.clang-format

@@ -1,130 +0,0 @@
-# References:
-#   https://clang.llvm.org/docs/ClangFormatStyleOptions.html
-#   https://code.qt.io/cgit/qt/qt5.git/tree/_clang-format
-
-BasedOnStyle: LLVM
-
-Standard: c++17
-
-# 指针和引用的对齐方式。
-# 可能的值有：
-# PAS_Left (在配置中： Left) 指针左对齐。
-# PAS_Right (在配置中： Right) 指针右对齐。
-# PAS_Middle (在配置中： Middle) 指针中间对齐。
-PointerAlignment: Right
-
-# public/protected/private 等访问修饰符偏移量
-AccessModifierOffset: -4
-
-# 缩进长度
-IndentWidth: 4
-
-# 连续空行的最大数
-MaxEmptyLinesToKeep: 999
-
-# 在OC中的@property后面添加一个空格。例如：使用“@property (readonly)”而不是“@property(readonly)”
-ObjCSpaceAfterProperty: true
-
-# OC块中所拍的字符数
-ObjCBlockIndentWidth: 4
-
-# 取决于值, 语句“int f() { return 0; }”可以被放到一个单行。
-# 可能的值有：
-# SFS_None (在配置中： None) 从不合并方法或函数到单独的一行。
-# SFS_Empty (在配置中： Empty) 仅合并空的函数。
-# SFS_Inline (在配置中： Inline) 仅合并类中定义的方法或函数. 意味着 “empty”.
-# SFS_All (在配置中： All) 合并所有的方法适应单行.
-AllowShortFunctionsOnASingleLine: None
-
-# 如果为真（true）, 语句“if (a) return;” 能被放到单行。
-AllowShortIfStatementsOnASingleLine: false
-
-# 如果为真（true）, 对齐注释。
-AlignTrailingComments: true
-
-# 如果为真,对齐连续的宏定义
-AlignConsecutiveMacros: true
-
-# 如果为真（true）,将会在“[”之后和“]”之前插入空格。
-SpacesInSquareBrackets: false
-
-# 如果为真（true）, 将会在“(”之后和“)”之前插入空格。
-SpacesInParentheses : false
-
-# 如果为真（true）, 校准连续的声明。
-# 这将会校准连续多行的声明的名字。这将会导致像下面这样的格式：
-# int         aaaa = 12;
-# float       b = 23;
-# std::string ccc = 23;
-AlignConsecutiveDeclarations: false
-
-# 如果为真（true），连续调整多行
-# 这将会调整连续行中的分配操作符。这将会导致像下面这样的格式：
-# int aaaa = 12;
-# int b    = 23;
-# int ccc  = 23;
-AlignConsecutiveAssignments: false
-
-# 如果为假（false），移除分配操作符（=）前空格。
-SpaceBeforeAssignmentOperators: true
-
-# 如果为真（true）, 将会在字面量容器中插入空格(例如 OC和Javascript的数组和字典字面量)。
-SpacesInContainerLiterals: false
-
-# 缩进case标签
-IndentCaseLabels: true
-
-# 如果表达式中包含函数调用，并且函数调用因为表达式太长被放到了下一行，是否缩进
-IndentWrappedFunctionNames: true
-
-# 如果为真（true）, 保持块的起始空行。
-# true:                                  false:
-# if (foo) {                     vs.     if (foo) {
-#                                          bar();
-#   bar();                               }
-# }
-KeepEmptyLinesAtTheStartOfBlocks: true
-
-# 允许所有参数都被放在下一行
-AllowAllParametersOfDeclarationOnNextLine: false
-
-# 使用C风格强制类型转换后，是否在中间添加一个空格
-SpaceAfterCStyleCast: true
-
-# 在模板定义后换行
-AlwaysBreakTemplateDeclarations: Yes
-
-# Tab长度
-TabWidth: 4
-
-# 是否使用Tab
-UseTab: Never
-
-# 在括号后对齐参数
-# someLongFunction(argument1,
-#                  argument2);
-AlignAfterOpenBracket: Align
-
-# 名字空间内部缩进
-NamespaceIndentation: All
-
-# 一行最长列数
-ColumnLimit: 100
-
-# 按层次缩进宏定义
-IndentPPDirectives: AfterHash
-
-# 预处理语句缩进为 2
-PPIndentWidth: 2
-
-# 数组元素对齐
-AlignArrayOfStructures: Left
-
-# 不对头文件排序
-SortIncludes: Never
-
-FixNamespaceComments: false
-
-StatementMacros: ['__qas_attr__', '__qas_exclude__', '__qas_include__']
-
-ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ]

example/src/AppInfo.cpp

@@ -4,11 +4,11 @@
 #include <QGuiApplication>
 #include "Version.h"
 
-AppInfo::AppInfo(QObject *parent) : QObject{parent} {
+AppInfo::AppInfo(QObject *parent)
+        : QObject{parent} {
     version(APPLICATION_VERSION);
 }
 
-
 [[maybe_unused]] void AppInfo::testCrash() {
     auto *crash = reinterpret_cast<volatile int *>(0);
     *crash = 0;

example/src/AppInfo.h

@@ -13,5 +13,6 @@ private:
 
 public:
 SINGLETON(AppInfo)
-    Q_INVOKABLE [[maybe_unused]] void testCrash();
+
+    [[maybe_unused]] Q_INVOKABLE void testCrash();
 };

example/src/app_dmp.h

@@ -11,28 +11,21 @@
 
 #pragma comment(lib, "Dbghelp.lib")
 
-static void miniDumpWriteDump(HANDLE hProcess, DWORD ProcessId, HANDLE hFile,
+static void
-                              CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
+miniDumpWriteDump(HANDLE hProcess, DWORD ProcessId, HANDLE hFile, CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam, CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam) {
-                              CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam) {
+    typedef HRESULT (WINAPI *MiniDumpWriteDumpPtr)(HANDLE hProcess, DWORD ProcessId, HANDLE hFile, MINIDUMP_TYPE DumpType, CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
-    typedef HRESULT(WINAPI * MiniDumpWriteDumpPtr)(
+                                                   CONST PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam, CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam);
-        HANDLE hProcess, DWORD ProcessId, HANDLE hFile, MINIDUMP_TYPE DumpType,
-        CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
-        CONST PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam,
-        CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam);
     HMODULE module = LoadLibraryW(L"Dbghelp.dll");
     if (module) {
         MiniDumpWriteDumpPtr mini_dump_write_dump;
-        mini_dump_write_dump =
+        mini_dump_write_dump = reinterpret_cast<MiniDumpWriteDumpPtr>(GetProcAddress(module, "MiniDumpWriteDump"));
-            reinterpret_cast<MiniDumpWriteDumpPtr>(GetProcAddress(module, "MiniDumpWriteDump"));
         if (mini_dump_write_dump) {
-            mini_dump_write_dump(hProcess, ProcessId, hFile, static_cast<MINIDUMP_TYPE>(80),
+            mini_dump_write_dump(hProcess, ProcessId, hFile, static_cast<MINIDUMP_TYPE>(80), ExceptionParam, nullptr, CallbackParam);
-                                 ExceptionParam, nullptr, CallbackParam);
         }
     }
 }
 
-BOOL CALLBACK MyMiniDumpCallback(PVOID, const PMINIDUMP_CALLBACK_INPUT input,
+BOOL CALLBACK MyMiniDumpCallback(PVOID, const PMINIDUMP_CALLBACK_INPUT input, PMINIDUMP_CALLBACK_OUTPUT output) {
-                                 PMINIDUMP_CALLBACK_OUTPUT output) {
     if (input == nullptr || output == nullptr)
         return FALSE;
 
@@ -49,7 +42,8 @@ BOOL CALLBACK MyMiniDumpCallback(PVOID, const PMINIDUMP_CALLBACK_INPUT input,
                 output->ModuleWriteFlags &= ~ModuleWriteModule;
             }
             ret = TRUE;
-        } break;
+        }
+            break;
         default:
             break;
     }
@@ -57,9 +51,7 @@ BOOL CALLBACK MyMiniDumpCallback(PVOID, const PMINIDUMP_CALLBACK_INPUT input,
 }
 
 void WriteDump(EXCEPTION_POINTERS *exp, const std::wstring &path) {
-    HANDLE h = ::CreateFileW(path.c_str(), GENERIC_WRITE | GENERIC_READ,
+    HANDLE h = ::CreateFileW(path.c_str(), GENERIC_WRITE | GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
-                             FILE_SHARE_WRITE | FILE_SHARE_READ, nullptr, CREATE_ALWAYS,
-                             FILE_ATTRIBUTE_NORMAL, nullptr);
     MINIDUMP_EXCEPTION_INFORMATION info;
     info.ThreadId = ::GetCurrentThreadId();
     info.ExceptionPointers = exp;
@@ -72,10 +64,8 @@ void WriteDump(EXCEPTION_POINTERS *exp, const std::wstring &path) {
 }
 
 LONG WINAPI MyUnhandledExceptionFilter(EXCEPTION_POINTERS *exp) {
-    const QString dumpFileName =
+    const QString dumpFileName = QString("%1_%2.dmp").arg("crash", QDateTime::currentDateTime().toString("yyyyMMdd_hhmmss"));
-        QString("%1_%2.dmp").arg("crash", QDateTime::currentDateTime().toString("yyyyMMdd_hhmmss"));
+    const QString dumpDirPath = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/dmp";
-    const QString dumpDirPath =
-        QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/dmp";
     const QDir dumpDir(dumpDirPath);
     if (!dumpDir.exists()) {
         dumpDir.mkpath(dumpDirPath);

example/src/component/CircularReveal.cpp

@@ -15,7 +15,9 @@ CircularReveal::CircularReveal(QQuickItem *parent) : QQuickPaintedItem(parent) {
         setVisible(false);
         Q_EMIT animationFinished();
     });
-    connect(this, &CircularReveal::radiusChanged, this, [=]() { update(); });
+    connect(this, &CircularReveal::radiusChanged, this, [=]() {
+        update();
+    });
 }
 
 void CircularReveal::paint(QPainter *painter) {
@@ -34,8 +36,7 @@ void CircularReveal::paint(QPainter *painter) {
     _anim->setEndValue(radius);
     _center = center;
     _grabResult = _target->grabToImage(QSize(w, h));
-    connect(_grabResult.data(), &QQuickItemGrabResult::ready, this,
+    connect(_grabResult.data(), &QQuickItemGrabResult::ready, this, &CircularReveal::handleGrabResult);
-            &CircularReveal::handleGrabResult);
 }
 
 void CircularReveal::handleGrabResult() {

example/src/component/CircularReveal.h

@@ -12,10 +12,15 @@ class CircularReveal : public QQuickPaintedItem {
 Q_PROPERTY_AUTO(int, radius)
 public:
     explicit CircularReveal(QQuickItem *parent = nullptr);
+
     void paint(QPainter *painter) override;
-    Q_INVOKABLE [[maybe_unused]] void start(int w, int h, const QPoint &center, int radius);
+
+    [[maybe_unused]] Q_INVOKABLE void start(int w, int h, const QPoint &center, int radius);
+
     Q_SIGNAL void imageChanged();
+
     Q_SIGNAL void animationFinished();
+
     Q_SLOT void handleGrabResult();
 
 private:

example/src/component/FileWatcher.h

@@ -7,9 +7,10 @@
 
 class FileWatcher : public QObject {
 Q_OBJECT
-    Q_PROPERTY_AUTO(QString, path)
+Q_PROPERTY_AUTO(QString, path);
 public:
     explicit FileWatcher(QObject *parent = nullptr);
+
     Q_SIGNAL void fileChanged();
 
 private:

example/src/component/FpsItem.cpp

@@ -12,9 +12,7 @@ FpsItem::FpsItem() {
     });
     connect(this, &QQuickItem::windowChanged, this, [this] {
         if (window()) {
-            connect(
+            connect(window(), &QQuickWindow::afterRendering, this, [this] { _frameCount++; }, Qt::DirectConnection);
-                window(), &QQuickWindow::afterRendering, this, [this] { _frameCount++; },
-                Qt::DirectConnection);
         }
     });
     timer->start(1000);

example/src/component/FpsItem.h

@@ -11,4 +11,5 @@ public:
 
 private:
     int _frameCount = 0;
+
 };

example/src/component/OpenGLItem.cpp

@@ -7,8 +7,11 @@
 class FBORenderer : public QQuickFramebufferObject::Renderer, protected QOpenGLFunctions {
 public:
     explicit FBORenderer(const OpenGLItem *item);
+
     void render() override;
+
     QOpenGLFramebufferObject *createFramebufferObject(const QSize &size) override;
+
     QOpenGLShaderProgram program;
     const OpenGLItem *item = nullptr;
 };
@@ -16,14 +19,14 @@ public:
 FBORenderer::FBORenderer(const OpenGLItem *item) {
     this->item = item;
     initializeOpenGLFunctions();
-    program.addCacheableShaderFromSourceCode(QOpenGLShader::Vertex, "attribute highp vec4 vertices;"
+    program.addCacheableShaderFromSourceCode(QOpenGLShader::Vertex,
+                                             "attribute highp vec4 vertices;"
                                              "varying highp vec2 coords;"
                                              "void main() {"
                                              "    gl_Position = vertices;"
                                              "    coords = vertices.xy;"
                                              "}");
-    program.addCacheableShaderFromSourceCode(
+    program.addCacheableShaderFromSourceCode(QOpenGLShader::Fragment,
-        QOpenGLShader::Fragment,
                                              "uniform lowp float t;"
                                              "varying highp vec2 coords;"
                                              "void main() {"
@@ -51,7 +54,12 @@ void FBORenderer::render() {
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     program.bind();
     program.enableAttributeArray(0);
-    float values[] = {-1, -1, 1, -1, -1, 1, 1, 1};
+    float values[] = {
+            -1, -1,
+            1, -1,
+            -1, 1,
+            1, 1
+    };
     glBindBuffer(GL_ARRAY_BUFFER, 0);
     program.setAttributeArray(0, GL_FLOAT, values, 2);
     program.setUniformValue("t", (float) item->t());

example/src/component/OpenGLItem.h

@@ -11,13 +11,17 @@ class OpenGLItem : public QQuickFramebufferObject, protected QOpenGLFunctions {
     Q_PROPERTY(qreal t READ t WRITE setT NOTIFY tChanged)
 public:
     explicit OpenGLItem(QQuickItem *parent = nullptr);
+
     [[nodiscard]] QQuickFramebufferObject::Renderer *createRenderer() const override;
+
     void timerEvent(QTimerEvent *) override;
-    [[nodiscard]] qreal t() const {
+
-        return m_t;
+    [[nodiscard]] qreal t() const { return m_t; }
-    }
+
     void setT(qreal t);
+
 signals:
+
     void tChanged();
 
 private:

example/src/helper/InitializrHelper.cpp

@@ -4,11 +4,11 @@
 #include <QGuiApplication>
 
 [[maybe_unused]] InitializrHelper::InitializrHelper(QObject *parent) : QObject(parent) {
+
 }
 
 InitializrHelper::~InitializrHelper() = default;
 
-
 bool InitializrHelper::copyDir(const QDir &fromDir, const QDir &toDir, bool coverIfFileExists) {
     const QDir &_formDir = fromDir;
     QDir _toDir = toDir;
@@ -61,8 +61,7 @@ void InitializrHelper::templateToFile(const QString &source, const QString &dest
 
 void InitializrHelper::copyFile(const QString &source, const QString &dest) {
     QFile::copy(source, dest);
-    QFile::setPermissions(dest, QFile::WriteOwner | QFile::WriteUser | QFile::WriteGroup |
+    QFile::setPermissions(dest, QFile::WriteOwner | QFile::WriteUser | QFile::WriteGroup | QFile::WriteOther);
-                                    QFile::WriteOther);
 }
 
 [[maybe_unused]] void InitializrHelper::generate(const QString &name, const QString &path) {
@@ -88,18 +87,12 @@ void InitializrHelper::copyFile(const QString &source, const QString &dest) {
     projectDir.mkpath(projectPath);
     QDir fluentDir(projectDir.filePath("FluentUI"));
     copyDir(QDir(QGuiApplication::applicationDirPath() + "/source"), fluentDir);
-    templateToFile(":/example/res/template/CMakeLists.txt.in",
+    templateToFile(":/example/res/template/CMakeLists.txt.in", projectDir.filePath("CMakeLists.txt"), name);
-                   projectDir.filePath("CMakeLists.txt"), name);
+    templateToFile(":/example/res/template/src/CMakeLists.txt.in", projectDir.filePath("src/CMakeLists.txt"), name);
-    templateToFile(":/example/res/template/src/CMakeLists.txt.in",
+    templateToFile(":/example/res/template/src/main.cpp.in", projectDir.filePath("src/main.cpp"), name);
-                   projectDir.filePath("src/CMakeLists.txt"), name);
+    templateToFile(":/example/res/template/src/main.qml.in", projectDir.filePath("src/main.qml"), name);
-    templateToFile(":/example/res/template/src/main.cpp.in", projectDir.filePath("src/main.cpp"),
+    templateToFile(":/example/res/template/src/en_US.ts.in", projectDir.filePath("src/" + name + "_en_US.ts"), name);
-                   name);
+    templateToFile(":/example/res/template/src/zh_CN.ts.in", projectDir.filePath("src/" + name + "_zh_CN.ts"), name);
-    templateToFile(":/example/res/template/src/main.qml.in", projectDir.filePath("src/main.qml"),
-                   name);
-    templateToFile(":/example/res/template/src/en_US.ts.in",
-                   projectDir.filePath("src/" + name + "_en_US.ts"), name);
-    templateToFile(":/example/res/template/src/zh_CN.ts.in",
-                   projectDir.filePath("src/" + name + "_zh_CN.ts"), name);
     copyFile(":/example/res/template/src/App.qml.in", projectDir.filePath("src/App.qml"));
     copyFile(":/example/res/template/src/qml.qrc.in", projectDir.filePath("src/qml.qrc"));
     copyFile(":/example/res/template/src/logo.ico.in", projectDir.filePath("src/logo.ico"));

example/src/helper/InitializrHelper.h

@@ -9,15 +9,22 @@ class InitializrHelper : public QObject {
 Q_OBJECT
 private:
     [[maybe_unused]] explicit InitializrHelper(QObject *parent = nullptr);
+
     bool copyDir(const QDir &fromDir, const QDir &toDir, bool coverIfFileExists = true);
+
     static void copyFile(const QString &source, const QString &dest);
+
     template<typename...Args>
     void templateToFile(const QString &source, const QString &dest, Args &&...args);
 
 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);
 };

example/src/helper/Log.cpp

@@ -13,7 +13,9 @@
 #include "Version.h"
 
 #ifdef WIN32
+
 #include <process.h>
+
 #else
 #include <unistd.h>
 #endif
@@ -47,8 +49,7 @@ QString Log::prettyProductInfoWrapper() {
     auto productName = QSysInfo::prettyProductName();
 #if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
 #if defined(Q_OS_MACOS)
-    auto macosVersionFile =
+    auto macosVersionFile = QString::fromUtf8("/System/Library/CoreServices/.SystemVersionPlatform.plist");
-        QString::fromUtf8("/System/Library/CoreServices/.SystemVersionPlatform.plist");
     auto fi = QFileInfo (macosVersionFile);
     if (fi.exists() && fi.isReadable()) {
         auto plistFile = QFile(macosVersionFile);
@@ -71,9 +72,7 @@ QString Log::prettyProductInfoWrapper() {
 #endif
 #endif
 #if defined(Q_OS_WIN)
-    QSettings regKey{
+    QSettings regKey{QString::fromUtf8(R"(HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion)"), QSettings::NativeFormat};
-        QString::fromUtf8(R"(HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion)"),
-        QSettings::NativeFormat};
     if (regKey.contains(QString::fromUtf8("CurrentBuildNumber"))) {
         auto buildNumber = regKey.value(QString::fromUtf8("CurrentBuildNumber")).toInt();
         if (buildNumber > 0) {
@@ -92,8 +91,7 @@ QString Log::prettyProductInfoWrapper() {
     return productName;
 }
 
-static inline void messageHandler(const QtMsgType type, const QMessageLogContext &context,
+static inline void messageHandler(const QtMsgType type, const QMessageLogContext &context, const QString &message) {
-                                  const QString &message) {
     if (message == "Could not get the INetworkConnection instance for the adapter GUID.") {
         return;
     }
@@ -134,12 +132,11 @@ static inline void messageHandler(const QtMsgType type, const QMessageLogContext
                 sprintf(fn, "%s", ptrTmp + 1);
                 strFileTmp = fn;
             }
-            fileAndLineLogStr = QString::fromStdString("[%1:%2]").arg(
+            fileAndLineLogStr = QString::fromStdString("[%1:%2]").arg(QString::fromStdString(strFileTmp), QString::number(context.line));
-                QString::fromStdString(strFileTmp), QString::number(context.line));
         }
-        const QString finalMessage =
+        const QString finalMessage = QString::fromStdString("%1[%2]%3[%4]:%5").arg(
-            QString::fromStdString("%1[%2]%3[%4]:%5")
+                QDateTime::currentDateTime().toString("yyyy/MM/dd hh:mm:ss.zzz"),
-                .arg(QDateTime::currentDateTime().toString("yyyy/MM/dd hh:mm:ss.zzz"), levelName,
+                levelName,
                 fileAndLineLogStr,
                 QString::number(reinterpret_cast<quintptr>(QThread::currentThreadId())),
                 message);
@@ -154,8 +151,7 @@ static inline void messageHandler(const QtMsgType type, const QMessageLogContext
         if (!g_logFile) {
             g_logFile = std::make_unique<QFile>(g_file_path);
             if (!g_logFile->open(QFile::WriteOnly | QFile::Text | QFile::Append)) {
-                std::cerr << "Can't open file to write: " << qPrintable(g_logFile->errorString())
+                std::cerr << "Can't open file to write: " << qPrintable(g_logFile->errorString()) << std::endl;
-                          << std::endl;
                 g_logFile.reset();
                 g_logError = true;
                 return;
@@ -183,10 +179,8 @@ void Log::setup(char *argv[], const QString &app, int level) {
     QString applicationPath = QString::fromStdString(argv[0]);
     once = true;
     g_app = app;
-    const QString logFileName =
+    const QString logFileName = QString("%1_%2.log").arg(g_app, QDateTime::currentDateTime().toString("yyyyMMdd"));
-        QString("%1_%2.log").arg(g_app, QDateTime::currentDateTime().toString("yyyyMMdd"));
+    const QString logDirPath = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/log";
-    const QString logDirPath =
-        QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/log";
     const QDir logDir(logDirPath);
     if (!logDir.exists()) {
         logDir.mkpath(logDirPath);

example/src/helper/Log.h

@@ -4,5 +4,6 @@
 
 namespace Log {
     QString prettyProductInfoWrapper();
+
     void setup(char *argv[], const QString &app, int level = 4);
 }

example/src/helper/Network.cpp

@@ -19,7 +19,9 @@
 #include <QGuiApplication>
 #include <utility>
 
+
 NetworkCallable::NetworkCallable(QObject *parent) : QObject{parent} {
+
 }
 
 QString NetworkParams::method2String() const {
@@ -62,7 +64,8 @@ bool NetworkParams::getOpenLog() const {
     return Network::getInstance()->openLog();
 }
 
-FluDownloadParam::FluDownloadParam(QObject *parent) : QObject{parent} {
+FluDownloadParam::FluDownloadParam(QObject *parent)
+        : QObject{parent} {
 }
 
 FluDownloadParam::FluDownloadParam(QString destPath, bool append, QObject *parent)
@@ -175,14 +178,12 @@ void Network::handle(NetworkParams *params, NetworkCallable *c) {
             callable->start();
         }
         QString cacheKey = params->buildCacheKey();
-        if (params->_cacheMode == NetworkType::CacheMode::FirstCacheThenRequest &&
+        if (params->_cacheMode == NetworkType::CacheMode::FirstCacheThenRequest && cacheExists(cacheKey)) {
-            cacheExists(cacheKey)) {
             if (!callable.isNull()) {
                 callable->cache(readCache(cacheKey));
             }
         }
-        if (params->_cacheMode == NetworkType::CacheMode::IfNoneCacheRequest &&
+        if (params->_cacheMode == NetworkType::CacheMode::IfNoneCacheRequest && cacheExists(cacheKey)) {
-            cacheExists(cacheKey)) {
             if (!callable.isNull()) {
                 callable->cache(readCache(cacheKey));
                 callable->finish();
@@ -193,8 +194,7 @@ void Network::handle(NetworkParams *params, NetworkCallable *c) {
         QNetworkAccessManager manager;
         manager.setTransferTimeout(params->getTimeout());
         QEventLoop loop;
-        connect(&manager, &QNetworkAccessManager::finished, &manager,
+        connect(&manager, &QNetworkAccessManager::finished, &manager, [&loop](QNetworkReply *reply) { loop.quit(); });
-                [&loop](QNetworkReply *reply) { loop.quit(); });
         for (int i = 0; i <= params->getRetry() - 1; ++i) {
             QUrl url(params->_url);
             addQueryParam(&url, params->_queryMap);
@@ -216,11 +216,9 @@ void Network::handle(NetworkParams *params, NetworkCallable *c) {
             QMetaObject::Connection conn_destroyed = {};
             QMetaObject::Connection conn_quit = {};
             if (params->_target) {
-                conn_destroyed =
+                conn_destroyed = connect(params->_target, &QObject::destroyed, &manager, abortCallable);
-                    connect(params->_target, &QObject::destroyed, &manager, abortCallable);
             }
-            conn_quit = connect(QGuiApplication::instance(), &QGuiApplication::aboutToQuit,
+            conn_quit = connect(QGuiApplication::instance(), &QGuiApplication::aboutToQuit, &manager, abortCallable);
-                                &manager, abortCallable);
             loop.exec();
             if (conn_destroyed) {
                 disconnect(conn_destroyed);
@@ -249,8 +247,7 @@ void Network::handle(NetworkParams *params, NetworkCallable *c) {
             } else {
                 if (i == params->getRetry() - 1) {
                     if (!callable.isNull()) {
-                        if (params->_cacheMode == NetworkType::CacheMode::RequestFailedReadCache &&
+                        if (params->_cacheMode == NetworkType::CacheMode::RequestFailedReadCache && cacheExists(cacheKey)) {
-                            cacheExists(cacheKey)) {
                             if (!callable.isNull()) {
                                 callable->cache(readCache(cacheKey));
                             }
@@ -335,25 +332,20 @@ void Network::handleDownload(NetworkParams *params, NetworkCallable *c) {
                 reply->abort();
             }
         };
-        connect(&manager, &QNetworkAccessManager::finished, &manager,
+        connect(&manager, &QNetworkAccessManager::finished, &manager, [&loop](QNetworkReply *reply) { loop.quit(); });
-                [&loop](QNetworkReply *reply) { loop.quit(); });
+        connect(QGuiApplication::instance(), &QGuiApplication::aboutToQuit, &manager, [&loop, reply]() { reply->abort(), loop.quit(); });
-        connect(QGuiApplication::instance(), &QGuiApplication::aboutToQuit, &manager,
-                [&loop, reply]() { reply->abort(), loop.quit(); });
         QMetaObject::Connection conn_destroyed = {};
         QMetaObject::Connection conn_quit = {};
         if (params->_target) {
             conn_destroyed = connect(params->_target, &QObject::destroyed, &manager, abortCallable);
         }
-        conn_quit = connect(QGuiApplication::instance(), &QGuiApplication::aboutToQuit, &manager,
+        conn_quit = connect(QGuiApplication::instance(), &QGuiApplication::aboutToQuit, &manager, abortCallable);
-                            abortCallable);
+        connect(reply, &QNetworkReply::readyRead, reply, [reply, seek, destFile, cacheFile, callable] {
-        connect(reply, &QNetworkReply::readyRead, reply,
-                [reply, seek, destFile, cacheFile, callable] {
             if (!reply || !destFile || reply->error() != QNetworkReply::NoError) {
                 return;
             }
             QMap<QString, QVariant> downInfo;
-                    qint64 contentLength =
+            qint64 contentLength = reply->header(QNetworkRequest::ContentLengthHeader).toLongLong() + seek;
-                        reply->header(QNetworkRequest::ContentLengthHeader).toLongLong() + seek;
             downInfo.insert("contentLength", contentLength);
             QString eTag = reply->header(QNetworkRequest::ETagHeader).toString();
             downInfo.insert("eTag", eTag);
@@ -362,8 +354,7 @@ void Network::handleDownload(NetworkParams *params, NetworkCallable *c) {
             downInfo.insert("fileSize", destFile->size());
             if (cacheFile->isOpen()) {
                 cacheFile->resize(0);
-                        cacheFile->write(
+                cacheFile->write(QJsonDocument::fromVariant(QVariant(downInfo)).toJson().toBase64());
-                            QJsonDocument::fromVariant(QVariant(downInfo)).toJson().toBase64());
                 cacheFile->flush();
             }
             if (!callable.isNull()) {
@@ -439,9 +430,7 @@ QString Network::map2String(const QMap<QString, QVariant> &map) {
     return parameters.join(" ");
 }
 
-void Network::sendRequest(QNetworkAccessManager *manager, QNetworkRequest request,
+void Network::sendRequest(QNetworkAccessManager *manager, QNetworkRequest request, NetworkParams *params, QNetworkReply *&reply, bool isFirst, const QPointer<NetworkCallable> &callable) {
-                          NetworkParams *params, QNetworkReply *&reply, bool isFirst,
-                          const QPointer<NetworkCallable> &callable) {
     QByteArray verb = params->method2String().toUtf8();
     switch (params->_type) {
         case NetworkParams::TYPE_FORM: {
@@ -451,8 +440,7 @@ void Network::sendRequest(QNetworkAccessManager *manager, QNetworkRequest reques
                 multiPart->setContentType(QHttpMultiPart::FormDataType);
                 for (const auto &each: params->_paramMap.toStdMap()) {
                     QHttpPart part;
-                    part.setHeader(QNetworkRequest::ContentDispositionHeader,
+                    part.setHeader(QNetworkRequest::ContentDispositionHeader, QString("form-data; name=\"%1\"").arg(each.first));
-                                   QString("form-data; name=\"%1\"").arg(each.first));
                     part.setBody(each.second.toByteArray());
                     multiPart->append(part);
                 }
@@ -464,23 +452,19 @@ void Network::sendRequest(QNetworkAccessManager *manager, QNetworkRequest reques
                     file->open(QIODevice::ReadOnly);
                     file->setParent(multiPart);
                     QHttpPart part;
-                    part.setHeader(
+                    part.setHeader(QNetworkRequest::ContentDispositionHeader, QString(R"(form-data; name="%1"; filename="%2")").arg(name, fileName));
-                        QNetworkRequest::ContentDispositionHeader,
-                        QString(R"(form-data; name="%1"; filename="%2")").arg(name, fileName));
                     part.setBodyDevice(file);
                     multiPart->append(part);
                 }
                 reply = manager->sendCustomRequest(request, verb, multiPart);
                 multiPart->setParent(reply);
-                connect(reply, &QNetworkReply::uploadProgress, reply,
+                connect(reply, &QNetworkReply::uploadProgress, reply, [callable](qint64 bytesSent, qint64 bytesTotal) {
-                        [callable](qint64 bytesSent, qint64 bytesTotal) {
                     if (!callable.isNull() && bytesSent != 0 && bytesTotal != 0) {
                         Q_EMIT callable->uploadProgress(bytesSent, bytesTotal);
                     }
                 });
             } else {
-                request.setHeader(QNetworkRequest::ContentTypeHeader,
+                request.setHeader(QNetworkRequest::ContentTypeHeader, QString("application/x-www-form-urlencoded"));
-                                  QString("application/x-www-form-urlencoded"));
                 QString value;
                 for (const auto &each: params->_paramMap.toStdMap()) {
                     value += QString("%1=%2").arg(each.first, each.second.toString());
@@ -495,8 +479,7 @@ void Network::sendRequest(QNetworkAccessManager *manager, QNetworkRequest reques
             break;
         }
         case NetworkParams::TYPE_JSON: {
-            request.setHeader(QNetworkRequest::ContentTypeHeader,
+            request.setHeader(QNetworkRequest::ContentTypeHeader, QString("application/json;charset=utf-8"));
-                              QString("application/json;charset=utf-8"));
             QJsonObject json;
             for (const auto &each: params->_paramMap.toStdMap()) {
                 json.insert(each.first, each.second.toJsonValue());
@@ -506,8 +489,7 @@ void Network::sendRequest(QNetworkAccessManager *manager, QNetworkRequest reques
             break;
         }
         case NetworkParams::TYPE_JSONARRAY: {
-            request.setHeader(QNetworkRequest::ContentTypeHeader,
+            request.setHeader(QNetworkRequest::ContentTypeHeader, QString("application/json;charset=utf-8"));
-                              QString("application/json;charset=utf-8"));
             QJsonArray jsonArray;
             for (const auto &each: params->_paramMap.toStdMap()) {
                 QJsonObject json;
@@ -519,8 +501,7 @@ void Network::sendRequest(QNetworkAccessManager *manager, QNetworkRequest reques
             break;
         }
         case NetworkParams::TYPE_BODY: {
-            request.setHeader(QNetworkRequest::ContentTypeHeader,
+            request.setHeader(QNetworkRequest::ContentTypeHeader, QString("text/plain;charset=utf-8"));
-                              QString("text/plain;charset=utf-8"));
             QByteArray data = params->_body.toUtf8();
             reply = manager->sendCustomRequest(request, verb, data);
             break;
@@ -538,20 +519,15 @@ void Network::printRequestStartLog(const QNetworkRequest &request, NetworkParams
     if (!params->getOpenLog()) {
         return;
     }
-    qDebug() << "<------"
+    qDebug() << "<------" << qUtf8Printable(request.header(QNetworkRequest::UserAgentHeader).toString()) << "Request Start ------>";
-             << qUtf8Printable(request.header(QNetworkRequest::UserAgentHeader).toString())
+    qDebug() << qUtf8Printable(QString::fromStdString("<%1>").arg(params->method2String())) << qUtf8Printable(params->_url);
-             << "Request Start ------>";
-    qDebug() << qUtf8Printable(QString::fromStdString("<%1>").arg(params->method2String()))
-             << qUtf8Printable(params->_url);
     auto contentType = request.header(QNetworkRequest::ContentTypeHeader).toString();
     if (!contentType.isEmpty()) {
-        qDebug() << qUtf8Printable(
+        qDebug() << qUtf8Printable(QString::fromStdString("<Header> %1=%2").arg("Content-Type", contentType));
-            QString::fromStdString("<Header> %1=%2").arg("Content-Type", contentType));
     }
     QList<QByteArray> headers = request.rawHeaderList();
     for (const QByteArray &header: headers) {
-        qDebug() << qUtf8Printable(
+        qDebug() << qUtf8Printable(QString::fromStdString("<Header> %1=%2").arg(header, request.rawHeader(header)));
-            QString::fromStdString("<Header> %1=%2").arg(header, request.rawHeader(header)));
     }
     if (!params->_queryMap.isEmpty()) {
         qDebug() << "<Query>" << qUtf8Printable(map2String(params->_queryMap));
@@ -567,16 +543,12 @@ void Network::printRequestStartLog(const QNetworkRequest &request, NetworkParams
     }
 }
 
-void Network::printRequestEndLog(const QNetworkRequest &request, NetworkParams *params,
+void Network::printRequestEndLog(const QNetworkRequest &request, NetworkParams *params, QNetworkReply *&reply, const QString &response) {
-                                 QNetworkReply *&reply, const QString &response) {
     if (!params->getOpenLog()) {
         return;
     }
-    qDebug() << "<------"
+    qDebug() << "<------" << qUtf8Printable(request.header(QNetworkRequest::UserAgentHeader).toString()) << "Request End ------>";
-             << qUtf8Printable(request.header(QNetworkRequest::UserAgentHeader).toString())
+    qDebug() << qUtf8Printable(QString::fromStdString("<%1>").arg(params->method2String())) << qUtf8Printable(params->_url);
-             << "Request End ------>";
-    qDebug() << qUtf8Printable(QString::fromStdString("<%1>").arg(params->method2String()))
-             << qUtf8Printable(params->_url);
     qDebug() << "<Result>" << qUtf8Printable(response);
 }
 
@@ -590,10 +562,7 @@ void Network::saveResponse(const QString &key, const QString &response) {
 }
 
 void Network::addHeaders(QNetworkRequest *request, const QMap<QString, QVariant> &headers) {
-    request->setHeader(
+    request->setHeader(QNetworkRequest::UserAgentHeader, QString::fromStdString("Mozilla/5.0 %1/%2").arg(QGuiApplication::applicationName(), QGuiApplication::applicationVersion()));
-        QNetworkRequest::UserAgentHeader,
-        QString::fromStdString("Mozilla/5.0 %1/%2")
-            .arg(QGuiApplication::applicationName(), QGuiApplication::applicationVersion()));
     QMapIterator<QString, QVariant> iter(headers);
     while (iter.hasNext()) {
         iter.next();
@@ -615,9 +584,7 @@ Network::Network(QObject *parent) : QObject{parent} {
     _timeout = 5000;
     _retry = 3;
     _openLog = false;
-    _cacheDir = QStandardPaths::writableLocation(QStandardPaths::CacheLocation)
+    _cacheDir = QStandardPaths::writableLocation(QStandardPaths::CacheLocation).append(QDir::separator()).append("network");
-                    .append(QDir::separator())
-                    .append("network");
 }
 
 NetworkParams *Network::get(const QString &url) {
@@ -689,8 +656,7 @@ NetworkParams *Network::patchJsonArray(const QString &url) {
 }
 
 NetworkParams *Network::deleteJsonArray(const QString &url) {
-    return new NetworkParams(url, NetworkParams::TYPE_JSONARRAY, NetworkParams::METHOD_DELETE,
+    return new NetworkParams(url, NetworkParams::TYPE_JSONARRAY, NetworkParams::METHOD_DELETE, this);
-                             this);
 }
 
 void Network::setInterceptor(QJSValue interceptor) {

example/src/helper/Network.h

@@ -70,8 +70,21 @@ class NetworkParams : public QObject {
 Q_OBJECT
     QML_NAMED_ELEMENT(NetworkParams)
 public:
-    enum Method { METHOD_GET, METHOD_HEAD, METHOD_POST, METHOD_PUT, METHOD_PATCH, METHOD_DELETE };
+    enum Method {
-    enum Type { TYPE_NONE, TYPE_FORM, TYPE_JSON, TYPE_JSONARRAY, TYPE_BODY };
+        METHOD_GET,
+        METHOD_HEAD,
+        METHOD_POST,
+        METHOD_PUT,
+        METHOD_PATCH,
+        METHOD_DELETE
+    };
+    enum Type {
+        TYPE_NONE,
+        TYPE_FORM,
+        TYPE_JSON,
+        TYPE_JSONARRAY,
+        TYPE_BODY
+    };
 
     explicit NetworkParams(QObject *parent = nullptr);
 
@@ -146,9 +159,7 @@ private:
 public:
 SINGLETON(Network)
 
-    static Network *create(QQmlEngine *qmlEngine, QJSEngine *jsEngine) {
+    static Network *create(QQmlEngine *qmlEngine, QJSEngine *jsEngine) { return getInstance(); }
-        return getInstance();
-    }
 
     Q_INVOKABLE NetworkParams *get(const QString &url);
 
@@ -193,9 +204,7 @@ public:
     void handleDownload(NetworkParams *params, NetworkCallable *result);
 
 private:
-    static void sendRequest(QNetworkAccessManager *manager, QNetworkRequest request,
+    static void sendRequest(QNetworkAccessManager *manager, QNetworkRequest request, NetworkParams *params, QNetworkReply *&reply, bool isFirst, const QPointer<NetworkCallable> &callable);
-                            NetworkParams *params, QNetworkReply *&reply, bool isFirst,
-                            const QPointer<NetworkCallable> &callable);
 
     static void addQueryParam(QUrl *url, const QMap<QString, QVariant> &params);
 
@@ -213,8 +222,7 @@ private:
 
     static void printRequestStartLog(const QNetworkRequest &request, NetworkParams *params);
 
-    static void printRequestEndLog(const QNetworkRequest &request, NetworkParams *params,
+    static void printRequestEndLog(const QNetworkRequest &request, NetworkParams *params, QNetworkReply *&reply, const QString &response);
-                                   QNetworkReply *&reply, const QString &response);
 
     static QString map2String(const QMap<QString, QVariant> &map);
 

example/src/helper/SettingsHelper.cpp

@@ -4,6 +4,7 @@
 #include <QStandardPaths>
 
 SettingsHelper::SettingsHelper(QObject *parent) : QObject(parent) {
+
 }
 
 SettingsHelper::~SettingsHelper() = default;
@@ -12,7 +13,6 @@ void SettingsHelper::save(const QString &key, QVariant val) {
     m_settings->setValue(key, val);
 }
 
-
 QVariant SettingsHelper::get(const QString &key, QVariant def) {
     QVariant data = m_settings->value(key);
     if (!data.isNull() && data.isValid()) {
@@ -25,7 +25,6 @@ void SettingsHelper::init(char *argv[]) {
     QString applicationPath = QString::fromStdString(argv[0]);
     const QFileInfo fileInfo(applicationPath);
     const QString iniFileName = fileInfo.completeBaseName() + ".ini";
-    const QString iniFilePath =
+    const QString iniFilePath = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/" + iniFileName;
-        QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/" + iniFileName;
     m_settings.reset(new QSettings(iniFilePath, QSettings::IniFormat));
 }

example/src/helper/SettingsHelper.h

@@ -16,29 +16,26 @@ private:
 
 public:
 SINGLETON(SettingsHelper)
+
     ~SettingsHelper() override;
+
     void init(char *argv[]);
-    Q_INVOKABLE void saveDarkMode(int darkModel) {
+
-        save("darkMode", darkModel);
+    Q_INVOKABLE void saveDarkMode(int darkModel) { save("darkMode", darkModel); }
-    }
+
-    Q_INVOKABLE int getDarkMode() {
+    Q_INVOKABLE int getDarkMode() { return get("darkMode", QVariant(0)).toInt(); }
-        return get("darkMode", QVariant(0)).toInt();
+
-    }
+    Q_INVOKABLE void saveUseSystemAppBar(bool useSystemAppBar) { save("useSystemAppBar", useSystemAppBar); }
-    Q_INVOKABLE void saveUseSystemAppBar(bool useSystemAppBar) {
+
-        save("useSystemAppBar", useSystemAppBar);
+    Q_INVOKABLE bool getUseSystemAppBar() { return get("useSystemAppBar", QVariant(false)).toBool(); }
-    }
+
-    Q_INVOKABLE bool getUseSystemAppBar() {
+    Q_INVOKABLE void saveLanguage(const QString &language) { save("language", language); }
-        return get("useSystemAppBar", QVariant(false)).toBool();
+
-    }
+    Q_INVOKABLE QString getLanguage() { return get("language", QVariant("en_US")).toString(); }
-    Q_INVOKABLE void saveLanguage(const QString &language) {
-        save("language", language);
-    }
-    Q_INVOKABLE QString getLanguage() {
-        return get("language", QVariant("en_US")).toString();
-    }
 
 private:
     void save(const QString &key, QVariant val);
+
     QVariant get(const QString &key, QVariant def = {});
 
 private:

example/src/helper/TranslateHelper.cpp

@@ -18,8 +18,7 @@ void TranslateHelper::init(QQmlEngine *engine) {
     _translator = new QTranslator(this);
     QGuiApplication::installTranslator(_translator);
     QString translatorPath = QGuiApplication::applicationDirPath() + "/i18n";
-    if (_translator->load(
+    if (_translator->load(QString::fromStdString("%1/example_%2.qm").arg(translatorPath, _current))) {
-            QString::fromStdString("%1/example_%2.qm").arg(translatorPath, _current))) {
         _engine->retranslate();
     }
 }

example/src/helper/TranslateHelper.h

@@ -15,7 +15,9 @@ private:
 
 public:
 SINGLETON(TranslateHelper)
+
     ~TranslateHelper() override;
+
     void init(QQmlEngine *engine);
 
 private:

example/src/main.cpp

@@ -20,7 +20,6 @@
 #include "src/helper/TranslateHelper.h"
 #include "src/helper/Network.h"
 
-
 #ifdef FLUENTUI_BUILD_STATIC_LIB
 #if (QT_VERSION > QT_VERSION_CHECK(6, 2, 0))
 Q_IMPORT_QML_PLUGIN(FluentUIPlugin)
@@ -32,7 +31,8 @@ Q_IMPORT_QML_PLUGIN(FluentUIPlugin)
 #include "app_dmp.h"
 #endif
 
-int main(int argc, char *argv[]) {
+int main(int argc, char *argv[])
+{
     const char *uri = "example";
     int major = 1;
     int minor = 0;
@@ -66,8 +66,7 @@ int main(int argc, char *argv[]) {
     QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
-    QApplication::setHighDpiScaleFactorRoundingPolicy(
+    QApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
-        Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
 #endif
 #endif
     QApplication app(argc, argv);
@@ -78,8 +77,7 @@ int main(int argc, char *argv[]) {
     qmlRegisterType<NetworkCallable>(uri,major,minor,"NetworkCallable");
     qmlRegisterType<NetworkParams>(uri,major,minor,"NetworkParams");
     qmlRegisterType<OpenGLItem>(uri,major,minor,"OpenGLItem");
-    qmlRegisterUncreatableMetaObject(NetworkType::staticMetaObject, uri, major, minor,
+    qmlRegisterUncreatableMetaObject(NetworkType::staticMetaObject, uri, major, minor, "NetworkType", "Access to enums & flags only");
-                                     "NetworkType", "Access to enums & flags only");
 
     QQmlApplicationEngine engine;
     TranslateHelper::getInstance()->init(&engine);
@@ -92,13 +90,11 @@ int main(int argc, char *argv[]) {
     FluentUI::getInstance()->registerTypes(&engine);
 #endif
     const QUrl url(QStringLiteral("qrc:/example/qml/App.qml"));
-    QObject::connect(
+    QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,
-        &engine, &QQmlApplicationEngine::objectCreated, &app,
+        &app, [url](QObject *obj, const QUrl &objUrl) {
-        [url](QObject *obj, const QUrl &objUrl) {
             if (!obj && url == objUrl)
                 QCoreApplication::exit(-1);
-        },
+        }, Qt::QueuedConnection);
-        Qt::QueuedConnection);
     engine.load(url);
     const int exec = QApplication::exec();
     if (exec == 931) {

example/src/singleton.h

@@ -18,7 +18,6 @@ T *Singleton<T>::getInstance() {
 #define SINGLETON(Class)                        \
 private:                                        \
     friend class Singleton<Class>;              \
-                                                                                                   \
     public:                                     \
     static Class* getInstance() {               \
         return Singleton<Class>::getInstance(); \

example/src/stdafx.h

@@ -4,14 +4,15 @@
 Q_PROPERTY(TYPE M MEMBER _##M NOTIFY M##Changed)                                                                     \
     public:                                                                                                          \
     Q_SIGNAL void M##Changed();                                                                                      \
-    void M(TYPE in_##M) {                                                                          \
+    void M(TYPE in_##M)                                                                                              \
+{                                                                                                                    \
         _##M = in_##M;                                                                                               \
         Q_EMIT M##Changed();                                                                                         \
 }                                                                                                                    \
-    TYPE M() {                                                                                     \
+    TYPE M()                                                                                                         \
+{                                                                                                                    \
         return _##M;                                                                                                 \
 }                                                                                                                    \
-                                                                                                   \
     private:                                                                                                         \
     TYPE _##M;
 
@@ -19,14 +20,15 @@ private:
 Q_PROPERTY(TYPE M MEMBER _##M NOTIFY M##Changed)                                                                     \
     public:                                                                                                          \
     Q_SIGNAL void M##Changed();                                                                                      \
-    void M(const TYPE &in_##M) {                                                                   \
+    void M(const TYPE& in_##M)                                                                                       \
+{                                                                                                                    \
         _##M = in_##M;                                                                                               \
         Q_EMIT M##Changed();                                                                                         \
 }                                                                                                                    \
-    TYPE M() {                                                                                     \
+    TYPE M()                                                                                                         \
+{                                                                                                                    \
         return _##M;                                                                                                 \
 }                                                                                                                    \
-                                                                                                   \
     private:                                                                                                         \
     TYPE _##M;
 
@@ -35,13 +37,14 @@ private:
 Q_PROPERTY(TYPE M READ M NOTIFY M##Changed FINAL)                                                                    \
     public:                                                                                                          \
     Q_SIGNAL void M##Changed();                                                                                      \
-    void M(const TYPE &in_##M) {                                                                   \
+    void M(const TYPE& in_##M)                                                                                       \
+{                                                                                                                    \
         _##M = in_##M;                                                                                               \
         Q_EMIT M##Changed();                                                                                         \
 }                                                                                                                    \
-    TYPE M() {                                                                                     \
+    TYPE M()                                                                                                         \
+{                                                                                                                    \
         return _##M;                                                                                                 \
 }                                                                                                                    \
-                                                                                                   \
     private:                                                                                                         \
     TYPE _##M;

src/Def.h

@@ -59,7 +59,11 @@ namespace FluPageType {
 
 namespace FluWindowType {
     Q_NAMESPACE
-    enum LaunchMode { Standard = 0x0000, SingleTask = 0x0001, SingleInstance = 0x0002 };
+    enum LaunchMode {
+        Standard = 0x0000,
+        SingleTask = 0x0001,
+        SingleInstance = 0x0002
+    };
 
     Q_ENUM_NS(LaunchMode)
 
@@ -68,7 +72,11 @@ namespace FluWindowType {
 
 namespace FluTreeViewType {
     Q_NAMESPACE
-    enum SelectionMode { None = 0x0000, Single = 0x0001, Multiple = 0x0002 };
+    enum SelectionMode {
+        None = 0x0000,
+        Single = 0x0001,
+        Multiple = 0x0002
+    };
 
     Q_ENUM_NS(SelectionMode)
 
@@ -77,7 +85,12 @@ namespace FluTreeViewType {
 
 namespace FluStatusLayoutType {
     Q_NAMESPACE
-    enum StatusMode { Loading = 0x0000, Empty = 0x0001, Error = 0x0002, Success = 0x0004 };
+    enum StatusMode {
+        Loading = 0x0000,
+        Empty = 0x0001,
+        Error = 0x0002,
+        Success = 0x0004
+    };
 
     Q_ENUM_NS(StatusMode)
 
@@ -86,7 +99,11 @@ namespace FluStatusLayoutType {
 
 namespace FluContentDialogType {
     Q_NAMESPACE
-    enum ButtonFlag { NeutralButton = 0x0001, NegativeButton = 0x0002, PositiveButton = 0x0004 };
+    enum ButtonFlag {
+        NeutralButton = 0x0001,
+        NegativeButton = 0x0002,
+        PositiveButton = 0x0004
+    };
 
     Q_ENUM_NS(ButtonFlag)
 
@@ -95,7 +112,10 @@ namespace FluContentDialogType {
 
 namespace FluTimePickerType {
     Q_NAMESPACE
-    enum HourFormat { H = 0x0000, HH = 0x0001 };
+    enum HourFormat {
+        H = 0x0000,
+        HH = 0x0001
+    };
 
     Q_ENUM_NS(HourFormat)
 
@@ -104,7 +124,11 @@ namespace FluTimePickerType {
 
 namespace FluCalendarViewType {
     Q_NAMESPACE
-    enum DisplayMode { Month = 0x0000, Year = 0x0001, Decade = 0x0002 };
+    enum DisplayMode {
+        Month = 0x0000,
+        Year = 0x0001,
+        Decade = 0x0002
+    };
 
     Q_ENUM_NS(DisplayMode)
 
@@ -113,11 +137,19 @@ namespace FluCalendarViewType {
 
 namespace FluTabViewType {
     Q_NAMESPACE
-    enum TabWidthBehavior { Equal = 0x0000, SizeToContent = 0x0001, Compact = 0x0002 };
+    enum TabWidthBehavior {
+        Equal = 0x0000,
+        SizeToContent = 0x0001,
+        Compact = 0x0002
+    };
 
     Q_ENUM_NS(TabWidthBehavior)
 
-    enum CloseButtonVisibility { Never = 0x0000, Always = 0x0001, OnHover = 0x0002 };
+    enum CloseButtonVisibility {
+        Never = 0x0000,
+        Always = 0x0001,
+        OnHover = 0x0002
+    };
 
     Q_ENUM_NS(CloseButtonVisibility)
 
@@ -126,11 +158,19 @@ namespace FluTabViewType {
 
 namespace FluNavigationViewType {
     Q_NAMESPACE
-    enum DisplayMode { Open = 0x0000, Compact = 0x0001, Minimal = 0x0002, Auto = 0x0004 };
+    enum DisplayMode {
+        Open = 0x0000,
+        Compact = 0x0001,
+        Minimal = 0x0002,
+        Auto = 0x0004
+    };
 
     Q_ENUM_NS(DisplayMode)
 
-    enum PageMode { Stack = 0x0000, NoStack = 0x0001 };
+    enum PageMode {
+        Stack = 0x0000,
+        NoStack = 0x0001
+    };
 
     Q_ENUM_NS(PageMode)
 

src/FluApp.cpp

@@ -34,8 +34,7 @@ void FluApp::init(QObject *launcher, QLocale locale) {
 
 [[maybe_unused]] QJsonArray FluApp::iconData(const QString &keyword) {
     QJsonArray arr;
-    QMetaEnum enumType = FluentIcons::staticMetaObject.enumerator(
+    QMetaEnum enumType = FluentIcons::staticMetaObject.enumerator(FluentIcons::staticMetaObject.indexOfEnumerator("Type"));
-        FluentIcons::staticMetaObject.indexOfEnumerator("Type"));
     for (int i = 0; i <= enumType.keyCount() - 1; ++i) {
         QString name = enumType.key(i);
         int icon = enumType.value(i);

src/FluApp.h

@@ -17,6 +17,7 @@
  */
 class FluApp : public QObject {
 Q_OBJECT
+
 Q_PROPERTY_AUTO(bool, useSystemAppBar)
 Q_PROPERTY_AUTO(QString, windowIcon)
 Q_PROPERTY_AUTO(QLocale, locale)
@@ -32,9 +33,7 @@ private:
 public:
 SINGLETON(FluApp)
 
-    static FluApp *create(QQmlEngine *, QJSEngine *) {
+    static FluApp *create(QQmlEngine *, QJSEngine *) { return getInstance(); }
-        return getInstance();
-    }
 
     Q_INVOKABLE void init(QObject *launcher, QLocale locale = QLocale::system());
 

src/FluCaptcha.cpp

@@ -40,8 +40,7 @@ void FluCaptcha::paint(QPainter *painter) {
     for (int i = 0; i < 4; i++) {
         pen = QPen(QColor(generaNumber(255), generaNumber(255), generaNumber(255)));
         painter->setPen(pen);
-        painter->drawText(15 + 35 * i, 10 + generaNumber(15), 30, 40, Qt::AlignCenter,
+        painter->drawText(15 + 35 * i, 10 + generaNumber(15), 30, 40, Qt::AlignCenter, QString(_code[i]));
-                          QString(_code[i]));
     }
     painter->restore();
 }

src/FluCaptcha.h

@@ -11,8 +11,8 @@
 class FluCaptcha : public QQuickPaintedItem {
 Q_OBJECT
 
-    Q_PROPERTY_AUTO(QFont, font)
+Q_PROPERTY_AUTO(QFont, font);
-    Q_PROPERTY_AUTO(bool, ignoreCase)
+Q_PROPERTY_AUTO(bool, ignoreCase);
     QML_NAMED_ELEMENT(FluCaptcha)
 
 public:

src/FluColors.h

@@ -13,39 +13,39 @@
 class FluColors : public QObject {
 Q_OBJECT
 
-    Q_PROPERTY_AUTO(QColor, Transparent)
+Q_PROPERTY_AUTO(QColor, Transparent);
-    Q_PROPERTY_AUTO(QColor, Black)
+Q_PROPERTY_AUTO(QColor, Black);
-    Q_PROPERTY_AUTO(QColor, White)
+Q_PROPERTY_AUTO(QColor, White);
-    Q_PROPERTY_AUTO(QColor, Grey10)
+Q_PROPERTY_AUTO(QColor, Grey10);
-    Q_PROPERTY_AUTO(QColor, Grey20)
+Q_PROPERTY_AUTO(QColor, Grey20);
-    Q_PROPERTY_AUTO(QColor, Grey30)
+Q_PROPERTY_AUTO(QColor, Grey30);
-    Q_PROPERTY_AUTO(QColor, Grey40)
+Q_PROPERTY_AUTO(QColor, Grey40);
-    Q_PROPERTY_AUTO(QColor, Grey50)
+Q_PROPERTY_AUTO(QColor, Grey50);
-    Q_PROPERTY_AUTO(QColor, Grey60)
+Q_PROPERTY_AUTO(QColor, Grey60);
-    Q_PROPERTY_AUTO(QColor, Grey70)
+Q_PROPERTY_AUTO(QColor, Grey70);
-    Q_PROPERTY_AUTO(QColor, Grey80)
+Q_PROPERTY_AUTO(QColor, Grey80);
-    Q_PROPERTY_AUTO(QColor, Grey90)
+Q_PROPERTY_AUTO(QColor, Grey90);
-    Q_PROPERTY_AUTO(QColor, Grey100)
+Q_PROPERTY_AUTO(QColor, Grey100);
-    Q_PROPERTY_AUTO(QColor, Grey110)
+Q_PROPERTY_AUTO(QColor, Grey110);
-    Q_PROPERTY_AUTO(QColor, Grey120)
+Q_PROPERTY_AUTO(QColor, Grey120);
-    Q_PROPERTY_AUTO(QColor, Grey130)
+Q_PROPERTY_AUTO(QColor, Grey130);
-    Q_PROPERTY_AUTO(QColor, Grey140)
+Q_PROPERTY_AUTO(QColor, Grey140);
-    Q_PROPERTY_AUTO(QColor, Grey150)
+Q_PROPERTY_AUTO(QColor, Grey150);
-    Q_PROPERTY_AUTO(QColor, Grey160)
+Q_PROPERTY_AUTO(QColor, Grey160);
-    Q_PROPERTY_AUTO(QColor, Grey170)
+Q_PROPERTY_AUTO(QColor, Grey170);
-    Q_PROPERTY_AUTO(QColor, Grey180)
+Q_PROPERTY_AUTO(QColor, Grey180);
-    Q_PROPERTY_AUTO(QColor, Grey190)
+Q_PROPERTY_AUTO(QColor, Grey190);
-    Q_PROPERTY_AUTO(QColor, Grey200)
+Q_PROPERTY_AUTO(QColor, Grey200);
-    Q_PROPERTY_AUTO(QColor, Grey210)
+Q_PROPERTY_AUTO(QColor, Grey210);
-    Q_PROPERTY_AUTO(QColor, Grey220)
+Q_PROPERTY_AUTO(QColor, Grey220);
-    Q_PROPERTY_AUTO_P(FluAccentColor *, Yellow)
+Q_PROPERTY_AUTO_P(FluAccentColor*, Yellow);
-    Q_PROPERTY_AUTO_P(FluAccentColor *, Orange)
+Q_PROPERTY_AUTO_P(FluAccentColor*, Orange);
-    Q_PROPERTY_AUTO_P(FluAccentColor *, Red)
+Q_PROPERTY_AUTO_P(FluAccentColor*, Red);
-    Q_PROPERTY_AUTO_P(FluAccentColor *, Magenta)
+Q_PROPERTY_AUTO_P(FluAccentColor*, Magenta);
-    Q_PROPERTY_AUTO_P(FluAccentColor *, Purple)
+Q_PROPERTY_AUTO_P(FluAccentColor*, Purple);
-    Q_PROPERTY_AUTO_P(FluAccentColor *, Blue)
+Q_PROPERTY_AUTO_P(FluAccentColor*, Blue);
-    Q_PROPERTY_AUTO_P(FluAccentColor *, Teal)
+Q_PROPERTY_AUTO_P(FluAccentColor*, Teal);
-    Q_PROPERTY_AUTO_P(FluAccentColor *, Green)
+Q_PROPERTY_AUTO_P(FluAccentColor*, Green);
     QML_NAMED_ELEMENT(FluColors)
     QML_SINGLETON
 
@@ -57,7 +57,5 @@ public:
 
     [[maybe_unused]] Q_INVOKABLE FluAccentColor *createAccentColor(const QColor &primaryColor);
 
-    static FluColors *create(QQmlEngine *, QJSEngine *) {
+    static FluColors *create(QQmlEngine *, QJSEngine *) { return getInstance(); }
-        return getInstance();
-    }
 };

src/FluFrameless.h

@@ -14,6 +14,7 @@ using QT_NATIVE_EVENT_RESULT_TYPE = long;
 using QT_ENTER_EVENT_TYPE = QEvent;
 #endif
 
+
 class FluFrameless : public QQuickItem, QAbstractNativeEventFilter {
 Q_OBJECT
 Q_PROPERTY_AUTO_P(QQuickItem*, appbar)
@@ -31,8 +32,7 @@ public:
 
     void componentComplete() override;
 
-    [[maybe_unused]] bool nativeEventFilter(const QByteArray &eventType, void *message,
+    [[maybe_unused]] bool nativeEventFilter(const QByteArray &eventType, void *message, QT_NATIVE_EVENT_RESULT_TYPE *result) override;
-                                            QT_NATIVE_EVENT_RESULT_TYPE *result) override;
 
     [[maybe_unused]] Q_INVOKABLE void showFullScreen();
 

src/FluHotkey.cpp

@@ -1,9 +1,11 @@
 #include "FluHotkey.h"
 
+
 #include "QGuiApplication"
 
-
+FluHotkey::FluHotkey(QObject *parent)
-FluHotkey::FluHotkey(QObject *parent) : QObject{parent} {
+    : QObject{parent}
+{
     _sequence = "";
     _isRegistered = false;
     connect(this,&FluHotkey::sequenceChanged,this,[=]{
@@ -13,9 +15,12 @@ FluHotkey::FluHotkey(QObject *parent) : QObject{parent} {
         }
         _hotkey = new QHotkey(QKeySequence(_sequence), true, qApp);
         this->isRegistered(_hotkey->isRegistered());
-        QObject::connect(_hotkey, &QHotkey::activated, qApp, [=]() { Q_EMIT this->activated(); });
+        QObject::connect(_hotkey, &QHotkey::activated, qApp, [=](){
-        QObject::connect(_hotkey, &QHotkey::registeredChanged, qApp,
+            Q_EMIT this->activated();
-                         [=]() { this->isRegistered(_hotkey->isRegistered()); });
+        });
+        QObject::connect(_hotkey, &QHotkey::registeredChanged, qApp, [=](){
+            this->isRegistered(_hotkey->isRegistered());
+        });
     });
 }
 

src/FluHotkey.h

@@ -6,8 +6,8 @@
 #include "qhotkey/qhotkey.h"
 #include "stdafx.h"
 
-class FluHotkey : public QObject {
+class FluHotkey : public QObject
-
+{
     Q_OBJECT
     Q_PROPERTY_AUTO(QString,sequence)
     Q_PROPERTY_AUTO(QString,name)
@@ -17,7 +17,6 @@ public:
     explicit FluHotkey(QObject *parent = nullptr);
     ~FluHotkey();
     Q_SIGNAL void activated();
-
 private:
     QHotkey* _hotkey = nullptr;
 };

src/FluQrCodeItem.h

@@ -14,7 +14,7 @@ class FluQrCodeItem : public QQuickPaintedItem {
 Q_PROPERTY_AUTO(QString, text)
 Q_PROPERTY_AUTO(QColor, color)
 Q_PROPERTY_AUTO(QColor, bgColor)
-    Q_PROPERTY_AUTO(int, size)
+Q_PROPERTY_AUTO(int, size);
     QML_NAMED_ELEMENT(FluQrCodeItem)
 public:
     explicit FluQrCodeItem(QQuickItem *parent = nullptr);

src/FluRectangle.cpp

@@ -8,7 +8,6 @@ FluRectangle::FluRectangle(QQuickItem *parent) : QQuickPaintedItem(parent) {
     connect(this, &FluRectangle::radiusChanged, this, [=] { update(); });
 }
 
-
 void FluRectangle::paint(QPainter *painter) {
     painter->save();
     painter->setRenderHint(QPainter::Antialiasing);
@@ -16,19 +15,13 @@ void FluRectangle::paint(QPainter *painter) {
     QRectF rect = boundingRect();
     path.moveTo(rect.bottomRight() - QPointF(0, _radius[2]));
     path.lineTo(rect.topRight() + QPointF(0, _radius[1]));
-    path.arcTo(QRectF(QPointF(rect.topRight() - QPointF(_radius[1] * 2, 0)),
+    path.arcTo(QRectF(QPointF(rect.topRight() - QPointF(_radius[1] * 2, 0)), QSize(_radius[1] * 2, _radius[1] * 2)), 0, 90);
-                      QSize(_radius[1] * 2, _radius[1] * 2)),
-               0, 90);
     path.lineTo(rect.topLeft() + QPointF(_radius[0], 0));
     path.arcTo(QRectF(QPointF(rect.topLeft()), QSize(_radius[0] * 2, _radius[0] * 2)), 90, 90);
     path.lineTo(rect.bottomLeft() - QPointF(0, _radius[3]));
-    path.arcTo(QRectF(QPointF(rect.bottomLeft() - QPointF(0, _radius[3] * 2)),
+    path.arcTo(QRectF(QPointF(rect.bottomLeft() - QPointF(0, _radius[3] * 2)), QSize(_radius[3] * 2, _radius[3] * 2)), 180, 90);
-                      QSize(_radius[3] * 2, _radius[3] * 2)),
-               180, 90);
     path.lineTo(rect.bottomRight() - QPointF(_radius[2], 0));
-    path.arcTo(QRectF(QPointF(rect.bottomRight() - QPointF(_radius[2] * 2, _radius[2] * 2)),
+    path.arcTo(QRectF(QPointF(rect.bottomRight() - QPointF(_radius[2] * 2, _radius[2] * 2)), QSize(_radius[2] * 2, _radius[2] * 2)), 270, 90);
-                      QSize(_radius[2] * 2, _radius[2] * 2)),
-               270, 90);
     painter->fillPath(path, _color);
     painter->restore();
 }

src/FluTableModel.cpp

@@ -1,13 +1,13 @@
 #include "FluTableModel.h"
 
 FluTableModel::FluTableModel(QObject *parent) : QAbstractTableModel{parent} {
+
 }
 
 int FluTableModel::rowCount(const QModelIndex &parent) const {
     return _rows.count();
 }
 
-
 int FluTableModel::columnCount(const QModelIndex &parent) const {
     return this->_columnSource.size();
 }

src/FluTableModel.h

@@ -13,8 +13,10 @@ class FluTableModel : public QAbstractTableModel {
     Q_PROPERTY(int rowCount READ rowCount CONSTANT)
     QML_NAMED_ELEMENT(FluTableModel)
 public:
-    enum TableModelRoles { RowModel = 0x0101, ColumnModel = 0x0102 };
+    enum TableModelRoles {
-
+        RowModel = 0x0101,
+        ColumnModel = 0x0102
+    };
 
     explicit FluTableModel(QObject *parent = nullptr);
 
@@ -22,8 +24,7 @@ public:
 
     [[nodiscard]] int columnCount(const QModelIndex &parent = {}) const override;
 
-    [[nodiscard]] QVariant data(const QModelIndex &index,
+    [[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-                                int role = Qt::DisplayRole) const override;
 
     [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
 
@@ -38,6 +39,7 @@ public:
     Q_INVOKABLE void removeRow(int rowIndex, int rows = 1);
 
     Q_INVOKABLE void appendRow(QVariant row);
+
 };
 
 

src/FluTableSortProxyModel.cpp

@@ -2,14 +2,13 @@
 
 #include <QJSValueList>
 
-FluTableSortProxyModel::FluTableSortProxyModel(QSortFilterProxyModel *parent)
+FluTableSortProxyModel::FluTableSortProxyModel(QSortFilterProxyModel *parent) : QSortFilterProxyModel{parent} {
-    : QSortFilterProxyModel{parent} {
+    connect(this, &FluTableSortProxyModel::modelChanged, this, [=] {
-    connect(this, &FluTableSortProxyModel::modelChanged, this,
+        setSourceModel(this->model().value<QAbstractTableModel *>());
-            [=] { setSourceModel(this->model().value<QAbstractTableModel *>()); });
+    });
 }
 
-bool FluTableSortProxyModel::filterAcceptsRow(int source_row,
+bool FluTableSortProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const {
-                                              const QModelIndex &source_parent) const {
     QJSValue filter = _filter;
     if (filter.isUndefined()) {
         return true;
@@ -19,13 +18,11 @@ bool FluTableSortProxyModel::filterAcceptsRow(int source_row,
     return filter.call(data).toBool();
 }
 
-bool FluTableSortProxyModel::filterAcceptsColumn(int source_column,
+bool FluTableSortProxyModel::filterAcceptsColumn(int source_column, const QModelIndex &source_parent) const {
-                                                 const QModelIndex &source_parent) const {
     return true;
 }
 
-bool FluTableSortProxyModel::lessThan(const QModelIndex &source_left,
+bool FluTableSortProxyModel::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const {
-                                      const QModelIndex &source_right) const {
     QJSValue comparator = _comparator;
     if (comparator.isUndefined()) {
         return true;
@@ -61,25 +58,18 @@ bool FluTableSortProxyModel::lessThan(const QModelIndex &source_left,
 
 [[maybe_unused]] QVariant FluTableSortProxyModel::getRow(int rowIndex) {
     QVariant result;
-    QMetaObject::invokeMethod(_model.value<QAbstractTableModel *>(), "getRow",
+    QMetaObject::invokeMethod(_model.value<QAbstractTableModel *>(), "getRow", Q_RETURN_ARG(QVariant, result), Q_ARG(int, mapToSource(index(rowIndex, 0)).row()));
-                              Q_RETURN_ARG(QVariant, result),
-                              Q_ARG(int, mapToSource(index(rowIndex, 0)).row()));
     return result;
 }
 
 [[maybe_unused]] void FluTableSortProxyModel::setRow(int rowIndex, const QVariant &val) {
-    QMetaObject::invokeMethod(_model.value<QAbstractTableModel *>(), "setRow",
+    QMetaObject::invokeMethod(_model.value<QAbstractTableModel *>(), "setRow", Q_ARG(int, mapToSource(index(rowIndex, 0)).row()), Q_ARG(QVariant, val));
-                              Q_ARG(int, mapToSource(index(rowIndex, 0)).row()),
-                              Q_ARG(QVariant, val));
 }
 
 [[maybe_unused]] void FluTableSortProxyModel::insertRow(int rowIndex, const QVariant &val) {
-    QMetaObject::invokeMethod(_model.value<QAbstractTableModel *>(), "insertRow",
+    QMetaObject::invokeMethod(_model.value<QAbstractTableModel *>(), "insertRow", Q_ARG(int, mapToSource(index(rowIndex, 0)).row()), Q_ARG(QVariant, val));
-                              Q_ARG(int, mapToSource(index(rowIndex, 0)).row()),
-                              Q_ARG(QVariant, val));
 }
 
 [[maybe_unused]] void FluTableSortProxyModel::removeRow(int rowIndex, int rows) {
-    QMetaObject::invokeMethod(_model.value<QAbstractTableModel *>(), "removeRow",
+    QMetaObject::invokeMethod(_model.value<QAbstractTableModel *>(), "removeRow", Q_ARG(int, mapToSource(index(rowIndex, 0)).row()), Q_ARG(int, rows));
-                              Q_ARG(int, mapToSource(index(rowIndex, 0)).row()), Q_ARG(int, rows));
 }

src/FluTextStyle.h

@@ -11,16 +11,15 @@
  */
 class FluTextStyle : public QObject {
 Q_OBJECT
-
 public:
 Q_PROPERTY_AUTO(QString, family)
-    Q_PROPERTY_AUTO(QFont, Caption)
+Q_PROPERTY_AUTO(QFont, Caption);
-    Q_PROPERTY_AUTO(QFont, Body)
+Q_PROPERTY_AUTO(QFont, Body);
-    Q_PROPERTY_AUTO(QFont, BodyStrong)
+Q_PROPERTY_AUTO(QFont, BodyStrong);
-    Q_PROPERTY_AUTO(QFont, Subtitle)
+Q_PROPERTY_AUTO(QFont, Subtitle);
-    Q_PROPERTY_AUTO(QFont, Title)
+Q_PROPERTY_AUTO(QFont, Title);
-    Q_PROPERTY_AUTO(QFont, TitleLarge)
+Q_PROPERTY_AUTO(QFont, TitleLarge);
-    Q_PROPERTY_AUTO(QFont, Display)
+Q_PROPERTY_AUTO(QFont, Display);
     QML_NAMED_ELEMENT(FluTextStyle)
     QML_SINGLETON
 
@@ -30,7 +29,5 @@ private:
 public:
 SINGLETON(FluTextStyle)
 
-    static FluTextStyle *create(QQmlEngine *, QJSEngine *) {
+    static FluTextStyle *create(QQmlEngine *, QJSEngine *) { return getInstance(); }
-        return getInstance();
-    }
 };

src/FluTheme.cpp

@@ -24,13 +24,15 @@ FluTheme::FluTheme(QObject *parent) : QObject{parent} {
     _blurBehindWindowEnabled = false;
     QGuiApplication::instance()->installEventFilter(this);
     refreshColors();
-    connect(this, &FluTheme::darkModeChanged, this, [=] { Q_EMIT darkChanged(); });
+    connect(this, &FluTheme::darkModeChanged, this, [=] {
+        Q_EMIT darkChanged();
+    });
     connect(this, &FluTheme::darkChanged, this, [=] { refreshColors(); });
     connect(this, &FluTheme::accentColorChanged, this, [=] { refreshColors(); });
-    connect(&_watcher, &QFileSystemWatcher::fileChanged, this,
+    connect(&_watcher, &QFileSystemWatcher::fileChanged, this, [=](const QString &path) {
-            [=](const QString &path) { Q_EMIT desktopImagePathChanged(); });
+        Q_EMIT desktopImagePathChanged();
-    connect(this, &FluTheme::blurBehindWindowEnabledChanged, this,
+    });
-            [=] { checkUpdateDesktopImage(); });
+    connect(this, &FluTheme::blurBehindWindowEnabledChanged, this, [=] { checkUpdateDesktopImage(); });
     startTimer(1000);
 }
 
@@ -45,16 +47,11 @@ void FluTheme::refreshColors() {
     fontSecondaryColor(isDark ? QColor(222, 222, 222, 255) : QColor(102, 102, 102, 255));
     fontTertiaryColor(isDark ? QColor(200, 200, 200, 255) : QColor(153, 153, 153, 255));
     itemNormalColor(isDark ? QColor(255, 255, 255, 0) : QColor(0, 0, 0, 0));
-    frameColor(isDark ? QColor(56, 56, 56, qRound(255 * 0.8))
+    frameColor(isDark ? QColor(56, 56, 56, qRound(255 * 0.8)) : QColor(243, 243, 243, qRound(255 * 0.8)));
-                      : QColor(243, 243, 243, qRound(255 * 0.8)));
+    frameActiveColor(isDark ? QColor(48, 48, 48, qRound(255 * 0.8)) : QColor(255, 255, 255, qRound(255 * 0.8)));
-    frameActiveColor(isDark ? QColor(48, 48, 48, qRound(255 * 0.8))
+    itemHoverColor(isDark ? QColor(255, 255, 255, qRound(255 * 0.06)) : QColor(0, 0, 0, qRound(255 * 0.03)));
-                            : QColor(255, 255, 255, qRound(255 * 0.8)));
+    itemPressColor(isDark ? QColor(255, 255, 255, qRound(255 * 0.09)) : QColor(0, 0, 0, qRound(255 * 0.06)));
-    itemHoverColor(isDark ? QColor(255, 255, 255, qRound(255 * 0.06))
+    itemCheckColor(isDark ? QColor(255, 255, 255, qRound(255 * 0.12)) : QColor(0, 0, 0, qRound(255 * 0.09)));
-                          : QColor(0, 0, 0, qRound(255 * 0.03)));
-    itemPressColor(isDark ? QColor(255, 255, 255, qRound(255 * 0.09))
-                          : QColor(0, 0, 0, qRound(255 * 0.06)));
-    itemCheckColor(isDark ? QColor(255, 255, 255, qRound(255 * 0.12))
-                          : QColor(0, 0, 0, qRound(255 * 0.09)));
 }
 
 bool FluTheme::eventFilter(QObject *, QEvent *event) {

src/FluTheme.h

@@ -18,26 +18,26 @@
 class FluTheme : public QObject {
 Q_OBJECT
     Q_PROPERTY(bool dark READ dark NOTIFY darkChanged)
-    Q_PROPERTY_AUTO_P(FluAccentColor *, accentColor)
+Q_PROPERTY_AUTO_P(FluAccentColor*, accentColor);
-    Q_PROPERTY_AUTO(QColor, primaryColor)
+Q_PROPERTY_AUTO(QColor, primaryColor);
-    Q_PROPERTY_AUTO(QColor, backgroundColor)
+Q_PROPERTY_AUTO(QColor, backgroundColor);
-    Q_PROPERTY_AUTO(QColor, dividerColor)
+Q_PROPERTY_AUTO(QColor, dividerColor);
-    Q_PROPERTY_AUTO(QColor, windowBackgroundColor)
+Q_PROPERTY_AUTO(QColor, windowBackgroundColor);
-    Q_PROPERTY_AUTO(QColor, windowActiveBackgroundColor)
+Q_PROPERTY_AUTO(QColor, windowActiveBackgroundColor);
-    Q_PROPERTY_AUTO(QColor, fontPrimaryColor)
+Q_PROPERTY_AUTO(QColor, fontPrimaryColor);
-    Q_PROPERTY_AUTO(QColor, fontSecondaryColor)
+Q_PROPERTY_AUTO(QColor, fontSecondaryColor);
-    Q_PROPERTY_AUTO(QColor, fontTertiaryColor)
+Q_PROPERTY_AUTO(QColor, fontTertiaryColor);
-    Q_PROPERTY_AUTO(QColor, itemNormalColor)
+Q_PROPERTY_AUTO(QColor, itemNormalColor);
-    Q_PROPERTY_AUTO(QColor, frameColor)
+Q_PROPERTY_AUTO(QColor, frameColor);
-    Q_PROPERTY_AUTO(QColor, frameActiveColor)
+Q_PROPERTY_AUTO(QColor, frameActiveColor);
-    Q_PROPERTY_AUTO(QColor, itemHoverColor)
+Q_PROPERTY_AUTO(QColor, itemHoverColor);
-    Q_PROPERTY_AUTO(QColor, itemPressColor)
+Q_PROPERTY_AUTO(QColor, itemPressColor);
-    Q_PROPERTY_AUTO(QColor, itemCheckColor)
+Q_PROPERTY_AUTO(QColor, itemCheckColor);
-    Q_PROPERTY_AUTO(QString, desktopImagePath)
+Q_PROPERTY_AUTO(QString, desktopImagePath);
-    Q_PROPERTY_AUTO(int, darkMode)
+Q_PROPERTY_AUTO(int, darkMode);
-    Q_PROPERTY_AUTO(bool, nativeText)
+Q_PROPERTY_AUTO(bool, nativeText);
-    Q_PROPERTY_AUTO(bool, animationEnabled)
+Q_PROPERTY_AUTO(bool, animationEnabled);
-    Q_PROPERTY_AUTO(bool, blurBehindWindowEnabled)
+Q_PROPERTY_AUTO(bool, blurBehindWindowEnabled);
     QML_NAMED_ELEMENT(FluTheme)
     QML_SINGLETON
 
@@ -49,6 +49,7 @@ private:
     void refreshColors();
 
 protected:
+
     void timerEvent(QTimerEvent *event) override;
 
     void checkUpdateDesktopImage();
@@ -58,9 +59,7 @@ public:
 
     Q_SIGNAL void darkChanged();
 
-    static FluTheme *create(QQmlEngine *, QJSEngine *) {
+    static FluTheme *create(QQmlEngine *, QJSEngine *) { return getInstance(); }
-        return getInstance();
-    }
 
     bool dark() const;
 

src/FluTools.cpp

@@ -25,6 +25,7 @@
 #endif
 
 FluTools::FluTools(QObject *parent) : QObject{parent} {
+
 }
 
 void FluTools::clipText(const QString &text) {
@@ -167,8 +168,7 @@ void FluTools::showFileInFolder(const QString &path) {
     QProcess::startDetached(process, arguments);
 #endif
 #if defined(Q_OS_MACOS)
-    QProcess::execute("/usr/bin/osascript",
+    QProcess::execute("/usr/bin/osascript", {"-e", "tell application \"Finder\" to reveal POSIX file \"" + path + "\""});
-                      {"-e", "tell application \"Finder\" to reveal POSIX file \"" + path + "\""});
     QProcess::execute("/usr/bin/osascript", {"-e", "tell application \"Finder\" to activate"});
 #endif
 }
@@ -206,9 +206,7 @@ int FluTools::cursorScreenIndex() {
 
 int FluTools::windowBuildNumber() {
 #if defined(Q_OS_WIN)
-    QSettings regKey{
+    QSettings regKey{QString::fromUtf8(R"(HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion)"), QSettings::NativeFormat};
-        QString::fromUtf8(R"(HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion)"),
-        QSettings::NativeFormat};
     if (regKey.contains(QString::fromUtf8("CurrentBuildNumber"))) {
         auto buildNumber = regKey.value(QString::fromUtf8("CurrentBuildNumber")).toInt();
         return buildNumber;
@@ -315,7 +313,5 @@ QColor FluTools::imageMainColor(const QImage &image, double bright) {
             }
         }
     }
-    return QColor(int(bright * r / t) > 255 ? 255 : int(bright * r / t),
+    return QColor(int(bright * r / t) > 255 ? 255 : int(bright * r / t), int(bright * g / t) > 255 ? 255 : int(bright * g / t), int(bright * b / t) > 255 ? 255 : int(bright * b / t));
-                  int(bright * g / t) > 255 ? 255 : int(bright * g / t),
-                  int(bright * b / t) > 255 ? 255 : int(bright * b / t));
 }

src/FluTools.h

@@ -21,9 +21,7 @@ private:
 public:
 SINGLETON(FluTools)
 
-    static FluTools *create(QQmlEngine *, QJSEngine *) {
+    static FluTools *create(QQmlEngine *, QJSEngine *) { return getInstance(); }
-        return getInstance();
-    }
 
     Q_INVOKABLE int qtMajor();
 

src/FluTreeModel.cpp

@@ -102,6 +102,7 @@ void FluTreeModel::checkRow(int row, bool checked) {
         itemData->_checked = checked;
     }
     Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0));
+
 }
 
 void FluTreeModel::setDataSource(QList<QMap<QString, QVariant>> data) {

src/FluTreeModel.h

@@ -7,7 +7,6 @@
 #include <QtQml/qqml.h>
 #include "stdafx.h"
 
-
 /**
  * @brief The FluTreeNode class
  */
@@ -20,21 +19,13 @@ class FluTreeNode : public QObject {
 public:
     explicit FluTreeNode(QObject *parent = nullptr);
 
-    [[nodiscard]] Q_INVOKABLE int depth() const {
+    [[nodiscard]] Q_INVOKABLE int depth() const { return _depth; };
-        return _depth;
-    };
 
-    [[nodiscard]] Q_INVOKABLE bool isExpanded() const {
+    [[nodiscard]] Q_INVOKABLE bool isExpanded() const { return _isExpanded; };
-        return _isExpanded;
-    };
 
-    [[nodiscard]] Q_INVOKABLE QVariantMap data() const {
+    [[nodiscard]] Q_INVOKABLE QVariantMap data() const { return _data; };
-        return _data;
-    };
 
-    [[nodiscard]] Q_INVOKABLE bool hasChildren() const {
+    [[nodiscard]] Q_INVOKABLE bool hasChildren() const { return !_children.isEmpty(); };
-        return !_children.isEmpty();
-    };
 
     Q_INVOKABLE bool hasNextNodeByIndex(int index) {
         FluTreeNode *p = this;
@@ -101,7 +92,10 @@ class FluTreeModel : public QAbstractTableModel {
 Q_PROPERTY_AUTO(QList<QVariantMap>, columnSource)
     QML_NAMED_ELEMENT(FluTreeModel)
 public:
-    enum TreeModelRoles { RowModel = 0x0101, ColumnModel = 0x0102 };
+    enum TreeModelRoles {
+        RowModel = 0x0101,
+        ColumnModel = 0x0102
+    };
 
     explicit FluTreeModel(QObject *parent = nullptr);
 
@@ -109,8 +103,7 @@ public:
 
     [[nodiscard]] int columnCount(const QModelIndex &parent = {}) const override;
 
-    [[nodiscard]] QVariant data(const QModelIndex &index,
+    [[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-                                int role = Qt::DisplayRole) const override;
 
     [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
 

src/FluWatermark.cpp

@@ -17,7 +17,6 @@ FluWatermark::FluWatermark(QQuickItem *parent) : QQuickPaintedItem(parent) {
     connect(this, &FluWatermark::textSizeChanged, this, [=] { update(); });
 }
 
-
 void FluWatermark::paint(QPainter *painter) {
     QFont font;
     font.setFamily(FluTextStyle::getInstance()->family());
@@ -38,8 +37,7 @@ void FluWatermark::paint(QPainter *painter) {
             painter->save();
             painter->translate(centerX, centerY);
             painter->rotate(_rotate);
-            painter->drawText(QRectF(-fontWidth / 2.0, -fontHeight / 2.0, fontWidth, fontHeight),
+            painter->drawText(QRectF(-fontWidth / 2.0, -fontHeight / 2.0, fontWidth, fontHeight), _text);
-                              _text);
             painter->restore();
         }
     }

src/qhotkey/qhotkey_x11.cpp

@@ -132,7 +132,7 @@ quint32 QHotkeyPrivateX11::nativeKeycode(Qt::Key keycode, bool &ok)
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 2, 0)
 	const QNativeInterface::QX11Application *x11Interface = qGuiApp->nativeInterface<QNativeInterface::QX11Application>();
-	Display *display = x11Interface ? x11Interface->display() : nullptr;
+	Display *display = x11Interface->display();
 #else
 	const bool x11Interface = QX11Info::isPlatformX11();
 	Display *display = QX11Info::display();

src/singleton.h

@@ -1,6 +1,5 @@
 #pragma once
 
-
 /**
  * @brief The Singleton class
  */
@@ -19,7 +18,6 @@ T *Singleton<T>::getInstance() {
 #define SINGLETON(Class)                        \
 private:                                        \
     friend class Singleton<Class>;              \
-                                                                                                   \
     public:                                     \
     static Class* getInstance() {               \
         return Singleton<Class>::getInstance(); \

src/stdafx.h

@@ -1,18 +1,18 @@
 #pragma once
 
-
 #define Q_PROPERTY_AUTO_P(TYPE, M)                                                                                   \
 Q_PROPERTY(TYPE M MEMBER _##M NOTIFY M##Changed)                                                                     \
     public:                                                                                                          \
     Q_SIGNAL void M##Changed();                                                                                      \
-    void M(TYPE in_##M) {                                                                          \
+    void M(TYPE in_##M)                                                                                              \
+{                                                                                                                    \
         _##M = in_##M;                                                                                               \
         Q_EMIT M##Changed();                                                                                         \
 }                                                                                                                    \
-    TYPE M() {                                                                                     \
+    TYPE M()                                                                                                         \
+{                                                                                                                    \
         return _##M;                                                                                                 \
 }                                                                                                                    \
-                                                                                                   \
     private:                                                                                                         \
     TYPE _##M;
 
@@ -20,14 +20,15 @@ private:
 Q_PROPERTY(TYPE M MEMBER _##M NOTIFY M##Changed)                                                                     \
     public:                                                                                                          \
     Q_SIGNAL void M##Changed();                                                                                      \
-    void M(const TYPE &in_##M) {                                                                   \
+    void M(const TYPE& in_##M)                                                                                       \
+{                                                                                                                    \
         _##M = in_##M;                                                                                               \
         Q_EMIT M##Changed();                                                                                         \
 }                                                                                                                    \
-    TYPE M() {                                                                                     \
+    TYPE M()                                                                                                         \
+{                                                                                                                    \
         return _##M;                                                                                                 \
 }                                                                                                                    \
-                                                                                                   \
     private:                                                                                                         \
     TYPE _##M;
 
@@ -36,13 +37,14 @@ private:
 Q_PROPERTY(TYPE M READ M NOTIFY M##Changed FINAL)                                                                    \
     public:                                                                                                          \
     Q_SIGNAL void M##Changed();                                                                                      \
-    void M(const TYPE &in_##M) {                                                                   \
+    void M(const TYPE& in_##M)                                                                                       \
+{                                                                                                                    \
         _##M = in_##M;                                                                                               \
         Q_EMIT M##Changed();                                                                                         \
 }                                                                                                                    \
-    TYPE M() {                                                                                     \
+    TYPE M()                                                                                                         \
+{                                                                                                                    \
         return _##M;                                                                                                 \
 }                                                                                                                    \
-                                                                                                   \
     private:                                                                                                         \
     TYPE _##M;