From 358a456a9d671892ef35f9b839d541f64f0bb816 Mon Sep 17 00:00:00 2001 From: "Aaron J. Seigo" Date: Fri, 4 Dec 2009 19:16:46 +0000 Subject: [PATCH] no need for pause now that Plasma::Animator isn't a factory for QAbAnim but IsA QAbAnim (with Plasma::Animator being the only factory) svn path=/trunk/KDE/kdelibs/; revision=1058597 --- CMakeLists.txt | 1 - animations/pause.cpp | 37 -------------------------------- animations/pause_p.h | 51 -------------------------------------------- animator.cpp | 5 ----- animator.h | 3 +-- 5 files changed, 1 insertion(+), 96 deletions(-) delete mode 100644 animations/pause.cpp delete mode 100644 animations/pause_p.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 325169633..144cb6df0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,7 +49,6 @@ set(plasma_LIB_SRCS animations/fade.cpp animations/grow.cpp animations/slide.cpp - animations/pause.cpp animations/pulser.cpp animations/rotation.cpp animations/rotationstacked.cpp diff --git a/animations/pause.cpp b/animations/pause.cpp deleted file mode 100644 index 68a2523bf..000000000 --- a/animations/pause.cpp +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2009 Aaron Seigo - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details - * - * You should have received a copy of the GNU Library General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include "pause_p.h" - -#include - -namespace Plasma -{ - -PauseAnimation::PauseAnimation(QObject *parent) - : Animation(parent) -{ -} - -void PauseAnimation::updateCurrentTime(int) -{ -} - -} //namespace Plasma - diff --git a/animations/pause_p.h b/animations/pause_p.h deleted file mode 100644 index d9b241030..000000000 --- a/animations/pause_p.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2009 Aaron J. Seigo - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details - * - * You should have received a copy of the GNU Library General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -/** - * @file This file contains the definition for the Expand effect. - */ - -#ifndef PLASMA_ANIMATIONS_PAUSE_H -#define PLASMA_ANIMATIONS_PAUSE_H - -#include -#include -class QPauseAnimation; - -namespace Plasma -{ - -/** - * @class PauseAnimation - * @short Provides a pause in animations - */ -class PauseAnimation : public Animation -{ - Q_OBJECT - -public: - PauseAnimation(QObject *parent = 0); - -protected: - void updateCurrentTime(int msecs); -}; - -} - -#endif diff --git a/animator.cpp b/animator.cpp index 78c62140e..e61654c7e 100644 --- a/animator.cpp +++ b/animator.cpp @@ -25,7 +25,6 @@ #include "animations/animation.h" #include "animations/fade_p.h" #include "animations/grow_p.h" -#include "animations/pause_p.h" #include "animations/pulser_p.h" #include "animations/rotation_p.h" #include "animations/slide_p.h" @@ -64,10 +63,6 @@ Plasma::Animation* Animator::create(Animator::Animation type, QObject *parent) result = new Plasma::SlideAnimation; break; - case PauseAnimation: - result = new Plasma::PauseAnimation; - break; - default: kDebug() << "Unsupported animation type."; diff --git a/animator.h b/animator.h index b3b4e8204..b943f9e21 100644 --- a/animator.h +++ b/animator.h @@ -62,8 +62,7 @@ public: PulseAnimation, /*<< Pulse animated object (opacity/geometry/scale) */ RotationAnimation, /*<< Rotate an animated object */ RotationStackedAnimation, /*<< TODO: for flipping one object with another */ - SlideAnimation, /*<< Move the position of animated object */ - PauseAnimation /*<< Pulse animated object (opacity/geometry/scale) */ + SlideAnimation /*<< Move the position of animated object */ }; enum CurveShape {