Pedantic--

diff --git a/src/tests/kitemlistcontrollertest.cpp b/src/tests/kitemlistcontrollertest.cpp
index e34731fa4b59c1f058bc8ec6bd3255fc4b142f07..e170e7b5b2b58b89a15bcdebbbe2b554158ba7c3 100644 (file)
--- a/src/tests/kitemlistcontrollertest.cpp
+++ b/src/tests/kitemlistcontrollertest.cpp
@@ -71,10 +71,10 @@ private:
     bool m_activateItemOnSingleClick;
 };
 
-Q_DECLARE_METATYPE(KFileItemListView::ItemLayout);
-Q_DECLARE_METATYPE(Qt::Orientation);
-Q_DECLARE_METATYPE(KItemListController::SelectionBehavior);
-Q_DECLARE_METATYPE(KItemSet);
+Q_DECLARE_METATYPE(KFileItemListView::ItemLayout)
+Q_DECLARE_METATYPE(Qt::Orientation)
+Q_DECLARE_METATYPE(KItemListController::SelectionBehavior)
+Q_DECLARE_METATYPE(KItemSet)
 
 class KItemListControllerTest : public QObject
 {
@@ -209,7 +209,7 @@ struct ViewState {
 
 // We have to define a typedef for the pair in order to make the test compile.
 typedef QPair<KeyPress, ViewState> keyPressViewStatePair;
-Q_DECLARE_METATYPE(QList<keyPressViewStatePair>);
+Q_DECLARE_METATYPE(QList<keyPressViewStatePair>)
 
 /**
  * This function provides the data for the actual test function

diff --git a/src/tests/kitemlistselectionmanagertest.cpp b/src/tests/kitemlistselectionmanagertest.cpp
index 7cf60df4228d3b23013c948678fdd0076957ce78..b183de3026924578cecd11fa9e45f596edaf6e34 100644 (file)
--- a/src/tests/kitemlistselectionmanagertest.cpp
+++ b/src/tests/kitemlistselectionmanagertest.cpp
@@ -322,12 +322,12 @@ namespace {
     };
 }
 
-Q_DECLARE_METATYPE(KItemSet);
-Q_DECLARE_METATYPE(ChangeType);
-Q_DECLARE_METATYPE(KItemRange);
-Q_DECLARE_METATYPE(KItemRangeList);
-Q_DECLARE_METATYPE(KItemListSelectionManager::SelectionMode);
-Q_DECLARE_METATYPE(QList<int>);
+Q_DECLARE_METATYPE(KItemSet)
+Q_DECLARE_METATYPE(ChangeType)
+Q_DECLARE_METATYPE(KItemRange)
+Q_DECLARE_METATYPE(KItemRangeList)
+Q_DECLARE_METATYPE(KItemListSelectionManager::SelectionMode)
+Q_DECLARE_METATYPE(QList<int>)
 
 /**
  * The following function provides a generic way to test the selection functionality.

diff --git a/src/tests/kitemrangetest.cpp b/src/tests/kitemrangetest.cpp
index ce7b48012a98528a0ed429f387a7aeeb28a87012..5e4ea653f43aa74d2f4bca3f948935589921b3e2 100644 (file)
--- a/src/tests/kitemrangetest.cpp
+++ b/src/tests/kitemrangetest.cpp
@@ -22,8 +22,8 @@
 #include <QTest>
 #include <QVector>
 
-Q_DECLARE_METATYPE(QVector<int>);
-Q_DECLARE_METATYPE(KItemRangeList);
+Q_DECLARE_METATYPE(QVector<int>)
+Q_DECLARE_METATYPE(KItemRangeList)
 
 class KItemRangeTest : public QObject
 {

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index d3023585aefa05a5a292fcbc6c0a9e9ef69e4e39..ba6d7188de6c27bed57e52f9576b7b896daf152b 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -77,7 +77,7 @@
 
 namespace {
     const int MaxModeEnum = DolphinView::CompactView;
-};
+}
 
 DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
     QWidget(parent),

diff --git a/src/views/versioncontrol/kversioncontrolplugin.h b/src/views/versioncontrol/kversioncontrolplugin.h
index e5a26784829b56eb46266b92603067a5c62670c3..85835e06232d602438d3ae8953c6f581dd70c2bc 100644 (file)
--- a/src/views/versioncontrol/kversioncontrolplugin.h
+++ b/src/views/versioncontrol/kversioncontrolplugin.h
@@ -23,9 +23,9 @@
 #include <dolphin_export.h>
 
 #include <QObject>
-#include <KFileItem>
 #include <QAction>
-
+class KFileItemList;
+class KFileItem;
 /**
  * @brief Base class for version control plugins.
  *