[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:27:56 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=542c872
The following commit has been merged in the master branch:
commit 542c872a166d06f597955acbd91d5020918249fb
Author: Àlex Fiestas <afiestas at kde.org>
Date: Sun Sep 21 22:23:31 2014 +0200
Port sftp plugin to Qurl
Since QUrl are buid with kdeconnect:/ (aka not local) we don't have to
change anything.
---
plugins/sftp/mounter.cpp | 8 ++++----
plugins/sftp/sftpplugin.cpp | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/plugins/sftp/mounter.cpp b/plugins/sftp/mounter.cpp
index 4987f2b..69d34c4 100644
--- a/plugins/sftp/mounter.cpp
+++ b/plugins/sftp/mounter.cpp
@@ -99,12 +99,12 @@ void Mounter::onPakcageReceived(const NetworkPackage& np)
//This is the previous code, to access sftp server using KIO. Now we are
//using the external binary sshfs, and accessing it as a local filesystem.
/*
- * KUrl url;
- * url.setProtocol("sftp");
+ * QUrl url;
+ * url.setScheme("sftp");
* url.setHost(np.get<QString>("ip"));
* url.setPort(np.get<QString>("port").toInt());
- * url.setUser(np.get<QString>("user"));
- * url.setPass(np.get<QString>("password"));
+ * url.setUserName(np.get<QString>("user"));
+ * url.setPassword(np.get<QString>("password"));
* url.setPath(np.get<QString>("path"));
* new KRun(url, 0);
* Q_EMIT mounted();
diff --git a/plugins/sftp/sftpplugin.cpp b/plugins/sftp/sftpplugin.cpp
index 9e0a4d3..0292761 100644
--- a/plugins/sftp/sftpplugin.cpp
+++ b/plugins/sftp/sftpplugin.cpp
@@ -70,14 +70,14 @@ SftpPlugin::~SftpPlugin()
void SftpPlugin::addToDolphin()
{
removeFromDolphin();
- KUrl kioUrl("kdeconnect://"+device()->id()+"/");
+ QUrl kioUrl("kdeconnect://"+device()->id()+"/");
m_d->placesModel.addPlace(device()->name(), kioUrl, "kdeconnect");
kDebug(debugArea()) << "add to dolphin";
}
void SftpPlugin::removeFromDolphin()
{
- KUrl kioUrl("kdeconnect://"+device()->id()+"/");
+ QUrl kioUrl("kdeconnect://"+device()->id()+"/");
QModelIndex index = m_d->placesModel.closestItem(kioUrl);
while (index.row() != -1) {
m_d->placesModel.removePlace(index);
@@ -133,8 +133,8 @@ bool SftpPlugin::isMounted() const
bool SftpPlugin::startBrowsing()
{
if (mountAndWait()) {
- //return new KRun(KUrl::fromLocalFile(mountPoint()), 0);
- return new KRun(KUrl::fromPathOrUrl("kdeconnect://"+device()->id()), 0);
+ //return new KRun(QUrl::fromLocalFile(mountPoint()), 0);
+ return new KRun(QUrl("kdeconnect://"+device()->id()), 0);
}
return false;
}
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list