Use AccountPtr in serverVersionChanged signal instead of raw pointer

Signed-off-by: Claudio Cambra <[email protected]>
nextcloud · Nov 20, 2024 · e4efc6b · e4efc6b
1 parent 351701f
commit e4efc6b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/src/gui/application.cpp b/src/gui/application.cpp
@@ -621,7 +621,7 @@ void Application::slotAccountStateAdded(AccountState *accountState)
     connect(accountState->account().data(), &Account::serverVersionChanged,
         _folderManager.data(), &FolderMan::slotServerVersionChanged);
 
-    _gui->slotTrayMessageIfServerUnsupported(accountState->account().data());
+    _gui->slotTrayMessageIfServerUnsupported(accountState->account());
 }
 
 void Application::slotCleanup()

diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
@@ -1057,7 +1057,7 @@ void FolderMan::slotForwardFolderSyncStateChange()
     }
 }
 
-void FolderMan::slotServerVersionChanged(Account *account)
+void FolderMan::slotServerVersionChanged(const OCC::AccountPtr &account)
 {
     // Pause folders if the server version is unsupported
     if (account->serverVersionUnsupported()) {

diff --git a/src/gui/folderman.h b/src/gui/folderman.h
@@ -306,7 +306,7 @@ private slots:
     // FolderMan::folderSyncStateChange(Folder*) signal.
     void slotForwardFolderSyncStateChange();
 
-    void slotServerVersionChanged(OCC::Account *account);
+    void slotServerVersionChanged(const OCC::AccountPtr &account);
 
     /**
      * A file whose locks were being monitored has become unlocked.

diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp
@@ -273,7 +273,7 @@ void ownCloudGui::slotAccountStateChanged()
     slotComputeOverallSyncStatus();
 }
 
-void ownCloudGui::slotTrayMessageIfServerUnsupported(Account *account)
+void ownCloudGui::slotTrayMessageIfServerUnsupported(const AccountPtr &account)
 {
     if (account->serverVersionUnsupported()) {
         slotShowTrayMessage(
@@ -285,8 +285,8 @@ void ownCloudGui::slotTrayMessageIfServerUnsupported(Account *account)
     }
 }
 
-void ownCloudGui::slotNeedToAcceptTermsOfService(OCC::AccountPtr account,
-                                                 AccountState::State state)
+void ownCloudGui::slotNeedToAcceptTermsOfService(const OCC::AccountPtr &account,
+                                                 const OCC::AccountState::State state)
 {
     if (state == AccountState::NeedToSignTermsOfService) {
         slotShowTrayMessage(

diff --git a/src/gui/owncloudgui.h b/src/gui/owncloudgui.h
@@ -93,9 +93,9 @@ public slots:
     void slotHelp();
     void slotOpenPath(const QString &path);
     void slotAccountStateChanged();
-    void slotTrayMessageIfServerUnsupported(OCC::Account *account);
-    void slotNeedToAcceptTermsOfService(OCC::AccountPtr account,
-                                        OCC::AccountState::State state);
+    void slotTrayMessageIfServerUnsupported(const OCC::AccountPtr &account);
+    void slotNeedToAcceptTermsOfService(const OCC::AccountPtr &account,
+                                        const OCC::AccountState::State state);
 
     /**
      * Open a share dialog for a file or folder.

diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp
@@ -790,7 +790,7 @@ void Account::setServerVersion(const QString &version)
 
     auto oldServerVersion = _serverVersion;
     _serverVersion = version;
-    emit serverVersionChanged(this, oldServerVersion, version);
+    emit serverVersionChanged(sharedFromThis(), oldServerVersion, version);
 }
 
 void Account::writeAppPasswordOnce(QString appPassword){

diff --git a/src/libsync/account.h b/src/libsync/account.h
@@ -434,7 +434,7 @@ public slots:
     // e.g. when the approved SSL certificates changed
     void wantsAccountSaved(const OCC::AccountPtr &acc);
 
-    void serverVersionChanged(OCC::Account *account, const QString &newVersion, const QString &oldVersion);
+    void serverVersionChanged(const OCC::AccountPtr &account, const QString &newVersion, const QString &oldVersion);
 
     void accountChangedAvatar();
     void accountChangedDisplayName();