remove more QT3_SUPPORT code

1 files changed, 0 insertions, 94 deletions

diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index cfd837da45..59687c709d 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -1151,100 +1151,6 @@ QDataStream &operator>>(QDataStream &s, QIcon &icon)
 
 #endif //QT_NO_DATASTREAM
 
-
-#ifdef QT3_SUPPORT
-
-static int widths[2] = { 22, 32 };
-static int heights[2] = { 22, 32 };
-
-static QSize pixmapSizeHelper(QIcon::Size which)
-{
-    int i = 0;
-    if (which == QIcon::Large)
-        i = 1;
-    return QSize(widths[i], heights[i]);
-}
-
-/*!
-    \enum QIcon::Size
-    \compat
-
-    \value Small  Use QStyle::pixelMetric(QStyle::PM_SmallIconSize) instead.
-    \value Large  Use QStyle::pixelMetric(QStyle::PM_LargeIconSize) instead.
-    \value Automatic  N/A.
-*/
-
-/*!
-    Use pixmap(QSize(...), \a mode, \a state), where the first
-    argument is an appropriate QSize instead of a \l Size value.
-
-    \sa pixmapSize()
-*/
-QPixmap QIcon::pixmap(Size size, Mode mode, State state) const
-{ return pixmap(pixmapSizeHelper(size), mode, state); }
-
-/*!
-    Use pixmap(QSize(...), mode, \a state), where the first argument
-    is an appropriate QSize instead of a \l Size value, and the
-    second argument is QIcon::Normal or QIcon::Disabled, depending on
-    the value of \a enabled.
-
-    \sa pixmapSize()
-*/
-QPixmap QIcon::pixmap(Size size, bool enabled, State state) const
-{ return pixmap(pixmapSizeHelper(size), enabled ? Normal : Disabled, state); }
-
-/*!
-    Use one of the other pixmap() overloads.
-*/
-QPixmap QIcon::pixmap() const
-{ return pixmap(pixmapSizeHelper(Small), Normal, Off); }
-
-/*!
-    The pixmap() function now takes a QSize instead of a QIcon::Size,
-    so there is no need for this function in new code.
-*/
-void QIcon::setPixmapSize(Size which, const QSize &size)
-{
-    int i = 0;
-    if (which == Large)
-        i = 1;
-    widths[i] = size.width();
-    heights[i] = size.height();
-}
-
-/*!
-    Use QStyle::pixelMetric() with QStyle::PM_SmallIconSize or
-    QStyle::PM_LargeIconSize as the first argument, depending on \a
-    which.
-*/
-QSize QIcon::pixmapSize(Size which)
-{
-    return pixmapSizeHelper(which);
-}
-
-/*!
-    \fn void QIcon::reset(const QPixmap &pixmap, Size size)
-
-    Use the constructor that takes a QPixmap and operator=().
-*/
-
-/*!
-    \fn void QIcon::setPixmap(const QPixmap &pixmap, Size size, Mode mode, State state)
-
-    Use addPixmap(\a pixmap, \a mode, \a state) instead. The \a size
-    parameter is ignored.
-*/
-
-/*!
-    \fn void QIcon::setPixmap(const QString &fileName, Size size, Mode mode, State state)
-
-    Use addFile(\a fileName, \a mode, \a state) instead. The \a size
-    parameter is ignored.
-*/
-
-#endif // QT3_SUPPORT
-
 /*!
     \fn DataPtr &QIcon::data_ptr()
     \internal