diff --git a/example/src/AppInfo.h b/example/src/AppInfo.h index 71fc3a10..4754f1a2 100644 --- a/example/src/AppInfo.h +++ b/example/src/AppInfo.h @@ -13,6 +13,6 @@ class AppInfo : public QObject { explicit AppInfo(QObject *parent = nullptr); public: - SINGLETON(AppInfo) + EXAMPLESINGLETON(AppInfo) [[maybe_unused]] Q_INVOKABLE void testCrash(); }; diff --git a/example/src/helper/InitializrHelper.h b/example/src/helper/InitializrHelper.h index 51f559c0..b8776041 100644 --- a/example/src/helper/InitializrHelper.h +++ b/example/src/helper/InitializrHelper.h @@ -15,7 +15,7 @@ private: void templateToFile(const QString &source, const QString &dest, Args &&...args); public: - SINGLETON(InitializrHelper) + EXAMPLESINGLETON(InitializrHelper) ~InitializrHelper() override; [[maybe_unused]] Q_INVOKABLE void generate(const QString &name, const QString &path); Q_SIGNAL void error(const QString &message); diff --git a/example/src/helper/Network.h b/example/src/helper/Network.h index cf4cfb38..62080284 100644 --- a/example/src/helper/Network.h +++ b/example/src/helper/Network.h @@ -144,7 +144,7 @@ private: explicit Network(QObject *parent = nullptr); public: - SINGLETON(Network) + EXAMPLESINGLETON(Network) static Network *create(QQmlEngine *qmlEngine, QJSEngine *jsEngine) { return getInstance(); diff --git a/example/src/helper/SettingsHelper.h b/example/src/helper/SettingsHelper.h index a8917570..98f78735 100644 --- a/example/src/helper/SettingsHelper.h +++ b/example/src/helper/SettingsHelper.h @@ -15,7 +15,7 @@ private: explicit SettingsHelper(QObject *parent = nullptr); public: - SINGLETON(SettingsHelper) + EXAMPLESINGLETON(SettingsHelper) ~SettingsHelper() override; void init(char *argv[]); Q_INVOKABLE void saveDarkMode(int darkModel) { diff --git a/example/src/helper/TranslateHelper.h b/example/src/helper/TranslateHelper.h index 7e7a73e5..36e58e5e 100644 --- a/example/src/helper/TranslateHelper.h +++ b/example/src/helper/TranslateHelper.h @@ -14,7 +14,7 @@ private: [[maybe_unused]] explicit TranslateHelper(QObject *parent = nullptr); public: - SINGLETON(TranslateHelper) + EXAMPLESINGLETON(TranslateHelper) ~TranslateHelper() override; void init(QQmlEngine *engine); diff --git a/example/src/singleton.h b/example/src/singleton.h index 9eaa2da1..34213785 100644 --- a/example/src/singleton.h +++ b/example/src/singleton.h @@ -4,22 +4,22 @@ * @brief The Singleton class */ template -class Singleton { +class ExampleSingleton { public: static T *getInstance(); }; template -T *Singleton::getInstance() { +T *ExampleSingleton::getInstance() { static T *instance = new T(); return instance; } -#define SINGLETON(Class) \ +#define EXAMPLESINGLETON(Class) \ private: \ - friend class Singleton; \ + friend class ExampleSingleton; \ \ public: \ static Class *getInstance() { \ - return Singleton::getInstance(); \ + return ExampleSingleton::getInstance(); \ }