From 65eca7929c22f0f0bc64135c02d85d1243df376c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:12:51 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- kpdf/core/document.cpp | 2 +- kpdf/core/document.h | 4 ++-- kpdf/core/generator.h | 4 ++-- kpdf/core/generator_kimgio/generator_kimgio.cpp | 2 +- kpdf/core/generator_kimgio/generator_kimgio.h | 2 +- kpdf/core/generator_pdf/generator_pdf.cpp | 8 ++++---- kpdf/core/generator_pdf/generator_pdf.h | 6 +++--- 7 files changed, 14 insertions(+), 14 deletions(-) (limited to 'kpdf/core') diff --git a/kpdf/core/document.cpp b/kpdf/core/document.cpp index c3c24a3d..8b1a2184 100644 --- a/kpdf/core/document.cpp +++ b/kpdf/core/document.cpp @@ -430,7 +430,7 @@ bool KPDFDocument::hasFonts() const return generator ? generator->hasFonts() : false; } -void KPDFDocument::putFontInfo(KListView *list) +void KPDFDocument::putFontInfo(TDEListView *list) { if (generator) generator->putFontInfo(list); } diff --git a/kpdf/core/document.h b/kpdf/core/document.h index d4d44f9a..a0529261 100644 --- a/kpdf/core/document.h +++ b/kpdf/core/document.h @@ -26,7 +26,7 @@ class DocumentInfo; class DocumentSynopsis; class Generator; class PixmapRequest; -class KListView; +class TDEListView; class KPrinter; class KURL; @@ -85,7 +85,7 @@ class KPDFDocument : public TQObject TQString getMetaData( const TQString & key, const TQString & option = TQString() ) const; bool supportsSearching() const; bool hasFonts() const; - void putFontInfo(KListView *list); + void putFontInfo(TDEListView *list); // perform actions on document / pages void setViewportPage( int page, int excludeId = -1, bool smoothMove = false ); diff --git a/kpdf/core/generator.h b/kpdf/core/generator.h index a3c1f985..5ed6aa73 100644 --- a/kpdf/core/generator.h +++ b/kpdf/core/generator.h @@ -14,7 +14,7 @@ #include #include #include "core/document.h" -class KListView; +class TDEListView; class KPrinter; class KPDFPage; class KPDFLink; @@ -64,7 +64,7 @@ class Generator : public TQObject virtual bool hasFonts() const = 0; // font related - virtual void putFontInfo(KListView *list) = 0; + virtual void putFontInfo(TDEListView *list) = 0; // print document using already configured kprinter virtual bool print( KPrinter& /*printer*/ ) { return false; } diff --git a/kpdf/core/generator_kimgio/generator_kimgio.cpp b/kpdf/core/generator_kimgio/generator_kimgio.cpp index 82491ddc..2cba5559 100644 --- a/kpdf/core/generator_kimgio/generator_kimgio.cpp +++ b/kpdf/core/generator_kimgio/generator_kimgio.cpp @@ -60,7 +60,7 @@ bool KIMGIOGenerator::hasFonts() const return false; } -void KIMGIOGenerator::putFontInfo( KListView * ) +void KIMGIOGenerator::putFontInfo( TDEListView * ) { } diff --git a/kpdf/core/generator_kimgio/generator_kimgio.h b/kpdf/core/generator_kimgio/generator_kimgio.h index 2e4606a7..150d3581 100644 --- a/kpdf/core/generator_kimgio/generator_kimgio.h +++ b/kpdf/core/generator_kimgio/generator_kimgio.h @@ -31,7 +31,7 @@ class KIMGIOGenerator : public Generator bool hasFonts() const; // font related - void putFontInfo(KListView *list); + void putFontInfo(TDEListView *list); // [INHERITED] print document using already configured kprinter bool print( KPrinter& printer ); diff --git a/kpdf/core/generator_pdf/generator_pdf.cpp b/kpdf/core/generator_pdf/generator_pdf.cpp index 1f03d9c0..20bb8516 100644 --- a/kpdf/core/generator_pdf/generator_pdf.cpp +++ b/kpdf/core/generator_pdf/generator_pdf.cpp @@ -360,7 +360,7 @@ bool PDFGenerator::hasFonts() const return true; } -void PDFGenerator::putFontInfo(KListView *list) +void PDFGenerator::putFontInfo(TDEListView *list) { Page *page; Dict *resDict; @@ -634,7 +634,7 @@ bool PDFGenerator::reparseConfig() } //END Generator inherited functions -void PDFGenerator::scanFonts(Dict *resDict, KListView *list, Ref **fonts, int &fontsLen, int &fontsSize, TQValueVector *visitedXObjects) +void PDFGenerator::scanFonts(Dict *resDict, TDEListView *list, Ref **fonts, int &fontsLen, int &fontsSize, TQValueVector *visitedXObjects) { Object obj1, obj2, xObjDict, xObj, xObj2, resObj; Ref r; @@ -709,7 +709,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, TDEListView *list, Ref **fonts, int &fontsLen, int &fontsSize) { Ref fontRef, embRef; Object fontObj, toUnicodeObj; @@ -772,7 +772,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 TDEListViewItem(list, sName, fontTypeNames[font->getType()], sEmb, sPath); // add this font to the list if (fontsLen == fontsSize) diff --git a/kpdf/core/generator_pdf/generator_pdf.h b/kpdf/core/generator_pdf/generator_pdf.h index 0aba8224..025deb0c 100644 --- a/kpdf/core/generator_pdf/generator_pdf.h +++ b/kpdf/core/generator_pdf/generator_pdf.h @@ -71,7 +71,7 @@ class PDFGenerator : public Generator bool hasFonts() const; // [INHERITED] font related - void putFontInfo(KListView *list); + void putFontInfo(TDEListView *list); // [INHERITED] print page using an already configured kprinter bool print( KPrinter& printer ); @@ -86,8 +86,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, TQValueVector *visitedXObjects); - void scanFont(GfxFont *font, KListView *list, Ref **fonts, int &fontsLen, int &fontsSize); + void scanFonts(Dict *resDict, TDEListView *list, Ref **fonts, int &fontsLen, int &fontsSize, TQValueVector *visitedXObjects); + void scanFont(GfxFont *font, TDEListView *list, Ref **fonts, int &fontsLen, int &fontsSize); void fillViewportFromLink( DocumentViewport &viewport, LinkDest *destination ); -- cgit v1.2.3