[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-9y () scm ! kde ! org
[Download RAW message or body]
Git commit e4cc635a8d76ba908c9a1da611b8293540b55af5 by Vincent PINON, on be=
half of Till Theato.
Committed on 18/04/2014 at 18:10.
Pushed by vpinon into branch 'next'.
Update includes.
Conflicts:
src/core.cpp
src/jogaction.cpp
src/monitor/monitor.cpp
src/monitor/monitormanager.cpp
src/monitor/recmonitor.cpp
src/projectlist.cpp
M +1 -1 src/dvdwizard.cpp
M +2 -2 src/dvdwizardchapters.h
M +1 -1 src/effectstack/effectstackview2.cpp
M +1 -1 src/effectstackedit.cpp
M +1 -0 src/jogaction.cpp
M +3 -3 src/mainwindow.cpp
M +3 -3 src/monitor/monitor.cpp
M +2 -2 src/monitor/monitormanager.cpp
M +2 -2 src/monitor/monitormanager.h
M +2 -2 src/monitor/monitorscene.cpp
M +4 -4 src/monitor/recmonitor.cpp
M +1 -0 src/projectlist.cpp
M +2 -2 src/rotoscoping/rotowidget.cpp
M +1 -1 src/scopes/abstractscopewidget.cpp
M +1 -1 src/scopes/audioscopes/abstractaudioscopewidget.cpp
M +1 -1 src/scopes/colorscopes/abstractgfxscopewidget.cpp
M +1 -1 src/scopes/scopemanager.cpp
M +1 -1 src/smallruler.h
M +2 -2 src/stopmotion/stopmotion.cpp
M +1 -1 src/transitionsettings.cpp
M +1 -1 src/widgets/abstractmonitor.cpp
M +2 -2 src/widgets/cornerswidget.cpp
M +2 -2 src/widgets/geometrywidget.cpp
M +1 -1 src/widgets/monitoreditwidget.cpp
http://commits.kde.org/kdenlive/e4cc635a8d76ba908c9a1da611b8293540b55af5
diff --git a/src/dvdwizard.cpp b/src/dvdwizard.cpp
index dddae69..071d6b4 100644
--- a/src/dvdwizard.cpp
+++ b/src/dvdwizard.cpp
@@ -23,7 +23,7 @@
#include "kdenlivesettings.h"
#include "profilesdialog.h"
#include "timecode.h"
-#include "monitormanager.h"
+#include "monitor/monitormanager.h"
=
#include <KStandardDirs>
#include <KLocalizedString>
diff --git a/src/dvdwizardchapters.h b/src/dvdwizardchapters.h
index 3223842..76add44 100644
--- a/src/dvdwizardchapters.h
+++ b/src/dvdwizardchapters.h
@@ -26,9 +26,9 @@
#include <KDebug>
=
#include "ui_dvdwizardchapters_ui.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "dvdwizardvob.h"
-#include "monitormanager.h"
+#include "monitor/monitormanager.h"
=
class DvdWizardChapters : public QWizardPage
{
diff --git a/src/effectstack/effectstackview2.cpp b/src/effectstack/effects=
tackview2.cpp
index 47b6666..4fc94ac 100644
--- a/src/effectstack/effectstackview2.cpp
+++ b/src/effectstack/effectstackview2.cpp
@@ -24,7 +24,7 @@
#include "projectlist.h"
#include "kthumb.h"
#include "widgets/monitoreditwidget.h"
-#include "monitorscene.h"
+#include "monitor/monitorscene.h"
#include "kdenlivesettings.h"
#include "collapsibleeffect.h"
#include "collapsiblegroup.h"
diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp
index 11d9d7c..b0ce714 100644
--- a/src/effectstackedit.cpp
+++ b/src/effectstackedit.cpp
@@ -18,7 +18,7 @@
#include "effectstackedit.h"
#include "effectstack/effectstackview2.h"
#include "effectslist.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "kdenlivesettings.h"
=
#include <KDebug>
diff --git a/src/jogaction.cpp b/src/jogaction.cpp
index e6cafa2..8d2e1bf 100644
--- a/src/jogaction.cpp
+++ b/src/jogaction.cpp
@@ -18,6 +18,7 @@
*************************************************************************=
**/
=
#include "jogaction.h"
+#include "monitor/monitormanager.h"
=
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 866ddfc..c33f79e 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -28,9 +28,9 @@
#include "events.h"
#include "clipmanager.h"
#include "projectlist.h"
-#include "monitor.h"
-#include "recmonitor.h"
-#include "monitormanager.h"
+#include "monitor/monitor.h"
+#include "monitor/recmonitor.h"
+#include "monitor/monitormanager.h"
#include "kdenlivedoc.h"
#include "trackview.h"
#include "customtrackview.h"
diff --git a/src/monitor/monitor.cpp b/src/monitor/monitor.cpp
index 2b8cd62..517753b 100644
--- a/src/monitor/monitor.cpp
+++ b/src/monitor/monitor.cpp
@@ -18,11 +18,11 @@
*************************************************************************=
**/
=
=
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "smallruler.h"
#include "docclipbase.h"
#include "abstractclipitem.h"
-#include "monitorscene.h"
+#include "monitor/monitorscene.h"
#include "widgets/monitoreditwidget.h"
#include "widgets/videosurface.h"
#include "kdenlivesettings.h"
@@ -1221,4 +1221,4 @@ void Overlay::setOverlayText(const QString &text, boo=
l isZone)
}
=
=
-#include "monitor.moc"
+#include "monitor/monitor.moc"
diff --git a/src/monitor/monitormanager.cpp b/src/monitor/monitormanager.cpp
index b05b1da..376e41b 100644
--- a/src/monitor/monitormanager.cpp
+++ b/src/monitor/monitormanager.cpp
@@ -18,7 +18,7 @@
*************************************************************************=
**/
=
=
-#include "monitormanager.h"
+#include "monitor/monitormanager.h"
#include "renderer.h"
#include "kdenlivesettings.h"
#include "kdenlivedoc.h"
@@ -282,4 +282,4 @@ QString MonitorManager::getProjectFolder() const
}
=
=
-#include "monitormanager.moc"
+#include "monitor/monitormanager.moc"
diff --git a/src/monitor/monitormanager.h b/src/monitor/monitormanager.h
index aa243af..82262d1 100644
--- a/src/monitor/monitormanager.h
+++ b/src/monitor/monitormanager.h
@@ -21,8 +21,8 @@
#ifndef MONITORMANAGER_H
#define MONITORMANAGER_H
=
-#include "monitor.h"
-#include "recmonitor.h"
+#include "monitor/monitor.h"
+#include "monitor/recmonitor.h"
#include "timecode.h"
=
class KdenliveDoc;
diff --git a/src/monitor/monitorscene.cpp b/src/monitor/monitorscene.cpp
index e6be3de..fa35619 100644
--- a/src/monitor/monitorscene.cpp
+++ b/src/monitor/monitorscene.cpp
@@ -18,7 +18,7 @@
*************************************************************************=
**/
=
=
-#include "monitorscene.h"
+#include "monitor/monitorscene.h"
#include "renderer.h"
#include "onmonitoritems/rotoscoping/bpointitem.h"
#include "onmonitoritems/rotoscoping/splineitem.h"
@@ -276,4 +276,4 @@ void MonitorScene::wheelEvent(QGraphicsSceneWheelEvent*=
event)
event->accept();
}
=
-#include "monitorscene.moc"
+#include "monitor/monitorscene.moc"
diff --git a/src/monitor/recmonitor.cpp b/src/monitor/recmonitor.cpp
index d7a1125..eef6380 100644
--- a/src/monitor/recmonitor.cpp
+++ b/src/monitor/recmonitor.cpp
@@ -17,13 +17,13 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA =
*
*************************************************************************=
**/
=
-#include "recmonitor.h"
+#include "monitor/recmonitor.h"
#include "gentime.h"
#include "mltdevicecapture.h"
#include "kdenlivesettings.h"
#include "managecapturesdialog.h"
-#include "monitormanager.h"
-#include "monitor.h"
+#include "monitor/monitormanager.h"
+#include "monitor/monitor.h"
#include "profilesdialog.h"
#include "widgets/videosurface.h"
#include "config-kdenlive.h"
@@ -1068,5 +1068,5 @@ void RecMonitor::slotMouseSeek(int /*eventDelta*/, bo=
ol /*fast*/)
}
=
=
-#include "recmonitor.moc"
+#include "monitor/recmonitor.moc"
=
diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index 562b187..6843935 100644
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -37,6 +37,7 @@
#include "timecodedisplay.h"
#include "profilesdialog.h"
#include "clipstabilize.h"
+#include "monitor/monitormanager.h"
#include "commands/editclipcommand.h"
#include "commands/editclipcutcommand.h"
#include "commands/editfoldercommand.h"
diff --git a/src/rotoscoping/rotowidget.cpp b/src/rotoscoping/rotowidget.cpp
index d5832f6..92429d7 100644
--- a/src/rotoscoping/rotowidget.cpp
+++ b/src/rotoscoping/rotowidget.cpp
@@ -17,9 +17,9 @@
*************************************************************************=
**/
=
#include "rotowidget.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "renderer.h"
-#include "monitorscene.h"
+#include "monitor/monitorscene.h"
#include "widgets/monitoreditwidget.h"
#include "onmonitoritems/rotoscoping/bpointitem.h"
#include "onmonitoritems/rotoscoping/splineitem.h"
diff --git a/src/scopes/abstractscopewidget.cpp b/src/scopes/abstractscopew=
idget.cpp
index bce8631..f3f0dd6 100644
--- a/src/scopes/abstractscopewidget.cpp
+++ b/src/scopes/abstractscopewidget.cpp
@@ -12,7 +12,7 @@
=
#include "abstractscopewidget.h"
#include "renderer.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
=
#include <QColor>
#include <QMenu>
diff --git a/src/scopes/audioscopes/abstractaudioscopewidget.cpp b/src/scop=
es/audioscopes/abstractaudioscopewidget.cpp
index a862ecf..0b1ea78 100644
--- a/src/scopes/audioscopes/abstractaudioscopewidget.cpp
+++ b/src/scopes/audioscopes/abstractaudioscopewidget.cpp
@@ -10,7 +10,7 @@
=
#include "abstractaudioscopewidget.h"
#include "renderer.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
=
=
// Uncomment for debugging
diff --git a/src/scopes/colorscopes/abstractgfxscopewidget.cpp b/src/scopes=
/colorscopes/abstractgfxscopewidget.cpp
index f39963f..df328d7 100644
--- a/src/scopes/colorscopes/abstractgfxscopewidget.cpp
+++ b/src/scopes/colorscopes/abstractgfxscopewidget.cpp
@@ -10,7 +10,7 @@
=
#include "abstractgfxscopewidget.h"
#include "renderer.h"
-#include "monitormanager.h"
+#include "monitor/monitormanager.h"
=
#include <QMouseEvent>
=
diff --git a/src/scopes/scopemanager.cpp b/src/scopes/scopemanager.cpp
index b192bea..6daed33 100644
--- a/src/scopes/scopemanager.cpp
+++ b/src/scopes/scopemanager.cpp
@@ -13,7 +13,7 @@
#include <QDockWidget>
=
#include "definitions.h"
-#include "monitormanager.h"
+#include "monitor/monitormanager.h"
#include "kdenlivesettings.h"
=
//#define DEBUG_SM
diff --git a/src/smallruler.h b/src/smallruler.h
index 5c18ba9..79e29a8 100644
--- a/src/smallruler.h
+++ b/src/smallruler.h
@@ -24,7 +24,7 @@
#include <KColorScheme>
#include <QWidget>
=
-#include "monitormanager.h"
+#include "monitor/monitormanager.h"
=
=
class SmallRuler : public QWidget
diff --git a/src/stopmotion/stopmotion.cpp b/src/stopmotion/stopmotion.cpp
index 9255e07..2b2ebd9 100644
--- a/src/stopmotion/stopmotion.cpp
+++ b/src/stopmotion/stopmotion.cpp
@@ -22,8 +22,8 @@
#include "slideshowclip.h"
#include "profilesdialog.h"
#include "mltdevicecapture.h"
-#include "recmonitor.h"
-#include "monitormanager.h"
+#include "monitor/recmonitor.h"
+#include "monitor/monitormanager.h"
#include "ui_smconfig_ui.h"
#include "kdenlivesettings.h"
=
diff --git a/src/transitionsettings.cpp b/src/transitionsettings.cpp
index b21203b..318e552 100644
--- a/src/transitionsettings.cpp
+++ b/src/transitionsettings.cpp
@@ -24,7 +24,7 @@
#include "kdenlivesettings.h"
#include "mainwindow.h"
#include "widgets/monitoreditwidget.h"
-#include "monitorscene.h"
+#include "monitor/monitorscene.h"
=
#include <KDebug>
=
diff --git a/src/widgets/abstractmonitor.cpp b/src/widgets/abstractmonitor.=
cpp
index e877dc8..27b054a 100644
--- a/src/widgets/abstractmonitor.cpp
+++ b/src/widgets/abstractmonitor.cpp
@@ -20,7 +20,7 @@
=
#include "widgets/abstractmonitor.h"
#include "kdenlivesettings.h"
-#include "monitormanager.h"
+#include "monitor/monitormanager.h"
=
#include <KDebug>
=
diff --git a/src/widgets/cornerswidget.cpp b/src/widgets/cornerswidget.cpp
index 20546a7..662547f 100644
--- a/src/widgets/cornerswidget.cpp
+++ b/src/widgets/cornerswidget.cpp
@@ -18,8 +18,8 @@
*************************************************************************=
**/
=
#include "cornerswidget.h"
-#include "monitor.h"
-#include "monitorscene.h"
+#include "monitor/monitor.h"
+#include "monitor/monitorscene.h"
#include "monitoreditwidget.h"
#include "onmonitoritems/onmonitorcornersitem.h"
#include "renderer.h"
diff --git a/src/widgets/geometrywidget.cpp b/src/widgets/geometrywidget.cpp
index 44377e0..fd65fe0 100644
--- a/src/widgets/geometrywidget.cpp
+++ b/src/widgets/geometrywidget.cpp
@@ -19,11 +19,11 @@
=
=
#include "geometrywidget.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
#include "renderer.h"
#include "keyframehelper.h"
#include "timecodedisplay.h"
-#include "monitorscene.h"
+#include "monitor/monitorscene.h"
#include "monitoreditwidget.h"
#include "onmonitoritems/onmonitorrectitem.h"
#include "onmonitoritems/onmonitorpathitem.h"
diff --git a/src/widgets/monitoreditwidget.cpp b/src/widgets/monitoreditwid=
get.cpp
index 0595477..fa1d0a0 100644
--- a/src/widgets/monitoreditwidget.cpp
+++ b/src/widgets/monitoreditwidget.cpp
@@ -19,7 +19,7 @@
=
#include "monitoreditwidget.h"
#include "renderer.h"
-#include "monitorscene.h"
+#include "monitor/monitorscene.h"
#include "kdenlivesettings.h"
=
#include "onmonitoritems/onmonitorrectitem.h"
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic