alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1060136
This commit is contained in:
Aaron J. Seigo 2009-12-08 09:22:51 +00:00
parent df6a9b7a36
commit bc7ac9cd23
5 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

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

18
animations/geo.cpp → animations/geometry.cpp
View File

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

8
animations/geo_p.h → animations/geometry_p.h
View File

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

8
animator.cpp
View File

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

2
animator.h
View File

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