Fix libsync exports for proxy changes in #1886

Build failed on Windows, missing libsync export for printQNetworkProxy after
moving ClientProxy class from gui to libsync.

Signed-off-by: Michael Schuster <michael@schuster.ms>

diff --git a/src/gui/connectionvalidator.cpp b/src/gui/connectionvalidator.cpp
index eab6479dabb0d87ac3afc6606ce066cd4472f656..70617195997664a037512bbd737c347b0dec7c1e 100644 (file)
--- a/src/gui/connectionvalidator.cpp
+++ b/src/gui/connectionvalidator.cpp
@@ -76,7 +76,7 @@ void ConnectionValidator::systemProxyLookupDone(const QNetworkProxy &proxy)
     }
 
     if (proxy.type() != QNetworkProxy::NoProxy) {
-        qCInfo(lcConnectionValidator) << "Setting QNAM proxy to be system proxy" << printQNetworkProxy(proxy);
+        qCInfo(lcConnectionValidator) << "Setting QNAM proxy to be system proxy" << ClientProxy::printQNetworkProxy(proxy);
     } else {
         qCInfo(lcConnectionValidator) << "No system proxy set by OS";
     }

diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp
index 4aff8095669ada628817274558cc9aae65cb5a94..1a8762e04c821a66898a5c1957f444d0c663f2be 100644 (file)
--- a/src/gui/owncloudsetupwizard.cpp
+++ b/src/gui/owncloudsetupwizard.cpp
@@ -170,7 +170,7 @@ void OwncloudSetupWizard::slotCheckServer(const QString &urlString)
 void OwncloudSetupWizard::slotSystemProxyLookupDone(const QNetworkProxy &proxy)
 {
     if (proxy.type() != QNetworkProxy::NoProxy) {
-        qCInfo(lcWizard) << "Setting QNAM proxy to be system proxy" << printQNetworkProxy(proxy);
+        qCInfo(lcWizard) << "Setting QNAM proxy to be system proxy" << ClientProxy::printQNetworkProxy(proxy);
     } else {
         qCInfo(lcWizard) << "No system proxy set by OS";
     }

diff --git a/src/libsync/clientproxy.cpp b/src/libsync/clientproxy.cpp
index 92fb2ab2939ae4bf1e9c4245c9feb9dffab44cdc..2deba9d546943b6e7ee0c95fef295a3cfe3b021e 100644 (file)
--- a/src/libsync/clientproxy.cpp
+++ b/src/libsync/clientproxy.cpp
@@ -56,7 +56,7 @@ bool ClientProxy::isUsingSystemDefault()
     return true;
 }
 
-const char *proxyTypeToCStr(QNetworkProxy::ProxyType type)
+const char *ClientProxy::proxyTypeToCStr(QNetworkProxy::ProxyType type)
 {
     switch (type) {
     case QNetworkProxy::NoProxy:
@@ -76,7 +76,7 @@ const char *proxyTypeToCStr(QNetworkProxy::ProxyType type)
     }
 }
 
-QString printQNetworkProxy(const QNetworkProxy &proxy)
+QString ClientProxy::printQNetworkProxy(const QNetworkProxy &proxy)
 {
     return QString("%1://%2:%3").arg(proxyTypeToCStr(proxy.type())).arg(proxy.hostName()).arg(proxy.port());
 }

diff --git a/src/libsync/clientproxy.h b/src/libsync/clientproxy.h
index 0363ae4664d248dd0684439ed5206c29c45175f1..77c1ee80467eddf4f8bab7a80d92a8d5ee973ab3 100644 (file)
--- a/src/libsync/clientproxy.h
+++ b/src/libsync/clientproxy.h
@@ -41,6 +41,9 @@ public:
     static bool isUsingSystemDefault();
     static void lookupSystemProxyAsync(const QUrl &url, QObject *dst, const char *slot);
 
+    static QString printQNetworkProxy(const QNetworkProxy &proxy);
+    static const char *proxyTypeToCStr(QNetworkProxy::ProxyType type);
+
 public slots:
     void setupQtProxyFromConfig();
 };
@@ -58,7 +61,6 @@ private:
     QUrl _url;
 };
 
-QString printQNetworkProxy(const QNetworkProxy &proxy);
 }
 
 #endif // CLIENTPROXY_H