[Pkg-owncloud-commits] [owncloud-client] 200/333: Fix compile after changing Account::davPath()

[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 91f416ffc7326ad1c34d6a575e15ca08c5d3b6ee
Author: Markus Goetz <markus at woboq.com>
Date:   Sat Mar 22 09:41:32 2014 +0100

    Fix compile after changing Account::davPath()
---
 src/mirall/owncloudsetupwizard.cpp | 6 +++---
 src/owncloudcmd/owncloudcmd.cpp    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mirall/owncloudsetupwizard.cpp b/src/mirall/owncloudsetupwizard.cpp
index 1047f28..aebcad1 100644
--- a/src/mirall/owncloudsetupwizard.cpp
+++ b/src/mirall/owncloudsetupwizard.cpp
@@ -440,7 +440,7 @@ DetermineAuthTypeJob::DetermineAuthTypeJob(Account *account, QObject *parent)
 
 void DetermineAuthTypeJob::start()
 {
-    QNetworkReply *reply = getRequest(Account::davPath());
+    QNetworkReply *reply = getRequest(account()->davPath());
     setReply(reply);
     setupConnections(reply);
     AbstractNetworkJob::start();
@@ -455,7 +455,7 @@ void DetermineAuthTypeJob::finished()
     }
     if ((reply()->error() == QNetworkReply::AuthenticationRequiredError) || redirection.isEmpty()) {
         emit authType(WizardCommon::HttpCreds);
-    } else if (redirection.toString().endsWith(Account::davPath())) {
+    } else if (redirection.toString().endsWith(account()->davPath())) {
         // do a new run
         _redirects++;
         setReply(getRequest(redirection));
@@ -481,7 +481,7 @@ ValidateDavAuthJob::ValidateDavAuthJob(Account *account, QObject *parent)
 
 void ValidateDavAuthJob::start()
 {
-    QNetworkReply *reply = getRequest(Account::davPath());
+    QNetworkReply *reply = getRequest(account()->davPath());
     setReply(reply);
     setupConnections(reply);
     AbstractNetworkJob::start();
diff --git a/src/owncloudcmd/owncloudcmd.cpp b/src/owncloudcmd/owncloudcmd.cpp
index a38ebf8..31ad39e 100644
--- a/src/owncloudcmd/owncloudcmd.cpp
+++ b/src/owncloudcmd/owncloudcmd.cpp
@@ -138,7 +138,7 @@ int main(int argc, char **argv) {
     Account account;
 
     // Find the folder and the original owncloud url
-    QStringList splitted = url.path().split(Account::davPath());
+    QStringList splitted = url.path().split(account.davPath());
     url.setPath(splitted.value(0));
     url.setScheme(url.scheme().replace("owncloud", "http"));
     QString folder = splitted.value(1);

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