Skip to content

Commit 36924cc

Browse files
committed
move files
1 parent d9400d0 commit 36924cc

23 files changed

+22
-22
lines changed

qv2ray/v2/components/proxy/QvProxyConfigurator.cpp 3rdparty/qv2ray/v2/components/proxy/QvProxyConfigurator.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <QStandardPaths>
1717
#include <QProcess>
1818

19-
#include "qv2ray/wrapper.hpp"
19+
#include "3rdparty/qv2ray/wrapper.hpp"
2020
#include "fmt/Preset.hpp"
2121
#include "main/NekoRay.hpp"
2222

File renamed without changes.
File renamed without changes.

qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp 3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3-
#include "qv2ray/wrapper.hpp"
4-
#include "qv2ray/v2/ui/widgets/common/QJsonModel.hpp"
3+
#include "3rdparty/qv2ray/wrapper.hpp"
4+
#include "3rdparty/qv2ray/v2/ui/widgets/common/QJsonModel.hpp"
55
#include "ui_w_JsonEditor.h"
66

77
#include <QDialog>

qv2ray/v3/components/GeositeReader/GeositeReader.cpp 3rdparty/qv2ray/v3/components/GeositeReader/GeositeReader.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "GeositeReader.hpp"
22

3-
#include "qv2ray/wrapper.hpp"
3+
#include "3rdparty/qv2ray/wrapper.hpp"
44
#include "picoproto.hpp"
55

66
#include <QFile>
File renamed without changes.

CMakeLists.txt

+10-10
Original file line numberDiff line numberDiff line change
@@ -147,16 +147,16 @@ set(PROJECT_SOURCES
147147
3rdparty/qrcodegen.cpp
148148
3rdparty/QtExtKeySequenceEdit.cpp
149149

150-
qv2ray/v2/ui/LogHighlighter.cpp
151-
qv2ray/v2/ui/QvAutoCompleteTextEdit.cpp
152-
qv2ray/v2/components/proxy/QvProxyConfigurator.cpp
153-
qv2ray/v2/ui/widgets/common/QJsonModel.cpp
154-
qv2ray/v2/ui/widgets/editors/w_JsonEditor.cpp
155-
qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp
156-
qv2ray/v2/ui/widgets/editors/w_JsonEditor.ui
157-
158-
qv2ray/v3/components/GeositeReader/GeositeReader.cpp
159-
qv2ray/v3/components/GeositeReader/picoproto.cpp
150+
3rdparty/qv2ray/v2/ui/LogHighlighter.cpp
151+
3rdparty/qv2ray/v2/ui/QvAutoCompleteTextEdit.cpp
152+
3rdparty/qv2ray/v2/components/proxy/QvProxyConfigurator.cpp
153+
3rdparty/qv2ray/v2/ui/widgets/common/QJsonModel.cpp
154+
3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.cpp
155+
3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp
156+
3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.ui
157+
158+
3rdparty/qv2ray/v3/components/GeositeReader/GeositeReader.cpp
159+
3rdparty/qv2ray/v3/components/GeositeReader/picoproto.cpp
160160

161161
rpc/gRPC.cpp
162162

ui/dialog_basic_settings.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "dialog_basic_settings.h"
22
#include "ui_dialog_basic_settings.h"
33

4-
#include "qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp"
4+
#include "3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp"
55
#include "fmt/Preset.hpp"
66
#include "ui/ThemeManager.hpp"
77
#include "ui/Icon.hpp"

ui/dialog_manage_routes.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include "dialog_manage_routes.h"
22
#include "ui_dialog_manage_routes.h"
33

4-
#include "qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp"
5-
#include "qv2ray/v3/components/GeositeReader/GeositeReader.hpp"
4+
#include "3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp"
5+
#include "3rdparty/qv2ray/v3/components/GeositeReader/GeositeReader.hpp"
66
#include "main/GuiUtils.hpp"
77
#include "fmt/Preset.hpp"
88

ui/dialog_manage_routes.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <QDialog>
44
#include <QMenu>
55

6-
#include "qv2ray/v2/ui/QvAutoCompleteTextEdit.hpp"
6+
#include "3rdparty/qv2ray/v2/ui/QvAutoCompleteTextEdit.hpp"
77
#include "main/NekoRay.hpp"
88

99
QT_BEGIN_NAMESPACE

ui/edit/dialog_edit_profile.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "fmt/includes.h"
1313
#include "fmt/Preset.hpp"
1414

15-
#include "qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp"
15+
#include "3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp"
1616
#include "main/GuiUtils.hpp"
1717

1818
#include <QInputDialog>

ui/edit/edit_custom.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "edit_custom.h"
22
#include "ui_edit_custom.h"
33

4-
#include "qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp"
4+
#include "3rdparty/qv2ray/v2/ui/widgets/editors/w_JsonEditor.hpp"
55
#include "fmt/CustomBean.hpp"
66
#include "fmt/Preset.hpp"
77
#include "db/ConfigBuilder.hpp"

ui/mainwindow.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
#include "3rdparty/qrcodegen.hpp"
2121
#include "3rdparty/VT100Parser.hpp"
22-
#include "qv2ray/v2/components/proxy/QvProxyConfigurator.hpp"
23-
#include "qv2ray/v2/ui/LogHighlighter.hpp"
22+
#include "3rdparty/qv2ray/v2/components/proxy/QvProxyConfigurator.hpp"
23+
#include "3rdparty/qv2ray/v2/ui/LogHighlighter.hpp"
2424

2525
#ifndef NKR_NO_ZXING
2626
#include "3rdparty/ZxingQtReader.hpp"

0 commit comments

Comments
 (0)