From 4f733a3316af9cd2e9bea0f448d4b010b8222c0f Mon Sep 17 00:00:00 2001 From: Mentalflow <312902918@qq.com> Date: Thu, 4 Jan 2024 00:40:01 +0800 Subject: [PATCH] Libsource: Improve singleton. --- lib_source/ribbontheme.h | 2 +- lib_source/ribbonui.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib_source/ribbontheme.h b/lib_source/ribbontheme.h index e1f32dd..e10a771 100644 --- a/lib_source/ribbontheme.h +++ b/lib_source/ribbontheme.h @@ -10,7 +10,6 @@ class RibbonTheme : public QQuickItem QML_ELEMENT QML_SINGLETON QML_NAMED_ELEMENT(RibbonTheme) - Q_DISABLE_COPY(RibbonTheme) Q_PROPERTY(bool dark_mode READ dark_mode() NOTIFY dark_modeChanged FINAL) Q_PROPERTY_RW(RibbonThemeType::ThemeMode,theme_mode) @@ -22,6 +21,7 @@ public: bool dark_mode(); private: RibbonTheme(); + Q_DISABLE_COPY_MOVE(RibbonTheme) bool eventFilter(QObject *obj, QEvent *event); RibbonThemeType::ThemeMode current_theme(); RibbonThemeType::ThemeMode _system_theme_mode; diff --git a/lib_source/ribbonui.h b/lib_source/ribbonui.h index c0a9dd6..b921794 100644 --- a/lib_source/ribbonui.h +++ b/lib_source/ribbonui.h @@ -10,13 +10,13 @@ class RibbonUI : public QQuickItem QML_ELEMENT QML_SINGLETON QML_NAMED_ELEMENT(RibbonUI) - Q_DISABLE_COPY(RibbonUI) Q_PROPERTY_RW(QString, version) public: static RibbonUI* instance(); static RibbonUI* create(QQmlEngine *qmlEngine, QJSEngine *jsEngine){return instance();} private: explicit RibbonUI(QQuickItem *parent = nullptr); + Q_DISABLE_COPY_MOVE(RibbonUI) }; #endif // RIBBONUI_H