diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
tree | 9981f274712c098cabbff0c4667672a3934e5393 /src/gui/image/qmovie.h | |
parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'src/gui/image/qmovie.h')
-rw-r--r-- | src/gui/image/qmovie.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/gui/image/qmovie.h b/src/gui/image/qmovie.h index f971e11b13..0278957091 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 |