Prevent issues when changing the enum.

Signed-off-by: alex-z <[email protected]>
nextcloud · Dec 11, 2023 · b13c9d9 · b13c9d9
1 parent ea58bf4
commit b13c9d9
Show file tree

Hide file tree

Showing 14 changed files with 165 additions and 206 deletions.
diff --git a/src/common/common.cmake b/src/common/common.cmake
@@ -4,7 +4,6 @@
 set(common_SOURCES
     ${CMAKE_CURRENT_LIST_DIR}/checksums.cpp
     ${CMAKE_CURRENT_LIST_DIR}/checksumcalculator.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/clientstatusreportingrecord.cpp
     ${CMAKE_CURRENT_LIST_DIR}/filesystembase.cpp
     ${CMAKE_CURRENT_LIST_DIR}/ownsql.cpp
     ${CMAKE_CURRENT_LIST_DIR}/preparedsqlquerymanager.cpp

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -121,10 +121,10 @@ set(client_SRCS
     navigationpanehelper.cpp
     networksettings.h
     networksettings.cpp
-    "${CMAKE_SOURCE_DIR}/src/libsync/ocsjob.h"
-    "${CMAKE_SOURCE_DIR}/src/libsync/ocsjob.cpp"
     ocsnavigationappsjob.h
     ocsnavigationappsjob.cpp
+    ocsjob.h
+    ocsjob.cpp
     ocssharejob.h
     ocssharejob.cpp
     ocsshareejob.h

diff --git a/src/libsync/ocsjob.cpp → src/gui/ocsjob.cpp b/src/libsync/ocsjob.cpp → src/gui/ocsjob.cpp
diff --git a/src/libsync/ocsjob.h → src/gui/ocsjob.h b/src/libsync/ocsjob.h → src/gui/ocsjob.h
@@ -148,13 +148,11 @@ protected slots:
 private slots:
     bool finished() override;
 
-protected:
-    QByteArray _verb;
-    QNetworkRequest _request;
-
 private:
-    QVector<int> _passStatusCodes;
+    QByteArray _verb;
     QHash<QString, QString> _params;
+    QVector<int> _passStatusCodes;
+    QNetworkRequest _request;
 };
 }
 

diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt
@@ -24,7 +24,10 @@ set(libsync_SRCS
     capabilities.cpp
     clientproxy.h
     clientproxy.cpp
+    clientstatusreporting.h
     clientstatusreporting.cpp
+    clientstatusreportingrecord.h
+    clientstatusreportingrecord.cpp
     cookiejar.h
     cookiejar.cpp
     discovery.h
@@ -54,10 +57,6 @@ set(libsync_SRCS
     owncloudpropagator.cpp
     nextcloudtheme.h
     nextcloudtheme.cpp
-    ocsjob.h
-    ocsjob.cpp
-    ocsclientstatusreportingjob.h
-    ocsclientstatusreportingjob.cpp
     abstractpropagateremotedeleteencrypted.h
     abstractpropagateremotedeleteencrypted.cpp
     deletejob.h

diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp
@@ -64,8 +64,7 @@ constexpr int checksumRecalculateRequestServerVersionMinSupportedMajor = 24;
 constexpr auto isSkipE2eeMetadataChecksumValidationAllowedInClientVersion = MIRALL_VERSION_MAJOR == 3 && MIRALL_VERSION_MINOR == 8;
 }
 
-namespace OCC
-{
+namespace OCC {
 Q_LOGGING_CATEGORY(lcAccount, "nextcloud.sync.account", QtInfoMsg)
 const char app_password[] = "_app-password";
 
@@ -88,7 +87,7 @@ AccountPtr Account::create()
     return acc;
 }
 
-ClientSideEncryption *Account::e2e()
+ClientSideEncryption* Account::e2e()
 {
     // Qt expects everything in the connect to be a pointer, so return a pointer.
     return &_e2e;
@@ -268,10 +267,14 @@ void Account::setCredentials(AbstractCredentials *cred)
     if (proxy.type() != QNetworkProxy::DefaultProxy) {
         _am->setProxy(proxy);
     }
-    connect(_am.data(), &QNetworkAccessManager::sslErrors, this, &Account::slotHandleSslErrors);
-    connect(_am.data(), &QNetworkAccessManager::proxyAuthenticationRequired, this, &Account::proxyAuthenticationRequired);
-    connect(_credentials.data(), &AbstractCredentials::fetched, this, &Account::slotCredentialsFetched);
-    connect(_credentials.data(), &AbstractCredentials::asked, this, &Account::slotCredentialsAsked);
+    connect(_am.data(), &QNetworkAccessManager::sslErrors,
+        this, &Account::slotHandleSslErrors);
+    connect(_am.data(), &QNetworkAccessManager::proxyAuthenticationRequired,
+        this, &Account::proxyAuthenticationRequired);
+    connect(_credentials.data(), &AbstractCredentials::fetched,
+        this, &Account::slotCredentialsFetched);
+    connect(_credentials.data(), &AbstractCredentials::asked,
+        this, &Account::slotCredentialsAsked);
 
     trySetupPushNotifications();
 }