[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Boxygen-gtk/animations=5D_src=3A_Changed_AnimationTy?=
From:       Hugo Pereira Da Costa <hugo () oxygen-icons ! org>
Date:       2011-02-27 10:50:04
Message-ID: 20110227105004.53785A60C9 () git ! kde ! org
[Download RAW message or body]

Git commit ee93d8245954d8091c1722b188a7dec66dc6facf by Hugo Pereira Da Costa.
Committed on 27/02/2011 at 11:00.
Pushed by hpereiradacosta into branch 'animations'.

Changed AnimationType enumeration into WidgetType for code clarity

M  +6    -6    src/animations/oxygenmenubarstatedata.h     
M  +4    -4    src/animations/oxygenmenubarstateengine.h     
M  +6    -6    src/animations/oxygenmenustatedata.h     
M  +4    -4    src/animations/oxygenmenustateengine.h     
M  +6    -6    src/animations/oxygentoolbarstatedata.h     
M  +4    -4    src/animations/oxygentoolbarstateengine.h     
M  +1    -1    src/oxygenanimationmodes.h     

http://commits.kde.org/oxygen-gtk/ee93d8245954d8091c1722b188a7dec66dc6facf

diff --git a/src/animations/oxygenmenubarstatedata.h b/src/animations/oxygenmenubarstatedata.h
index 1d0b479..0046379 100644
--- a/src/animations/oxygenmenubarstatedata.h
+++ b/src/animations/oxygenmenubarstatedata.h
@@ -102,19 +102,19 @@ namespace Oxygen
         { return isAnimated( AnimationCurrent ) || isAnimated( AnimationPrevious ); }
 
         //! true if given animation type is animated
-        bool isAnimated( const AnimationType& type ) const
+        bool isAnimated( const WidgetType& type ) const
         { return data( type )._timeLine.isRunning(); }
 
         //! widget for current animation type
-        GtkWidget* widget( const AnimationType& type ) const
+        GtkWidget* widget( const WidgetType& type ) const
         { return data( type )._widget; }
 
         //! rect for given animation type
-        const GdkRectangle& rectangle( const AnimationType& type ) const
+        const GdkRectangle& rectangle( const WidgetType& type ) const
         { return data( type )._rect; }
 
         //! animation data
-        AnimationData animationData( const AnimationType& type ) const
+        AnimationData animationData( const WidgetType& type ) const
         {
             const Data& data( this->data( type ) );
             return data._timeLine.isRunning() ?
@@ -210,7 +210,7 @@ namespace Oxygen
         };
 
         //! get data for given animation type
-        Data& data( const AnimationType& type )
+        Data& data( const WidgetType& type )
         {
             switch( type )
             {
@@ -221,7 +221,7 @@ namespace Oxygen
         }
 
         //! get data for given animation type
-        const Data& data( const AnimationType& type ) const
+        const Data& data( const WidgetType& type ) const
         {
             switch( type )
             {
diff --git a/src/animations/oxygenmenubarstateengine.h b/src/animations/oxygenmenubarstateengine.h
index 707b873..923b432 100644
--- a/src/animations/oxygenmenubarstateengine.h
+++ b/src/animations/oxygenmenubarstateengine.h
@@ -123,19 +123,19 @@ namespace Oxygen
         { return data().value( widget ).isAnimated(); }
 
         //! true if given animation type is animated
-        bool isAnimated( GtkWidget* widget, const AnimationType& type )
+        bool isAnimated( GtkWidget* widget, const WidgetType& type )
         { return data().value( widget ).isAnimated( type ); }
 
         //! animated widget for given parent and type
-        GtkWidget* widget( GtkWidget* widget, const AnimationType& type )
+        GtkWidget* widget( GtkWidget* widget, const WidgetType& type )
         { return data().value( widget ).widget( type ); }
 
         //! animated rect for given widget and type
-        const GdkRectangle& rectangle( GtkWidget* widget, const AnimationType& type )
+        const GdkRectangle& rectangle( GtkWidget* widget, const WidgetType& type )
         { return data().value( widget ).rectangle( type ); }
 
         //! animation data for given widget and type
-        AnimationData animationData( GtkWidget* widget, const AnimationType& type )
+        AnimationData animationData( GtkWidget* widget, const WidgetType& type )
         { return data().value( widget ).animationData( type ); }
 
         //! returns true if animated rectangle is valid
diff --git a/src/animations/oxygenmenustatedata.h b/src/animations/oxygenmenustatedata.h
index 51aa5f4..73c2f2e 100644
--- a/src/animations/oxygenmenustatedata.h
+++ b/src/animations/oxygenmenustatedata.h
@@ -105,19 +105,19 @@ namespace Oxygen
         { return isAnimated( AnimationCurrent ) || isAnimated( AnimationPrevious ); }
 
         //! true if given animation type is animated
-        bool isAnimated( const AnimationType& type ) const
+        bool isAnimated( const WidgetType& type ) const
         { return data( type )._timeLine.isRunning(); }
 
         //! widget for current animation type
-        GtkWidget* widget( const AnimationType& type ) const
+        GtkWidget* widget( const WidgetType& type ) const
         { return data( type )._widget; }
 
         //! rect for given animation type
-        const GdkRectangle& rectangle( const AnimationType& type ) const
+        const GdkRectangle& rectangle( const WidgetType& type ) const
         { return data( type )._rect; }
 
         //! animation data
-        AnimationData animationData( const AnimationType& type ) const
+        AnimationData animationData( const WidgetType& type ) const
         {
             const Data& data( this->data( type ) );
             return data._timeLine.isRunning() ?
@@ -220,7 +220,7 @@ namespace Oxygen
         };
 
         //! get data for given animation type
-        Data& data( const AnimationType& type )
+        Data& data( const WidgetType& type )
         {
             switch( type )
             {
@@ -231,7 +231,7 @@ namespace Oxygen
         }
 
         //! get data for given animation type
-        const Data& data( const AnimationType& type ) const
+        const Data& data( const WidgetType& type ) const
         {
             switch( type )
             {
diff --git a/src/animations/oxygenmenustateengine.h b/src/animations/oxygenmenustateengine.h
index 0cfec4c..0850669 100644
--- a/src/animations/oxygenmenustateengine.h
+++ b/src/animations/oxygenmenustateengine.h
@@ -123,19 +123,19 @@ namespace Oxygen
         { return data().value( widget ).isAnimated(); }
 
         //! true if given animation type is animated
-        bool isAnimated( GtkWidget* widget, const AnimationType& type )
+        bool isAnimated( GtkWidget* widget, const WidgetType& type )
         { return data().value( widget ).isAnimated( type ); }
 
         //! animated widget for given parent and type
-        GtkWidget* widget( GtkWidget* widget, const AnimationType& type )
+        GtkWidget* widget( GtkWidget* widget, const WidgetType& type )
         { return data().value( widget ).widget( type ); }
 
         //! animated rect for given widget and type
-        const GdkRectangle& rectangle( GtkWidget* widget, const AnimationType& type )
+        const GdkRectangle& rectangle( GtkWidget* widget, const WidgetType& type )
         { return data().value( widget ).rectangle( type ); }
 
         //! animation data for given widget and type
-        AnimationData animationData( GtkWidget* widget, const AnimationType& type )
+        AnimationData animationData( GtkWidget* widget, const WidgetType& type )
         { return data().value( widget ).animationData( type ); }
 
         //! returns true if animated rectangle is valid
diff --git a/src/animations/oxygentoolbarstatedata.h b/src/animations/oxygentoolbarstatedata.h
index d06f035..f63ef84 100644
--- a/src/animations/oxygentoolbarstatedata.h
+++ b/src/animations/oxygentoolbarstatedata.h
@@ -91,19 +91,19 @@ namespace Oxygen
         { return isAnimated( AnimationCurrent ) || isAnimated( AnimationPrevious ); }
 
         //! true if given animation type is animated
-        bool isAnimated( const AnimationType& type ) const
+        bool isAnimated( const WidgetType& type ) const
         { return data( type )._timeLine.isRunning(); }
 
         //! widget matching type
-        GtkWidget* widget( const AnimationType& type ) const
+        GtkWidget* widget( const WidgetType& type ) const
         { return data( type )._widget; }
 
         //! rect for given animation type
-        const GdkRectangle& rectangle( const AnimationType& type ) const
+        const GdkRectangle& rectangle( const WidgetType& type ) const
         { return data( type )._rect; }
 
         //! animation data
-        AnimationData animationData( const AnimationType& type ) const
+        AnimationData animationData( const WidgetType& type ) const
         {
             const Data& data( this->data( type ) );
             return data._timeLine.isRunning() ?
@@ -174,7 +174,7 @@ namespace Oxygen
         };
 
         //! get data for given animation type
-        Data& data( const AnimationType& type )
+        Data& data( const WidgetType& type )
         {
             switch( type )
             {
@@ -185,7 +185,7 @@ namespace Oxygen
         }
 
         //! get data for given animation type
-        const Data& data( const AnimationType& type ) const
+        const Data& data( const WidgetType& type ) const
         {
             switch( type )
             {
diff --git a/src/animations/oxygentoolbarstateengine.h b/src/animations/oxygentoolbarstateengine.h
index cf7e90f..db48414 100644
--- a/src/animations/oxygentoolbarstateengine.h
+++ b/src/animations/oxygentoolbarstateengine.h
@@ -112,19 +112,19 @@ namespace Oxygen
         { return data().value( widget ).isAnimated(); }
 
         //! true if given animation type is animated
-        bool isAnimated( GtkWidget* widget, const AnimationType& type )
+        bool isAnimated( GtkWidget* widget, const WidgetType& type )
         { return data().value( widget ).isAnimated( type ); }
 
         //! widget matching type
-        GtkWidget* widget( GtkWidget* widget, const AnimationType& type )
+        GtkWidget* widget( GtkWidget* widget, const WidgetType& type )
         { return data().value( widget ).widget( type ); }
 
         //! animated rect for given widget and type
-        const GdkRectangle& rectangle( GtkWidget* widget, const AnimationType& type )
+        const GdkRectangle& rectangle( GtkWidget* widget, const WidgetType& type )
         { return data().value( widget ).rectangle( type ); }
 
         //! animation data for given widget and type
-        AnimationData animationData( GtkWidget* widget, const AnimationType& type )
+        AnimationData animationData( GtkWidget* widget, const WidgetType& type )
         { return data().value( widget ).animationData( type ); }
 
         //@}
diff --git a/src/oxygenanimationmodes.h b/src/oxygenanimationmodes.h
index 0bb85e6..1dcf598 100644
--- a/src/oxygenanimationmodes.h
+++ b/src/oxygenanimationmodes.h
@@ -36,7 +36,7 @@ namespace Oxygen
     used for engines that keep track of previously(fade-out) and
     currently (fade-in) animated objects
     */
-    enum AnimationType
+    enum WidgetType
     {
         AnimationCurrent,
         AnimationPrevious

[prev in list] [next in list] [prev in thread] [next in thread]