mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5587 from nextcloud/ci/fullyQualifyTypeForSignalsSlots

Browse Source 
fix compilation with clazy and fully-qualified-moc-types checks enabled
This commit is contained in:
Matthieu Gallien 2023-04-11 17:05:42 +02:00 committed by GitHub
commit e0a577172b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/syncjournaldb.h
View File

@ -389,7 +389,7 @@ public:
public slots:
/// Store a new or updated record in the database
void setCaseConflictRecord(const ConflictRecord &record);
void setCaseConflictRecord(const OCC::ConflictRecord &record);
/// Delete a case clash conflict record by path of the file with the conflict tag
void deleteCaseClashConflictByPathRecord(const QString &path);

2
src/gui/accountsettings.h
View File

@ -118,7 +118,7 @@ private slots:
private slots:
void displayMnemonic(const QString &mnemonic);
void disableEncryptionForAccount(const AccountPtr &account) const;
void disableEncryptionForAccount(const OCC::AccountPtr &account) const;
void showConnectionLabel(const QString &message, QStringList errors = QStringList());
void openIgnoredFilesDialog(const QString & absFolderPath);
void customizeStyle();

2
src/gui/accountsetupfromcommandlinejob.h
View File

@ -47,7 +47,7 @@ private slots:
void accountSetupFromCommandLinePropfindHandleFailure();
void setupLocalSyncFolder(AccountState *accountState);
void setupLocalSyncFolder(OCC::AccountState *accountState);
void printAccountSetupFromCommandLineStatusAndExit(const QString &status, bool isFailure);

2
src/gui/editlocallyjob.h
View File

@ -76,7 +76,7 @@ private slots:
void lockFile();
void fileAlreadyLocked();
void fileLockSuccess(const SyncFileItemPtr &item);
void fileLockSuccess(const OCC::SyncFileItemPtr &item);
void fileLockError(const QString &errorMessage);
void fileLockProcedureComplete(const QString &notificationTitle,
const QString &notificationMessage,

2
src/gui/filedetails/shareemodel.h
View File

@ -88,7 +88,7 @@ public slots:
private slots:
void shareesFetched(const QJsonDocument &reply);
void insertSearchGloballyItem(const QVector<ShareePtr> &newShareesFetched);
void insertSearchGloballyItem(const QVector<OCC::ShareePtr> &newShareesFetched);
void filterSharees();
void slotDarkModeChanged();

2
src/gui/folderman.cpp
View File

@ -1549,7 +1549,6 @@ void FolderMan::trayOverallStatus(const QList<Folder *> &folders,
int goodSeen = 0;
int abortOrPausedSeen = 0;
int runSeen = 0;
int various = 0;
for (const Folder *folder : qAsConst(folders)) {
SyncResult folderResult = folder->syncResult();
@ -1561,7 +1560,6 @@ void FolderMan::trayOverallStatus(const QList<Folder *> &folders,
switch (syncStatus) {
case SyncResult::Undefined:
case SyncResult::NotYetStarted:
various++;
break;
case SyncResult::SyncPrepare:
case SyncResult::SyncRunning:

2
src/gui/folderman.h
View File

@ -276,7 +276,7 @@ public slots:
void forceSyncForFolder(OCC::Folder *folder);
void removeE2eFiles(const AccountPtr &account) const;
void removeE2eFiles(const OCC::AccountPtr &account) const;
private slots:
void slotFolderSyncPaused(OCC::Folder *, bool paused);

4
src/gui/socketapi/socketapi.h
View File

@ -125,9 +125,9 @@ private:
// The context menu actions
Q_INVOKABLE void command_ACTIVITY(const QString &localFile, OCC::SocketListener *listener);
Q_INVOKABLE void command_ENCRYPT(const QString &localFile, SocketListener *listener);
Q_INVOKABLE void command_ENCRYPT(const QString &localFile, OCC::SocketListener *listener);
Q_INVOKABLE void command_SHARE(const QString &localFile, OCC::SocketListener *listener);
Q_INVOKABLE void command_LEAVESHARE(const QString &localFile, SocketListener *listener);
Q_INVOKABLE void command_LEAVESHARE(const QString &localFile, OCC::SocketListener *listener);
Q_INVOKABLE void command_MANAGE_PUBLIC_LINKS(const QString &localFile, OCC::SocketListener *listener);
Q_INVOKABLE void command_COPY_SECUREFILEDROP_LINK(const QString &localFile, OCC::SocketListener *listener);
Q_INVOKABLE void command_COPY_PUBLIC_LINK(const QString &localFile, OCC::SocketListener *listener);

4
src/gui/systray.h
View File

@ -102,7 +102,7 @@ signals:
void shutdown();
void showFileDetailsPage(const QString &fileLocalPath, const OCC::Systray::FileDetailsPage page);
void showFileDetails(AccountState *accountState, const QString &localPath, const OCC::Systray::FileDetailsPage fileDetailsPage);
void showFileDetails(OCC::AccountState *accountState, const QString &localPath, const OCC::Systray::FileDetailsPage fileDetailsPage);
void sendChatMessage(const QString &token, const QString &message, const QString &replyTo);
void showErrorMessageDialog(const QString &error);
@ -115,7 +115,7 @@ public slots:
void showMessage(const QString &title, const QString &message, QSystemTrayIcon::MessageIcon icon = Information);
void showUpdateMessage(const QString &title, const QString &message, const QUrl &webUrl);
void showTalkMessage(const QString &title, const QString &message, const QString &replyTo, const QString &token, const AccountStatePtr &accountState);
void showTalkMessage(const QString &title, const QString &message, const QString &replyTo, const QString &token, const OCC::AccountStatePtr &accountState);
void setToolTip(const QString &tip);
void createCallDialog(const OCC::Activity &callNotification, const OCC::AccountStatePtr accountState);

10
src/gui/tray/usermodel.h
View File

@ -113,15 +113,15 @@ public slots:
private slots:
void slotPushNotificationsReady();
void slotDisconnectPushNotifications();
void slotReceivedPushNotification(Account *account);
void slotReceivedPushActivity(Account *account);
void slotReceivedPushNotification(OCC::Account *account);
void slotReceivedPushActivity(OCC::Account *account);
void slotCheckExpiredActivities();
void checkNotifiedNotifications();
void showDesktopNotification(const QString &title, const QString &message, const long notificationId);
void showDesktopNotification(const Activity &activity);
void showDesktopNotification(const ActivityList &activityList);
void showDesktopTalkNotification(const Activity &activity);
void showDesktopNotification(const OCC::Activity &activity);
void showDesktopNotification(const OCC::ActivityList &activityList);
void showDesktopTalkNotification(const OCC::Activity &activity);
private:
void connectPushNotifications() const;

24
src/libsync/clientsideencryption.h
View File

@ -137,12 +137,12 @@ signals:
void mnemonicDeleted();
public slots:
void initialize(const AccountPtr &account);
void forgetSensitiveData(const AccountPtr &account);
void initialize(const OCC::AccountPtr &account);
void forgetSensitiveData(const OCC::AccountPtr &account);
private slots:
void generateKeyPair(const AccountPtr &account);
void encryptPrivateKey(const AccountPtr &account);
void generateKeyPair(const OCC::AccountPtr &account);
void encryptPrivateKey(const OCC::AccountPtr &account);
void publicKeyFetched(QKeychain::Job *incoming);
void privateKeyFetched(QKeychain::Job *incoming);
@ -153,15 +153,15 @@ private slots:
void handleMnemonicDeleted(const QKeychain::Job* const incoming);
void checkAllSensitiveDataDeleted();
void getPrivateKeyFromServer(const AccountPtr &account);
void getPublicKeyFromServer(const AccountPtr &account);
void fetchAndValidatePublicKeyFromServer(const AccountPtr &account);
void decryptPrivateKey(const AccountPtr &account, const QByteArray &key);
void getPrivateKeyFromServer(const OCC::AccountPtr &account);
void getPublicKeyFromServer(const OCC::AccountPtr &account);
void fetchAndValidatePublicKeyFromServer(const OCC::AccountPtr &account);
void decryptPrivateKey(const OCC::AccountPtr &account, const QByteArray &key);
void fetchFromKeyChain(const AccountPtr &account);
void writePrivateKey(const AccountPtr &account);
void writeCertificate(const AccountPtr &account);
void writeMnemonic(const AccountPtr &account);
void fetchFromKeyChain(const OCC::AccountPtr &account);
void writePrivateKey(const OCC::AccountPtr &account);
void writeCertificate(const OCC::AccountPtr &account);
void writeMnemonic(const OCC::AccountPtr &account);
private:
void generateCSR(const AccountPtr &account, PKey keyPair);

4
src/libsync/syncengine.h
View File

@ -128,7 +128,7 @@ public:
[[nodiscard]] const SyncEngine::SingleItemDiscoveryOptions &singleItemDiscoveryOptions() const;
public slots:
void setSingleItemDiscoveryOptions(const SingleItemDiscoveryOptions &singleItemDiscoveryOptions);
void setSingleItemDiscoveryOptions(const OCC::SyncEngine::SingleItemDiscoveryOptions &singleItemDiscoveryOptions);
void startSync();
@ -165,7 +165,7 @@ signals:
void transmissionProgress(const OCC::ProgressInfo &progress);
void itemDiscovered(const SyncFileItemPtr &);
void itemDiscovered(const OCC::SyncFileItemPtr &);
/// We've produced a new sync error of a type.
void syncError(const QString &message, OCC::ErrorCategory category = OCC::ErrorCategory::Normal);

2
src/libsync/updatefiledropmetadata.h
View File

@ -51,7 +51,7 @@ private slots:
signals:
void folderUnlocked(const QByteArray &folderId, int httpStatus);
void fileDropMetadataParsedAndAdjusted(const FolderMetadata *const metadata);
void fileDropMetadataParsedAndAdjusted(const OCC::FolderMetadata *const metadata);
private:
QString _path;