diff --git a/.vscode/settings.json b/.vscode/settings.json index 4304dc3..8aa97c9 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,6 +4,7 @@ "cmake.configureOnOpen": true, "editor.fontFamily": "'Maple Mono NL NF CN Light', 'Maple Mono NL NF CN Light', 'Maple Mono NL NF CN Light'", "cmake.debugConfig": { + "type": "lldb", "console": "externalTerminal", "setupCommands": [ { @@ -12,11 +13,10 @@ "ignoreFailures": true } ], - "visualizerFile": "${workspaceRoot}/.vscode/qt5.natvis", "args": [] }, "cmake.configureSettings": { - "CMAKE_PREFIX_PATH": "C:/Qt/Qt6", + "CMAKE_PREFIX_PATH": "C:/local/Qt6", }, "cmake.configureArgs": [ "-Wno-dev", diff --git a/Console/main.cpp b/Console/main.cpp index 65eadd8..cb84824 100644 --- a/Console/main.cpp +++ b/Console/main.cpp @@ -38,6 +38,11 @@ int main(int argc, char* argv[]) auto core = std::make_shared(); auto helper = std::make_shared(); + QObject::connect(core.get(), &ClientCore::conFailed, [&app](){ + qWarning() << "Abnormal state, quit..."; + app.exit(); + }); + helper->SetIpPort(argv[1], QString("%1").arg(argv[2]).toInt()); helper->RunWorker(core.get()); helper->Connect(); diff --git a/Gui/Control/FileControl.h b/Gui/Control/FileControl.h index d75f7e8..094e916 100644 --- a/Gui/Control/FileControl.h +++ b/Gui/Control/FileControl.h @@ -38,8 +38,8 @@ public: void SetType(const QString& sendType, const QString& ansType); void SetPath(const QString& stra, const QString& strb, const QString& type); InfoMsg GetMsg() const; - virtual void interrupCheck(); - virtual void recvFrame(QSharedPointer frame); + void interrupCheck() override; + void recvFrame(QSharedPointer frame) override; private: bool recvMsg_{}; diff --git a/Gui/Control/cpTableWidget.h b/Gui/Control/cpTableWidget.h index 1d4f111..1548164 100644 --- a/Gui/Control/cpTableWidget.h +++ b/Gui/Control/cpTableWidget.h @@ -18,7 +18,7 @@ public: protected: void dropEvent(QDropEvent* event) override; - void dragEnterEvent(QDragEnterEvent* event); + void dragEnterEvent(QDragEnterEvent* event) override; private: bool isResource_{}; diff --git a/Gui/Control/cusTableWidget.h b/Gui/Control/cusTableWidget.h index 7fe3f1c..d9a5446 100644 --- a/Gui/Control/cusTableWidget.h +++ b/Gui/Control/cusTableWidget.h @@ -22,7 +22,7 @@ public: protected: void dropEvent(QDropEvent* event) override; - void dragEnterEvent(QDragEnterEvent* event); + void dragEnterEvent(QDragEnterEvent* event) override; protected: bool isRemote_{false};