From 3a91a1580ddcb93be3242c7af4c7324d4e36efad Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 8 Jun 2023 14:45:37 +0300 Subject: [PATCH] generic: remove QT_KATIE definition checks Signed-off-by: Ivailo Monev --- ark/kerfuffle/tests/jsonarchiveinterface.cpp | 5 ----- okular/generators/epub/converter.cpp | 4 ---- okular/generators/epub/epubdocument.cpp | 4 ---- 3 files changed, 13 deletions(-) diff --git a/ark/kerfuffle/tests/jsonarchiveinterface.cpp b/ark/kerfuffle/tests/jsonarchiveinterface.cpp index eaf3350c..3a8e6be7 100644 --- a/ark/kerfuffle/tests/jsonarchiveinterface.cpp +++ b/ark/kerfuffle/tests/jsonarchiveinterface.cpp @@ -28,11 +28,6 @@ #include #include -#ifndef QT_KATIE -# include -#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 087aa9fb..fb83e281 100644 --- 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 35a6ab54..44eb5401 100644 --- 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)