Moves AbstractMonitor into widgets folder.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ad661ad6bf46a7fc519647fd5e8eefa9971c14b7..5a0098fa9cda86157cb875a5efcfa9629ef07807 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -111,7 +111,6 @@ list(APPEND kdenlive_SRCS
   KoSliderCombo.cpp
   abstractclipitem.cpp
   abstractgroupitem.cpp
-  abstractmonitor.cpp
   clipdurationdialog.cpp
   clipitem.cpp
   clipmanager.cpp

diff --git a/src/mltdevicecapture.h b/src/mltdevicecapture.h
index ea7291c9acc358faa069c0edcdf5ebdf4f76b75a..c811be876ef4409ff3cf88cb1a53bfb68d855867 100644 (file)
--- a/src/mltdevicecapture.h
+++ b/src/mltdevicecapture.h
@@ -25,7 +25,7 @@
 
 #include "gentime.h"
 #include "definitions.h"
-#include "abstractmonitor.h"
+#include "widgets/abstractmonitor.h"
 
 #include <mlt/framework/mlt_types.h>
 

diff --git a/src/monitor.h b/src/monitor.h
index e65f2ec98469e30172eb9de3358a55e305d939dc..1d7b54cb3fa5e0d4252a6eca2cce2090706f029c 100644 (file)
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -25,7 +25,7 @@
 #include "renderer.h"
 #include "definitions.h"
 #include "timecodedisplay.h"
-#include "abstractmonitor.h"
+#include "widgets/abstractmonitor.h"
 #ifdef USE_OPENGL
 #include "widgets/videoglwidget.h"
 #endif

diff --git a/src/recmonitor.h b/src/recmonitor.h
index 72e3ce457f4ecb83503c7cdc2f5ec8fa2e8af80f..4041e42530f1436464a234646e56de72b84afa03 100644 (file)
--- a/src/recmonitor.h
+++ b/src/recmonitor.h
@@ -26,7 +26,7 @@
 #ifndef RECMONITOR_H
 #define RECMONITOR_H
 
-#include "abstractmonitor.h"
+#include "widgets/abstractmonitor.h"
 #include "definitions.h"
 #include "ui_recmonitor_ui.h"
 

diff --git a/src/renderer.h b/src/renderer.h
index 8b7d1b5ac52a907a282f342af7370f5aaaf905de..cf36dae04fbe6b1c423afd7696ed9b27a0dbaae0 100644 (file)
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -31,7 +31,7 @@
 
 #include "gentime.h"
 #include "definitions.h"
-#include "abstractmonitor.h"
+#include "widgets/abstractmonitor.h"
 
 #include <mlt/framework/mlt_types.h>
 

diff --git a/src/stopmotion/stopmotion.h b/src/stopmotion/stopmotion.h
index 1c1ff876ed02f1564465333a3c82f1f2a3d5c369..42a55cbc9c102e201f80d50582a781a36645dad4 100644 (file)
--- a/src/stopmotion/stopmotion.h
+++ b/src/stopmotion/stopmotion.h
@@ -26,7 +26,7 @@
 #include <QFuture>
 #include <QVBoxLayout>
 #include <QTimer>
-#include <abstractmonitor.h>
+#include <widgets/abstractmonitor.h>
 
 class MltDeviceCapture;
 class MonitorManager;

diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index 3a4abc2d389c25097d46674924af64b47a9ad694..38108ce2c7a57e4f3769ebaae1f6a97fdc076ec3 100644 (file)
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -1,5 +1,6 @@
 set(kdenlive_SRCS
   ${kdenlive_SRCS}
+  widgets/abstractmonitor.cpp
   widgets/invaliddialog.cpp
   widgets/choosecolorwidget.cpp
   widgets/colorpickerwidget.cpp

diff --git a/src/abstractmonitor.cpp b/src/widgets/abstractmonitor.cpp
similarity index 99%
rename from src/abstractmonitor.cpp
rename to src/widgets/abstractmonitor.cpp
index dc9ccd646c9288e682965c9503d06871c63916cc..e877dc800d3d22147f87b155205413203a957ea7 100644 (file)
--- a/src/abstractmonitor.cpp
+++ b/src/widgets/abstractmonitor.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 
-#include "abstractmonitor.h"
+#include "widgets/abstractmonitor.h"
 #include "kdenlivesettings.h"
 #include "monitormanager.h"
 

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