[Pkg-owncloud-commits] [owncloud-client] 45/159: Proxy: Fix compile harder

[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 cfada67aa636e0bc1afd014afe3e08cdc3c8d5d9
Author: Markus Goetz <markus at woboq.com>
Date:   Fri Mar 27 10:36:34 2015 +0100

    Proxy: Fix compile harder
---
 src/libsync/clientproxy.cpp         | 6 +++---
 src/libsync/clientproxy.h           | 3 +++
 src/libsync/connectionvalidator.cpp | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/libsync/clientproxy.cpp b/src/libsync/clientproxy.cpp
index 8a4ff57..2900cfd 100644
--- a/src/libsync/clientproxy.cpp
+++ b/src/libsync/clientproxy.cpp
@@ -51,7 +51,7 @@ bool ClientProxy::isUsingSystemDefault() {
     return false;
 }
 
-QString printProxy(const QNetworkProxy &proxy)
+QString printQNetworkProxy(const QNetworkProxy &proxy)
 {
     return QString("%1://%2:%3").arg(proxy.type()).arg(proxy.hostName()).arg(proxy.port());
 }
@@ -80,13 +80,13 @@ void ClientProxy::setupQtProxyFromConfig()
         break;
     case QNetworkProxy::Socks5Proxy:
         proxy.setType(QNetworkProxy::Socks5Proxy);
-        qDebug() << "Set proxy configuration to SOCKS5" << printProxy(proxy);
+        qDebug() << "Set proxy configuration to SOCKS5" << printQNetworkProxy(proxy);
         QNetworkProxyFactory::setUseSystemConfiguration(false);
         QNetworkProxy::setApplicationProxy(proxy);
         break;
     case QNetworkProxy::HttpProxy:
         proxy.setType(QNetworkProxy::HttpProxy);
-        qDebug() << "Set proxy configuration to HTTP" << printProxy(proxy);
+        qDebug() << "Set proxy configuration to HTTP" << printQNetworkProxy(proxy);
         QNetworkProxyFactory::setUseSystemConfiguration(false);
         QNetworkProxy::setApplicationProxy(proxy);
         break;
diff --git a/src/libsync/clientproxy.h b/src/libsync/clientproxy.h
index 9ed3860..756c013 100644
--- a/src/libsync/clientproxy.h
+++ b/src/libsync/clientproxy.h
@@ -54,6 +54,9 @@ private:
     QUrl _url;
 };
 
+QString printQNetworkProxy(const QNetworkProxy &proxy);
+
+
 }
 
 #endif // CLIENTPROXY_H
diff --git a/src/libsync/connectionvalidator.cpp b/src/libsync/connectionvalidator.cpp
index 6802e89..a75094f 100644
--- a/src/libsync/connectionvalidator.cpp
+++ b/src/libsync/connectionvalidator.cpp
@@ -85,7 +85,7 @@ void ConnectionValidator::systemProxyLookupDone(const QNetworkProxy &proxy) {
     }
 
     if (proxy.type() != QNetworkProxy::DefaultProxy) {
-        qDebug() << Q_FUNC_INFO << "Setting QNAM proxy to be system proxy" << proxy;
+        qDebug() << Q_FUNC_INFO << "Setting QNAM proxy to be system proxy" << printQNetworkProxy(proxy);
         _account->networkAccessManager()->setProxy(proxy);
     }
 

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