Phase -> Animator

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=800875

CMakeLists.txt

@@ -19,6 +19,7 @@ set(plasma_LIB_SRCS
     ${plasmagik_SRCS}
     abstractrunner.cpp
     animationdriver.cpp
+    animator.cpp
     applet.cpp
     appletbrowser.cpp
     appletbrowser/customdragtreeview.cpp
@@ -38,7 +39,6 @@ set(plasma_LIB_SRCS
     #FOR FUTURE
     #layouts/borderlayout.cpp
     packages.cpp
-    phase.cpp
     plasma.cpp
     plasma_export.h
     searchmatch.cpp
@@ -100,6 +100,7 @@ install(FILES ${plasmagik_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/)
 set(plasma_LIB_INCLUDES
     abstractrunner.h
     animationdriver.h
+    animator.h
     applet.h
     appletbrowser.h
     configxml.h
@@ -109,7 +110,6 @@ set(plasma_LIB_INCLUDES
     dataengine.h
     dataenginemanager.h
     dialog.h
-    phase.h
     plasma.h
     plasma_export.h
     searchmatch.h
@@ -155,13 +155,13 @@ install(FILES
 install(FILES
     includes/AbstractRunner
     includes/AnimationDriver
+    includes/Animator
     includes/Applet
     includes/AppletBrowser
     includes/ConfigXml
     includes/Corona
     includes/Containment
     includes/Dialog
-    includes/Phase
     includes/Plasma
     includes/Package
     includes/PackageStructure

animationdriver.h

@@ -28,7 +28,7 @@
 #include <kgenericfactory.h>
 
 #include <plasma/plasma_export.h>
-#include <plasma/phase.h>
+#include <plasma/animator.h>
 
 class QGraphicsItem;
 

animator.cpp

@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "phase.h"
+#include "animator.h"
 
 #include <QGraphicsItem>
 
@@ -644,4 +644,4 @@ void Animator::init()
 
 } // namespace Plasma
 
-#include <phase.moc>
+#include <animator.moc>

applethandle_p.h

@@ -24,7 +24,7 @@
 #include <QtGui/QGraphicsItem>
 #include <QTimer>
 
-#include "phase.h"
+#include "animator.h"
 #include "svg.h"
 
 namespace Plasma

containment.cpp

@@ -43,7 +43,7 @@
 
 #include "applethandle_p.h"
 #include "corona.h"
-#include "phase.h"
+#include "animator.h"
 #include "desktoptoolbox_p.h"
 #include "paneltoolbox_p.h"
 #include "svg.h"

containment.h

@@ -30,7 +30,7 @@
 #include <kgenericfactory.h>
 
 #include <plasma/applet.h>
-#include <plasma/phase.h>
+#include <plasma/animator.h>
 
 #include "widgets/icon.h"
 

desktoptoolbox_p.h

@@ -29,7 +29,7 @@
 
 #include <plasma/toolbox_p.h>
 
-#include "phase.h"
+#include "animator.h"
 
 namespace Plasma
 {

includes/Animator

@@ -0,0 +1 @@
+#include "../../plasma/animator.h"

includes/Phase

@@ -1 +0,0 @@
-#include "../../plasma/phase.h"

paneltoolbox_p.h

@@ -29,7 +29,7 @@
 
 #include <plasma/toolbox_p.h>
 
-#include "phase.h"
+#include "animator.h"
 
 namespace Plasma
 {

toolbox_p.h

@@ -24,7 +24,7 @@
 #include <QGraphicsItem>
 #include <QObject>
 
-#include "phase.h"
+#include "animator.h"
 
 namespace Plasma
 {

widgets/flash.cpp

@@ -30,7 +30,7 @@
 
 #include <KDebug>
 
-#include <plasma/phase.h>
+#include <plasma/animator.h>
 
 using namespace Plasma;
 

widgets/icon.cpp

@@ -52,7 +52,7 @@
 
 #include <plasma/theme.h>
 
-#include "phase.h"
+#include "animator.h"
 #include "svg.h"
 
 namespace Plasma

widgets/icon.h

@@ -29,7 +29,7 @@
 #include <QGraphicsWidget>
 
 #include <plasma/dataengine.h>
-#include <plasma/phase.h>
+#include <plasma/animator.h>
 #include <plasma/plasma_export.h>
 
 class QAction;

widgets/icon_p.h

@@ -33,7 +33,7 @@
 #include <plasma/svg.h>
 
 #include "icon.h"
-#include "phase.h"
+#include "animator.h"
 
 class QAction;
 class QPainter;