From 6f6b1bbb69ba6653879431b1c4dcb22c89efba81 Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Fri, 10 Oct 2014 23:36:36 +0200
Subject: Clean includes + port to QMenu

---
 src/views/dolphinnewfilemenuobserver.h | 1 -
 src/views/dolphinremoteencoding.cpp    | 2 +-
 src/views/dolphinview.cpp              | 4 ++--
 src/views/dolphinview.h                | 1 -
 src/views/dolphinviewactionhandler.cpp | 2 +-
 src/views/draganddrophelper.h          | 1 -
 src/views/tooltips/tooltipmanager.h    | 4 ----
 7 files changed, 4 insertions(+), 11 deletions(-)

(limited to 'src/views')

diff --git a/src/views/dolphinnewfilemenuobserver.h b/src/views/dolphinnewfilemenuobserver.h
index 3b5014ae9..b9b18e229 100644
--- a/src/views/dolphinnewfilemenuobserver.h
+++ b/src/views/dolphinnewfilemenuobserver.h
@@ -25,7 +25,6 @@
 #include "libdolphin_export.h"
 
 class DolphinNewFileMenu;
-class KUrl;
 
 /**
  * @brief Allows to observe new file items that have been created
diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp
index 8fe66b92d..97a15313a 100644
--- a/src/views/dolphinremoteencoding.cpp
+++ b/src/views/dolphinremoteencoding.cpp
@@ -35,7 +35,7 @@
 #include <KMimeType>
 #include <KConfig>
 #include <KCharsets>
-#include <KMenu>
+#include <QMenu>
 #include <KProtocolInfo>
 #include <KProtocolManager>
 #include <KIO/Scheduler>
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 1586dfc88..b3df1ebd6 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -58,7 +58,7 @@
 #include <KIO/PreviewJob>
 #include <KIO/Paste>
 #include <KJob>
-#include <KMenu>
+#include <QMenu>
 #include <KGlobal>
 #include <KMessageBox>
 #include <KJobWidgets>
@@ -874,7 +874,7 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
 {
     ViewProperties props(viewPropertiesUrl());
 
-    QPointer<KMenu> menu = new KMenu(QApplication::activeWindow());
+    QPointer<QMenu> menu = new QMenu(QApplication::activeWindow());
 
     KItemListView* view = m_container->controller()->view();
     const QSet<QByteArray> visibleRolesSet = view->visibleRoles().toSet();
diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index 1c5ecd57e..1616bcaa6 100644
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -40,7 +40,6 @@
 typedef KIO::FileUndoManager::CommandType CommandType;
 
 class DolphinItemListView;
-class KActionCollection;
 class KFileItemModel;
 class KItemListContainer;
 class KItemModelBase;
diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index d99c78cdd..41c3a5dca 100644
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -33,7 +33,7 @@
 #include <KActionMenu>
 #include <kitemviews/kfileitemmodel.h>
 #include <KLocale>
-#include <KMenu>
+#include <QMenu>
 #include <KNewFileMenu>
 #include <KSelectAction>
 #include <KToggleAction>
diff --git a/src/views/draganddrophelper.h b/src/views/draganddrophelper.h
index eda5fc5c2..a6fbb7c7f 100644
--- a/src/views/draganddrophelper.h
+++ b/src/views/draganddrophelper.h
@@ -28,7 +28,6 @@
 class KFileItem;
 class KUrl;
 class QDropEvent;
-class QWidget;
 class KonqOperations;
 
 class LIBDOLPHINPRIVATE_EXPORT DragAndDropHelper
diff --git a/src/views/tooltips/tooltipmanager.h b/src/views/tooltips/tooltipmanager.h
index 4fd8f843e..f6d8b8f26 100644
--- a/src/views/tooltips/tooltipmanager.h
+++ b/src/views/tooltips/tooltipmanager.h
@@ -25,11 +25,7 @@
 
 #include <KFileItem>
 
-class DolphinModel;
-class DolphinSortFilterProxyModel;
 class FileMetaDataToolTip;
-class QAbstractItemView;
-class QModelIndex;
 class QTimer;
 
 /**
-- 
cgit v1.3