diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-01-24 22:26:31 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-31 16:17:55 +0100 |
| commit | 3855233dab82946ba50ddd90ce86df035998da8e (patch) | |
| tree | 908cdc84626a17dde6450810f97859502dcddab3 /src/gui/image/qimage.h | |
| parent | 9a4d30d9995a806ca7c69692992383b28c655054 (diff) | |
Remove many deprecated methods
Remove methods that have been marked as deprecated
before Qt 4.6. Keep others, but inline them
where possible and mark them as QT_DEPRECATED_SINCE(5, 0).
Change-Id: If881821ae095f054b31cc13464f19e2007c20ed7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'src/gui/image/qimage.h')
| -rw-r--r-- | src/gui/image/qimage.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index 55f1e0d379..b805a3297f 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -70,7 +70,7 @@ struct QImageData; class QImageDataMisc; // internal #ifndef QT_NO_IMAGE_TEXT #if QT_DEPRECATED_SINCE(5, 0) -class Q_GUI_EXPORT QImageTextKeyLang { +class QT_DEPRECATED QImageTextKeyLang { public: QImageTextKeyLang(const char* k, const char* l) : key(k), lang(l) { } QImageTextKeyLang() { } @@ -270,11 +270,11 @@ public: void setText(const QString &key, const QString &value); #if QT_DEPRECATED_SINCE(5, 0) - inline QString text(const char* key, const char* lang=0) const; - inline QList<QImageTextKeyLang> textList() const; - inline QStringList textLanguages() const; - inline QString text(const QImageTextKeyLang&) const; - inline void setText(const char* key, const char* lang, const QString&); + QT_DEPRECATED inline QString text(const char* key, const char* lang=0) const; + QT_DEPRECATED inline QList<QImageTextKeyLang> textList() const; + QT_DEPRECATED inline QStringList textLanguages() const; + QT_DEPRECATED inline QString text(const QImageTextKeyLang&) const; + QT_DEPRECATED inline void setText(const char* key, const char* lang, const QString&); #endif #endif @@ -382,6 +382,7 @@ inline void QImage::setText(const char* key, const char* lang, const QString &s) setText(k, s); } #endif + inline int QImage::numColors() const { return colorCount(); |