From 17ebedf5fc640abbe7af9ffc97bb62404a7eefdd Mon Sep 17 00:00:00 2001
From: Konstantin Ritt <ritt.ks@gmail.com>
Date: Tue, 24 Apr 2012 18:38:57 +0300
Subject: get rid of QT_NO_IMAGE_TEXT switcher

Change-Id: Ie72f907ffb959f629af6a414959348a992c4c941
Reviewed-by: aavit <qt_aavit@ovi.com>
---
 src/gui/image/qimage.cpp | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'src/gui/image/qimage.cpp')

diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 9770aca9e5..b8ec7de851 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -1127,9 +1127,7 @@ QImage QImage::copy(const QRect& r) const
         image.d->dpmy = d->dpmy;
         image.d->offset = d->offset;
         image.d->has_alpha_clut = d->has_alpha_clut;
-#ifndef QT_NO_IMAGE_TEXT
         image.d->text = d->text;
-#endif
         return image;
     }
 
@@ -1219,9 +1217,7 @@ QImage QImage::copy(const QRect& r) const
     image.d->dpmy = dotsPerMeterY();
     image.d->offset = offset();
     image.d->has_alpha_clut = d->has_alpha_clut;
-#ifndef QT_NO_IMAGE_TEXT
     image.d->text = d->text;
-#endif
     return image;
 }
 
@@ -3350,9 +3346,7 @@ QImage QImage::convertToFormat(Format format, Qt::ImageConversionFlags flags) co
         image.setDotsPerMeterY(dotsPerMeterY());
         image.setDotsPerMeterX(dotsPerMeterX());
 
-#if !defined(QT_NO_IMAGE_TEXT)
         image.d->text = d->text;
-#endif // !QT_NO_IMAGE_TEXT
 
         converter(image.d, d, flags);
         return image;
@@ -3399,14 +3393,12 @@ static QImage convertWithPalette(const QImage &src, QImage::Format format,
     QImage dest(src.size(), format);
     dest.setColorTable(clut);
 
-#if !defined(QT_NO_IMAGE_TEXT)
     QString textsKeys = src.text();
     QStringList textKeyList = textsKeys.split(QLatin1Char('\n'), QString::SkipEmptyParts);
     foreach (const QString &textKey, textKeyList) {
         QStringList textKeySplitted = textKey.split(QLatin1String(": "));
         dest.setText(textKeySplitted[0], textKeySplitted[1]);
     }
-#endif // !QT_NO_IMAGE_TEXT
 
     int h = src.height();
     int w = src.width();
@@ -3474,9 +3466,7 @@ QImage QImage::convertToFormat(Format format, const QVector<QRgb> &colorTable, Q
     QImage image(d->width, d->height, format);
     QIMAGE_SANITYCHECK_MEMORY(image);
 
-#if !defined(QT_NO_IMAGE_TEXT)
-        image.d->text = d->text;
-#endif // !QT_NO_IMAGE_TEXT
+    image.d->text = d->text;
 
     converter(image.d, d, flags);
     return image;
@@ -4756,7 +4746,6 @@ void QImage::setOffset(const QPoint& p)
     if (d)
         d->offset = p;
 }
-#ifndef QT_NO_IMAGE_TEXT
 
 /*!
     Returns the text keys for this image.
@@ -4879,8 +4868,6 @@ void QImage::setText(const QString &key, const QString &value)
     \endomit
 */
 
-#endif // QT_NO_IMAGE_TEXT
-
 /*
     Sets the image bits to the \a pixmap contents and returns a
     reference to the image.
-- 
cgit v1.2.3