taynpg/OneLevelXmlOpr
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

config：更改为Qt6配置。

Browse Source
This commit is contained in:
taynpg 2024-05-28 09:17:23 +08:00
parent 33064c7cb3
commit 9ddfbc6878
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.vscode/settings.json vendored
View File

@ -16,10 +16,10 @@
"ignoreFailures": true "ignoreFailures": true
} }
], ],
"visualizerFile": "${workspaceRoot}/.vscode/qt5.natvis" "visualizerFile": "${workspaceRoot}/.vscode/qt6.natvis"
}, },
"cmake.environment": { "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" "LD_LIBRARY_PATH": "$LD_LIBRARY_PATH:/home/xxx"
}, },
"cmake.options.statusBarVisibility": "visible", "cmake.options.statusBarVisibility": "visible",

10
CMakeLists.txt
View File

@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5)
project(OneLevelXmlOpr VERSION 0.1 LANGUAGES CXX) project(OneLevelXmlOpr VERSION 0.1 LANGUAGES CXX)
set(CMAKE_PREFIX_PATH 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" "/opt/homebrew/Cellar/qt@5/5.15.13_1"
) )
@ -31,10 +31,12 @@ set(PROJECT_SOURCES
) )
if (MSVC) if (MSVC)
if(${QT_VERSION_MAJOR} LESS 6)
add_compile_options(/source-charset:utf-8) add_compile_options(/source-charset:utf-8)
add_compile_options(/EHsc) endif()
add_compile_options(/wd4267) add_compile_options(/EHsc)
add_compile_options(-D_CRT_SECURE_NO_WARNINGS) add_compile_options(/wd4267)
add_compile_options(-D_CRT_SECURE_NO_WARNINGS)
endif() endif()
if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)

3
MainWidget.cpp
View File

@ -621,7 +621,8 @@ void MainWidget::sort_by_repeat(std::vector<Element_t*>& vec)
std::vector<SElement_t> turn_vec{}; std::vector<SElement_t> turn_vec{};
for (const auto& item : vec) { for (const auto& item : vec) {
const char* str = item->Attribute(keys_[0].c_str()); 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) { auto compare = [&](const SElement_t& se1, const SElement_t& se2) {

7
src/config.h
View File

@ -19,16 +19,17 @@ public:
~ConfigIni() = default; ~ConfigIni() = default;
public: public:
bool set_work_exe(const std::string& dir); bool set_work_exe(const std::string& dir);
bool set_xml_path(const std::string& path); bool set_xml_path(const std::string& path);
OprBase get_config(); OprBase get_config();
private: private:
bool parse_ini(); bool parse_ini();
private: private:
std::string work_dir_{}; std::string work_dir_{};
std::string ini_path_{}; std::string ini_path_{};
CSimpleIni ini_{}; CSimpleIniA ini_{};
OprBase opr_base_{}; OprBase opr_base_{};
}; };