From: Peter Penz <peter.penz19@gmail.com>
Date: Sun, 7 Nov 2010 14:31:33 +0000 (+0000)
Subject: Remove patch from SVN commit 1126336: It has sideeffects if the removed entry still... 
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/4fa931ae25eda718ab3a1666f385f9db6228d3a6

Remove patch from SVN commit 1126336: It has sideeffects if the removed entry still shows a valid content.

BUG: 244021
BUG: 250405
FIXED-IN: 4.6.0

svn path=/trunk/KDE/kdebase/apps/; revision=1193904
---

diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp
index 1ca9bf59a..d2e3ef570 100644
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@ -20,10 +20,8 @@
 
 #include "placespanel.h"
 
-#include "dolphin_generalsettings.h"
 #include <kfileitem.h>
 #include <konq_operations.h>
-#include "settings/dolphinsettings.h"
 #include "views/draganddrophelper.h"
 
 PlacesPanel::PlacesPanel(QWidget* parent) :
@@ -47,22 +45,6 @@ void PlacesPanel::mousePressEvent(QMouseEvent* event)
     KFilePlacesView::mousePressEvent(event);
 }
 
-void PlacesPanel::rowsAboutToBeRemoved(const QModelIndex& parent, int start, int end)
-{
-    Q_UNUSED(parent);
-
-    const QModelIndexList indexes = selectedIndexes();
-    if (!indexes.isEmpty()) {
-        const int selectedRow = indexes.first().row();
-        if ((start >= selectedRow) && (end <= selectedRow)) {
-            // The currently selected item is about to be removed, reset view to home URL
-            const KUrl homeUrl = DolphinSettings::instance().generalSettings()->homeUrl();
-            setUrl(homeUrl);
-            emit urlChanged(homeUrl, Qt::NoButton);
-        }
-    }
-}
-
 void PlacesPanel::slotUrlsDropped(const KUrl& dest, QDropEvent* event, QWidget* parent)
 {
     DragAndDropHelper::instance().dropUrls(KFileItem(), dest, event, parent);
diff --git a/src/panels/places/placespanel.h b/src/panels/places/placespanel.h
index f39bdec47..05a0b45ac 100644
--- a/src/panels/places/placespanel.h
+++ b/src/panels/places/placespanel.h
@@ -39,7 +39,6 @@ signals:
 
 protected:
     virtual void mousePressEvent(QMouseEvent* event);
-    virtual void rowsAboutToBeRemoved(const QModelIndex& parent, int start, int end);
 
 private slots:
     void slotUrlsDropped(const KUrl& dest, QDropEvent* event, QWidget* parent);