From 832e157ecd1a1640b82425358b20fff416a2f8b7 Mon Sep 17 00:00:00 2001
From: Emmanuel Pescosta <emmanuelpescosta099@gmail.com>
Date: Thu, 26 Feb 2015 17:40:06 +0100
Subject: Port away from KDELibs4Support (we only use KDELibs4Support when
 baloo isn't present, because KFileMetaDataWidget is in KDELibs4Support)

Reviewed-By: Vishesh Handa
---
 src/panels/folders/folderspanel.cpp        | 4 ++--
 src/panels/folders/treeviewcontextmenu.cpp | 3 ++-
 src/panels/places/placesitemeditdialog.cpp | 1 -
 src/panels/places/placesitemmodel.cpp      | 2 --
 4 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/panels')

diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp
index e99c673bc..13df9019b 100644
--- a/src/panels/folders/folderspanel.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@ -208,7 +208,7 @@ void FoldersPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
 
     const KFileItem fileItem = m_model->fileItem(index);
 
-    QWeakPointer<TreeViewContextMenu> contextMenu = new TreeViewContextMenu(this, fileItem);
+    QPointer<TreeViewContextMenu> contextMenu = new TreeViewContextMenu(this, fileItem);
     contextMenu.data()->open();
     if (contextMenu.data()) {
         delete contextMenu.data();
@@ -219,7 +219,7 @@ void FoldersPanel::slotViewContextMenuRequested(const QPointF& pos)
 {
     Q_UNUSED(pos);
 
-    QWeakPointer<TreeViewContextMenu> contextMenu = new TreeViewContextMenu(this, KFileItem());
+    QPointer<TreeViewContextMenu> contextMenu = new TreeViewContextMenu(this, KFileItem());
     contextMenu.data()->open();
     if (contextMenu.data()) {
         delete contextMenu.data();
diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp
index bbdf783cd..e45fcd67e 100644
--- a/src/panels/folders/treeviewcontextmenu.cpp
+++ b/src/panels/folders/treeviewcontextmenu.cpp
@@ -42,6 +42,7 @@
 #include <QApplication>
 #include <QClipboard>
 #include <QMimeData>
+#include <QPointer>
 
 TreeViewContextMenu::TreeViewContextMenu(FoldersPanel* parent,
                                          const KFileItem& fileInfo) :
@@ -148,7 +149,7 @@ void TreeViewContextMenu::open()
         }
     }
 
-    QWeakPointer<QMenu> popupPtr = popup;
+    QPointer<QMenu> popupPtr = popup;
     popup->exec(QCursor::pos());
     if (popupPtr.data()) {
         popupPtr.data()->deleteLater();
diff --git a/src/panels/places/placesitemeditdialog.cpp b/src/panels/places/placesitemeditdialog.cpp
index d5ca4bf4f..d035b0403 100644
--- a/src/panels/places/placesitemeditdialog.cpp
+++ b/src/panels/places/placesitemeditdialog.cpp
@@ -30,7 +30,6 @@
 #include <KLocalizedString>
 #include <QMimeDatabase>
 #include <KUrlRequester>
-#include <KComponentData>
 #include <QCheckBox>
 #include <QEvent>
 #include <QFormLayout>
diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp
index 354d4a43e..bc7c2b7d3 100644
--- a/src/panels/places/placesitemmodel.cpp
+++ b/src/panels/places/placesitemmodel.cpp
@@ -26,13 +26,11 @@
 #include "dolphin_generalsettings.h"
 
 #include <KBookmark>
-#include <KBookmarkGroup>
 #include <KBookmarkManager>
 #include "dolphindebug.h"
 #include <QIcon>
 #include <KProtocolInfo>
 #include <KLocalizedString>
-#include <KComponentData>
 #include <QStandardPaths>
 #include <KUser>
 #include <KAboutData>
-- 
cgit v1.3