[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdesvn] src: Make sure to pass a valid url to QUrl ctor on restart - leftover from KUrl -> QUrl tra
From: Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date: 2016-11-13 13:27:46
Message-ID: E1c5up0-0003dz-Ld () code ! kde ! org
[Download RAW message or body]
Git commit d6724b71a497e5ffd1cb9e0bc212b18fa86db667 by Christian Ehrlicher.
Committed on 13/11/2016 at 13:27.
Pushed by chehrlic into branch 'master'.
Make sure to pass a valid url to QUrl ctor on restart - leftover from KUrl -> QUrl \
transition
BUG: 372422
M +1 -4 src/kdesvn.cpp
M +3 -3 src/kdesvn_part.cpp
M +1 -1 src/kdesvn_part.h
M +5 -5 src/kdesvnview.cpp
M +6 -5 src/kdesvnview.h
M +2 -2 src/svnfrontend/maintreewidget.cpp
M +1 -1 src/svnfrontend/maintreewidget.h
http://commits.kde.org/kdesvn/d6724b71a497e5ffd1cb9e0bc212b18fa86db667
diff --git a/src/kdesvn.cpp b/src/kdesvn.cpp
index 03f9117..6cbaca3 100644
--- a/src/kdesvn.cpp
+++ b/src/kdesvn.cpp
@@ -225,13 +225,10 @@ void kdesvn::setupActions()
m_statusbarAction = KStandardAction::showStatusbar(this, \
SLOT(optionsShowStatusbar()), actionCollection());
KToggleAction *toggletemp;
-// toggletemp = new KToggleAction(i18n("Load last opened URL on \
start"),KShortcut(),
-// actionCollection(),"toggle_load_last_url");
toggletemp = new KToggleAction(i18n("Load last opened URL on start"), this);
actionCollection()->addAction("toggle_load_last_url", toggletemp);
toggletemp->setToolTip(i18n("Reload last opened URL if no one is given on \
command line")); KConfigGroup cs(KSharedConfig::openConfig(), "startup");
-// toggletemp->setChecked(cs.readBoolEntry("load_last_on_start",false));
toggletemp->setChecked(cs.readEntry("load_last_on_start", false));
connect(toggletemp, SIGNAL(toggled(bool)), this, SLOT(slotLoadLast(bool)));
}
@@ -403,7 +400,7 @@ void kdesvn::closeEvent(QCloseEvent *ev)
emit sigSavestate();
if (m_part) {
KConfigGroup cs(KSharedConfig::openConfig(), "startup");
- cs.writeEntry("lastURL", m_part->url().toString());
+ cs.writeEntry("lastURL", m_part->url().toString(QUrl::FullyEncoded));
cs.sync();
}
return KParts::MainWindow::closeEvent(ev);
diff --git a/src/kdesvn_part.cpp b/src/kdesvn_part.cpp
index 499152b..262ba33 100644
--- a/src/kdesvn_part.cpp
+++ b/src/kdesvn_part.cpp
@@ -93,7 +93,7 @@ void kdesvnpart::init(QWidget *parentWidget, bool full)
connect(m_view, SIGNAL(sigSwitchUrl(QUrl)), this, SLOT(openUrl(QUrl)));
connect(this, SIGNAL(refreshTree()), m_view, SLOT(refreshCurrentTree()));
connect(m_view, SIGNAL(setWindowCaption(QString)), this, \
SIGNAL(setWindowCaption(QString)));
- connect(m_view, SIGNAL(sigUrlChanged(QString)), this, \
SLOT(slotUrlChanged(QString))); + connect(m_view, &kdesvnView::sigUrlChanged, \
this, &kdesvnpart::slotUrlChanged);
connect(this, SIGNAL(settingsChanged()), widget(), SLOT(slotSettingsChanged()));
SshAgent ssh;
ssh.querySshAgent();
@@ -105,9 +105,9 @@ kdesvnpart::~kdesvnpart()
//kdesvnpartFactory::instance()->config()->sync();
}
-void kdesvnpart::slotUrlChanged(const QString &url)
+void kdesvnpart::slotUrlChanged(const QUrl &url)
{
- setUrl(QUrl(url));
+ setUrl(url);
}
bool kdesvnpart::openFile()
diff --git a/src/kdesvn_part.h b/src/kdesvn_part.h
index 5d93de8..78cb90a 100644
--- a/src/kdesvn_part.h
+++ b/src/kdesvn_part.h
@@ -86,7 +86,7 @@ protected slots:
virtual void slotLogFollowNodes(bool);
virtual void slotDisplayIgnored(bool);
virtual void slotDisplayUnkown(bool);
- virtual void slotUrlChanged(const QString &);
+ void slotUrlChanged(const QUrl &);
void showAboutApplication();
void appHelpActivated();
virtual void slotShowSettings();
diff --git a/src/kdesvnview.cpp b/src/kdesvnview.cpp
index f1787ce..c057571 100644
--- a/src/kdesvnview.cpp
+++ b/src/kdesvnview.cpp
@@ -87,7 +87,7 @@ kdesvnView::kdesvnView(KActionCollection *aCollection, QWidget \
*parent, bool ful
connect(m_TreeWidget, SIGNAL(sigShowPopup(QString,QWidget**)), this, \
SLOT(slotDispPopup(QString,QWidget**)));
connect(m_TreeWidget, SIGNAL(sigUrlOpend(bool)), parent, \
SLOT(slotUrlOpened(bool)));
connect(m_TreeWidget, SIGNAL(sigSwitchUrl(QUrl)), this, \
SIGNAL(sigSwitchUrl(QUrl)));
- connect(m_TreeWidget, SIGNAL(sigUrlChanged(QString)), this, \
SLOT(slotUrlChanged(QString))); + connect(m_TreeWidget, \
&MainTreeWidget::sigUrlChanged, this, &kdesvnView::slotUrlChanged);
connect(m_TreeWidget, SIGNAL(sigCacheStatus(qlonglong,qlonglong)), this, \
SLOT(fillCacheStatus(qlonglong,qlonglong)));
connect(m_TreeWidget, SIGNAL(sigExtraStatusMessage(QString)), this, \
SIGNAL(sigExtraStatusMessage(QString)));
@@ -124,15 +124,15 @@ void kdesvnView::slotSavestate()
}
}
-void kdesvnView::slotUrlChanged(const QString &url)
+void kdesvnView::slotUrlChanged(const QUrl &url)
{
m_currentUrl = url;
- slotSetTitle(url);
+ slotSetTitle(url.toString());
emit sigUrlChanged(url);
slotOnURL(i18n("Repository opened"));
}
-QString kdesvnView::currentUrl()
+QUrl kdesvnView::currentUrl() const
{
return m_currentUrl;
}
@@ -164,7 +164,7 @@ bool kdesvnView::openUrl(const QUrl &url)
slotSetTitle(url.toString());
if (m_TreeWidget->openUrl(url)) {
slotOnURL(i18n("Repository opened"));
- m_currentUrl = url.url();
+ m_currentUrl = url;
open = true;
} else {
QString t = m_TreeWidget->lastError();
diff --git a/src/kdesvnview.h b/src/kdesvnview.h
index 924dba0..93b6780 100644
--- a/src/kdesvnview.h
+++ b/src/kdesvnview.h
@@ -22,7 +22,8 @@
#define KDESVNVIEW_H
#include "svnqt/repositorylistener.h"
-#include <qwidget.h>
+#include <QWidget>
+#include <QUrl>
#include <kparts/part.h>
class QPainter;
@@ -61,7 +62,7 @@ public:
/**
* Random 'get' function
*/
- QString currentUrl();
+ QUrl currentUrl() const;
/**
* Random 'set' function
@@ -91,8 +92,8 @@ Q_SIGNALS:
void sigShowPopup(const QString &, QWidget **);
void sigSwitchUrl(const QUrl &);
+ void sigUrlChanged(const QUrl &url);
void setWindowCaption(const QString &);
- void sigUrlChanged(const QString &);
void sigMakeBaseDirs();
/* repositorylistener methods */
@@ -119,7 +120,7 @@ protected Q_SLOTS:
virtual void slotOnURL(const QString &url);
virtual void slotSetTitle(const QString &title);
virtual void slotAppendLog(const QString &text);
- virtual void slotUrlChanged(const QString &);
+ void slotUrlChanged(const QUrl &url);
void onCustomLogWindowContextMenuRequested(const QPoint &pos);
protected:
@@ -128,7 +129,7 @@ protected:
KActionCollection *m_Collection;
QSplitter *m_Splitter, *m_infoSplitter;
- QString m_currentUrl;
+ QUrl m_currentUrl;
QTextBrowser *m_LogWindow;
QVBoxLayout *m_topLayout;
QProgressBar *m_CacheProgressBar;
diff --git a/src/svnfrontend/maintreewidget.cpp b/src/svnfrontend/maintreewidget.cpp
index e865b00..0a0b390 100644
--- a/src/svnfrontend/maintreewidget.cpp
+++ b/src/svnfrontend/maintreewidget.cpp
@@ -326,7 +326,7 @@ bool MainTreeWidget::openUrl(const QUrl &url, bool noReinit)
#endif
emit changeCaption(baseUri());
emit sigUrlOpend(result);
- emit sigUrlChanged(baseUri());
+ emit sigUrlChanged(baseUriAsUrl());
#ifdef DEBUG_TIMER
qCDebug(KDESVN_LOG) << "Fired signals " << _counttime.elapsed();
_counttime.restart();
@@ -860,7 +860,7 @@ void MainTreeWidget::closeMe()
emit changeCaption(QString());
emit sigUrlOpend(false);
- emit sigUrlChanged(QString());
+ emit sigUrlChanged(QUrl());
enableActions();
m_Data->m_Model->svnWrapper()->reInitClient();
diff --git a/src/svnfrontend/maintreewidget.h b/src/svnfrontend/maintreewidget.h
index e24eab7..5dc1751 100644
--- a/src/svnfrontend/maintreewidget.h
+++ b/src/svnfrontend/maintreewidget.h
@@ -68,7 +68,7 @@ Q_SIGNALS:
void sigShowPopup(const QString &, QWidget **);
void sigUrlOpend(bool);
void sigSwitchUrl(const QUrl &);
- void sigUrlChanged(const QString &);
+ void sigUrlChanged(const QUrl &);
void sigProplist(const svn::PathPropertiesMapListPtr &, bool, bool, const \
QString &); void sigListError();
void sigCacheStatus(qlonglong, qlonglong);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic