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
This commit is contained in:
Olivier Goffart 2018-02-21 15:03:55 +01:00 committed by Camila San
parent 7e05e1e411
commit 311307e8cb
No known key found for this signature in database
GPG key ID: 7A4A6121E88E2AD4
7 changed files with 8 additions and 6 deletions

View file

@ -48,6 +48,8 @@ set(client_SRCS
accountmanager.cpp
accountsettings.cpp
application.cpp
clientproxy.cpp
connectionvalidator.cpp
folder.cpp
folderman.cpp
folderstatusmodel.cpp

View file

@ -32,7 +32,7 @@ class ConfigFile;
* @brief The ClientProxy class
* @ingroup libsync
*/
class OWNCLOUDSYNC_EXPORT ClientProxy : public QObject
class ClientProxy : public QObject
{
Q_OBJECT
public:
@ -61,7 +61,7 @@ private:
QUrl _url;
};
OWNCLOUDSYNC_EXPORT QString printQNetworkProxy(const QNetworkProxy &proxy);
QString printQNetworkProxy(const QNetworkProxy &proxy);
}
#endif // CLIENTPROXY_H

View file

@ -79,7 +79,7 @@ namespace OCC {
\endcode
*/
class OWNCLOUDSYNC_EXPORT ConnectionValidator : public QObject
class ConnectionValidator : public QObject
{
Q_OBJECT
public:
@ -113,7 +113,7 @@ public slots:
void checkAuthentication();
signals:
void connectionResult(ConnectionValidator::Status status, QStringList errors);
void connectionResult(ConnectionValidator::Status status, const QStringList &errors);
protected slots:
void slotCheckServerAndAuth();

View file

@ -24,8 +24,6 @@ set(libsync_SRCS
wordlist.cpp
bandwidthmanager.cpp
capabilities.cpp
clientproxy.cpp
connectionvalidator.cpp
cookiejar.cpp
discoveryphase.cpp
filesystem.cpp

View file

@ -64,6 +64,8 @@ list(APPEND FolderMan_SRC ../src/gui/syncrunfilelog.cpp )
list(APPEND FolderMan_SRC ../src/gui/lockwatcher.cpp )
list(APPEND FolderMan_SRC ../src/gui/guiutility.cpp )
list(APPEND FolderMan_SRC ../src/gui/navigationpanehelper.cpp )
list(APPEND FolderMan_SRC ../src/gui/connectionvalidator.cpp )
list(APPEND FolderMan_SRC ../src/gui/clientproxy.cpp )
list(APPEND FolderMan_SRC ${FolderWatcher_SRC})
list(APPEND FolderMan_SRC stub.cpp )
owncloud_add_test(FolderMan "${FolderMan_SRC}")