[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdesvn/frameworks] src: Save lastURL as valid Url so we don't need to use helpers::KTranslateUrl::s
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2016-03-31 19:21:07
Message-ID: E1ali9T-0005rB-Bu () scm ! kde ! org
[Download RAW message or body]

Git commit a3245156041753ed4d1232de987504e1c9276705 by Christian Ehrlicher.
Committed on 28/03/2016 at 18:20.
Pushed by chehrlic into branch 'frameworks'.

Save lastURL as valid Url so we don't need to use helpers::KTranslateUrl::string2Uri() on reload

M  +7    -7    src/kdesvn.cpp

http://commits.kde.org/kdesvn/a3245156041753ed4d1232de987504e1c9276705

diff --git a/src/kdesvn.cpp b/src/kdesvn.cpp
index ba27ec7..5d709cd 100644
--- a/src/kdesvn.cpp
+++ b/src/kdesvn.cpp
@@ -305,9 +305,9 @@ void kdesvn::readProperties(const KConfigGroup &config)
         return;
     }
 
-    const QString url = config.readPathEntry("lastURL", QString());
-    if (!url.isEmpty()) {
-        m_part->openUrl(helpers::KTranslateUrl::string2Uri(url));
+    const QUrl url(config.readPathEntry("lastURL", QString()));
+    if (url.isValid()) {
+        m_part->openUrl(url);
     }
 }
 
@@ -425,7 +425,7 @@ void kdesvn::closeEvent(QCloseEvent *ev)
     emit sigSavestate();
     if (m_part) {
         KConfigGroup cs(KSharedConfig::openConfig(), "startup");
-        cs.writeEntry("lastURL", m_part->url().toDisplayString());
+        cs.writeEntry("lastURL", m_part->url().toString());
         cs.sync();
     }
     return KParts::MainWindow::closeEvent(ev);
@@ -441,9 +441,9 @@ void kdesvn::checkReload()
         return;
     }
 
-    const QString url = cs.readPathEntry("lastURL", QString());
-    if (!url.isEmpty() && m_part) {
-        load(helpers::KTranslateUrl::string2Uri(url), false);
+    const QUrl url(cs.readPathEntry("lastURL", QString()));
+    if (url.isValid() && m_part) {
+        load(url, false);
     }
 }
 

[prev in list] [next in list] [prev in thread] [next in thread]