From cd85961a9520f2f3c909e889dacd8de539468b89 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Wed, 4 Mar 2009 00:22:46 +0000 Subject: [PATCH] Krazy fixes: cleanup all headers svn path=/branches/KDE4/; revision=3096 --- plugins/sampleplugin/sampleplugin.cpp | 11 ++-- renderer/renderjob.cpp | 4 +- src/abstractclipitem.cpp | 16 +++--- src/abstractclipitem.h | 2 +- src/abstractgroupitem.cpp | 15 +++--- src/addclipcommand.cpp | 3 +- src/addeffectcommand.cpp | 3 +- src/addfoldercommand.cpp | 3 +- src/addmarkercommand.cpp | 4 +- src/addtimelineclipcommand.cpp | 3 +- src/addtrackcommand.cpp | 3 +- src/addtransitioncommand.cpp | 4 +- src/addtransitioncommand.h | 4 +- src/changespeedcommand.cpp | 3 +- src/changetrackcommand.cpp | 3 +- src/clipdurationdialog.cpp | 7 +-- src/clipdurationdialog.h | 1 - src/clipitem.cpp | 26 ++++----- src/clipmanager.cpp | 10 ++-- src/clipproperties.cpp | 11 ++-- src/clipproperties.h | 5 +- src/complexparameter.cpp | 6 +-- src/customruler.cpp | 7 ++- src/customruler.h | 19 +++++++ src/customtrackscene.cpp | 6 +-- src/customtrackview.cpp | 30 +++++------ src/docclipbase.cpp | 12 +++-- src/docclipbase.h | 2 +- src/dvdwizard.cpp | 19 ++++--- src/dvdwizardmenu.cpp | 2 +- src/dvdwizardvob.cpp | 3 +- src/editclipcommand.cpp | 4 +- src/editeffectcommand.cpp | 3 +- src/editfoldercommand.cpp | 3 +- src/editguidecommand.cpp | 4 +- src/editkeyframecommand.cpp | 4 +- src/edittransitioncommand.cpp | 3 +- src/effectslist.cpp | 5 +- src/effectslistview.cpp | 14 ++--- src/effectslistview.h | 4 +- src/effectslistwidget.cpp | 12 +++-- src/effectslistwidget.h | 4 +- src/effectstackedit.cpp | 23 ++++---- src/effectstackview.cpp | 21 ++++---- src/geometryval.cpp | 11 ++-- src/graphicsscenerectmove.cpp | 22 +++++++- src/graphicsscenerectmove.h | 24 ++++++++- src/guide.cpp | 12 ++--- src/headertrack.cpp | 15 +++--- src/initeffects.cpp | 19 ++++--- src/insertspacecommand.cpp | 3 +- src/jogshuttle.cpp | 31 +++++------ src/kdenlivedoc.cpp | 21 ++++---- src/kdenlivedoc.h | 2 +- src/kdenlivesettings.kcfg | 2 +- src/kdenlivesettingsdialog.cpp | 11 ++-- src/keyframehelper.cpp | 9 ++-- src/kthumb.cpp | 20 ++++--- src/kthumb.h | 2 +- src/locktrackcommand.cpp | 4 +- src/mainwindow.cpp | 76 ++++++++++++--------------- src/managecapturesdialog.cpp | 17 +++--- src/managecapturesdialog.h | 1 - src/markerdialog.cpp | 6 ++- src/markerdialog.h | 1 - src/monitor.cpp | 23 ++++---- src/monitormanager.cpp | 9 ++-- src/moveclipcommand.cpp | 4 +- src/moveeffectcommand.cpp | 3 +- src/movegroupcommand.cpp | 3 +- src/movetransitioncommand.cpp | 4 +- src/profilesdialog.cpp | 8 +-- src/profilesdialog.h | 1 - src/projectitem.cpp | 13 ++--- src/projectlist.cpp | 38 +++++++------- src/projectlist.h | 4 +- src/projectlistview.cpp | 14 ++--- src/projectlistview.h | 7 ++- src/projectsettings.cpp | 8 +-- src/razorclipcommand.cpp | 3 +- src/recmonitor.cpp | 22 ++++---- src/renderer.cpp | 26 ++++----- src/renderer.h | 7 +-- src/renderwidget.cpp | 24 ++++----- src/renderwidget.h | 3 +- src/resizeclipcommand.cpp | 3 +- src/slideshowclip.cpp | 6 +-- src/slideshowclip.h | 5 +- src/smallruler.cpp | 7 ++- src/spacerdialog.cpp | 6 ++- src/spacerdialog.h | 1 - src/titlewidget.cpp | 16 +++--- src/titlewidget.h | 2 - src/trackview.cpp | 12 ++--- src/trackview.h | 1 - src/transition.cpp | 22 ++++---- src/transitionsettings.cpp | 3 +- src/wizard.cpp | 15 +++--- thumbnailer/westleypreview.cpp | 3 +- thumbnailer/westleypreview.h | 12 ++--- 100 files changed, 529 insertions(+), 469 deletions(-) diff --git a/plugins/sampleplugin/sampleplugin.cpp b/plugins/sampleplugin/sampleplugin.cpp index 486f681f..177387f9 100644 --- a/plugins/sampleplugin/sampleplugin.cpp +++ b/plugins/sampleplugin/sampleplugin.cpp @@ -18,18 +18,17 @@ ***************************************************************************/ -#include -#include -#include -#include +#include "sampleplugin.h" +#include "ui_countdown_ui.h" #include #include #include #include -#include "sampleplugin.h" -#include "ui_countdown_ui.h" +#include +#include +#include QStringList SamplePlugin::generators() const { return QStringList() << i18n("Countdown") << i18n("Noise"); diff --git a/renderer/renderjob.cpp b/renderer/renderjob.cpp index b6808743..33f7b7b4 100644 --- a/renderer/renderjob.cpp +++ b/renderer/renderjob.cpp @@ -17,10 +17,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ + +#include "renderjob.h" + #include #include #include -#include "renderjob.h" // Can't believe I need to do this to sleep. class SleepThread : QThread { diff --git a/src/abstractclipitem.cpp b/src/abstractclipitem.cpp index b2b90e77..7cff1601 100644 --- a/src/abstractclipitem.cpp +++ b/src/abstractclipitem.cpp @@ -18,17 +18,15 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include -#include -#include -#include +#include "abstractclipitem.h" +#include "customtrackscene.h" +#include "kdenlivesettings.h" #include #include -#include "abstractclipitem.h" -#include "customtrackscene.h" -#include "kdenlivesettings.h" +#include +#include AbstractClipItem::AbstractClipItem(const ItemInfo info, const QRectF& rect, double fps): QGraphicsRectItem(rect), m_track(0), m_fps(fps), m_editedKeyframe(-1), m_selectedKeyframe(0), m_keyframeFactor(1) { setFlags(/*QGraphicsItem::ItemClipsToShape | */QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); @@ -367,7 +365,7 @@ bool AbstractClipItem::hasKeyFrames() const { return !m_keyframes.isEmpty(); } -QRect AbstractClipItem::visibleRect() { +/*QRect AbstractClipItem::visibleRect() { QRect rectInView; if (scene()->views().size() > 0) { rectInView = scene()->views()[0]->viewport()->rect(); @@ -376,7 +374,7 @@ QRect AbstractClipItem::visibleRect() { //kDebug() << scene()->views()[0]->viewport()->rect() << " " << scene()->views()[0]->horizontalScrollBar()->value(); } return rectInView; -} +}*/ CustomTrackScene* AbstractClipItem::projectScene() { if (scene()) return static_cast (scene()); diff --git a/src/abstractclipitem.h b/src/abstractclipitem.h index 5d0b835e..e91c479f 100644 --- a/src/abstractclipitem.h +++ b/src/abstractclipitem.h @@ -74,7 +74,7 @@ protected: double m_fps; QPainterPath upperRectPart(QRectF); QPainterPath lowerRectPart(QRectF); - QRect visibleRect(); + //QRect visibleRect(); void drawKeyFrames(QPainter *painter, QRectF exposedRect); int mouseOverKeyFrames(QPointF pos); }; diff --git a/src/abstractgroupitem.cpp b/src/abstractgroupitem.cpp index b4f8c1eb..f605218d 100644 --- a/src/abstractgroupitem.cpp +++ b/src/abstractgroupitem.cpp @@ -18,20 +18,17 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include -#include -#include -#include -#include - -#include -#include - #include "abstractgroupitem.h" #include "abstractclipitem.h" #include "kdenlivesettings.h" #include "customtrackscene.h" +#include + +#include +#include + + AbstractGroupItem::AbstractGroupItem(double fps): QGraphicsItemGroup(), m_fps(fps) { setZValue(2); setFlags(QGraphicsItem::ItemClipsToShape | QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); diff --git a/src/addclipcommand.cpp b/src/addclipcommand.cpp index 1807e38c..b6b4b4c1 100644 --- a/src/addclipcommand.cpp +++ b/src/addclipcommand.cpp @@ -17,11 +17,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include #include "addclipcommand.h" #include "kdenlivedoc.h" +#include + AddClipCommand::AddClipCommand(KdenliveDoc *doc, const QDomElement &xml, const QString &id, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_doc(doc), m_xml(xml), m_id(id), m_doIt(doIt) { if (doIt) setText(i18n("Add clip")); else setText(i18n("Delete clip")); diff --git a/src/addeffectcommand.cpp b/src/addeffectcommand.cpp index d5564868..7d8d5057 100644 --- a/src/addeffectcommand.cpp +++ b/src/addeffectcommand.cpp @@ -17,11 +17,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include #include "addeffectcommand.h" #include "customtrackview.h" +#include + AddEffectCommand::AddEffectCommand(CustomTrackView *view, const int track, GenTime pos, QDomElement effect, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_track(track), m_pos(pos), m_effect(effect), m_doIt(doIt) { QString effectName; QDomNode namenode = effect.elementsByTagName("name").item(0); diff --git a/src/addfoldercommand.cpp b/src/addfoldercommand.cpp index 3d7d98a3..59760de0 100644 --- a/src/addfoldercommand.cpp +++ b/src/addfoldercommand.cpp @@ -17,11 +17,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include #include "addfoldercommand.h" #include "projectlist.h" +#include + AddFolderCommand::AddFolderCommand(ProjectList *view, const QString folderName, const QString &clipId, bool doIt, QUndoCommand *parent) : QUndoCommand(parent), m_view(view), m_name(folderName), m_id(clipId), m_doIt(doIt) { if (doIt) setText(i18n("Add folder")); else setText(i18n("Delete folder")); diff --git a/src/addmarkercommand.cpp b/src/addmarkercommand.cpp index da747f14..ed1c2a1c 100644 --- a/src/addmarkercommand.cpp +++ b/src/addmarkercommand.cpp @@ -14,11 +14,13 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include + #include "addmarkercommand.h" #include "customtrackview.h" +#include + AddMarkerCommand::AddMarkerCommand(CustomTrackView *view, const QString &oldcomment, const QString &comment, const QString &id, const GenTime &pos, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_oldcomment(oldcomment), m_comment(comment), m_id(id), m_pos(pos), m_doIt(doIt) { if (m_comment.isEmpty()) setText(i18n("Delete marker")); else if (m_oldcomment.isEmpty()) setText(i18n("Add marker")); diff --git a/src/addtimelineclipcommand.cpp b/src/addtimelineclipcommand.cpp index 939de38a..394a7aff 100644 --- a/src/addtimelineclipcommand.cpp +++ b/src/addtimelineclipcommand.cpp @@ -17,11 +17,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include #include "addtimelineclipcommand.h" #include "customtrackview.h" +#include + AddTimelineClipCommand::AddTimelineClipCommand(CustomTrackView *view, QDomElement xml, const QString &clipId, ItemInfo info, EffectsList effects, bool doIt, bool doRemove, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_xml(xml), m_clipId(clipId), m_clipInfo(info), m_effects(effects), m_doIt(doIt), m_remove(doRemove) { if (!m_remove) setText(i18n("Add timeline clip")); else setText(i18n("Delete timeline clip")); diff --git a/src/addtrackcommand.cpp b/src/addtrackcommand.cpp index b47cb119..5e848726 100644 --- a/src/addtrackcommand.cpp +++ b/src/addtrackcommand.cpp @@ -17,11 +17,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include #include "addtrackcommand.h" #include "customtrackview.h" +#include + AddTrackCommand::AddTrackCommand(CustomTrackView *view, int ix, TrackInfo info, bool addTrack, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_ix(ix), m_info(info), m_addTrack(addTrack), m_doIt(doIt) { if (addTrack) setText(i18n("Add track")); else setText(i18n("Delete track")); diff --git a/src/addtransitioncommand.cpp b/src/addtransitioncommand.cpp index e41adff1..7f402f1d 100644 --- a/src/addtransitioncommand.cpp +++ b/src/addtransitioncommand.cpp @@ -14,11 +14,13 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include + #include "addtransitioncommand.h" #include "customtrackview.h" +#include + AddTransitionCommand::AddTransitionCommand(CustomTrackView *view, ItemInfo info, int transitiontrack, QDomElement params, bool remove, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_info(info), m_track(transitiontrack), m_params(params), m_remove(remove), m_doIt(doIt) { if (m_remove) setText(i18n("Delete transition from clip")); else setText(i18n("Add transition to clip")); diff --git a/src/addtransitioncommand.h b/src/addtransitioncommand.h index 67c3383b..1994d10a 100644 --- a/src/addtransitioncommand.h +++ b/src/addtransitioncommand.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef TIMELINETRANSITIONCOMMAND_H -#define TIMELINETRANSITIONCOMMAND_H +#ifndef ADDTRANSITIONCOMMAND_H +#define ADDTRANSITIONCOMMAND_H #include #include diff --git a/src/changespeedcommand.cpp b/src/changespeedcommand.cpp index 35468c91..badcb9b0 100644 --- a/src/changespeedcommand.cpp +++ b/src/changespeedcommand.cpp @@ -17,11 +17,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include #include "changespeedcommand.h" #include "customtrackview.h" +#include + ChangeSpeedCommand::ChangeSpeedCommand(CustomTrackView *view, ItemInfo info, double old_speed, double new_speed, const QString &clipId, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_clipInfo(info), m_old_speed(old_speed), m_new_speed(new_speed), m_clipId(clipId), m_doIt(doIt) { setText(i18n("Adjust clip length")); } diff --git a/src/changetrackcommand.cpp b/src/changetrackcommand.cpp index 6abef1f3..a532d1c3 100644 --- a/src/changetrackcommand.cpp +++ b/src/changetrackcommand.cpp @@ -17,11 +17,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include #include "changetrackcommand.h" #include "customtrackview.h" +#include + ChangeTrackCommand::ChangeTrackCommand(CustomTrackView *view, int ix, TrackInfo oldInfo, TrackInfo newInfo, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_ix(ix), m_oldinfo(oldInfo), m_newinfo(newInfo), m_doIt(doIt) { setText(i18n("Change track type")); } diff --git a/src/clipdurationdialog.cpp b/src/clipdurationdialog.cpp index 3948df27..6d40276e 100644 --- a/src/clipdurationdialog.cpp +++ b/src/clipdurationdialog.cpp @@ -18,11 +18,12 @@ ***************************************************************************/ -#include - -#include "clipitem.h" #include "clipdurationdialog.h" +#include "clipitem.h" #include "kdenlivesettings.h" + +#include + #include ClipDurationDialog::ClipDurationDialog(AbstractClipItem *clip, Timecode tc, QWidget * parent): QDialog(parent), m_tc(tc), m_clip(clip) { diff --git a/src/clipdurationdialog.h b/src/clipdurationdialog.h index f0fbcff9..81536662 100644 --- a/src/clipdurationdialog.h +++ b/src/clipdurationdialog.h @@ -21,7 +21,6 @@ #ifndef CLIPDURATIONDIALOG_H #define CLIPDURATIONDIALOG_H -#include #include "abstractclipitem.h" #include "timecode.h" diff --git a/src/clipitem.cpp b/src/clipitem.cpp index 3f7c3d8d..1aeaec11 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -18,18 +18,6 @@ ***************************************************************************/ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - #include "clipitem.h" #include "customtrackview.h" #include "customtrackscene.h" @@ -39,6 +27,14 @@ #include "kdenlivesettings.h" #include "kthumb.h" +#include + +#include +#include +#include +#include +#include + ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, bool generateThumbs) : AbstractClipItem(info, QRectF(), fps), m_clip(clip), m_resizeMode(NONE), m_grabPoint(0), m_maxTrack(0), m_hasThumbs(false), startThumbTimer(NULL), endThumbTimer(NULL), audioThumbWasDrawn(false), m_opacity(1.0), m_timeLine(0), m_startThumbRequested(false), m_endThumbRequested(false), m_startFade(0), m_endFade(0), m_hover(false), m_selectedEffect(-1), m_speed(speed), framePixelWidth(0), m_startPix(QPixmap()), m_endPix(QPixmap()) { @@ -653,7 +649,7 @@ void ClipItem::paint(QPainter *painter, framepos = br.x() + pos.frames(m_fps); const QRectF r1(framepos + 0.04, 10, itemWidth - framepos - 2, itemHeight - 10); const QRectF r2 = painter->matrix().mapRect(r1); - const QRectF txtBounding = painter->boundingRect(r2, Qt::AlignLeft | Qt::AlignTop, " " + (*it).comment() + " "); + const QRectF txtBounding = painter->boundingRect(r2, Qt::AlignLeft | Qt::AlignTop, ' ' + (*it).comment() + ' '); QPainterPath path; path.addRoundedRect(txtBounding, 3, 3); @@ -719,7 +715,7 @@ void ClipItem::paint(QPainter *painter, } // Draw clip name - QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, " " + m_clipName + " "); + QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, ' ' + m_clipName + ' '); painter->fillRect(txtBounding, QBrush(QColor(0, 0, 0, 150))); //painter->setPen(QColor(0, 0, 0, 180)); //painter->drawText(txtBounding, Qt::AlignCenter, m_clipName); @@ -1352,7 +1348,7 @@ double ClipItem::speed() const { void ClipItem::setSpeed(const double speed) { m_speed = speed; if (m_speed == 1.0) m_clipName = baseClip()->name(); - else m_clipName = baseClip()->name() + " - " + QString::number(speed * 100, 'f', 0) + "%"; + else m_clipName = baseClip()->name() + " - " + QString::number(speed * 100, 'f', 0) + '%'; //update(); } diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp index c310f79d..2960180f 100644 --- a/src/clipmanager.cpp +++ b/src/clipmanager.cpp @@ -16,18 +16,20 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include -#include -#include + +#include "clipmanager.h" #include "addclipcommand.h" #include "kdenlivesettings.h" -#include "clipmanager.h" #include "docclipbase.h" #include "kdenlivedoc.h" #include +#include +#include +#include + ClipManager::ClipManager(KdenliveDoc *doc): m_doc(doc), m_audioThumbsEnabled(false), m_audioThumbsQueue(QList ()), m_generatingAudioId(QString()) { m_clipIdCounter = 1; m_folderIdCounter = 1; diff --git a/src/clipproperties.cpp b/src/clipproperties.cpp index 825ca86e..923fdfb7 100644 --- a/src/clipproperties.cpp +++ b/src/clipproperties.cpp @@ -17,16 +17,17 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include + +#include "clipproperties.h" +#include "kdenlivesettings.h" +#include "kthumb.h" +#include "markerdialog.h" #include #include #include -#include "kdenlivesettings.h" -#include "clipproperties.h" -#include "kthumb.h" -#include "markerdialog.h" +#include static const int VIDEOTAB = 0; static const int AUDIOTAB = 1; diff --git a/src/clipproperties.h b/src/clipproperties.h index 6e486fe0..cae1652b 100644 --- a/src/clipproperties.h +++ b/src/clipproperties.h @@ -18,10 +18,9 @@ ***************************************************************************/ -#ifndef CLIPPROPSDIALOG_H -#define CLIPPROPSDIALOG_H +#ifndef CLIPPROPERTIES_H +#define CLIPPROPERTIES_H -#include #include "definitions.h" #include "timecode.h" diff --git a/src/complexparameter.cpp b/src/complexparameter.cpp index b632e3b7..be688609 100644 --- a/src/complexparameter.cpp +++ b/src/complexparameter.cpp @@ -15,12 +15,12 @@ * * ***************************************************************************/ +#include "complexparameter.h" + #include #include -#include "complexparameter.h" -#include "effectslist.h" -#include "clipitem.h" + #include #include diff --git a/src/customruler.cpp b/src/customruler.cpp index 23241b92..4e4421e5 100644 --- a/src/customruler.cpp +++ b/src/customruler.cpp @@ -17,16 +17,15 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include -#include +#include "customruler.h" #include #include #include #include -#include "customruler.h" - +#include +#include static const int FIX_WIDTH = 24; /* widget width in pixel */ static const int LINE_END = (FIX_WIDTH - 3); diff --git a/src/customruler.h b/src/customruler.h index 76959fcd..f84fdb56 100644 --- a/src/customruler.h +++ b/src/customruler.h @@ -1,3 +1,22 @@ +/*************************************************************************** + * Copyright (C) 2007 by Jean-Baptiste Mardelle (jb@kdenlive.org) * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * + ***************************************************************************/ + #ifndef CUSTOMRULER_H #define CUSTOMRULER_H diff --git a/src/customtrackscene.cpp b/src/customtrackscene.cpp index e2cc7345..9dedfa8b 100644 --- a/src/customtrackscene.cpp +++ b/src/customtrackscene.cpp @@ -17,10 +17,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include - -#include "kdenlivedoc.h" #include "customtrackscene.h" +#include "kdenlivedoc.h" + +#include CustomTrackScene::CustomTrackScene(KdenliveDoc *doc, QObject *parent) : QGraphicsScene(parent), m_document(doc), m_scale(1.0) { diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 49647d3c..bc312dc6 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -17,19 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include #include "customtrackview.h" #include "customtrackscene.h" @@ -52,8 +39,6 @@ #include "razorclipcommand.h" #include "kdenlivesettings.h" #include "transition.h" -#include "clipitem.h" -#include "customtrackview.h" #include "clipmanager.h" #include "renderer.h" #include "markerdialog.h" @@ -70,6 +55,21 @@ #include "initeffects.h" #include "locktrackcommand.h" +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + + //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/docclipbase.cpp b/src/docclipbase.cpp index ade305e4..f82402ad 100644 --- a/src/docclipbase.cpp +++ b/src/docclipbase.cpp @@ -3,7 +3,8 @@ ------------------- begin : Fri Apr 12 2002 copyright : (C) 2002 by Jason Wood - email : jasonwood@blueyonder.co.uk + copyright : (C) 2009 by Jean-Baptiste Mardelle + ***************************************************************************/ /*************************************************************************** @@ -15,15 +16,16 @@ * * ***************************************************************************/ -#include -#include - -#include "kdenlivesettings.h" #include "docclipbase.h" +#include "kdenlivesettings.h" #include "kthumb.h" #include "clipmanager.h" +#include + +#include + DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QString &id): m_id(id), m_description(QString()), m_refcount(0), m_audioThumbCreated(false), m_duration(GenTime()), m_thumbProd(NULL), m_audioTimer(NULL), m_properties(QMap ()), audioFrameChache(QMap > ()), m_baseTrackProducers(QList ()), m_snapMarkers(QList < CommentedTime > ()) { int type = xml.attribute("type").toInt(); diff --git a/src/docclipbase.h b/src/docclipbase.h index a956bf73..a690377a 100644 --- a/src/docclipbase.h +++ b/src/docclipbase.h @@ -50,7 +50,7 @@ class Producer; class DocClipBase: public QObject { Q_OBJECT public: /** this enum determines the types of "feed" available within this clip. types must be non-exclusive - * - e.g. if you can have audio and video seperately, it should be possible to combin the two, as is + * - e.g. if you can have audio and video separately, it should be possible to combin the two, as is * done here. If a new clip type is added then it should be possible to combine it with both audio * and video. */ diff --git a/src/dvdwizard.cpp b/src/dvdwizard.cpp index f35aab08..87219acd 100644 --- a/src/dvdwizard.cpp +++ b/src/dvdwizard.cpp @@ -17,13 +17,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include + +#include "dvdwizard.h" +#include "kdenlivesettings.h" +#include "profilesdialog.h" #include #include @@ -32,9 +29,11 @@ #include #include -#include "kdenlivesettings.h" -#include "profilesdialog.h" -#include "dvdwizard.h" +#include +#include +#include +#include + DvdWizard::DvdWizard(const QString &url, const QString &profile, QWidget *parent): QWizard(parent), m_profile(profile) { //setPixmap(QWizard::WatermarkPixmap, QPixmap(KStandardDirs::locate("appdata", "banner.png"))); diff --git a/src/dvdwizardmenu.cpp b/src/dvdwizardmenu.cpp index a010ef79..189c8163 100644 --- a/src/dvdwizardmenu.cpp +++ b/src/dvdwizardmenu.cpp @@ -17,10 +17,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ +#include "dvdwizardmenu.h" #include -#include "dvdwizardmenu.h" DvdWizardMenu::DvdWizardMenu(const QString &profile, QWidget *parent): QWizardPage(parent) { m_view.setupUi(this); diff --git a/src/dvdwizardvob.cpp b/src/dvdwizardvob.cpp index 2b78a245..3c82cef2 100644 --- a/src/dvdwizardvob.cpp +++ b/src/dvdwizardvob.cpp @@ -17,11 +17,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ +#include "dvdwizardvob.h" + #include #include #include -#include "dvdwizardvob.h" DvdWizardVob::DvdWizardVob(QWidget *parent): QWizardPage(parent) { m_view.setupUi(this); diff --git a/src/editclipcommand.cpp b/src/editclipcommand.cpp index 14ea52fe..90b27cdf 100644 --- a/src/editclipcommand.cpp +++ b/src/editclipcommand.cpp @@ -17,11 +17,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include - #include "editclipcommand.h" #include "projectlist.h" +#include + EditClipCommand::EditClipCommand(ProjectList *list, const QString &id, QMap oldparams, QMap newparams, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_list(list), m_id(id), m_oldparams(oldparams), m_newparams(newparams), m_doIt(doIt) { setText(i18n("Edit clip")); } diff --git a/src/editeffectcommand.cpp b/src/editeffectcommand.cpp index 903e8f45..909ace14 100644 --- a/src/editeffectcommand.cpp +++ b/src/editeffectcommand.cpp @@ -17,11 +17,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include #include "editeffectcommand.h" #include "customtrackview.h" +#include + EditEffectCommand::EditEffectCommand(CustomTrackView *view, const int track, GenTime pos, QDomElement oldeffect, QDomElement effect, int stackPos, bool doIt) : m_view(view), m_track(track), m_pos(pos), m_oldeffect(oldeffect), m_stackPos(stackPos), m_doIt(doIt) { m_effect = effect.cloneNode().toElement(); diff --git a/src/editfoldercommand.cpp b/src/editfoldercommand.cpp index ffc3b877..93183c6f 100644 --- a/src/editfoldercommand.cpp +++ b/src/editfoldercommand.cpp @@ -17,11 +17,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include #include "editfoldercommand.h" #include "projectlist.h" +#include + EditFolderCommand::EditFolderCommand(ProjectList *view, const QString newfolderName, const QString oldfolderName, const QString &clipId, bool doIt, QUndoCommand *parent) : QUndoCommand(parent), m_view(view), m_name(newfolderName), m_oldname(oldfolderName), m_id(clipId), m_doIt(doIt) { setText(i18n("Rename folder")); } diff --git a/src/editguidecommand.cpp b/src/editguidecommand.cpp index c60a90e3..582b76b4 100644 --- a/src/editguidecommand.cpp +++ b/src/editguidecommand.cpp @@ -14,11 +14,13 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include + #include "editguidecommand.h" #include "customtrackview.h" +#include + EditGuideCommand::EditGuideCommand(CustomTrackView *view, const GenTime oldPos, const QString &oldcomment, const GenTime pos, const QString &comment, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_oldPos(oldPos), m_oldcomment(oldcomment), m_pos(pos), m_comment(comment), m_doIt(doIt) { if (m_oldcomment.isEmpty()) setText(i18n("Add guide")); else if (m_oldPos == m_pos) setText(i18n("Edit guide")); diff --git a/src/editkeyframecommand.cpp b/src/editkeyframecommand.cpp index 8e4d397e..ab8ab5fd 100644 --- a/src/editkeyframecommand.cpp +++ b/src/editkeyframecommand.cpp @@ -14,11 +14,13 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include + #include "editkeyframecommand.h" #include "customtrackview.h" +#include + EditKeyFrameCommand::EditKeyFrameCommand(CustomTrackView *view, const int track, GenTime pos, const int effectIndex, const QString& oldkeyframes, const QString& newkeyframes, bool doIt) : m_view(view), m_track(track), m_pos(pos), m_index(effectIndex), m_oldkfr(oldkeyframes), m_newkfr(newkeyframes), m_doIt(doIt) { int prev = m_oldkfr.split(';', QString::SkipEmptyParts).count(); int next = m_newkfr.split(';', QString::SkipEmptyParts).count(); diff --git a/src/edittransitioncommand.cpp b/src/edittransitioncommand.cpp index 89c2081f..66e19b53 100644 --- a/src/edittransitioncommand.cpp +++ b/src/edittransitioncommand.cpp @@ -14,11 +14,12 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include "edittransitioncommand.h" #include "customtrackview.h" +#include + EditTransitionCommand::EditTransitionCommand(CustomTrackView *view, const int track, GenTime pos, QDomElement oldeffect, QDomElement effect, bool doIt) : m_view(view), m_track(track), m_pos(pos), m_oldeffect(oldeffect), m_doIt(doIt) { m_effect = effect.cloneNode().toElement(); diff --git a/src/effectslist.cpp b/src/effectslist.cpp index fecf4b9b..91f1119f 100644 --- a/src/effectslist.cpp +++ b/src/effectslist.cpp @@ -15,11 +15,12 @@ * * ***************************************************************************/ -#include -#include #include "effectslist.h" +#include +#include + EffectsList::EffectsList(): QList < QDomElement > () { diff --git a/src/effectslistview.cpp b/src/effectslistview.cpp index 90060c62..9c94ee3d 100644 --- a/src/effectslistview.cpp +++ b/src/effectslistview.cpp @@ -17,19 +17,19 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include -#include -#include - -#include -#include -#include #include "effectslistview.h" #include "effectslistwidget.h" #include "effectslist.h" #include "kdenlivesettings.h" +#include +#include +#include + +#include +#include + EffectsListView::EffectsListView(QWidget *parent) : QWidget(parent) { ui.setupUi(this); diff --git a/src/effectslistview.h b/src/effectslistview.h index 25cf9859..72c95cc0 100644 --- a/src/effectslistview.h +++ b/src/effectslistview.h @@ -18,8 +18,8 @@ ***************************************************************************/ -#ifndef EFFECTLISTVIEW_H -#define EFFECTLISTVIEW_H +#ifndef EFFECTSLISTVIEW_H +#define EFFECTSLISTVIEW_H #include diff --git a/src/effectslistwidget.cpp b/src/effectslistwidget.cpp index f4453f6b..2f60bc1b 100644 --- a/src/effectslistwidget.cpp +++ b/src/effectslistwidget.cpp @@ -17,16 +17,18 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include "QApplication" -#include "QMouseEvent" -#include - -#include "KDebug" #include "effectslistwidget.h" #include "effectslist.h" #include "mainwindow.h" +#include "KDebug" + +#include "QApplication" +#include "QMouseEvent" +#include + + static const int EFFECT_VIDEO = 1; static const int EFFECT_AUDIO = 2; static const int EFFECT_CUSTOM = 3; diff --git a/src/effectslistwidget.h b/src/effectslistwidget.h index 1091c5b6..127e7346 100644 --- a/src/effectslistwidget.h +++ b/src/effectslistwidget.h @@ -18,8 +18,8 @@ ***************************************************************************/ -#ifndef EFFECTLISTWIDGET_H -#define EFFECTLISTWIDGET_H +#ifndef EFFECTSLISTWIDGET_H +#define EFFECTSLISTWIDGET_H #include #include diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp index 0a4967bc..2adf966a 100644 --- a/src/effectstackedit.cpp +++ b/src/effectstackedit.cpp @@ -15,16 +15,7 @@ * * ***************************************************************************/ -#include -#include -#include -#include -#include -#include - -#include -#include - +#include "effectstackedit.h" #include "ui_constval_ui.h" #include "ui_listval_ui.h" #include "ui_boolval_ui.h" @@ -32,11 +23,19 @@ #include "ui_positionval_ui.h" #include "ui_wipeval_ui.h" #include "complexparameter.h" -#include "effectstackedit.h" #include "geometryval.h" - #include "kdenlivesettings.h" +#include +#include + +#include +#include +#include +#include +#include +#include + QMap EffectStackEdit::iconCache; EffectStackEdit::EffectStackEdit(QWidget *parent): QWidget(parent), m_in(0), m_out(0) { diff --git a/src/effectstackview.cpp b/src/effectstackview.cpp index 87147100..f28ee882 100644 --- a/src/effectstackview.cpp +++ b/src/effectstackview.cpp @@ -15,16 +15,6 @@ * * ***************************************************************************/ -#include -#include -#include -#include -#include - -#include -#include -#include -#include #include "effectstackview.h" #include "effectslist.h" @@ -32,6 +22,17 @@ #include "mainwindow.h" #include "kdenlivesettings.h" +#include +#include +#include +#include + +#include +#include +#include +#include + + EffectStackView::EffectStackView(QWidget *parent) : QWidget(parent) { ui.setupUi(this); diff --git a/src/geometryval.cpp b/src/geometryval.cpp index ac9e0988..a42d96d1 100644 --- a/src/geometryval.cpp +++ b/src/geometryval.cpp @@ -15,20 +15,17 @@ * * ***************************************************************************/ +#include "geometryval.h" +#include "graphicsscenerectmove.h" +#include "kdenlivesettings.h" +#include #include #include -#include #include -#include #include -#include - -#include "graphicsscenerectmove.h" -#include "geometryval.h" -#include "kdenlivesettings.h" Geometryval::Geometryval(const MltVideoProfile profile, QWidget* parent): QWidget(parent), m_profile(profile), m_geom(NULL), m_path(NULL), paramRect(NULL), m_fixedMode(false) { ui.setupUi(this); diff --git a/src/graphicsscenerectmove.cpp b/src/graphicsscenerectmove.cpp index 7fba479b..3c94eccf 100644 --- a/src/graphicsscenerectmove.cpp +++ b/src/graphicsscenerectmove.cpp @@ -1,3 +1,24 @@ +/*************************************************************************** + * copyright (C) 2008 by Marco Gittler * + * Copyright (C) 2008 by Jean-Baptiste Mardelle (jb@kdenlive.org) * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * + ***************************************************************************/ + +#include "graphicsscenerectmove.h" #include #include @@ -11,7 +32,6 @@ #include #include -#include "graphicsscenerectmove.h" GraphicsSceneRectMove::GraphicsSceneRectMove(QObject *parent): QGraphicsScene(parent), m_selectedItem(NULL), resizeMode(NoResize), m_tool(TITLE_RECTANGLE) { //grabMouse(); diff --git a/src/graphicsscenerectmove.h b/src/graphicsscenerectmove.h index 45bd5f7d..7a4b1239 100644 --- a/src/graphicsscenerectmove.h +++ b/src/graphicsscenerectmove.h @@ -1,5 +1,25 @@ -#ifndef GRAPHICSVIEWRECTMOVE_H -#define GRAPHICSVIEWRECTMOVE_H +/*************************************************************************** + * copyright (C) 2008 by Marco Gittler * + * Copyright (C) 2008 by Jean-Baptiste Mardelle (jb@kdenlive.org) * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * + ***************************************************************************/ + +#ifndef GRAPHICSSCENERECTMOVE_H +#define GRAPHICSSCENERECTMOVE_H #include diff --git a/src/guide.cpp b/src/guide.cpp index 37be746d..ed2a85be 100644 --- a/src/guide.cpp +++ b/src/guide.cpp @@ -17,18 +17,16 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ - -#include -#include -#include - -#include - #include "guide.h" #include "customtrackview.h" #include "customtrackscene.h" #include "kdenlivesettings.h" +#include + +#include +#include + Guide::Guide(CustomTrackView *view, GenTime pos, QString label, double fps, double height) : QGraphicsLineItem(), m_view(view), m_position(pos), m_label(label), m_fps(fps) { setFlags(QGraphicsItem::ItemIsMovable); diff --git a/src/headertrack.cpp b/src/headertrack.cpp index 87d22123..0b2f8b8f 100644 --- a/src/headertrack.cpp +++ b/src/headertrack.cpp @@ -17,19 +17,18 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include -#include -#include -#include -#include -#include + +#include "headertrack.h" +#include "kdenlivesettings.h" #include #include #include -#include "kdenlivesettings.h" -#include "headertrack.h" +#include +#include +#include +#include HeaderTrack::HeaderTrack(int index, TrackInfo info, QWidget *parent) : QWidget(parent), m_index(index), m_type(info.type) { diff --git a/src/initeffects.cpp b/src/initeffects.cpp index adb65e27..c6384cfd 100644 --- a/src/initeffects.cpp +++ b/src/initeffects.cpp @@ -17,22 +17,21 @@ * * ***************************************************************************/ - -#include -#include -#include -#include - -#include -#include -#include - #include "initeffects.h" #include "kdenlivesettings.h" #include "effectslist.h" #include "effectstackedit.h" #include "mainwindow.h" +#include +#include +#include + +#include +#include +#include +#include + initEffectsThumbnailer::initEffectsThumbnailer() { } diff --git a/src/insertspacecommand.cpp b/src/insertspacecommand.cpp index c0803572..1a6cc43f 100644 --- a/src/insertspacecommand.cpp +++ b/src/insertspacecommand.cpp @@ -17,11 +17,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include #include "insertspacecommand.h" #include "customtrackview.h" +#include + InsertSpaceCommand::InsertSpaceCommand(CustomTrackView *view, QList clipsToMove, QList transToMove, int track, const GenTime &duration, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_clipsToMove(clipsToMove), m_transToMove(transToMove), m_track(track), m_duration(duration), m_doIt(doIt) { if (duration > GenTime()) setText(i18n("Insert space")); diff --git a/src/jogshuttle.cpp b/src/jogshuttle.cpp index 208706cc..1b6df679 100644 --- a/src/jogshuttle.cpp +++ b/src/jogshuttle.cpp @@ -19,6 +19,20 @@ ***************************************************************************/ +#include "jogshuttle.h" + +#include +#include + +#include +#include + +#include +#include +#include +#include +#include + #define DELAY 10 @@ -54,23 +68,6 @@ #define JOG_STOP 10009 -#include -#include - -#include -#include - -#include -#include -#include -#include -#include - - - -#include "jogshuttle.h" - - void ShuttleThread::init(QObject *parent, QString device) { m_parent = parent; m_device = device; diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp index c6e42c1b..539f87a7 100644 --- a/src/kdenlivedoc.cpp +++ b/src/kdenlivedoc.cpp @@ -17,8 +17,15 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include -#include + +#include "kdenlivedoc.h" +#include "docclipbase.h" +#include "profilesdialog.h" +#include "kdenlivesettings.h" +#include "renderer.h" +#include "clipmanager.h" +#include "titlewidget.h" +#include "mainwindow.h" #include #include @@ -29,17 +36,11 @@ #include #include +#include +#include #include -#include "kdenlivedoc.h" -#include "docclipbase.h" -#include "profilesdialog.h" -#include "kdenlivesettings.h" -#include "renderer.h" -#include "clipmanager.h" -#include "titlewidget.h" -#include "mainwindow.h" KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, const QString &profileName, const QPoint tracks, Render *render, MainWindow *parent): QObject(parent), m_render(render), m_url(url), m_projectFolder(projectFolder), m_commandStack(new QUndoStack(undoGroup)), m_modified(false), m_documentLoadingProgress(0), m_documentLoadingStep(0.0), m_startPos(0), m_zoom(7), m_autosave(NULL), m_zoneStart(0), m_zoneEnd(100), m_abortLoading(false) { m_clipManager = new ClipManager(this); diff --git a/src/kdenlivedoc.h b/src/kdenlivedoc.h index 11456d04..f474ab24 100644 --- a/src/kdenlivedoc.h +++ b/src/kdenlivedoc.h @@ -168,7 +168,7 @@ signals: void updateClipDisplay(const QString&); void deleteTimelineClip(const QString&); void progressInfo(const QString &, int); - /** emited when the document state has been modified (= needs saving or not) */ + /** emitted when the document state has been modified (= needs saving or not) */ void docModified(bool); void selectLastAddedClip(const QString &); void guidesUpdated(); diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg index 503a9a90..3a7661cb 100644 --- a/src/kdenlivesettings.kcfg +++ b/src/kdenlivesettings.kcfg @@ -441,4 +441,4 @@ - \ No newline at end of file + diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp index 285cd4f4..b43bb434 100644 --- a/src/kdenlivesettingsdialog.cpp +++ b/src/kdenlivesettingsdialog.cpp @@ -17,8 +17,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include -#include +#include "kdenlivesettingsdialog.h" +#include "profilesdialog.h" +#include "kdenlivesettings.h" #include #include @@ -26,6 +27,9 @@ #include #include +#include +#include + #include #include #include @@ -34,9 +38,6 @@ #include #endif /* NO_JOGSHUTTLE */ -#include "profilesdialog.h" -#include "kdenlivesettings.h" -#include "kdenlivesettingsdialog.h" KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent): KConfigDialog(parent, "settings", KdenliveSettings::self()) { diff --git a/src/keyframehelper.cpp b/src/keyframehelper.cpp index e8c6dd1f..c0bf5d7a 100644 --- a/src/keyframehelper.cpp +++ b/src/keyframehelper.cpp @@ -17,14 +17,15 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include -#include + +#include "keyframehelper.h" +#include "definitions.h" #include #include -#include "keyframehelper.h" -#include "definitions.h" +#include +#include KeyframeHelper::KeyframeHelper(QWidget *parent) diff --git a/src/kthumb.cpp b/src/kthumb.cpp index f5963c1a..0fb223d9 100644 --- a/src/kthumb.cpp +++ b/src/kthumb.cpp @@ -20,25 +20,23 @@ * * ***************************************************************************/ -#include -#include -#include +#include "kthumb.h" +#include "clipmanager.h" +#include "renderer.h" +#include "kdenlivesettings.h" + +#include #include #include #include -#include #include #include #include -#include - -#include "clipmanager.h" -#include "renderer.h" -#include "kthumb.h" -#include "kdenlivesettings.h" - +#include +#include +#include void MyThread::init(QObject *parent, KUrl url, QString target, double frame, double frameLength, int frequency, int channels, int arrayWidth) { stop_me = false; diff --git a/src/kthumb.h b/src/kthumb.h index f571bdbe..53600f68 100644 --- a/src/kthumb.h +++ b/src/kthumb.h @@ -32,7 +32,7 @@ /**KRender encapsulates the client side of the interface to a renderer. From Kdenlive's point of view, you treat the KRender object as the renderer, and simply use it as if it was local. Calls are asyncrhonous - -you send a call out, and then recieve the return value through the +you send a call out, and then receive the return value through the relevant signal that get's emitted once the call completes. *@author Jason Wood */ diff --git a/src/locktrackcommand.cpp b/src/locktrackcommand.cpp index 9d854a80..f082152d 100644 --- a/src/locktrackcommand.cpp +++ b/src/locktrackcommand.cpp @@ -17,11 +17,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include - #include "locktrackcommand.h" #include "customtrackview.h" +#include + LockTrackCommand::LockTrackCommand(CustomTrackView *view, int ix, bool lock, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_ix(ix), m_lock(lock), m_doIt(doIt) { if (lock) setText(i18n("Lock track")); else setText(i18n("Unlock track")); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 96ba5066..85f5b885 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -17,44 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - #include "mainwindow.h" #include "mainwindowadaptor.h" @@ -86,10 +48,42 @@ #include "titlewidget.h" #include "markerdialog.h" #include "clipitem.h" - #include "interfaces.h" -// #include "scriptingpart.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include static const int ID_STATUS_MSG = 1; static const int ID_EDITMODE_MSG = 2; @@ -2086,7 +2080,7 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip) { void MainWindow::customEvent(QEvent* e) { if (e->type() == QEvent::User) { // The timeline playing position changed... - kDebug() << "RECIEVED JOG EVEMNT!!!"; + kDebug() << "RECEIVED JOG EVEMNT!!!"; } } void MainWindow::slotActivateEffectStackView() { diff --git a/src/managecapturesdialog.cpp b/src/managecapturesdialog.cpp index fbd32451..497564cf 100644 --- a/src/managecapturesdialog.cpp +++ b/src/managecapturesdialog.cpp @@ -17,20 +17,21 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include -#include -#include -#include -#include -#include + +#include "managecapturesdialog.h" +#include "kthumb.h" #include #include #include #include -#include "managecapturesdialog.h" -#include "kthumb.h" +#include +#include +#include +#include +#include +#include ManageCapturesDialog::ManageCapturesDialog(KUrl::List files, QWidget * parent): QDialog(parent) { diff --git a/src/managecapturesdialog.h b/src/managecapturesdialog.h index 75605679..dbddb278 100644 --- a/src/managecapturesdialog.h +++ b/src/managecapturesdialog.h @@ -21,7 +21,6 @@ #ifndef CAPTUREDIALOG_H #define CAPTUREDIALOG_H -#include #include #include diff --git a/src/markerdialog.cpp b/src/markerdialog.cpp index a26b3379..7f32b501 100644 --- a/src/markerdialog.cpp +++ b/src/markerdialog.cpp @@ -17,13 +17,15 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include -#include #include "markerdialog.h" #include "kthumb.h" #include "kdenlivesettings.h" +#include +#include + + MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, const QString &caption, QWidget * parent): QDialog(parent), m_tc(tc), m_clip(clip), m_marker(t), m_producer(NULL), m_profile(NULL) { setFont(KGlobalSettings::toolBarFont()); m_fps = m_tc.fps(); diff --git a/src/markerdialog.h b/src/markerdialog.h index 6a238c0d..6d56e124 100644 --- a/src/markerdialog.h +++ b/src/markerdialog.h @@ -21,7 +21,6 @@ #ifndef MARKERDIALOG_H #define MARKERDIALOG_H -#include #include "docclipbase.h" #include "timecode.h" diff --git a/src/monitor.cpp b/src/monitor.cpp index eb001c65..4faf482a 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -18,6 +18,18 @@ ***************************************************************************/ +#include "monitor.h" +#include "renderer.h" +#include "monitormanager.h" +#include "smallruler.h" +#include "docclipbase.h" + +#include +#include +#include +#include +#include + #include #include #include @@ -26,17 +38,6 @@ #include #include -#include -#include -#include -#include -#include - -#include "monitor.h" -#include "renderer.h" -#include "monitormanager.h" -#include "smallruler.h" -#include "docclipbase.h" Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) : QWidget(parent), render(NULL), m_monitorManager(manager), m_name(name), m_isActive(false), m_currentClip(NULL), m_dragStarted(false) { diff --git a/src/monitormanager.cpp b/src/monitormanager.cpp index 00515de5..c620ece2 100644 --- a/src/monitormanager.cpp +++ b/src/monitormanager.cpp @@ -18,13 +18,14 @@ ***************************************************************************/ -#include -#include +#include "monitormanager.h" +#include "kdenlivesettings.h" #include -#include "monitormanager.h" -#include "kdenlivesettings.h" +#include +#include + MonitorManager::MonitorManager(QWidget *parent) : QObject(parent) { diff --git a/src/moveclipcommand.cpp b/src/moveclipcommand.cpp index 5d9f91c7..fe0d0eda 100644 --- a/src/moveclipcommand.cpp +++ b/src/moveclipcommand.cpp @@ -17,10 +17,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include #include "moveclipcommand.h" #include "customtrackview.h" + +#include + MoveClipCommand::MoveClipCommand(CustomTrackView *view, const ItemInfo start, const ItemInfo end, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_startPos(start), m_endPos(end), m_doIt(doIt) { setText(i18n("Move clip")); } diff --git a/src/moveeffectcommand.cpp b/src/moveeffectcommand.cpp index cc0e90ae..e6271afd 100644 --- a/src/moveeffectcommand.cpp +++ b/src/moveeffectcommand.cpp @@ -17,11 +17,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include #include "moveeffectcommand.h" #include "customtrackview.h" +#include + MoveEffectCommand::MoveEffectCommand(CustomTrackView *view, const int track, GenTime pos, int oldPos, int newPos, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_track(track), m_pos(pos), m_oldindex(oldPos), m_newindex(newPos), m_doIt(doIt) { /* QString effectName; QDomNode namenode = effect.elementsByTagName("name").item(0); diff --git a/src/movegroupcommand.cpp b/src/movegroupcommand.cpp index 38b2ba8f..8d4bd3a4 100644 --- a/src/movegroupcommand.cpp +++ b/src/movegroupcommand.cpp @@ -17,11 +17,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include #include "movegroupcommand.h" #include "customtrackview.h" +#include + MoveGroupCommand::MoveGroupCommand(CustomTrackView *view, const QList startClip, const QList startTransition, const GenTime offset, const int trackOffset, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_startClip(startClip), m_startTransition(startTransition), m_offset(offset), m_trackOffset(trackOffset), m_doIt(doIt) { setText(i18n("Move clip")); } diff --git a/src/movetransitioncommand.cpp b/src/movetransitioncommand.cpp index 2164f157..4b4bf236 100644 --- a/src/movetransitioncommand.cpp +++ b/src/movetransitioncommand.cpp @@ -14,10 +14,12 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include "movetransitioncommand.h" #include "customtrackview.h" + +#include + MoveTransitionCommand::MoveTransitionCommand(CustomTrackView *view, const ItemInfo start, const ItemInfo end, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_startPos(start), m_endPos(end), m_doIt(doIt) { setText(i18n("Move transition")); } diff --git a/src/profilesdialog.cpp b/src/profilesdialog.cpp index 965f8f68..97a822e9 100644 --- a/src/profilesdialog.cpp +++ b/src/profilesdialog.cpp @@ -17,16 +17,16 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include -#include +#include "profilesdialog.h" +#include "kdenlivesettings.h" #include #include #include #include -#include "kdenlivesettings.h" -#include "profilesdialog.h" +#include +#include ProfilesDialog::ProfilesDialog(QWidget * parent): QDialog(parent), m_isCustomProfile(false), m_profileIsModified(false) { m_view.setupUi(this); diff --git a/src/profilesdialog.h b/src/profilesdialog.h index 00b23694..04dbe8dc 100644 --- a/src/profilesdialog.h +++ b/src/profilesdialog.h @@ -21,7 +21,6 @@ #ifndef PROFILESDIALOG_H #define PROFILESDIALOG_H -#include #include "definitions.h" #include "ui_profiledialog_ui.h" diff --git a/src/projectitem.cpp b/src/projectitem.cpp index 37de7250..18211a18 100644 --- a/src/projectitem.cpp +++ b/src/projectitem.cpp @@ -18,21 +18,16 @@ ***************************************************************************/ -#include -#include -#include -#include +#include "projectitem.h" +#include "timecode.h" +#include "kdenlivesettings.h" +#include "docclipbase.h" #include #include #include -#include "projectitem.h" -#include "timecode.h" -#include "kdenlivesettings.h" -#include "docclipbase.h" - const int NameRole = Qt::UserRole; const int DurationRole = NameRole + 1; const int UsageRole = NameRole + 2; diff --git a/src/projectlist.cpp b/src/projectlist.cpp index f632976d..eb936d0a 100644 --- a/src/projectlist.cpp +++ b/src/projectlist.cpp @@ -17,25 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include -#include -//#include - #include "projectlist.h" #include "projectitem.h" #include "addfoldercommand.h" @@ -53,6 +34,25 @@ #include "editclipcommand.h" #include "editfoldercommand.h" + +#include +#include +#include +#include +#include +#include + +#include +#include +//#include + +#include +#include +#include +#include +#include +#include + ProjectList::ProjectList(QWidget *parent) : QWidget(parent), m_render(NULL), m_fps(-1), m_commandStack(NULL), m_selectedItem(NULL), m_infoQueue(QMap ()), m_thumbnailQueue(QList ()), m_refreshed(false), m_editAction(NULL), m_openAction(NULL), m_deleteAction(NULL), m_reloadAction(NULL) { diff --git a/src/projectlist.h b/src/projectlist.h index dc04ec60..e0679d03 100644 --- a/src/projectlist.h +++ b/src/projectlist.h @@ -18,8 +18,8 @@ ***************************************************************************/ -#ifndef PRJECTLIST_H -#define PRJECTLIST_H +#ifndef PROJECTLIST_H +#define PROJECTLIST_H #include #include diff --git a/src/projectlistview.cpp b/src/projectlistview.cpp index d76e85c4..117d0456 100644 --- a/src/projectlistview.cpp +++ b/src/projectlistview.cpp @@ -17,18 +17,18 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include -#include -#include + +#include "projectlistview.h" +#include "projectitem.h" +#include "kdenlivesettings.h" #include #include #include -#include "projectitem.h" -#include "projectlistview.h" -#include "kdenlivesettings.h" - +#include +#include +#include ProjectListView::ProjectListView(QWidget *parent) : QTreeWidget(parent), m_dragStarted(false) { diff --git a/src/projectlistview.h b/src/projectlistview.h index 4b302e5e..cc9be0db 100644 --- a/src/projectlistview.h +++ b/src/projectlistview.h @@ -18,13 +18,16 @@ ***************************************************************************/ -#ifndef PRJECTLISTVIEW_H -#define PRJECTLISTVIEW_H +#ifndef PROJECTLISTVIEW_H +#define PROJECTLISTVIEW_H #include #include #include +class DocClipBase; + +class KUrl; class ProjectListView : public QTreeWidget { Q_OBJECT diff --git a/src/projectsettings.cpp b/src/projectsettings.cpp index 7f1cea7d..0d37b990 100644 --- a/src/projectsettings.cpp +++ b/src/projectsettings.cpp @@ -17,14 +17,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include +#include "projectsettings.h" +#include "kdenlivesettings.h" +#include "profilesdialog.h" #include #include -#include "kdenlivesettings.h" -#include "profilesdialog.h" -#include "projectsettings.h" +#include ProjectSettings::ProjectSettings(int videotracks, int audiotracks, const QString projectPath, bool readOnlyTracks, QWidget * parent): QDialog(parent), m_isCustomProfile(false) { m_view.setupUi(this); diff --git a/src/razorclipcommand.cpp b/src/razorclipcommand.cpp index 7485910a..071351f9 100644 --- a/src/razorclipcommand.cpp +++ b/src/razorclipcommand.cpp @@ -17,11 +17,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include #include "razorclipcommand.h" #include "customtrackview.h" +#include + RazorClipCommand::RazorClipCommand(CustomTrackView *view, const ItemInfo info, const GenTime cutTime, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_info(info), m_cutTime(cutTime), m_doIt(doIt) { setText(i18n("Razor clip")); } diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp index ea57ca3a..479d0568 100644 --- a/src/recmonitor.cpp +++ b/src/recmonitor.cpp @@ -18,25 +18,25 @@ ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include +#include "recmonitor.h" +#include "gentime.h" +#include "kdenlivesettings.h" +#include "managecapturesdialog.h" #include #include +#include #include #include #include #include -#include "gentime.h" -#include "kdenlivesettings.h" -#include "managecapturesdialog.h" -#include "recmonitor.h" +#include +#include +#include +#include +#include + RecMonitor::RecMonitor(QString name, QWidget *parent) : QWidget(parent), m_name(name), m_isActive(false), m_isCapturing(false), m_isPlaying(false), m_didCapture(false) { diff --git a/src/renderer.cpp b/src/renderer.cpp index d5f23306..810944c1 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -22,11 +22,13 @@ * * ***************************************************************************/ -#include -#include -#include -#include +#include "renderer.h" +#include "kdenlivesettings.h" +#include "kthumb.h" +#include "definitions.h" + +#include #include #include @@ -34,13 +36,11 @@ #include #include -#include "renderer.h" -#include "kdenlivesettings.h" -#include "kthumb.h" -#include "definitions.h" - -#include +#include +#include +#include +#include static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr) { // detect if the producer has finished playing. Is there a better way to do it ? @@ -520,7 +520,7 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo } if (producer == NULL || producer->is_blank() || !producer->is_valid()) { - kDebug() << " / / / / / / / /ERRROR / / / / // CANNOT LOAD PRODUCER: "; + kDebug() << " / / / / / / / / ERROR / / / / // CANNOT LOAD PRODUCER: "; emit removeInvalidClip(clipId); return; } @@ -614,7 +614,7 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo char property[200]; if (producer->get_int("video_index") > -1) { /*if (context->duration == AV_NOPTS_VALUE) { - kDebug() << " / / / / / / / /ERRROR / / / CLIP HAS UNKNOWN DURATION"; + kDebug() << " / / / / / / / /ERROR / / / CLIP HAS UNKNOWN DURATION"; emit removeInvalidClip(clipId); return; }*/ @@ -681,7 +681,7 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bo QString name = metadata.get_name(i); QString value = QString::fromUtf8(metadata.get(i)); if (name.endsWith("markup") && !value.isEmpty()) - metadataPropertyMap[ name.section(".", 0, -2)] = value; + metadataPropertyMap[ name.section('.', 0, -2)] = value; } emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer); diff --git a/src/renderer.h b/src/renderer.h index 3f3fbe0d..8685765e 100644 --- a/src/renderer.h +++ b/src/renderer.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef KRENDER_H -#define KRENDER_H +#ifndef RENDERER_H +#define RENDERER_H #include #include @@ -37,7 +37,8 @@ relevant signal that get's emitted once the call completes. */ class Render; -//class EffectParamDesc; + +class QTimer; class QPixmap; namespace Mlt { diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp index 461bd71b..92e4c614 100644 --- a/src/renderwidget.cpp +++ b/src/renderwidget.cpp @@ -18,14 +18,9 @@ ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include +#include "renderwidget.h" +#include "kdenlivesettings.h" +#include "ui_saveprofile_ui.h" #include #include @@ -35,9 +30,14 @@ #include // #include -#include "kdenlivesettings.h" -#include "renderwidget.h" -#include "ui_saveprofile_ui.h" +#include +#include +#include +#include +#include +#include +#include +#include const int GroupRole = Qt::UserRole; const int ExtensionRole = GroupRole + 1; @@ -614,7 +614,7 @@ void RenderWidget::slotExport(bool scriptExport) { if (group == "dvd" && m_view.open_dvd->isChecked()) { renderItem->setData(0, Qt::UserRole, group); if (renderArgs.contains("profile=")) { - // rendering profile contains an MLT profile, so pass it to the running jog item, usefull for dvd + // rendering profile contains an MLT profile, so pass it to the running jog item, useful for dvd QString prof = renderArgs.section("profile=", 1, 1); prof = prof.section(' ', 0, 0); kDebug() << "// render profile: " << prof; diff --git a/src/renderwidget.h b/src/renderwidget.h index 926e0e54..a97a8b1a 100644 --- a/src/renderwidget.h +++ b/src/renderwidget.h @@ -21,7 +21,6 @@ #ifndef RENDERWIDGET_H #define RENDERWIDGET_H -#include #include #include #include @@ -29,6 +28,8 @@ #include "definitions.h" #include "ui_renderwidget_ui.h" +class QDomElement; + // RenderViewDelegate is used to draw the progress bars. class RenderViewDelegate : public QItemDelegate { diff --git a/src/resizeclipcommand.cpp b/src/resizeclipcommand.cpp index f76c7687..3f491c37 100644 --- a/src/resizeclipcommand.cpp +++ b/src/resizeclipcommand.cpp @@ -17,11 +17,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include #include "resizeclipcommand.h" #include "customtrackview.h" +#include + ResizeClipCommand::ResizeClipCommand(CustomTrackView *view, const ItemInfo start, const ItemInfo end, bool doIt, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_startPos(start), m_endPos(end), m_doIt(doIt) { setText(i18n("Resize clip")); } diff --git a/src/slideshowclip.cpp b/src/slideshowclip.cpp index 01b33b72..bd5f12df 100644 --- a/src/slideshowclip.cpp +++ b/src/slideshowclip.cpp @@ -17,14 +17,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include +#include "slideshowclip.h" +#include "kdenlivesettings.h" #include #include #include -#include "kdenlivesettings.h" -#include "slideshowclip.h" +#include SlideshowClip::SlideshowClip(QWidget * parent): QDialog(parent), m_count(0) { setFont(KGlobalSettings::toolBarFont()); diff --git a/src/slideshowclip.h b/src/slideshowclip.h index fd4c32cc..7c101c6f 100644 --- a/src/slideshowclip.h +++ b/src/slideshowclip.h @@ -18,10 +18,9 @@ ***************************************************************************/ -#ifndef SLIDESHOWDIALOG_H -#define SLIDESHOWDIALOG_H +#ifndef SLIDESHOWCLIP_H +#define SLIDESHOWCLIP_H -#include #include "definitions.h" #include "docclipbase.h" diff --git a/src/smallruler.cpp b/src/smallruler.cpp index fdd6fd9f..a07d1755 100644 --- a/src/smallruler.cpp +++ b/src/smallruler.cpp @@ -18,13 +18,12 @@ ***************************************************************************/ -#include -#include +#include "smallruler.h" #include -#include "smallruler.h" - +#include +#include SmallRuler::SmallRuler(QWidget *parent) : QWidget(parent), m_scale(1), m_maxval(25) { diff --git a/src/spacerdialog.cpp b/src/spacerdialog.cpp index 756dd5ef..cb0fc9ba 100644 --- a/src/spacerdialog.cpp +++ b/src/spacerdialog.cpp @@ -17,13 +17,15 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include -#include #include "spacerdialog.h" #include "kthumb.h" #include "kdenlivesettings.h" +#include +#include + + SpacerDialog::SpacerDialog(const GenTime duration, Timecode tc, int track, int trackNumber, QWidget * parent): QDialog(parent), m_tc(tc) { setFont(KGlobalSettings::toolBarFont()); m_fps = m_tc.fps(); diff --git a/src/spacerdialog.h b/src/spacerdialog.h index e474a3b5..516de61a 100644 --- a/src/spacerdialog.h +++ b/src/spacerdialog.h @@ -21,7 +21,6 @@ #ifndef SPACERDIALOG_H #define SPACERDIALOG_H -#include #include "timecode.h" #include "ui_spacerdialog_ui.h" diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp index f0e43c3d..ed1b6801 100644 --- a/src/titlewidget.cpp +++ b/src/titlewidget.cpp @@ -15,25 +15,21 @@ * * ***************************************************************************/ +#include "titlewidget.h" +#include "kdenlivesettings.h" +#include +#include +#include +#include -#include #include #include #include #include - #include #include -#include -#include -#include -#include - -#include "titlewidget.h" -#include "kdenlivesettings.h" - int settingUp = false; TitleWidget::TitleWidget(KUrl url, QString projectPath, Render *render, QWidget *parent): QDialog(parent), m_render(render), m_count(0), m_projectPath(projectPath), startViewport(NULL), endViewport(NULL) { diff --git a/src/titlewidget.h b/src/titlewidget.h index a67112b7..9378aac7 100644 --- a/src/titlewidget.h +++ b/src/titlewidget.h @@ -19,8 +19,6 @@ #define TITLEWIDGET_H -#include - #include #include "ui_titlewidget_ui.h" diff --git a/src/trackview.cpp b/src/trackview.cpp index c1f66bad..72cf2823 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -18,14 +18,9 @@ ***************************************************************************/ -#include - -#include -#include - +#include "trackview.h" #include "definitions.h" #include "headertrack.h" -#include "trackview.h" #include "clipitem.h" #include "transition.h" #include "kdenlivesettings.h" @@ -36,6 +31,11 @@ #include "customtrackview.h" #include "initeffects.h" +#include +#include + +#include + TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) : QWidget(parent), m_doc(doc), m_scale(1.0), m_projectTracks(0) { diff --git a/src/trackview.h b/src/trackview.h index ae88ac2c..8a0c06c8 100644 --- a/src/trackview.h +++ b/src/trackview.h @@ -29,7 +29,6 @@ #include #include -#define FRAME_SIZE 90 #include "customtrackscene.h" #include "ui_timeline_ui.h" diff --git a/src/transition.cpp b/src/transition.cpp index d574e5f6..e345d08f 100644 --- a/src/transition.cpp +++ b/src/transition.cpp @@ -15,24 +15,22 @@ * * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - #include "transition.h" #include "clipitem.h" #include "kdenlivesettings.h" #include "customtrackscene.h" #include "mainwindow.h" +#include +#include +#include + +#include +#include +#include +#include + + Transition::Transition(const ItemInfo info, int transitiontrack, double fps, QDomElement params, bool automaticTransition) : AbstractClipItem(info, QRectF(), fps), m_automaticTransition(automaticTransition), m_forceTransitionTrack(false) { setZValue(2); setRect(0, 0, (info.endPos - info.startPos).frames(fps) - 0.02, (qreal)(KdenliveSettings::trackheight() / 3 * 2 - 1)); diff --git a/src/transitionsettings.cpp b/src/transitionsettings.cpp index 304c6f95..cfa77d1a 100644 --- a/src/transitionsettings.cpp +++ b/src/transitionsettings.cpp @@ -16,7 +16,6 @@ ***************************************************************************/ -#include #include "transitionsettings.h" #include "transition.h" @@ -25,6 +24,8 @@ #include "kdenlivesettings.h" #include "mainwindow.h" +#include + TransitionSettings::TransitionSettings(QWidget* parent): QWidget(parent), m_tracksCount(0), m_usedTransition(NULL) { ui.setupUi(this); effectEdit = new EffectStackEdit(ui.frame); diff --git a/src/wizard.cpp b/src/wizard.cpp index c6865623..c858906c 100644 --- a/src/wizard.cpp +++ b/src/wizard.cpp @@ -17,20 +17,19 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include -#include -#include -#include -#include +#include "wizard.h" +#include "kdenlivesettings.h" +#include "profilesdialog.h" #include #include #include #include -#include "kdenlivesettings.h" -#include "profilesdialog.h" -#include "wizard.h" +#include +#include +#include +#include Wizard::Wizard(QWidget *parent): QWizard(parent) { setPixmap(QWizard::WatermarkPixmap, QPixmap(KStandardDirs::locate("appdata", "banner.png"))); diff --git a/thumbnailer/westleypreview.cpp b/thumbnailer/westleypreview.cpp index c6679bfc..547fd5d0 100644 --- a/thumbnailer/westleypreview.cpp +++ b/thumbnailer/westleypreview.cpp @@ -18,6 +18,8 @@ Boston, MA 02110-1301, USA. ***************************************************************************/ +#include "westleypreview.h" + #include #include #include @@ -34,7 +36,6 @@ #include -#include "westleypreview.h" #define DBG_AREA diff --git a/thumbnailer/westleypreview.h b/thumbnailer/westleypreview.h index 79820acc..3b85cf15 100644 --- a/thumbnailer/westleypreview.h +++ b/thumbnailer/westleypreview.h @@ -20,21 +20,19 @@ ***************************************************************************/ -#ifndef _westleypreview_H_ -#define _westleypreview_H_ - -#include +#ifndef WESTLEYPREVIEW_H +#define WESTLEYPREVIEW_H #include + +#include +#include #include class QProcess; class KTempDir; class KRandomSequence; - - - class WestleyPreview : public QObject, public ThumbCreator { Q_OBJECT public: -- 2.39.5