From 9ddfbc68789eb500a79a675ca17ff5a65f4f0f10 Mon Sep 17 00:00:00 2001
From: taynpg <taynpg@163.com>
Date: Tue, 28 May 2024 09:17:23 +0800
Subject: [PATCH] =?UTF-8?q?config=EF=BC=9A=E6=9B=B4=E6=94=B9=E4=B8=BAQt6?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/settings.json |  4 ++--
 CMakeLists.txt        | 10 ++++++----
 MainWidget.cpp        |  3 ++-
 src/config.h          |  7 ++++---
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 14c0ece..c7fe1bb 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -16,10 +16,10 @@
                 "ignoreFailures": true
             }
         ],
-        "visualizerFile": "${workspaceRoot}/.vscode/qt5.natvis"
+        "visualizerFile": "${workspaceRoot}/.vscode/qt6.natvis"
     },
     "cmake.environment": {
-        "PATH": "${env:PATH};C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/bin",
+        "PATH": "${env:PATH};C:/Qt/Qt6.6.3/6.6.3/msvc2019_64/bin",
         "LD_LIBRARY_PATH": "$LD_LIBRARY_PATH:/home/xxx"
     },
     "cmake.options.statusBarVisibility": "visible",
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51c9567..a168e90 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5)
 project(OneLevelXmlOpr VERSION 0.1 LANGUAGES CXX)
 
 set(CMAKE_PREFIX_PATH
-    "C:/Qt/Qt5.14.2/5.14.2/msvc2017_64"
+    "C:/Qt/Qt6.6.3/6.6.3/msvc2019_64"
     "/opt/homebrew/Cellar/qt@5/5.15.13_1"
 )
 
@@ -31,10 +31,12 @@ set(PROJECT_SOURCES
 )
 
 if (MSVC)
+if(${QT_VERSION_MAJOR} LESS 6)
     add_compile_options(/source-charset:utf-8)
-    add_compile_options(/EHsc)
-    add_compile_options(/wd4267)
-    add_compile_options(-D_CRT_SECURE_NO_WARNINGS)
+endif()
+add_compile_options(/EHsc)
+add_compile_options(/wd4267)
+add_compile_options(-D_CRT_SECURE_NO_WARNINGS)
 endif()
 
 if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
diff --git a/MainWidget.cpp b/MainWidget.cpp
index adedf2e..4453931 100644
--- a/MainWidget.cpp
+++ b/MainWidget.cpp
@@ -621,7 +621,8 @@ void MainWidget::sort_by_repeat(std::vector<Element_t*>& vec)
     std::vector<SElement_t> turn_vec{};
     for (const auto& item : vec) {
         const char* str = item->Attribute(keys_[0].c_str());
-        turn_vec.emplace_back(item, std::string(str));
+        std::string d(str);
+        turn_vec.emplace_back(item, d);
     }
 
     auto compare = [&](const SElement_t& se1, const SElement_t& se2) {
diff --git a/src/config.h b/src/config.h
index 46b01c9..573da6e 100644
--- a/src/config.h
+++ b/src/config.h
@@ -19,16 +19,17 @@ public:
     ~ConfigIni() = default;
 
 public:
-    bool set_work_exe(const std::string& dir);
-    bool set_xml_path(const std::string& path);
+    bool    set_work_exe(const std::string& dir);
+    bool    set_xml_path(const std::string& path);
     OprBase get_config();
 
 private:
     bool parse_ini();
+
 private:
     std::string work_dir_{};
     std::string ini_path_{};
-    CSimpleIni  ini_{};
+    CSimpleIniA ini_{};
     OprBase     opr_base_{};
 };