From e68bb9d94d0d85e70c61cad78d1fa33a7906e622 Mon Sep 17 00:00:00 2001 From: Nomango Date: Wed, 20 May 2020 23:48:56 +0800 Subject: [PATCH] refactor utils --- projects/kiwano/kiwano.vcxproj | 24 +++++----- projects/kiwano/kiwano.vcxproj.filters | 52 +++++++++++----------- src/kiwano-network/HttpRequest.h | 2 +- src/kiwano/2d/Actor.h | 4 +- src/kiwano/core/ObjectBase.cpp | 2 +- src/kiwano/kiwano.h | 10 ++--- src/kiwano/platform/Application.h | 2 +- src/kiwano/{core => utils}/EventTicker.cpp | 2 +- src/kiwano/{core => utils}/EventTicker.h | 2 +- src/kiwano/{core => utils}/Json.h | 0 src/kiwano/utils/ResourceCache.h | 6 +-- src/kiwano/{core => utils}/Task.cpp | 2 +- src/kiwano/{core => utils}/Task.h | 2 +- src/kiwano/{core => utils}/TaskManager.cpp | 2 +- src/kiwano/{core => utils}/TaskManager.h | 2 +- src/kiwano/{core => utils}/Ticker.cpp | 2 +- src/kiwano/{core => utils}/Ticker.h | 2 +- src/kiwano/{core => utils}/Timer.cpp | 2 +- src/kiwano/{core => utils}/Timer.h | 0 src/kiwano/{core => utils}/Xml.h | 0 20 files changed, 60 insertions(+), 60 deletions(-) rename src/kiwano/{core => utils}/EventTicker.cpp (97%) rename src/kiwano/{core => utils}/EventTicker.h (98%) rename src/kiwano/{core => utils}/Json.h (100%) rename src/kiwano/{core => utils}/Task.cpp (98%) rename src/kiwano/{core => utils}/Task.h (99%) rename src/kiwano/{core => utils}/TaskManager.cpp (98%) rename src/kiwano/{core => utils}/TaskManager.h (98%) rename src/kiwano/{core => utils}/Ticker.cpp (98%) rename src/kiwano/{core => utils}/Ticker.h (99%) rename src/kiwano/{core => utils}/Timer.cpp (98%) rename src/kiwano/{core => utils}/Timer.h (100%) rename src/kiwano/{core => utils}/Xml.h (100%) diff --git a/projects/kiwano/kiwano.vcxproj b/projects/kiwano/kiwano.vcxproj index 6c148289..46c98312 100644 --- a/projects/kiwano/kiwano.vcxproj +++ b/projects/kiwano/kiwano.vcxproj @@ -17,7 +17,6 @@ - @@ -26,16 +25,12 @@ - - - - @@ -56,8 +51,6 @@ - - @@ -101,9 +94,16 @@ + + + + + + + @@ -126,7 +126,6 @@ - @@ -142,11 +141,7 @@ - - - - @@ -176,8 +171,13 @@ + + + + + diff --git a/projects/kiwano/kiwano.vcxproj.filters b/projects/kiwano/kiwano.vcxproj.filters index 3bbe6b4a..8e32b171 100644 --- a/projects/kiwano/kiwano.vcxproj.filters +++ b/projects/kiwano/kiwano.vcxproj.filters @@ -285,12 +285,6 @@ core - - core - - - core - core @@ -321,20 +315,26 @@ render - - core + + utils - - core + + utils - - core + + utils - - core + + utils - - core + + utils + + + utils + + + utils @@ -542,20 +542,20 @@ render - - core + + utils - - core + + utils - - core + + utils - - core + + utils - - core + + utils diff --git a/src/kiwano-network/HttpRequest.h b/src/kiwano-network/HttpRequest.h index fe8bdd6c..626c3b56 100644 --- a/src/kiwano-network/HttpRequest.h +++ b/src/kiwano-network/HttpRequest.h @@ -21,7 +21,7 @@ #pragma once #include #include -#include +#include namespace kiwano { diff --git a/src/kiwano/2d/Actor.h b/src/kiwano/2d/Actor.h index 0c552b20..a1af5e8b 100644 --- a/src/kiwano/2d/Actor.h +++ b/src/kiwano/2d/Actor.h @@ -19,11 +19,11 @@ // THE SOFTWARE. #pragma once +#include #include #include -#include #include -#include +#include #include #include diff --git a/src/kiwano/core/ObjectBase.cpp b/src/kiwano/core/ObjectBase.cpp index 9423407c..7fa059f2 100644 --- a/src/kiwano/core/ObjectBase.cpp +++ b/src/kiwano/core/ObjectBase.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include namespace kiwano diff --git a/src/kiwano/kiwano.h b/src/kiwano/kiwano.h index 92aa77fd..e7cb0773 100644 --- a/src/kiwano/kiwano.h +++ b/src/kiwano/kiwano.h @@ -52,11 +52,6 @@ #include #include #include -#include -#include -#include -#include -#include #include #include #include @@ -120,3 +115,8 @@ #include #include #include +#include +#include +#include +#include +#include diff --git a/src/kiwano/platform/Application.h b/src/kiwano/platform/Application.h index 6fe77c3c..5c2d4e87 100644 --- a/src/kiwano/platform/Application.h +++ b/src/kiwano/platform/Application.h @@ -23,11 +23,11 @@ #include #include #include -#include #include #include #include #include +#include namespace kiwano { diff --git a/src/kiwano/core/EventTicker.cpp b/src/kiwano/utils/EventTicker.cpp similarity index 97% rename from src/kiwano/core/EventTicker.cpp rename to src/kiwano/utils/EventTicker.cpp index b0872b41..f354f081 100644 --- a/src/kiwano/core/EventTicker.cpp +++ b/src/kiwano/utils/EventTicker.cpp @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include +#include namespace kiwano { diff --git a/src/kiwano/core/EventTicker.h b/src/kiwano/utils/EventTicker.h similarity index 98% rename from src/kiwano/core/EventTicker.h rename to src/kiwano/utils/EventTicker.h index 1f070edb..37ec50d1 100644 --- a/src/kiwano/core/EventTicker.h +++ b/src/kiwano/utils/EventTicker.h @@ -19,7 +19,7 @@ // THE SOFTWARE. #pragma once -#include +#include #include #include diff --git a/src/kiwano/core/Json.h b/src/kiwano/utils/Json.h similarity index 100% rename from src/kiwano/core/Json.h rename to src/kiwano/utils/Json.h diff --git a/src/kiwano/utils/ResourceCache.h b/src/kiwano/utils/ResourceCache.h index 6c40b938..e6aaa9e8 100644 --- a/src/kiwano/utils/ResourceCache.h +++ b/src/kiwano/utils/ResourceCache.h @@ -19,11 +19,11 @@ // THE SOFTWARE. #pragma once +#include +#include +#include #include #include -#include -#include -#include #include #include diff --git a/src/kiwano/core/Task.cpp b/src/kiwano/utils/Task.cpp similarity index 98% rename from src/kiwano/core/Task.cpp rename to src/kiwano/utils/Task.cpp index 430c6094..a1988735 100644 --- a/src/kiwano/core/Task.cpp +++ b/src/kiwano/utils/Task.cpp @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include +#include namespace kiwano { diff --git a/src/kiwano/core/Task.h b/src/kiwano/utils/Task.h similarity index 99% rename from src/kiwano/core/Task.h rename to src/kiwano/utils/Task.h index 9297d707..2fcce5f2 100644 --- a/src/kiwano/core/Task.h +++ b/src/kiwano/utils/Task.h @@ -19,7 +19,7 @@ // THE SOFTWARE. #pragma once -#include +#include #include namespace kiwano diff --git a/src/kiwano/core/TaskManager.cpp b/src/kiwano/utils/TaskManager.cpp similarity index 98% rename from src/kiwano/core/TaskManager.cpp rename to src/kiwano/utils/TaskManager.cpp index 740ef94a..36afa031 100644 --- a/src/kiwano/core/TaskManager.cpp +++ b/src/kiwano/utils/TaskManager.cpp @@ -19,7 +19,7 @@ // THE SOFTWARE. #include -#include +#include namespace kiwano { diff --git a/src/kiwano/core/TaskManager.h b/src/kiwano/utils/TaskManager.h similarity index 98% rename from src/kiwano/core/TaskManager.h rename to src/kiwano/utils/TaskManager.h index d71d975b..1d2c8669 100644 --- a/src/kiwano/core/TaskManager.h +++ b/src/kiwano/utils/TaskManager.h @@ -19,7 +19,7 @@ // THE SOFTWARE. #pragma once -#include +#include namespace kiwano { diff --git a/src/kiwano/core/Ticker.cpp b/src/kiwano/utils/Ticker.cpp similarity index 98% rename from src/kiwano/core/Ticker.cpp rename to src/kiwano/utils/Ticker.cpp index b3884cd8..c072f580 100644 --- a/src/kiwano/core/Ticker.cpp +++ b/src/kiwano/utils/Ticker.cpp @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include +#include namespace kiwano { diff --git a/src/kiwano/core/Ticker.h b/src/kiwano/utils/Ticker.h similarity index 99% rename from src/kiwano/core/Ticker.h rename to src/kiwano/utils/Ticker.h index a4663769..0fb86ab0 100644 --- a/src/kiwano/core/Ticker.h +++ b/src/kiwano/utils/Ticker.h @@ -19,7 +19,7 @@ // THE SOFTWARE. #pragma once -#include +#include namespace kiwano { diff --git a/src/kiwano/core/Timer.cpp b/src/kiwano/utils/Timer.cpp similarity index 98% rename from src/kiwano/core/Timer.cpp rename to src/kiwano/utils/Timer.cpp index aec2bb48..1c9ce5e2 100644 --- a/src/kiwano/core/Timer.cpp +++ b/src/kiwano/utils/Timer.cpp @@ -18,7 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#include +#include #include namespace kiwano diff --git a/src/kiwano/core/Timer.h b/src/kiwano/utils/Timer.h similarity index 100% rename from src/kiwano/core/Timer.h rename to src/kiwano/utils/Timer.h diff --git a/src/kiwano/core/Xml.h b/src/kiwano/utils/Xml.h similarity index 100% rename from src/kiwano/core/Xml.h rename to src/kiwano/utils/Xml.h