Moving choosecolorwidget and colorpickerwidget in the widget folder.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c784aafcc3dc15edca7bddd6f99954387b9a378c..30328c9a28971396e24d27268fd4025a75eb7b07 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -113,14 +113,12 @@ list(APPEND kdenlive_SRCS
   abstractgroupitem.cpp
   abstractmonitor.cpp
   archivewidget.cpp
-  choosecolorwidget.cpp
   clipdurationdialog.cpp
   clipitem.cpp
   clipmanager.cpp
   clipproperties.cpp
   cliptranscode.cpp
   clipstabilize.cpp
-  colorpickerwidget.cpp
   colorplaneexport.cpp
   colortools.cpp
   complexparameter.cpp

diff --git a/src/effectstack/parametercontainer.cpp b/src/effectstack/parametercontainer.cpp
index 6bc33844ae54d962795a7b2c964c197fd48f4d76..3b86c721932a6a15718ffbf2bcda99cbfc630010 100644 (file)
--- a/src/effectstack/parametercontainer.cpp
+++ b/src/effectstack/parametercontainer.cpp
@@ -28,7 +28,7 @@
 #include "positionedit.h"
 #include "kis_curve_widget.h"
 #include "kis_cubic_curve.h"
-#include "choosecolorwidget.h"
+#include "widgets/choosecolorwidget.h"
 #include "geometrywidget.h"
 #include "colortools.h"
 #include "doubleparameterwidget.h"

diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index 1f649ee10225caad9dae5769dfd41001d5e90dc6..1272b2031b2a38b566eafdbda210e535abd9d772 100644 (file)
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -1,6 +1,8 @@
 set(kdenlive_SRCS
   ${kdenlive_SRCS}
   widgets/invaliddialog.cpp
+  widgets/choosecolorwidget.cpp
+  widgets/colorpickerwidget.cpp
   PARENT_SCOPE
 )
 

diff --git a/src/choosecolorwidget.cpp b/src/widgets/choosecolorwidget.cpp
similarity index 98%
rename from src/choosecolorwidget.cpp
rename to src/widgets/choosecolorwidget.cpp
index f8b8d3024b7050e30d4883316808a8948ae64a9b..317ecac748d7198092c346616739e3e486fc038c 100644 (file)
--- a/src/choosecolorwidget.cpp
+++ b/src/widgets/choosecolorwidget.cpp
@@ -18,8 +18,8 @@
  ***************************************************************************/
 
 
-#include "choosecolorwidget.h"
-#include "colorpickerwidget.h"
+#include "widgets/choosecolorwidget.h"
+#include "widgets/colorpickerwidget.h"
 
 #include <QLabel>
 #include <QHBoxLayout>

diff --git a/src/choosecolorwidget.h b/src/widgets/choosecolorwidget.h
similarity index 100%
rename from src/choosecolorwidget.h
rename to src/widgets/choosecolorwidget.h

diff --git a/src/colorpickerwidget.cpp b/src/widgets/colorpickerwidget.cpp
similarity index 100%
rename from src/colorpickerwidget.cpp
rename to src/widgets/colorpickerwidget.cpp

diff --git a/src/colorpickerwidget.h b/src/widgets/colorpickerwidget.h
similarity index 100%
rename from src/colorpickerwidget.h
rename to src/widgets/colorpickerwidget.h