refactor: 整理Qt项目配置并优化SqliteWAL模块

RealChuan · RealChuan · commit 016428104cc7 · 2026-07-03T14:16:07.000+08:00
1.  合并所有.pro文件的QT模块声明，简化跨版本配置
2.  重构SqliteWAL模块：移除旧main.cc，新增单元测试，替换宏为函数，优化代码风格与线程安全
3.  修正导航进度条的冗余变量判断
4.  更新C++现代编程规范文档
diff --git a/.trae/rules/cpp-modern.md b/.trae/rules/cpp-modern.md
@@ -5,7 +5,6 @@
 - 用 `concepts` 约束模板，替代 SFINAE
 - 用 `std::format` 替代 printf/iostream 格式化
 - 优先用 `std::ranges` 算法替代手写循环
-- 用 `std::jthread` 替代 `std::thread`（自动 join）
 - 禁止裸 `new`/`delete`；用 `std::make_unique`/`std::make_shared`
 - 适当标记 `[[nodiscard]]`、`[[deprecated]]`
 - 用结构化绑定处理多返回值
diff --git a/src/AutoStartManager/AutoStartManager.pro b/src/AutoStartManager/AutoStartManager.pro
@@ -1,8 +1,6 @@
 include(../../qmake/ProjectSettings.pri)
 
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT       += core gui widgets
 
 SOURCES += \
     main.cc \
diff --git a/src/Battery/Battery.pro b/src/Battery/Battery.pro
@@ -1,8 +1,6 @@
 include(../../qmake/ProjectSettings.pri)
 
-QT       += core gui 
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT       += core gui widgets
 
 SOURCES += \
     batterywidget.cc \
diff --git a/src/Bubble/Bubble.pro b/src/Bubble/Bubble.pro
@@ -1,8 +1,6 @@
 include(../../qmake/ProjectSettings.pri)
 
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT       += core gui widgets
 
 SOURCES += \
     bubblewidget.cc \
diff --git a/src/ButtonIconStateManager/ButtonIconStateManager.pro b/src/ButtonIconStateManager/ButtonIconStateManager.pro
@@ -1,8 +1,6 @@
 include(../../qmake/ProjectSettings.pri)
 
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT       += core gui widgets
 
 SOURCES += \
     buttoniconstatemanager.cc \
diff --git a/src/Carousel3DView/Carousel3DView.pro b/src/Carousel3DView/Carousel3DView.pro
@@ -1,8 +1,6 @@
 include(../../qmake/ProjectSettings.pri)
 
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT       += core gui widgets
 
 SOURCES += \
     carousel3dview.cc \
diff --git a/src/Chart/Chart.pro b/src/Chart/Chart.pro
@@ -1,8 +1,6 @@
 include(../../qmake/ProjectSettings.pri)
 
-QT       += core gui charts
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT       += core gui charts widgets
 
 SOURCES += \
     areachart.cc \
diff --git a/src/CheckableTreeItem/CheckableTreeItem.pro b/src/CheckableTreeItem/CheckableTreeItem.pro
@@ -1,8 +1,6 @@
 include(../../qmake/ProjectSettings.pri)
 
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT       += core gui widgets
 
 SOURCES += \
     checkabletreeitem.cc \
diff --git a/src/CircularProgress/CircularProgress.pro b/src/CircularProgress/CircularProgress.pro
@@ -1,8 +1,6 @@
 include(../../qmake/ProjectSettings.pri)
 
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT       += core gui widgets
 
 SOURCES += \
     circularprogress.cc \
diff --git a/src/Clock/Clock.pro b/src/Clock/Clock.pro
@@ -1,8 +1,6 @@
 include(../../qmake/ProjectSettings.pri)
 
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT       += core gui widgets
 
 SOURCES += \
     clockwidget.cc \
diff --git a/src/DashBoard/DashBoard.pro b/src/DashBoard/DashBoard.pro
@@ -1,8 +1,6 @@
 include(../../qmake/ProjectSettings.pri)
 
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT       += core gui widgets
 
 SOURCES += \
     dashboardwidget.cc \
diff --git a/src/GridViewModel/GridViewModel.pro b/src/GridViewModel/GridViewModel.pro
@@ -1,8 +1,6 @@
 include(../../qmake/ProjectSettings.pri)
 
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT       += core gui widgets
 
 SOURCES += \
     gridmodel.cc \
diff --git a/src/LoadingIndicator/LoadingIndicator.pro b/src/LoadingIndicator/LoadingIndicator.pro
@@ -1,8 +1,6 @@
 include(../../qmake/ProjectSettings.pri)
 
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT       += core gui widgets
 
 SOURCES += \
     loadingindicator.cc \
diff --git a/src/NavigationProgressBar/NavigationProgressBar.pro b/src/NavigationProgressBar/NavigationProgressBar.pro
@@ -1,8 +1,6 @@
 include(../../qmake/ProjectSettings.pri)
 
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT       += core gui widgets
 
 SOURCES += \
     main.cc \
diff --git a/src/NavigationProgressBar/navigationprogressbar.cc b/src/NavigationProgressBar/navigationprogressbar.cc
@@ -305,7 +305,6 @@ auto NavigationProgressBar::drawCompleteProgress(QPainter &painter) -> void
         }
 
         const bool segmentCompleted = (i < d_ptr->step - 1) || (i == d_ptr->step - 1);
-        const bool segmentActive = (i == d_ptr->step - 1);
 
         if (segmentCompleted) {
             // 已完成连接线 - 实线，粗
@@ -331,7 +330,6 @@ auto NavigationProgressBar::drawCompleteProgress(QPainter &painter) -> void
     for (int i = 0; i < d_ptr->maxStep; i++) {
         const double cx = d_ptr->spacing + w * i + w / 2.0;
         const bool isCompleted = i < d_ptr->step;
-        const bool isCurrent = i == d_ptr->step - 1 || (i == 0 && d_ptr->step == 0 && i == 0);
 
         if (isCompleted) {
             // 已完成步骤 - 实心圆 + 对勾
diff --git a/src/PasswordLineEdit/PasswordLineEdit.pro b/src/PasswordLineEdit/PasswordLineEdit.pro
@@ -1,8 +1,6 @@
 include(../../qmake/ProjectSettings.pri)
 
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT       += core gui widgets
 
 SOURCES += \
     main.cc \
diff --git a/src/ProgressBar/ProgressBar.pro b/src/ProgressBar/ProgressBar.pro
@@ -1,8 +1,6 @@
 include(../../qmake/ProjectSettings.pri)
 
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT       += core gui widgets
 
 SOURCES += \
     main.cc \
diff --git a/src/SqliteWAL/CMakeLists.txt b/src/SqliteWAL/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(PROJECT_SOURCES sqlitetest.cc sqlitetest.hpp sqliteutils.cc sqliteutils.hpp
-                    main.cc)
+                    sqlitewal_unittest.cc)
 
-qt_add_executable(SqliteWAL ${PROJECT_SOURCES})
-target_link_libraries(SqliteWAL PRIVATE Qt::Core Qt::Sql)
+qt_add_executable(sqlitewal_unittest ${PROJECT_SOURCES})
+target_link_libraries(sqlitewal_unittest PRIVATE Qt::Core Qt::Sql Qt::Test)
diff --git a/src/SqliteWAL/SqliteWAL.pro b/src/SqliteWAL/SqliteWAL.pro
@@ -1,13 +1,13 @@
 include(../../qmake/ProjectSettings.pri)
 
-QT += core sql
+QT += core sql testlib
 
 CONFIG += cmdline
 
 SOURCES += \
-        main.cc \
         sqlitetest.cc \
-        sqliteutils.cc
+        sqliteutils.cc \
+        sqlitewal_unittest.cc 
 
 HEADERS += \
     sqlitetest.hpp \
diff --git a/src/SqliteWAL/main.cc b/src/SqliteWAL/main.cc
diff --git a/src/SqliteWAL/sqlitetest.cc b/src/SqliteWAL/sqlitetest.cc
@@ -7,18 +7,19 @@
 #include <QSqlQuery>
 #include <QThread>
 
-#include <mutex>
+using namespace Qt::StringLiterals;
 
 class SqliteTest::SqliteTestPrivate
 {
 public:
-    explicit SqliteTestPrivate(SqliteTest *q)
-        : q_ptr(q)
+    explicit SqliteTestPrivate(SqliteTest *q, const QString &dbPath) : q_ptr(q)
     {
-        dataBaseConnection.dataBasePath = QString("%1/%2").arg(QDir::tempPath()).arg("test.db");
+        dataBaseConnection.dataBasePath
+            = dbPath.isEmpty() ? QDir::tempPath() + u"/test.db"_s : dbPath;
 
         static std::once_flag onceFlag;
-        std::call_once(onceFlag, [this]() { QFile::remove(this->dataBaseConnection.dataBasePath); });
+        std::call_once(onceFlag,
+                       [this]() { QFile::remove(this->dataBaseConnection.dataBasePath); });
 
         dataBaseConnection.connectionName = getDatabaseConnectionName();
 
@@ -42,15 +43,16 @@ class SqliteTest::SqliteTestPrivate
                   " [id] INTEGER NOT NULL ON CONFLICT REPLACE UNIQUE ON CONFLICT "
                   "REPLACE COLLATE BINARY, "
                   " [brand] TEXT, "
-                  " [num] TEXT, "
+                  " [num] INTEGER, "
                   " [create_time] TIMESTAMP DEFAULT CURRENT_TIMESTAMP, "
                   " [local_time] TEXT DEFAULT (strftime('%Y-%m-%d %H:%M:%f', 'now', 'localtime')), "
                   " PRIMARY KEY([id] COLLATE [BINARY] ASC) ON CONFLICT REPLACE)")
                   .arg(tableName);
 
         QMutexLocker locker(&mutex);
         auto db = getDatabase(dataBaseConnection);
-        CHECK_DATABASE_VALIDITY(db)
+        if (!checkDatabaseValidity(db))
+            return false;
 
         QSqlQuery query(db);
         if (!query.exec(createTable)) {
@@ -63,29 +65,30 @@ class SqliteTest::SqliteTestPrivate
     SqliteTest *q_ptr;
 
     SqliteConnection dataBaseConnection;
-    const QString tableName = "phone";
+    const QString tableName = u"phone"_s;
 
     static QMutex mutex;
 };
 
 QMutex SqliteTest::SqliteTestPrivate::mutex;
 
-SqliteTest::SqliteTest(QObject *parent)
-    : QObject{parent}
-    , d_ptr(new SqliteTestPrivate(this))
+SqliteTest::SqliteTest(const QString &dbPath, QObject *parent)
+    : QObject{parent}, d_ptr(std::make_unique<SqliteTestPrivate>(this, dbPath))
 {}
 
-SqliteTest::~SqliteTest() {}
+SqliteTest::~SqliteTest() = default;
 
 bool SqliteTest::insert(const QString &brand, int num)
 {
     auto db = getDatabase(d_ptr->dataBaseConnection);
-    CHECK_DATABASE_VALIDITY(db)
+    if (!checkDatabaseValidity(db))
+        return false;
+
     QSqlQuery query(db);
     query.prepare(
         QString("INSERT INTO %1 (brand, num) VALUES (:brand, :num)").arg(d_ptr->tableName));
-    query.bindValue(":brand", brand);
-    query.bindValue(":num", num);
+    query.bindValue(u":brand"_s, brand);
+    query.bindValue(u":num"_s, num);
 
     QMutexLocker locker(&d_ptr->mutex);
     if (!query.exec()) {
@@ -99,7 +102,8 @@ bool SqliteTest::insert(const QString &brand, int num)
 bool SqliteTest::readLastRecord()
 {
     auto db = getDatabase(d_ptr->dataBaseConnection);
-    CHECK_DATABASE_VALIDITY(db)
+    if (!checkDatabaseValidity(db))
+        return false;
 
     QSqlQuery query(db);
     if (!query.exec(QString("SELECT id, brand, num, create_time, local_time "
@@ -112,13 +116,13 @@ bool SqliteTest::readLastRecord()
         qWarning() << "No records found.";
         return false;
     }
-    auto text = QString(
-                    "Last Record - ID: %1, Brand: %2\t, Num: %3\t, Created At: %4, Local Time: %5")
-                    .arg(QString::number(query.value("id").toInt()),
-                         query.value("brand").toString(),
-                         QString::number(query.value("num").toInt()),
-                         query.value("create_time").toString(),
-                         query.value("local_time").toString());
+    auto text
+        = QString("Last Record - ID: %1, Brand: %2\t, Num: %3\t, Created At: %4, Local Time: %5")
+              .arg(QString::number(query.value(u"id"_s).toInt()),
+                   query.value(u"brand"_s).toString(),
+                   QString::number(query.value(u"num"_s).toInt()),
+                   query.value(u"create_time"_s).toString(),
+                   query.value(u"local_time"_s).toString());
     qDebug().noquote() << text;
     return true;
 }
diff --git a/src/SqliteWAL/sqlitetest.hpp b/src/SqliteWAL/sqlitetest.hpp
@@ -2,17 +2,19 @@
 
 #include <QObject>
 
+#include <memory>
+
 class SqliteTest : public QObject
 {
     Q_OBJECT
 public:
-    explicit SqliteTest(QObject *parent = nullptr);
-    ~SqliteTest();
+    explicit SqliteTest(const QString &dbPath = {}, QObject *parent = nullptr);
+    ~SqliteTest() override;
 
     bool insert(const QString &brand, int num);
     bool readLastRecord();
 
 private:
     class SqliteTestPrivate;
-    QScopedPointer<SqliteTestPrivate> d_ptr;
+    std::unique_ptr<SqliteTestPrivate> d_ptr;
 };
diff --git a/src/SqliteWAL/sqliteutils.cc b/src/SqliteWAL/sqliteutils.cc
diff --git a/src/SqliteWAL/sqliteutils.hpp b/src/SqliteWAL/sqliteutils.hpp
diff --git a/src/SqliteWAL/sqlitewal_unittest.cc b/src/SqliteWAL/sqlitewal_unittest.cc
diff --git a/src/SwitchButton/SwitchButton.pro b/src/SwitchButton/SwitchButton.pro
diff --git a/src/WindowsIntegration/WindowsIntegration.pro b/src/WindowsIntegration/WindowsIntegration.pro
