Integrate with the required MLT hooks for getting Movit to work.

[kdenlive] / src / tracksconfigdialog.cpp

diff --git a/src/tracksconfigdialog.cpp b/src/tracksconfigdialog.cpp
index 48a6e41744f0d1c7aee239b1401def679eca727e..d2736deaf50f5b0461d009934195bdf5988f96f5 100644 (file)
--- a/src/tracksconfigdialog.cpp
+++ b/src/tracksconfigdialog.cpp
@@ -44,7 +44,7 @@ void TracksDelegate::setEditorData(QWidget *editor, const QModelIndex &index) co
     QComboBox *comboBox = qobject_cast<QComboBox *>(editor);
     if (!comboBox)
         return;
-    int pos = comboBox->findText(index.model()->data(index).toString(), Qt::MatchExactly);
+    const int pos = comboBox->findText(index.model()->data(index).toString(), Qt::MatchExactly);
     comboBox->setCurrentIndex(pos);
 }
 
@@ -106,14 +106,14 @@ const QList <TrackInfo> TracksConfigDialog::tracksList()
 {
     QList <TrackInfo> tracks;
     TrackInfo info;
-    for (int i = table->rowCount() - 1; i >= 0; i--) {
+    for (int i = table->rowCount() - 1; i >= 0; --i) {
         info.trackName = table->item(i, 0)->text();
         QTableWidgetItem *item = table->item(i, 1);
         if (item->text() == i18n("Audio")) {
-            info.type = AUDIOTRACK;
+            info.type = AudioTrack;
             info.isBlind = true;
         } else {
-            info.type = VIDEOTRACK;
+            info.type = VideoTrack;
             info.isBlind = (table->item(i, 2)->checkState() == Qt::Checked);
         }
         info.isMute = (table->item(i, 3)->checkState() == Qt::Checked);
@@ -123,7 +123,7 @@ const QList <TrackInfo> TracksConfigDialog::tracksList()
     return tracks;
 }
 
-QList <int> TracksConfigDialog::deletedTracks()
+QList <int> TracksConfigDialog::deletedTracks() const
 {
     return m_deletedRows;
 }
@@ -134,13 +134,13 @@ void TracksConfigDialog::setupOriginal(int selected)
 
     QStringList numbers;
     TrackInfo info;
-    for (int i = m_doc->tracksCount() - 1; i >= 0; i--) {
+    for (int i = m_doc->tracksCount() - 1; i >= 0; --i) {
         numbers << QString::number(i);
         info = m_doc->trackInfoAt(m_doc->tracksCount() - i - 1);
         table->setItem(i, 0, new QTableWidgetItem(info.trackName));
 
         QTableWidgetItem *item1 = new QTableWidgetItem(i18n("Video"));
-        if (info.type == AUDIOTRACK)
+        if (info.type == AudioTrack)
             item1->setText(i18n("Audio"));
         table->setItem(i, 1, item1);
         table->openPersistentEditor(item1);
@@ -148,7 +148,7 @@ void TracksConfigDialog::setupOriginal(int selected)
         QTableWidgetItem *item2 = new QTableWidgetItem("");
         item2->setFlags(item2->flags() & ~Qt::ItemIsEditable);
         item2->setCheckState(info.isBlind ? Qt::Checked : Qt::Unchecked);
-        if (info.type == AUDIOTRACK)
+        if (info.type == AudioTrack)
             item2->setFlags(item2->flags() & ~Qt::ItemIsEnabled);
         table->setItem(i, 2, item2);
 
@@ -194,7 +194,7 @@ void TracksConfigDialog::slotDelete()
             return;
         if (m_deletedRows.at(i) > row)
             break;
-        i++;
+        ++i;
     }
     m_deletedRows.insert(i, row);
     for (i = 0; i < table->columnCount(); ++i) {