From 5c720242e4521c764491220ff52feed927d42f8e Mon Sep 17 00:00:00 2001 From: fourtf Date: Thu, 22 Nov 2018 19:11:26 +0100 Subject: [PATCH] removed unused dependencies --- .gitmodules | 12 ------------ chatterino.pro | 12 ++++++------ dependencies/signals.pri | 2 -- files | 26 -------------------------- {dependencies => lib}/fmt.pri | 0 {dependencies => lib}/humanize.pri | 0 {dependencies => lib}/libcommuni.pri | 0 {dependencies => lib}/openssl.pri | 0 lib/rapidjson | 1 - lib/serialize | 1 - lib/settings | 1 - lib/signals | 1 - {dependencies => lib}/websocketpp.pri | 0 {dependencies => lib}/wintoast.pri | 0 14 files changed, 6 insertions(+), 50 deletions(-) delete mode 100644 dependencies/signals.pri delete mode 100644 files rename {dependencies => lib}/fmt.pri (100%) rename {dependencies => lib}/humanize.pri (100%) rename {dependencies => lib}/libcommuni.pri (100%) rename {dependencies => lib}/openssl.pri (100%) delete mode 160000 lib/rapidjson delete mode 160000 lib/serialize delete mode 160000 lib/settings delete mode 160000 lib/signals rename {dependencies => lib}/websocketpp.pri (100%) rename {dependencies => lib}/wintoast.pri (100%) diff --git a/.gitmodules b/.gitmodules index 75ec51a0f..c088e63cc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,18 +1,9 @@ [submodule "lib/libcommuni"] path = lib/libcommuni url = https://github.com/hemirt/libcommuni -[submodule "lib/settings"] - path = lib/settings - url = https://github.com/pajlada/settings [submodule "lib/humanize"] path = lib/humanize url = https://github.com/pajlada/humanize.git -[submodule "lib/signals"] - path = lib/signals - url = https://github.com/pajlada/signals.git -[submodule "lib/rapidjson"] - path = lib/rapidjson - url = https://github.com/Tencent/rapidjson.git [submodule "lib/websocketpp"] path = lib/websocketpp url = https://github.com/zaphoyd/websocketpp.git @@ -24,6 +15,3 @@ path = lib/WinToast url = https://github.com/mohabouje/WinToast.git -[submodule "lib/serialize"] - path = lib/serialize - url = https://github.com/pajlada/serialize.git diff --git a/chatterino.pro b/chatterino.pro index d94cc1dbf..a53cb00e9 100644 --- a/chatterino.pro +++ b/chatterino.pro @@ -41,13 +41,13 @@ macx { } # Submodules -include(dependencies/humanize.pri) -include(dependencies/fmt.pri) +include(lib/humanize.pri) +include(lib/fmt.pri) DEFINES += IRC_NAMESPACE=Communi -include(dependencies/libcommuni.pri) -include(dependencies/websocketpp.pri) -include(dependencies/openssl.pri) -include(dependencies/wintoast.pri) +include(lib/libcommuni.pri) +include(lib/websocketpp.pri) +include(lib/openssl.pri) +include(lib/wintoast.pri) # Optional feature: QtWebEngine #exists ($(QTDIR)/include/QtWebEngine/QtWebEngine) { diff --git a/dependencies/signals.pri b/dependencies/signals.pri deleted file mode 100644 index 25e11f9df..000000000 --- a/dependencies/signals.pri +++ /dev/null @@ -1,2 +0,0 @@ -# signals -INCLUDEPATH += $$PWD/../lib/signals/include/ diff --git a/files b/files deleted file mode 100644 index 65b349acb..000000000 --- a/files +++ /dev/null @@ -1,26 +0,0 @@ -find src/ -type f -exec sed -i 's`Channel.cpp"`common/Channel.cpp"`' {} \; -find src/ -type f -exec sed -i 's`Channel.hpp"`common/Channel.hpp"`' {} \; -find src/ -type f -exec sed -i 's`Common.hpp"`common/Common.hpp"`' {} \; -find src/ -type f -exec sed -i 's`LockedObject.hpp"`common/LockedObject.hpp"`' {} \; -find src/ -type f -exec sed -i 's`NullablePtr.hpp"`common/NullablePtr.hpp"`' {} \; -find src/ -type f -exec sed -i 's`ProviderId.hpp"`common/ProviderId.hpp"`' {} \; -find src/ -type f -exec sed -i 's`SignalVector.hpp"`common/SignalVector.hpp"`' {} \; -find src/ -type f -exec sed -i 's`util/CompletionModel.cpp"`common/CompletionModel.cpp"`' {} \; -find src/ -type f -exec sed -i 's`util/CompletionModel.hpp"`common/CompletionModel.hpp"`' {} \; -find src/ -type f -exec sed -i 's`util/Emotemap.cpp"`common/Emotemap.cpp"`' {} \; -find src/ -type f -exec sed -i 's`util/Emotemap.hpp"`common/Emotemap.hpp"`' {} \; -find src/ -type f -exec sed -i 's`util/FlagsEnum.hpp"`common/FlagsEnum.hpp"`' {} \; -find src/ -type f -exec sed -i 's`util/MutexValue.hpp"`common/MutexValue.hpp"`' {} \; -find src/ -type f -exec sed -i 's`util/NetworkManager.cpp"`common/NetworkManager.cpp"`' {} \; -find src/ -type f -exec sed -i 's`util/NetworkManager.hpp"`common/NetworkManager.hpp"`' {} \; -find src/ -type f -exec sed -i 's`util/NetworkRequest.cpp"`common/NetworkRequest.cpp"`' {} \; -find src/ -type f -exec sed -i 's`util/NetworkRequest.hpp"`common/NetworkRequest.hpp"`' {} \; -find src/ -type f -exec sed -i 's`util/NetworkRequester.hpp"`common/NetworkRequester.hpp"`' {} \; -find src/ -type f -exec sed -i 's`util/NetworkWorker.hpp"`common/NetworkWorker.hpp"`' {} \; -find src/ -type f -exec sed -i 's`util/Property.hpp"`common/Property.hpp"`' {} \; -find src/ -type f -exec sed -i 's`util/SerializeCustom.hpp"`common/SerializeCustom.hpp"`' {} \; -find src/ -type f -exec sed -i 's`util/SignalVector2.hpp"`common/SignalVector2.hpp"`' {} \; -find src/ -type f -exec sed -i 's`util/SignalVectorModel.hpp"`common/SignalVectorModel.hpp"`' {} \; -find src/ -type f -exec sed -i 's`util/UrlFetch.hpp"`common/UrlFetch.hpp"`' {} \; -find src/ -type f -exec sed -i 's`util/Version.hpp"`common/Version.hpp"`' {} \; - diff --git a/dependencies/fmt.pri b/lib/fmt.pri similarity index 100% rename from dependencies/fmt.pri rename to lib/fmt.pri diff --git a/dependencies/humanize.pri b/lib/humanize.pri similarity index 100% rename from dependencies/humanize.pri rename to lib/humanize.pri diff --git a/dependencies/libcommuni.pri b/lib/libcommuni.pri similarity index 100% rename from dependencies/libcommuni.pri rename to lib/libcommuni.pri diff --git a/dependencies/openssl.pri b/lib/openssl.pri similarity index 100% rename from dependencies/openssl.pri rename to lib/openssl.pri diff --git a/lib/rapidjson b/lib/rapidjson deleted file mode 160000 index f54b0e47a..000000000 --- a/lib/rapidjson +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f54b0e47a08782a6131cc3d60f94d038fa6e0a51 diff --git a/lib/serialize b/lib/serialize deleted file mode 160000 index 8df89adc1..000000000 --- a/lib/serialize +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8df89adc101e3208098e323f66caf3d04582281f diff --git a/lib/settings b/lib/settings deleted file mode 160000 index f564560af..000000000 --- a/lib/settings +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f564560afc62de01c0b616d7d219cca5b7c06d97 diff --git a/lib/signals b/lib/signals deleted file mode 160000 index 0fde0171d..000000000 --- a/lib/signals +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0fde0171d61077e6e30e13fd67f91f72dae34122 diff --git a/dependencies/websocketpp.pri b/lib/websocketpp.pri similarity index 100% rename from dependencies/websocketpp.pri rename to lib/websocketpp.pri diff --git a/dependencies/wintoast.pri b/lib/wintoast.pri similarity index 100% rename from dependencies/wintoast.pri rename to lib/wintoast.pri