From bc7ac9cd23baa98e53271364ca533cfcff916ddf Mon Sep 17 00:00:00 2001 From: "Aaron J. Seigo" Date: Tue, 8 Dec 2009 09:22:51 +0000 Subject: [PATCH] geo -> geometry (let's not be lazy :) svn path=/trunk/KDE/kdelibs/; revision=1060136 --- CMakeLists.txt | 2 +- animations/{geo.cpp => geometry.cpp} | 18 +++++++++--------- animations/{geo_p.h => geometry_p.h} | 8 ++++---- animator.cpp | 8 +++++--- animator.h | 2 +- 5 files changed, 20 insertions(+), 18 deletions(-) rename animations/{geo.cpp => geometry.cpp} (80%) rename animations/{geo_p.h => geometry_p.h} (90%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a0fb4537..6c181c58f 100644 --- a/CMakeLists.txt +++ b/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 diff --git a/animations/geo.cpp b/animations/geometry.cpp similarity index 80% rename from animations/geo.cpp rename to animations/geometry.cpp index 168f664f6..32d49de30 100644 --- a/animations/geo.cpp +++ b/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 @@ -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) { diff --git a/animations/geo_p.h b/animations/geometry_p.h similarity index 90% rename from animations/geo_p.h rename to animations/geometry_p.h index 99152f12c..5287fa4ab 100644 --- a/animations/geo_p.h +++ b/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 &); diff --git a/animator.cpp b/animator.cpp index 15f212db8..0b8e6d9bc 100644 --- a/animator.cpp +++ b/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; diff --git a/animator.h b/animator.h index 4845e740c..d0280b972 100644 --- a/animator.h +++ b/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 /*<