Remove all code that is related to DolphinController's

requestUrlChange signal. This signal was removed in r1080351, so the
code isn't needed any more.

svn path=/trunk/KDE/kdebase/apps/; revision=1095213

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index e5151c0fbc602b8e476f35feb879eb32af8d3d45..0a17c788414e5818f66dff5d8f44dbc1d89b2b54 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -106,8 +106,6 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
             this, SLOT(slotSelectionChanged(KFileItemList)));
     connect(m_view, SIGNAL(requestItemInfo(KFileItem)),
             this, SLOT(slotRequestItemInfo(KFileItem)));
-    connect(m_view, SIGNAL(requestUrlChange(KUrl)),
-            this, SLOT(slotRequestUrlChange(KUrl)));
     connect(m_view, SIGNAL(modeChanged()),
             this, SIGNAL(viewModeChanged())); // relay signal
     connect(m_view, SIGNAL(redirection(KUrl, KUrl)),
@@ -456,16 +454,6 @@ void DolphinPart::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl)
     }
 }
 
-void DolphinPart::slotRequestUrlChange(const KUrl& url)
-{
-    if (m_view->url() != url) {
-        // If the view URL is not equal to 'url', then an inner URL change has
-        // been done (e. g. by activating an existing column in the column view).
-        openUrl(url);
-        emit m_extension->openUrlNotify();
-    }
-}
-
 ////
 
 void DolphinPartBrowserExtension::restoreState(QDataStream &stream)

diff --git a/src/dolphinpart.h b/src/dolphinpart.h
index 2b8129f3d33d99495ce9e70fc6dbb385d3cb85f3..5629b9c2dfcbcea306b5ca1486f26e4a36a56028 100644 (file)
--- a/src/dolphinpart.h
+++ b/src/dolphinpart.h
@@ -145,12 +145,6 @@ private Q_SLOTS:
                              const KUrl& url,
                              const QList<QAction*>& customActions);
 
-    /**
-     * Asks the host to open the URL \a url if the current view has
-     * a different URL.
-     */
-    void slotRequestUrlChange(const KUrl& url);
-
     /**
      * Informs the host that we are opening \a url (e.g. after a redirection
      * coming from KDirLister).

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index c00d6a7e7eb8efd25bcb12c6b3d1a810c3534d94..2fa351b3256ed443d17e60e433acaec773e5c6f7 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -108,8 +108,6 @@ DolphinView::DolphinView(QWidget* parent,
 
     connect(m_controller, SIGNAL(urlChanged(const KUrl&)),
             this, SIGNAL(urlChanged(const KUrl&)));
-    connect(m_controller, SIGNAL(requestUrlChange(const KUrl&)),
-            this, SLOT(slotRequestUrlChange(const KUrl&)));
 
     connect(m_controller, SIGNAL(requestContextMenu(const QPoint&, const QList<QAction*>&)),
             this, SLOT(openContextMenu(const QPoint&, const QList<QAction*>&)));
@@ -1125,12 +1123,6 @@ void DolphinView::slotDeleteFileFinished(KJob* job)
     }
 }
 
-void DolphinView::slotRequestUrlChange(const KUrl& url)
-{
-    emit requestUrlChange(url);
-    m_controller->setUrl(url);
-}
-
 void DolphinView::slotDirListerCompleted()
 {
     if (!m_expanderActive) {

diff --git a/src/dolphinview.h b/src/dolphinview.h
index cbbea498f3f9aba3b3a49928516b8e822ec5aa5d..a00e5427b1b5c7f4c5d075da222a6057451fba13 100644 (file)
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -435,12 +435,6 @@ signals:
     /** Is emitted if URL of the view has been changed to \a url. */
     void urlChanged(const KUrl& url);
 
-    /**
-     * Is emitted if the view requests a changing of the current
-     * URL to \a url (see DolphinController::triggerUrlChangeRequest()).
-     */
-    void requestUrlChange(const KUrl& url);
-
     /**
      * Is emitted when clicking on an item with the left mouse button.
      */
@@ -628,12 +622,6 @@ private slots:
      */
     void slotDeleteFileFinished(KJob* job);
 
-    /**
-     * Is emitted if the controller requests a changing of the current
-     * URL to \a url
-     */
-    void slotRequestUrlChange(const KUrl& url);
-
     /**
      * Invoked when the directory lister has completed the loading of
      * items. Assures that pasted items and renamed items get seleced.