┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Penz <[email protected]>2010-09-21 19:38:26 +0000
committerPeter Penz <[email protected]>2010-09-21 19:38:26 +0000
commitbf8f150507b6e2bca77f0e899736ae22a012056b (patch)
treeaccd772c1c2aa15500c04ab1b104bc3781b0e167
parent53dbea61bcce157c9556601ad6163f5d78e19c0f (diff)
- DolphinViewContainer::url() returns an instance, not a reference
- GeneralSettings::homeUrl() returns a QString instance, not a KUrl reference svn path=/trunk/KDE/kdebase/apps/; revision=1177958
-rw-r--r--src/dolphinmainwindow.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index e83d8c692..41ba52419 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -958,7 +958,7 @@ void DolphinMainWindow::openTerminal()
void DolphinMainWindow::editSettings()
{
if (m_settingsDialog == 0) {
- const KUrl& url = activeViewContainer()->url();
+ const KUrl url = activeViewContainer()->url();
m_settingsDialog = new DolphinSettingsDialog(url, this);
m_settingsDialog->setAttribute(Qt::WA_DeleteOnClose);
m_settingsDialog->show();
@@ -1195,7 +1195,7 @@ void DolphinMainWindow::init()
setupActions();
- const KUrl& homeUrl = generalSettings->homeUrl();
+ const KUrl homeUrl(generalSettings->homeUrl());
setUrlAsCaption(homeUrl);
m_actionHandler = new DolphinViewActionHandler(actionCollection(), this);
connect(m_actionHandler, SIGNAL(actionBeingHandled()), SLOT(clearStatusBar()));
@@ -1299,7 +1299,7 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContain
updateViewActions();
updateGoActions();
- const KUrl& url = m_activeViewContainer->url();
+ const KUrl url = m_activeViewContainer->url();
setUrlAsCaption(url);
if (m_viewTab.count() > 1) {
m_tabBar->setTabText(m_tabIndex, tabName(url));
@@ -1624,7 +1624,7 @@ void DolphinMainWindow::updateViewActions()
void DolphinMainWindow::updateGoActions()
{
QAction* goUpAction = actionCollection()->action(KStandardAction::name(KStandardAction::Up));
- const KUrl& currentUrl = m_activeViewContainer->url();
+ const KUrl currentUrl = m_activeViewContainer->url();
goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
}