Fix pedantic, fix forward declaration/include

diff --git a/src/encodingprofilesdialog.cpp b/src/encodingprofilesdialog.cpp
index 13a93f25821b464c2bffff6d9628ae42abc23eb9..857a7fd55dbdacde3e5bcc6c4c87fa59a6075adc 100644 (file)
--- 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 cecf58a5cba563cd1acf50eee91b97a9f0c5cc53..21b01fbff6ff5a94467e86b7f2a635b1a72bbb0a 100644 (file)
--- 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 0e9f80b7815126f58cf6627ff8b3cb6983903c55..6c9c4496a76940f154512a88ddda42481cffd419 100644 (file)
--- 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 880279d50d79decb0a3d6b96afb4de5a3a4ab3e6..cbd94d7e1c11d68359bb4405d8b543bf855036b9 100644 (file)
--- 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 293b34e29c5ccb65d5dc985eddd84dc4162d1acd..e0cc20f086b4eaea5b6dacb6717ab96496699d1e 100644 (file)
--- 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 bc43c7b44ab7cafc1efb239b33c394da36b22af7..a4d789d33de33d2399dce84b109cdeb60f6b0a89 100644 (file)
--- 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