diff --git a/CMakeLists.txt b/CMakeLists.txt index 81b506e7c..38e75866e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,8 +14,8 @@ add_library(${CORE_WIDGETS_ADDON} SHARED "${CMAKE_JS_SRC}" "${PROJECT_SOURCE_DIR}/src/cpp/main.cpp" # core internals - "${PROJECT_SOURCE_DIR}/src/cpp/lib/Extras/Utils/integration.cpp" "${PROJECT_SOURCE_DIR}/src/cpp/lib/Extras/Utils/nutils.cpp" + "${PROJECT_SOURCE_DIR}/src/cpp/lib/core/Integration/integration.cpp" "${PROJECT_SOURCE_DIR}/src/cpp/lib/core/FlexLayout/flexutils.cpp" "${PROJECT_SOURCE_DIR}/src/cpp/lib/core/FlexLayout/flexlayout.cpp" "${PROJECT_SOURCE_DIR}/src/cpp/lib/core/FlexLayout/flexitem.cpp" diff --git a/src/cpp/include/nodegui/Extras/Utils/integration.h b/src/cpp/include/nodegui/core/Integration/integration.h similarity index 100% rename from src/cpp/include/nodegui/Extras/Utils/integration.h rename to src/cpp/include/nodegui/core/Integration/integration.h diff --git a/src/cpp/lib/Extras/Utils/integration.cpp b/src/cpp/lib/core/Integration/integration.cpp similarity index 86% rename from src/cpp/lib/Extras/Utils/integration.cpp rename to src/cpp/lib/core/Integration/integration.cpp index d603ed208..b83857913 100644 --- a/src/cpp/lib/Extras/Utils/integration.cpp +++ b/src/cpp/lib/core/Integration/integration.cpp @@ -1,5 +1,5 @@ -#include "Extras/Utils/integration.h" +#include "core/Integration/integration.h" #include #include diff --git a/src/cpp/main.cpp b/src/cpp/main.cpp index e68301609..10a94895d 100644 --- a/src/cpp/main.cpp +++ b/src/cpp/main.cpp @@ -1,6 +1,5 @@ #include -#include "Extras/Utils/integration.h" #include "Extras/Utils/nutils.h" #include "QtCore/QDate/qdate_wrap.h" #include "QtCore/QDateTime/qdatetime_wrap.h" @@ -74,6 +73,7 @@ #include "QtWidgets/QTreeWidgetItem/qtreewidgetitem_wrap.h" #include "QtWidgets/QWidget/qwidget_wrap.h" #include "core/FlexLayout/flexlayout_wrap.h" +#include "core/Integration/integration.h" // These cant be instantiated in JS Side void InitPrivateHelpers(Napi::Env env) { qodeIntegration::integrate();