From 255cfc0146db2aa12cbce15f6a3590efc5d9ef83 Mon Sep 17 00:00:00 2001 From: Jean-Nicolas Artaud Date: Wed, 15 Jan 2014 00:30:33 +0100 Subject: [PATCH] Moves AbstractMonitor into widgets folder. --- src/CMakeLists.txt | 1 - src/mltdevicecapture.h | 2 +- src/monitor.h | 2 +- src/recmonitor.h | 2 +- src/renderer.h | 2 +- src/stopmotion/stopmotion.h | 2 +- src/widgets/CMakeLists.txt | 1 + src/{ => widgets}/abstractmonitor.cpp | 2 +- src/{ => widgets}/abstractmonitor.h | 0 9 files changed, 7 insertions(+), 7 deletions(-) rename src/{ => widgets}/abstractmonitor.cpp (99%) rename src/{ => widgets}/abstractmonitor.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ad661ad6..5a0098fa 100644 --- 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 ea7291c9..c811be87 100644 --- 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 diff --git a/src/monitor.h b/src/monitor.h index e65f2ec9..1d7b54cb 100644 --- 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 72e3ce45..4041e425 100644 --- 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 8b7d1b5a..cf36dae0 100644 --- 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 diff --git a/src/stopmotion/stopmotion.h b/src/stopmotion/stopmotion.h index 1c1ff876..42a55cbc 100644 --- a/src/stopmotion/stopmotion.h +++ b/src/stopmotion/stopmotion.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include class MltDeviceCapture; class MonitorManager; diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index 3a4abc2d..38108ce2 100644 --- 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 dc9ccd64..e877dc80 100644 --- 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 -- 2.39.2