Krazy fixes: cleanup all headers

[kdenlive] / src / kdenlivesettingsdialog.cpp

diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp
index 47a4f2edf7a148cbb0556058133193949c4eff0d..b43bb4345f8bb986e2b7bb0bc9171d9303b3d792 100644 (file)
--- a/src/kdenlivesettingsdialog.cpp
+++ b/src/kdenlivesettingsdialog.cpp
@@ -17,13 +17,18 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QDir>
-#include <QTimer>
+#include "kdenlivesettingsdialog.h"
+#include "profilesdialog.h"
+#include "kdenlivesettings.h"
 
 #include <KStandardDirs>
 #include <KDebug>
 #include <kopenwithdialog.h>
 #include <KConfigDialogManager>
+#include <kde_file.h>
+
+#include <QDir>
+#include <QTimer>
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -33,9 +38,6 @@
 #include <linux/input.h>
 #endif /* NO_JOGSHUTTLE */
 
-#include "profilesdialog.h"
-#include "kdenlivesettings.h"
-#include "kdenlivesettingsdialog.h"
 
 KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent): KConfigDialog(parent, "settings", KdenliveSettings::self()) {
 
@@ -110,13 +112,6 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent): KConfigDialog(
     connect(m_configEnv.kp_audio, SIGNAL(clicked()), this, SLOT(slotEditAudioApplication()));
     connect(m_configEnv.kp_player, SIGNAL(clicked()), this, SLOT(slotEditVideoApplication()));
 
-    QMap <QString, QString> profilesInfo = ProfilesDialog::getProfilesInfo();
-    QMapIterator<QString, QString> i(profilesInfo);
-    while (i.hasNext()) {
-        i.next();
-        m_configMisc.kcfg_profiles_list->addItem(i.key(), i.value());
-    }
-
     checkProfile();
 
     slotUpdateDisplay();
@@ -172,6 +167,14 @@ void KdenliveSettingsDialog::slotUpdateRmdRegionStatus() {
 }
 
 void KdenliveSettingsDialog::checkProfile() {
+    m_configMisc.kcfg_profiles_list->clear();
+    QMap <QString, QString> profilesInfo = ProfilesDialog::getProfilesInfo();
+    QMapIterator<QString, QString> i(profilesInfo);
+    while (i.hasNext()) {
+        i.next();
+        m_configMisc.kcfg_profiles_list->addItem(i.key(), i.value());
+    }
+
     if (!KdenliveSettings::default_profile().isEmpty()) {
         for (int i = 0; i < m_configMisc.kcfg_profiles_list->count(); i++) {
             if (m_configMisc.kcfg_profiles_list->itemData(i).toString() == KdenliveSettings::default_profile()) {
@@ -216,7 +219,7 @@ void KdenliveSettingsDialog::initDevices() {
     // Fill the list of audio playback devices
     m_configSdl.kcfg_audio_device->addItem(i18n("Default"), QString());
     m_configCapture.kcfg_rmd_alsa_device->addItem(i18n("Default"), QString());
-    if (KStandardDirs::findExe("aplay") != QString::null) {
+    if (!KStandardDirs::findExe("aplay").isEmpty()) {
         m_readProcess.setOutputChannelMode(KProcess::OnlyStdoutChannel);
         m_readProcess.setProgram("aplay", QStringList() << "-l");
         connect(&m_readProcess, SIGNAL(readyReadStandardOutput()) , this, SLOT(slotReadAudioDevices()));
@@ -231,12 +234,12 @@ void KdenliveSettingsDialog::initDevices() {
             while (!stream.atEnd()) {
                 line = stream.readLine();
                 if (line.contains("playback")) {
-                    deviceId = line.section(":", 0, 0);
-                    m_configSdl.kcfg_audio_device->addItem(line.section(":", 1, 1), "plughw:" + QString::number(deviceId.section("-", 0, 0).toInt()) + "," + QString::number(deviceId.section("-", 1, 1).toInt()));
+                    deviceId = line.section(':', 0, 0);
+                    m_configSdl.kcfg_audio_device->addItem(line.section(':', 1, 1), "plughw:" + QString::number(deviceId.section('-', 0, 0).toInt()) + ',' + QString::number(deviceId.section('-', 1, 1).toInt()));
                 }
                 if (line.contains("capture")) {
-                    deviceId = line.section(":", 0, 0);
-                    m_configCapture.kcfg_rmd_alsa_device->addItem(line.section(":", 1, 1), "plughw:" + QString::number(deviceId.section("-", 0, 0).toInt()) + "," + QString::number(deviceId.section("-", 1, 1).toInt()));
+                    deviceId = line.section(':', 0, 0);
+                    m_configCapture.kcfg_rmd_alsa_device->addItem(line.section(':', 1, 1), "plughw:" + QString::number(deviceId.section('-', 0, 0).toInt()) + ',' + QString::number(deviceId.section('-', 1, 1).toInt()));
                 }
             }
             file.close();
@@ -262,13 +265,13 @@ void KdenliveSettingsDialog::slotReadAudioDevices() {
     kDebug() << "// / / / / / READING APLAY: ";
     kDebug() << result;
     QStringList lines = result.split('\n');
-    foreach(QString data, lines) {
+    foreach(const QString &data, lines) {
         kDebug() << "// READING LINE: " << data;
         if (data.simplified().startsWith("card")) {
-            QString card = data.section(":", 0, 0).section(" ", -1);
-            QString device = data.section(":", 1, 1).section(" ", -1);
-            m_configSdl.kcfg_audio_device->addItem(data.section(":", -1), "plughw:" + card + "," + device);
-            m_configCapture.kcfg_rmd_alsa_device->addItem(data.section(":", -1), "plughw:" + card + "," + device);
+            QString card = data.section(':', 0, 0).section(' ', -1);
+            QString device = data.section(':', 1, 1).section(' ', -1);
+            m_configSdl.kcfg_audio_device->addItem(data.section(':', -1), "plughw:" + card + ',' + device);
+            m_configCapture.kcfg_rmd_alsa_device->addItem(data.section(':', -1), "plughw:" + card + ',' + device);
         }
     }
 }
@@ -337,7 +340,7 @@ void KdenliveSettingsDialog::slotCheckShuttle(int state) {
             kDebug() << "/// CHECKING OFR: " << filename;
 
             char name[256] = "unknown";
-            fd = ::open((char *) filename.toUtf8().data(), O_RDONLY);
+            fd = KDE_open((char *) filename.toUtf8().data(), O_RDONLY);
             if (fd >= 0 && ioctl(fd, EVIOCGNAME(sizeof(name)), name) >= 0) {
                 m_configShuttle.shuttledevicelist->addItem(name, filename);
             }
@@ -413,10 +416,10 @@ void KdenliveSettingsDialog::updateSettings() {
 void KdenliveSettingsDialog::slotUpdateDisplay() {
     QString currentProfile = m_configMisc.kcfg_profiles_list->itemData(m_configMisc.kcfg_profiles_list->currentIndex()).toString();
     QMap< QString, QString > values = ProfilesDialog::getSettingsFromFile(currentProfile);
-    m_configMisc.p_size->setText(values.value("width") + "x" + values.value("height"));
-    m_configMisc.p_fps->setText(values.value("frame_rate_num") + "/" + values.value("frame_rate_den"));
-    m_configMisc.p_aspect->setText(values.value("sample_aspect_num") + "/" + values.value("sample_aspect_den"));
-    m_configMisc.p_display->setText(values.value("display_aspect_num") + "/" + values.value("display_aspect_den"));
+    m_configMisc.p_size->setText(values.value("width") + 'x' + values.value("height"));
+    m_configMisc.p_fps->setText(values.value("frame_rate_num") + '/' + values.value("frame_rate_den"));
+    m_configMisc.p_aspect->setText(values.value("sample_aspect_num") + '/' + values.value("sample_aspect_den"));
+    m_configMisc.p_display->setText(values.value("display_aspect_num") + '/' + values.value("display_aspect_den"));
     if (values.value("progressive").toInt() == 0) m_configMisc.p_progressive->setText(i18n("Interlaced"));
     else m_configMisc.p_progressive->setText(i18n("Progressive"));
     m_defaultProfile = m_configMisc.kcfg_profiles_list->itemText(m_configMisc.kcfg_profiles_list->currentIndex());