extenders into a subdir

svn path=/trunk/KDE/kdelibs/; revision=1019570

CMakeLists.txt

@@ -6,6 +6,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ${CMAKE_BINARY_DIR}/solid/
                     ${CMAKE_SOURCE_DIR}/solid/
                     ${CMAKE_SOURCE_DIR}/threadweaver/
+                    ${CMAKE_SOURCE_DIR}/plasma/extenders
                     ${CMAKE_SOURCE_DIR}/plasma/remote
                     ${CMAKE_SOURCE_DIR}/plasma/runners
                     ${CMAKE_SOURCE_DIR}/plasma/private/qtjolie-branch/qtjolie
@@ -52,9 +53,9 @@ set(plasma_LIB_SRCS
     dataenginemanager.cpp
     delegate.cpp
     dialog.cpp
-    extender.cpp
-    extendergroup.cpp
-    extenderitem.cpp
+    extenders/extender.cpp
+    extenders/extendergroup.cpp
+    extenders/extenderitem.cpp
     paintutils.cpp
     framesvg.cpp
     plasma.cpp
@@ -235,9 +236,9 @@ set(plasma_LIB_INCLUDES
     dataenginemanager.h
     delegate.h
     dialog.h
-    extender.h
-    extendergroup.h
-    extenderitem.h
+    extenders/extender.h
+    extenders/extendergroup.h
+    extenders/extenderitem.h
     paintutils.h
     windoweffects.h
     framesvg.h

applet.cpp

@@ -68,8 +68,8 @@
 #include "containment.h"
 #include "corona.h"
 #include "dataenginemanager.h"
-#include "extender.h"
-#include "extenderitem.h"
+#include "extenders/extender.h"
+#include "extenders/extenderitem.h"
 #include "package.h"
 #include "plasma.h"
 #include "scripting/appletscript.h"

dialog.cpp

@@ -45,7 +45,7 @@
 
 #include "plasma/applet.h"
 #include "plasma/animator.h"
-#include "plasma/extender.h"
+#include "plasma/extenders/extender.h"
 #include "plasma/private/extender_p.h"
 #include "plasma/framesvg.h"
 #include "plasma/theme.h"

popupapplet.cpp

@@ -42,8 +42,8 @@
 #include "plasma/corona.h"
 #include "plasma/containment.h"
 #include "plasma/dialog.h"
-#include "plasma/extender.h"
-#include "plasma/extenderitem.h"
+#include "plasma/extenders/extender.h"
+#include "plasma/extenders/extenderitem.h"
 #include "plasma/tooltipmanager.h"
 #include "plasma/widgets/iconwidget.h"
 

private/extender_p.h

@@ -23,7 +23,7 @@
 #include <QString>
 #include <QList>
 #include <QPointF>
-#include "../extender.h"
+#include "plasma/extenders/extender.h"
 
 class QGraphicsGridLayout;
 class QGraphicsLinearLayout;

private/extenderapplet.cpp

@@ -19,8 +19,8 @@
 
 #include "extenderapplet_p.h"
 
-#include "../extender.h"
-#include "../extenderitem.h"
+#include "plasma/extenders/extender.h"
+#include "plasma/extenders/extenderitem.h"
 
 #include <QGraphicsLinearLayout>
 

private/extenderitemmimedata.cpp

@@ -19,7 +19,7 @@
 
 #include "extenderitemmimedata_p.h"
 
-#include "../extenderitem.h"
+#include "plasma/extenders/extenderitem.h"
 
 #include <QMimeData>