From fcd5a863495b5a0c1cea3a9bcedc8af656af98ef Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Wed, 11 Oct 2023 14:22:06 +0200 Subject: [PATCH] signals/slots need to have fully qualified arguments Signed-off-by: Matthieu Gallien --- src/gui/accountmanager.cpp | 2 +- src/gui/accountmanager.h | 2 +- src/gui/filedetails/sharemodel.cpp | 2 +- src/gui/filedetails/sharemodel.h | 2 +- src/libsync/owncloudpropagator.h | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp index ce981e11a6..91dfb33dab 100644 --- a/src/gui/accountmanager.cpp +++ b/src/gui/accountmanager.cpp @@ -490,7 +490,7 @@ AccountState *AccountManager::addAccount(const AccountPtr &newAccount) return newAccountState; } -void AccountManager::deleteAccount(AccountState *account) +void AccountManager::deleteAccount(OCC::AccountState *account) { const auto it = std::find(_accounts.begin(), _accounts.end(), account); if (it == _accounts.end()) { diff --git a/src/gui/accountmanager.h b/src/gui/accountmanager.h index da5f3464a7..626800f9b9 100644 --- a/src/gui/accountmanager.h +++ b/src/gui/accountmanager.h @@ -101,7 +101,7 @@ public slots: void save(bool saveCredentials = true); /// Delete the AccountState - void deleteAccount(AccountState *account); + void deleteAccount(OCC::AccountState *account); /// Remove all accounts void shutdown(); diff --git a/src/gui/filedetails/sharemodel.cpp b/src/gui/filedetails/sharemodel.cpp index 5d6f635b8d..418f5353d4 100644 --- a/src/gui/filedetails/sharemodel.cpp +++ b/src/gui/filedetails/sharemodel.cpp @@ -945,7 +945,7 @@ void ShareModel::toggleShareNoteToRecipientFromQml(const QVariant &share, const toggleShareNoteToRecipient(ptr, enable); } -void ShareModel::changePermissionModeFromQml(const QVariant &share, const SharePermissionsMode permissionMode) +void ShareModel::changePermissionModeFromQml(const QVariant &share, const OCC::ShareModel::SharePermissionsMode permissionMode) { const auto sharePtr = share.value(); if (sharePtr.isNull() || _sharePermissionsChangeInProgress) { diff --git a/src/gui/filedetails/sharemodel.h b/src/gui/filedetails/sharemodel.h index e3e44c963e..735d207c9f 100644 --- a/src/gui/filedetails/sharemodel.h +++ b/src/gui/filedetails/sharemodel.h @@ -173,7 +173,7 @@ public slots: void toggleShareExpirationDateFromQml(const QVariant &share, const bool enable) const; void toggleShareNoteToRecipient(const OCC::SharePtr &share, const bool enable) const; void toggleShareNoteToRecipientFromQml(const QVariant &share, const bool enable) const; - void changePermissionModeFromQml(const QVariant &share, const SharePermissionsMode permissionMode); + void changePermissionModeFromQml(const QVariant &share, const OCC::ShareModel::SharePermissionsMode permissionMode); void setLinkShareLabel(const QSharedPointer &linkShare, const QString &label) const; void setLinkShareLabelFromQml(const QVariant &linkShare, const QString &label) const; diff --git a/src/libsync/owncloudpropagator.h b/src/libsync/owncloudpropagator.h index 1b2398c044..46f0ea4e5e 100644 --- a/src/libsync/owncloudpropagator.h +++ b/src/libsync/owncloudpropagator.h @@ -644,7 +644,7 @@ private slots: signals: void newItem(const OCC::SyncFileItemPtr &); - void itemCompleted(const SyncFileItemPtr &item, OCC::ErrorCategory category); + void itemCompleted(const OCC::SyncFileItemPtr &item, OCC::ErrorCategory category); void progress(const OCC::SyncFileItem &, qint64 bytes); void finished(OCC::SyncFileItem::Status status); @@ -725,7 +725,7 @@ public: void start(); signals: void finished(); - void aborted(const QString &error, const ErrorCategory errorCategory); + void aborted(const QString &error, const OCC::ErrorCategory errorCategory); private slots: void slotPollFinished(); };