From 06fabc683a3bddc60ba59573a62458ca4f6a0ef6 Mon Sep 17 00:00:00 2001 From: Marco Gittler Date: Sat, 22 Mar 2008 00:06:43 +0000 Subject: [PATCH] last files updated with forward declaration svn path=/branches/KDE4/; revision=2096 --- src/customtrackview.cpp | 1 + src/mainwindow.cpp | 1 + src/monitor.cpp | 3 +++ src/monitor.h | 6 +++--- src/moveclipcommand.cpp | 2 +- src/moveclipcommand.h | 3 +-- src/projectitem.cpp | 1 + src/projectitem.h | 2 +- src/projectlist.cpp | 4 ++++ src/projectlist.h | 8 +++++--- src/renderjob.h | 1 - src/resizeclipcommand.cpp | 2 +- src/resizeclipcommand.h | 3 +-- src/trackview.cpp | 3 +++ src/trackview.h | 9 +++++---- src/transitionsettings.cpp | 1 + src/transitionsettings.h | 3 ++- 17 files changed, 34 insertions(+), 19 deletions(-) diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 3d8a68d5..eb9086ca 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -44,6 +44,7 @@ #include "clipitem.h" #include "customtrackview.h" #include "clipmanager.h" +#include "renderer.h" //TODO: // disable animation if user asked it in KDE's global settings // http://lists.kde.org/?l=kde-commits&m=120398724717624&w=2 diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 1cc5120c..4c5a35d0 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -69,6 +69,7 @@ #include "effectstackview.h" #include "transitionsettings.h" #include "renderwidget.h" +#include "renderer.h" #include "jogshuttle.h" #define ID_STATUS_MSG 1 diff --git a/src/monitor.cpp b/src/monitor.cpp index d22a90bd..be3cdcf7 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -29,6 +29,9 @@ #include "gentime.h" #include "monitor.h" +#include "renderer.h" +#include "monitormanager.h" +#include "smallruler.h" Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : QWidget(parent), render(NULL), m_monitorManager(manager), m_name(name), m_isActive(false) { diff --git a/src/monitor.h b/src/monitor.h index 3ae530b4..cae7ad80 100644 --- a/src/monitor.h +++ b/src/monitor.h @@ -24,13 +24,13 @@ #include #include #include +#include #include "ui_monitor_ui.h" -#include "renderer.h" -#include "monitormanager.h" -#include "smallruler.h" class MonitorManager; +class Render; +class SmallRuler; class MonitorRefresh : public QWidget { Q_OBJECT diff --git a/src/moveclipcommand.cpp b/src/moveclipcommand.cpp index 5c6c124e..eb933a56 100644 --- a/src/moveclipcommand.cpp +++ b/src/moveclipcommand.cpp @@ -20,7 +20,7 @@ #include #include "moveclipcommand.h" - +#include "customtrackview.h" MoveClipCommand::MoveClipCommand(CustomTrackView *view, const QPointF startPos, const QPointF endPos, bool doIt) : m_view(view), m_startPos(startPos), m_endPos(endPos), m_doIt(doIt) { setText(i18n("Move clip")); diff --git a/src/moveclipcommand.h b/src/moveclipcommand.h index d31bb2d6..06980281 100644 --- a/src/moveclipcommand.h +++ b/src/moveclipcommand.h @@ -27,8 +27,7 @@ #include -#include "projectlist.h" -#include "customtrackview.h" +class CustomTrackView; class MoveClipCommand : public QUndoCommand { public: diff --git a/src/projectitem.cpp b/src/projectitem.cpp index d861ef5c..843d1534 100644 --- a/src/projectitem.cpp +++ b/src/projectitem.cpp @@ -31,6 +31,7 @@ #include "projectitem.h" #include "timecode.h" #include "kdenlivesettings.h" +#include "docclipbase.h" const int NameRole = Qt::UserRole; const int DurationRole = NameRole + 1; diff --git a/src/projectitem.h b/src/projectitem.h index 47bc56b9..139e6bbd 100644 --- a/src/projectitem.h +++ b/src/projectitem.h @@ -29,8 +29,8 @@ #include "gentime.h" #include "definitions.h" -#include "docclipbase.h" +class DocClipBase; class ProjectItem : public QTreeWidgetItem { public: ProjectItem(QTreeWidget * parent, const QStringList & strings, QDomElement xml, int clipId); diff --git a/src/projectlist.cpp b/src/projectlist.cpp index eca0ae6a..bce657ff 100644 --- a/src/projectlist.cpp +++ b/src/projectlist.cpp @@ -44,6 +44,10 @@ #include "definitions.h" #include "titlewidget.h" #include "clipmanager.h" +#include "docclipbase.h" +#include "kdenlivedoc.h" +#include "renderer.h" +#include "projectlistview.h" #include ProjectList::ProjectList(QWidget *parent) diff --git a/src/projectlist.h b/src/projectlist.h index 64d62887..2b808eef 100644 --- a/src/projectlist.h +++ b/src/projectlist.h @@ -29,14 +29,16 @@ #include #include #include "kextendableitemdelegate.h" +#include #include "definitions.h" -#include "kdenlivedoc.h" -#include "renderer.h" #include "timecode.h" -#include "projectlistview.h" class ProjectItem; +class ProjectListView; +class Render; +class KdenliveDoc; +class DocClipBase; const int NameRole = Qt::UserRole; const int DurationRole = NameRole + 1; diff --git a/src/renderjob.h b/src/renderjob.h index e6285d1b..d084b0de 100644 --- a/src/renderjob.h +++ b/src/renderjob.h @@ -29,7 +29,6 @@ #include "gentime.h" #include "definitions.h" -#include "docclipbase.h" class RenderJob : public KJob { Q_OBJECT diff --git a/src/resizeclipcommand.cpp b/src/resizeclipcommand.cpp index 9e97e462..33463054 100644 --- a/src/resizeclipcommand.cpp +++ b/src/resizeclipcommand.cpp @@ -20,7 +20,7 @@ #include #include "resizeclipcommand.h" - +#include "customtrackview.h" ResizeClipCommand::ResizeClipCommand(CustomTrackView *view, const QPointF startPos, const QPointF endPos, bool resizeClipStart, bool doIt) : m_view(view), m_startPos(startPos), m_endPos(endPos), m_resizeClipStart(resizeClipStart), m_doIt(doIt) { setText(i18n("Resize clip")); diff --git a/src/resizeclipcommand.h b/src/resizeclipcommand.h index 6247df12..55171135 100644 --- a/src/resizeclipcommand.h +++ b/src/resizeclipcommand.h @@ -27,8 +27,7 @@ #include -#include "projectlist.h" -#include "customtrackview.h" +class CustomTrackView; class ResizeClipCommand : public QUndoCommand { public: diff --git a/src/trackview.cpp b/src/trackview.cpp index 7dc5f146..75b98281 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -30,6 +30,9 @@ #include "clipitem.h" #include "kdenlivesettings.h" #include "clipmanager.h" +#include "customruler.h" +#include "kdenlivedoc.h" +#include "customtrackview.h" TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) : QWidget(parent), m_doc(doc), m_scale(1.0), m_projectTracks(0), m_currentZoom(4) { diff --git a/src/trackview.h b/src/trackview.h index 0c5cdd24..2f01be7e 100644 --- a/src/trackview.h +++ b/src/trackview.h @@ -27,15 +27,16 @@ #include #include #include - +#include #define FRAME_SIZE 90 #include "ui_timeline_ui.h" -#include "customruler.h" -#include "kdenlivedoc.h" -#include "customtrackview.h" + class ClipItem; class Transition; +class CustomTrackView; +class KdenliveDoc; +class CustomRuler; class TrackView : public QWidget { Q_OBJECT diff --git a/src/transitionsettings.cpp b/src/transitionsettings.cpp index 7c9b3a56..e50daa50 100644 --- a/src/transitionsettings.cpp +++ b/src/transitionsettings.cpp @@ -18,6 +18,7 @@ #include "transitionsettings.h" #include "transition.h" #include +#include "effectslist.h" TransitionSettings::TransitionSettings(EffectsList *transitions, QWidget* parent): QWidget(parent) { ui.setupUi(this); diff --git a/src/transitionsettings.h b/src/transitionsettings.h index 4c708210..bc1c1069 100644 --- a/src/transitionsettings.h +++ b/src/transitionsettings.h @@ -17,9 +17,10 @@ #ifndef TRANSITIONSETTINGS_H #define TRANSITIONSETTINGS_H #include "ui_transitionsettings_ui.h" -#include "effectslist.h" +#include class Transition; +class EffectsList; class TransitionSettings : public QWidget { Q_OBJECT -- 2.39.5