From 300517892bf984e605ec3033f2e29a080beb99e2 Mon Sep 17 00:00:00 2001 From: taynpg Date: Tue, 11 Nov 2025 08:52:09 +0800 Subject: [PATCH] =?UTF-8?q?xp=EF=BC=9AWindows=20XP=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 5 +++-- ClientCore/ClientCore.h | 2 +- ClientCore/RemoteFile.cpp | 2 +- Gui/Control/FileControl.cpp | 6 +++--- Gui/Control/FileControl.h | 6 +++--- Util/Util.h | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 809c9a0..f2492f4 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -16,13 +16,14 @@ "args": [] }, "cmake.configureSettings": { - "CMAKE_PREFIX_PATH": "C:/Qt/6.8.3/mingw_64", + //"CMAKE_PREFIX_PATH": "C:/Qt/6.8.3/mingw_64", + "CMAKE_PREFIX_PATH": "C:/Qt/Qt5.7.1/5.7/mingw53_32", //"CMAKE_TOOLCHAIN_FILE": "${env:TT_VCPKG}" }, "cmake.configureArgs": [ "-Wno-dev", "-DCOMPILE_GUI=ON", - "-DQT_DEFAULT_MAJOR_VERSION=6" + "-DQT_DEFAULT_MAJOR_VERSION=5" ], "cmake.options.statusBarVisibility": "visible", "cmake.generator": "Ninja", diff --git a/ClientCore/ClientCore.h b/ClientCore/ClientCore.h index 3c42f57..6a729fa 100644 --- a/ClientCore/ClientCore.h +++ b/ClientCore/ClientCore.h @@ -64,7 +64,7 @@ public: signals: void sigDisconnect(); - void sigPath(const QString& path, const QStringList& drivers); + void sigPath(const QString& path, const QVector& drivers); void sigClients(const InfoClientVec& clients); void sigFiles(const DirFileInfoVec& files); void sigReqSend(QSharedPointer frame); diff --git a/ClientCore/RemoteFile.cpp b/ClientCore/RemoteFile.cpp index 7c145b9..a1429cc 100644 --- a/ClientCore/RemoteFile.cpp +++ b/ClientCore/RemoteFile.cpp @@ -12,7 +12,7 @@ void RemoteFile::setClientCore(ClientCore* cliCore) { cliCore_ = cliCore; connect(cliCore_, &ClientCore::sigPath, this, - [this](const QString& path, const QStringList& drivers) { sigHome(path, drivers); }); + [this](const QString& path, const QVector& drivers) { sigHome(path, drivers); }); connect(cliCore_, &ClientCore::sigFiles, this, [this](const DirFileInfoVec& files) { sigDirFile(files); }); } diff --git a/Gui/Control/FileControl.cpp b/Gui/Control/FileControl.cpp index 22e8d51..23b2169 100644 --- a/Gui/Control/FileControl.cpp +++ b/Gui/Control/FileControl.cpp @@ -109,7 +109,7 @@ void FileManager::InitMenu() menu_->addSeparator(); } -void FileManager::ShowPath(const QString& path, const QStringList& drivers) +void FileManager::ShowPath(const QString& path, const QVector& drivers) { QMutexLocker locker(&cbMut_); @@ -349,7 +349,7 @@ void FileManager::SetUiCurrentPath(const QString& path) ui->comboBox->setCurrentText(path); } -void FileManager::FilterFile(const QStringList& selectedTypes) +void FileManager::FilterFile(const QVector& selectedTypes) { if (selectedTypes.contains("*")) { currentShowInfo_.vec = currentInfo_.vec; @@ -415,7 +415,7 @@ void FileManager::ShowFilterForm() dialog.setLayout(&layout); if (dialog.exec() == QDialog::Accepted) { - QStringList selectedTypes; + QVector selectedTypes; for (int i = 0; i < listWidget.count(); ++i) { QListWidgetItem* item = listWidget.item(i); if (item->checkState() == Qt::Checked) { diff --git a/Gui/Control/FileControl.h b/Gui/Control/FileControl.h index d1497c0..090d542 100644 --- a/Gui/Control/FileControl.h +++ b/Gui/Control/FileControl.h @@ -46,13 +46,13 @@ signals: private: void InitControl(); void InitMenu(); - void ShowPath(const QString& path, const QStringList& drivers); + void ShowPath(const QString& path, const QVector& drivers); void ShowFile(const DirFileInfoVec& info); void doubleClick(int row, int column); void SetRoot(const QString& path); void SortFileInfo(SortMethod method); void HeaderClicked(int column); - void FilterFile(const QStringList& selectedTypes); + void FilterFile(const QVector& selectedTypes); void GenFilter(); void ShowFilterForm(); void CopyFullPath(); @@ -70,7 +70,7 @@ private: ClientCore* cliCore_; QMutex cbMut_; QMutex tbMut_; - QStringList drivers_; + QVector drivers_; QSet fileTypes_; QSet curSelectTypes_; DirFileInfoVec currentInfo_; diff --git a/Util/Util.h b/Util/Util.h index f96bb3e..b51ac4d 100644 --- a/Util/Util.h +++ b/Util/Util.h @@ -66,7 +66,7 @@ public: QString GetErr() const; signals: - void sigHome(const QString& path, const QStringList& drivers); + void sigHome(const QString& path, const QVector& drivers); void sigDirFile(const DirFileInfoVec& dirFile); protected: