generic: remove QT_KATIE definition checks

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/ark/kerfuffle/tests/jsonarchiveinterface.cpp b/ark/kerfuffle/tests/jsonarchiveinterface.cpp
index eaf3350..3a8e6be 100644 (file)
--- a/ark/kerfuffle/tests/jsonarchiveinterface.cpp
+++ b/ark/kerfuffle/tests/jsonarchiveinterface.cpp
@@ -28,11 +28,6 @@
 #include <kdebug.h>
 #include <qfile.h>
 
-#ifndef QT_KATIE
-#  include <qjson/parser.h>
-#endif
-
-
 JSONArchiveInterface::JSONArchiveInterface(QObject *parent, const QVariantList& args)
     : Kerfuffle::ReadWriteArchiveInterface(parent, args)
 {

diff --git a/okular/generators/epub/converter.cpp b/okular/generators/epub/converter.cpp
index 087aa9f..fb83e28 100644 (file)
--- a/okular/generators/epub/converter.cpp
+++ b/okular/generators/epub/converter.cpp
@@ -395,11 +395,7 @@ QTextDocument* Converter::convert( const QString &fileName )
             block = _cursor->block();
             QImage image;
             mSectionMap.insert(link, block);
-#ifndef QT_KATIE
-            if (image.loadFromData((unsigned char *)data, size)) {
-#else
             if (image.loadFromData(data, size)) {
-#endif
               mTextDocument->addResource(QTextDocument::ImageResource,
                                          QUrl(link), image);
               _cursor->insertImage(link);

diff --git a/okular/generators/epub/epubdocument.cpp b/okular/generators/epub/epubdocument.cpp
index 35a6ab5..44eb540 100644 (file)
--- a/okular/generators/epub/epubdocument.cpp
+++ b/okular/generators/epub/epubdocument.cpp
@@ -89,11 +89,7 @@ QVariant EpubDocument::loadResource(int type, const QUrl &name)
   if (data) {
     switch(type) {
     case QTextDocument::ImageResource:{
-#ifndef QT_KATIE
-      QImage img = QImage::fromData((unsigned char *)data, size);
-#else
       QImage img = QImage::fromData(data, size);
-#endif
       const int maxHeight = maxContentHeight();
       const int maxWidth = maxContentWidth();
       if(img.height() > maxHeight)