Katana_mirror/kde-extraapps
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-extraapps.git synced 2025-02-23 10:22:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: remove QT_KATIE definition checks

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-06-08 14:45:37 +03:00
parent 29171a58d1
commit 3a91a1580d
3 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ark/kerfuffle/tests/jsonarchiveinterface.cpp
View file

@ -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)
{

4
okular/generators/epub/converter.cpp
View file

@ -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);

4
okular/generators/epub/epubdocument.cpp
View file

@ -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)