gwenview: fix build case with QT_NO_IMAGE_TEXT defined

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/gwenview/lib/thumbnailprovider/thumbnailgenerator.cpp b/gwenview/lib/thumbnailprovider/thumbnailgenerator.cpp
index 3989ccc..a73753b 100644 (file)
--- a/gwenview/lib/thumbnailprovider/thumbnailgenerator.cpp
+++ b/gwenview/lib/thumbnailprovider/thumbnailgenerator.cpp
@@ -245,6 +245,7 @@ void ThumbnailGenerator::run()
 
 void ThumbnailGenerator::cacheThumbnail()
 {
+#ifndef QT_NO_IMAGE_TEXT
     mImage.setText("Thumb::URI"          , mOriginalUri);
     mImage.setText("Thumb::MTime"        , QString::number(mOriginalTime));
     mImage.setText("Thumb::Size"         , QString::number(mOriginalFileSize));
@@ -252,6 +253,7 @@ void ThumbnailGenerator::cacheThumbnail()
     mImage.setText("Thumb::Image::Width" , QString::number(mOriginalWidth));
     mImage.setText("Thumb::Image::Height", QString::number(mOriginalHeight));
     mImage.setText("Software"            , "Gwenview");
+#endif
 
     emit thumbnailReadyToBeCached(mThumbnailPath, mImage);
 }

diff --git a/gwenview/lib/thumbnailprovider/thumbnailprovider.cpp b/gwenview/lib/thumbnailprovider/thumbnailprovider.cpp
index baa994c..9ffbf77 100644 (file)
--- a/gwenview/lib/thumbnailprovider/thumbnailprovider.cpp
+++ b/gwenview/lib/thumbnailprovider/thumbnailprovider.cpp
@@ -68,7 +68,7 @@ static QString generateOriginalUri(const KUrl& url_)
 {
     KUrl url = url_;
     // Don't include the password if any
-    url.setPass(QString::null); //krazy:exclude=nullstrassign for old broken gcc
+    url.setPass(QString());
     return url.url();
 }
 
@@ -132,7 +132,9 @@ static void moveThumbnailHelper(const QString& oldUri, const QString& newUri, Th
     if (!thumb.load(oldPath)) {
         return;
     }
+#ifndef QT_NO_IMAGE_TEXT
     thumb.setText("Thumb::URI", newUri);
+#endif
     thumb.save(newPath, "png");
     QFile::remove(QFile::encodeName(oldPath));
 }
@@ -407,10 +409,12 @@ QImage ThumbnailProvider::loadThumbnailFromCache() const
         }
         int size = ThumbnailGroup::pixelSize(ThumbnailGroup::Normal);
         image = largeImage.scaled(size, size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+#ifndef QT_NO_IMAGE_TEXT
         Q_FOREACH(const QString& key, largeImage.textKeys()) {
             QString text = largeImage.text(key);
             image.setText(key, text);
         }
+#endif
         sThumbnailWriter->queueThumbnail(mThumbnailPath, image);
     }
 
@@ -440,6 +444,7 @@ void ThumbnailProvider::checkThumbnail()
     LOG("Stat thumb" << mThumbnailPath);
 
     QImage thumb = loadThumbnailFromCache();
+#ifndef QT_NO_IMAGE_TEXT
     KIO::filesize_t fileSize = thumb.text(QLatin1String("Thumb::Size")).toULongLong();
     if (!thumb.isNull()) {
         if (thumb.text(QLatin1String("Thumb::URI")) == mOriginalUri &&
@@ -472,6 +477,7 @@ void ThumbnailProvider::checkThumbnail()
             return;
         }
     }
+#endif
 
     // Thumbnail not found or not valid
     if (MimeTypeUtils::fileItemKind(mCurrentItem) == MimeTypeUtils::KIND_RASTER_IMAGE) {