diff --git a/autotests/addremoveannotationtest.cpp b/autotests/addremoveannotationtest.cpp index 687eaa4de..5d97da123 100644 --- a/autotests/addremoveannotationtest.cpp +++ b/autotests/addremoveannotationtest.cpp @@ -17,7 +17,7 @@ class AddRemoveAnnotationTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void init(); void cleanup(); diff --git a/autotests/annotationstest.cpp b/autotests/annotationstest.cpp index 43b3b2ebf..c8c75cf8f 100644 --- a/autotests/annotationstest.cpp +++ b/autotests/annotationstest.cpp @@ -19,7 +19,7 @@ class AnnotationTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void testDistance(); void testDistance_data(); diff --git a/autotests/annotationtoolbartest.cpp b/autotests/annotationtoolbartest.cpp index 75f548a00..d57499daa 100644 --- a/autotests/annotationtoolbartest.cpp +++ b/autotests/annotationtoolbartest.cpp @@ -54,7 +54,7 @@ public: return s->m_tabWidget; } -private slots: +private Q_SLOTS: void initTestCase(); void init(); void cleanup(); diff --git a/autotests/calculatetexttest.cpp b/autotests/calculatetexttest.cpp index dfff3b607..1b87df2af 100644 --- a/autotests/calculatetexttest.cpp +++ b/autotests/calculatetexttest.cpp @@ -18,7 +18,7 @@ class CalculateTextTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void cleanupTestCase(); diff --git a/autotests/closedialoghelper.h b/autotests/closedialoghelper.h index b5b5fc689..8fa5b6a3a 100644 --- a/autotests/closedialoghelper.h +++ b/autotests/closedialoghelper.h @@ -25,7 +25,7 @@ public: ~CloseDialogHelper() override; -private slots: +private Q_SLOTS: void closeDialog(); private: diff --git a/autotests/documenttest.cpp b/autotests/documenttest.cpp index eaedb5c50..db19ca60b 100644 --- a/autotests/documenttest.cpp +++ b/autotests/documenttest.cpp @@ -26,7 +26,7 @@ class DocumentTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void testCloseDuringRotationJob(); void testDocdataMigration(); }; diff --git a/autotests/editannotationcontentstest.cpp b/autotests/editannotationcontentstest.cpp index 6e81323a0..9949273fc 100644 --- a/autotests/editannotationcontentstest.cpp +++ b/autotests/editannotationcontentstest.cpp @@ -18,7 +18,7 @@ class EditAnnotationContentsTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void cleanupTestCase(); void init(); @@ -65,7 +65,7 @@ public: return m_anchorPos; } -private slots: +private Q_SLOTS: void slotAnnotationContentsChangedByUndoRedo(Okular::Annotation *annotation, const QString &contents, int cursorPos, int anchorPos); private: diff --git a/autotests/editformstest.cpp b/autotests/editformstest.cpp index c28dd5777..984325b36 100644 --- a/autotests/editformstest.cpp +++ b/autotests/editformstest.cpp @@ -17,7 +17,7 @@ class EditFormsTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void cleanupTestCase(); void init(); diff --git a/autotests/formattest.cpp b/autotests/formattest.cpp index 7a83d0f34..b1ab3f220 100644 --- a/autotests/formattest.cpp +++ b/autotests/formattest.cpp @@ -21,7 +21,7 @@ class FormatTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void cleanupTestCase(); void testTimeFormat(); diff --git a/autotests/generatorstest.cpp b/autotests/generatorstest.cpp index 89610fb2f..1d9c701b5 100644 --- a/autotests/generatorstest.cpp +++ b/autotests/generatorstest.cpp @@ -16,7 +16,7 @@ class GeneratorsTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void testLoadsCorrectly(); }; diff --git a/autotests/keystroketest.cpp b/autotests/keystroketest.cpp index 9277b96e2..03de3df5e 100644 --- a/autotests/keystroketest.cpp +++ b/autotests/keystroketest.cpp @@ -22,7 +22,7 @@ class KeystrokeTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void cleanupTestCase(); diff --git a/autotests/kjsfunctionstest.cpp b/autotests/kjsfunctionstest.cpp index 76efb0942..ee385ec26 100644 --- a/autotests/kjsfunctionstest.cpp +++ b/autotests/kjsfunctionstest.cpp @@ -44,7 +44,7 @@ public: QVERIFY(m_clicked); } -private slots: +private Q_SLOTS: void closeMessageBox() { const QWidgetList allToplevelWidgets = QApplication::topLevelWidgets(); @@ -80,7 +80,7 @@ class KJSFunctionsTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void testNthFieldName(); void testDisplay(); diff --git a/autotests/mainshelltest.cpp b/autotests/mainshelltest.cpp index 2750bdc2b..0eb046e1c 100644 --- a/autotests/mainshelltest.cpp +++ b/autotests/mainshelltest.cpp @@ -66,7 +66,7 @@ public: } bool foundDialog; -public slots: +public Q_SLOTS: void closePrintDialog(); private: @@ -83,7 +83,7 @@ public: return s->m_tabWidget; } -private slots: +private Q_SLOTS: void initTestCase(); void cleanupTestCase(); void init(); diff --git a/autotests/markdowntest.cpp b/autotests/markdowntest.cpp index c31bc4559..4eb0959c5 100644 --- a/autotests/markdowntest.cpp +++ b/autotests/markdowntest.cpp @@ -17,7 +17,7 @@ class MarkdownTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void testFancyPantsEnabled(); diff --git a/autotests/modifyannotationpropertiestest.cpp b/autotests/modifyannotationpropertiestest.cpp index 94390747b..dfd948792 100644 --- a/autotests/modifyannotationpropertiestest.cpp +++ b/autotests/modifyannotationpropertiestest.cpp @@ -18,7 +18,7 @@ class ModifyAnnotationPropertiesTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void cleanupTestCase(); void init(); diff --git a/autotests/parttest.cpp b/autotests/parttest.cpp index 939a60a35..db49fbe7b 100644 --- a/autotests/parttest.cpp +++ b/autotests/parttest.cpp @@ -55,7 +55,7 @@ class PartTest : public QObject signals: void urlHandler(const QUrl &url); // NOLINT(readability-inconsistent-declaration-parameter-name) -private slots: +private Q_SLOTS: void init(); void testZoomWithCrop(); diff --git a/autotests/searchtest.cpp b/autotests/searchtest.cpp index c082b3443..5722f3dbd 100644 --- a/autotests/searchtest.cpp +++ b/autotests/searchtest.cpp @@ -21,7 +21,7 @@ class SearchFinishedReceiver : public QObject { Q_OBJECT -public slots: +public Q_SLOTS: void searchFinished(int id, Okular::Document::SearchStatus status) { m_id = id; @@ -37,7 +37,7 @@ class SearchTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void testNextAndPrevious(); void test311232(); diff --git a/autotests/shelltest.cpp b/autotests/shelltest.cpp index e7aaf7116..f26c0f34e 100644 --- a/autotests/shelltest.cpp +++ b/autotests/shelltest.cpp @@ -35,7 +35,7 @@ class ShellTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void testUrlArgs_data(); void testUrlArgs(); diff --git a/autotests/signatureformtest.cpp b/autotests/signatureformtest.cpp index e5797c04c..5a40b2c47 100644 --- a/autotests/signatureformtest.cpp +++ b/autotests/signatureformtest.cpp @@ -18,7 +18,7 @@ class SignatureFormTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void cleanupTestCase(); void testSignatureForm(); diff --git a/autotests/signunsignedfieldtest.cpp b/autotests/signunsignedfieldtest.cpp index 7e3de19bf..3b84f5f48 100644 --- a/autotests/signunsignedfieldtest.cpp +++ b/autotests/signunsignedfieldtest.cpp @@ -46,7 +46,7 @@ class SignUnsignedFieldTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void init(); void cleanup(); diff --git a/autotests/translateannotationtest.cpp b/autotests/translateannotationtest.cpp index 4385e690d..4f0aaaab8 100644 --- a/autotests/translateannotationtest.cpp +++ b/autotests/translateannotationtest.cpp @@ -31,7 +31,7 @@ class TranslateAnnotationTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void cleanupTestCase(); void init(); diff --git a/autotests/visibilitytest.cpp b/autotests/visibilitytest.cpp index 5d2323613..6dc8c1d00 100644 --- a/autotests/visibilitytest.cpp +++ b/autotests/visibilitytest.cpp @@ -20,7 +20,7 @@ class VisibilityTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void cleanupTestCase(); diff --git a/core/generator_p.h b/core/generator_p.h index e45a8bc2e..07757a3f8 100644 --- a/core/generator_p.h +++ b/core/generator_p.h @@ -147,7 +147,7 @@ public: void abortExtraction(); bool shouldAbortExtraction() const; -public slots: +public Q_SLOTS: void startGeneration(); protected: diff --git a/generators/chm/autotests/chmgeneratortest.cpp b/generators/chm/autotests/chmgeneratortest.cpp index c428fa1b3..2c7696ab1 100644 --- a/generators/chm/autotests/chmgeneratortest.cpp +++ b/generators/chm/autotests/chmgeneratortest.cpp @@ -16,7 +16,7 @@ class ChmGeneratorTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void testDocumentStructure(); void testDocumentContent(); diff --git a/generators/chm/lib/ebook_search.h b/generators/chm/lib/ebook_search.h index 9e0576bf1..97b5214db 100644 --- a/generators/chm/lib/ebook_search.h +++ b/generators/chm/lib/ebook_search.h @@ -57,10 +57,10 @@ public: signals: void progressStep(int value, const QString &stepName); -public slots: +public Q_SLOTS: void cancelIndexGeneration(); -private slots: +private Q_SLOTS: void updateProgress(int value, const QString &stepName); void processEvents(); diff --git a/generators/chm/lib/helper_search_index.h b/generators/chm/lib/helper_search_index.h index c6203658a..4c0d25453 100644 --- a/generators/chm/lib/helper_search_index.h +++ b/generators/chm/lib/helper_search_index.h @@ -81,7 +81,7 @@ public: signals: void indexingProgress(int, const QString &); -public slots: +public Q_SLOTS: void setLastWinClosed(); private: diff --git a/generators/comicbook/autotests/comicbooktest.cpp b/generators/comicbook/autotests/comicbooktest.cpp index b303e9760..4ecd58f7d 100644 --- a/generators/comicbook/autotests/comicbooktest.cpp +++ b/generators/comicbook/autotests/comicbooktest.cpp @@ -19,7 +19,7 @@ class ComicBookGeneratorTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void testRotatedImage(); void cleanupTestCase(); diff --git a/generators/epub/autotests/epubgeneratortest.cpp b/generators/epub/autotests/epubgeneratortest.cpp index 129ac8046..7ec128489 100644 --- a/generators/epub/autotests/epubgeneratortest.cpp +++ b/generators/epub/autotests/epubgeneratortest.cpp @@ -16,7 +16,7 @@ class EpubGeneratorTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void testDocumentStructure(); void testDocumentContent(); diff --git a/generators/kimgio/tests/kimgiotest.cpp b/generators/kimgio/tests/kimgiotest.cpp index a37153a15..898dedf4b 100644 --- a/generators/kimgio/tests/kimgiotest.cpp +++ b/generators/kimgio/tests/kimgiotest.cpp @@ -24,7 +24,7 @@ class KIMGIOTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void testExifOrientation_data(); void testExifOrientation(); diff --git a/part/actionbar.cpp b/part/actionbar.cpp index 1489128c0..eb8b62cfd 100644 --- a/part/actionbar.cpp +++ b/part/actionbar.cpp @@ -27,7 +27,7 @@ public: explicit ActionBarWidget(QToolBar *parent); void recreateButtons(const QList &actions); -private slots: +private Q_SLOTS: void onOrientationChanged(Qt::Orientation orientation); }; diff --git a/part/annotationactionhandler.h b/part/annotationactionhandler.h index 9ab575c41..f16e7d399 100644 --- a/part/annotationactionhandler.h +++ b/part/annotationactionhandler.h @@ -45,7 +45,7 @@ public: signals: void ephemeralStampWarning(); -private slots: +private Q_SLOTS: void slotAnnotationToolBarVisibilityChanged(bool visible); private: diff --git a/part/tts.h b/part/tts.h index e20bafce3..8d703a455 100644 --- a/part/tts.h +++ b/part/tts.h @@ -21,7 +21,7 @@ public: void stopAllSpeechs(); void pauseResumeSpeech(); -public slots: +public Q_SLOTS: void slotSpeechStateChanged(QTextToSpeech::State state); void slotConfigChanged();