[Pkg-owncloud-commits] [owncloud-client] 38/159: Qt4: Fix compile

[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 418185af9a99b3c5822fccdeb49fa4e07b267e6a
Author: Markus Goetz <markus at woboq.com>
Date:   Thu Mar 26 15:17:02 2015 +0100

    Qt4: Fix compile
---
 src/libsync/clientproxy.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/libsync/clientproxy.cpp b/src/libsync/clientproxy.cpp
index a3f9972..8a4ff57 100644
--- a/src/libsync/clientproxy.cpp
+++ b/src/libsync/clientproxy.cpp
@@ -51,6 +51,11 @@ bool ClientProxy::isUsingSystemDefault() {
     return false;
 }
 
+QString printProxy(const QNetworkProxy &proxy)
+{
+    return QString("%1://%2:%3").arg(proxy.type()).arg(proxy.hostName()).arg(proxy.port());
+}
+
 void ClientProxy::setupQtProxyFromConfig()
 {
     OCC::ConfigFile cfg;
@@ -75,13 +80,13 @@ void ClientProxy::setupQtProxyFromConfig()
         break;
     case QNetworkProxy::Socks5Proxy:
         proxy.setType(QNetworkProxy::Socks5Proxy);
-        qDebug() << "Set proxy configuration to SOCKS5" << proxy;
+        qDebug() << "Set proxy configuration to SOCKS5" << printProxy(proxy);
         QNetworkProxyFactory::setUseSystemConfiguration(false);
         QNetworkProxy::setApplicationProxy(proxy);
         break;
     case QNetworkProxy::HttpProxy:
         proxy.setType(QNetworkProxy::HttpProxy);
-        qDebug() << "Set proxy configuration to HTTP" << proxy;
+        qDebug() << "Set proxy configuration to HTTP" << printProxy(proxy);
         QNetworkProxyFactory::setUseSystemConfiguration(false);
         QNetworkProxy::setApplicationProxy(proxy);
         break;
@@ -135,6 +140,9 @@ void ClientProxy::setCSyncProxy( const QUrl& url, CSYNC *csync_ctx )
     csync_set_module_property( csync_ctx, "proxy_port", &proxy_port );
     csync_set_module_property( csync_ctx, "proxy_user", proxy.user().toUtf8().data());
     csync_set_module_property( csync_ctx, "proxy_pwd",  proxy.password().toUtf8().data());
+#else
+    Q_UNUSED(url);
+    Q_UNUSED(csync_ctx);
 #endif
 }
 
@@ -156,7 +164,6 @@ void SystemProxyRunnable::run()
 {
     qDebug() << Q_FUNC_INFO << "Starting system proxy lookup";
     QList<QNetworkProxy> proxies = QNetworkProxyFactory::systemProxyForQuery(QNetworkProxyQuery(_url));
-    qDebug() << Q_FUNC_INFO << proxies.count() << "proxies: " << proxies;
 
     if (proxies.isEmpty()) {
         emit systemProxyLookedUp(QNetworkProxy(QNetworkProxy::NoProxy));

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