┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFrank Reininghaus <[email protected]>2010-02-23 20:34:33 +0000
committerFrank Reininghaus <[email protected]>2010-02-23 20:34:33 +0000
commitaf46cf7666564847b6a9a752a11ce55485bff0eb (patch)
tree2886d1b3514234f09f35ce2e2efd695bf59b20af /src
parente6ba74c5ae544dbc55c5e258adc7f23924993e5b (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/dolphinpart.cpp12
-rw-r--r--src/dolphinpart.h6
-rw-r--r--src/dolphinview.cpp8
-rw-r--r--src/dolphinview.h12
4 files changed, 0 insertions, 38 deletions
diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index e5151c0fb..0a17c7884 100644
--- 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 2b8129f3d..5629b9c2d 100644
--- a/src/dolphinpart.h
+++ b/src/dolphinpart.h
@@ -146,12 +146,6 @@ private Q_SLOTS:
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).
* Testcase 1: fish://localhost
diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index c00d6a7e7..2fa351b32 100644
--- 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 cbbea498f..a00e5427b 100644
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -436,12 +436,6 @@ signals:
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.
*/
void itemTriggered(const KFileItem& item);
@@ -629,12 +623,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.
*/