From 4f2b90147eaaa96577947455d846937030130988 Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Sat, 11 Apr 2026 20:16:37 +1000 Subject: [PATCH] fix: signal and emit macros -> keywords Only the ones inside macros are unable to use the keywords --- plugin/src/Caelestia/Config/appearanceconfig.hpp | 15 ++++++++++----- plugin/src/Caelestia/Config/config.hpp | 3 ++- plugin/src/Caelestia/Config/configobject.cpp | 12 ++++++------ plugin/src/Caelestia/Config/configobject.hpp | 12 +++++++----- plugin/src/Caelestia/Config/configscope.cpp | 6 +++--- plugin/src/Caelestia/Config/configscope.hpp | 7 ++++--- plugin/src/Caelestia/Config/tokens.hpp | 3 ++- 7 files changed, 34 insertions(+), 24 deletions(-) diff --git a/plugin/src/Caelestia/Config/appearanceconfig.hpp b/plugin/src/Caelestia/Config/appearanceconfig.hpp index db395e82..c13d0779 100644 --- a/plugin/src/Caelestia/Config/appearanceconfig.hpp +++ b/plugin/src/Caelestia/Config/appearanceconfig.hpp @@ -35,7 +35,8 @@ public: [[nodiscard]] int large() const; [[nodiscard]] int full() const; - Q_SIGNAL void valuesChanged(); +signals: + void valuesChanged(); private: RoundingTokens* m_tokens = nullptr; @@ -65,7 +66,8 @@ public: [[nodiscard]] int larger() const; [[nodiscard]] int large() const; - Q_SIGNAL void valuesChanged(); +signals: + void valuesChanged(); private: SpacingTokens* m_tokens = nullptr; @@ -95,7 +97,8 @@ public: [[nodiscard]] int larger() const; [[nodiscard]] int large() const; - Q_SIGNAL void valuesChanged(); +signals: + void valuesChanged(); private: PaddingTokens* m_tokens = nullptr; @@ -141,7 +144,8 @@ public: [[nodiscard]] int large() const; [[nodiscard]] int extraLarge() const; - Q_SIGNAL void valuesChanged(); +signals: + void valuesChanged(); private: FontSizeTokens* m_tokens = nullptr; @@ -189,7 +193,8 @@ public: [[nodiscard]] int expressiveDefaultSpatial() const; [[nodiscard]] int expressiveSlowSpatial() const; - Q_SIGNAL void valuesChanged(); +signals: + void valuesChanged(); private: AnimDurationTokens* m_tokens = nullptr; diff --git a/plugin/src/Caelestia/Config/config.hpp b/plugin/src/Caelestia/Config/config.hpp index 2218e753..ddced131 100644 --- a/plugin/src/Caelestia/Config/config.hpp +++ b/plugin/src/Caelestia/Config/config.hpp @@ -116,7 +116,8 @@ public: static Config* qmlAttachedProperties(QObject* object); - Q_SIGNAL void sourceChanged(); +signals: + void sourceChanged(); private: void connectScope(); diff --git a/plugin/src/Caelestia/Config/configobject.cpp b/plugin/src/Caelestia/Config/configobject.cpp index 93736837..8103b896 100644 --- a/plugin/src/Caelestia/Config/configobject.cpp +++ b/plugin/src/Caelestia/Config/configobject.cpp @@ -276,7 +276,7 @@ void ConfigObject::emitBatchedChanges() { auto changes = std::move(m_pendingChanges); m_pendingChanges.clear(); - Q_EMIT propertiesChanged(changes); + emit propertiesChanged(changes); } void ConfigObject::setupFileBackend(const QString& path) { @@ -300,14 +300,14 @@ void ConfigObject::setupFileBackend(const QString& path) { if (!file.open(QIODevice::WriteOnly)) { qCWarning(lcConfig, "Failed to write %s", qUtf8Printable(m_filePath)); if (auto* root = qobject_cast(this)) - Q_EMIT root->fileSaveFailed(QStringLiteral("Failed to open file for writing")); + emit root->fileSaveFailed(QStringLiteral("Failed to open file for writing")); return; } auto json = m_sparse ? toSparseJsonObject() : toJsonObject(); file.write(QJsonDocument(json).toJson(QJsonDocument::Indented)); if (auto* root = qobject_cast(this)) - Q_EMIT root->fileSaved(); + emit root->fileSaved(); }); m_cooldownTimer->setSingleShot(true); @@ -387,9 +387,9 @@ void ConfigObject::onFileChanged() { bool ok = reloadFromFile(); if (auto* root = qobject_cast(this)) { if (ok) - Q_EMIT root->fileLoaded(); + emit root->fileLoaded(); else - Q_EMIT root->fileLoadFailed(QStringLiteral("Failed to load config file")); + emit root->fileLoadFailed(QStringLiteral("Failed to load config file")); } } } @@ -405,7 +405,7 @@ void RootConfig::save() { void RootConfig::reload() { if (reloadFromFile()) - Q_EMIT fileLoaded(); + emit fileLoaded(); } } // namespace caelestia::config diff --git a/plugin/src/Caelestia/Config/configobject.hpp b/plugin/src/Caelestia/Config/configobject.hpp index f9607fa7..f0420441 100644 --- a/plugin/src/Caelestia/Config/configobject.hpp +++ b/plugin/src/Caelestia/Config/configobject.hpp @@ -87,7 +87,8 @@ public: return true; } - Q_SIGNAL void propertiesChanged(const QMap& changed); +signals: + void propertiesChanged(const QMap& changed); protected: void notifyPropertyChanged(const QString& name, const QVariant& value); @@ -126,10 +127,11 @@ public: Q_INVOKABLE void save(); Q_INVOKABLE void reload(); - Q_SIGNAL void fileLoaded(); - Q_SIGNAL void fileLoadFailed(const QString& error); - Q_SIGNAL void fileSaved(); - Q_SIGNAL void fileSaveFailed(const QString& error); +signals: + void fileLoaded(); + void fileLoadFailed(const QString& error); + void fileSaved(); + void fileSaveFailed(const QString& error); }; } // namespace caelestia::config diff --git a/plugin/src/Caelestia/Config/configscope.cpp b/plugin/src/Caelestia/Config/configscope.cpp index 7b2074e3..6f20f05d 100644 --- a/plugin/src/Caelestia/Config/configscope.cpp +++ b/plugin/src/Caelestia/Config/configscope.cpp @@ -11,7 +11,7 @@ void ConfigScope::setScreen(const QString& screen) { return; m_screen = screen; - Q_EMIT screenChanged(); + emit screenChanged(); resolveConfig(); } @@ -28,12 +28,12 @@ void ConfigScope::resolveConfig() { if (m_config != newConfig) { m_config = newConfig; - Q_EMIT configChanged(); + emit configChanged(); } if (m_tokens != newTokens) { m_tokens = newTokens; - Q_EMIT tokensChanged(); + emit tokensChanged(); } } diff --git a/plugin/src/Caelestia/Config/configscope.hpp b/plugin/src/Caelestia/Config/configscope.hpp index 53ff5426..202cf48a 100644 --- a/plugin/src/Caelestia/Config/configscope.hpp +++ b/plugin/src/Caelestia/Config/configscope.hpp @@ -31,9 +31,10 @@ public: static ConfigScope* find(QObject* object); - Q_SIGNAL void screenChanged(); - Q_SIGNAL void configChanged(); - Q_SIGNAL void tokensChanged(); +signals: + void screenChanged(); + void configChanged(); + void tokensChanged(); private: void resolveConfig(); diff --git a/plugin/src/Caelestia/Config/tokens.hpp b/plugin/src/Caelestia/Config/tokens.hpp index 53c4a707..b8b4ab79 100644 --- a/plugin/src/Caelestia/Config/tokens.hpp +++ b/plugin/src/Caelestia/Config/tokens.hpp @@ -363,7 +363,8 @@ public: static Tokens* qmlAttachedProperties(QObject* object); - Q_SIGNAL void sourceChanged(); +signals: + void sourceChanged(); private: void connectScope();