Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 22c7002

Browse files
committedFeb 26, 2018
Move ClientProxy and ConnecitonValidator to gui
They are using the ConfigFile and are used to control when to sync rather than for the sync itself
1 parent 9968142 commit 22c7002

7 files changed

+8
-6
lines changed
 

‎src/gui/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ set(client_SRCS
4747
accountmanager.cpp
4848
accountsettings.cpp
4949
application.cpp
50+
clientproxy.cpp
51+
connectionvalidator.cpp
5052
folder.cpp
5153
folderman.cpp
5254
folderstatusmodel.cpp
File renamed without changes.

‎src/libsync/clientproxy.h ‎src/gui/clientproxy.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class ConfigFile;
3232
* @brief The ClientProxy class
3333
* @ingroup libsync
3434
*/
35-
class OWNCLOUDSYNC_EXPORT ClientProxy : public QObject
35+
class ClientProxy : public QObject
3636
{
3737
Q_OBJECT
3838
public:
@@ -61,7 +61,7 @@ class SystemProxyRunnable : public QObject, public QRunnable
6161
QUrl _url;
6262
};
6363

64-
OWNCLOUDSYNC_EXPORT QString printQNetworkProxy(const QNetworkProxy &proxy);
64+
QString printQNetworkProxy(const QNetworkProxy &proxy);
6565
}
6666

6767
#endif // CLIENTPROXY_H
File renamed without changes.

‎src/libsync/connectionvalidator.h ‎src/gui/connectionvalidator.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ namespace OCC {
7575
7676
\endcode
7777
*/
78-
class OWNCLOUDSYNC_EXPORT ConnectionValidator : public QObject
78+
class ConnectionValidator : public QObject
7979
{
8080
Q_OBJECT
8181
public:
@@ -109,7 +109,7 @@ public slots:
109109
void checkAuthentication();
110110

111111
signals:
112-
void connectionResult(ConnectionValidator::Status status, QStringList errors);
112+
void connectionResult(ConnectionValidator::Status status, const QStringList &errors);
113113

114114
protected slots:
115115
void slotCheckServerAndAuth();

‎src/libsync/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ set(libsync_SRCS
2424
account.cpp
2525
bandwidthmanager.cpp
2626
capabilities.cpp
27-
clientproxy.cpp
28-
connectionvalidator.cpp
2927
cookiejar.cpp
3028
discoveryphase.cpp
3129
filesystem.cpp

‎test/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ list(APPEND FolderMan_SRC ../src/gui/syncrunfilelog.cpp )
6464
list(APPEND FolderMan_SRC ../src/gui/lockwatcher.cpp )
6565
list(APPEND FolderMan_SRC ../src/gui/guiutility.cpp )
6666
list(APPEND FolderMan_SRC ../src/gui/navigationpanehelper.cpp )
67+
list(APPEND FolderMan_SRC ../src/gui/connectionvalidator.cpp )
68+
list(APPEND FolderMan_SRC ../src/gui/clientproxy.cpp )
6769
list(APPEND FolderMan_SRC ${FolderWatcher_SRC})
6870
list(APPEND FolderMan_SRC stub.cpp )
6971
owncloud_add_test(FolderMan "${FolderMan_SRC}")

0 commit comments

Comments
 (0)
Please sign in to comment.