move all the layouts to their own directory; much more logical and makes it easier to not miss layouts that need changes

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

CMakeLists.txt

@@ -31,6 +31,14 @@ set(plasma_LIB_SRCS
     datacontainer.cpp
     dataengine.cpp
     dataenginemanager.cpp
+    layouts/boxlayout.cpp
+    layouts/borderlayout.cpp
+    layouts/freelayout.cpp
+    layouts/nodelayout.cpp
+    layouts/flowlayout.cpp
+    layouts/layout.cpp
+    layouts/layoutanimator.cpp
+    layouts/layoutitem.cpp
     packages.cpp
     phase.cpp
     plasma.cpp
@@ -44,18 +52,10 @@ set(plasma_LIB_SRCS
     toolbox.cpp
     uiloader.cpp
     view.cpp
-    widgets/boxlayout.cpp
-    widgets/borderlayout.cpp
     widgets/checkbox.cpp
-    widgets/freelayout.cpp
-    widgets/nodelayout.cpp
-    widgets/flowlayout.cpp
     widgets/flash.cpp
     widgets/icon.cpp
     widgets/label.cpp
-    widgets/layout.cpp
-    widgets/layoutanimator.cpp
-    widgets/layoutitem.cpp
     widgets/lineedit.cpp
     widgets/progressbar.cpp
     widgets/pushbutton.cpp
@@ -134,18 +134,9 @@ install(FILES
         DESTINATION ${INCLUDE_INSTALL_DIR}/plasma)
 
 install(FILES
-    widgets/boxlayout.h
-    widgets/borderlayout.h
-    widgets/nodelayout.h
-    widgets/hboxlayout.h
-    widgets/vboxlayout.h
-    widgets/freelayout.h
     widgets/flash.h
     widgets/icon.h
     widgets/label.h
-    widgets/layout.h
-    widgets/layoutanimator.h
-    widgets/layoutitem.h
     widgets/lineedit.h
     widgets/progressbar.h
     widgets/pushbutton.h
@@ -157,6 +148,17 @@ install(FILES
     widgets/meter.h
     DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/widgets)
 
+install(FILES
+    layouts/boxlayout.cpp
+    layouts/borderlayout.cpp
+    layouts/freelayout.cpp
+    layouts/nodelayout.cpp
+    layouts/flowlayout.cpp
+    layouts/layout.cpp
+    layouts/layoutanimator.cpp
+    layouts/layoutitem.cpp
+    DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/layouts)
+
 install(FILES
     includes/AbstractRunner
     includes/Applet

containment.cpp

@@ -42,8 +42,8 @@
 #include "toolbox_p.h"
 #include "svg.h"
 
-#include "widgets/freelayout.h"
-#include "widgets/boxlayout.h"
+#include "layouts/freelayout.h"
+#include "layouts/boxlayout.h"
 #include "widgets/pushbutton.h"
 
 namespace Plasma

corona.cpp

@@ -37,8 +37,7 @@
 #include "containment.h"
 #include "dataengine.h"
 #include "phase.h"
-#include "widgets/freelayout.h"
-#include "widgets/boxlayout.h"
+#include "layouts/layout.h"
 #include "widgets/icon.h"
 
 using namespace Plasma;

layouts/layout.cpp

@@ -26,8 +26,8 @@
 #include <QtCore/QTimeLine>
 #include <QtDebug>
 
-#include "widget.h"
-#include "layoutanimator.h"
+#include "widgets/widget.h"
+#include "layouts/layoutanimator.h"
 
 namespace Plasma
 {
@@ -95,7 +95,7 @@ void Layout::update()
 
 void Layout::invalidate()
 {
-    if (d->relayouting()) {
+    if (d->relayouting) {
         return;
     }
 

layouts/layoutanimator.cpp

@@ -27,8 +27,8 @@
 #include <QtGui/QGraphicsScene>
 #include <QtDebug>
 
-#include "layout.h"
-#include "widget.h"
+#include "layouts/layout.h"
+#include "widgets/widget.h"
 
 using namespace Plasma;
 

uiloader.cpp

@@ -21,9 +21,6 @@
 
 #include <QStringList>
 
-#include "widgets/widget.h"
-#include "widgets/layout.h"
-
 #include "widgets/checkbox.h"
 #include "widgets/flash.h"
 #include "widgets/icon.h"
@@ -33,9 +30,9 @@
 #include "widgets/meter.h"
 //#include "widgets/rectangle.h"
 
-#include "widgets/hboxlayout.h"
-#include "widgets/vboxlayout.h"
-#include "widgets/flowlayout.h"
+#include "layouts/hboxlayout.h"
+#include "layouts/vboxlayout.h"
+#include "layouts/flowlayout.h"
 
 namespace Plasma
 {

widgets/tests/testLayouts.cpp

@@ -10,7 +10,7 @@
 
 #include "../pushbutton.h"
 #include "../lineedit.h"
-#include "../boxlayout.h"
+#include "../../layouts/boxlayout.h"
 #include "../widget.h"
 #include "../label.h"
 

widgets/tests/testProgressBar.cpp

@@ -10,7 +10,7 @@
 #include <KIcon>
 
 
-#include "../boxlayout.h"
+#include "../../layouts/boxlayout.h"
 #include "../widget.h"
 #include "../progressbar.h"
 

widgets/widget.cpp

@@ -33,7 +33,7 @@
 
 #include <KDebug>
 
-#include "freelayout.h"
+#include "layouts/freelayout.h"
 #include "plasma/plasma.h"
 
 namespace Plasma