X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftransitionsettings.cpp;h=b21203bf2847c99af953374ae48ac501e5bfba9f;hb=255cfc0146db2aa12cbce15f6a3590efc5d9ef83;hp=6afc76ec8f30047c2344ec4292c8ad02dbdd57b7;hpb=45adaf0e93ffa28bfeb3425a099ca95e70fd0d79;p=kdenlive

diff --git a/src/transitionsettings.cpp b/src/transitionsettings.cpp
index 6afc76ec..b21203bf 100644
--- a/src/transitionsettings.cpp
+++ b/src/transitionsettings.cpp
@@ -23,7 +23,7 @@
 #include "effectstackedit.h"
 #include "kdenlivesettings.h"
 #include "mainwindow.h"
-#include "monitoreditwidget.h"
+#include "widgets/monitoreditwidget.h"
 #include "monitorscene.h"
 
 #include <KDebug>
@@ -50,7 +50,7 @@ TransitionSettings::TransitionSettings(Monitor *monitor, QWidget* parent) :
     QStringList transitionInfo;
     int ix = 0;
 
-    for (; ix < max; ix++) {
+    for (; ix < max; ++ix) {
         transitionInfo = MainWindow::transitions.effectIdInfo(ix);
         transitionInfo << QString::number(ix);
         transitionsList.append(transitionInfo);
@@ -61,7 +61,7 @@ TransitionSettings::TransitionSettings(Monitor *monitor, QWidget* parent) :
         if (!data.isEmpty()) data.removeLast();
         transitionList->addItem(value.at(0), data);
         transitionList->setItemData(ix, MainWindow::transitions.getInfoFromIndex(value.last().toInt()), Qt::ToolTipRole);
-        ix++;
+        ++ix;
     }
 
     connect(transitionList, SIGNAL(activated(int)), this, SLOT(slotTransitionChanged()));
@@ -95,7 +95,7 @@ void TransitionSettings::updateTrackList()
     KIcon audioIcon("kdenlive-show-audio");
     for (int i = limit; i < m_tracks.count(); ++i) {
         int ix = m_tracks.count() - i - 1;
-        transitionTrack->addItem(m_tracks.at(ix).type == VIDEOTRACK ? videoIcon : audioIcon,
+        transitionTrack->addItem(m_tracks.at(ix).type == VideoTrack ? videoIcon : audioIcon,
                                  m_tracks.at(ix).trackName.isEmpty() ? QString::number(i) : m_tracks.at(ix).trackName + " (" + QString::number(i) + ')',
                                  m_tracks.count() - i);
     }
@@ -129,8 +129,7 @@ void TransitionSettings::slotTransitionChanged(bool reinit, bool updateCurrent)
             transitionList->setCurrentIndex(ix);
             transitionList->blockSignals(false);
             m_effectEdit->transferParamDesc(e, m_usedTransition->info(), false);
-        }
-        else {
+        } else {
             slotUpdateEffectParams(e, e);
             if (m_usedTransition->hasGeometry())
                 m_effectEdit->transferParamDesc(m_usedTransition->toXML(), m_usedTransition->info(), false);