diff options
author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-07-01 10:14:29 (GMT) |
---|---|---|
committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-07-01 15:16:10 (GMT) |
commit | d0299745e511640df3e0a26e8c447d0960ac4546 (patch) | |
tree | 860cd92c3dcfbc0fa91337a1e1410c8c35312953 /src/gui/widgets/qwidgetanimator_p.h | |
parent | fef6f4469d4c856abdaaefe1d914c120396ff365 (diff) | |
download | Qt-d0299745e511640df3e0a26e8c447d0960ac4546.zip Qt-d0299745e511640df3e0a26e8c447d0960ac4546.tar.gz Qt-d0299745e511640df3e0a26e8c447d0960ac4546.tar.bz2 |
QMainWindow: cleanup of code in QWidgetAnimator
Diffstat (limited to 'src/gui/widgets/qwidgetanimator_p.h')
-rw-r--r-- | src/gui/widgets/qwidgetanimator_p.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/gui/widgets/qwidgetanimator_p.h b/src/gui/widgets/qwidgetanimator_p.h index 6ee150b..0c68e00 100644 --- a/src/gui/widgets/qwidgetanimator_p.h +++ b/src/gui/widgets/qwidgetanimator_p.h @@ -56,18 +56,18 @@ #include <qobject.h> #include <qrect.h> #include <qmap.h> +#include <qbasictimer.h> +#include <qdatetime.h> QT_BEGIN_NAMESPACE class QWidget; -class QTimer; -class QTime; +class QMainWindowLayout; class QWidgetAnimator : public QObject { - Q_OBJECT public: - QWidgetAnimator(QObject *parent = 0); + QWidgetAnimator(QMainWindowLayout *layout); ~QWidgetAnimator(); void animate(QWidget *widget, const QRect &final_geometry, bool animate); bool animating() const; @@ -75,12 +75,8 @@ public: void abort(QWidget *widget); -signals: - void finished(QWidget *widget); - void finishedAll(); - -private slots: - void animationStep(); +protected: + void timerEvent(QTimerEvent *e); private: struct AnimationItem { @@ -93,8 +89,9 @@ private: }; typedef QMap<QWidget*, AnimationItem> AnimationMap; AnimationMap m_animation_map; - QTimer *m_timer; - QTime *m_time; + QBasicTimer m_timer; + QTime m_time; + QMainWindowLayout *m_mainWindowLayout; }; QT_END_NAMESPACE |