Changeset 561 for trunk/src/gui/widgets/qwidgetanimator_p.h

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/widgets/qwidgetanimator_p.h (modified) (6 diffs)

trunk/src/gui/widgets/qwidgetanimator_p.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -55 +55 @@
 
 #include <qobject.h>
-#include <qrect.h>
 #include <qmap.h>
 
@@ -61 +60 @@
 
 class QWidget;
-class QTimer;
-class QTime;
+class QMainWindowLayout;
+class QPropertyAnimation;
+class QRect;
 
 class QWidgetAnimator : public QObject
@@ -68 +68 @@
     Q_OBJECT
 public:
-    QWidgetAnimator(QObject *parent = 0);
-    ~QWidgetAnimator();
+    QWidgetAnimator(QMainWindowLayout *layout);
     void animate(QWidget *widget, const QRect &final_geometry, bool animate);
     bool animating() const;
-    bool animating(QWidget *widget);
 
     void abort(QWidget *widget);
 
-signals:
-    void finished(QWidget *widget);
-    void finishedAll();
-
-private slots:
-    void animationStep();
+#ifndef QT_NO_ANIMATION
+private Q_SLOTS:
+    void animationFinished();
+#endif
 
 private:
-    struct AnimationItem {
-        AnimationItem(QWidget *_widget = 0, const QRect &_r1 = QRect(),
-                        const QRect &_r2 = QRect())
-            : widget(_widget), r1(_r1), r2(_r2), step(0) {}
-        QWidget *widget;
-        QRect r1, r2;
-        int step;
-    };
-    typedef QMap<QWidget*, AnimationItem> AnimationMap;
+    typedef QMap<QWidget*, QPropertyAnimation*> AnimationMap;
     AnimationMap m_animation_map;
-    QTimer *m_timer;
-    QTime *m_time;
+    QMainWindowLayout *m_mainWindowLayout;
 };