* cleanup includes for external usage

* include KGenericFactory so subclasses don't have to
* move the plugin macro to Animator where it belongs

svn path=/trunk/KDE/kdebase/workspace/lib/plasma/; revision=673394

animator.h

@@ -23,7 +23,9 @@
 #include <QRegion>
 #include <QStringList>
 
-#include <plasma_export.h>
+#include <KGenericFactory>
+
+#include <plasma/plasma_export.h>
 
 class QGraphicsItem;
 
@@ -55,4 +57,9 @@ public:
 
 } // Plasma namespace
 
+#define K_EXPORT_PLASMA_ANIMATOR(libname, classname) \
+        K_EXPORT_COMPONENT_FACTORY(                \
+                        plasma_animator_##libname,   \
+                        KGenericFactory<classname>("plasma_animator_" #libname))
+
 #endif // multiple inclusion guard

phase.h

@@ -22,7 +22,7 @@
 #include <QImage>
 #include <QObject>
 
-#include <plasma_export.h>
+#include <plasma/plasma_export.h>
 
 class QGraphicsItem;
 
@@ -82,11 +82,5 @@ private:
 
 } // namespace Plasma
 
-#define K_EXPORT_PLASMA_PHASER(libname, classname) \
-        K_EXPORT_COMPONENT_FACTORY(                \
-                        plasma_animator_##libname,   \
-                        KGenericFactory<classname>("plasma_animator_" #libname))
-
 #endif
 
-