Fix indent

[kdenlive] / src / recmonitor.cpp

diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp
index aec81c3995b03f5ad234ded1a2e80648f158da49..e104426e1f03db10563f0796d4bf1596e8290fed 100644 (file)
--- a/src/recmonitor.cpp
+++ b/src/recmonitor.cpp
@@ -181,7 +181,7 @@ RecMonitor::~RecMonitor()
     m_spaceTimer.stop();
     delete m_captureProcess;
     delete m_displayProcess;
-    if (m_captureDevice) delete m_captureDevice;
+    delete m_captureDevice;
 }
 
 void RecMonitor::mouseDoubleClickEvent(QMouseEvent * event)
@@ -233,15 +233,15 @@ void RecMonitor::slotVideoDeviceChanged(int ix)
 {
     QString capturefile;
     QString capturename;
-    if (m_infoMessage->isVisible()) {
 #if KDE_IS_VERSION(4,7,0)
+    if (m_infoMessage->isVisible()) {
 #if KDE_IS_VERSION(4,10,0)
-    m_infoMessage->animatedHide();
+       m_infoMessage->animatedHide();
 #else    
-    QTimer::singleShot(0, m_infoMessage, SLOT(animatedHide()));
-#endif
+       QTimer::singleShot(0, m_infoMessage, SLOT(animatedHide()));
 #endif
     }
+#endif
     m_previewSettings->setEnabled(ix == VIDEO4LINUX || ix == BLACKMAGIC);
     control_frame->setVisible(ix == VIDEO4LINUX);
     m_playAction->setVisible(ix != SCREENGRAB);
@@ -280,7 +280,7 @@ void RecMonitor::slotVideoDeviceChanged(int ix)
         if (!KdenliveSettings::ffmpegpath().isEmpty()) {
            if (!Render::checkX11Grab()) {
                // FFmpeg does not support screen grab
-               showWarningMessage(i18n("Your FFmpeg / Libav installation\n does not support screen grab"), "dialog-warning");
+               showWarningMessage(i18n("Your FFmpeg / Libav installation\n does not support screen grab"));
                m_recAction->setEnabled(false);
            }
            else video_frame->setPixmap(mergeSideBySide(KIcon("video-display").pixmap(QSize(50, 50)), i18n("Press record button\nto start screen capture\nFiles will be saved in:\n%1", m_capturePath)));
@@ -612,7 +612,7 @@ void RecMonitor::slotRecord()
         while (QFile::exists(path)) {
             QString num = QString::number(i).rightJustified(4, '0', false);
             path = KUrl(m_capturePath).path(KUrl::AddTrailingSlash) + "capture" + num + '.' + extension;
-            i++;
+            ++i;
         }
         m_captureFile = KUrl(path);
 
@@ -799,7 +799,8 @@ void RecMonitor::showWarningMessage(const QString &text, bool logAction)
        m_infoMessage->addAction(manualAction);
     }
 #if KDE_IS_VERSION(4,10,0)
-    m_infoMessage->animatedShow();
+    if (isVisible())
+       m_infoMessage->animatedShow();
 #else
     QTimer::singleShot(0, m_infoMessage, SLOT(animatedShow()));
 #endif
@@ -810,12 +811,12 @@ void RecMonitor::showWarningMessage(const QString &text, bool logAction)
     }
     else {
        video_frame->setText(QString("<qt>" + text + "<br><a href=\"http://kde.org\">" + i18n("Show log") + "</a>"));
-       connect(video_frame, SIGNAL(linkActivated (const QString &)), this, SLOT(slotShowLog()));
+       connect(video_frame, SIGNAL(linkActivated(QString)), this, SLOT(slotShowLog()));
     }
 #endif
 }
 
-const QString RecMonitor::getV4lXmlPlaylist(MltVideoProfile profile, bool *isXml) 
+const QString RecMonitor::getV4lXmlPlaylist(const MltVideoProfile &profile, bool *isXml)
 {
     QString playlist;
     if (rec_video->isChecked() && rec_audio->isChecked()) {
@@ -969,7 +970,7 @@ void RecMonitor::manageCapturedFiles()
     kDebug() << "Found : " << capturedFiles.count() << " new capture files";
     kDebug() << capturedFiles;
 
-    if (capturedFiles.count() > 0) {
+    if (!capturedFiles.isEmpty()) {
         QPointer<ManageCapturesDialog> d = new ManageCapturesDialog(capturedFiles, this);
         if (d->exec() == QDialog::Accepted) {
             emit addProjectClipList(d->importFiles());