From 50dcab5f8813f81394cb2e6ac2fa8740cce23b2f Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Sat, 21 Mar 2020 11:25:34 +0100
Subject: [PATCH] Move the proxyfiles to libsync where they make more sense

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: Michael Schuster <michael@schuster.ms>
---
 src/gui/CMakeLists.txt               |  1 -
 src/libsync/CMakeLists.txt           |  1 +
 src/{gui => libsync}/clientproxy.cpp | 20 --------------------
 src/{gui => libsync}/clientproxy.h   |  7 ++-----
 test/CMakeLists.txt                  |  2 --
 5 files changed, 3 insertions(+), 28 deletions(-)
 rename src/{gui => libsync}/clientproxy.cpp (88%)
 rename src/{gui => libsync}/clientproxy.h (89%)

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index cb8738581..b83106441 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -54,7 +54,6 @@ set(client_SRCS
     accountmanager.cpp
     accountsettings.cpp
     application.cpp
-    clientproxy.cpp
     connectionvalidator.cpp
     folder.cpp
     folderman.cpp
diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt
index 663bc1ac8..ac3e99bd4 100644
--- a/src/libsync/CMakeLists.txt
+++ b/src/libsync/CMakeLists.txt
@@ -24,6 +24,7 @@ set(libsync_SRCS
     wordlist.cpp
     bandwidthmanager.cpp
     capabilities.cpp
+    clientproxy.cpp
     cookiejar.cpp
     discoveryphase.cpp
     filesystem.cpp
diff --git a/src/gui/clientproxy.cpp b/src/libsync/clientproxy.cpp
similarity index 88%
rename from src/gui/clientproxy.cpp
rename to src/libsync/clientproxy.cpp
index d9f851d1a..8d078f2dd 100644
--- a/src/gui/clientproxy.cpp
+++ b/src/libsync/clientproxy.cpp
@@ -108,26 +108,6 @@ void ClientProxy::setupQtProxyFromConfig()
     }
 }
 
-const char *ClientProxy::proxyTypeToCStr(QNetworkProxy::ProxyType type)
-{
-    switch (type) {
-    case QNetworkProxy::NoProxy:
-        return "NoProxy";
-    case QNetworkProxy::DefaultProxy:
-        return "DefaultProxy";
-    case QNetworkProxy::Socks5Proxy:
-        return "Socks5Proxy";
-    case QNetworkProxy::HttpProxy:
-        return "HttpProxy";
-    case QNetworkProxy::HttpCachingProxy:
-        return "HttpCachingProxy";
-    case QNetworkProxy::FtpCachingProxy:
-        return "FtpCachingProxy";
-    default:
-        return "NoProxy";
-    }
-}
-
 void ClientProxy::lookupSystemProxyAsync(const QUrl &url, QObject *dst, const char *slot)
 {
     auto *runnable = new SystemProxyRunnable(url);
diff --git a/src/gui/clientproxy.h b/src/libsync/clientproxy.h
similarity index 89%
rename from src/gui/clientproxy.h
rename to src/libsync/clientproxy.h
index 348eab99b..0363ae466 100644
--- a/src/gui/clientproxy.h
+++ b/src/libsync/clientproxy.h
@@ -32,7 +32,7 @@ class ConfigFile;
  * @brief The ClientProxy class
  * @ingroup libsync
  */
-class ClientProxy : public QObject
+class OWNCLOUDSYNC_EXPORT ClientProxy : public QObject
 {
     Q_OBJECT
 public:
@@ -43,12 +43,9 @@ public:
 
 public slots:
     void setupQtProxyFromConfig();
-
-private:
-    const char *proxyTypeToCStr(QNetworkProxy::ProxyType type);
 };
 
-class SystemProxyRunnable : public QObject, public QRunnable
+class OWNCLOUDSYNC_EXPORT SystemProxyRunnable : public QObject, public QRunnable
 {
     Q_OBJECT
 public:
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a39da386d..8a7a79049 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -69,7 +69,6 @@ list(APPEND FolderMan_SRC ../src/gui/guiutility.cpp )
 list(APPEND FolderMan_SRC ../src/gui/navigationpanehelper.cpp )
 list(APPEND FolderMan_SRC ../src/gui/userinfo.cpp )
 list(APPEND FolderMan_SRC ../src/gui/connectionvalidator.cpp )
-list(APPEND FolderMan_SRC ../src/gui/clientproxy.cpp )
 list(APPEND FolderMan_SRC ../src/gui/ocsjob.cpp )
 list(APPEND FolderMan_SRC ../src/gui/ocsnavigationappsjob.cpp )
 list(APPEND FolderMan_SRC ../src/gui/accountstate.cpp )
@@ -79,7 +78,6 @@ list(APPEND FolderMan_SRC stubfolderman.cpp )
 nextcloud_add_test(FolderMan "${FolderMan_SRC}")
 
 SET(RemoteWipe_SRC ../src/gui/remotewipe.cpp)
-list(APPEND RemoteWipe_SRC ../src/gui/clientproxy.cpp )
 list(APPEND RemoteWipe_SRC ../src/gui/guiutility.cpp )
 list(APPEND RemoteWipe_SRC ../src/gui/userinfo.cpp )
 list(APPEND RemoteWipe_SRC ../src/gui/connectionvalidator.cpp )
-- 
2.30.2