Changeset 769 for trunk/demos/composition/composition.h

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• demos/composition/composition.h (modified) (4 diffs)

trunk/demos/composition/composition.h

@@ -110 +110 @@
     void paint(QPainter *);
 
-    void mousePressEvent(QMouseEvent *);
-    void mouseMoveEvent(QMouseEvent *);
-    void mouseReleaseEvent(QMouseEvent *);
-
     void setCirclePos(const QPointF &pos);
 
@@ -121 +117 @@
     int circleColor() const { return m_circle_hue; }
     int circleAlpha() const { return m_circle_alpha; }
+
+protected:
+    void mousePressEvent(QMouseEvent *);
+    void mouseMoveEvent(QMouseEvent *);
+    void mouseReleaseEvent(QMouseEvent *);
+    void timerEvent(QTimerEvent *);
 
 public slots:
@@ -151 +153 @@
     void setCircleAlpha(int alpha) { m_circle_alpha = alpha; update(); }
     void setCircleColor(int hue) { m_circle_hue = hue; update(); }
-    void setAnimationEnabled(bool enabled) { m_animation_enabled = enabled; update(); }
+    void setAnimationEnabled(bool enabled);
 
 private:
@@ -178 +180 @@
     ObjectType m_current_object;
     bool m_animation_enabled;
+    int m_animationTimer;
 
 #ifdef QT_OPENGL_SUPPORT