[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=e553d97

The following commit has been merged in the master branch:
commit e553d97732fc90774bfea1e58d6b227785990b17
Author: Lukáš Tinkl <lukas at kde.org>
Date:   Wed Apr 15 17:45:54 2015 +0200

    fix possibly localized destination dir
    
    construct the whole QUrl from a local file, not just the default;
    entries returned from QStandardPaths are translated on systems with a non
    US locale, and this turned the string such as "~/Stažené" into its decoded
    form, preventing the transfer from happening
---
 plugins/share/autoclosingqfile.h | 2 +-
 plugins/share/shareplugin.cpp    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/share/autoclosingqfile.h b/plugins/share/autoclosingqfile.h
index 54dea83..bea1ea1 100644
--- a/plugins/share/autoclosingqfile.h
+++ b/plugins/share/autoclosingqfile.h
@@ -29,7 +29,7 @@ class AutoClosingQFile : public QFile
 public:
 
     AutoClosingQFile(const QString &name);
-    virtual qint64 readData(char* data, qint64 maxlen) {
+    qint64 readData(char* data, qint64 maxlen) Q_DECL_OVERRIDE {
         qint64 read = QFile::readData(data, maxlen);
         if (read == -1 || read == bytesAvailable()) {
             close();
diff --git a/plugins/share/shareplugin.cpp b/plugins/share/shareplugin.cpp
index 956df5e..4459757 100644
--- a/plugins/share/shareplugin.cpp
+++ b/plugins/share/shareplugin.cpp
@@ -38,7 +38,7 @@
 
 K_PLUGIN_FACTORY_WITH_JSON( KdeConnectPluginFactory, "kdeconnect_share.json", registerPlugin< SharePlugin >(); )
 
-Q_LOGGING_CATEGORY(KDECONNECT_PLUGIN_SHARE, "kdeconnect.plugin.share");
+Q_LOGGING_CATEGORY(KDECONNECT_PLUGIN_SHARE, "kdeconnect.plugin.share")
 
 SharePlugin::SharePlugin(QObject* parent, const QVariantList& args)
     : KdeConnectPlugin(parent, args)
@@ -47,8 +47,8 @@ SharePlugin::SharePlugin(QObject* parent, const QVariantList& args)
 
 QUrl SharePlugin::destinationDir() const
 {
-    const QUrl defaultDownloadPath = QUrl::fromLocalFile(QStandardPaths::writableLocation(QStandardPaths::DownloadLocation));
-    QUrl dir = config()->get<QUrl>("incoming_path", defaultDownloadPath);
+    const QString defaultDownloadPath = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation);
+    QUrl dir = QUrl::fromLocalFile(config()->get<QString>("incoming_path", defaultDownloadPath));
 
     if (dir.path().contains("%1")) {
         dir.setPath(dir.path().arg(device()->name()));

-- 
kdeconnect packaging