[Pkg-owncloud-commits] [owncloud-client] 105/332: Socket API: Make it work with Qt5's QUrl

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 0d54b88ab211d1533d0733b87d3fc11a10121ab7
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Jun 19 14:22:03 2014 +0200

    Socket API: Make it work with Qt5's QUrl
    
    QUrl default constructor has a different behaviour in Qt5
    One must not forget to call QUrl::fromLocalFile in Qt5
---
 src/mirall/application.cpp | 2 +-
 src/mirall/socketapi.cpp   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mirall/application.cpp b/src/mirall/application.cpp
index 30a4376..53cc830 100644
--- a/src/mirall/application.cpp
+++ b/src/mirall/application.cpp
@@ -152,7 +152,7 @@ Application::Application(int &argc, char **argv) :
 
     connect (this, SIGNAL(aboutToQuit()), SLOT(slotCleanup()));
 
-    _socketApi = new SocketApi(this, cfg.configPathWithAppName().append(QLatin1String("socket")));
+    _socketApi = new SocketApi(this, QUrl::fromLocalFile(cfg.configPathWithAppName().append(QLatin1String("socket"))));
 
 }
 
diff --git a/src/mirall/socketapi.cpp b/src/mirall/socketapi.cpp
index b527757..8150962 100644
--- a/src/mirall/socketapi.cpp
+++ b/src/mirall/socketapi.cpp
@@ -300,7 +300,7 @@ void SocketApi::command_RETRIEVE_FOLDER_STATUS(const QString& argument, QLocalSo
         return;
     }
 
-    Folder* folder = FolderMan::instance()->folderForPath( argument );
+    Folder* folder = FolderMan::instance()->folderForPath( QUrl::fromLocalFile(argument) );
     // this can happen in offline mode e.g.: nothing to worry about
     if (!folder) {
         DEBUG << "folder offline or not watched:" << argument;
@@ -357,7 +357,7 @@ void SocketApi::command_RETRIEVE_FILE_STATUS(const QString& argument, QLocalSock
 
     QString statusString;
 
-    Folder* folder = FolderMan::instance()->folderForPath( argument );
+    Folder* folder = FolderMan::instance()->folderForPath( QUrl::fromLocalFile(argument) );
     // this can happen in offline mode e.g.: nothing to worry about
     if (!folder) {
         DEBUG << "folder offline or not watched:" << argument;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git