Sprinkle constness over C++ and Obj-C pointers

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

diff --git a/src/gui/macOS/fileprovider.h b/src/gui/macOS/fileprovider.h
index 484cee22375aaa725ebd1e7c0d979534165e49b7..7ed52b4b5f10f575216eb7a0c140342454ab5e29 100644 (file)
--- a/src/gui/macOS/fileprovider.h
+++ b/src/gui/macOS/fileprovider.h
@@ -32,7 +32,7 @@ public:
     ~FileProvider() = default;
 
 private:
-    explicit FileProvider(QObject *parent = nullptr);
+    explicit FileProvider(QObject * const parent = nullptr);
     FileProviderSocketServer _socketServer;
 };
 

diff --git a/src/gui/macOS/fileprovider_mac.mm b/src/gui/macOS/fileprovider_mac.mm
index 65d34da19904f297cb1521e8044763bf205b220d..0259b74288984a56ef517ab08cfa92f551992b1f 100644 (file)
--- a/src/gui/macOS/fileprovider_mac.mm
+++ b/src/gui/macOS/fileprovider_mac.mm
@@ -27,7 +27,7 @@ namespace Mac {
 
 static FileProvider *_instance = nullptr;
 
-FileProvider::FileProvider(QObject *parent)
+FileProvider::FileProvider(QObject * const parent)
     : QObject(parent)
 {
     const auto domainManager = FileProviderDomainManager::instance();

diff --git a/src/gui/macOS/fileproviderdomainmanager.h b/src/gui/macOS/fileproviderdomainmanager.h
index 7f2ddd46065364c0cc8ea50bea3a9fad9739a288..c8973b7e828dbc6400dca7c3ebbb3ff7857c40e0 100644 (file)
--- a/src/gui/macOS/fileproviderdomainmanager.h
+++ b/src/gui/macOS/fileproviderdomainmanager.h
@@ -34,15 +34,15 @@ public:
 private slots:
     void setupFileProviderDomains();
 
-    void addFileProviderDomainForAccount(OCC::AccountState *accountState);
-    void removeFileProviderDomainForAccount(OCC::AccountState *accountState);
+    void addFileProviderDomainForAccount(const OCC::AccountState * const accountState);
+    void removeFileProviderDomainForAccount(const OCC::AccountState * const accountState);
 
-    void trySetupPushNotificationsForAccount(Account *account);
-    void setupPushNotificationsForAccount(OCC::Account *account);
-    void signalEnumeratorChanged(OCC::Account *account);
+    void trySetupPushNotificationsForAccount(const OCC::Account * const account);
+    void setupPushNotificationsForAccount(const OCC::Account * const account);
+    void signalEnumeratorChanged(const OCC::Account * const account);
 
 private:
-    explicit FileProviderDomainManager(QObject *parent = nullptr);
+    explicit FileProviderDomainManager(QObject * const parent = nullptr);
     static FileProviderDomainManager *_instance;
     class Private;
     std::unique_ptr<Private> d;

diff --git a/src/gui/macOS/fileproviderdomainmanager_mac.mm b/src/gui/macOS/fileproviderdomainmanager_mac.mm
index beada9f46103206cca1a615931561df6de2ba429..bbf9a1d89d6dc0b50a7b77b46991785d4c4f1f66 100644 (file)
--- a/src/gui/macOS/fileproviderdomainmanager_mac.mm
+++ b/src/gui/macOS/fileproviderdomainmanager_mac.mm
@@ -39,14 +39,14 @@ class FileProviderDomainManager::Private {
 
     void findExistingFileProviderDomains()
     {
-        [NSFileProviderManager getDomainsWithCompletionHandler:^(NSArray<NSFileProviderDomain *> *domains, NSError *error) {
+        [NSFileProviderManager getDomainsWithCompletionHandler:^(NSArray<NSFileProviderDomain *> * const domains, NSError * const error) {
             if(error) {
                 qCDebug(lcMacFileProviderDomainManager) << "Could not get existing file provider domains: "
                                                         << error.code
                                                         << error.localizedDescription;
             }
 
-            for (NSFileProviderDomain *domain in domains) {
+            for (NSFileProviderDomain * const domain in domains) {
                 const auto accountId = QString::fromNSString(domain.identifier);
 
                 if (const auto accountState = AccountManager::instance()->accountFromUserId(accountId);
@@ -61,7 +61,7 @@ class FileProviderDomainManager::Private {
                 } else {
                     qCDebug(lcMacFileProviderDomainManager) << "Found existing file provider domain with no known configured account:"
                                                             << domain.displayName;
-                    [NSFileProviderManager removeDomain:domain completionHandler:^(NSError *error) {
+                    [NSFileProviderManager removeDomain:domain completionHandler:^(NSError * const error) {
                         if(error) {
                             qCDebug(lcMacFileProviderDomainManager) << "Error removing file provider domain: "
                                                                     << error.code
@@ -73,7 +73,7 @@ class FileProviderDomainManager::Private {
         }];
     }
 
-    void addFileProviderDomain(const AccountState *accountState)
+    void addFileProviderDomain(const AccountState * const accountState)
     {
         const auto accountDisplayName = accountState->account()->displayName();
         const auto accountId = accountState->account()->userIdAtHostWithPort();
@@ -85,9 +85,9 @@ class FileProviderDomainManager::Private {
             return;
         }
 
-        NSFileProviderDomain *fileProviderDomain = [[NSFileProviderDomain alloc] initWithIdentifier:accountId.toNSString()
-                                                                                        displayName:accountDisplayName.toNSString()];
-        [NSFileProviderManager addDomain:fileProviderDomain completionHandler:^(NSError *error) {
+        NSFileProviderDomain * const fileProviderDomain = [[NSFileProviderDomain alloc] initWithIdentifier:accountId.toNSString()
+                                                                                               displayName:accountDisplayName.toNSString()];
+        [NSFileProviderManager addDomain:fileProviderDomain completionHandler:^(NSError * const error) {
             if(error) {
                 qCDebug(lcMacFileProviderDomainManager) << "Error adding file provider domain: "
                                                         << [error code]
@@ -98,7 +98,7 @@ class FileProviderDomainManager::Private {
         _registeredDomains.insert(accountId, fileProviderDomain);
     }
 
-    void removeFileProviderDomain(const AccountState *accountState)
+    void removeFileProviderDomain(const AccountState * const accountState)
     {
         const auto accountId = accountState->account()->userIdAtHostWithPort();
         qCDebug(lcMacFileProviderDomainManager) << "Removing file provider domain for account with id: " << accountId;
@@ -108,7 +108,7 @@ class FileProviderDomainManager::Private {
             return;
         }
 
-        NSFileProviderDomain* fileProviderDomain = _registeredDomains[accountId];
+        NSFileProviderDomain * const fileProviderDomain = _registeredDomains[accountId];
 
         [NSFileProviderManager removeDomain:fileProviderDomain completionHandler:^(NSError *error) {
             if(error) {
@@ -118,7 +118,7 @@ class FileProviderDomainManager::Private {
             }
         }];
 
-        NSFileProviderDomain* domain = _registeredDomains.take(accountId);
+        NSFileProviderDomain * const domain = _registeredDomains.take(accountId);
         [domain release];
     }
 
@@ -126,7 +126,7 @@ class FileProviderDomainManager::Private {
     {
         qCDebug(lcMacFileProviderDomainManager) << "Removing all file provider domains.";
 
-        [NSFileProviderManager removeAllDomainsWithCompletionHandler:^(NSError *error) {
+        [NSFileProviderManager removeAllDomainsWithCompletionHandler:^(NSError * const error) {
             if(error) {
                 qCDebug(lcMacFileProviderDomainManager) << "Error removing all file provider domains: "
                                                         << [error code]
@@ -139,7 +139,7 @@ class FileProviderDomainManager::Private {
     {
         qCDebug(lcMacFileProviderDomainManager) << "Removing and wiping all file provider domains";
 
-        [NSFileProviderManager getDomainsWithCompletionHandler:^(NSArray<NSFileProviderDomain *> *domains, NSError *error) {
+        [NSFileProviderManager getDomainsWithCompletionHandler:^(NSArray<NSFileProviderDomain *> * const domains, NSError * const error) {
             if (error) {
                 qCDebug(lcMacFileProviderDomainManager) << "Error removing and wiping file provider domains: "
                                                         << [error code]
@@ -147,8 +147,10 @@ class FileProviderDomainManager::Private {
                 return;
             }
 
-            for (NSFileProviderDomain *domain in domains) {
-                [NSFileProviderManager removeDomain:domain mode:NSFileProviderDomainRemovalModeRemoveAll completionHandler:^(NSURL *preservedLocation, NSError *error) {
+            for (NSFileProviderDomain * const domain in domains) {
+                [NSFileProviderManager removeDomain:domain mode:NSFileProviderDomainRemovalModeRemoveAll completionHandler:^(NSURL * const preservedLocation, NSError * const error) {
+                    Q_UNUSED(preservedLocation)
+
                     if (error) {
                         qCDebug(lcMacFileProviderDomainManager) << "Error removing and wiping file provider domain: "
                                                                 << [domain displayName]
@@ -173,7 +175,7 @@ class FileProviderDomainManager::Private {
 
         NSFileProviderDomain * const fileProviderDomain = _registeredDomains[accountId];
         NSFileProviderManager * const fpManager = [NSFileProviderManager managerForDomain:fileProviderDomain];
-        [fpManager signalEnumeratorForContainerItemIdentifier:NSFileProviderWorkingSetContainerItemIdentifier completionHandler:^(NSError *error) {
+        [fpManager signalEnumeratorForContainerItemIdentifier:NSFileProviderWorkingSetContainerItemIdentifier completionHandler:^(NSError * const error) {
             if (error != nil) {
                 qCDebug(lcMacFileProviderDomainManager) << "Error signalling enumerator changed for working set:"
                                                         << error.localizedDescription;
@@ -185,7 +187,7 @@ private:
     QHash<QString, NSFileProviderDomain*> _registeredDomains;
 };
 
-FileProviderDomainManager::FileProviderDomainManager(QObject *parent)
+FileProviderDomainManager::FileProviderDomainManager(QObject * const parent)
     : QObject(parent)
 {
     d.reset(new FileProviderDomainManager::Private());
@@ -217,7 +219,7 @@ void FileProviderDomainManager::setupFileProviderDomains()
     }
 }
 
-void FileProviderDomainManager::addFileProviderDomainForAccount(AccountState *accountState)
+void FileProviderDomainManager::addFileProviderDomainForAccount(const AccountState * const accountState)
 {
     Q_ASSERT(accountState);
     const auto account = accountState->account();
@@ -236,7 +238,7 @@ void FileProviderDomainManager::addFileProviderDomainForAccount(AccountState *ac
     trySetupPushNotificationsForAccount(account.get());
 }
 
-void FileProviderDomainManager::trySetupPushNotificationsForAccount(Account *account)
+void FileProviderDomainManager::trySetupPushNotificationsForAccount(const Account * const account)
 {
     Q_ASSERT(account);
 
@@ -254,7 +256,7 @@ void FileProviderDomainManager::trySetupPushNotificationsForAccount(Account *acc
     }
 }
 
-void FileProviderDomainManager::setupPushNotificationsForAccount(Account *account)
+void FileProviderDomainManager::setupPushNotificationsForAccount(const Account * const account)
 {
     Q_ASSERT(account);
 
@@ -265,13 +267,13 @@ void FileProviderDomainManager::setupPushNotificationsForAccount(Account *accoun
     disconnect(account, &Account::pushNotificationsReady, this, &FileProviderDomainManager::setupPushNotificationsForAccount);
 }
 
-void FileProviderDomainManager::signalEnumeratorChanged(Account *account)
+void FileProviderDomainManager::signalEnumeratorChanged(const Account * const account)
 {
     Q_ASSERT(account);
     d->signalEnumeratorChanged(account);
 }
 
-void FileProviderDomainManager::removeFileProviderDomainForAccount(AccountState* accountState)
+void FileProviderDomainManager::removeFileProviderDomainForAccount(const AccountState *  const accountState)
 {
     Q_ASSERT(accountState);
     const auto account = accountState->account();

diff --git a/src/gui/macOS/fileprovidersocketcontroller.cpp b/src/gui/macOS/fileprovidersocketcontroller.cpp
index 99b9143341bd150db78ff3828e826021d9a6c4d8..8463de50e64b32f2c5b685b391b53a233056cb40 100644 (file)
--- a/src/gui/macOS/fileprovidersocketcontroller.cpp
+++ b/src/gui/macOS/fileprovidersocketcontroller.cpp
@@ -24,7 +24,7 @@ namespace Mac {
 
 Q_LOGGING_CATEGORY(lcFileProviderSocketController, "nextcloud.gui.macos.fileprovider.socketcontroller", QtInfoMsg)
 
-FileProviderSocketController::FileProviderSocketController(QLocalSocket *socket, QObject *parent)
+FileProviderSocketController::FileProviderSocketController(QLocalSocket * const socket, QObject * const parent)
     : QObject{parent}
     , _socket(socket)
 {
@@ -43,7 +43,7 @@ void FileProviderSocketController::slotOnDisconnected()
     Q_EMIT socketDestroyed(_socket);
 }
 
-void FileProviderSocketController::slotSocketDestroyed(QObject *object)
+void FileProviderSocketController::slotSocketDestroyed(const QObject * const object)
 {
     Q_UNUSED(object)
     qCInfo(lcFileProviderSocketController) << "File provider socket object has been destroyed, destroying controller";
@@ -54,7 +54,7 @@ void FileProviderSocketController::slotReadyRead()
 {
     Q_ASSERT(_socket);
     while(_socket->canReadLine()) {
-        const QString line = QString::fromUtf8(_socket->readLine().trimmed()).normalized(QString::NormalizationForm_C);
+        const auto line = QString::fromUtf8(_socket->readLine().trimmed()).normalized(QString::NormalizationForm_C);
         qCDebug(lcFileProviderSocketController) << "Received message in file provider socket:" << line;
 
         parseReceivedLine(line);

diff --git a/src/gui/macOS/fileprovidersocketcontroller.h b/src/gui/macOS/fileprovidersocketcontroller.h
index e5142a057cb9f9f4a636ede0728b094c04136e32..ad40300bec3c4b96baa60dd94e278e91c8ddde63 100644 (file)
--- a/src/gui/macOS/fileprovidersocketcontroller.h
+++ b/src/gui/macOS/fileprovidersocketcontroller.h
@@ -29,7 +29,7 @@ class FileProviderSocketController : public QObject
     Q_OBJECT
 
 public:
-    explicit FileProviderSocketController(QLocalSocket *socket, QObject *parent = nullptr);
+    explicit FileProviderSocketController(QLocalSocket * const socket, QObject * const parent = nullptr);
 
 signals:
     void socketDestroyed(const QLocalSocket * const socket);
@@ -40,7 +40,7 @@ public slots:
 
 private slots:
     void slotOnDisconnected();
-    void slotSocketDestroyed(QObject *object);
+    void slotSocketDestroyed(const QObject * const object);
     void slotReadyRead();
 
     void parseReceivedLine(const QString &receivedLine);