Sort initializers in declaration order

Suppress compiler warnings about out-of-order initializers by
initializing all member variables in declaration order.

Signed-off-by: Ray Lehtiniemi <rayl@mail.com>
svn path=/trunk/kdenlive/; revision=3226

diff --git a/renderer/renderjob.cpp b/renderer/renderjob.cpp
index a743cfb4c621ce14226c6cc20171863ccd0f6621..3f7da99d111bed6b89798603c256a0f9b1d04de8 100644 (file)
--- a/renderer/renderjob.cpp
+++ b/renderer/renderjob.cpp
@@ -38,9 +38,9 @@ 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)
+        m_kdenliveinterface(NULL),
+        m_usekuiserver(usekuiserver)
 {
     m_scenelist = scenelist;
     m_dest = dest;

diff --git a/src/abstractclipitem.cpp b/src/abstractclipitem.cpp
index 40142a686d1093ec204d88fc76d7afee5887092c..7d2b35c7e3f2c821d2ab1d34c6641e5a098d1a72 100644 (file)
--- a/src/abstractclipitem.cpp
+++ b/src/abstractclipitem.cpp
@@ -31,10 +31,10 @@
 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)
+        m_keyframeFactor(1),
+        m_fps(fps)
 {
     setFlags(/*QGraphicsItem::ItemClipsToShape | */QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
     setTrack(info.track);

diff --git a/src/addeffectcommand.cpp b/src/addeffectcommand.cpp
index 2a982bb36f811e0fd7aa08af7b357c9ee9ccaa14..91e1eb95634c884cd7d20c08a3dcf8d0b31b6d01 100644 (file)
--- a/src/addeffectcommand.cpp
+++ b/src/addeffectcommand.cpp
@@ -27,8 +27,8 @@ AddEffectCommand::AddEffectCommand(CustomTrackView *view, const int track, GenTi
         QUndoCommand(parent),
         m_view(view),
         m_track(track),
-        m_pos(pos),
         m_effect(effect),
+        m_pos(pos),
         m_doIt(doIt)
 {
     QString effectName;

diff --git a/src/addtimelineclipcommand.cpp b/src/addtimelineclipcommand.cpp
index 437a0522dd6d63aa358c5632ea759ba914bd63f7..543ac23f24958a7c06d212b69bd992dc108a0c5c 100644 (file)
--- a/src/addtimelineclipcommand.cpp
+++ b/src/addtimelineclipcommand.cpp
@@ -26,10 +26,10 @@
 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_clipId(clipId),
+        m_xml(xml),
         m_doIt(doIt),
         m_remove(doRemove)
 {

diff --git a/src/addtrackcommand.cpp b/src/addtrackcommand.cpp
index 0908371935727a90dd825ccc102180f8695dbc82..9214897d4dcf83977e79249536d6313ddf6d5676 100644 (file)
--- a/src/addtrackcommand.cpp
+++ b/src/addtrackcommand.cpp
@@ -27,8 +27,8 @@ AddTrackCommand::AddTrackCommand(CustomTrackView *view, int ix, TrackInfo info,
         QUndoCommand(parent),
         m_view(view),
         m_ix(ix),
-        m_info(info),
-        m_addTrack(addTrack)
+        m_addTrack(addTrack),
+        m_info(info)
 {
     if (addTrack) setText(i18n("Add track"));
     else setText(i18n("Delete track"));

diff --git a/src/addtransitioncommand.cpp b/src/addtransitioncommand.cpp
index 7469f3f8f4bd6aace7db99d298a617d66dc09a8b..9a1be1dada0a026394494856d5ba0e142f509260 100644 (file)
--- a/src/addtransitioncommand.cpp
+++ b/src/addtransitioncommand.cpp
@@ -25,10 +25,10 @@ AddTransitionCommand::AddTransitionCommand(CustomTrackView *view, ItemInfo info,
         QUndoCommand(parent),
         m_view(view),
         m_info(info),
-        m_track(transitiontrack),
         m_params(params),
-        m_remove(remove),
-        m_doIt(doIt)
+        m_track(transitiontrack),
+        m_doIt(doIt),
+        m_remove(remove)
 {
     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 2822cfbbfc74da4ffe5521653a94a0c28201f250..125c633aa2b7ee4ce33fcc4d84472bbefe7aa791 100644 (file)
--- a/src/changecliptypecommand.cpp
+++ b/src/changecliptypecommand.cpp
@@ -26,8 +26,8 @@
 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_track(track),
         m_videoOnly(videoOnly),
         m_audioOnly(audioOnly),
         m_originalVideoOnly(originalVideo),

diff --git a/src/changespeedcommand.cpp b/src/changespeedcommand.cpp
index b44fb4d605f01f046418a38a94397c29d2b4f15c..378ec3b553216e8ddd5558c218bfdb4fccae4954 100644 (file)
--- a/src/changespeedcommand.cpp
+++ b/src/changespeedcommand.cpp
@@ -27,9 +27,9 @@ ChangeSpeedCommand::ChangeSpeedCommand(CustomTrackView *view, ItemInfo info, dou
         QUndoCommand(parent),
         m_view(view),
         m_clipInfo(info),
+        m_clipId(clipId),
         m_old_speed(old_speed),
-        m_new_speed(new_speed),
-        m_clipId(clipId)
+        m_new_speed(new_speed)
 {
     setText(i18n("Adjust clip length"));
 }

diff --git a/src/clipdurationdialog.cpp b/src/clipdurationdialog.cpp
index 26c3795e6928a1e2274bc82393c14a7d65ecdcc9..5f144bdc512a361a4b53683e1d778fb6506f0f19 100644 (file)
--- a/src/clipdurationdialog.cpp
+++ b/src/clipdurationdialog.cpp
@@ -28,8 +28,8 @@
 
 ClipDurationDialog::ClipDurationDialog(AbstractClipItem *clip, Timecode tc, QWidget * parent):
         QDialog(parent),
-        m_tc(tc),
-        m_clip(clip)
+        m_clip(clip),
+        m_tc(tc)
 {
     setFont(KGlobalSettings::toolBarFont());
     m_fps = m_tc.fps();

diff --git a/src/clipitem.cpp b/src/clipitem.cpp
index 7e7b517b1eb5b50cef58e2a7b96ad1a013d154d6..94a5f046b8056f4aee3be61dc6d065c386980391 100644 (file)
--- a/src/clipitem.cpp
+++ b/src/clipitem.cpp
@@ -41,25 +41,25 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, b
         m_clip(clip),
         m_resizeMode(NONE),
         m_grabPoint(0),
+        m_startFade(0),
+        m_endFade(0),
         m_maxTrack(0),
+        m_audioOnly(false),
+        m_videoOnly(false),
+        m_startPix(QPixmap()),
+        m_endPix(QPixmap()),
         m_hasThumbs(false),
         startThumbTimer(NULL),
         endThumbTimer(NULL),
-        audioThumbWasDrawn(false),
+        m_selectedEffect(-1),
         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)
+        audioThumbWasDrawn(false),
+        framePixelWidth(0)
 {
     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 c857fda6a9c7bf2327348878496e669e20037410..b3c42c2aa7ee4a7d8625cf5b60194dc38aae9709 100644 (file)
--- a/src/clipmanager.cpp
+++ b/src/clipmanager.cpp
@@ -35,9 +35,9 @@
 #include <QGraphicsItemGroup>
 
 ClipManager::ClipManager(KdenliveDoc *doc) :
+        m_audioThumbsQueue(QList <QString> ()),
         m_doc(doc),
         m_audioThumbsEnabled(false),
-        m_audioThumbsQueue(QList <QString> ()),
         m_generatingAudioId(QString())
 {
     m_clipIdCounter = 1;

diff --git a/src/clipproperties.cpp b/src/clipproperties.cpp
index 4f5b22425ca2c72bb3104502d262ecd531b3ca02..352859c35a625b312e1010aebce0f2802208be57 100644 (file)
--- a/src/clipproperties.cpp
+++ b/src/clipproperties.cpp
@@ -45,11 +45,11 @@ 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_tc(tc),
         m_fps(fps),
-        m_clipNeedsRefresh(false),
-        m_count(0)
+        m_count(0),
+        m_clipNeedsRefresh(false)
 {
     setFont(KGlobalSettings::toolBarFont());
     m_view.setupUi(this);

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 30b0b42ad8f0b440a722a20e629b77e1136f7360..84f144db48ca0501479f5a7a54dbde6ffb043544 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -83,32 +83,32 @@
 
 CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscene, QWidget *parent) :
         QGraphicsView(projectscene, parent),
-        m_scene(projectscene),
+        m_tracksHeight(KdenliveSettings::trackheight()),
+        m_selectedTrack(0),
+        m_projectDuration(0),
         m_cursorPos(0),
+        m_document(doc),
+        m_scene(projectscene),
         m_cursorLine(NULL),
         m_operationMode(NONE),
+        m_moveOpMode(NONE),
         m_dragItem(NULL),
+        m_dragGuide(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<AbstractClipItem *> ()),
-        m_scrollOffset(0),
         m_changeSpeedAction(NULL),
         m_pasteEffectsAction(NULL),
         m_ungroupAction(NULL),
-        m_clipDrag(false)
+        m_scrollOffset(0),
+        m_clipDrag(false),
+        m_findIndex(0),
+        m_tool(SELECTTOOL),
+        m_copiedItems(QList<AbstractClipItem *> ()),
+        m_menuPosition(QPoint()),
+        m_blockRefresh(false),
+        m_selectionGroup(NULL)
 {
     if (doc) m_commandStack = doc->commandStack();
     else m_commandStack = NULL;

diff --git a/src/docclipbase.cpp b/src/docclipbase.cpp
index e843889ab0184dd350a706bd093d781f160a1dbc..9b6f09d3eb929c764b4576035a29d12aa46aea10 100644 (file)
--- a/src/docclipbase.cpp
+++ b/src/docclipbase.cpp
@@ -34,19 +34,19 @@
 #include <QCryptographicHash>
 
 DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QString &id) :
-        m_id(id),
+        audioFrameChache(QMap<int, QMap<int, QByteArray> > ()),
         m_description(QString()),
         m_refcount(0),
-        m_audioThumbCreated(false),
-        m_duration(GenTime()),
-        m_thumbProd(NULL),
-        m_audioTimer(NULL),
-        m_properties(QMap <QString, QString> ()),
-        audioFrameChache(QMap<int, QMap<int, QByteArray> > ()),
         m_baseTrackProducers(QList <Mlt::Producer *>()),
-        m_snapMarkers(QList < CommentedTime > ()),
+        m_audioTrackProducers(QList <Mlt::Producer *>()),
         m_videoOnlyProducer(NULL),
-        m_audioTrackProducers(QList <Mlt::Producer *>())
+        m_snapMarkers(QList < CommentedTime > ()),
+        m_duration(GenTime()),
+        m_audioTimer(NULL),
+        m_thumbProd(NULL),
+        m_audioThumbCreated(false),
+        m_id(id),
+        m_properties(QMap <QString, QString> ())
 {
     int type = xml.attribute("type").toInt();
     m_clipType = (CLIPTYPE) type;

diff --git a/src/editclipcommand.cpp b/src/editclipcommand.cpp
index db4cad81c298f25ade732e166a4715b00e2a7326..d65acfc509794290fdf2e8d860887cae2c5e1d40 100644 (file)
--- a/src/editclipcommand.cpp
+++ b/src/editclipcommand.cpp
@@ -25,9 +25,9 @@
 EditClipCommand::EditClipCommand(ProjectList *list, const QString &id, QMap <QString, QString> oldparams, QMap <QString, QString> newparams, bool doIt, QUndoCommand * parent) :
         QUndoCommand(parent),
         m_list(list),
-        m_id(id),
         m_oldparams(oldparams),
         m_newparams(newparams),
+        m_id(id),
         m_doIt(doIt)
 {
     setText(i18n("Edit clip"));

diff --git a/src/editeffectcommand.cpp b/src/editeffectcommand.cpp
index 191631dc39ae6ff2d27732f29dfc4a4a5979e486..0184a45fba9a68ace4928594d206c3fd8f14486f 100644 (file)
--- a/src/editeffectcommand.cpp
+++ b/src/editeffectcommand.cpp
@@ -26,8 +26,8 @@
 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_pos(pos),
         m_stackPos(stackPos),
         m_doIt(doIt)
 {

diff --git a/src/editguidecommand.cpp b/src/editguidecommand.cpp
index dd22fd2ac6f0f81d685db72d83164e687f05d00a..20933a3c8e760fe06e0b7b04b4e8cdd7cd765ae5 100644 (file)
--- a/src/editguidecommand.cpp
+++ b/src/editguidecommand.cpp
@@ -24,10 +24,10 @@
 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_oldPos(oldPos),
+        m_pos(pos),
         m_doIt(doIt)
 {
     if (m_oldcomment.isEmpty()) setText(i18n("Add guide"));

diff --git a/src/editkeyframecommand.cpp b/src/editkeyframecommand.cpp
index fed063e1fdd4f386e8fa331697eaeb98ade1f703..78934fa70d8649e47192c780671c9162f491f303 100644 (file)
--- a/src/editkeyframecommand.cpp
+++ b/src/editkeyframecommand.cpp
@@ -23,11 +23,11 @@
 
 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_track(track),
+        m_index(effectIndex),
+        m_pos(pos),
         m_doIt(doIt)
 {
     int prev = m_oldkfr.split(';', QString::SkipEmptyParts).count();

diff --git a/src/edittransitioncommand.cpp b/src/edittransitioncommand.cpp
index b66d7a32510de82b93efc45267f7db9a89234955..8980c52b463b442cf7a739cbb3637a75dc38e3b4 100644 (file)
--- a/src/edittransitioncommand.cpp
+++ b/src/edittransitioncommand.cpp
@@ -23,8 +23,8 @@
 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_pos(pos),
         m_doIt(doIt)
 {
     m_effect = effect.cloneNode().toElement();

diff --git a/src/geometryval.cpp b/src/geometryval.cpp
index 19967819c8aacc71e8a2642cddd7d9ffc314bb05..43aaa5ee9761a399d6ac2d4abd10d322fde34375 100644 (file)
--- a/src/geometryval.cpp
+++ b/src/geometryval.cpp
@@ -30,9 +30,9 @@
 Geometryval::Geometryval(const MltVideoProfile profile, QWidget* parent) :
         QWidget(parent),
         m_profile(profile),
+        paramRect(NULL),
         m_geom(NULL),
         m_path(NULL),
-        paramRect(NULL),
         m_fixedMode(false)
 {
     ui.setupUi(this);

diff --git a/src/guide.cpp b/src/guide.cpp
index df31a26c72c2a893720540403db847dcdc0dec1f..b6c05a435232fa0d8da5fb81e5d89b07a1934741 100644 (file)
--- a/src/guide.cpp
+++ b/src/guide.cpp
@@ -29,10 +29,10 @@
 
 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)
+        m_fps(fps),
+        m_view(view)
 {
     setFlags(QGraphicsItem::ItemIsMovable);
     setToolTip(label);

diff --git a/src/insertspacecommand.cpp b/src/insertspacecommand.cpp
index d9d63ed86e2793d56f946deacdb4315a00bc5cae..7802a82b44e8bda170f6228cc0a95ab54b84ee59 100644 (file)
--- a/src/insertspacecommand.cpp
+++ b/src/insertspacecommand.cpp
@@ -28,8 +28,8 @@ InsertSpaceCommand::InsertSpaceCommand(CustomTrackView *view, QList<ItemInfo> cl
         m_view(view),
         m_clipsToMove(clipsToMove),
         m_transToMove(transToMove),
-        m_track(track),
         m_duration(duration),
+        m_track(track),
         m_doIt(doIt)
 {
     if (duration > GenTime()) setText(i18n("Insert space"));

diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp
index a5f40d0b25a503348a2d15b862981330eb008bbd..4476473daf7771676c8ae062397d08dff56c21d7 100644 (file)
--- a/src/kdenlivedoc.cpp
+++ b/src/kdenlivedoc.cpp
@@ -44,19 +44,19 @@
 
 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_autosave(NULL),
         m_url(url),
-        m_projectFolder(projectFolder),
+        m_zoom(7),
+        m_startPos(0),
+        m_render(render),
         m_commandStack(new QUndoStack(undoGroup)),
         m_modified(false),
-        m_documentLoadingProgress(0),
+        m_projectFolder(projectFolder),
         m_documentLoadingStep(0.0),
-        m_startPos(0),
-        m_zoom(7),
-        m_autosave(NULL),
+        m_documentLoadingProgress(0),
+        m_abortLoading(false),
         m_zoneStart(0),
-        m_zoneEnd(100),
-        m_abortLoading(false)
+        m_zoneEnd(100)
 {
     m_clipManager = new ClipManager(this);
     m_autoSaveTimer = new QTimer(this);

diff --git a/src/markerdialog.cpp b/src/markerdialog.cpp
index 6e0e30c2337ddeeed8d0cebabbf075ca8ea7369b..e7d1830d0aaec301e0cbf605ef3807f7df7b6088 100644 (file)
--- a/src/markerdialog.cpp
+++ b/src/markerdialog.cpp
@@ -28,11 +28,11 @@
 
 MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, const QString &caption, QWidget * parent) :
         QDialog(parent),
-        m_tc(tc),
+        m_producer(NULL),
+        m_profile(NULL),
         m_clip(clip),
         m_marker(t),
-        m_producer(NULL),
-        m_profile(NULL)
+        m_tc(tc)
 {
     setFont(KGlobalSettings::toolBarFont());
     m_fps = m_tc.fps();

diff --git a/src/moveeffectcommand.cpp b/src/moveeffectcommand.cpp
index 613dcae437e8eec90c4fd4ab5db49dced3d0f3cd..cfbd76bfd77ac8443909033a724b15f9d664ab13 100644 (file)
--- a/src/moveeffectcommand.cpp
+++ b/src/moveeffectcommand.cpp
@@ -27,9 +27,9 @@ MoveEffectCommand::MoveEffectCommand(CustomTrackView *view, const int track, Gen
         QUndoCommand(parent),
         m_view(view),
         m_track(track),
-        m_pos(pos),
         m_oldindex(oldPos),
-        m_newindex(newPos)
+        m_newindex(newPos),
+        m_pos(pos)
 {
     /*    QString effectName;
         QDomNode namenode = effect.elementsByTagName("name").item(0);

diff --git a/src/profilesdialog.cpp b/src/profilesdialog.cpp
index 09a73f6dc1739f4ff2b51ac6f6b1aa44184bbdd1..69da96089d2bf32f08fe566ec62f7566c93bf594 100644 (file)
--- a/src/profilesdialog.cpp
+++ b/src/profilesdialog.cpp
@@ -30,8 +30,8 @@
 
 ProfilesDialog::ProfilesDialog(QWidget * parent) :
         QDialog(parent),
-        m_isCustomProfile(false),
-        m_profileIsModified(false)
+        m_profileIsModified(false),
+        m_isCustomProfile(false)
 {
     m_view.setupUi(this);
 

diff --git a/src/projectitem.cpp b/src/projectitem.cpp
index d3f1d247f461db668e12be5e45987fa72808f425..e1d66920eee7ee5ddf9e5c562335f33f6446beaa 100644 (file)
--- a/src/projectitem.cpp
+++ b/src/projectitem.cpp
@@ -36,10 +36,10 @@ const int UsageRole = NameRole + 2;
 // folder
 ProjectItem::ProjectItem(QTreeWidget * parent, const QStringList & strings, const QString &clipId) :
         QTreeWidgetItem(parent, strings),
+        m_groupname(strings.at(1)),
         m_clipType(FOLDER),
         m_clipId(clipId),
-        m_clip(NULL),
-        m_groupname(strings.at(1))
+        m_clip(NULL)
 {
     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 4db3e74c4b6344bf380c680f8637528563581a93..9586a6d010fbee6cdaee5add7aadcf7a309e9cf5 100644 (file)
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -59,14 +59,14 @@ ProjectList::ProjectList(QWidget *parent) :
         m_render(NULL),
         m_fps(-1),
         m_commandStack(NULL),
-        m_selectedItem(NULL),
-        m_infoQueue(QMap <QString, QDomElement> ()),
-        m_thumbnailQueue(QList <QString> ()),
-        m_refreshed(false),
         m_editAction(NULL),
-        m_openAction(NULL),
         m_deleteAction(NULL),
-        m_reloadAction(NULL)
+        m_openAction(NULL),
+        m_reloadAction(NULL),
+        m_selectedItem(NULL),
+        m_refreshed(false),
+        m_infoQueue(QMap <QString, QDomElement> ()),
+        m_thumbnailQueue(QList <QString> ())
 {
 
     listView = new ProjectListView(this);;

diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp
index 37f1970da39d087037db39dde01d7185eeecb48b..98f496f949520852e3d9aef979edb770c338b5a4 100644 (file)
--- a/src/recmonitor.cpp
+++ b/src/recmonitor.cpp
@@ -43,8 +43,8 @@ RecMonitor::RecMonitor(QString name, QWidget *parent) :
         m_name(name),
         m_isActive(false),
         m_isCapturing(false),
-        m_isPlaying(false),
-        m_didCapture(false)
+        m_didCapture(false),
+        m_isPlaying(false)
 {
     ui.setupUi(this);
 

diff --git a/src/renderer.cpp b/src/renderer.cpp
index 66639e9534f40d1d8c3c7864b6bde6493a0b8241..c88fc355e96d34d2baf214f6ba4777491c6387a8 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -55,18 +55,18 @@ 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_isBlocked(true),
         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)
+        m_isLoopMode(false),
+        m_isSplitView(false),
+        m_blackClip(NULL),
+        m_winid(winid),
+        m_externalwinid(extid)
 {
     kDebug() << "//////////  USING PROFILE: " << (char*)KdenliveSettings::current_profile().toUtf8().data();
     refreshTimer = new QTimer(this);

diff --git a/src/splitaudiocommand.cpp b/src/splitaudiocommand.cpp
index 7cf15a212feda07060b325f04434fd3e24fce7a8..872c7de842e1acb1cba7569b193985ff71512570 100644 (file)
--- a/src/splitaudiocommand.cpp
+++ b/src/splitaudiocommand.cpp
@@ -26,8 +26,8 @@
 SplitAudioCommand::SplitAudioCommand(CustomTrackView *view, const int track, const GenTime &pos, QUndoCommand * parent) :
         QUndoCommand(parent),
         m_view(view),
-        m_track(track),
-        m_pos(pos)
+        m_pos(pos),
+        m_track(track)
 {
     setText(i18n("Split audio"));
 }

diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp
index 3059c61159ec4fc006332ffe724a8723d7f1c756..f48c132a48791f0db71454cec8c6e332c7c00fba 100644 (file)
--- a/src/titlewidget.cpp
+++ b/src/titlewidget.cpp
@@ -35,11 +35,11 @@ int settingUp = false;
 
 TitleWidget::TitleWidget(KUrl url, QString projectPath, Render *render, QWidget *parent) :
         QDialog(parent),
+        startViewport(NULL),
+        endViewport(NULL),
         m_render(render),
         m_count(0),
-        m_projectPath(projectPath),
-        startViewport(NULL),
-        endViewport(NULL)
+        m_projectPath(projectPath)
 {
     setupUi(this);
     setFont(KGlobalSettings::toolBarFont());

diff --git a/src/trackview.cpp b/src/trackview.cpp
index ceda4904eaf09c6a7f461d87444c8985f33de6d2..9c860270dc52e9010a074b6ff71316e74a47652f 100644 (file)
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@@ -38,9 +38,9 @@
 
 TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) :
         QWidget(parent),
-        m_doc(doc),
         m_scale(1.0),
-        m_projectTracks(0)
+        m_projectTracks(0),
+        m_doc(doc)
 {
 
     view = new Ui::TimeLine_UI();

diff --git a/src/transition.cpp b/src/transition.cpp
index 8272941bd20440be08973a7874549cdbdd534ed5..95c0b8380149b045001d36d9484b18bd712804a9 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -33,8 +33,8 @@
 
 Transition::Transition(const ItemInfo info, int transitiontrack, double fps, QDomElement params, bool automaticTransition) :
         AbstractClipItem(info, QRectF(), fps),
-        m_automaticTransition(automaticTransition),
-        m_forceTransitionTrack(false)
+        m_forceTransitionTrack(false),
+        m_automaticTransition(automaticTransition)
 {
     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 5309915ec8178a7835a3e4f084f30c409e087c00..372a59b86ddb48180f0b84bddab7bd3b908f78cf 100644 (file)
--- a/src/transitionsettings.cpp
+++ b/src/transitionsettings.cpp
@@ -28,8 +28,8 @@
 
 TransitionSettings::TransitionSettings(QWidget* parent) :
         QWidget(parent),
-        m_tracksCount(0),
-        m_usedTransition(NULL)
+        m_usedTransition(NULL),
+        m_tracksCount(0)
 {
     ui.setupUi(this);
     effectEdit = new EffectStackEdit(ui.frame);

diff --git a/thumbnailer/westleypreview.cpp b/thumbnailer/westleypreview.cpp
index 6292069203a7555929803532432b3b076fe3e10d..66285b238008dfc498d3059b2bea90a4b8bc5bf0 100644 (file)
--- a/thumbnailer/westleypreview.cpp
+++ b/thumbnailer/westleypreview.cpp
@@ -48,8 +48,8 @@ extern "C"
 }
 
 WestleyPreview::WestleyPreview() :
-        m_rand(0),
-        m_inigoprocess(0)
+        m_inigoprocess(0),
+        m_rand(0)
 {
 }