From 5ee798aed90c5a3a50024e6b5bd26753e03ec7cc Mon Sep 17 00:00:00 2001 From: Ray Lehtiniemi Date: Sun, 5 Apr 2009 22:21:33 +0000 Subject: [PATCH] Reformat initializer lists in all constructors. Use a consistent, readable format for all initializers. This layout facilitates the next several patches, which implement Effective C++ recommendations and remove compiler warnings. The layout also works with the astyle settings in the reindent script. Signed-off-by: Ray Lehtiniemi svn path=/trunk/kdenlive/; revision=3225 --- renderer/renderjob.cpp | 6 +++++- src/abstractclipitem.cpp | 8 +++++++- src/abstractgroupitem.cpp | 4 +++- src/addclipcommand.cpp | 7 ++++++- src/addeffectcommand.cpp | 8 +++++++- src/addfoldercommand.cpp | 7 ++++++- src/addmarkercommand.cpp | 8 +++++++- src/addtimelineclipcommand.cpp | 10 +++++++++- src/addtrackcommand.cpp | 7 ++++++- src/addtransitioncommand.cpp | 9 ++++++++- src/changecliptypecommand.cpp | 10 +++++++++- src/changespeedcommand.cpp | 8 +++++++- src/changetrackcommand.cpp | 7 ++++++- src/clipdurationdialog.cpp | 5 ++++- src/clipitem.cpp | 26 ++++++++++++++++++++++++-- src/clipmanager.cpp | 6 +++++- src/clipproperties.cpp | 8 +++++++- src/complexparameter.cpp | 4 ++-- src/customruler.cpp | 8 ++++++-- src/customtrackscene.cpp | 6 ++++-- src/customtrackview.cpp | 30 ++++++++++++++++++++++++++++-- src/docclipbase.cpp | 16 ++++++++++++++-- src/dvdwizard.cpp | 6 +++++- src/dvdwizardmenu.cpp | 3 ++- src/dvdwizardvob.cpp | 3 ++- src/editclipcommand.cpp | 8 +++++++- src/editeffectcommand.cpp | 9 +++++++-- src/editfoldercommand.cpp | 8 +++++++- src/editguidecommand.cpp | 9 ++++++++- src/editkeyframecommand.cpp | 9 ++++++++- src/edittransitioncommand.cpp | 8 ++++++-- src/effectslist.cpp | 2 +- src/effectslistview.cpp | 4 ++-- src/effectslistwidget.cpp | 5 +++-- src/effectstackedit.cpp | 5 ++++- src/effectstackview.cpp | 4 ++-- src/geometryval.cpp | 8 +++++++- src/graphicsscenerectmove.cpp | 6 +++++- src/groupclipscommand.cpp | 7 ++++++- src/guide.cpp | 8 ++++++-- src/headertrack.cpp | 6 ++++-- src/insertspacecommand.cpp | 10 ++++++++-- src/jogshuttle.cpp | 3 ++- src/kdenlivedoc.cpp | 16 +++++++++++++++- src/kdenlivesettingsdialog.cpp | 3 ++- src/keyframehelper.cpp | 7 +++++-- src/kthumb.cpp | 4 ++-- src/locktrackcommand.cpp | 6 +++++- src/mainwindow.cpp | 11 +++++++---- src/managecapturesdialog.cpp | 3 ++- src/markerdialog.cpp | 8 +++++++- src/monitor.cpp | 18 ++++++++++++++---- src/monitormanager.cpp | 4 ++-- src/moveclipcommand.cpp | 7 ++++++- src/moveeffectcommand.cpp | 8 +++++++- src/movegroupcommand.cpp | 9 ++++++++- src/movetransitioncommand.cpp | 7 ++++++- src/parameterplotter.cpp | 3 ++- src/profilesdialog.cpp | 5 ++++- src/projectitem.cpp | 16 ++++++++++------ src/projectlist.cpp | 15 +++++++++++++-- src/projectlistview.cpp | 5 +++-- src/projectsettings.cpp | 4 +++- src/razorclipcommand.cpp | 6 +++++- src/recmonitor.cpp | 9 +++++++-- src/regiongrabber.cpp | 24 +++++++++++++++++------- src/renderer.cpp | 15 ++++++++++++++- src/renderwidget.cpp | 4 +++- src/resizeclipcommand.cpp | 7 ++++++- src/slideshowclip.cpp | 4 +++- src/smallruler.cpp | 6 ++++-- src/spacerdialog.cpp | 4 +++- src/splitaudiocommand.cpp | 6 +++++- src/timecode.cpp | 5 +++-- src/titlewidget.cpp | 8 +++++++- src/trackview.cpp | 7 +++++-- src/transition.cpp | 5 ++++- src/transitionsettings.cpp | 5 ++++- src/wizard.cpp | 3 ++- thumbnailer/westleypreview.cpp | 5 +++-- 80 files changed, 500 insertions(+), 121 deletions(-) diff --git a/renderer/renderjob.cpp b/renderer/renderjob.cpp index bdd6e1cc..a743cfb4 100644 --- a/renderer/renderjob.cpp +++ b/renderer/renderjob.cpp @@ -36,7 +36,11 @@ public: static QDBusConnection connection(QLatin1String("")); -RenderJob::RenderJob(bool erase, bool usekuiserver, const QString &renderer, const QString &profile, const QString &rendermodule, const QString &player, const QString &scenelist, const QString &dest, const QStringList &preargs, const QStringList &args, int in, int out) : QObject(), m_usekuiserver(usekuiserver), m_jobUiserver(NULL), m_kdenliveinterface(NULL) +RenderJob::RenderJob(bool erase, bool usekuiserver, const QString &renderer, const QString &profile, const QString &rendermodule, const QString &player, const QString &scenelist, const QString &dest, const QStringList &preargs, const QStringList &args, int in, int out) : + QObject(), + m_usekuiserver(usekuiserver), + m_jobUiserver(NULL), + m_kdenliveinterface(NULL) { m_scenelist = scenelist; m_dest = dest; diff --git a/src/abstractclipitem.cpp b/src/abstractclipitem.cpp index c6bd71fd..40142a68 100644 --- a/src/abstractclipitem.cpp +++ b/src/abstractclipitem.cpp @@ -28,7 +28,13 @@ #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) +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); setTrack(info.track); diff --git a/src/abstractgroupitem.cpp b/src/abstractgroupitem.cpp index c2fc010d..756e2943 100644 --- a/src/abstractgroupitem.cpp +++ b/src/abstractgroupitem.cpp @@ -32,7 +32,9 @@ #include -AbstractGroupItem::AbstractGroupItem(double fps): QGraphicsItemGroup(), m_fps(fps) +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 ef516dde..44df4d5b 100644 --- a/src/addclipcommand.cpp +++ b/src/addclipcommand.cpp @@ -23,7 +23,12 @@ #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) +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 c16cec64..2a982bb3 100644 --- a/src/addeffectcommand.cpp +++ b/src/addeffectcommand.cpp @@ -23,7 +23,13 @@ #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) +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 7d0184ee..b5146d96 100644 --- a/src/addfoldercommand.cpp +++ b/src/addfoldercommand.cpp @@ -23,7 +23,12 @@ #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) +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 adec5022..dd551846 100644 --- a/src/addmarkercommand.cpp +++ b/src/addmarkercommand.cpp @@ -21,7 +21,13 @@ #include -AddMarkerCommand::AddMarkerCommand(CustomTrackView *view, const QString &oldcomment, const QString &comment, const QString &id, const GenTime &pos, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_oldcomment(oldcomment), m_comment(comment), m_id(id), m_pos(pos) +AddMarkerCommand::AddMarkerCommand(CustomTrackView *view, const QString &oldcomment, const QString &comment, const QString &id, const GenTime &pos, QUndoCommand * parent) : + QUndoCommand(parent), + m_view(view), + m_oldcomment(oldcomment), + m_comment(comment), + m_id(id), + m_pos(pos) { 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 3f75319b..437a0522 100644 --- a/src/addtimelineclipcommand.cpp +++ b/src/addtimelineclipcommand.cpp @@ -23,7 +23,15 @@ #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) +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 89bf7deb..09083719 100644 --- a/src/addtrackcommand.cpp +++ b/src/addtrackcommand.cpp @@ -23,7 +23,12 @@ #include -AddTrackCommand::AddTrackCommand(CustomTrackView *view, int ix, TrackInfo info, bool addTrack, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_ix(ix), m_info(info), m_addTrack(addTrack) +AddTrackCommand::AddTrackCommand(CustomTrackView *view, int ix, TrackInfo info, bool addTrack, QUndoCommand * parent) : + QUndoCommand(parent), + m_view(view), + m_ix(ix), + m_info(info), + m_addTrack(addTrack) { if (addTrack) setText(i18n("Add track")); else setText(i18n("Delete track")); diff --git a/src/addtransitioncommand.cpp b/src/addtransitioncommand.cpp index ec3ff832..7469f3f8 100644 --- a/src/addtransitioncommand.cpp +++ b/src/addtransitioncommand.cpp @@ -21,7 +21,14 @@ #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) +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/changecliptypecommand.cpp b/src/changecliptypecommand.cpp index d5c9e31f..2822cfbb 100644 --- a/src/changecliptypecommand.cpp +++ b/src/changecliptypecommand.cpp @@ -23,7 +23,15 @@ #include -ChangeClipTypeCommand::ChangeClipTypeCommand(CustomTrackView *view, const int track, const GenTime &pos, bool videoOnly, bool audioOnly, bool originalVideo, bool originalAudio, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_track(track), m_pos(pos), m_videoOnly(videoOnly), m_audioOnly(audioOnly), m_originalVideoOnly(originalVideo), m_originalAudioOnly(originalAudio) +ChangeClipTypeCommand::ChangeClipTypeCommand(CustomTrackView *view, const int track, const GenTime &pos, bool videoOnly, bool audioOnly, bool originalVideo, bool originalAudio, QUndoCommand * parent) : + QUndoCommand(parent), + m_view(view), + m_track(track), + m_pos(pos), + m_videoOnly(videoOnly), + m_audioOnly(audioOnly), + m_originalVideoOnly(originalVideo), + m_originalAudioOnly(originalAudio) { setText(i18n("Change clip type")); } diff --git a/src/changespeedcommand.cpp b/src/changespeedcommand.cpp index f99baead..b44fb4d6 100644 --- a/src/changespeedcommand.cpp +++ b/src/changespeedcommand.cpp @@ -23,7 +23,13 @@ #include -ChangeSpeedCommand::ChangeSpeedCommand(CustomTrackView *view, ItemInfo info, double old_speed, double new_speed, const QString &clipId, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_clipInfo(info), m_old_speed(old_speed), m_new_speed(new_speed), m_clipId(clipId) +ChangeSpeedCommand::ChangeSpeedCommand(CustomTrackView *view, ItemInfo info, double old_speed, double new_speed, const QString &clipId, QUndoCommand * parent) : + QUndoCommand(parent), + m_view(view), + m_clipInfo(info), + m_old_speed(old_speed), + m_new_speed(new_speed), + m_clipId(clipId) { setText(i18n("Adjust clip length")); } diff --git a/src/changetrackcommand.cpp b/src/changetrackcommand.cpp index da87e7d7..f68ea929 100644 --- a/src/changetrackcommand.cpp +++ b/src/changetrackcommand.cpp @@ -23,7 +23,12 @@ #include -ChangeTrackCommand::ChangeTrackCommand(CustomTrackView *view, int ix, TrackInfo oldInfo, TrackInfo newInfo, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_ix(ix), m_oldinfo(oldInfo), m_newinfo(newInfo) +ChangeTrackCommand::ChangeTrackCommand(CustomTrackView *view, int ix, TrackInfo oldInfo, TrackInfo newInfo, QUndoCommand * parent) : + QUndoCommand(parent), + m_view(view), + m_ix(ix), + m_oldinfo(oldInfo), + m_newinfo(newInfo) { setText(i18n("Change track type")); } diff --git a/src/clipdurationdialog.cpp b/src/clipdurationdialog.cpp index e941293d..26c3795e 100644 --- a/src/clipdurationdialog.cpp +++ b/src/clipdurationdialog.cpp @@ -26,7 +26,10 @@ #include -ClipDurationDialog::ClipDurationDialog(AbstractClipItem *clip, Timecode tc, QWidget * parent): QDialog(parent), m_tc(tc), m_clip(clip) +ClipDurationDialog::ClipDurationDialog(AbstractClipItem *clip, Timecode tc, QWidget * parent): + QDialog(parent), + m_tc(tc), + m_clip(clip) { setFont(KGlobalSettings::toolBarFont()); m_fps = m_tc.fps(); diff --git a/src/clipitem.cpp b/src/clipitem.cpp index f1b4bc87..7e7b517b 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -36,8 +36,30 @@ #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()), m_videoOnly(false), m_audioOnly(false) +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()), + m_videoOnly(false), + m_audioOnly(false) { setZValue(1); setRect(0, 0, (info.endPos - info.startPos).frames(fps) - 0.02, (double)(KdenliveSettings::trackheight() - 2)); diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp index a5850f26..c857fda6 100644 --- a/src/clipmanager.cpp +++ b/src/clipmanager.cpp @@ -34,7 +34,11 @@ #include -ClipManager::ClipManager(KdenliveDoc *doc): m_doc(doc), m_audioThumbsEnabled(false), m_audioThumbsQueue(QList ()), m_generatingAudioId(QString()) +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 bff6d906..4f5b2242 100644 --- a/src/clipproperties.cpp +++ b/src/clipproperties.cpp @@ -43,7 +43,13 @@ static const int TYPE_PNG = 1; static const int TYPE_BMP = 2; static const int TYPE_GIF = 3; -ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidget * parent): QDialog(parent), m_tc(tc), m_clip(clip), m_fps(fps), m_clipNeedsRefresh(false), m_count(0) +ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidget * parent) : + QDialog(parent), + m_tc(tc), + m_clip(clip), + m_fps(fps), + m_clipNeedsRefresh(false), + m_count(0) { setFont(KGlobalSettings::toolBarFont()); m_view.setupUi(this); diff --git a/src/complexparameter.cpp b/src/complexparameter.cpp index 1c89a8a3..bf2a6d0e 100644 --- a/src/complexparameter.cpp +++ b/src/complexparameter.cpp @@ -24,8 +24,8 @@ #include #include -ComplexParameter::ComplexParameter(QWidget *parent) - : QWidget(parent) +ComplexParameter::ComplexParameter(QWidget *parent) : + QWidget(parent) { ui.setupUi(this); //ui.effectlist->horizontalHeader()->setVisible(false); diff --git a/src/customruler.cpp b/src/customruler.cpp index fad7268c..b47bed2e 100644 --- a/src/customruler.cpp +++ b/src/customruler.cpp @@ -52,8 +52,12 @@ static int bigMarkDistance; const int CustomRuler::comboScale[] = { 1, 2, 5, 10, 25, 50, 125, 250, 500, 725, 1500, 3000, 6000, 12000}; -CustomRuler::CustomRuler(Timecode tc, CustomTrackView *parent) - : QWidget(parent), m_timecode(tc), m_view(parent), m_duration(0), m_offset(0) +CustomRuler::CustomRuler(Timecode tc, CustomTrackView *parent) : + QWidget(parent), + m_timecode(tc), + m_view(parent), + m_duration(0), + m_offset(0) { setFont(KGlobalSettings::toolBarFont()); m_scale = 3; diff --git a/src/customtrackscene.cpp b/src/customtrackscene.cpp index 76ae1def..eff28595 100644 --- a/src/customtrackscene.cpp +++ b/src/customtrackscene.cpp @@ -22,8 +22,10 @@ #include -CustomTrackScene::CustomTrackScene(KdenliveDoc *doc, QObject *parent) - : QGraphicsScene(parent), m_document(doc), m_scale(1.0) +CustomTrackScene::CustomTrackScene(KdenliveDoc *doc, QObject *parent) : + QGraphicsScene(parent), + m_document(doc), + m_scale(1.0) { m_transitionPixmap = QPixmap(KStandardDirs::locate("appdata", "transition.png")); } diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 435c9ef2..30b0b42a 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -81,8 +81,34 @@ // const bool animate = KGlobalSettings::graphicEffectsLevel() & KGlobalSettings::SimpleAnimationEffects; // const int duration = animate ? 1500 : 1; -CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscene, QWidget *parent) - : QGraphicsView(projectscene, parent), m_scene(projectscene), m_cursorPos(0), m_cursorLine(NULL), m_operationMode(NONE), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_clickPoint(QPoint()), m_document(doc), m_autoScroll(KdenliveSettings::autoscroll()), m_tracksHeight(KdenliveSettings::trackheight()), m_tool(SELECTTOOL), m_dragGuide(NULL), m_findIndex(0), m_menuPosition(QPoint()), m_blockRefresh(false), m_selectionGroup(NULL), m_selectedTrack(0), m_copiedItems(QList ()), m_scrollOffset(0), m_changeSpeedAction(NULL), m_pasteEffectsAction(NULL), m_ungroupAction(NULL), m_clipDrag(false) +CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscene, QWidget *parent) : + QGraphicsView(projectscene, parent), + m_scene(projectscene), + m_cursorPos(0), + m_cursorLine(NULL), + m_operationMode(NONE), + m_dragItem(NULL), + m_visualTip(NULL), + m_moveOpMode(NONE), + m_animation(NULL), + m_projectDuration(0), + m_clickPoint(QPoint()), + m_document(doc), + m_autoScroll(KdenliveSettings::autoscroll()), + m_tracksHeight(KdenliveSettings::trackheight()), + m_tool(SELECTTOOL), + m_dragGuide(NULL), + m_findIndex(0), + m_menuPosition(QPoint()), + m_blockRefresh(false), + m_selectionGroup(NULL), + m_selectedTrack(0), + m_copiedItems(QList ()), + m_scrollOffset(0), + m_changeSpeedAction(NULL), + m_pasteEffectsAction(NULL), + m_ungroupAction(NULL), + m_clipDrag(false) { if (doc) m_commandStack = doc->commandStack(); else m_commandStack = NULL; diff --git a/src/docclipbase.cpp b/src/docclipbase.cpp index 5d8521e4..e843889a 100644 --- a/src/docclipbase.cpp +++ b/src/docclipbase.cpp @@ -33,8 +33,20 @@ #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 > ()), m_videoOnlyProducer(NULL), m_audioTrackProducers(QList ()) +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 > ()), + m_videoOnlyProducer(NULL), + m_audioTrackProducers(QList ()) { int type = xml.attribute("type").toInt(); m_clipType = (CLIPTYPE) type; diff --git a/src/dvdwizard.cpp b/src/dvdwizard.cpp index e1e7e2d5..86d01a85 100644 --- a/src/dvdwizard.cpp +++ b/src/dvdwizard.cpp @@ -35,7 +35,11 @@ #include -DvdWizard::DvdWizard(const QString &url, const QString &profile, QWidget *parent): QWizard(parent), m_profile(profile), m_dvdauthor(NULL), m_mkiso(NULL) +DvdWizard::DvdWizard(const QString &url, const QString &profile, QWidget *parent) : + QWizard(parent), + m_profile(profile), + m_dvdauthor(NULL), + m_mkiso(NULL) { //setPixmap(QWizard::WatermarkPixmap, QPixmap(KStandardDirs::locate("appdata", "banner.png"))); setAttribute(Qt::WA_DeleteOnClose); diff --git a/src/dvdwizardmenu.cpp b/src/dvdwizardmenu.cpp index 8e99cdfd..fefa8e80 100644 --- a/src/dvdwizardmenu.cpp +++ b/src/dvdwizardmenu.cpp @@ -22,7 +22,8 @@ #include -DvdWizardMenu::DvdWizardMenu(const QString &profile, QWidget *parent): QWizardPage(parent) +DvdWizardMenu::DvdWizardMenu(const QString &profile, QWidget *parent) : + QWizardPage(parent) { m_view.setupUi(this); m_view.play_text->setText(i18n("Play")); diff --git a/src/dvdwizardvob.cpp b/src/dvdwizardvob.cpp index 9356f018..6955eb69 100644 --- a/src/dvdwizardvob.cpp +++ b/src/dvdwizardvob.cpp @@ -26,7 +26,8 @@ #include -DvdWizardVob::DvdWizardVob(QWidget *parent): QWizardPage(parent) +DvdWizardVob::DvdWizardVob(QWidget *parent) : + QWizardPage(parent) { m_view.setupUi(this); m_view.intro_vob->setEnabled(false); diff --git a/src/editclipcommand.cpp b/src/editclipcommand.cpp index bef3b9c6..db4cad81 100644 --- a/src/editclipcommand.cpp +++ b/src/editclipcommand.cpp @@ -22,7 +22,13 @@ #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) +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 22817750..191631dc 100644 --- a/src/editeffectcommand.cpp +++ b/src/editeffectcommand.cpp @@ -23,8 +23,13 @@ #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) +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(); QString effectName; diff --git a/src/editfoldercommand.cpp b/src/editfoldercommand.cpp index 974c2514..6dbcd7fc 100644 --- a/src/editfoldercommand.cpp +++ b/src/editfoldercommand.cpp @@ -23,7 +23,13 @@ #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) +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 0b476569..dd22fd2a 100644 --- a/src/editguidecommand.cpp +++ b/src/editguidecommand.cpp @@ -21,7 +21,14 @@ #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) +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 92028525..fed063e1 100644 --- a/src/editkeyframecommand.cpp +++ b/src/editkeyframecommand.cpp @@ -21,7 +21,14 @@ #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) +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 93ffbfd4..b66d7a32 100644 --- a/src/edittransitioncommand.cpp +++ b/src/edittransitioncommand.cpp @@ -20,8 +20,12 @@ #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) +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(); QString effectName; diff --git a/src/effectslist.cpp b/src/effectslist.cpp index 257845fe..3a64e7db 100644 --- a/src/effectslist.cpp +++ b/src/effectslist.cpp @@ -22,7 +22,7 @@ #include -EffectsList::EffectsList(): +EffectsList::EffectsList() : QList < QDomElement > () { } diff --git a/src/effectslistview.cpp b/src/effectslistview.cpp index 4cd5a227..2f7325a8 100644 --- a/src/effectslistview.cpp +++ b/src/effectslistview.cpp @@ -30,8 +30,8 @@ #include #include -EffectsListView::EffectsListView(QWidget *parent) - : QWidget(parent) +EffectsListView::EffectsListView(QWidget *parent) : + QWidget(parent) { ui.setupUi(this); diff --git a/src/effectslistwidget.cpp b/src/effectslistwidget.cpp index 1f99f924..f9f10fec 100644 --- a/src/effectslistwidget.cpp +++ b/src/effectslistwidget.cpp @@ -36,8 +36,9 @@ static const int EFFECT_CUSTOM = 3; const int TypeRole = Qt::UserRole; const int IdRole = TypeRole + 1; -EffectsListWidget::EffectsListWidget(QMenu *menu, QWidget *parent) - : KListWidget(parent), m_menu(menu) +EffectsListWidget::EffectsListWidget(QMenu *menu, QWidget *parent) : + KListWidget(parent), + m_menu(menu) { //setSelectionMode(QAbstractItemView::ExtendedSelection); //setDragDropMode(QAbstractItemView::DragDrop); diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp index 29d737e7..e3511c4a 100644 --- a/src/effectstackedit.cpp +++ b/src/effectstackedit.cpp @@ -38,7 +38,10 @@ QMap EffectStackEdit::iconCache; -EffectStackEdit::EffectStackEdit(QWidget *parent): QWidget(parent), m_in(0), m_out(0) +EffectStackEdit::EffectStackEdit(QWidget *parent) : + QWidget(parent), + m_in(0), + m_out(0) { setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding)); QVBoxLayout *vbox1 = new QVBoxLayout(parent); diff --git a/src/effectstackview.cpp b/src/effectstackview.cpp index af4e3372..f24f34cf 100644 --- a/src/effectstackview.cpp +++ b/src/effectstackview.cpp @@ -33,8 +33,8 @@ #include -EffectStackView::EffectStackView(QWidget *parent) - : QWidget(parent) +EffectStackView::EffectStackView(QWidget *parent) : + QWidget(parent) { ui.setupUi(this); effectedit = new EffectStackEdit(ui.frame); diff --git a/src/geometryval.cpp b/src/geometryval.cpp index 24df9503..19967819 100644 --- a/src/geometryval.cpp +++ b/src/geometryval.cpp @@ -27,7 +27,13 @@ #include -Geometryval::Geometryval(const MltVideoProfile profile, QWidget* parent): QWidget(parent), m_profile(profile), m_geom(NULL), m_path(NULL), paramRect(NULL), m_fixedMode(false) +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); QVBoxLayout* vbox = new QVBoxLayout(ui.widget); diff --git a/src/graphicsscenerectmove.cpp b/src/graphicsscenerectmove.cpp index b63ace1c..08649b85 100644 --- a/src/graphicsscenerectmove.cpp +++ b/src/graphicsscenerectmove.cpp @@ -33,7 +33,11 @@ #include -GraphicsSceneRectMove::GraphicsSceneRectMove(QObject *parent): QGraphicsScene(parent), m_selectedItem(NULL), resizeMode(NoResize), m_tool(TITLE_RECTANGLE) +GraphicsSceneRectMove::GraphicsSceneRectMove(QObject *parent) : + QGraphicsScene(parent), + m_selectedItem(NULL), + resizeMode(NoResize), + m_tool(TITLE_RECTANGLE) { //grabMouse(); zoom = 1.0; diff --git a/src/groupclipscommand.cpp b/src/groupclipscommand.cpp index dc46fcff..2d34df7b 100644 --- a/src/groupclipscommand.cpp +++ b/src/groupclipscommand.cpp @@ -23,7 +23,12 @@ #include -GroupClipsCommand::GroupClipsCommand(CustomTrackView *view, const QList clipInfos, const QList transitionInfos, bool group, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_clips(clipInfos), m_transitions(transitionInfos), m_group(group) +GroupClipsCommand::GroupClipsCommand(CustomTrackView *view, const QList clipInfos, const QList transitionInfos, bool group, QUndoCommand * parent) : + QUndoCommand(parent), + m_view(view), + m_clips(clipInfos), + m_transitions(transitionInfos), + m_group(group) { if (m_group) setText(i18n("Group clips")); else setText(i18n("Ungroup clips")); diff --git a/src/guide.cpp b/src/guide.cpp index 80ade912..df31a26c 100644 --- a/src/guide.cpp +++ b/src/guide.cpp @@ -27,8 +27,12 @@ #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) +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); setToolTip(label); diff --git a/src/headertrack.cpp b/src/headertrack.cpp index 6472c1b3..5e7ebda7 100644 --- a/src/headertrack.cpp +++ b/src/headertrack.cpp @@ -30,8 +30,10 @@ #include #include -HeaderTrack::HeaderTrack(int index, TrackInfo info, QWidget *parent) - : QWidget(parent), m_index(index), m_type(info.type) +HeaderTrack::HeaderTrack(int index, TrackInfo info, QWidget *parent) : + QWidget(parent), + m_index(index), + m_type(info.type) { setFixedHeight(KdenliveSettings::trackheight()); view.setupUi(this); diff --git a/src/insertspacecommand.cpp b/src/insertspacecommand.cpp index 972df988..d9d63ed8 100644 --- a/src/insertspacecommand.cpp +++ b/src/insertspacecommand.cpp @@ -23,8 +23,14 @@ #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) +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")); else setText(i18n("Remove space")); diff --git a/src/jogshuttle.cpp b/src/jogshuttle.cpp index 1a14e3ff..e94a17f0 100644 --- a/src/jogshuttle.cpp +++ b/src/jogshuttle.cpp @@ -210,7 +210,8 @@ void ShuttleThread::jogshuttle(unsigned short code, unsigned int value) } -JogShuttle::JogShuttle(QString device, QObject *parent): QObject(parent) +JogShuttle::JogShuttle(QString device, QObject *parent) : + QObject(parent) { initDevice(device); } diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp index 4a920cc4..a5f40d0b 100644 --- a/src/kdenlivedoc.cpp +++ b/src/kdenlivedoc.cpp @@ -42,7 +42,21 @@ #include -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) +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); m_autoSaveTimer = new QTimer(this); diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp index c0a3e7a3..cb95c7f0 100644 --- a/src/kdenlivesettingsdialog.cpp +++ b/src/kdenlivesettingsdialog.cpp @@ -40,7 +40,8 @@ #endif /* NO_JOGSHUTTLE */ -KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent): KConfigDialog(parent, "settings", KdenliveSettings::self()) +KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent) : + KConfigDialog(parent, "settings", KdenliveSettings::self()) { QWidget *p1 = new QWidget; diff --git a/src/keyframehelper.cpp b/src/keyframehelper.cpp index 04a2c02b..a199bc7d 100644 --- a/src/keyframehelper.cpp +++ b/src/keyframehelper.cpp @@ -28,8 +28,11 @@ #include -KeyframeHelper::KeyframeHelper(QWidget *parent) - : QWidget(parent), m_geom(NULL), m_position(0), m_scale(0) +KeyframeHelper::KeyframeHelper(QWidget *parent) : + QWidget(parent), + m_geom(NULL), + m_position(0), + m_scale(0) { setFont(KGlobalSettings::toolBarFont()); } diff --git a/src/kthumb.cpp b/src/kthumb.cpp index de7fc00b..b883dd22 100644 --- a/src/kthumb.cpp +++ b/src/kthumb.cpp @@ -125,8 +125,8 @@ void MyThread::run() } -KThumb::KThumb(ClipManager *clipManager, KUrl url, const QString &id, const QString &hash, QObject * parent, const char */*name*/) - : QObject(parent), +KThumb::KThumb(ClipManager *clipManager, KUrl url, const QString &id, const QString &hash, QObject * parent, const char */*name*/) : + QObject(parent), audioThumbProducer(), m_url(url), m_thumbFile(), diff --git a/src/locktrackcommand.cpp b/src/locktrackcommand.cpp index 4eb8cc08..ffbe7be3 100644 --- a/src/locktrackcommand.cpp +++ b/src/locktrackcommand.cpp @@ -22,7 +22,11 @@ #include -LockTrackCommand::LockTrackCommand(CustomTrackView *view, int ix, bool lock, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_ix(ix), m_lock(lock) +LockTrackCommand::LockTrackCommand(CustomTrackView *view, int ix, bool lock, QUndoCommand * parent) : + QUndoCommand(parent), + m_view(view), + m_ix(ix), + m_lock(lock) { if (lock) setText(i18n("Lock track")); else setText(i18n("Unlock track")); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 265f0c55..d956bb40 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -105,13 +105,16 @@ EffectsList MainWindow::audioEffects; EffectsList MainWindow::customEffects; EffectsList MainWindow::transitions; -MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent) - : KXmlGuiWindow(parent), - m_activeDocument(NULL), m_activeTimeline(NULL), m_renderWidget(NULL), +MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent) : + KXmlGuiWindow(parent), + m_activeDocument(NULL), + m_activeTimeline(NULL), + m_renderWidget(NULL), #ifndef NO_JOGSHUTTLE m_jogProcess(NULL), #endif /* NO_JOGSHUTTLE */ - m_findActivated(false), m_initialized(false) + m_findActivated(false), + m_initialized(false) { // Create DBus interface diff --git a/src/managecapturesdialog.cpp b/src/managecapturesdialog.cpp index e9554ce4..784276c4 100644 --- a/src/managecapturesdialog.cpp +++ b/src/managecapturesdialog.cpp @@ -34,7 +34,8 @@ #include -ManageCapturesDialog::ManageCapturesDialog(KUrl::List files, QWidget * parent): QDialog(parent) +ManageCapturesDialog::ManageCapturesDialog(KUrl::List files, QWidget * parent) : + QDialog(parent) { setFont(KGlobalSettings::toolBarFont()); m_view.setupUi(this); diff --git a/src/markerdialog.cpp b/src/markerdialog.cpp index 865f06cf..6e0e30c2 100644 --- a/src/markerdialog.cpp +++ b/src/markerdialog.cpp @@ -26,7 +26,13 @@ #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) +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/monitor.cpp b/src/monitor.cpp index 08fdc919..28a67f77 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -40,8 +40,15 @@ #include -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), m_overlay(NULL) +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), + m_overlay(NULL) { ui.setupUi(this); m_scale = 1; @@ -737,7 +744,9 @@ void Monitor::slotSwitchMonitorInfo(bool show) } } -MonitorRefresh::MonitorRefresh(QWidget* parent): QWidget(parent), m_renderer(NULL) +MonitorRefresh::MonitorRefresh(QWidget* parent) : \ + QWidget(parent), + m_renderer(NULL) { setAttribute(Qt::WA_PaintOnScreen); setAttribute(Qt::WA_OpaquePaintEvent); //setAttribute(Qt::WA_NoSystemBackground); @@ -754,7 +763,8 @@ void MonitorRefresh::paintEvent(QPaintEvent * /*event*/) } -Overlay::Overlay(QWidget* parent): QLabel(parent) +Overlay::Overlay(QWidget* parent) : + QLabel(parent) { setAttribute(Qt::WA_TransparentForMouseEvents); setAttribute(Qt::WA_OpaquePaintEvent); diff --git a/src/monitormanager.cpp b/src/monitormanager.cpp index 30eda6e5..9a94f237 100644 --- a/src/monitormanager.cpp +++ b/src/monitormanager.cpp @@ -27,8 +27,8 @@ #include -MonitorManager::MonitorManager(QWidget *parent) - : QObject(parent) +MonitorManager::MonitorManager(QWidget *parent) : + QObject(parent) { } diff --git a/src/moveclipcommand.cpp b/src/moveclipcommand.cpp index 1df58fa6..a5f0c3f5 100644 --- a/src/moveclipcommand.cpp +++ b/src/moveclipcommand.cpp @@ -23,7 +23,12 @@ #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) +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 1d1c34e8..613dcae4 100644 --- a/src/moveeffectcommand.cpp +++ b/src/moveeffectcommand.cpp @@ -23,7 +23,13 @@ #include -MoveEffectCommand::MoveEffectCommand(CustomTrackView *view, const int track, GenTime pos, int oldPos, int newPos, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_track(track), m_pos(pos), m_oldindex(oldPos), m_newindex(newPos) +MoveEffectCommand::MoveEffectCommand(CustomTrackView *view, const int track, GenTime pos, int oldPos, int newPos, QUndoCommand * parent) : + QUndoCommand(parent), + m_view(view), + m_track(track), + m_pos(pos), + m_oldindex(oldPos), + m_newindex(newPos) { /* QString effectName; QDomNode namenode = effect.elementsByTagName("name").item(0); diff --git a/src/movegroupcommand.cpp b/src/movegroupcommand.cpp index 3723c39b..f22bdc95 100644 --- a/src/movegroupcommand.cpp +++ b/src/movegroupcommand.cpp @@ -23,7 +23,14 @@ #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) +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 group")); } diff --git a/src/movetransitioncommand.cpp b/src/movetransitioncommand.cpp index 40ba3e3f..fb8ff8bc 100644 --- a/src/movetransitioncommand.cpp +++ b/src/movetransitioncommand.cpp @@ -20,7 +20,12 @@ #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) +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/parameterplotter.cpp b/src/parameterplotter.cpp index d2fc920c..f53c20a6 100644 --- a/src/parameterplotter.cpp +++ b/src/parameterplotter.cpp @@ -23,7 +23,8 @@ #include #include -ParameterPlotter::ParameterPlotter(QWidget *parent): KPlotWidget(parent) +ParameterPlotter::ParameterPlotter(QWidget *parent) : + KPlotWidget(parent) { setAntialiasing(true); setLeftPadding(20); diff --git a/src/profilesdialog.cpp b/src/profilesdialog.cpp index 56af2f61..09a73f6d 100644 --- a/src/profilesdialog.cpp +++ b/src/profilesdialog.cpp @@ -28,7 +28,10 @@ #include #include -ProfilesDialog::ProfilesDialog(QWidget * parent): QDialog(parent), m_isCustomProfile(false), m_profileIsModified(false) +ProfilesDialog::ProfilesDialog(QWidget * parent) : + QDialog(parent), + m_isCustomProfile(false), + m_profileIsModified(false) { m_view.setupUi(this); diff --git a/src/projectitem.cpp b/src/projectitem.cpp index 7c3688c1..d3f1d247 100644 --- a/src/projectitem.cpp +++ b/src/projectitem.cpp @@ -34,8 +34,12 @@ const int UsageRole = NameRole + 2; // folder -ProjectItem::ProjectItem(QTreeWidget * parent, const QStringList & strings, const QString &clipId) - : QTreeWidgetItem(parent, strings), m_clipType(FOLDER), m_clipId(clipId), m_clip(NULL), m_groupname(strings.at(1)) +ProjectItem::ProjectItem(QTreeWidget * parent, const QStringList & strings, const QString &clipId) : + QTreeWidgetItem(parent, strings), + m_clipType(FOLDER), + m_clipId(clipId), + m_clip(NULL), + m_groupname(strings.at(1)) { setSizeHint(0, QSize(65, 45)); setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable); @@ -44,8 +48,8 @@ ProjectItem::ProjectItem(QTreeWidget * parent, const QStringList & strings, cons //kDebug() << "Constructed as folder, with clipId: " << m_clipId << ", and groupname: " << m_groupname; } -ProjectItem::ProjectItem(QTreeWidget * parent, DocClipBase *clip) - : QTreeWidgetItem(parent) +ProjectItem::ProjectItem(QTreeWidget * parent, DocClipBase *clip) : + QTreeWidgetItem(parent) { setSizeHint(0, QSize(65, 45)); setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable); @@ -64,8 +68,8 @@ ProjectItem::ProjectItem(QTreeWidget * parent, DocClipBase *clip) //kDebug() << "Constructed with clipId: " << m_clipId; } -ProjectItem::ProjectItem(QTreeWidgetItem * parent, DocClipBase *clip) - : QTreeWidgetItem(parent) +ProjectItem::ProjectItem(QTreeWidgetItem * parent, DocClipBase *clip) : + QTreeWidgetItem(parent) { setSizeHint(0, QSize(65, 45)); setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable); diff --git a/src/projectlist.cpp b/src/projectlist.cpp index 5ff295cf..4db3e74c 100644 --- a/src/projectlist.cpp +++ b/src/projectlist.cpp @@ -54,8 +54,19 @@ #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) +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) { listView = new ProjectListView(this);; diff --git a/src/projectlistview.cpp b/src/projectlistview.cpp index 4451fe0f..cc717572 100644 --- a/src/projectlistview.cpp +++ b/src/projectlistview.cpp @@ -30,8 +30,9 @@ #include #include -ProjectListView::ProjectListView(QWidget *parent) - : QTreeWidget(parent), m_dragStarted(false) +ProjectListView::ProjectListView(QWidget *parent) : + QTreeWidget(parent), + m_dragStarted(false) { setSelectionMode(QAbstractItemView::ExtendedSelection); setDragDropMode(QAbstractItemView::DragDrop); diff --git a/src/projectsettings.cpp b/src/projectsettings.cpp index 94bf02fb..1240ddcd 100644 --- a/src/projectsettings.cpp +++ b/src/projectsettings.cpp @@ -26,7 +26,9 @@ #include -ProjectSettings::ProjectSettings(int videotracks, int audiotracks, const QString projectPath, bool readOnlyTracks, QWidget * parent): QDialog(parent), m_isCustomProfile(false) +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 32f4194d..4abc4bd3 100644 --- a/src/razorclipcommand.cpp +++ b/src/razorclipcommand.cpp @@ -23,7 +23,11 @@ #include -RazorClipCommand::RazorClipCommand(CustomTrackView *view, const ItemInfo info, const GenTime cutTime, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_info(info), m_cutTime(cutTime) +RazorClipCommand::RazorClipCommand(CustomTrackView *view, const ItemInfo info, const GenTime cutTime, QUndoCommand * parent) : + QUndoCommand(parent), + m_view(view), + m_info(info), + m_cutTime(cutTime) { setText(i18n("Razor clip")); } diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp index b8173b22..37f1970d 100644 --- a/src/recmonitor.cpp +++ b/src/recmonitor.cpp @@ -38,8 +38,13 @@ #include -RecMonitor::RecMonitor(QString name, QWidget *parent) - : QWidget(parent), m_name(name), m_isActive(false), m_isCapturing(false), m_isPlaying(false), m_didCapture(false) +RecMonitor::RecMonitor(QString name, QWidget *parent) : + QWidget(parent), + m_name(name), + m_isActive(false), + m_isCapturing(false), + m_isPlaying(false), + m_didCapture(false) { ui.setupUi(this); diff --git a/src/regiongrabber.cpp b/src/regiongrabber.cpp index 9c7a3d90..6d6bd1ce 100644 --- a/src/regiongrabber.cpp +++ b/src/regiongrabber.cpp @@ -29,13 +29,23 @@ #include RegionGrabber::RegionGrabber() : - QWidget(0), selection(), mouseDown(false), newSelection(false), - handleSize(10), mouseOverHandle(0), idleTimer(), - showHelp(true), grabbing(false), - TLHandle(0, 0, handleSize, handleSize), TRHandle(0, 0, handleSize, handleSize), - BLHandle(0, 0, handleSize, handleSize), BRHandle(0, 0, handleSize, handleSize), - LHandle(0, 0, handleSize, handleSize), THandle(0, 0, handleSize, handleSize), - RHandle(0, 0, handleSize, handleSize), BHandle(0, 0, handleSize, handleSize) + QWidget(0), + selection(), + mouseDown(false), + newSelection(false), + handleSize(10), + mouseOverHandle(0), + idleTimer(), + showHelp(true), + grabbing(false), + TLHandle(0, 0, handleSize, handleSize), + TRHandle(0, 0, handleSize, handleSize), + BLHandle(0, 0, handleSize, handleSize), + BRHandle(0, 0, handleSize, handleSize), + LHandle(0, 0, handleSize, handleSize), + THandle(0, 0, handleSize, handleSize), + RHandle(0, 0, handleSize, handleSize), + BHandle(0, 0, handleSize, handleSize) { handles << &TLHandle << &TRHandle << &BLHandle << &BRHandle << &LHandle << &THandle << &RHandle << &BHandle; diff --git a/src/renderer.cpp b/src/renderer.cpp index 656e3f39..66639e95 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -53,7 +53,20 @@ static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr } } -Render::Render(const QString & rendererName, int winid, int extid, QWidget *parent): QObject(parent), m_name(rendererName), m_mltConsumer(NULL), m_mltProducer(NULL), m_mltTextProducer(NULL), m_winid(winid), m_externalwinid(extid), m_framePosition(0), m_isBlocked(true), m_blackClip(NULL), m_isSplitView(false), m_isZoneMode(false), m_isLoopMode(false) +Render::Render(const QString & rendererName, int winid, int extid, QWidget *parent) : + QObject(parent), + m_name(rendererName), + m_mltConsumer(NULL), + m_mltProducer(NULL), + m_mltTextProducer(NULL), + m_winid(winid), + m_externalwinid(extid), + m_framePosition(0), + m_isBlocked(true), + m_blackClip(NULL), + m_isSplitView(false), + m_isZoneMode(false), + m_isLoopMode(false) { kDebug() << "////////// USING PROFILE: " << (char*)KdenliveSettings::current_profile().toUtf8().data(); refreshTimer = new QTimer(this); diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp index bd9f203f..832ec2d1 100644 --- a/src/renderwidget.cpp +++ b/src/renderwidget.cpp @@ -48,7 +48,9 @@ const int EditableRole = GroupRole + 5; const int MetaGroupRole = GroupRole + 6; const int ExtraRole = GroupRole + 7; -RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent): QDialog(parent), m_projectFolder(projectfolder) +RenderWidget::RenderWidget(const QString &projectfolder, QWidget * parent) : + QDialog(parent), + m_projectFolder(projectfolder) { m_view.setupUi(this); setWindowTitle(i18n("Rendering")); diff --git a/src/resizeclipcommand.cpp b/src/resizeclipcommand.cpp index db5037b4..9ad85065 100644 --- a/src/resizeclipcommand.cpp +++ b/src/resizeclipcommand.cpp @@ -23,7 +23,12 @@ #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) +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 639344a2..0169630f 100644 --- a/src/slideshowclip.cpp +++ b/src/slideshowclip.cpp @@ -26,7 +26,9 @@ #include -SlideshowClip::SlideshowClip(QWidget * parent): QDialog(parent), m_count(0) +SlideshowClip::SlideshowClip(QWidget * parent) : + QDialog(parent), + m_count(0) { setFont(KGlobalSettings::toolBarFont()); setWindowTitle(i18n("Add Slideshow Clip")); diff --git a/src/smallruler.cpp b/src/smallruler.cpp index d63ef06c..8881329c 100644 --- a/src/smallruler.cpp +++ b/src/smallruler.cpp @@ -25,8 +25,10 @@ #include #include -SmallRuler::SmallRuler(QWidget *parent) - : QWidget(parent), m_scale(1), m_maxval(25) +SmallRuler::SmallRuler(QWidget *parent) : + QWidget(parent), + m_scale(1), + m_maxval(25) { m_zoneStart = 10; m_zoneEnd = 60; diff --git a/src/spacerdialog.cpp b/src/spacerdialog.cpp index 9427cf31..c0756fc7 100644 --- a/src/spacerdialog.cpp +++ b/src/spacerdialog.cpp @@ -26,7 +26,9 @@ #include -SpacerDialog::SpacerDialog(const GenTime duration, Timecode tc, int track, int trackNumber, QWidget * parent): QDialog(parent), m_tc(tc) +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/splitaudiocommand.cpp b/src/splitaudiocommand.cpp index 5a81b03d..7cf15a21 100644 --- a/src/splitaudiocommand.cpp +++ b/src/splitaudiocommand.cpp @@ -23,7 +23,11 @@ #include -SplitAudioCommand::SplitAudioCommand(CustomTrackView *view, const int track, const GenTime &pos, QUndoCommand * parent) : QUndoCommand(parent), m_view(view), m_track(track), m_pos(pos) +SplitAudioCommand::SplitAudioCommand(CustomTrackView *view, const int track, const GenTime &pos, QUndoCommand * parent) : + QUndoCommand(parent), + m_view(view), + m_track(track), + m_pos(pos) { setText(i18n("Split audio")); } diff --git a/src/timecode.cpp b/src/timecode.cpp index 182f6d90..40e7b198 100644 --- a/src/timecode.cpp +++ b/src/timecode.cpp @@ -19,8 +19,9 @@ #include #include -Timecode::Timecode(Formats format, int framesPerSecond, - bool dropFrame): m_format(format), m_dropFrame(dropFrame), +Timecode::Timecode(Formats format, int framesPerSecond, bool dropFrame) : + m_format(format), + m_dropFrame(dropFrame), m_displayedFramesPerSecond(framesPerSecond) { } diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp index 917399b9..3059c611 100644 --- a/src/titlewidget.cpp +++ b/src/titlewidget.cpp @@ -33,7 +33,13 @@ 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) +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) { setupUi(this); setFont(KGlobalSettings::toolBarFont()); diff --git a/src/trackview.cpp b/src/trackview.cpp index 934a69a4..ceda4904 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -36,8 +36,11 @@ #include -TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) - : QWidget(parent), m_doc(doc), m_scale(1.0), m_projectTracks(0) +TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) : + QWidget(parent), + m_doc(doc), + m_scale(1.0), + m_projectTracks(0) { view = new Ui::TimeLine_UI(); diff --git a/src/transition.cpp b/src/transition.cpp index 14da9bd5..8272941b 100644 --- a/src/transition.cpp +++ b/src/transition.cpp @@ -31,7 +31,10 @@ #include -Transition::Transition(const ItemInfo info, int transitiontrack, double fps, QDomElement params, bool automaticTransition) : AbstractClipItem(info, QRectF(), fps), m_automaticTransition(automaticTransition), m_forceTransitionTrack(false) +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 2b15ebcb..5309915e 100644 --- a/src/transitionsettings.cpp +++ b/src/transitionsettings.cpp @@ -26,7 +26,10 @@ #include -TransitionSettings::TransitionSettings(QWidget* parent): QWidget(parent), m_tracksCount(0), m_usedTransition(NULL) +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 13b8a547..ca239213 100644 --- a/src/wizard.cpp +++ b/src/wizard.cpp @@ -33,7 +33,8 @@ const double recommendedMltVersion = 36; -Wizard::Wizard(bool upgrade, QWidget *parent): QWizard(parent) +Wizard::Wizard(bool upgrade, QWidget *parent) : + QWizard(parent) { setPixmap(QWizard::WatermarkPixmap, QPixmap(KStandardDirs::locate("appdata", "banner.png"))); diff --git a/thumbnailer/westleypreview.cpp b/thumbnailer/westleypreview.cpp index 84c56327..62920692 100644 --- a/thumbnailer/westleypreview.cpp +++ b/thumbnailer/westleypreview.cpp @@ -47,8 +47,9 @@ extern "C" } } -WestleyPreview::WestleyPreview() - : m_rand(0), m_inigoprocess(0) +WestleyPreview::WestleyPreview() : + m_rand(0), + m_inigoprocess(0) { } -- 2.39.5