From 1e6aaec27f1694f35beff56cc07fd5cb198932d2 Mon Sep 17 00:00:00 2001 From: "Aaron J. Seigo" Date: Thu, 3 Sep 2009 21:53:56 +0000 Subject: [PATCH] extenders into a subdir svn path=/trunk/KDE/kdelibs/; revision=1019570 --- CMakeLists.txt | 13 +++++++------ applet.cpp | 4 ++-- dialog.cpp | 2 +- extender.cpp => extenders/extender.cpp | 0 extender.h => extenders/extender.h | 0 extendergroup.cpp => extenders/extendergroup.cpp | 0 extendergroup.h => extenders/extendergroup.h | 0 extenderitem.cpp => extenders/extenderitem.cpp | 0 extenderitem.h => extenders/extenderitem.h | 0 popupapplet.cpp | 4 ++-- private/extender_p.h | 2 +- private/extenderapplet.cpp | 4 ++-- private/extenderitemmimedata.cpp | 2 +- 13 files changed, 16 insertions(+), 15 deletions(-) rename extender.cpp => extenders/extender.cpp (100%) rename extender.h => extenders/extender.h (100%) rename extendergroup.cpp => extenders/extendergroup.cpp (100%) rename extendergroup.h => extenders/extendergroup.h (100%) rename extenderitem.cpp => extenders/extenderitem.cpp (100%) rename extenderitem.h => extenders/extenderitem.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 90dd8f2da..0891af963 100644 --- a/CMakeLists.txt +++ b/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 diff --git a/applet.cpp b/applet.cpp index 499a3a126..dc767c326 100644 --- a/applet.cpp +++ b/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" diff --git a/dialog.cpp b/dialog.cpp index 1d37dd76e..87ef66923 100644 --- a/dialog.cpp +++ b/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" diff --git a/extender.cpp b/extenders/extender.cpp similarity index 100% rename from extender.cpp rename to extenders/extender.cpp diff --git a/extender.h b/extenders/extender.h similarity index 100% rename from extender.h rename to extenders/extender.h diff --git a/extendergroup.cpp b/extenders/extendergroup.cpp similarity index 100% rename from extendergroup.cpp rename to extenders/extendergroup.cpp diff --git a/extendergroup.h b/extenders/extendergroup.h similarity index 100% rename from extendergroup.h rename to extenders/extendergroup.h diff --git a/extenderitem.cpp b/extenders/extenderitem.cpp similarity index 100% rename from extenderitem.cpp rename to extenders/extenderitem.cpp diff --git a/extenderitem.h b/extenders/extenderitem.h similarity index 100% rename from extenderitem.h rename to extenders/extenderitem.h diff --git a/popupapplet.cpp b/popupapplet.cpp index 409da7dff..000ce534d 100644 --- a/popupapplet.cpp +++ b/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" diff --git a/private/extender_p.h b/private/extender_p.h index 02a85d3de..917854adf 100644 --- a/private/extender_p.h +++ b/private/extender_p.h @@ -23,7 +23,7 @@ #include #include #include -#include "../extender.h" +#include "plasma/extenders/extender.h" class QGraphicsGridLayout; class QGraphicsLinearLayout; diff --git a/private/extenderapplet.cpp b/private/extenderapplet.cpp index 8f552a372..a9f1df821 100644 --- a/private/extenderapplet.cpp +++ b/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 diff --git a/private/extenderitemmimedata.cpp b/private/extenderitemmimedata.cpp index 639dc3fbd..9b2d87ca3 100644 --- a/private/extenderitemmimedata.cpp +++ b/private/extenderitemmimedata.cpp @@ -19,7 +19,7 @@ #include "extenderitemmimedata_p.h" -#include "../extenderitem.h" +#include "plasma/extenders/extenderitem.h" #include