[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive/next] src: Update includes.
From:       Vincent PINON <vincent.pinon () laposte ! net>
Date:       2014-04-30 20:28:01
Message-ID: E1Wfb6n-0003AX-Vd () scm ! kde ! org
[Download RAW message or body]

Git commit 45d1317d650d619da030ebf5505ff28f85d6e32e by Vincent PINON, on be=
half of Till Theato.
Committed on 18/04/2014 at 19:22.
Pushed by vpinon into branch 'next'.

Update includes.

Conflicts:
	src/monitor/monitor.h
	src/stopmotion/stopmotion.h

M  +1    -1    src/mltdevicecapture.h
M  +1    -0    src/monitor/CMakeLists.txt
M  +2    -2    src/monitor/abstractmonitor.cpp
M  +1    -1    src/monitor/monitor.h
M  +1    -1    src/monitor/recmonitor.h
M  +1    -1    src/renderer.h
M  +1    -1    src/stopmotion/stopmotion.h
M  +0    -1    src/widgets/CMakeLists.txt

http://commits.kde.org/kdenlive/45d1317d650d619da030ebf5505ff28f85d6e32e

diff --git a/src/mltdevicecapture.h b/src/mltdevicecapture.h
index c811be8..e7cdeaa 100644
--- a/src/mltdevicecapture.h
+++ b/src/mltdevicecapture.h
@@ -25,7 +25,7 @@
 =

 #include "gentime.h"
 #include "definitions.h"
-#include "widgets/abstractmonitor.h"
+#include "monitor/abstractmonitor.h"
 =

 #include <mlt/framework/mlt_types.h>
 =

diff --git a/src/monitor/CMakeLists.txt b/src/monitor/CMakeLists.txt
index e3aca6e..8347479 100644
--- a/src/monitor/CMakeLists.txt
+++ b/src/monitor/CMakeLists.txt
@@ -1,4 +1,5 @@
 set(monitor_SRCS
+    monitor/abstractmonitor.cpp
     monitor/monitor.cpp
     monitor/monitormanager.cpp
     monitor/monitorscene.cpp
diff --git a/src/monitor/abstractmonitor.cpp b/src/monitor/abstractmonitor.=
cpp
index 27b054a..8d75b48 100644
--- a/src/monitor/abstractmonitor.cpp
+++ b/src/monitor/abstractmonitor.cpp
@@ -18,7 +18,7 @@
  *************************************************************************=
**/
 =

 =

-#include "widgets/abstractmonitor.h"
+#include "monitor/abstractmonitor.h"
 #include "kdenlivesettings.h"
 #include "monitor/monitormanager.h"
 =

@@ -160,4 +160,4 @@ void VideoContainer::switchFullScreen()
     }
 }
 =

-#include "abstractmonitor.moc"
+#include "monitor/abstractmonitor.moc"
diff --git a/src/monitor/monitor.h b/src/monitor/monitor.h
index 1d7b54c..ce55e5a 100644
--- a/src/monitor/monitor.h
+++ b/src/monitor/monitor.h
@@ -25,7 +25,7 @@
 #include "renderer.h"
 #include "definitions.h"
 #include "timecodedisplay.h"
-#include "widgets/abstractmonitor.h"
+#include "monitor/abstractmonitor.h"
 #ifdef USE_OPENGL
 #include "widgets/videoglwidget.h"
 #endif
diff --git a/src/monitor/recmonitor.h b/src/monitor/recmonitor.h
index 62d9459..fc5fd49 100644
--- a/src/monitor/recmonitor.h
+++ b/src/monitor/recmonitor.h
@@ -26,7 +26,7 @@
 #ifndef RECMONITOR_H
 #define RECMONITOR_H
 =

-#include "widgets/abstractmonitor.h"
+#include "monitor/abstractmonitor.h"
 #include "definitions.h"
 #include "ui_recmonitor_ui.h"
 =

diff --git a/src/renderer.h b/src/renderer.h
index e8c0d46..1db44de 100644
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -31,7 +31,7 @@
 =

 #include "gentime.h"
 #include "definitions.h"
-#include "widgets/abstractmonitor.h"
+#include "monitor/abstractmonitor.h"
 =

 #include <mlt/framework/mlt_types.h>
 =

diff --git a/src/stopmotion/stopmotion.h b/src/stopmotion/stopmotion.h
index 42a55cb..fd6de4d 100644
--- a/src/stopmotion/stopmotion.h
+++ b/src/stopmotion/stopmotion.h
@@ -26,7 +26,7 @@
 #include <QFuture>
 #include <QVBoxLayout>
 #include <QTimer>
-#include <widgets/abstractmonitor.h>
+#include "monitor/abstractmonitor.h"
 =

 class MltDeviceCapture;
 class MonitorManager;
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index 38108ce..3a4abc2 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -1,6 +1,5 @@
 set(kdenlive_SRCS
   ${kdenlive_SRCS}
-  widgets/abstractmonitor.cpp
   widgets/invaliddialog.cpp
   widgets/choosecolorwidget.cpp
   widgets/colorpickerwidget.cpp
[prev in list] [next in list] [prev in thread] [next in thread]