[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive] src: Fix pedantic, fix forward declaration/include
From:       Montel Laurent <montel () kde ! org>
Date:       2013-05-31 17:13:46
Message-ID: 20130531171346.D1903A6071 () git ! kde ! org
[Download RAW message or body]

Git commit 8264860e076d2dbceb8016aa55e1a35f7dd0da96 by Montel Laurent.
Committed on 31/05/2013 at 16:18.
Pushed by mlaurent into branch 'master'.

Fix pedantic, fix forward declaration/include

M  +4    -2    src/encodingprofilesdialog.cpp
M  +1    -1    src/kthumb.h
M  +0    -1    src/managecapturesdialog.h
M  +1    -0    src/monitor.cpp
M  +1    -3    src/monitor.h
M  +1    -0    src/scopes/abstractscopewidget.cpp

http://commits.kde.org/kdenlive/8264860e076d2dbceb8016aa55e1a35f7dd0da96

diff --git a/src/encodingprofilesdialog.cpp b/src/encodingprofilesdialog.cpp
index 13a93f2..857a7fd 100644
--- a/src/encodingprofilesdialog.cpp
+++ b/src/encodingprofilesdialog.cpp
@@ -105,14 +105,16 @@ void EncodingProfilesDialog::slotShowParams()
 {
     profile_parameters->clear();
     QListWidgetItem *item = profile_list->currentItem();
-    if (!item) return;
+    if (!item)
+        return;
     profile_parameters->setPlainText(item->data(Qt::UserRole).toString().section(';', 0, 0));
 }
 
 void EncodingProfilesDialog::slotDeleteProfile()
 {
     QListWidgetItem *item = profile_list->currentItem();
-    if (!item) return;
+    if (!item)
+        return;
     QString profile = item->text();
     m_configGroup->deleteEntry(profile);
     slotLoadProfiles();
diff --git a/src/kthumb.h b/src/kthumb.h
index cecf58a..21b01fb 100644
--- a/src/kthumb.h
+++ b/src/kthumb.h
@@ -42,7 +42,7 @@ namespace Mlt
 {
 class Producer;
 class Frame;
-};
+}
 
 class ClipManager;
 
diff --git a/src/managecapturesdialog.h b/src/managecapturesdialog.h
index 0e9f80b..6c9c449 100644
--- a/src/managecapturesdialog.h
+++ b/src/managecapturesdialog.h
@@ -25,7 +25,6 @@
 
 #include <KUrl>
 
-//#include "docclipbase.h"
 #include "ui_managecaptures_ui.h"
 
 class ManageCapturesDialog : public QDialog
diff --git a/src/monitor.cpp b/src/monitor.cpp
index 880279d..cbd94d7 100644
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -42,6 +42,7 @@
 #include <QLabel>
 #include <QIntValidator>
 #include <QVBoxLayout>
+#include <QSlider>
 
 
 #define SEEK_INACTIVE (-1)
diff --git a/src/monitor.h b/src/monitor.h
index 293b34e..e0cc20f 100644
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -33,11 +33,8 @@
 #include <QLabel>
 #include <QDomElement>
 #include <QToolBar>
-#include <QSlider>
 
 #include <KIcon>
-#include <KAction>
-#include <KRestrictedLine>
 
 class SmallRuler;
 class DocClipBase;
@@ -47,6 +44,7 @@ class ClipItem;
 class MonitorEditWidget;
 class Monitor;
 class MonitorManager;
+class QSlider;
 
 
 class Overlay : public QLabel
diff --git a/src/scopes/abstractscopewidget.cpp b/src/scopes/abstractscopewidget.cpp
index bc43c7b..a4d789d 100644
--- a/src/scopes/abstractscopewidget.cpp
+++ b/src/scopes/abstractscopewidget.cpp
@@ -21,6 +21,7 @@
 #include <QPainter>
 
 #include <KConfigGroup>
+#include <KGlobal>
 
 // Uncomment for Scope debugging.
 //#define DEBUG_ASW

[prev in list] [next in list] [prev in thread] [next in thread]