amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2025-01-23 04:14:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: [singleton] Fixed an issue with the Singleton class redefinition

Browse Source 
fix #564
This commit is contained in:
liuzhangjian 2025-01-20 17:00:41 +08:00
parent 29686d07ba
commit cb4ec62c1e
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/src/AppInfo.h
View File

@ -13,6 +13,6 @@ class AppInfo : public QObject {
explicit AppInfo(QObject *parent = nullptr); explicit AppInfo(QObject *parent = nullptr);
public: public:
SINGLETON(AppInfo) EXAMPLESINGLETON(AppInfo)
[[maybe_unused]] Q_INVOKABLE void testCrash(); [[maybe_unused]] Q_INVOKABLE void testCrash();
}; };

2
example/src/helper/InitializrHelper.h
View File

@ -15,7 +15,7 @@ private:
void templateToFile(const QString &source, const QString &dest, Args &&...args); void templateToFile(const QString &source, const QString &dest, Args &&...args);
public: public:
SINGLETON(InitializrHelper) EXAMPLESINGLETON(InitializrHelper)
~InitializrHelper() override; ~InitializrHelper() override;
[[maybe_unused]] Q_INVOKABLE void generate(const QString &name, const QString &path); [[maybe_unused]] Q_INVOKABLE void generate(const QString &name, const QString &path);
Q_SIGNAL void error(const QString &message); Q_SIGNAL void error(const QString &message);

2
example/src/helper/Network.h
View File

@ -144,7 +144,7 @@ private:
explicit Network(QObject *parent = nullptr); explicit Network(QObject *parent = nullptr);
public: public:
SINGLETON(Network) EXAMPLESINGLETON(Network)
static Network *create(QQmlEngine *qmlEngine, QJSEngine *jsEngine) { static Network *create(QQmlEngine *qmlEngine, QJSEngine *jsEngine) {
return getInstance(); return getInstance();

2
example/src/helper/SettingsHelper.h
View File

@ -15,7 +15,7 @@ private:
explicit SettingsHelper(QObject *parent = nullptr); explicit SettingsHelper(QObject *parent = nullptr);
public: public:
SINGLETON(SettingsHelper) EXAMPLESINGLETON(SettingsHelper)
~SettingsHelper() override; ~SettingsHelper() override;
void init(char *argv[]); void init(char *argv[]);
Q_INVOKABLE void saveDarkMode(int darkModel) { Q_INVOKABLE void saveDarkMode(int darkModel) {

2
example/src/helper/TranslateHelper.h
View File

@ -14,7 +14,7 @@ private:
[[maybe_unused]] explicit TranslateHelper(QObject *parent = nullptr); [[maybe_unused]] explicit TranslateHelper(QObject *parent = nullptr);
public: public:
SINGLETON(TranslateHelper) EXAMPLESINGLETON(TranslateHelper)
~TranslateHelper() override; ~TranslateHelper() override;
void init(QQmlEngine *engine); void init(QQmlEngine *engine);

10
example/src/singleton.h
View File

@ -4,22 +4,22 @@
* @brief The Singleton class * @brief The Singleton class
*/ */
template <typename T> template <typename T>
class Singleton { class ExampleSingleton {
public: public:
static T *getInstance(); static T *getInstance();
}; };
template <typename T> template <typename T>
T *Singleton<T>::getInstance() { T *ExampleSingleton<T>::getInstance() {
static T *instance = new T(); static T *instance = new T();
return instance; return instance;
} }
#define SINGLETON(Class) \ #define EXAMPLESINGLETON(Class) \
private: \ private: \
friend class Singleton<Class>; \ friend class ExampleSingleton<Class>; \
\ \
public: \ public: \
static Class *getInstance() { \ static Class *getInstance() { \
return Singleton<Class>::getInstance(); \ return ExampleSingleton<Class>::getInstance(); \
} }