adapt to new kdelibs api

svn path=/trunk/KDE/kdegraphics/kpdf/; revision=518219
remotes/origin/kpdf
Laurent Montel 20 years ago
parent a59ae53b59
commit ce8715fb8c
  1. 2
      core/document.cpp
  2. 4
      core/document.h
  3. 4
      core/generator.h
  4. 2
      core/generator_kimgio/generator_kimgio.cpp
  5. 2
      core/generator_kimgio/generator_kimgio.h
  6. 10
      core/generator_pdf/generator_pdf.cpp
  7. 6
      core/generator_pdf/generator_pdf.h
  8. 4
      ui/propertiesdialog.cpp
  9. 14
      ui/toc.cpp
  10. 6
      ui/toc.h

@ -426,7 +426,7 @@ bool KPDFDocument::hasFonts() const
return generator ? generator->hasFonts() : false;
}
void KPDFDocument::putFontInfo(KListView *list)
void KPDFDocument::putFontInfo(K3ListView *list)
{
if (generator) generator->putFontInfo(list);
}

@ -28,7 +28,7 @@ class DocumentInfo;
class DocumentSynopsis;
class Generator;
class PixmapRequest;
class KListView;
class K3ListView;
class KPrinter;
class KUrl;
@ -83,7 +83,7 @@ class KPDFDocument : public QObject
QString getMetaData( const QString & key, const QString & option = QString() ) const;
bool supportsSearching() const;
bool hasFonts() const;
void putFontInfo(KListView *list);
void putFontInfo(K3ListView *list);
// perform actions on document / pages
void setViewportPage( int page, int excludeId = -1, bool smoothMove = false );

@ -14,7 +14,7 @@
#include <qvector.h>
#include <qstring.h>
#include "core/document.h"
class KListView;
class K3ListView;
class KPrinter;
class KPDFPage;
class KPDFLink;
@ -64,7 +64,7 @@ class Generator : public QObject
virtual bool hasFonts() const = 0;
// font related
virtual void putFontInfo(KListView *list) = 0;
virtual void putFontInfo(K3ListView *list) = 0;
// print document using already configured kprinter
virtual bool print( KPrinter& /*printer*/ ) { return false; }

@ -60,7 +60,7 @@ bool KIMGIOGenerator::hasFonts() const
return false;
}
void KIMGIOGenerator::putFontInfo( KListView * )
void KIMGIOGenerator::putFontInfo( K3ListView * )
{
}

@ -31,7 +31,7 @@ class KIMGIOGenerator : public Generator
bool hasFonts() const;
// font related
void putFontInfo(KListView *list);
void putFontInfo(K3ListView *list);
// [INHERITED] print document using already configured kprinter
bool print( KPrinter& printer );

@ -15,7 +15,7 @@
#include <qapplication.h>
#include <qregexp.h>
#include <kauthorized.h>
#include <klistview.h>
#include <k3listview.h>
#include <klocale.h>
#include <kpassworddialog.h>
#include <kwallet.h>
@ -355,7 +355,7 @@ bool PDFGenerator::hasFonts() const
return true;
}
void PDFGenerator::putFontInfo(KListView *list)
void PDFGenerator::putFontInfo(K3ListView *list)
{
Page *page;
Dict *resDict;
@ -537,7 +537,7 @@ static QString unicodeToQString(Unicode* u, int len) {
return ret;
}
void PDFGenerator::scanFonts(Dict *resDict, KListView *list, Ref **fonts, int &fontsLen, int &fontsSize)
void PDFGenerator::scanFonts(Dict *resDict, K3ListView *list, Ref **fonts, int &fontsLen, int &fontsSize)
{
Object obj1, obj2, xObjDict, xObj, resObj;
Ref r;
@ -592,7 +592,7 @@ void PDFGenerator::scanFonts(Dict *resDict, KListView *list, Ref **fonts, int &f
xObjDict.free();
}
void PDFGenerator::scanFont(GfxFont *font, KListView *list, Ref **fonts, int &fontsLen, int &fontsSize)
void PDFGenerator::scanFont(GfxFont *font, K3ListView *list, Ref **fonts, int &fontsLen, int &fontsSize)
{
Ref fontRef, embRef;
Object fontObj, toUnicodeObj;
@ -651,7 +651,7 @@ void PDFGenerator::scanFont(GfxFont *font, KListView *list, Ref **fonts, int &fo
sPath = i18n("-");
}
sEmb = emb ? i18n("Yes") : i18n("No");
new KListViewItem(list, sName, fontTypeNames[font->getType()], sEmb, sPath);
new K3ListViewItem(list, sName, fontTypeNames[font->getType()], sEmb, sPath);
// add this font to the list
if (fontsLen == fontsSize)

@ -72,7 +72,7 @@ class PDFGenerator : public Generator
bool hasFonts() const;
// [INHERITED] font related
void putFontInfo(KListView *list);
void putFontInfo(K3ListView *list);
// [INHERITED] print page using an already configured kprinter
bool print( KPrinter& printer );
@ -87,8 +87,8 @@ class PDFGenerator : public Generator
// friend class to access private document related variables
friend class PDFPixmapGeneratorThread;
void scanFonts(Dict *resDict, KListView *list, Ref **fonts, int &fontsLen, int &fontsSize);
void scanFont(GfxFont *font, KListView *list, Ref **fonts, int &fontsLen, int &fontsSize);
void scanFonts(Dict *resDict, K3ListView *list, Ref **fonts, int &fontsLen, int &fontsSize);
void scanFont(GfxFont *font, K3ListView *list, Ref **fonts, int &fontsLen, int &fontsSize);
void fillViewportFromLink( DocumentViewport &viewport, LinkDest *destination );

@ -10,7 +10,7 @@
// qt/kde includes
#include <qlayout.h>
#include <qlabel.h>
#include <klistview.h>
#include <k3listview.h>
#include <klocale.h>
#include <ksqueezedtextlabel.h>
#include <kglobalsettings.h>
@ -76,7 +76,7 @@ PropertiesDialog::PropertiesDialog(QWidget *parent, KPDFDocument *doc)
{
QFrame *page2 = addPage(i18n("Fonts"));
page2Layout = new QVBoxLayout(page2, 0, KDialog::spacingHint());
KListView *lv = new KListView(page2);
K3ListView *lv = new K3ListView(page2);
page2Layout->add(lv);
doc->putFontInfo(lv);
}

@ -21,11 +21,11 @@
// they're slow when converted to page number. drop the 2nd column idea.
//#define TOC_ENABLE_PAGE_COLUMN
class TOCItem : public KListViewItem
class TOCItem : public K3ListViewItem
{
public:
TOCItem( KListView *parent, TOCItem *after, const QDomElement & e )
: KListViewItem( parent, after, e.tagName() ), m_element( e )
TOCItem( K3ListView *parent, TOCItem *after, const QDomElement & e )
: K3ListViewItem( parent, after, e.tagName() ), m_element( e )
{
#ifdef TOC_ENABLE_PAGE_COLUMN
if ( e.hasAttribute( "Page" ) )
@ -34,8 +34,8 @@ class TOCItem : public KListViewItem
setMultiLinesEnabled( true );
}
TOCItem( KListViewItem *parent, TOCItem *after, const QDomElement & e )
: KListViewItem( parent, after, e.tagName() ), m_element( e )
TOCItem( K3ListViewItem *parent, TOCItem *after, const QDomElement & e )
: K3ListViewItem( parent, after, e.tagName() ), m_element( e )
{
#ifdef TOC_ENABLE_PAGE_COLUMN
if ( e.hasAttribute( "Page" ) )
@ -53,7 +53,7 @@ class TOCItem : public KListViewItem
QDomElement m_element;
};
TOC::TOC(QWidget *parent, KPDFDocument *document) : KListView(parent), m_document(document)
TOC::TOC(QWidget *parent, KPDFDocument *document) : K3ListView(parent), m_document(document)
{
addColumn( i18n("Topic") );
#ifdef TOC_ENABLE_PAGE_COLUMN
@ -102,7 +102,7 @@ void TOC::notifySetup( const QVector< KPDFPage * > & /*pages*/, bool documentCha
emit hasTOC( true );
}
void TOC::addChildren( const QDomNode & parentNode, KListViewItem * parentItem )
void TOC::addChildren( const QDomNode & parentNode, K3ListViewItem * parentItem )
{
// keep track of the current listViewItem
TOCItem * currentItem = 0;

@ -11,13 +11,13 @@
#define _KPDF_TOC_H_
#include <qdom.h>
#include <klistview.h>
#include <k3listview.h>
#include "core/document.h"
#include "core/observer.h"
class KPDFDocument;
class TOC : public KListView, public DocumentObserver
class TOC : public K3ListView, public DocumentObserver
{
Q_OBJECT
public:
@ -35,7 +35,7 @@ Q_OBJECT
void slotExecuted(Q3ListViewItem *i);
private:
void addChildren( const QDomNode & parentNode, KListViewItem * parentItem = 0 );
void addChildren( const QDomNode & parentNode, K3ListViewItem * parentItem = 0 );
DocumentViewport getViewport( const QDomElement &e ) const;
KPDFDocument *m_document;
};

Loading…
Cancel
Save