diff --git a/example/example_en_US.ts b/example/example_en_US.ts index af62a481..84b80013 100644 --- a/example/example_en_US.ts +++ b/example/example_en_US.ts @@ -143,22 +143,22 @@ InitializrHelper - + The name cannot be empty - + The creation path cannot be empty - + The path does not exist - + %1 folder already exists diff --git a/example/example_zh_CN.ts b/example/example_zh_CN.ts index 865999ac..74375eb0 100644 --- a/example/example_zh_CN.ts +++ b/example/example_zh_CN.ts @@ -143,22 +143,22 @@ InitializrHelper - + The name cannot be empty 名称不能为空 - + The creation path cannot be empty 创建路径不能为空 - + The path does not exist 路径不存在 - + %1 folder already exists %1 文件夹已经存在 diff --git a/example/src/AppInfo.h b/example/src/AppInfo.h index 49f907e9..71fc3a10 100644 --- a/example/src/AppInfo.h +++ b/example/src/AppInfo.h @@ -2,16 +2,17 @@ #include #include -#include "stdafx.h" + #include "singleton.h" +#include "stdafx.h" class AppInfo : public QObject { - Q_OBJECT - Q_PROPERTY_AUTO(QString, version) -private: - explicit AppInfo(QObject *parent = nullptr); + Q_OBJECT + Q_PROPERTY_AUTO(QString, version) + private: + explicit AppInfo(QObject *parent = nullptr); -public: - SINGLETON(AppInfo) - Q_INVOKABLE [[maybe_unused]] void testCrash(); + public: + SINGLETON(AppInfo) + [[maybe_unused]] Q_INVOKABLE void testCrash(); }; diff --git a/example/src/component/CircularReveal.h b/example/src/component/CircularReveal.h index e8e706d3..62db7c97 100644 --- a/example/src/component/CircularReveal.h +++ b/example/src/component/CircularReveal.h @@ -13,7 +13,7 @@ class CircularReveal : public QQuickPaintedItem { public: explicit CircularReveal(QQuickItem *parent = nullptr); void paint(QPainter *painter) override; - Q_INVOKABLE [[maybe_unused]] void start(int w, int h, const QPoint ¢er, int radius); + [[maybe_unused]] Q_INVOKABLE void start(int w, int h, const QPoint ¢er, int radius); Q_SIGNAL void imageChanged(); Q_SIGNAL void animationFinished(); Q_SLOT void handleGrabResult(); diff --git a/example/src/helper/InitializrHelper.h b/example/src/helper/InitializrHelper.h index a4410f6a..51f559c0 100644 --- a/example/src/helper/InitializrHelper.h +++ b/example/src/helper/InitializrHelper.h @@ -17,7 +17,7 @@ private: public: SINGLETON(InitializrHelper) ~InitializrHelper() override; - Q_INVOKABLE [[maybe_unused]] 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 success(const QString &path); }; diff --git a/example/src/main.cpp b/example/src/main.cpp index a6b4d918..804f739e 100644 --- a/example/src/main.cpp +++ b/example/src/main.cpp @@ -1,25 +1,26 @@ +#include + #include +#include +#include +#include +#include #include #include -#include #include -#include #include -#include -#include -#include -#include "Version.h" + #include "AppInfo.h" +#include "Version.h" #include "helper/Log.h" #include "src/component/CircularReveal.h" #include "src/component/FileWatcher.h" #include "src/component/FpsItem.h" #include "src/component/OpenGLItem.h" -#include "src/helper/SettingsHelper.h" #include "src/helper/InitializrHelper.h" -#include "src/helper/TranslateHelper.h" #include "src/helper/Network.h" - +#include "src/helper/SettingsHelper.h" +#include "src/helper/TranslateHelper.h" #ifdef FLUENTUI_BUILD_STATIC_LIB # if (QT_VERSION > QT_VERSION_CHECK(6, 2, 0))