Commit e4cc635a authored by Till Theato's avatar Till Theato Committed by Vincent PINON

Update includes.

Conflicts:
	src/core.cpp
	src/jogaction.cpp
	src/monitor/monitor.cpp
	src/monitor/monitormanager.cpp
	src/monitor/recmonitor.cpp
	src/projectlist.cpp
parent 64bfe657
......@@ -23,7 +23,7 @@
#include "kdenlivesettings.h"
#include "profilesdialog.h"
#include "timecode.h"
#include "monitormanager.h"
#include "monitor/monitormanager.h"
#include <KStandardDirs>
#include <KLocalizedString>
......
......@@ -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
{
......
......@@ -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"
......
......@@ -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>
......
......@@ -18,6 +18,7 @@
***************************************************************************/
#include "jogaction.h"
#include "monitor/monitormanager.h"
#include <stdio.h>
#include <stdlib.h>
......
......@@ -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"
......
......@@ -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, bool isZone)
}
#include "monitor.moc"
#include "monitor/monitor.moc"
......@@ -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"
......@@ -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;
......
......@@ -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"
......@@ -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*/, bool /*fast*/)
}
#include "recmonitor.moc"
#include "monitor/recmonitor.moc"
......@@ -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"
......
......@@ -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"
......
......@@ -12,7 +12,7 @@
#include "abstractscopewidget.h"
#include "renderer.h"
#include "monitor.h"
#include "monitor/monitor.h"
#include <QColor>
#include <QMenu>
......
......@@ -10,7 +10,7 @@
#include "abstractaudioscopewidget.h"
#include "renderer.h"
#include "monitor.h"
#include "monitor/monitor.h"
// Uncomment for debugging
......
......@@ -10,7 +10,7 @@
#include "abstractgfxscopewidget.h"
#include "renderer.h"
#include "monitormanager.h"
#include "monitor/monitormanager.h"
#include <QMouseEvent>
......
......@@ -13,7 +13,7 @@
#include <QDockWidget>
#include "definitions.h"
#include "monitormanager.h"
#include "monitor/monitormanager.h"
#include "kdenlivesettings.h"
//#define DEBUG_SM
......
......@@ -24,7 +24,7 @@
#include <KColorScheme>
#include <QWidget>
#include "monitormanager.h"
#include "monitor/monitormanager.h"
class SmallRuler : public QWidget
......
......@@ -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"
......
......@@ -24,7 +24,7 @@
#include "kdenlivesettings.h"
#include "mainwindow.h"
#include "widgets/monitoreditwidget.h"
#include "monitorscene.h"
#include "monitor/monitorscene.h"
#include <KDebug>
......
......@@ -20,7 +20,7 @@
#include "widgets/abstractmonitor.h"
#include "kdenlivesettings.h"
#include "monitormanager.h"
#include "monitor/monitormanager.h"
#include <KDebug>
......
......@@ -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"
......
......@@ -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"
......
......@@ -19,7 +19,7 @@
#include "monitoreditwidget.h"
#include "renderer.h"
#include "monitorscene.h"
#include "monitor/monitorscene.h"
#include "kdenlivesettings.h"
#include "onmonitoritems/onmonitorrectitem.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment