From 1cc54642368cfdb1f4dac42afef10b12a825f851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Tue, 12 Jul 2011 13:16:45 +0200
Subject: Deprecate some functions in QImage (that have been obsolete since
 4.1).

Reviewed-by: Olivier Goffart
(cherry picked from commit 5ee3e4964d60f4d9cd7026c6f8b6fb93ddd39588)

Change-Id: Ib536c2b5a2b51ca42ab26129142242f30f6c6759
Reviewed-on: http://codereview.qt.nokia.com/1550
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
---
 src/gui/image/qimage.h | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'src/gui/image')

diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index c783b76b77..57d7169789 100644
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -66,7 +66,8 @@ template <class T> class QVector;
 struct QImageData;
 class QImageDataMisc; // internal
 #ifndef QT_NO_IMAGE_TEXT
-class Q_GUI_EXPORT QImageTextKeyLang {
+#ifdef QT_DEPRECATED
+class Q_GUI_EXPORT QT_DEPRECATED QImageTextKeyLang {
 public:
     QImageTextKeyLang(const char* k, const char* l) : key(k), lang(l) { }
     QImageTextKeyLang() { }
@@ -81,6 +82,7 @@ public:
     inline bool operator!= (const QImageTextKeyLang &other) const
         { return !operator==(other); }
 };
+#endif
 #endif //QT_NO_IMAGE_TEXT
 
 
@@ -275,12 +277,13 @@ public:
     QString text(const QString &key = QString()) const;
     void setText(const QString &key, const QString &value);
 
-    // The following functions are obsolete as of 4.1
-    QString text(const char* key, const char* lang=0) const;
-    QList<QImageTextKeyLang> textList() const;
-    QStringList textLanguages() const;
-    QString text(const QImageTextKeyLang&) const;
-    void setText(const char* key, const char* lang, const QString&);
+#ifdef QT_DEPRECATED
+    QT_DEPRECATED QString text(const char* key, const char* lang=0) const;
+    QT_DEPRECATED QList<QImageTextKeyLang> textList() const;
+    QT_DEPRECATED QStringList textLanguages() const;
+    QT_DEPRECATED QString text(const QImageTextKeyLang&) const;
+    QT_DEPRECATED void setText(const char* key, const char* lang, const QString&);
+#endif
 #endif
 
 #ifdef QT3_SUPPORT
-- 
cgit v1.2.3