diff options
Diffstat (limited to 'tdefile-plugins')
28 files changed, 102 insertions, 87 deletions
diff --git a/tdefile-plugins/RETURNED_ITEMS b/tdefile-plugins/RETURNED_ITEMS index 70a3b519..9bf09559 100644 --- a/tdefile-plugins/RETURNED_ITEMS +++ b/tdefile-plugins/RETURNED_ITEMS @@ -50,7 +50,7 @@ String Camera make String Camera model String Date/time Size Dimensions Width x Height in pixels -int Qt::Orientation 1 - "The 0th row is at the visual top of the image, +int Orientation 1 - "The 0th row is at the visual top of the image, and the 0th column is the visual left-hand side." 2 - "The 0th row is at the visual top of the image, and the 0th column is the visual right-hand side." @@ -115,7 +115,7 @@ String JPG quality 1 - "basic" default: unknown String User comment String Comment -QImage Thumbnail +TQImage Thumbnail gif plugin: diff --git a/tdefile-plugins/bmp/tdefile_bmp.h b/tdefile-plugins/bmp/tdefile_bmp.h index ce4f03eb..c598f6fb 100644 --- a/tdefile-plugins/bmp/tdefile_bmp.h +++ b/tdefile-plugins/bmp/tdefile_bmp.h @@ -26,7 +26,7 @@ class TQStringList; class KBmpPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/dds/tdefile_dds.h b/tdefile-plugins/dds/tdefile_dds.h index 5a638a9d..418c6e43 100644 --- a/tdefile-plugins/dds/tdefile_dds.h +++ b/tdefile-plugins/dds/tdefile_dds.h @@ -26,7 +26,7 @@ class TQStringList; class KDdsPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt b/tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt index 28be343b..d95dc846 100644 --- a/tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt +++ b/tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt @@ -41,6 +41,7 @@ install( FILES poppler-qt.h poppler-page-transition.h poppler-link-qt3.h DESTINATION ${INCLUDE_INSTALL_DIR} ) + ##### poppler-tqt (shared) ############################ tde_add_library( poppler-tqt SHARED AUTOMOC @@ -50,6 +51,12 @@ tde_add_library( poppler-tqt SHARED AUTOMOC poppler-page-transition.cpp poppler-page-transition-private.h poppler-private.cpp poppler-private.h VERSION 0.0.0 + CXX_FEATURES ${POPPLER_CXX_FEATURES} LINK ${POPPLER_LIBRARIES} ${TQT_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) + + +##### install cmake export file ################# + +tde_install_export( ) diff --git a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake index 1bc139b7..99a48c8e 100644 --- a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake +++ b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake @@ -6,34 +6,14 @@ else( ) tde_message_fatal( "poppler is required, but was not found on your system" ) endif( ) -tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) -set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${POPPLER_INCLUDE_DIRS}) -set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} ${POPPLER_LDFLAGS} ) -check_cxx_source_compiles(" - #include <PSOutputDev.h> - int main(int, char**) { int a; int b; PSOutputDev *psOut = new PSOutputDev(\"test\", (PDFDoc*)0, (XRef*)0, (Catalog*)0, NULL, 0, 0, psModePS, a, b); } " - HAVE_POPPLER_016 ) -check_cxx_source_compiles(" - #include <PSOutputDev.h> - int main(int, char**) { int a; int b; PSOutputDev *psOut = new PSOutputDev(\"test\", (PDFDoc*)0, NULL, 0, 0, psModePS, a, b); } " - HAVE_POPPLER_020 ) -check_cxx_source_compiles(" - #include <vector> - #include <PSOutputDev.h> - int main(int, char**) { int a; int b; std::vector<int> p; PSOutputDev *psOut = new PSOutputDev(\"test\", (PDFDoc*)0, NULL, p, psModePS, a, b); } " - HAVE_POPPLER_030 ) -tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) +string( REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" + POPPLER_VERSION_SPLIT ${POPPLER_VERSION} ) +set( POPPLER_VERSION_MAJOR ${CMAKE_MATCH_1} ) +set( POPPLER_VERSION_MINOR ${CMAKE_MATCH_2} ) +set( POPPLER_VERSION_PATCH ${CMAKE_MATCH_3} ) +math( EXPR POPPLER_VERSION_C "(${POPPLER_VERSION_MAJOR}*1000000) + (${POPPLER_VERSION_MINOR}*1000) + ${POPPLER_VERSION_PATCH}" ) +set( POPPLER_VERSION_C ${POPPLER_VERSION_C} CACHE INTERNAL "Poppler library version as code number" ) -foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 0.86 ) - string( REPLACE "." "" _poppler_str "${_poppler_ver}" ) - if( NOT DEFINED HAVE_POPPLER_${_poppler_str} ) - message( STATUS "Performing Test HAVE_POPPLER_${_poppler_str}" ) - if( NOT POPPLER_VERSION VERSION_LESS "${_poppler_ver}" ) - set( HAVE_POPPLER_${_poppler_str} 1 CACHE INTERNAL "" FORCE ) - message( STATUS "Performing Test HAVE_POPPLER_${_poppler_str} - Success" ) - else( ) - set( HAVE_POPPLER_${_poppler_str} "" CACHE INTERNAL "" FORCE ) - message( STATUS "Performing Test HAVE_POPPLER_${_poppler_str} - Failed" ) - endif( ) - endif( ) -endforeach( ) +if( NOT POPPLER_VERSION_C LESS 21012000 ) + set( POPPLER_CXX_FEATURES cxx_std_17 CACHE INTERNAL "C++ standard required by Poppler" ) +endif() diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp b/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp index fac02a4b..5ed02af6 100644 --- a/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp +++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp @@ -33,7 +33,7 @@ #include <DateInfo.h> #include "poppler-private.h" -#if !defined(HAVE_POPPLER_071) +#if (POPPLER_VERSION_C < 71000) #undef bool #endif @@ -43,14 +43,18 @@ Document *Document::load(const TQString &filePath) { if (!globalParams) { globalParams = -#if defined(HAVE_POPPLER_083) +#if (POPPLER_VERSION_C >= 83000) std::make_unique<GlobalParams>(); #else new GlobalParams(); #endif } +# if (POPPLER_VERSION_C >= 22003000) + DocumentData *doc = new DocumentData(std::make_unique<GooString>(TQFile::encodeName(filePath)), {}); +# else DocumentData *doc = new DocumentData(new GooString(TQFile::encodeName(filePath)), NULL); +# endif Document *pdoc; if (doc->doc.isOk() || doc->doc.getErrorCode() == errEncrypted) { pdoc = new Document(doc); @@ -84,10 +88,15 @@ bool Document::unlock(const TQCString &password) { if (data->locked) { /* racier then it needs to be */ +# if (POPPLER_VERSION_C >= 22003000) + DocumentData *doc2 = new DocumentData(std::make_unique<GooString>(data->doc.getFileName()), + GooString(password.data())); +# else GooString *filename = new GooString(data->doc.getFileName()); GooString *pwd = new GooString(password.data()); DocumentData *doc2 = new DocumentData(filename, pwd); delete pwd; +# endif if (!doc2->doc.isOk()) { delete doc2; } else { @@ -134,15 +143,13 @@ bool Document::scanForFonts( int numPages, TQValueList<FontInfo> *fontList ) con { FONTS_LIST_TYPE items = data->m_fontInfoScanner->scan( numPages ); -#if !defined(HAVE_POPPLER_082) +#if (POPPLER_VERSION_C < 82000) if ( NULL == items ) return false; #endif -#if !defined(HAVE_POPPLER_076) +#if (POPPLER_VERSION_C < 76000) if ( FONTS_LIST_IS_EMPTY(items) ) { -# if !defined(HAVE_POPPLER_082) delete items; -# endif return false; } #endif @@ -159,16 +166,16 @@ bool Document::scanForFonts( int numPages, TQValueList<FontInfo> *fontList ) con (Poppler::FontInfo::Type)(fontInfo->getType())); fontList->append(font); } -# if defined(HAVE_POPPLER_082) +# if (POPPLER_VERSION_C >= 82000) for (auto entry : items) { delete entry; } -# elif defined(HAVE_POPPLER_076) +# elif (POPPLER_VERSION_C >= 76000) for (auto entry : *items) { delete entry; } delete items; -# elif defined(HAVE_POPPLER_070) +# elif (POPPLER_VERSION_C >= 70000) deleteGooList<::FontInfo>(items); # else deleteGooList(items, ::FontInfo); @@ -184,7 +191,7 @@ TQString Document::getInfo( const TQString & type ) const if ( data->locked ) return NULL; -# if defined(HAVE_POPPLER_058) +# if (POPPLER_VERSION_C >= 58000) info = data->doc.getDocInfo(); # else data->doc.getDocInfo( &info ); @@ -200,7 +207,7 @@ TQString Document::getInfo( const TQString & type ) const int i; Dict *infoDict = info.getDict(); -#if defined(HAVE_POPPLER_058) +#if (POPPLER_VERSION_C >= 58000) obj = infoDict->lookup( (char*)type.latin1() ); #else infoDict->lookup( (char*)type.latin1(), &obj ); @@ -232,13 +239,13 @@ TQString Document::getInfo( const TQString & type ) const } result += unicodeToTQString( &u, 1 ); } -# if !defined(HAVE_POPPLER_058) +# if (POPPLER_VERSION_C < 58000) obj.free(); info.free(); # endif return result; } -# if !defined(HAVE_POPPLER_058) +# if (POPPLER_VERSION_C < 58000) obj.free(); info.free(); # endif @@ -253,13 +260,13 @@ TQDateTime Document::getDate( const TQString & type ) const return TQDateTime(); Object info; -# if defined(HAVE_POPPLER_058) +# if (POPPLER_VERSION_C >= 58000) info = data->doc.getDocInfo(); # else data->doc.getDocInfo( &info ); # endif if ( !info.isDict() ) { -# if !defined(HAVE_POPPLER_058) +# if (POPPLER_VERSION_C < 58000) info.free(); # endif return TQDateTime(); @@ -271,21 +278,26 @@ TQDateTime Document::getDate( const TQString & type ) const Dict *infoDict = info.getDict(); TQString result; -#if defined(HAVE_POPPLER_058) +#if (POPPLER_VERSION_C >= 58000) obj = infoDict->lookup( (char*)type.latin1() ); #else infoDict->lookup( (char*)type.latin1(), &obj ); #endif if (!obj.isNull() && obj.isString()) { - TQString s = UnicodeParsedString(obj.getString()); +# if (POPPLER_VERSION_C >= 21008000) + const GooString *s = obj.getString(); +# else + TQString tqs = UnicodeParsedString(obj.getString()); + const char *s = tqs.latin1(); +# endif // TODO do something with the timezone information - if ( parseDateString( s.latin1(), &year, &mon, &day, &hour, &min, &sec, &tz, &tz_hour, &tz_minute ) ) + if (parseDateString(s, &year, &mon, &day, &hour, &min, &sec, &tz, &tz_hour, &tz_minute)) { TQDate d( year, mon, day ); //CHECK: it was mon-1, Jan->0 (??) TQTime t( hour, min, sec ); if ( d.isValid() && t.isValid() ) { -# if !defined(HAVE_POPPLER_058) +# if (POPPLER_VERSION_C < 58000) obj.free(); info.free(); # endif @@ -293,7 +305,7 @@ TQDateTime Document::getDate( const TQString & type ) const } } } -# if !defined(HAVE_POPPLER_058) +# if (POPPLER_VERSION_C < 58000) obj.free(); info.free(); # endif @@ -376,16 +388,16 @@ bool Document::print(const TQString &fileName, TQValueList<int> pageList, double bool Document::print(const TQString &file, TQValueList<int> pageList, double hDPI, double vDPI, int rotate, int paperWidth, int paperHeight) { -#if defined(HAVE_POPPLER_058) || defined(HAVE_POPPLER_030) +#if (POPPLER_VERSION_C >= 30000) std::vector<int> pages; TQValueList<int>::iterator it; for (it = pageList.begin(); it != pageList.end(); ++it ) { pages.push_back(*it); } PSOutputDev *psOut = new PSOutputDev(file.latin1(), &(data->doc), NULL, pages, psModePS, paperWidth, paperHeight); -#elif defined(HAVE_POPPLER_020) +#elif (POPPLER_VERSION_C >= 20000) PSOutputDev *psOut = new PSOutputDev(file.latin1(), &(data->doc), NULL, 1, data->doc.getNumPages(), psModePS, paperWidth, paperHeight); -#elif defined(HAVE_POPPLER_016) +#elif (POPPLER_VERSION_C >= 16000) PSOutputDev *psOut = new PSOutputDev(file.latin1(), &(data->doc), data->doc.getXRef(), data->doc.getCatalog(), NULL, 1, data->doc.getNumPages(), psModePS, paperWidth, paperHeight); #else PSOutputDev *psOut = new PSOutputDev(file.latin1(), data->doc.getXRef(), data->doc.getCatalog(), NULL, 1, data->doc.getNumPages(), psModePS, paperWidth, paperHeight); diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-link.cpp b/tdefile-plugins/dependencies/poppler-tqt/poppler-link.cpp index 99cd8cc9..3ba58505 100644 --- a/tdefile-plugins/dependencies/poppler-tqt/poppler-link.cpp +++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-link.cpp @@ -35,7 +35,7 @@ namespace Poppler { if ( data.namedDest && !ld ) { deleteDest = true; -# if defined(HAVE_POPPLER_086) +# if (POPPLER_VERSION_C >= 86000) ld = data.doc->doc.findDest( data.namedDest ).get(); # else ld = data.doc->doc.findDest( data.namedDest ); @@ -81,7 +81,7 @@ namespace Poppler { m_right = rightAux; m_bottom = bottomAux; -# if !defined(HAVE_POPPLER_086) +# if (POPPLER_VERSION_C < 86000) if (deleteDest) delete ld; # endif } diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp b/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp index 426b750f..54f198e9 100644 --- a/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp +++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp @@ -129,7 +129,7 @@ TQString Page::getText(const Rectangle &r) const TQString result; ::Page *p; -#if defined(HAVE_POPPLER_058) || defined(HAVE_POPPLER_030) || defined(HAVE_POPPLER_020) +#if (POPPLER_VERSION_C >= 20000) output_dev = new TextOutputDev(0, gFalse, 0, gFalse, gFalse); #else output_dev = new TextOutputDev(0, gFalse, gFalse, gFalse); @@ -164,7 +164,7 @@ TQValueList<TextBox*> Page::textList() const TQValueList<TextBox*> output_list; -#if defined(HAVE_POPPLER_058) || defined(HAVE_POPPLER_030) || defined(HAVE_POPPLER_020) +#if (POPPLER_VERSION_C >= 20000) output_dev = new TextOutputDev(0, gFalse, 0, gFalse, gFalse); #else output_dev = new TextOutputDev(0, gFalse, gFalse, gFalse); @@ -173,7 +173,11 @@ TQValueList<TextBox*> Page::textList() const data->doc->data->doc.displayPageSlice(output_dev, data->index + 1, 72, 72, 0, false, false, false, -1, -1, -1, -1); +# if (POPPLER_VERSION_C >= 21011000) + std::unique_ptr<TextWordList> word_list = output_dev->makeWordList(); +# else TextWordList *word_list = output_dev->makeWordList(); +# endif if (!word_list) { delete output_dev; @@ -193,7 +197,9 @@ TQValueList<TextBox*> Page::textList() const output_list.append(text_box); } +# if (POPPLER_VERSION_C < 21011000) delete word_list; +# endif delete output_dev; return output_list; @@ -205,14 +211,14 @@ PageTransition *Page::getTransition() const { Object o; PageTransitionParams params; -# if defined(HAVE_POPPLER_058) +# if (POPPLER_VERSION_C >= 58000) o = data->doc->data->doc.getCatalog()->getPage(data->index + 1)->getTrans(); # else data->doc->data->doc.getCatalog()->getPage(data->index + 1)->getTrans(&o); # endif params.dictObj = &o; data->transition = new PageTransition(params); -# if !defined(HAVE_POPPLER_058) +# if (POPPLER_VERSION_C < 58000) o.free(); # endif } diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-private.cpp b/tdefile-plugins/dependencies/poppler-tqt/poppler-private.cpp index 059bf1c0..42ec0899 100644 --- a/tdefile-plugins/dependencies/poppler-tqt/poppler-private.cpp +++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-private.cpp @@ -93,7 +93,7 @@ void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, O { // iterate over every object in 'items' OutlineItem * outlineItem = -#ifdef HAVE_POPPLER_076 +#if (POPPLER_VERSION_C >= 76000) (*items)[i]; #else (OutlineItem *)items->get( i ); @@ -101,9 +101,15 @@ void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, O // 1. create element using outlineItem's title as tagName TQString name; +#if (POPPLER_VERSION_C >= 24002000) + const std::vector<Unicode> &uVec = outlineItem->getTitle(); + name = unicodeToTQString( uVec.data(), uVec.size() ); +#else CONST_064 Unicode * uniChar = outlineItem->getTitle(); int titleLength = outlineItem->getTitleLength(); name = unicodeToTQString(uniChar, titleLength); +#endif + if ( name.isEmpty() ) continue; diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h b/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h index c98d02b8..d3487ef1 100644 --- a/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h +++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h @@ -39,27 +39,27 @@ #else class SplashOutputDev; #endif -#if defined(HAVE_POPPLER_064) +#if (POPPLER_VERSION_C >= 64000) #define CONST_064 const #else #define CONST_064 #endif -#if defined(HAVE_POPPLER_071) +#if (POPPLER_VERSION_C >= 71000) #define GBool bool #define gTrue true #define gFalse false #endif -#if defined(HAVE_POPPLER_072) +#if (POPPLER_VERSION_C >= 72000) #define GOO_GET_CSTR c_str #else #define GOO_GET_CSTR getCString #endif -#if defined(HAVE_POPPLER_076) +#if (POPPLER_VERSION_C >= 76000) #include <vector> class OutlineItem; #define OUTLINE_ITEMS_TYPE const std::vector<OutlineItem*> #define OUTLINE_ITEMS_LENGTH(goo) goo->size() -# if defined(HAVE_POPPLER_082) +# if (POPPLER_VERSION_C >= 82000) #define FONTS_LIST_TYPE std::vector<::FontInfo*> #define FONTS_LIST_LENGTH(goo) goo.size() #define FONTS_LIST_IS_EMPTY(goo) goo.empty() @@ -104,7 +104,11 @@ class LinkDestinationData { class DocumentData { public: +# if (POPPLER_VERSION_C >= 22003000) + DocumentData(std::unique_ptr<GooString> &&filePath, const std::optional<GooString> &password) : doc(std::move(filePath), password), m_fontInfoScanner(0), m_outputDev(0) {} +# else DocumentData(GooString *filePath, GooString *password) : doc(filePath,password), m_fontInfoScanner(0), m_outputDev(0) {} +# endif ~DocumentData() { diff --git a/tdefile-plugins/dvi/tdefile_dvi.h b/tdefile-plugins/dvi/tdefile_dvi.h index 034ddced..36e715b9 100644 --- a/tdefile-plugins/dvi/tdefile_dvi.h +++ b/tdefile-plugins/dvi/tdefile_dvi.h @@ -27,7 +27,7 @@ class TQStringList; class KDviPlugin : public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: KDviPlugin ( TQObject * parent, const char * name, const TQStringList & preferredItems ); diff --git a/tdefile-plugins/exr/tdefile_exr.h b/tdefile-plugins/exr/tdefile_exr.h index 11a3a86b..6d71aebf 100644 --- a/tdefile-plugins/exr/tdefile_exr.h +++ b/tdefile-plugins/exr/tdefile_exr.h @@ -28,7 +28,7 @@ class TQStringList; class KExrPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/gif/tdefile_gif.h b/tdefile-plugins/gif/tdefile_gif.h index acaa17d4..39cf789e 100644 --- a/tdefile-plugins/gif/tdefile_gif.h +++ b/tdefile-plugins/gif/tdefile_gif.h @@ -26,7 +26,7 @@ class TQStringList; class KGifPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/ico/tdefile_ico.h b/tdefile-plugins/ico/tdefile_ico.h index 5e1331c9..37da8326 100644 --- a/tdefile-plugins/ico/tdefile_ico.h +++ b/tdefile-plugins/ico/tdefile_ico.h @@ -26,7 +26,7 @@ class TQStringList; class KIcoPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/jpeg/tdefile_jpeg.h b/tdefile-plugins/jpeg/tdefile_jpeg.h index c6eae8b1..4b825a45 100644 --- a/tdefile-plugins/jpeg/tdefile_jpeg.h +++ b/tdefile-plugins/jpeg/tdefile_jpeg.h @@ -25,7 +25,7 @@ class KJpegPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/pcx/tdefile_pcx.h b/tdefile-plugins/pcx/tdefile_pcx.h index bf567792..195e82ec 100644 --- a/tdefile-plugins/pcx/tdefile_pcx.h +++ b/tdefile-plugins/pcx/tdefile_pcx.h @@ -72,7 +72,7 @@ struct PCXHEADER class KPcxPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/pdf/tdefile_pdf.h b/tdefile-plugins/pdf/tdefile_pdf.h index e06e3a12..7fa842e0 100644 --- a/tdefile-plugins/pdf/tdefile_pdf.h +++ b/tdefile-plugins/pdf/tdefile_pdf.h @@ -28,7 +28,7 @@ class TQStringList; class KPdfPlugin: public KFilePlugin { -Q_OBJECT +TQ_OBJECT public: KPdfPlugin( TQObject *parent, const char *name, const TQStringList& preferredItems ); diff --git a/tdefile-plugins/png/tdefile_png.h b/tdefile-plugins/png/tdefile_png.h index 5b02d3fc..6588d754 100644 --- a/tdefile-plugins/png/tdefile_png.h +++ b/tdefile-plugins/png/tdefile_png.h @@ -28,7 +28,7 @@ class TQStringList; class KPngPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/pnm/tdefile_pnm.h b/tdefile-plugins/pnm/tdefile_pnm.h index 0948d1a7..2c76ed2a 100644 --- a/tdefile-plugins/pnm/tdefile_pnm.h +++ b/tdefile-plugins/pnm/tdefile_pnm.h @@ -26,7 +26,7 @@ class TQStringList; class KPnmPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/ps/gscreator.cpp b/tdefile-plugins/ps/gscreator.cpp index c664947b..88601a4c 100644 --- a/tdefile-plugins/ps/gscreator.cpp +++ b/tdefile-plugins/ps/gscreator.cpp @@ -241,7 +241,7 @@ bool GSCreator::create(const TQString &path, int width, int height, TQImage &img char translation[64] = ""; char pagesize[32] = ""; char resopt[32] = ""; - std::auto_ptr<KDSCBBOX> bbox = dsc.bbox(); + std::unique_ptr<KDSCBBOX> bbox = dsc.bbox(); if (is_encapsulated) { // GhostScript's rendering at the extremely low resolutions // required for thumbnails leaves something to be desired. To diff --git a/tdefile-plugins/ps/tdefile_ps.h b/tdefile-plugins/ps/tdefile_ps.h index 16f3c56a..4beff5ba 100644 --- a/tdefile-plugins/ps/tdefile_ps.h +++ b/tdefile-plugins/ps/tdefile_ps.h @@ -29,7 +29,7 @@ class TQStringList; class KPSPlugin: public KFilePlugin, public KDSCCommentHandler { - Q_OBJECT + TQ_OBJECT public: KPSPlugin( TQObject *parent, const char *name, diff --git a/tdefile-plugins/raw/kcamerarawplugin.h b/tdefile-plugins/raw/kcamerarawplugin.h index d16446e8..7d8cc414 100644 --- a/tdefile-plugins/raw/kcamerarawplugin.h +++ b/tdefile-plugins/raw/kcamerarawplugin.h @@ -25,7 +25,7 @@ class TQImage; class KCameraRawPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/raw/parse.c b/tdefile-plugins/raw/parse.c index 467b0577..4f7e8dc1 100644 --- a/tdefile-plugins/raw/parse.c +++ b/tdefile-plugins/raw/parse.c @@ -284,7 +284,7 @@ int parse_tiff_ifd (int base, int level) case 0x111: /* StripOffset */ if (!offset || is_dng) offset = val; break; - case 0x112: /* Qt::Orientation */ + case 0x112: /* Orientation */ flip = flip_map[(val-1) & 7]; break; case 0x117: /* StripByteCounts */ diff --git a/tdefile-plugins/rgb/tdefile_rgb.h b/tdefile-plugins/rgb/tdefile_rgb.h index 72c46d10..35947fb4 100644 --- a/tdefile-plugins/rgb/tdefile_rgb.h +++ b/tdefile-plugins/rgb/tdefile_rgb.h @@ -26,7 +26,7 @@ class TQStringList; class KRgbPlugin : public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/tga/tdefile_tga.h b/tdefile-plugins/tga/tdefile_tga.h index ae0489b1..633f17e5 100644 --- a/tdefile-plugins/tga/tdefile_tga.h +++ b/tdefile-plugins/tga/tdefile_tga.h @@ -26,7 +26,7 @@ class TQStringList; class KTgaPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/tiff/tdefile_tiff.h b/tdefile-plugins/tiff/tdefile_tiff.h index ab8560bf..fc489533 100644 --- a/tdefile-plugins/tiff/tdefile_tiff.h +++ b/tdefile-plugins/tiff/tdefile_tiff.h @@ -26,7 +26,7 @@ class KTiffPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/xbm/tdefile_xbm.h b/tdefile-plugins/xbm/tdefile_xbm.h index 0b844c1c..ffb0c77c 100644 --- a/tdefile-plugins/xbm/tdefile_xbm.h +++ b/tdefile-plugins/xbm/tdefile_xbm.h @@ -26,7 +26,7 @@ class TQStringList; class KXbmPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdefile-plugins/xpm/tdefile_xpm.h b/tdefile-plugins/xpm/tdefile_xpm.h index a16ca7fe..0b545856 100644 --- a/tdefile-plugins/xpm/tdefile_xpm.h +++ b/tdefile-plugins/xpm/tdefile_xpm.h @@ -33,7 +33,7 @@ class TQStringList; class xpmPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: |