From 72db181c7c0d3c49c7d9e9b2a602ff115d72d10a Mon Sep 17 00:00:00 2001 From: "Aaron J. Seigo" Date: Fri, 25 Apr 2008 03:23:31 +0000 Subject: [PATCH] Phase -> Animator svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=800875 --- CMakeLists.txt | 6 +++--- animationdriver.h | 2 +- phase.cpp => animator.cpp | 4 ++-- phase.h => animator.h | 0 applethandle_p.h | 2 +- containment.cpp | 2 +- containment.h | 2 +- desktoptoolbox_p.h | 2 +- includes/Animator | 1 + includes/Phase | 1 - paneltoolbox_p.h | 2 +- toolbox_p.h | 2 +- widgets/flash.cpp | 2 +- widgets/icon.cpp | 2 +- widgets/icon.h | 2 +- widgets/icon_p.h | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) rename phase.cpp => animator.cpp (99%) rename phase.h => animator.h (100%) create mode 100644 includes/Animator delete mode 100644 includes/Phase diff --git a/CMakeLists.txt b/CMakeLists.txt index 202906205..05429710a 100644 --- a/CMakeLists.txt +++ b/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 diff --git a/animationdriver.h b/animationdriver.h index 113c497ad..be923a57c 100644 --- a/animationdriver.h +++ b/animationdriver.h @@ -28,7 +28,7 @@ #include #include -#include +#include class QGraphicsItem; diff --git a/phase.cpp b/animator.cpp similarity index 99% rename from phase.cpp rename to animator.cpp index 84ce02e79..6a756ea4c 100644 --- a/phase.cpp +++ b/animator.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "phase.h" +#include "animator.h" #include @@ -644,4 +644,4 @@ void Animator::init() } // namespace Plasma -#include +#include diff --git a/phase.h b/animator.h similarity index 100% rename from phase.h rename to animator.h diff --git a/applethandle_p.h b/applethandle_p.h index e64ef94d9..840cb36f1 100644 --- a/applethandle_p.h +++ b/applethandle_p.h @@ -24,7 +24,7 @@ #include #include -#include "phase.h" +#include "animator.h" #include "svg.h" namespace Plasma diff --git a/containment.cpp b/containment.cpp index ae7e2002c..88e970df4 100644 --- a/containment.cpp +++ b/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" diff --git a/containment.h b/containment.h index 979e1aa99..37bd45f6f 100644 --- a/containment.h +++ b/containment.h @@ -30,7 +30,7 @@ #include #include -#include +#include #include "widgets/icon.h" diff --git a/desktoptoolbox_p.h b/desktoptoolbox_p.h index 585a70bd9..139b60a9e 100644 --- a/desktoptoolbox_p.h +++ b/desktoptoolbox_p.h @@ -29,7 +29,7 @@ #include -#include "phase.h" +#include "animator.h" namespace Plasma { diff --git a/includes/Animator b/includes/Animator new file mode 100644 index 000000000..3be3eaab2 --- /dev/null +++ b/includes/Animator @@ -0,0 +1 @@ +#include "../../plasma/animator.h" diff --git a/includes/Phase b/includes/Phase deleted file mode 100644 index e2c00fa9b..000000000 --- a/includes/Phase +++ /dev/null @@ -1 +0,0 @@ -#include "../../plasma/phase.h" diff --git a/paneltoolbox_p.h b/paneltoolbox_p.h index 8ef07005b..4c14a4ae7 100644 --- a/paneltoolbox_p.h +++ b/paneltoolbox_p.h @@ -29,7 +29,7 @@ #include -#include "phase.h" +#include "animator.h" namespace Plasma { diff --git a/toolbox_p.h b/toolbox_p.h index 3a03fa818..9f6834bfc 100644 --- a/toolbox_p.h +++ b/toolbox_p.h @@ -24,7 +24,7 @@ #include #include -#include "phase.h" +#include "animator.h" namespace Plasma { diff --git a/widgets/flash.cpp b/widgets/flash.cpp index 6ba99fe29..ee026d3b5 100644 --- a/widgets/flash.cpp +++ b/widgets/flash.cpp @@ -30,7 +30,7 @@ #include -#include +#include using namespace Plasma; diff --git a/widgets/icon.cpp b/widgets/icon.cpp index c52abf6a2..29523b5f1 100644 --- a/widgets/icon.cpp +++ b/widgets/icon.cpp @@ -52,7 +52,7 @@ #include -#include "phase.h" +#include "animator.h" #include "svg.h" namespace Plasma diff --git a/widgets/icon.h b/widgets/icon.h index 8ea20c6a8..e14662b8c 100644 --- a/widgets/icon.h +++ b/widgets/icon.h @@ -29,7 +29,7 @@ #include #include -#include +#include #include class QAction; diff --git a/widgets/icon_p.h b/widgets/icon_p.h index 65dd89e2f..0bc983327 100644 --- a/widgets/icon_p.h +++ b/widgets/icon_p.h @@ -33,7 +33,7 @@ #include #include "icon.h" -#include "phase.h" +#include "animator.h" class QAction; class QPainter;