From 8d7da28432a5274577fa90a2ccf9cd9551159e9d Mon Sep 17 00:00:00 2001
From: Jean-Nicolas Artaud <jeannicolasartaud@gmail.com>
Date: Sun, 12 Jan 2014 12:48:04 +0100
Subject: [PATCH] Moving choosecolorwidget and colorpickerwidget in the widget
 folder.

---
 src/CMakeLists.txt                      | 2 --
 src/effectstack/parametercontainer.cpp  | 2 +-
 src/widgets/CMakeLists.txt              | 2 ++
 src/{ => widgets}/choosecolorwidget.cpp | 4 ++--
 src/{ => widgets}/choosecolorwidget.h   | 0
 src/{ => widgets}/colorpickerwidget.cpp | 0
 src/{ => widgets}/colorpickerwidget.h   | 0
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename src/{ => widgets}/choosecolorwidget.cpp (98%)
 rename src/{ => widgets}/choosecolorwidget.h (100%)
 rename src/{ => widgets}/colorpickerwidget.cpp (100%)
 rename src/{ => widgets}/colorpickerwidget.h (100%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c784aafc..30328c9a 100644
--- 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 6bc33844..3b86c721 100644
--- 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 1f649ee1..1272b203 100644
--- 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 f8b8d302..317ecac7 100644
--- 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
-- 
2.39.2