[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=b9c9f97

The following commit has been merged in the master branch:
commit b9c9f97fa49d95d8562fb0dabc20095ff8d7b120
Author: Àlex Fiestas <afiestas at kde.org>
Date:   Mon Sep 22 01:24:42 2014 +0200

    Port sftp plugin to QStandardPaths
    
    I have not been able to test this, but double checked the return values
    and they should be the same.
---
 plugins/sftp/mounter.cpp     | 1 -
 plugins/sftp/sftp_config.cpp | 4 ++--
 plugins/sftp/sftpplugin.cpp  | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/plugins/sftp/mounter.cpp b/plugins/sftp/mounter.cpp
index 6e24619..f60cefa 100644
--- a/plugins/sftp/mounter.cpp
+++ b/plugins/sftp/mounter.cpp
@@ -23,7 +23,6 @@
 #include <QDebug>
 
 #include <KLocalizedString>
-#include <KStandardDirs>
 
 #include "mounter.h"
 #include "sftp_debug.h"
diff --git a/plugins/sftp/sftp_config.cpp b/plugins/sftp/sftp_config.cpp
index d53718e..b7f226e 100644
--- a/plugins/sftp/sftp_config.cpp
+++ b/plugins/sftp/sftp_config.cpp
@@ -24,7 +24,7 @@
 #include <KGlobalSettings>
 #include <KPluginFactory>
 #include <KSharedConfig>
-#include <KStandardDirs>
+#include <QStandardPaths>
 #include <KAboutData>
 #include <KIconLoader>
 
@@ -57,7 +57,7 @@ SftpConfig::~SftpConfig()
 
 void SftpConfig::checkSshfs()
 {
-    m_ui->error->setVisible(KStandardDirs::findExe("sshfs").isEmpty());
+    m_ui->error->setVisible(QStandardPaths::findExecutable(QStringLiteral("sshfs")).isEmpty());
 }
 
 void SftpConfig::defaults()
diff --git a/plugins/sftp/sftpplugin.cpp b/plugins/sftp/sftpplugin.cpp
index 0d7f301..9ab8c8e 100644
--- a/plugins/sftp/sftpplugin.cpp
+++ b/plugins/sftp/sftpplugin.cpp
@@ -31,7 +31,7 @@
 #include <KLocalizedString>
 #include <KNotification>
 #include <KRun>
-#include <KStandardDirs>
+#include <QStandardPaths>
 #include <KFilePlacesModel>
 #include <kde_file.h>
 
@@ -157,7 +157,7 @@ bool SftpPlugin::receivePackage(const NetworkPackage& np)
 
 QString SftpPlugin::mountPoint()
 {
-    const QString mountDir = KStandardDirs::locateLocal("appdata", "", true);
+    const QString mountDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
     return QDir(mountDir).absoluteFilePath(device()->id());
 }
 

-- 
kdeconnect packaging