summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qmovie.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2011-05-03 22:37:25 +0200
committerLars Knoll <lars.knoll@nokia.com>2011-05-03 22:37:25 +0200
commit181df199d31a8018cfcfc31b548909fe4b57ccbd (patch)
tree76833450e7d545d8345a4f529ef5320f24188c1e /src/gui/image/qmovie.h
parent52352c6c572f15c10c4c3de641db81723aada468 (diff)
remove more QT3_SUPPORT code
Diffstat (limited to 'src/gui/image/qmovie.h')
-rw-r--r--src/gui/image/qmovie.h20
1 files changed, 0 insertions, 20 deletions
diff --git a/src/gui/image/qmovie.h b/src/gui/image/qmovie.h
index b64df29c41..98fcf68ee6 100644
--- a/src/gui/image/qmovie.h
+++ b/src/gui/image/qmovie.h
@@ -51,11 +51,6 @@
#include <QtCore/qobject.h>
#include <QtGui/qimagereader.h>
-#ifdef QT3_SUPPORT
-#include <QtGui/qimage.h>
-#include <QtGui/qpixmap.h>
-#endif
-
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
@@ -151,21 +146,6 @@ public Q_SLOTS:
private:
Q_DISABLE_COPY(QMovie)
Q_PRIVATE_SLOT(d_func(), void _q_loadNextFrame())
-
-#ifdef QT3_SUPPORT
-public:
- inline QT3_SUPPORT bool isNull() const { return isValid(); }
- inline QT3_SUPPORT int frameNumber() const { return currentFrameNumber(); }
- inline QT3_SUPPORT bool running() const { return state() == Running; }
- inline QT3_SUPPORT bool paused() const { return state() == Paused; }
- inline QT3_SUPPORT bool finished() const { return state() == NotRunning; }
- inline QT3_SUPPORT void restart() { stop(); start(); }
- inline QT3_SUPPORT QImage frameImage() const { return currentImage(); }
- inline QT3_SUPPORT QPixmap framePixmap() const { return currentPixmap(); }
- inline QT3_SUPPORT void step() { jumpToNextFrame(); }
- inline QT3_SUPPORT void pause() { setPaused(true); }
- inline QT3_SUPPORT void unpause() { setPaused(false); }
-#endif
};
QT_END_NAMESPACE