From 3e58d67c4cc4894b17098bc998224ef3ec4a44b6 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 8 Mar 2020 14:04:29 +0100 Subject: [PATCH] Don't use lower-case Qt macros --- CMakeLists.txt | 2 +- dbquery/dbquery.h | 2 +- gui/attachmentsedit.h | 4 ++-- gui/dbquerywidget.h | 4 ++-- gui/entertargetdialog.h | 2 +- gui/mainwindow.h | 4 ++-- gui/notificationlabel.h | 4 ++-- gui/notificationmodel.h | 2 +- gui/picturepreviewselection.h | 4 ++-- gui/renamefilesdialog.h | 2 +- gui/tagedit.h | 2 +- gui/tageditorwidget.h | 4 ++-- gui/tagfieldedit.h | 4 ++-- renamingutility/renamingengine.h | 4 ++-- renamingutility/tageditorobject.h | 2 +- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5db70d7..6eb8563 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ set(META_GUI_OPTIONAL true) set(META_JS_SRC_DIR renamingutility) set(META_VERSION_MAJOR 3) set(META_VERSION_MINOR 3) -set(META_VERSION_PATCH 4) +set(META_VERSION_PATCH 5) set(META_ADD_DEFAULT_CPP_UNIT_TEST_APPLICATION ON) # add project files diff --git a/dbquery/dbquery.h b/dbquery/dbquery.h index cd1d93d..c0684a9 100644 --- a/dbquery/dbquery.h +++ b/dbquery/dbquery.h @@ -128,7 +128,7 @@ protected: void handleCoverReplyFinished(QNetworkReply *reply, const QString &albumId, int row); void parseCoverResults(const QString &albumId, int row, const QByteArray &data); -private slots: +private Q_SLOTS: void handleInitialReplyFinished(); protected: diff --git a/gui/attachmentsedit.h b/gui/attachmentsedit.h index c13215c..5da1d3e 100644 --- a/gui/attachmentsedit.h +++ b/gui/attachmentsedit.h @@ -29,7 +29,7 @@ public: void setFileInfo(TagParser::MediaFileInfo *fileInfo, bool updateUi = true); const QList ¤tAttachments() const; -public slots: +public Q_SLOTS: void clear(); void restore(); void apply(); @@ -39,7 +39,7 @@ public slots: void showFileSelection(); void extractSelected(); -private slots: +private Q_SLOTS: void selectionChanged(const QModelIndex ¤t, const QModelIndex &previous); private: diff --git a/gui/dbquerywidget.h b/gui/dbquerywidget.h index 82e6261..06a902b 100644 --- a/gui/dbquerywidget.h +++ b/gui/dbquerywidget.h @@ -35,7 +35,7 @@ public: SongDescription currentSongDescription() const; void applyResults(TagEdit *tagEdit, const QModelIndex &resultIndex); -public slots: +public Q_SLOTS: void searchMusicBrainz(); void searchLyricsWikia(); void searchMakeItPersonal(); @@ -48,7 +48,7 @@ public slots: void insertSearchTermsFromActiveTagEdit(); void clearSearchCriteria(); -private slots: +private Q_SLOTS: void showResults(); void setStatus(bool aborted); void fileStatusChanged(bool opened, bool hasTags); diff --git a/gui/entertargetdialog.h b/gui/entertargetdialog.h index dccca6e..4638ad3 100644 --- a/gui/entertargetdialog.h +++ b/gui/entertargetdialog.h @@ -33,7 +33,7 @@ public: TagParser::TagTarget target() const; void setTarget(const TagParser::TagTarget &target, const TagParser::MediaFileInfo *file = nullptr); -private slots: +private Q_SLOTS: void updateLevelNamePlaceholderText(int i); private: diff --git a/gui/mainwindow.h b/gui/mainwindow.h index ac52ee3..2ff7da8 100644 --- a/gui/mainwindow.h +++ b/gui/mainwindow.h @@ -47,7 +47,7 @@ public: QString currentDirectory() const; bool isLayoutLocked() const; -public slots: +public Q_SLOTS: void setCurrentDirectory(const QString &path); void setLayoutLocked(bool locked); void toggleLayoutLocked(); @@ -56,7 +56,7 @@ public slots: protected: bool event(QEvent *event) override; -private slots: +private Q_SLOTS: // file selection void pathEntered(); void fileSelected(); diff --git a/gui/notificationlabel.h b/gui/notificationlabel.h index e68dbbf..17f299e 100644 --- a/gui/notificationlabel.h +++ b/gui/notificationlabel.h @@ -41,7 +41,7 @@ public: QSize sizeHint() const override; QSize minimumSizeHint() const override; -public slots: +public Q_SLOTS: void setText(const QString &text); void setContext(const QString &context); void clearText(); @@ -57,7 +57,7 @@ protected: void paintEvent(QPaintEvent *event) override; void mouseDoubleClickEvent(QMouseEvent *event) override; -private slots: +private Q_SLOTS: void updateAnimation(); void showMessageBox() const; diff --git a/gui/notificationmodel.h b/gui/notificationmodel.h index ad47b66..9cb531d 100644 --- a/gui/notificationmodel.h +++ b/gui/notificationmodel.h @@ -28,7 +28,7 @@ public: signals: -public slots: +public Q_SLOTS: private: TagParser::Diagnostics m_diag; diff --git a/gui/picturepreviewselection.h b/gui/picturepreviewselection.h index 2709ac0..d2fa9c6 100644 --- a/gui/picturepreviewselection.h +++ b/gui/picturepreviewselection.h @@ -44,7 +44,7 @@ public: TagParser::Tag *tag() const; TagParser::KnownField field() const; -public slots: +public Q_SLOTS: bool setTagField(TagParser::Tag *tag, TagParser::KnownField field, PreviousValueHandling previousValueHandling = PreviousValueHandling::Clear); bool setValue(const TagParser::TagValue &value, PreviousValueHandling previousValueHandling = PreviousValueHandling::Clear); @@ -73,7 +73,7 @@ protected: void dragEnterEvent(QDragEnterEvent *event) override; void dropEvent(QDropEvent *event) override; -private slots: +private Q_SLOTS: void typeSwitched(int index); void updateDescription(int newIndex); void updateDescription(int lastIndex, int newIndex); diff --git a/gui/renamefilesdialog.h b/gui/renamefilesdialog.h index 45bd11c..f6a9eb3 100644 --- a/gui/renamefilesdialog.h +++ b/gui/renamefilesdialog.h @@ -34,7 +34,7 @@ public: protected: bool event(QEvent *event) override; -private slots: +private Q_SLOTS: void showScriptFileSelectionDlg(); void startGeneratingPreview(); void startApplyChangings(); diff --git a/gui/tagedit.h b/gui/tagedit.h index f7d8f7b..0ec0047 100644 --- a/gui/tagedit.h +++ b/gui/tagedit.h @@ -48,7 +48,7 @@ public: QString generateLabel() const; bool hasAutoCorrectionBeenApplied() const; -public slots: +public Q_SLOTS: void clear(); void restore(); void apply(); diff --git a/gui/tageditorwidget.h b/gui/tageditorwidget.h index 32fc6c3..ab82000 100644 --- a/gui/tageditorwidget.h +++ b/gui/tageditorwidget.h @@ -64,7 +64,7 @@ public: void foreachTagEdit(const std::function &function); TagEdit *activeTagEdit(); -public slots: +public Q_SLOTS: // operations with the currently opened file: load, save, delete, close bool startParsing(const QString &path, bool forceRefresh = false); bool startSaving(); @@ -98,7 +98,7 @@ signals: protected: bool event(QEvent *event) override; -private slots: +private Q_SLOTS: // editor void fileChangedOnDisk(const QString &path); void showFile(char result); diff --git a/gui/tagfieldedit.h b/gui/tagfieldedit.h index b9db260..617d75a 100644 --- a/gui/tagfieldedit.h +++ b/gui/tagfieldedit.h @@ -53,7 +53,7 @@ public: void toggleLocked(); bool hasAutoCorrectionBeenApplied() const; -public slots: +public Q_SLOTS: void clear(); void apply(); void restore(); @@ -65,7 +65,7 @@ signals: protected: bool eventFilter(QObject *obj, QEvent *event) override; -private slots: +private Q_SLOTS: void handleRestoreButtonClicked(); void handleRestoreButtonDestroyed(QObject *obj = nullptr); void handleLockButtonDestroyed(QObject *obj = nullptr); diff --git a/renamingutility/renamingengine.h b/renamingutility/renamingengine.h index a0789bb..e0d0c38 100644 --- a/renamingutility/renamingengine.h +++ b/renamingutility/renamingengine.h @@ -72,7 +72,7 @@ public: const QString &errorMessage() const; int errorLineNumber() const; -public slots: +public Q_SLOTS: bool generatePreview(const QDir &rootDirectory, bool includeSubdirs); bool applyChangings(); void abort(); @@ -82,7 +82,7 @@ signals: void changingsApplied(); void progress(int itemsProcessed, int errorsOccured); -private slots: +private Q_SLOTS: void processPreviewGenerated(); void processChangingsApplied(); diff --git a/renamingutility/tageditorobject.h b/renamingutility/tageditorobject.h index e424278..e99bcc8 100644 --- a/renamingutility/tageditorobject.h +++ b/renamingutility/tageditorobject.h @@ -41,7 +41,7 @@ public: const QString &newRelativeDirectory() const; const QString ¬e() const; -public slots: +public Q_SLOTS: TAGEDITOR_JS_VALUE parseFileInfo(const QString &fileName); TAGEDITOR_JS_VALUE parseFileName(const QString &fileName); TAGEDITOR_JS_VALUE allFiles(const QString &dirName);