diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-03 22:37:25 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-03 22:37:25 +0200 |
| commit | 181df199d31a8018cfcfc31b548909fe4b57ccbd (patch) | |
| tree | 76833450e7d545d8345a4f529ef5320f24188c1e /src/gui/image/qicon.h | |
| parent | 52352c6c572f15c10c4c3de641db81723aada468 (diff) | |
remove more QT3_SUPPORT code
Diffstat (limited to 'src/gui/image/qicon.h')
| -rw-r--r-- | src/gui/image/qicon.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/gui/image/qicon.h b/src/gui/image/qicon.h index 170559182b..4e3960925e 100644 --- a/src/gui/image/qicon.h +++ b/src/gui/image/qicon.h @@ -114,21 +114,6 @@ public: static QString themeName(); static void setThemeName(const QString &path); - -#ifdef QT3_SUPPORT - enum Size { Small, Large, Automatic = Small }; - static QT3_SUPPORT void setPixmapSize(Size which, const QSize &size); - static QT3_SUPPORT QSize pixmapSize(Size which); - inline QT3_SUPPORT void reset(const QPixmap &pixmap, Size /*size*/) { *this = QIcon(pixmap); } - inline QT3_SUPPORT void setPixmap(const QPixmap &pixmap, Size, Mode mode = Normal, State state = Off) - { addPixmap(pixmap, mode, state); } - inline QT3_SUPPORT void setPixmap(const QString &fileName, Size, Mode mode = Normal, State state = Off) - { addPixmap(QPixmap(fileName), mode, state); } - QT3_SUPPORT QPixmap pixmap(Size size, Mode mode, State state = Off) const; - QT3_SUPPORT QPixmap pixmap(Size size, bool enabled, State state = Off) const; - QT3_SUPPORT QPixmap pixmap() const; -#endif - Q_DUMMY_COMPARISON_OPERATOR(QIcon) private: @@ -151,10 +136,6 @@ Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QIcon &); Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QIcon &); #endif -#ifdef QT3_SUPPORT -typedef QIcon QIconSet; -#endif - QT_END_NAMESPACE QT_END_HEADER |