geo -> geometry (let's not be lazy :)

svn path=/trunk/KDE/kdelibs/; revision=1060136

CMakeLists.txt

@@ -52,7 +52,7 @@ set(plasma_LIB_SRCS
     animations/rotation.cpp
     animations/rotationstacked.cpp
     animations/stackedlayout.cpp
-    animations/geo.cpp
+    animations/geometry.cpp
     animations/zoom.cpp
     applet.cpp
     configloader.cpp

animations/geometry.cpp

@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "geo_p.h"
+#include "geometry_p.h"
 
 #include <QRect>
 
@@ -26,37 +26,37 @@
 namespace Plasma
 {
 
-GeoAnimation::GeoAnimation(QObject *parent)
+GeometryAnimation::GeometryAnimation(QObject *parent)
              : Animation(parent),
              m_startGeometry(-1, -1, -1, -1)
 {
 }
 
-GeoAnimation::~GeoAnimation()
+GeometryAnimation::~GeometryAnimation()
 {
 }
 
-void GeoAnimation::setStartGeometry(const QRectF &geometry)
+void GeometryAnimation::setStartGeometry(const QRectF &geometry)
 {
     m_startGeometry = geometry;
 }
 
-QRectF GeoAnimation::startGeometry() const
+QRectF GeometryAnimation::startGeometry() const
 {
     return m_startGeometry;
 }
 
-void GeoAnimation::setTargetGeometry(const QRectF &geometry)
+void GeometryAnimation::setTargetGeometry(const QRectF &geometry)
 {
     m_targetGeometry = geometry;
 }
 
-QRectF GeoAnimation::targetGeometry() const
+QRectF GeometryAnimation::targetGeometry() const
 {
     return m_targetGeometry;
 }
 
-void GeoAnimation::updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState)
+void GeometryAnimation::updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState)
 {
     QGraphicsWidget *w = widgetToAnimate();
     if (!w) {
@@ -74,7 +74,7 @@ void GeoAnimation::updateState(QAbstractAnimation::State newState, QAbstractAnim
     }
 }
 
-void GeoAnimation::updateCurrentTime(int currentTime)
+void GeometryAnimation::updateCurrentTime(int currentTime)
 {
     QGraphicsWidget *w = widgetToAnimate();
     if (w) {

animations/geometry_p.h

@@ -31,19 +31,19 @@ namespace Plasma
 {
 
 /**
- * @class GeoAnimation plasma/animations/geo_p.h
+ * @class GeometryAnimation plasma/animations/geo_p.h
  * @short Geometry Animation
  *
  */
-class GeoAnimation : public Animation
+class GeometryAnimation : public Animation
 {
     Q_OBJECT
     Q_PROPERTY(QRectF startGeometry READ startGeometry WRITE setStartGeometry)
     Q_PROPERTY(QRectF targetGeometry READ targetGeometry WRITE setTargetGeometry)
 
 public:
-    GeoAnimation(QObject *parent = 0);
-    virtual ~GeoAnimation();
+    GeometryAnimation(QObject *parent = 0);
+    virtual ~GeometryAnimation();
 
     QRectF startGeometry() const;
     void setStartGeometry(const QRectF &);

animator.cpp

@@ -29,7 +29,7 @@
 #include "animations/rotation_p.h"
 #include "animations/slide_p.h"
 #include "animations/rotationstacked_p.h"
-#include "animations/geo_p.h"
+#include "animations/geometry_p.h"
 #include "animations/zoom_p.h"
 
 namespace Plasma
@@ -64,9 +64,11 @@ Plasma::Animation* Animator::create(Animator::Animation type, QObject *parent)
     case SlideAnimation:
         result = new Plasma::SlideAnimation;
         break;
-    case GeoAnimation:
-        result = new Plasma::GeoAnimation;
+
+    case GeometryAnimation:
+        result = new Plasma::GeometryAnimation;
         break;
+
     case ZoomAnimation:
         result = new Plasma::ZoomAnimation;
         break;

animator.h

@@ -63,7 +63,7 @@ public:
         RotationAnimation, /*<< Rotate an animated object */
         RotationStackedAnimation, /*<< for flipping one object with another */
         SlideAnimation, /*<< Move the position of animated object */
-        GeoAnimation, /*<< Geometry animation*/
+        GeometryAnimation, /*<< Geometry animation*/
         ZoomAnimation /*<<Zoom animation */
     };