Use capitalized KDE includes

[dolphin.git] / src / views / dolphiniconsview.cpp

diff --git a/src/views/dolphiniconsview.cpp b/src/views/dolphiniconsview.cpp
index 522a9078779ba6b00d18ce5d209d00d5dbe9cca9..301748e15570e26aa5d9a7ef21eb3613d2e2b0e9 100644 (file)
--- a/src/views/dolphiniconsview.cpp
+++ b/src/views/dolphiniconsview.cpp
@@ -31,9 +31,9 @@
 #include "viewmodecontroller.h"
 #include "zoomlevelinfo.h"
 
-#include <kcategorizedsortfilterproxymodel.h>
-#include <kdialog.h>
-#include <kfileitemdelegate.h>
+#include <KCategorizedSortFilterProxyModel>
+#include <KDialog>
+#include <KFileItemDelegate>
 
 #include <QAbstractProxyModel>
 #include <QApplication>
@@ -45,7 +45,6 @@ DolphinIconsView::DolphinIconsView(QWidget* parent,
                                    DolphinSortFilterProxyModel* proxyModel) :
     KCategorizedView(parent),
     m_dolphinViewController(dolphinViewController),
-    m_viewModeController(viewModeController),
     m_categoryDrawer(new DolphinCategoryDrawer(this)),
     m_extensionsFactory(0),
     m_font(),
@@ -126,9 +125,6 @@ DolphinIconsView::DolphinIconsView(QWidget* parent,
 
     updateGridSize(view->showPreview(), 0);
     m_extensionsFactory = new ViewExtensionsFactory(this, dolphinViewController, viewModeController);
-
-    // setFocus() must be called after m_extensionsFactory is initialised (see bug 240374).
-    setFocus();
 }
 
 DolphinIconsView::~DolphinIconsView()
@@ -227,7 +223,7 @@ void DolphinIconsView::dropEvent(QDropEvent* event)
 {
     const QModelIndex index = indexAt(event->pos());
     const KFileItem item = m_dolphinViewController->itemForIndex(index);
-    m_dolphinViewController->indicateDroppedUrls(item, m_viewModeController->url(), event);
+    m_dolphinViewController->indicateDroppedUrls(item, event);
     // don't call KCategorizedView::dropEvent(event), as it moves
     // the items which is not wanted
 }