From d246d9527ae903f1211e37c7c3eb500b199fbac3 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Sat, 31 May 2025 11:35:37 -0400 Subject: [PATCH] Feat: Define QT_NO_KEYWORDS, allowing us to use Qt in more places must use Q_SIGNALS, Q_SLOTS and Q_EMIT in place of signals, slots and emit macros --- CMakeLists.txt | 4 ++++ src/lib/common/Settings.h | 2 +- src/lib/deskflow/ipc/DaemonIpcServer.h | 4 ++-- src/lib/deskflow/unix/AppUtilUnix.cpp | 12 +++++++----- src/lib/gui/DataDownloader.h | 4 ++-- src/lib/gui/FileTail.h | 4 ++-- src/lib/gui/Logger.h | 2 +- src/lib/gui/MainWindow.h | 2 +- src/lib/gui/ScreenSetupModel.h | 2 +- src/lib/gui/VersionChecker.h | 4 ++-- src/lib/gui/core/ClientConnection.h | 2 +- src/lib/gui/core/CommandProcess.h | 4 ++-- src/lib/gui/core/CoreProcess.h | 4 ++-- src/lib/gui/core/ServerConnection.h | 2 +- src/lib/gui/dialogs/ActionDialog.h | 2 +- src/lib/gui/dialogs/AddClientDialog.h | 2 +- src/lib/gui/dialogs/FingerprintDialog.h | 2 +- src/lib/gui/dialogs/HotkeyDialog.h | 2 +- src/lib/gui/dialogs/ScreenSettingsDialog.h | 4 ++-- src/lib/gui/dialogs/ServerConfigDialog.h | 6 +++--- src/lib/gui/dialogs/SettingsDialog.h | 2 +- src/lib/gui/ipc/DaemonIpcClient.h | 4 ++-- src/lib/gui/proxy/QProcessProxy.h | 2 +- src/lib/gui/widgets/KeySequenceWidget.h | 2 +- src/lib/gui/widgets/TrashScreenWidget.h | 2 +- src/unittests/arch/ArchStringTests.h | 2 +- src/unittests/base/PathTests.h | 2 +- src/unittests/base/StringTests.h | 2 +- src/unittests/base/UnicodeTests.h | 2 +- src/unittests/base/XBaseTests.h | 2 +- src/unittests/common/SettingsTests.h | 2 +- src/unittests/deskflow/ArgParserTests.h | 2 +- src/unittests/deskflow/ClipboardChunksTests.h | 2 +- src/unittests/deskflow/ClipboardTests.h | 2 +- src/unittests/deskflow/ConfigTests.h | 2 +- src/unittests/deskflow/IKeyStateTests.h | 2 +- src/unittests/deskflow/KeyMapTests.h | 2 +- src/unittests/deskflow/LanguageManagerTests.h | 2 +- src/unittests/deskflow/ServerAppTests.h | 2 +- src/unittests/deskflow/X11LayoutParserTests.h | 2 +- src/unittests/gui/DotEnvTests.h | 2 +- src/unittests/gui/LoggerTests.h | 2 +- src/unittests/gui/config/ScreenTests.h | 2 +- src/unittests/gui/core/CommandProcessTests.h | 2 +- src/unittests/net/FingerprintDatabaseTests.h | 2 +- src/unittests/net/FingerprintTests.h | 2 +- src/unittests/net/SecureUtilsTests.h | 2 +- src/unittests/platform/MSWindowsClipboardTests.h | 2 +- src/unittests/platform/OSXClipboardTests.h | 2 +- src/unittests/platform/OSXKeyStateTests.h | 2 +- src/unittests/platform/XWindowsClipboardTests.h | 2 +- src/unittests/server/ServerConfigTests.h | 2 +- src/unittests/server/ServerTests.h | 2 +- 53 files changed, 72 insertions(+), 66 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4150efeba..04c8a4dea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,6 +144,10 @@ endif() set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib") +# disables the use of signals,slots and emit +# Instead use Q_SIGNAL, Q_SLOT and Q_EMIT +# prevents issues when used with glib for libportal +add_definitions(-DQT_NO_KEYWORDS) include(cmake/Libraries.cmake) include(GNUInstallDirs) diff --git a/src/lib/common/Settings.h b/src/lib/common/Settings.h index 4a1e5d154..2d5f8490f 100644 --- a/src/lib/common/Settings.h +++ b/src/lib/common/Settings.h @@ -129,7 +129,7 @@ public: static void save(bool emitSaving = true); static const QStringList validKeys(); -signals: +Q_SIGNALS: void settingsChanged(const QString key); void serverSettingsChanged(); diff --git a/src/lib/deskflow/ipc/DaemonIpcServer.h b/src/lib/deskflow/ipc/DaemonIpcServer.h index 1bc95716c..2495b0a02 100644 --- a/src/lib/deskflow/ipc/DaemonIpcServer.h +++ b/src/lib/deskflow/ipc/DaemonIpcServer.h @@ -24,7 +24,7 @@ public: void listen(); -signals: +Q_SIGNALS: void logLevelChanged(const QString &logLevel); void elevateModeChanged(bool elevate); void commandChanged(const QString &command); @@ -38,7 +38,7 @@ private: void processElevate(QLocalSocket *&clientSocket, const QStringList &messageParts); void processCommand(QLocalSocket *&clientSocket, const QStringList &messageParts); -private slots: +private Q_SLOTS: void handleNewConnection(); void handleReadyRead(); void handleDisconnected(); diff --git a/src/lib/deskflow/unix/AppUtilUnix.cpp b/src/lib/deskflow/unix/AppUtilUnix.cpp index 530597d43..d0f11e8e7 100644 --- a/src/lib/deskflow/unix/AppUtilUnix.cpp +++ b/src/lib/deskflow/unix/AppUtilUnix.cpp @@ -7,8 +7,10 @@ #include "deskflow/unix/AppUtilUnix.h" #include "deskflow/ArgsBase.h" -#include -#include + +#include "base/Log.h" +#include "base/LogOutputters.h" +#include "common/Constants.h" #if WINAPI_XWINDOWS #include "deskflow/unix/X11LayoutsParser.h" @@ -19,9 +21,9 @@ #else #error Platform not supported. #endif -#include "base/Log.h" -#include "base/LogOutputters.h" -#include "common/Constants.h" + +#include +#include AppUtilUnix::AppUtilUnix(const IEventQueue *events) { diff --git a/src/lib/gui/DataDownloader.h b/src/lib/gui/DataDownloader.h index 9b9b58ff4..e1c5c7b22 100644 --- a/src/lib/gui/DataDownloader.h +++ b/src/lib/gui/DataDownloader.h @@ -28,10 +28,10 @@ public: return m_IsFinished; } -signals: +Q_SIGNALS: void isComplete(); -private slots: +private Q_SLOTS: void complete(QNetworkReply *reply); private: diff --git a/src/lib/gui/FileTail.h b/src/lib/gui/FileTail.h index 7cd51fc8e..125d2d2d4 100644 --- a/src/lib/gui/FileTail.h +++ b/src/lib/gui/FileTail.h @@ -20,10 +20,10 @@ class FileTail : public QObject public: FileTail(const QString &filePath, QObject *parent = nullptr); -signals: +Q_SIGNALS: void newLine(const QString &line); -private slots: +private Q_SLOTS: void handleFileChanged(const QString &); private: diff --git a/src/lib/gui/Logger.h b/src/lib/gui/Logger.h index b54c9f03d..ee469ed2c 100644 --- a/src/lib/gui/Logger.h +++ b/src/lib/gui/Logger.h @@ -30,7 +30,7 @@ public: void handleMessage(const QtMsgType type, const QString &fileLine, const QString &message); void logVerbose(const QString &message) const; -signals: +Q_SIGNALS: void newLine(const QString &line); private: diff --git a/src/lib/gui/MainWindow.h b/src/lib/gui/MainWindow.h index 11095ebe5..aa2e3e756 100644 --- a/src/lib/gui/MainWindow.h +++ b/src/lib/gui/MainWindow.h @@ -88,7 +88,7 @@ public: void hide(); -signals: +Q_SIGNALS: void shown(); private: diff --git a/src/lib/gui/ScreenSetupModel.h b/src/lib/gui/ScreenSetupModel.h index ee31c239f..6195f6928 100644 --- a/src/lib/gui/ScreenSetupModel.h +++ b/src/lib/gui/ScreenSetupModel.h @@ -55,7 +55,7 @@ public: QMimeData *mimeData(const QModelIndexList &indexes) const override; bool isFull() const; -signals: +Q_SIGNALS: void screensChanged(); protected: diff --git a/src/lib/gui/VersionChecker.h b/src/lib/gui/VersionChecker.h index 7c014ae22..b0edf9af4 100644 --- a/src/lib/gui/VersionChecker.h +++ b/src/lib/gui/VersionChecker.h @@ -19,9 +19,9 @@ class VersionChecker : public QObject public: explicit VersionChecker(QObject *parent = nullptr); void checkLatest() const; -public slots: +public Q_SLOTS: void replyFinished(QNetworkReply *reply); -signals: +Q_SIGNALS: void updateFound(const QString &version); private: diff --git a/src/lib/gui/core/ClientConnection.h b/src/lib/gui/core/ClientConnection.h index 96a1a5dc4..84c80dd3c 100644 --- a/src/lib/gui/core/ClientConnection.h +++ b/src/lib/gui/core/ClientConnection.h @@ -41,7 +41,7 @@ public: m_showMessage = true; } -signals: +Q_SIGNALS: void messageShowing(); private: diff --git a/src/lib/gui/core/CommandProcess.h b/src/lib/gui/core/CommandProcess.h index d817a8cef..87d926d7c 100644 --- a/src/lib/gui/core/CommandProcess.h +++ b/src/lib/gui/core/CommandProcess.h @@ -16,10 +16,10 @@ class CommandProcess : public QObject public: CommandProcess(QString cmd, QStringList arguments, QString input = ""); -signals: +Q_SIGNALS: void finished(); -public slots: +public Q_SLOTS: QString run(); private: diff --git a/src/lib/gui/core/CoreProcess.h b/src/lib/gui/core/CoreProcess.h index 7c3c588c5..da00129cf 100644 --- a/src/lib/gui/core/CoreProcess.h +++ b/src/lib/gui/core/CoreProcess.h @@ -113,7 +113,7 @@ public: m_mode = mode; } -signals: +Q_SIGNALS: void starting(); void error(Error error); void logLine(const QString &line); @@ -122,7 +122,7 @@ signals: void secureSocket(bool enabled); void daemonIpcClientConnectionFailed(); -private slots: +private Q_SLOTS: void onProcessFinished(int exitCode, QProcess::ExitStatus); void onProcessReadyReadStandardOutput(); void onProcessReadyReadStandardError(); diff --git a/src/lib/gui/core/ServerConnection.h b/src/lib/gui/core/ServerConnection.h index 220b01077..1544aace8 100644 --- a/src/lib/gui/core/ServerConnection.h +++ b/src/lib/gui/core/ServerConnection.h @@ -32,7 +32,7 @@ public: ); void handleLogLine(const QString &logLine); -signals: +Q_SIGNALS: void messageShowing(); void configureClient(const QString &clientName); diff --git a/src/lib/gui/dialogs/ActionDialog.h b/src/lib/gui/dialogs/ActionDialog.h index 07bb80e9b..da0cd156f 100644 --- a/src/lib/gui/dialogs/ActionDialog.h +++ b/src/lib/gui/dialogs/ActionDialog.h @@ -38,7 +38,7 @@ public: ActionDialog(QWidget *parent, const ServerConfig &config, Hotkey &hotkey, Action &action); ~ActionDialog() override; -protected slots: +protected Q_SLOTS: void accept() override; private: diff --git a/src/lib/gui/dialogs/AddClientDialog.h b/src/lib/gui/dialogs/AddClientDialog.h index a074f2608..c2c3db576 100644 --- a/src/lib/gui/dialogs/AddClientDialog.h +++ b/src/lib/gui/dialogs/AddClientDialog.h @@ -37,7 +37,7 @@ public: return m_AddResult; } -private slots: +private Q_SLOTS: void handleButtonLeft(); void handleButtonUp(); void handleButtonRight(); diff --git a/src/lib/gui/dialogs/FingerprintDialog.h b/src/lib/gui/dialogs/FingerprintDialog.h index 8f104c1cd..9cc73d383 100644 --- a/src/lib/gui/dialogs/FingerprintDialog.h +++ b/src/lib/gui/dialogs/FingerprintDialog.h @@ -32,7 +32,7 @@ public: ); ~FingerprintDialog() override = default; -signals: +Q_SIGNALS: void requestLocalPrintsDialog(); private: diff --git a/src/lib/gui/dialogs/HotkeyDialog.h b/src/lib/gui/dialogs/HotkeyDialog.h index 106a7b9fb..dc9abe6a4 100644 --- a/src/lib/gui/dialogs/HotkeyDialog.h +++ b/src/lib/gui/dialogs/HotkeyDialog.h @@ -31,7 +31,7 @@ public: return m_Hotkey; } -protected slots: +protected Q_SLOTS: void accept() override; protected: diff --git a/src/lib/gui/dialogs/ScreenSettingsDialog.h b/src/lib/gui/dialogs/ScreenSettingsDialog.h index 6c37c8e5f..8c4141ee1 100644 --- a/src/lib/gui/dialogs/ScreenSettingsDialog.h +++ b/src/lib/gui/dialogs/ScreenSettingsDialog.h @@ -27,10 +27,10 @@ public: ScreenSettingsDialog(QWidget *parent, Screen *pScreen = nullptr, const ScreenList *pScreens = nullptr); ~ScreenSettingsDialog() override; -public slots: +public Q_SLOTS: void accept() override; -private slots: +private Q_SLOTS: void on_m_pButtonAddAlias_clicked(); void on_m_pButtonRemoveAlias_clicked(); void on_m_pLineEditAlias_textChanged(const QString &text); diff --git a/src/lib/gui/dialogs/ServerConfigDialog.h b/src/lib/gui/dialogs/ServerConfigDialog.h index 1ce275c44..c0ae983b5 100644 --- a/src/lib/gui/dialogs/ServerConfigDialog.h +++ b/src/lib/gui/dialogs/ServerConfigDialog.h @@ -28,7 +28,7 @@ public: ~ServerConfigDialog() override; bool addClient(const QString &clientName); -public slots: +public Q_SLOTS: void accept() override; void reject() override; void message(const QString &message) @@ -36,7 +36,7 @@ public slots: m_Message = message; } -protected slots: +protected Q_SLOTS: void onScreenRemoved(); protected: @@ -102,6 +102,6 @@ private: ScreenSetupModel m_ScreenSetupModel; QString m_Message = ""; -private slots: +private Q_SLOTS: void onChange(); }; diff --git a/src/lib/gui/dialogs/SettingsDialog.h b/src/lib/gui/dialogs/SettingsDialog.h index 7ad0c99af..d09873526 100644 --- a/src/lib/gui/dialogs/SettingsDialog.h +++ b/src/lib/gui/dialogs/SettingsDialog.h @@ -30,7 +30,7 @@ public: SettingsDialog(QWidget *parent, const IServerConfig &serverConfig, const CoreProcess &coreProcess); ~SettingsDialog() override; -signals: +Q_SIGNALS: void shown(); private: diff --git a/src/lib/gui/ipc/DaemonIpcClient.h b/src/lib/gui/ipc/DaemonIpcClient.h index 2d1cae0a4..d5e4ee0f6 100644 --- a/src/lib/gui/ipc/DaemonIpcClient.h +++ b/src/lib/gui/ipc/DaemonIpcClient.h @@ -40,11 +40,11 @@ public: return m_state == State::Connected; } -signals: +Q_SIGNALS: void connected(); void connectionFailed(); -private slots: +private Q_SLOTS: void handleDisconnected(); void handleErrorOccurred(); diff --git a/src/lib/gui/proxy/QProcessProxy.h b/src/lib/gui/proxy/QProcessProxy.h index 798d9e1dd..f18b81e21 100644 --- a/src/lib/gui/proxy/QProcessProxy.h +++ b/src/lib/gui/proxy/QProcessProxy.h @@ -26,7 +26,7 @@ public: virtual QString readAllStandardOutput(); virtual QString readAllStandardError(); -signals: +Q_SIGNALS: void finished(int exitCode, QProcess::ExitStatus exitStatus); void readyReadStandardOutput(); void readyReadStandardError(); diff --git a/src/lib/gui/widgets/KeySequenceWidget.h b/src/lib/gui/widgets/KeySequenceWidget.h index 7de4e80e8..ec5d2573e 100644 --- a/src/lib/gui/widgets/KeySequenceWidget.h +++ b/src/lib/gui/widgets/KeySequenceWidget.h @@ -18,7 +18,7 @@ class KeySequenceWidget : public QPushButton public: KeySequenceWidget(QWidget *parent, const KeySequence &seq = KeySequence()); -signals: +Q_SIGNALS: void keySequenceChanged(); public: diff --git a/src/lib/gui/widgets/TrashScreenWidget.h b/src/lib/gui/widgets/TrashScreenWidget.h index a5bf4c45b..590cd5672 100644 --- a/src/lib/gui/widgets/TrashScreenWidget.h +++ b/src/lib/gui/widgets/TrashScreenWidget.h @@ -27,6 +27,6 @@ public: void dragEnterEvent(QDragEnterEvent *event) override; void dropEvent(QDropEvent *event) override; -signals: +Q_SIGNALS: void screenRemoved(); }; diff --git a/src/unittests/arch/ArchStringTests.h b/src/unittests/arch/ArchStringTests.h index 28bd02f33..1e2adade9 100644 --- a/src/unittests/arch/ArchStringTests.h +++ b/src/unittests/arch/ArchStringTests.h @@ -11,7 +11,7 @@ class ArchStringTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); // Test are run in order top to bottom void convertStringWCToMB_buffer(); diff --git a/src/unittests/base/PathTests.h b/src/unittests/base/PathTests.h index 6184ed9a1..c10609817 100644 --- a/src/unittests/base/PathTests.h +++ b/src/unittests/base/PathTests.h @@ -9,7 +9,7 @@ class PathTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void testOpen(); }; diff --git a/src/unittests/base/StringTests.h b/src/unittests/base/StringTests.h index 80fc834e1..c9164982d 100644 --- a/src/unittests/base/StringTests.h +++ b/src/unittests/base/StringTests.h @@ -9,7 +9,7 @@ class StringTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void formatWithArgs(); void formatedString(); void intToString(); diff --git a/src/unittests/base/UnicodeTests.h b/src/unittests/base/UnicodeTests.h index 15bba08a0..7647f055c 100644 --- a/src/unittests/base/UnicodeTests.h +++ b/src/unittests/base/UnicodeTests.h @@ -11,7 +11,7 @@ class UnicodeTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void UTF32ToUTF8(); void UTF16ToUTF8(); diff --git a/src/unittests/base/XBaseTests.h b/src/unittests/base/XBaseTests.h index f301677dd..f96071879 100644 --- a/src/unittests/base/XBaseTests.h +++ b/src/unittests/base/XBaseTests.h @@ -9,7 +9,7 @@ class XBaseTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void empty(); void nonEmpty(); }; diff --git a/src/unittests/common/SettingsTests.h b/src/unittests/common/SettingsTests.h index 50d00a0cf..d408504a6 100644 --- a/src/unittests/common/SettingsTests.h +++ b/src/unittests/common/SettingsTests.h @@ -11,7 +11,7 @@ class SettingsTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); // Test are run in order top to bottom void setSettingsFile(); diff --git a/src/unittests/deskflow/ArgParserTests.h b/src/unittests/deskflow/ArgParserTests.h index 975a4bbe7..d4d122633 100644 --- a/src/unittests/deskflow/ArgParserTests.h +++ b/src/unittests/deskflow/ArgParserTests.h @@ -12,7 +12,7 @@ class ArgParserTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); // Test are run in order top to bottom void isArg(); diff --git a/src/unittests/deskflow/ClipboardChunksTests.h b/src/unittests/deskflow/ClipboardChunksTests.h index 68ac88d63..4f249c1cf 100644 --- a/src/unittests/deskflow/ClipboardChunksTests.h +++ b/src/unittests/deskflow/ClipboardChunksTests.h @@ -9,7 +9,7 @@ class ClipboardChunksTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: // Test are run in order top to bottom void startFormatData(); void formatDataChunk(); diff --git a/src/unittests/deskflow/ClipboardTests.h b/src/unittests/deskflow/ClipboardTests.h index af3d83ef6..aabbbd059 100644 --- a/src/unittests/deskflow/ClipboardTests.h +++ b/src/unittests/deskflow/ClipboardTests.h @@ -11,7 +11,7 @@ class ClipboardTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: // Test are run in order top to bottom void initTestCase(); void basicFunction(); diff --git a/src/unittests/deskflow/ConfigTests.h b/src/unittests/deskflow/ConfigTests.h index a3a64b88e..c66d5dd8b 100644 --- a/src/unittests/deskflow/ConfigTests.h +++ b/src/unittests/deskflow/ConfigTests.h @@ -11,7 +11,7 @@ class ConfigTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: // Test are run in order top to bottom void initTestCase(); void loadFile(); diff --git a/src/unittests/deskflow/IKeyStateTests.h b/src/unittests/deskflow/IKeyStateTests.h index bf19e2f49..6fb545c3e 100644 --- a/src/unittests/deskflow/IKeyStateTests.h +++ b/src/unittests/deskflow/IKeyStateTests.h @@ -11,7 +11,7 @@ class IKeyStateTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void allocDestination(); private: diff --git a/src/unittests/deskflow/KeyMapTests.h b/src/unittests/deskflow/KeyMapTests.h index cd04eb098..beece9395 100644 --- a/src/unittests/deskflow/KeyMapTests.h +++ b/src/unittests/deskflow/KeyMapTests.h @@ -11,7 +11,7 @@ namespace deskflow { class KeyMapTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void findBestKey_requiredDown_matchExactFirstItem(); void findBestKey_requiredAndExtraSensitiveDown_matchExactFirstItem(); void findBestKey_requiredAndExtraSensitiveDown_matchExactSecondItem(); diff --git a/src/unittests/deskflow/LanguageManagerTests.h b/src/unittests/deskflow/LanguageManagerTests.h index 88bfe5f09..f4b1f097a 100644 --- a/src/unittests/deskflow/LanguageManagerTests.h +++ b/src/unittests/deskflow/LanguageManagerTests.h @@ -11,7 +11,7 @@ class LanguageManagerTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); // Test are run in order top to bottom void remoteLanguages(); diff --git a/src/unittests/deskflow/ServerAppTests.h b/src/unittests/deskflow/ServerAppTests.h index 1f421fb48..7942a2d6f 100644 --- a/src/unittests/deskflow/ServerAppTests.h +++ b/src/unittests/deskflow/ServerAppTests.h @@ -9,7 +9,7 @@ class ServerAppTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: // Test are run in order top to bottom void version(); }; diff --git a/src/unittests/deskflow/X11LayoutParserTests.h b/src/unittests/deskflow/X11LayoutParserTests.h index 801718025..36c68e4e4 100644 --- a/src/unittests/deskflow/X11LayoutParserTests.h +++ b/src/unittests/deskflow/X11LayoutParserTests.h @@ -11,7 +11,7 @@ class X11LayoutParserTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: // Test are run in order top to bottom void initTestCase(); void xmlParse(); diff --git a/src/unittests/gui/DotEnvTests.h b/src/unittests/gui/DotEnvTests.h index b2429a5e7..83ed7da1c 100644 --- a/src/unittests/gui/DotEnvTests.h +++ b/src/unittests/gui/DotEnvTests.h @@ -9,7 +9,7 @@ class DotEnvTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: // Test are run in order top to bottom void initTestCase(); void invalidFile(); diff --git a/src/unittests/gui/LoggerTests.h b/src/unittests/gui/LoggerTests.h index 5fb80ef90..77d5aa160 100644 --- a/src/unittests/gui/LoggerTests.h +++ b/src/unittests/gui/LoggerTests.h @@ -9,7 +9,7 @@ class LoggerTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: // Test are run in order top to bottom void newLine(); void noNewLine(); diff --git a/src/unittests/gui/config/ScreenTests.h b/src/unittests/gui/config/ScreenTests.h index b92c98e62..85c131473 100644 --- a/src/unittests/gui/config/ScreenTests.h +++ b/src/unittests/gui/config/ScreenTests.h @@ -9,7 +9,7 @@ class ScreenTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: // Test are run in order top to bottom void initTestCase(); void basicFunctionality(); diff --git a/src/unittests/gui/core/CommandProcessTests.h b/src/unittests/gui/core/CommandProcessTests.h index c2edfa28a..a683b6bef 100644 --- a/src/unittests/gui/core/CommandProcessTests.h +++ b/src/unittests/gui/core/CommandProcessTests.h @@ -9,7 +9,7 @@ class CommandProcessTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: // Test are run in order top to bottom // void initTestCase(); void runCommand(); diff --git a/src/unittests/net/FingerprintDatabaseTests.h b/src/unittests/net/FingerprintDatabaseTests.h index d7bfd4e19..88e61683a 100644 --- a/src/unittests/net/FingerprintDatabaseTests.h +++ b/src/unittests/net/FingerprintDatabaseTests.h @@ -9,7 +9,7 @@ class FingerprintDatabaseTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void readFile(); void writeFile(); void clear(); diff --git a/src/unittests/net/FingerprintTests.h b/src/unittests/net/FingerprintTests.h index 3c72f4f09..d8f4575cd 100644 --- a/src/unittests/net/FingerprintTests.h +++ b/src/unittests/net/FingerprintTests.h @@ -9,7 +9,7 @@ class FingerprintTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void test_isValid(); void test_toDbLine(); void test_fromDbLine(); diff --git a/src/unittests/net/SecureUtilsTests.h b/src/unittests/net/SecureUtilsTests.h index 1ac5eaa45..50a3fc202 100644 --- a/src/unittests/net/SecureUtilsTests.h +++ b/src/unittests/net/SecureUtilsTests.h @@ -9,7 +9,7 @@ class SecureUtilsTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void checkHex(); void checkArt(); }; diff --git a/src/unittests/platform/MSWindowsClipboardTests.h b/src/unittests/platform/MSWindowsClipboardTests.h index e4a739cf6..4fd990001 100644 --- a/src/unittests/platform/MSWindowsClipboardTests.h +++ b/src/unittests/platform/MSWindowsClipboardTests.h @@ -11,7 +11,7 @@ class MSWindowsClipboardTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: // Test are run in order top to bottom void initTestCase(); void cleanupTestCase(); diff --git a/src/unittests/platform/OSXClipboardTests.h b/src/unittests/platform/OSXClipboardTests.h index bbc956978..11c21280f 100644 --- a/src/unittests/platform/OSXClipboardTests.h +++ b/src/unittests/platform/OSXClipboardTests.h @@ -10,7 +10,7 @@ class OSXClipboardTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: // Test are run in order top to bottom void open(); void singleFormat(); diff --git a/src/unittests/platform/OSXKeyStateTests.h b/src/unittests/platform/OSXKeyStateTests.h index acdda8e80..8e539ced4 100644 --- a/src/unittests/platform/OSXKeyStateTests.h +++ b/src/unittests/platform/OSXKeyStateTests.h @@ -12,7 +12,7 @@ class OSXKeyStateTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); // Test are run in order top to bottom void mapModifiersFromOSX_OSXMask(); diff --git a/src/unittests/platform/XWindowsClipboardTests.h b/src/unittests/platform/XWindowsClipboardTests.h index 483c76632..8f406f4c9 100644 --- a/src/unittests/platform/XWindowsClipboardTests.h +++ b/src/unittests/platform/XWindowsClipboardTests.h @@ -15,7 +15,7 @@ class XWindowsClipboardTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: // Test are run in order top to bottom void defaultCtor(); // Tests only work on X Windows diff --git a/src/unittests/server/ServerConfigTests.h b/src/unittests/server/ServerConfigTests.h index 294b5c453..4bb2cf3a2 100644 --- a/src/unittests/server/ServerConfigTests.h +++ b/src/unittests/server/ServerConfigTests.h @@ -9,7 +9,7 @@ class ServerConfigTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void equalityCheck(); void equalityCheck_diff_options(); void equalityCheck_diff_alias(); diff --git a/src/unittests/server/ServerTests.h b/src/unittests/server/ServerTests.h index 43cf5e7b6..86ddd91b1 100644 --- a/src/unittests/server/ServerTests.h +++ b/src/unittests/server/ServerTests.h @@ -9,7 +9,7 @@ class ServerTests : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void SwitchToScreenInfo_alloc_screen(); void KeyboardBroadcastInfo_alloc_stateAndSceens(); };