From 36924cc7784130293a03dd0bc18324ae54892b8b Mon Sep 17 00:00:00 2001 From: arm64v8a <48624112+arm64v8a@users.noreply.github.com> Date: Mon, 10 Apr 2023 15:08:14 +0900 Subject: [PATCH] move files --- .../components/proxy/QvProxyConfigurator.cpp | 2 +- .../components/proxy/QvProxyConfigurator.hpp | 0 .../qv2ray}/v2/ui/LogHighlighter.cpp | 0 .../qv2ray}/v2/ui/LogHighlighter.hpp | 0 .../qv2ray}/v2/ui/QvAutoCompleteTextEdit.cpp | 0 .../qv2ray}/v2/ui/QvAutoCompleteTextEdit.hpp | 0 .../v2/ui/widgets/common/QJsonModel.cpp | 0 .../v2/ui/widgets/common/QJsonModel.hpp | 0 .../v2/ui/widgets/editors/w_JsonEditor.cpp | 0 .../v2/ui/widgets/editors/w_JsonEditor.hpp | 4 ++-- .../v2/ui/widgets/editors/w_JsonEditor.ui | 0 .../components/GeositeReader/GeositeReader.cpp | 2 +- .../components/GeositeReader/GeositeReader.hpp | 0 .../v3/components/GeositeReader/picoproto.cpp | 0 .../v3/components/GeositeReader/picoproto.hpp | 0 {qv2ray => 3rdparty/qv2ray}/wrapper.hpp | 0 CMakeLists.txt | 18 +++++++++--------- ui/dialog_basic_settings.cpp | 2 +- ui/dialog_manage_routes.cpp | 4 ++-- ui/dialog_manage_routes.h | 2 +- ui/edit/dialog_edit_profile.cpp | 2 +- ui/edit/edit_custom.cpp | 2 +- ui/mainwindow.cpp | 4 ++-- 23 files changed, 21 insertions(+), 21 deletions(-) rename {qv2ray => 3rdparty/qv2ray}/v2/components/proxy/QvProxyConfigurator.cpp (99%) rename {qv2ray => 3rdparty/qv2ray}/v2/components/proxy/QvProxyConfigurator.hpp (100%) rename {qv2ray => 3rdparty/qv2ray}/v2/ui/LogHighlighter.cpp (100%) rename {qv2ray => 3rdparty/qv2ray}/v2/ui/LogHighlighter.hpp (100%) rename {qv2ray => 3rdparty/qv2ray}/v2/ui/QvAutoCompleteTextEdit.cpp (100%) rename {qv2ray => 3rdparty/qv2ray}/v2/ui/QvAutoCompleteTextEdit.hpp (100%) rename {qv2ray => 3rdparty/qv2ray}/v2/ui/widgets/common/QJsonModel.cpp (100%) rename {qv2ray => 3rdparty/qv2ray}/v2/ui/widgets/common/QJsonModel.hpp (100%) rename {qv2ray => 3rdparty/qv2ray}/v2/ui/widgets/editors/w_JsonEditor.cpp (100%) rename {qv2ray => 3rdparty/qv2ray}/v2/ui/widgets/editors/w_JsonEditor.hpp (83%) rename {qv2ray => 3rdparty/qv2ray}/v2/ui/widgets/editors/w_JsonEditor.ui (100%) rename {qv2ray => 3rdparty/qv2ray}/v3/components/GeositeReader/GeositeReader.cpp (97%) rename {qv2ray => 3rdparty/qv2ray}/v3/components/GeositeReader/GeositeReader.hpp (100%) rename {qv2ray => 3rdparty/qv2ray}/v3/components/GeositeReader/picoproto.cpp (100%) rename {qv2ray => 3rdparty/qv2ray}/v3/components/GeositeReader/picoproto.hpp (100%) rename {qv2ray => 3rdparty/qv2ray}/wrapper.hpp (100%) diff --git a/qv2ray/v2/components/proxy/QvProxyConfigurator.cpp b/3rdparty/qv2ray/v2/components/proxy/QvProxyConfigurator.cpp similarity index 99% rename from qv2ray/v2/components/proxy/QvProxyConfigurator.cpp rename to 3rdparty/qv2ray/v2/components/proxy/QvProxyConfigurator.cpp index bcd1996..22991ee 100644 --- a/qv2ray/v2/components/proxy/QvProxyConfigurator.cpp +++ b/3rdparty/qv2ray/v2/components/proxy/QvProxyConfigurator.cpp @@ -16,7 +16,7 @@ #include #include -#include "qv2ray/wrapper.hpp" +#include "3rdparty/qv2ray/wrapper.hpp" #include "fmt/Preset.hpp" #include "main/NekoRay.hpp" diff --git a/qv2ray/v2/components/proxy/QvProxyConfigurator.hpp b/3rdparty/qv2ray/v2/components/proxy/QvProxyConfigurator.hpp similarity index 100% rename from qv2ray/v2/components/proxy/QvProxyConfigurator.hpp rename to 3rdparty/qv2ray/v2/components/proxy/QvProxyConfigurator.hpp diff --git a/qv2ray/v2/ui/LogHighlighter.cpp b/3rdparty/qv2ray/v2/ui/LogHighlighter.cpp similarity index 100% rename from qv2ray/v2/ui/LogHighlighter.cpp rename to 3rdparty/qv2ray/v2/ui/LogHighlighter.cpp diff --git a/qv2ray/v2/ui/LogHighlighter.hpp b/3rdparty/qv2ray/v2/ui/LogHighlighter.hpp similarity index 100% rename from qv2ray/v2/ui/LogHighlighter.hpp rename to 3rdparty/qv2ray/v2/ui/LogHighlighter.hpp diff --git a/qv2ray/v2/ui/QvAutoCompleteTextEdit.cpp b/3rdparty/qv2ray/v2/ui/QvAutoCompleteTextEdit.cpp similarity index 100% rename from qv2ray/v2/ui/QvAutoCompleteTextEdit.cpp rename to 3rdparty/qv2ray/v2/ui/QvAutoCompleteTextEdit.cpp diff --git a/qv2ray/v2/ui/QvAutoCompleteTextEdit.hpp b/3rdparty/qv2ray/v2/ui/QvAutoCompleteTextEdit.hpp similarity index 100% rename from qv2ray/v2/ui/QvAutoCompleteTextEdit.hpp rename to 3rdparty/qv2ray/v2/ui/QvAutoCompleteTextEdit.hpp diff --git a/qv2ray/v2/ui/widgets/common/QJsonModel.cpp b/3rdparty/qv2ray/v2/ui/widgets/common/QJsonModel.cpp similarity index 100% rename from qv2ray/v2/ui/widgets/common/QJsonModel.cpp rename to 3rdparty/qv2ray/v2/ui/widgets/common/QJsonModel.cpp diff --git a/qv2ray/v2/ui/widgets/common/QJsonModel.hpp b/3rdparty/qv2ray/v2/ui/widgets/common/QJsonModel.hpp similarity index 100% rename from qv2ray/v2/ui/widgets/common/QJsonModel.hpp rename to 3rdparty/qv2ray/v2/ui/widgets/common/QJsonModel.hpp diff --git a/qv2ray/v2/ui/widgets/editors/w_JsonEditor.cpp b/3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.cpp similarity index 100% rename from qv2ray/v2/ui/widgets/editors/w_JsonEditor.cpp rename to 3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.cpp diff --git a/qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp b/3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp similarity index 83% rename from qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp rename to 3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp index 6fccd0d..ea08afa 100644 --- a/qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp +++ b/3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp @@ -1,7 +1,7 @@ #pragma once -#include "qv2ray/wrapper.hpp" -#include "qv2ray/v2/ui/widgets/common/QJsonModel.hpp" +#include "3rdparty/qv2ray/wrapper.hpp" +#include "3rdparty/qv2ray/v2/ui/widgets/common/QJsonModel.hpp" #include "ui_w_JsonEditor.h" #include diff --git a/qv2ray/v2/ui/widgets/editors/w_JsonEditor.ui b/3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.ui similarity index 100% rename from qv2ray/v2/ui/widgets/editors/w_JsonEditor.ui rename to 3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.ui diff --git a/qv2ray/v3/components/GeositeReader/GeositeReader.cpp b/3rdparty/qv2ray/v3/components/GeositeReader/GeositeReader.cpp similarity index 97% rename from qv2ray/v3/components/GeositeReader/GeositeReader.cpp rename to 3rdparty/qv2ray/v3/components/GeositeReader/GeositeReader.cpp index 57e6f9f..562e986 100644 --- a/qv2ray/v3/components/GeositeReader/GeositeReader.cpp +++ b/3rdparty/qv2ray/v3/components/GeositeReader/GeositeReader.cpp @@ -1,6 +1,6 @@ #include "GeositeReader.hpp" -#include "qv2ray/wrapper.hpp" +#include "3rdparty/qv2ray/wrapper.hpp" #include "picoproto.hpp" #include diff --git a/qv2ray/v3/components/GeositeReader/GeositeReader.hpp b/3rdparty/qv2ray/v3/components/GeositeReader/GeositeReader.hpp similarity index 100% rename from qv2ray/v3/components/GeositeReader/GeositeReader.hpp rename to 3rdparty/qv2ray/v3/components/GeositeReader/GeositeReader.hpp diff --git a/qv2ray/v3/components/GeositeReader/picoproto.cpp b/3rdparty/qv2ray/v3/components/GeositeReader/picoproto.cpp similarity index 100% rename from qv2ray/v3/components/GeositeReader/picoproto.cpp rename to 3rdparty/qv2ray/v3/components/GeositeReader/picoproto.cpp diff --git a/qv2ray/v3/components/GeositeReader/picoproto.hpp b/3rdparty/qv2ray/v3/components/GeositeReader/picoproto.hpp similarity index 100% rename from qv2ray/v3/components/GeositeReader/picoproto.hpp rename to 3rdparty/qv2ray/v3/components/GeositeReader/picoproto.hpp diff --git a/qv2ray/wrapper.hpp b/3rdparty/qv2ray/wrapper.hpp similarity index 100% rename from qv2ray/wrapper.hpp rename to 3rdparty/qv2ray/wrapper.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 142d2a5..eabf7f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -147,16 +147,16 @@ set(PROJECT_SOURCES 3rdparty/qrcodegen.cpp 3rdparty/QtExtKeySequenceEdit.cpp - qv2ray/v2/ui/LogHighlighter.cpp - qv2ray/v2/ui/QvAutoCompleteTextEdit.cpp - qv2ray/v2/components/proxy/QvProxyConfigurator.cpp - qv2ray/v2/ui/widgets/common/QJsonModel.cpp - qv2ray/v2/ui/widgets/editors/w_JsonEditor.cpp - qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp - qv2ray/v2/ui/widgets/editors/w_JsonEditor.ui + 3rdparty/qv2ray/v2/ui/LogHighlighter.cpp + 3rdparty/qv2ray/v2/ui/QvAutoCompleteTextEdit.cpp + 3rdparty/qv2ray/v2/components/proxy/QvProxyConfigurator.cpp + 3rdparty/qv2ray/v2/ui/widgets/common/QJsonModel.cpp + 3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.cpp + 3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp + 3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.ui - qv2ray/v3/components/GeositeReader/GeositeReader.cpp - qv2ray/v3/components/GeositeReader/picoproto.cpp + 3rdparty/qv2ray/v3/components/GeositeReader/GeositeReader.cpp + 3rdparty/qv2ray/v3/components/GeositeReader/picoproto.cpp rpc/gRPC.cpp diff --git a/ui/dialog_basic_settings.cpp b/ui/dialog_basic_settings.cpp index 2be17c6..27f8fbf 100644 --- a/ui/dialog_basic_settings.cpp +++ b/ui/dialog_basic_settings.cpp @@ -1,7 +1,7 @@ #include "dialog_basic_settings.h" #include "ui_dialog_basic_settings.h" -#include "qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp" +#include "3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp" #include "fmt/Preset.hpp" #include "ui/ThemeManager.hpp" #include "ui/Icon.hpp" diff --git a/ui/dialog_manage_routes.cpp b/ui/dialog_manage_routes.cpp index cea37b7..5f289f4 100644 --- a/ui/dialog_manage_routes.cpp +++ b/ui/dialog_manage_routes.cpp @@ -1,8 +1,8 @@ #include "dialog_manage_routes.h" #include "ui_dialog_manage_routes.h" -#include "qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp" -#include "qv2ray/v3/components/GeositeReader/GeositeReader.hpp" +#include "3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp" +#include "3rdparty/qv2ray/v3/components/GeositeReader/GeositeReader.hpp" #include "main/GuiUtils.hpp" #include "fmt/Preset.hpp" diff --git a/ui/dialog_manage_routes.h b/ui/dialog_manage_routes.h index 036631e..949c8af 100644 --- a/ui/dialog_manage_routes.h +++ b/ui/dialog_manage_routes.h @@ -3,7 +3,7 @@ #include #include -#include "qv2ray/v2/ui/QvAutoCompleteTextEdit.hpp" +#include "3rdparty/qv2ray/v2/ui/QvAutoCompleteTextEdit.hpp" #include "main/NekoRay.hpp" QT_BEGIN_NAMESPACE diff --git a/ui/edit/dialog_edit_profile.cpp b/ui/edit/dialog_edit_profile.cpp index fc8a675..6391cd5 100644 --- a/ui/edit/dialog_edit_profile.cpp +++ b/ui/edit/dialog_edit_profile.cpp @@ -12,7 +12,7 @@ #include "fmt/includes.h" #include "fmt/Preset.hpp" -#include "qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp" +#include "3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp" #include "main/GuiUtils.hpp" #include diff --git a/ui/edit/edit_custom.cpp b/ui/edit/edit_custom.cpp index 6ecc2e0..0613e4c 100644 --- a/ui/edit/edit_custom.cpp +++ b/ui/edit/edit_custom.cpp @@ -1,7 +1,7 @@ #include "edit_custom.h" #include "ui_edit_custom.h" -#include "qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp" +#include "3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp" #include "fmt/CustomBean.hpp" #include "fmt/Preset.hpp" #include "db/ConfigBuilder.hpp" diff --git a/ui/mainwindow.cpp b/ui/mainwindow.cpp index f0ae6ab..5433ee6 100644 --- a/ui/mainwindow.cpp +++ b/ui/mainwindow.cpp @@ -19,8 +19,8 @@ #include "3rdparty/qrcodegen.hpp" #include "3rdparty/VT100Parser.hpp" -#include "qv2ray/v2/components/proxy/QvProxyConfigurator.hpp" -#include "qv2ray/v2/ui/LogHighlighter.hpp" +#include "3rdparty/qv2ray/v2/components/proxy/QvProxyConfigurator.hpp" +#include "3rdparty/qv2ray/v2/ui/LogHighlighter.hpp" #ifndef NKR_NO_ZXING #include "3rdparty/ZxingQtReader.hpp"