From: Claudio Cambra Date: Sat, 11 Mar 2023 00:56:20 +0000 (+0100) Subject: Sprinkle constness over C++ and Obj-C pointers X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~10^2~55^2~156 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d528adf345796028418e64cd9dc530e3e5c84e48;p=nextcloud-desktop.git Sprinkle constness over C++ and Obj-C pointers Signed-off-by: Claudio Cambra --- diff --git a/src/gui/macOS/fileprovider.h b/src/gui/macOS/fileprovider.h index 484cee223..7ed52b4b5 100644 --- 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 65d34da19..0259b7428 100644 --- 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 7f2ddd460..c8973b7e8 100644 --- 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 d; diff --git a/src/gui/macOS/fileproviderdomainmanager_mac.mm b/src/gui/macOS/fileproviderdomainmanager_mac.mm index beada9f46..bbf9a1d89 100644 --- 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 *domains, NSError *error) { + [NSFileProviderManager getDomainsWithCompletionHandler:^(NSArray * 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 *domains, NSError *error) { + [NSFileProviderManager getDomainsWithCompletionHandler:^(NSArray * 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 _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 99b914334..8463de50e 100644 --- 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 e5142a057..ad40300be 100644 --- 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);