From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Fri, 7 Sep 2012 12:58:34 +0000 (+0200)
Subject: Fix jog shuttle slot (Qt's moc doesn't like slots in #ifdef's)
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ac37d09b9998fa06e7b9ff85aadb09287d17408c;p=kdenlive

Fix jog shuttle slot (Qt's moc doesn't like slots in #ifdef's)
---

diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp
index 1b1bce53..90216935 100644
--- a/src/kdenlivesettingsdialog.cpp
+++ b/src/kdenlivesettingsdialog.cpp
@@ -521,10 +521,10 @@ void KdenliveSettingsDialog::slotEditImageApplication()
     delete dlg;
 }
 
-#ifdef USE_JOGSHUTTLE
 void KdenliveSettingsDialog::slotCheckShuttle(int state)
 {
-    m_configShuttle.config_group->setEnabled(state);
+#ifdef USE_JOGSHUTTLE
+  m_configShuttle.config_group->setEnabled(state);
     if (m_configShuttle.shuttledevicelist->count() == 0) {
         // parse devices
         QString baseName = "/dev/input/event";
@@ -542,16 +542,17 @@ void KdenliveSettingsDialog::slotCheckShuttle(int state)
         }
         if (KdenliveSettings::shuttledevice().isEmpty()) QTimer::singleShot(1500, this, SLOT(slotUpdateShuttleDevice()));
     }
+#endif /* USE_JOGSHUTTLE */
 }
 
 void KdenliveSettingsDialog::slotUpdateShuttleDevice(int ix)
 {
+#ifdef USE_JOGSHUTTLE
     QString device = m_configShuttle.shuttledevicelist->itemData(ix).toString();
     //KdenliveSettings::setShuttledevice(device);
     m_configShuttle.kcfg_shuttledevice->setText(device);
-}
-
 #endif /* USE_JOGSHUTTLE */
+}
 
 void KdenliveSettingsDialog::updateWidgets()
 {
diff --git a/src/kdenlivesettingsdialog.h b/src/kdenlivesettingsdialog.h
index 9208107a..ed57d12d 100644
--- a/src/kdenlivesettingsdialog.h
+++ b/src/kdenlivesettingsdialog.h
@@ -53,10 +53,8 @@ protected slots:
 
 private slots:
     void slotUpdateDisplay();
-#ifdef USE_JOGSHUTTLE
     void slotCheckShuttle(int state = 0);
     void slotUpdateShuttleDevice(int ix = 0);
-#endif
     void slotEditImageApplication();
     void slotEditAudioApplication();
     void slotEditVideoApplication();