diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ded53f39..be654e95d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,3 +163,12 @@ target_include_directories(${CORE_WIDGETS_ADDON} PRIVATE target_link_libraries(${CORE_WIDGETS_ADDON} PRIVATE "${CMAKE_JS_LIB}" ) + + +if (WIN32) + target_compile_definitions(${CORE_WIDGETS_ADDON} PRIVATE + ENABLE_DLL_EXPORT + ) + target_compile_options(${CORE_WIDGETS_ADDON} PRIVATE "/MP4") + +endif() \ No newline at end of file diff --git a/config/plugin.cmake b/config/plugin.cmake index 34f67925b..62db06a6a 100644 --- a/config/plugin.cmake +++ b/config/plugin.cmake @@ -3,6 +3,10 @@ set(PLUGIN_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}") set(NODEGUI_ROOT "${PLUGIN_CMAKE_DIR}/..") set(NODEGUI_LIBRARY "${NODEGUI_ROOT}/build/Release/nodegui_core.node") +if(WIN32) + set(NODEGUI_LIBRARY "${NODEGUI_ROOT}\\build\\Release\\nodegui_core.lib") +endif() + include("${PLUGIN_CMAKE_DIR}/common.cmake") include("${PLUGIN_CMAKE_DIR}/qt.cmake") include("${PLUGIN_CMAKE_DIR}/napi.cmake") diff --git a/package-lock.json b/package-lock.json index ea9ed28c8..a88a8512a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4820,12 +4820,6 @@ "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", "dev": true }, - "lodash.unescape": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/lodash.unescape/-/lodash.unescape-4.0.1.tgz", - "integrity": "sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=", - "dev": true - }, "loose-envify": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", diff --git a/src/cpp/include/nodegui/Extras/Utils/nutils.h b/src/cpp/include/nodegui/Extras/Utils/nutils.h index 2ec3165f4..4c1e03fdb 100644 --- a/src/cpp/include/nodegui/Extras/Utils/nutils.h +++ b/src/cpp/include/nodegui/Extras/Utils/nutils.h @@ -1,21 +1,31 @@ #pragma once +#ifdef _WINDLL +#ifdef ENABLE_DLL_EXPORT +#define DLL_EXPORT __declspec(dllexport) +#else +#define DLL_EXPORT __declspec(dllimport) +#endif +#else +#define DLL_EXPORT +#endif + #include #include #include -#include "core/FlexLayout/flexlayout.hpp" #include "core/FlexLayout/flexutils.h" -namespace extrautils { +#include "deps/yoga/YGNode.h" -QVariant* convertToQVariant(Napi::Env& env, Napi::Value& value); -bool isNapiValueInt(Napi::Env& env, Napi::Value& num); -std::string getNapiObjectClassName(Napi::Object& object); -void* configureQWidget(QWidget* widget, YGNodeRef node, - bool isLeafNode = false); -void* configureQObject(QObject* object); -void* configureComponent(void* component); +namespace extrautils { +DLL_EXPORT QVariant* convertToQVariant(Napi::Env& env, Napi::Value& value); +DLL_EXPORT bool isNapiValueInt(Napi::Env& env, Napi::Value& num); +DLL_EXPORT std::string getNapiObjectClassName(Napi::Object& object); +DLL_EXPORT void* configureQWidget(QWidget* widget, YGNodeRef node, + bool isLeafNode = false); +DLL_EXPORT void* configureQObject(QObject* object); +DLL_EXPORT void* configureComponent(void* component); template void safeDelete(QPointer& component) { @@ -26,7 +36,7 @@ void safeDelete(QPointer& component) { void initAppSettings(); } // namespace extrautils -class NUtilsWrap : public Napi::ObjectWrap { +class DLL_EXPORT NUtilsWrap : public Napi::ObjectWrap { public: static Napi::Object init(Napi::Env env, Napi::Object exports); NUtilsWrap(const Napi::CallbackInfo& info); @@ -34,5 +44,5 @@ class NUtilsWrap : public Napi::ObjectWrap { }; namespace StaticNUtilsWrapMethods { -Napi::Value isNapiExternal(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value isNapiExternal(const Napi::CallbackInfo& info); } // namespace StaticNUtilsWrapMethods \ No newline at end of file diff --git a/src/cpp/include/nodegui/QtCore/QDate/qdate_wrap.h b/src/cpp/include/nodegui/QtCore/QDate/qdate_wrap.h index 396ef3481..677c6921f 100644 --- a/src/cpp/include/nodegui/QtCore/QDate/qdate_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QDate/qdate_wrap.h @@ -5,9 +5,10 @@ #include +#include "Extras/Utils/nutils.h" #include "core/Component/component_macro.h" -class QDateWrap : public Napi::ObjectWrap { +class DLL_EXPORT QDateWrap : public Napi::ObjectWrap { COMPONENT_WRAPPED_METHODS_DECLARATION private: std::unique_ptr instance; @@ -38,9 +39,9 @@ class QDateWrap : public Napi::ObjectWrap { }; namespace StaticDateWrapMethods { -Napi::Value currentDate(const Napi::CallbackInfo& info); -Napi::Value fromJulianDay(const Napi::CallbackInfo& info); -Napi::Value isLeapYear(const Napi::CallbackInfo& info); -Napi::Value isValid(const Napi::CallbackInfo& info); -Napi::Value fromQVariant(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value currentDate(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value fromJulianDay(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value isLeapYear(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value isValid(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value fromQVariant(const Napi::CallbackInfo& info); } // namespace StaticDateWrapMethods diff --git a/src/cpp/include/nodegui/QtCore/QDateTime/qdatetime_wrap.h b/src/cpp/include/nodegui/QtCore/QDateTime/qdatetime_wrap.h index 4c88a18b9..06372afa7 100644 --- a/src/cpp/include/nodegui/QtCore/QDateTime/qdatetime_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QDateTime/qdatetime_wrap.h @@ -5,9 +5,10 @@ #include +#include "Extras/Utils/nutils.h" #include "core/Component/component_macro.h" -class QDateTimeWrap : public Napi::ObjectWrap { +class DLL_EXPORT QDateTimeWrap : public Napi::ObjectWrap { COMPONENT_WRAPPED_METHODS_DECLARATION private: std::unique_ptr instance; @@ -50,9 +51,9 @@ class QDateTimeWrap : public Napi::ObjectWrap { }; namespace StaticDateTimeWrapMethods { -Napi::Value currentDateTime(const Napi::CallbackInfo& info); -Napi::Value currentDateTimeUtc(const Napi::CallbackInfo& info); -Napi::Value currentMSecsSinceEpoch(const Napi::CallbackInfo& info); -Napi::Value currentSecsSinceEpoch(const Napi::CallbackInfo& info); -Napi::Value fromQVariant(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value currentDateTime(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value currentDateTimeUtc(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value currentMSecsSinceEpoch(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value currentSecsSinceEpoch(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value fromQVariant(const Napi::CallbackInfo& info); } // namespace StaticDateTimeWrapMethods diff --git a/src/cpp/include/nodegui/QtCore/QModelIndex/qmodelindex_wrap.h b/src/cpp/include/nodegui/QtCore/QModelIndex/qmodelindex_wrap.h index c2ed2d610..98a8f7924 100644 --- a/src/cpp/include/nodegui/QtCore/QModelIndex/qmodelindex_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QModelIndex/qmodelindex_wrap.h @@ -4,9 +4,10 @@ #include +#include "Extras/Utils/nutils.h" #include "core/Component/component_macro.h" -class QModelIndexWrap : public Napi::ObjectWrap { +class DLL_EXPORT QModelIndexWrap : public Napi::ObjectWrap { private: std::unique_ptr instance; @@ -31,5 +32,5 @@ class QModelIndexWrap : public Napi::ObjectWrap { }; namespace StaticQModelIndexWrapMethods { -Napi::Value fromQVariant(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value fromQVariant(const Napi::CallbackInfo& info); } // namespace StaticQModelIndexWrapMethods \ No newline at end of file diff --git a/src/cpp/include/nodegui/QtCore/QObject/nobject.hpp b/src/cpp/include/nodegui/QtCore/QObject/nobject.hpp index 67ea6d7e3..d10340d4d 100644 --- a/src/cpp/include/nodegui/QtCore/QObject/nobject.hpp +++ b/src/cpp/include/nodegui/QtCore/QObject/nobject.hpp @@ -1,11 +1,12 @@ #pragma once #include +#include "Extras/Utils/nutils.h" #include "QtCore/QObject/qobject_macro.h" #include "core/Events/eventwidget.h" #include "core/Events/eventwidget_macro.h" -class NObject : public QObject, public EventWidget { +class DLL_EXPORT NObject : public QObject, public EventWidget { Q_OBJECT EVENTWIDGET_IMPLEMENTATIONS(QObject) public: diff --git a/src/cpp/include/nodegui/QtCore/QObject/qobject_wrap.h b/src/cpp/include/nodegui/QtCore/QObject/qobject_wrap.h index c34a65b0c..8f44486e3 100644 --- a/src/cpp/include/nodegui/QtCore/QObject/qobject_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QObject/qobject_wrap.h @@ -4,10 +4,11 @@ #include +#include "Extras/Utils/nutils.h" #include "QtCore/QObject/nobject.hpp" #include "QtCore/QObject/qobject_macro.h" -class QObjectWrap : public Napi::ObjectWrap { +class DLL_EXPORT QObjectWrap : public Napi::ObjectWrap { QOBJECT_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtCore/QPoint/qpoint_wrap.h b/src/cpp/include/nodegui/QtCore/QPoint/qpoint_wrap.h index 31b615b9e..d6c3b0c0e 100644 --- a/src/cpp/include/nodegui/QtCore/QPoint/qpoint_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QPoint/qpoint_wrap.h @@ -4,9 +4,10 @@ #include +#include "Extras/Utils/nutils.h" #include "core/Component/component_macro.h" -class QPointWrap : public Napi::ObjectWrap { +class DLL_EXPORT QPointWrap : public Napi::ObjectWrap { COMPONENT_WRAPPED_METHODS_DECLARATION private: std::unique_ptr instance; @@ -25,5 +26,5 @@ class QPointWrap : public Napi::ObjectWrap { }; namespace StaticQPointWrapMethods { -Napi::Value fromQVariant(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value fromQVariant(const Napi::CallbackInfo& info); } // namespace StaticQPointWrapMethods \ No newline at end of file diff --git a/src/cpp/include/nodegui/QtCore/QRect/qrect_wrap.h b/src/cpp/include/nodegui/QtCore/QRect/qrect_wrap.h index 1861f55ee..2ba304e4f 100644 --- a/src/cpp/include/nodegui/QtCore/QRect/qrect_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QRect/qrect_wrap.h @@ -4,9 +4,10 @@ #include +#include "Extras/Utils/nutils.h" #include "core/Component/component_macro.h" -class QRectWrap : public Napi::ObjectWrap { +class DLL_EXPORT QRectWrap : public Napi::ObjectWrap { COMPONENT_WRAPPED_METHODS_DECLARATION private: std::unique_ptr instance; @@ -29,5 +30,5 @@ class QRectWrap : public Napi::ObjectWrap { }; namespace StaticQRectWrapMethods { -Napi::Value fromQVariant(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value fromQVariant(const Napi::CallbackInfo& info); } // namespace StaticQRectWrapMethods \ No newline at end of file diff --git a/src/cpp/include/nodegui/QtCore/QSize/qsize_wrap.h b/src/cpp/include/nodegui/QtCore/QSize/qsize_wrap.h index d75d5941b..f76546618 100644 --- a/src/cpp/include/nodegui/QtCore/QSize/qsize_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QSize/qsize_wrap.h @@ -4,9 +4,10 @@ #include +#include "Extras/Utils/nutils.h" #include "core/Component/component_macro.h" -class QSizeWrap : public Napi::ObjectWrap { +class DLL_EXPORT QSizeWrap : public Napi::ObjectWrap { COMPONENT_WRAPPED_METHODS_DECLARATION private: std::unique_ptr instance; @@ -25,5 +26,5 @@ class QSizeWrap : public Napi::ObjectWrap { }; namespace StaticQSizeWrapMethods { -Napi::Value fromQVariant(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value fromQVariant(const Napi::CallbackInfo& info); } // namespace StaticQSizeWrapMethods \ No newline at end of file diff --git a/src/cpp/include/nodegui/QtCore/QTime/qtime_wrap.h b/src/cpp/include/nodegui/QtCore/QTime/qtime_wrap.h index 417225cf9..b27135db1 100644 --- a/src/cpp/include/nodegui/QtCore/QTime/qtime_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QTime/qtime_wrap.h @@ -5,9 +5,10 @@ #include +#include "Extras/Utils/nutils.h" #include "core/Component/component_macro.h" -class QTimeWrap : public Napi::ObjectWrap { +class DLL_EXPORT QTimeWrap : public Napi::ObjectWrap { COMPONENT_WRAPPED_METHODS_DECLARATION private: std::unique_ptr instance; @@ -38,8 +39,8 @@ class QTimeWrap : public Napi::ObjectWrap { }; namespace StaticTimeWrapMethods { -Napi::Value currentTime(const Napi::CallbackInfo& info); -Napi::Value fromMSecsSinceStartOfDay(const Napi::CallbackInfo& info); -Napi::Value isValid(const Napi::CallbackInfo& info); -Napi::Value fromQVariant(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value currentTime(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value fromMSecsSinceStartOfDay(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value isValid(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value fromQVariant(const Napi::CallbackInfo& info); } // namespace StaticTimeWrapMethods diff --git a/src/cpp/include/nodegui/QtCore/QUrl/qurl_wrap.h b/src/cpp/include/nodegui/QtCore/QUrl/qurl_wrap.h index 9143c4868..c89c12705 100644 --- a/src/cpp/include/nodegui/QtCore/QUrl/qurl_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QUrl/qurl_wrap.h @@ -4,9 +4,10 @@ #include +#include "Extras/Utils/nutils.h" #include "core/Component/component_macro.h" -class QUrlWrap : public Napi::ObjectWrap { +class DLL_EXPORT QUrlWrap : public Napi::ObjectWrap { COMPONENT_WRAPPED_METHODS_DECLARATION private: std::unique_ptr instance; @@ -23,5 +24,5 @@ class QUrlWrap : public Napi::ObjectWrap { }; namespace StaticQUrlWrapMethods { -Napi::Value fromQVariant(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value fromQVariant(const Napi::CallbackInfo& info); } // namespace StaticQUrlWrapMethods \ No newline at end of file diff --git a/src/cpp/include/nodegui/QtCore/QVariant/qvariant_wrap.h b/src/cpp/include/nodegui/QtCore/QVariant/qvariant_wrap.h index 4500ec2c6..0cd57774b 100644 --- a/src/cpp/include/nodegui/QtCore/QVariant/qvariant_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QVariant/qvariant_wrap.h @@ -4,9 +4,10 @@ #include +#include "Extras/Utils/nutils.h" #include "core/Component/component_macro.h" -class QVariantWrap : public Napi::ObjectWrap { +class DLL_EXPORT QVariantWrap : public Napi::ObjectWrap { COMPONENT_WRAPPED_METHODS_DECLARATION private: QSharedPointer instance; @@ -25,5 +26,5 @@ class QVariantWrap : public Napi::ObjectWrap { }; namespace StaticQVariantWrapMethods { -Napi::Value converToQVariant(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value converToQVariant(const Napi::CallbackInfo& info); } // namespace StaticQVariantWrapMethods \ No newline at end of file diff --git a/src/cpp/include/nodegui/QtGui/QApplication/qapplication_wrap.h b/src/cpp/include/nodegui/QtGui/QApplication/qapplication_wrap.h index 2bb5ed0f8..75357a270 100644 --- a/src/cpp/include/nodegui/QtGui/QApplication/qapplication_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QApplication/qapplication_wrap.h @@ -5,9 +5,10 @@ #include #include +#include "Extras/Utils/nutils.h" #include "core/Component/component_macro.h" -class QApplicationWrap : public Napi::ObjectWrap { +class DLL_EXPORT QApplicationWrap : public Napi::ObjectWrap { COMPONENT_WRAPPED_METHODS_DECLARATION private: @@ -32,7 +33,7 @@ class QApplicationWrap : public Napi::ObjectWrap { }; namespace StaticQApplicationWrapMethods { -Napi::Value instance(const Napi::CallbackInfo& info); -Napi::Value clipboard(const Napi::CallbackInfo& info); -Napi::Value style(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value instance(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value clipboard(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value style(const Napi::CallbackInfo& info); } // namespace StaticQApplicationWrapMethods diff --git a/src/cpp/include/nodegui/QtGui/QClipboard/qclipboard_wrap.h b/src/cpp/include/nodegui/QtGui/QClipboard/qclipboard_wrap.h index 572c11980..3d37e63a4 100644 --- a/src/cpp/include/nodegui/QtGui/QClipboard/qclipboard_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QClipboard/qclipboard_wrap.h @@ -4,9 +4,10 @@ #include +#include "Extras/Utils/nutils.h" #include "core/Component/component_macro.h" -class QClipboardWrap : public Napi::ObjectWrap { +class DLL_EXPORT QClipboardWrap : public Napi::ObjectWrap { COMPONENT_WRAPPED_METHODS_DECLARATION private: diff --git a/src/cpp/include/nodegui/QtGui/QColor/qcolor_wrap.h b/src/cpp/include/nodegui/QtGui/QColor/qcolor_wrap.h index 13df401ac..d28fbc1dd 100644 --- a/src/cpp/include/nodegui/QtGui/QColor/qcolor_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QColor/qcolor_wrap.h @@ -4,9 +4,10 @@ #include +#include "Extras/Utils/nutils.h" #include "core/Component/component_macro.h" -class QColorWrap : public Napi::ObjectWrap { +class DLL_EXPORT QColorWrap : public Napi::ObjectWrap { COMPONENT_WRAPPED_METHODS_DECLARATION private: std::unique_ptr instance; @@ -29,5 +30,5 @@ class QColorWrap : public Napi::ObjectWrap { }; namespace StaticQColorWrapMethods { -Napi::Value fromQVariant(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value fromQVariant(const Napi::CallbackInfo& info); } // namespace StaticQColorWrapMethods diff --git a/src/cpp/include/nodegui/QtGui/QCursor/qcursor_wrap.h b/src/cpp/include/nodegui/QtGui/QCursor/qcursor_wrap.h index 90752d524..e698448ad 100644 --- a/src/cpp/include/nodegui/QtGui/QCursor/qcursor_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QCursor/qcursor_wrap.h @@ -4,9 +4,10 @@ #include +#include "Extras/Utils/nutils.h" #include "core/Component/component_macro.h" -class QCursorWrap : public Napi::ObjectWrap { +class DLL_EXPORT QCursorWrap : public Napi::ObjectWrap { COMPONENT_WRAPPED_METHODS_DECLARATION private: std::unique_ptr instance; diff --git a/src/cpp/include/nodegui/QtGui/QEvent/QKeyEvent/qkeyevent_wrap.h b/src/cpp/include/nodegui/QtGui/QEvent/QKeyEvent/qkeyevent_wrap.h index 62fd15bf4..596f56cf9 100644 --- a/src/cpp/include/nodegui/QtGui/QEvent/QKeyEvent/qkeyevent_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QEvent/QKeyEvent/qkeyevent_wrap.h @@ -4,9 +4,10 @@ #include +#include "Extras/Utils/nutils.h" #include "core/Component/component_macro.h" -class QKeyEventWrap : public Napi::ObjectWrap { +class DLL_EXPORT QKeyEventWrap : public Napi::ObjectWrap { COMPONENT_WRAPPED_METHODS_DECLARATION private: diff --git a/src/cpp/include/nodegui/QtGui/QEvent/QMouseEvent/qmouseevent_wrap.h b/src/cpp/include/nodegui/QtGui/QEvent/QMouseEvent/qmouseevent_wrap.h index 5cf029f0b..e9cac08ce 100644 --- a/src/cpp/include/nodegui/QtGui/QEvent/QMouseEvent/qmouseevent_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QEvent/QMouseEvent/qmouseevent_wrap.h @@ -4,9 +4,10 @@ #include +#include "Extras/Utils/nutils.h" #include "core/Component/component_macro.h" -class QMouseEventWrap : public Napi::ObjectWrap { +class DLL_EXPORT QMouseEventWrap : public Napi::ObjectWrap { COMPONENT_WRAPPED_METHODS_DECLARATION private: diff --git a/src/cpp/include/nodegui/QtGui/QFont/qfont_wrap.h b/src/cpp/include/nodegui/QtGui/QFont/qfont_wrap.h index 30e37b81b..349267b39 100644 --- a/src/cpp/include/nodegui/QtGui/QFont/qfont_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QFont/qfont_wrap.h @@ -4,9 +4,10 @@ #include +#include "Extras/Utils/nutils.h" #include "core/Component/component_macro.h" -class QFontWrap : public Napi::ObjectWrap { +class DLL_EXPORT QFontWrap : public Napi::ObjectWrap { private: std::unique_ptr instance; @@ -34,5 +35,5 @@ class QFontWrap : public Napi::ObjectWrap { }; namespace StaticQFontWrapMethods { -Napi::Value fromQVariant(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value fromQVariant(const Napi::CallbackInfo& info); } // namespace StaticQFontWrapMethods diff --git a/src/cpp/include/nodegui/QtGui/QFontDatabase/qfontdatabase_wrap.h b/src/cpp/include/nodegui/QtGui/QFontDatabase/qfontdatabase_wrap.h index 9d88a8cce..fb3b5ec07 100644 --- a/src/cpp/include/nodegui/QtGui/QFontDatabase/qfontdatabase_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QFontDatabase/qfontdatabase_wrap.h @@ -4,9 +4,11 @@ #include +#include "Extras/Utils/nutils.h" #include "core/Component/component_macro.h" -class QFontDatabaseWrap : public Napi::ObjectWrap { +class DLL_EXPORT QFontDatabaseWrap + : public Napi::ObjectWrap { COMPONENT_WRAPPED_METHODS_DECLARATION private: @@ -24,6 +26,6 @@ class QFontDatabaseWrap : public Napi::ObjectWrap { }; namespace StaticQFontDatabaseWrapMethods { -Napi::Value addApplicationFont(const Napi::CallbackInfo& info); -Napi::Value removeApplicationFont(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value addApplicationFont(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value removeApplicationFont(const Napi::CallbackInfo& info); } // namespace StaticQFontDatabaseWrapMethods diff --git a/src/cpp/include/nodegui/QtGui/QIcon/qicon_wrap.h b/src/cpp/include/nodegui/QtGui/QIcon/qicon_wrap.h index c840ec566..0ec94d651 100644 --- a/src/cpp/include/nodegui/QtGui/QIcon/qicon_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QIcon/qicon_wrap.h @@ -4,9 +4,10 @@ #include +#include "Extras/Utils/nutils.h" #include "core/Component/component_macro.h" -class QIconWrap : public Napi::ObjectWrap { +class DLL_EXPORT QIconWrap : public Napi::ObjectWrap { COMPONENT_WRAPPED_METHODS_DECLARATION private: @@ -26,5 +27,5 @@ class QIconWrap : public Napi::ObjectWrap { }; namespace StaticQIconWrapMethods { -Napi::Value fromQVariant(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value fromQVariant(const Napi::CallbackInfo& info); } // namespace StaticQIconWrapMethods \ No newline at end of file diff --git a/src/cpp/include/nodegui/QtGui/QKeySequence/qkeysequence_wrap.h b/src/cpp/include/nodegui/QtGui/QKeySequence/qkeysequence_wrap.h index e0b8649cb..e2195a23b 100644 --- a/src/cpp/include/nodegui/QtGui/QKeySequence/qkeysequence_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QKeySequence/qkeysequence_wrap.h @@ -4,9 +4,10 @@ #include +#include "Extras/Utils/nutils.h" #include "core/Component/component_macro.h" -class QKeySequenceWrap : public Napi::ObjectWrap { +class DLL_EXPORT QKeySequenceWrap : public Napi::ObjectWrap { COMPONENT_WRAPPED_METHODS_DECLARATION private: @@ -26,5 +27,5 @@ class QKeySequenceWrap : public Napi::ObjectWrap { }; namespace StaticQKeySequenceWrapMethods { -Napi::Value fromQVariant(const Napi::CallbackInfo &info); +DLL_EXPORT Napi::Value fromQVariant(const Napi::CallbackInfo &info); } // namespace StaticQKeySequenceWrapMethods diff --git a/src/cpp/include/nodegui/QtGui/QMovie/nmovie.hpp b/src/cpp/include/nodegui/QtGui/QMovie/nmovie.hpp index 648b49fe0..26a213ca0 100644 --- a/src/cpp/include/nodegui/QtGui/QMovie/nmovie.hpp +++ b/src/cpp/include/nodegui/QtGui/QMovie/nmovie.hpp @@ -1,13 +1,14 @@ #pragma once #include +#include "Extras/Utils/nutils.h" #include "QtCore/QObject/qobject_macro.h" #include "QtCore/QRect/qrect_wrap.h" #include "QtCore/QSize/qsize_wrap.h" #include "core/Events/eventwidget.h" #include "core/Events/eventwidget_macro.h" -class NMovie : public QMovie, public EventWidget { +class DLL_EXPORT NMovie : public QMovie, public EventWidget { Q_OBJECT EVENTWIDGET_IMPLEMENTATIONS(QMovie) public: diff --git a/src/cpp/include/nodegui/QtGui/QMovie/qmovie_wrap.h b/src/cpp/include/nodegui/QtGui/QMovie/qmovie_wrap.h index 483329e69..32786eeda 100644 --- a/src/cpp/include/nodegui/QtGui/QMovie/qmovie_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QMovie/qmovie_wrap.h @@ -4,10 +4,11 @@ #include +#include "Extras/Utils/nutils.h" #include "QtCore/QObject/qobject_macro.h" #include "nmovie.hpp" -class QMovieWrap : public Napi::ObjectWrap { +class DLL_EXPORT QMovieWrap : public Napi::ObjectWrap { QOBJECT_WRAPPED_METHODS_DECLARATION private: diff --git a/src/cpp/include/nodegui/QtGui/QPixmap/qpixmap_wrap.h b/src/cpp/include/nodegui/QtGui/QPixmap/qpixmap_wrap.h index 9a10c9e64..9d3e77ad2 100644 --- a/src/cpp/include/nodegui/QtGui/QPixmap/qpixmap_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QPixmap/qpixmap_wrap.h @@ -4,9 +4,10 @@ #include +#include "Extras/Utils/nutils.h" #include "core/Component/component_macro.h" -class QPixmapWrap : public Napi::ObjectWrap { +class DLL_EXPORT QPixmapWrap : public Napi::ObjectWrap { COMPONENT_WRAPPED_METHODS_DECLARATION private: @@ -28,5 +29,5 @@ class QPixmapWrap : public Napi::ObjectWrap { }; namespace StaticQPixmapWrapMethods { -Napi::Value fromQVariant(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value fromQVariant(const Napi::CallbackInfo& info); } // namespace StaticQPixmapWrapMethods \ No newline at end of file diff --git a/src/cpp/include/nodegui/QtGui/QStyle/qstyle_wrap.h b/src/cpp/include/nodegui/QtGui/QStyle/qstyle_wrap.h index 39d3bdce1..07d65c774 100644 --- a/src/cpp/include/nodegui/QtGui/QStyle/qstyle_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QStyle/qstyle_wrap.h @@ -4,9 +4,10 @@ #include +#include "Extras/Utils/nutils.h" #include "core/Component/component_macro.h" -class QStyleWrap : public Napi::ObjectWrap { +class DLL_EXPORT QStyleWrap : public Napi::ObjectWrap { COMPONENT_WRAPPED_METHODS_DECLARATION private: diff --git a/src/cpp/include/nodegui/QtWidgets/QAction/naction.hpp b/src/cpp/include/nodegui/QtWidgets/QAction/naction.hpp index 490738b0b..39feea1aa 100644 --- a/src/cpp/include/nodegui/QtWidgets/QAction/naction.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QAction/naction.hpp @@ -1,12 +1,12 @@ #pragma once - #include +#include "Extras/Utils/nutils.h" #include "QtCore/QObject/qobject_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" -class NAction : public QAction, public EventWidget { +class DLL_EXPORT NAction : public QAction, public EventWidget { Q_OBJECT EVENTWIDGET_IMPLEMENTATIONS(QAction) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QAction/qaction_wrap.h b/src/cpp/include/nodegui/QtWidgets/QAction/qaction_wrap.h index c58b2d826..070fc2362 100644 --- a/src/cpp/include/nodegui/QtWidgets/QAction/qaction_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QAction/qaction_wrap.h @@ -4,9 +4,10 @@ #include +#include "Extras/Utils/nutils.h" #include "QtCore/QObject/qobject_macro.h" #include "naction.hpp" -class QActionWrap : public Napi::ObjectWrap { +class DLL_EXPORT QActionWrap : public Napi::ObjectWrap { QOBJECT_WRAPPED_METHODS_DECLARATION private: diff --git a/src/cpp/include/nodegui/QtWidgets/QBoxLayout/nboxlayout.hpp b/src/cpp/include/nodegui/QtWidgets/QBoxLayout/nboxlayout.hpp index 5f81b343c..80a06a501 100644 --- a/src/cpp/include/nodegui/QtWidgets/QBoxLayout/nboxlayout.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QBoxLayout/nboxlayout.hpp @@ -1,10 +1,11 @@ #pragma once #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QLayout/qlayout_macro.h" #include "core/Events/eventwidget_macro.h" -class NBoxLayout : public QBoxLayout, public EventWidget { +class DLL_EXPORT NBoxLayout : public QBoxLayout, public EventWidget { Q_OBJECT public: EVENTWIDGET_IMPLEMENTATIONS(QBoxLayout) diff --git a/src/cpp/include/nodegui/QtWidgets/QBoxLayout/qboxlayout_wrap.h b/src/cpp/include/nodegui/QtWidgets/QBoxLayout/qboxlayout_wrap.h index e1dba62cb..8e5657e6e 100644 --- a/src/cpp/include/nodegui/QtWidgets/QBoxLayout/qboxlayout_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QBoxLayout/qboxlayout_wrap.h @@ -5,10 +5,11 @@ #include #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QBoxLayout/nboxlayout.hpp" #include "QtWidgets/QLayout/qlayout_macro.h" -class QBoxLayoutWrap : public Napi::ObjectWrap { +class DLL_EXPORT QBoxLayoutWrap : public Napi::ObjectWrap { QLAYOUT_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QButtonGroup/nbuttongroup.hpp b/src/cpp/include/nodegui/QtWidgets/QButtonGroup/nbuttongroup.hpp index 73dffdcec..1d8c7b653 100644 --- a/src/cpp/include/nodegui/QtWidgets/QButtonGroup/nbuttongroup.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QButtonGroup/nbuttongroup.hpp @@ -1,13 +1,13 @@ #pragma once - #include #include +#include "Extras/Utils/nutils.h" #include "QtCore/QObject/qobject_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" -class NButtonGroup : public QButtonGroup, public EventWidget { +class DLL_EXPORT NButtonGroup : public QButtonGroup, public EventWidget { Q_OBJECT EVENTWIDGET_IMPLEMENTATIONS(QButtonGroup) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QButtonGroup/qbuttongroup_wrap.h b/src/cpp/include/nodegui/QtWidgets/QButtonGroup/qbuttongroup_wrap.h index cdd3dbd39..ed58872a4 100644 --- a/src/cpp/include/nodegui/QtWidgets/QButtonGroup/qbuttongroup_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QButtonGroup/qbuttongroup_wrap.h @@ -7,7 +7,7 @@ #include "Extras/Utils/nutils.h" #include "QtCore/QObject/qobject_macro.h" #include "nbuttongroup.hpp" -class QButtonGroupWrap : public Napi::ObjectWrap { +class DLL_EXPORT QButtonGroupWrap : public Napi::ObjectWrap { private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QCalendarWidget/ncalendarwidget.hpp b/src/cpp/include/nodegui/QtWidgets/QCalendarWidget/ncalendarwidget.hpp index 004928362..d1dfa60b3 100644 --- a/src/cpp/include/nodegui/QtWidgets/QCalendarWidget/ncalendarwidget.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QCalendarWidget/ncalendarwidget.hpp @@ -1,13 +1,13 @@ #pragma once - #include +#include "Extras/Utils/nutils.h" #include "QtCore/QDate/qdate_wrap.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" -class NCalendarWidget : public QCalendarWidget, public NodeWidget { +class DLL_EXPORT NCalendarWidget : public QCalendarWidget, public NodeWidget { Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QCalendarWidget) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QCalendarWidget/qcalendarwidget_wrap.h b/src/cpp/include/nodegui/QtWidgets/QCalendarWidget/qcalendarwidget_wrap.h index 28be43849..ff82ef26e 100644 --- a/src/cpp/include/nodegui/QtWidgets/QCalendarWidget/qcalendarwidget_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QCalendarWidget/qcalendarwidget_wrap.h @@ -8,7 +8,8 @@ #include "QtWidgets/QCalendarWidget/ncalendarwidget.hpp" #include "QtWidgets/QWidget/qwidget_macro.h" -class QCalendarWidgetWrap : public Napi::ObjectWrap { +class DLL_EXPORT QCalendarWidgetWrap + : public Napi::ObjectWrap { private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QCheckBox/ncheckbox.hpp b/src/cpp/include/nodegui/QtWidgets/QCheckBox/ncheckbox.hpp index 6bfa0fda5..e9a90fe47 100644 --- a/src/cpp/include/nodegui/QtWidgets/QCheckBox/ncheckbox.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QCheckBox/ncheckbox.hpp @@ -1,13 +1,13 @@ #pragma once - #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QAbstractButton/qabstractbutton_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" -class NCheckBox : public QCheckBox, public NodeWidget { +class DLL_EXPORT NCheckBox : public QCheckBox, public NodeWidget { Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QCheckBox) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QCheckBox/qcheckbox_wrap.h b/src/cpp/include/nodegui/QtWidgets/QCheckBox/qcheckbox_wrap.h index 59f8ce692..38ec3b0f6 100644 --- a/src/cpp/include/nodegui/QtWidgets/QCheckBox/qcheckbox_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QCheckBox/qcheckbox_wrap.h @@ -4,11 +4,12 @@ #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QAbstractButton/qabstractbutton_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "ncheckbox.hpp" -class QCheckBoxWrap : public Napi::ObjectWrap { +class DLL_EXPORT QCheckBoxWrap : public Napi::ObjectWrap { QABSTRACTBUTTON_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QComboBox/ncombobox.hpp b/src/cpp/include/nodegui/QtWidgets/QComboBox/ncombobox.hpp index 2d7aeb742..5debbf809 100644 --- a/src/cpp/include/nodegui/QtWidgets/QComboBox/ncombobox.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QComboBox/ncombobox.hpp @@ -1,12 +1,12 @@ #pragma once - #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" -class NComboBox : public QComboBox, public NodeWidget { +class DLL_EXPORT NComboBox : public QComboBox, public NodeWidget { public: Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QComboBox) diff --git a/src/cpp/include/nodegui/QtWidgets/QComboBox/qcombobox_wrap.h b/src/cpp/include/nodegui/QtWidgets/QComboBox/qcombobox_wrap.h index 05afb8010..3bf3e658c 100644 --- a/src/cpp/include/nodegui/QtWidgets/QComboBox/qcombobox_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QComboBox/qcombobox_wrap.h @@ -8,7 +8,7 @@ #include "QtWidgets/QComboBox/ncombobox.hpp" #include "QtWidgets/QWidget/qwidget_macro.h" -class QComboBoxWrap : public Napi::ObjectWrap { +class DLL_EXPORT QComboBoxWrap : public Napi::ObjectWrap { QWIDGET_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QDateEdit/ndateedit.hpp b/src/cpp/include/nodegui/QtWidgets/QDateEdit/ndateedit.hpp index 74c3af818..aade7255c 100644 --- a/src/cpp/include/nodegui/QtWidgets/QDateEdit/ndateedit.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QDateEdit/ndateedit.hpp @@ -1,12 +1,12 @@ #pragma once - #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QDateTimeEdit/qdatetimeedit_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" -class NDateEdit : public QDateEdit, public NodeWidget { +class DLL_EXPORT NDateEdit : public QDateEdit, public NodeWidget { Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QDateEdit) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QDateEdit/qdateedit_wrap.h b/src/cpp/include/nodegui/QtWidgets/QDateEdit/qdateedit_wrap.h index 4bef31ad8..9b0f9c196 100644 --- a/src/cpp/include/nodegui/QtWidgets/QDateEdit/qdateedit_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QDateEdit/qdateedit_wrap.h @@ -8,7 +8,7 @@ #include "QtWidgets/QDateTimeEdit/qdatetimeedit_macro.h" #include "ndateedit.hpp" -class QDateEditWrap : public Napi::ObjectWrap { +class DLL_EXPORT QDateEditWrap : public Napi::ObjectWrap { QDATETIMEEDIT_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/ndatetimeedit.hpp b/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/ndatetimeedit.hpp index 12a659a08..27cd7728a 100644 --- a/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/ndatetimeedit.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/ndatetimeedit.hpp @@ -1,12 +1,13 @@ #pragma once +#include #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QDateTimeEdit/qdatetimeedit_macro.h" #include "core/NodeWidget/nodewidget.h" -#include "napi.h" -class NDateTimeEdit : public QDateTimeEdit, public NodeWidget { +class DLL_EXPORT NDateTimeEdit : public QDateTimeEdit, public NodeWidget { Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QDateTimeEdit) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/qdatetimeedit_wrap.h b/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/qdatetimeedit_wrap.h index a7cce2a7a..5430bc454 100644 --- a/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/qdatetimeedit_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/qdatetimeedit_wrap.h @@ -8,7 +8,8 @@ #include "QtWidgets/QDateTimeEdit/qdatetimeedit_macro.h" #include "ndatetimeedit.hpp" -class QDateTimeEditWrap : public Napi::ObjectWrap { +class DLL_EXPORT QDateTimeEditWrap + : public Napi::ObjectWrap { QDATETIMEEDIT_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QDial/ndial.hpp b/src/cpp/include/nodegui/QtWidgets/QDial/ndial.hpp index 80f60964a..b747c0173 100644 --- a/src/cpp/include/nodegui/QtWidgets/QDial/ndial.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QDial/ndial.hpp @@ -1,11 +1,11 @@ #pragma once - #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QAbstractSlider/qabstractslider_macro.h" #include "core/NodeWidget/nodewidget.h" -class NDial : public QDial, public NodeWidget { +class DLL_EXPORT NDial : public QDial, public NodeWidget { Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QDial) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QDial/qdial_wrap.h b/src/cpp/include/nodegui/QtWidgets/QDial/qdial_wrap.h index 2609664a3..949300e7f 100644 --- a/src/cpp/include/nodegui/QtWidgets/QDial/qdial_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QDial/qdial_wrap.h @@ -4,11 +4,12 @@ #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QAbstractSlider/qabstractslider_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "ndial.hpp" -class QDialWrap : public Napi::ObjectWrap { +class DLL_EXPORT QDialWrap : public Napi::ObjectWrap { QABSTRACTSLIDER_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QDialog/ndialog.hpp b/src/cpp/include/nodegui/QtWidgets/QDialog/ndialog.hpp index be7aa8c9d..7b824905a 100644 --- a/src/cpp/include/nodegui/QtWidgets/QDialog/ndialog.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QDialog/ndialog.hpp @@ -1,11 +1,11 @@ #pragma once - #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QDialog/qdialog_macro.h" #include "core/NodeWidget/nodewidget.h" -class NDialog : public QDialog, public NodeWidget { +class DLL_EXPORT NDialog : public QDialog, public NodeWidget { Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QDialog) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QDialog/qdialog_wrap.h b/src/cpp/include/nodegui/QtWidgets/QDialog/qdialog_wrap.h index 1b2f6f96b..f20b3c178 100644 --- a/src/cpp/include/nodegui/QtWidgets/QDialog/qdialog_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QDialog/qdialog_wrap.h @@ -4,10 +4,11 @@ #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QDialog/qdialog_macro.h" #include "ndialog.hpp" -class QDialogWrap : public Napi::ObjectWrap { +class DLL_EXPORT QDialogWrap : public Napi::ObjectWrap { QDIALOG_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QFileDialog/nfiledialog.hpp b/src/cpp/include/nodegui/QtWidgets/QFileDialog/nfiledialog.hpp index c3d26d6e8..e200381ff 100644 --- a/src/cpp/include/nodegui/QtWidgets/QFileDialog/nfiledialog.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QFileDialog/nfiledialog.hpp @@ -1,12 +1,12 @@ #pragma once - #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QDialog/qdialog_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" -class NFileDialog : public QFileDialog, public NodeWidget { +class DLL_EXPORT NFileDialog : public QFileDialog, public NodeWidget { public: Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QFileDialog) diff --git a/src/cpp/include/nodegui/QtWidgets/QFileDialog/qfiledialog_wrap.h b/src/cpp/include/nodegui/QtWidgets/QFileDialog/qfiledialog_wrap.h index 2434cebb1..44a53d53e 100644 --- a/src/cpp/include/nodegui/QtWidgets/QFileDialog/qfiledialog_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QFileDialog/qfiledialog_wrap.h @@ -8,7 +8,7 @@ #include "QtWidgets/QDialog/qdialog_macro.h" #include "QtWidgets/QFileDialog/nfiledialog.hpp" -class QFileDialogWrap : public Napi::ObjectWrap { +class DLL_EXPORT QFileDialogWrap : public Napi::ObjectWrap { QDIALOG_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QGridLayout/ngridlayout.hpp b/src/cpp/include/nodegui/QtWidgets/QGridLayout/ngridlayout.hpp index 1346fbae7..419eb4ea7 100644 --- a/src/cpp/include/nodegui/QtWidgets/QGridLayout/ngridlayout.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QGridLayout/ngridlayout.hpp @@ -1,10 +1,11 @@ #pragma once #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QLayout/qlayout_macro.h" #include "core/Events/eventwidget_macro.h" -class NGridLayout : public QGridLayout, public EventWidget { +class DLL_EXPORT NGridLayout : public QGridLayout, public EventWidget { Q_OBJECT public: EVENTWIDGET_IMPLEMENTATIONS(QGridLayout) diff --git a/src/cpp/include/nodegui/QtWidgets/QGridLayout/qgridlayout_wrap.h b/src/cpp/include/nodegui/QtWidgets/QGridLayout/qgridlayout_wrap.h index 567d82111..73581730d 100644 --- a/src/cpp/include/nodegui/QtWidgets/QGridLayout/qgridlayout_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QGridLayout/qgridlayout_wrap.h @@ -5,10 +5,11 @@ #include #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QGridLayout/ngridlayout.hpp" #include "QtWidgets/QLayout/qlayout_macro.h" -class QGridLayoutWrap : public Napi::ObjectWrap { +class DLL_EXPORT QGridLayoutWrap : public Napi::ObjectWrap { QLAYOUT_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QGroupBox/ngroupbox.hpp b/src/cpp/include/nodegui/QtWidgets/QGroupBox/ngroupbox.hpp index 087d20194..7fa83b313 100644 --- a/src/cpp/include/nodegui/QtWidgets/QGroupBox/ngroupbox.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QGroupBox/ngroupbox.hpp @@ -1,12 +1,12 @@ #pragma once - #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" -class NGroupBox : public QGroupBox, public NodeWidget { +class DLL_EXPORT NGroupBox : public QGroupBox, public NodeWidget { Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QGroupBox) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QGroupBox/qgroupbox_wrap.h b/src/cpp/include/nodegui/QtWidgets/QGroupBox/qgroupbox_wrap.h index 4f9fcc399..206e64ab0 100644 --- a/src/cpp/include/nodegui/QtWidgets/QGroupBox/qgroupbox_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QGroupBox/qgroupbox_wrap.h @@ -4,10 +4,11 @@ #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "ngroupbox.hpp" -class QGroupBoxWrap : public Napi::ObjectWrap { +class DLL_EXPORT QGroupBoxWrap : public Napi::ObjectWrap { QWIDGET_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QLabel/nlabel.hpp b/src/cpp/include/nodegui/QtWidgets/QLabel/nlabel.hpp index b42c20482..bf4381ae6 100644 --- a/src/cpp/include/nodegui/QtWidgets/QLabel/nlabel.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QLabel/nlabel.hpp @@ -1,11 +1,11 @@ #pragma once - #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" -class NLabel : public QLabel, public NodeWidget { +class DLL_EXPORT NLabel : public QLabel, public NodeWidget { Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QLabel) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QLabel/qlabel_wrap.h b/src/cpp/include/nodegui/QtWidgets/QLabel/qlabel_wrap.h index 85ff5648a..4a71be7b3 100644 --- a/src/cpp/include/nodegui/QtWidgets/QLabel/qlabel_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QLabel/qlabel_wrap.h @@ -4,10 +4,11 @@ #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nlabel.hpp" -class QLabelWrap : public Napi::ObjectWrap { +class DLL_EXPORT QLabelWrap : public Napi::ObjectWrap { QWIDGET_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QLayout/nlayout.hpp b/src/cpp/include/nodegui/QtWidgets/QLayout/nlayout.hpp index 598915abe..e49e3afda 100644 --- a/src/cpp/include/nodegui/QtWidgets/QLayout/nlayout.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QLayout/nlayout.hpp @@ -1,10 +1,11 @@ #pragma once #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QLayout/qlayout_macro.h" #include "core/Events/eventwidget_macro.h" -class NLayout : public QLayout, public EventWidget { +class DLL_EXPORT NLayout : public QLayout, public EventWidget { Q_OBJECT public: EVENTWIDGET_IMPLEMENTATIONS(QLayout) diff --git a/src/cpp/include/nodegui/QtWidgets/QLayout/qlayout_wrap.h b/src/cpp/include/nodegui/QtWidgets/QLayout/qlayout_wrap.h index 7f97a2d4d..6da2522c2 100644 --- a/src/cpp/include/nodegui/QtWidgets/QLayout/qlayout_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QLayout/qlayout_wrap.h @@ -5,11 +5,12 @@ #include #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QLayout/nlayout.hpp" #include "QtWidgets/QLayout/qlayout_macro.h" // ABSTRACT CLASS -class QLayoutWrap : public Napi::ObjectWrap { +class DLL_EXPORT QLayoutWrap : public Napi::ObjectWrap { QLAYOUT_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QLineEdit/nlineedit.hpp b/src/cpp/include/nodegui/QtWidgets/QLineEdit/nlineedit.hpp index 97831ad6c..baf2d3023 100644 --- a/src/cpp/include/nodegui/QtWidgets/QLineEdit/nlineedit.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QLineEdit/nlineedit.hpp @@ -1,11 +1,11 @@ #pragma once - #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" -class NLineEdit : public QLineEdit, public NodeWidget { +class DLL_EXPORT NLineEdit : public QLineEdit, public NodeWidget { Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QLineEdit) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QLineEdit/qlineedit_wrap.h b/src/cpp/include/nodegui/QtWidgets/QLineEdit/qlineedit_wrap.h index 67be6833e..20c1a8f37 100644 --- a/src/cpp/include/nodegui/QtWidgets/QLineEdit/qlineedit_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QLineEdit/qlineedit_wrap.h @@ -4,10 +4,11 @@ #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nlineedit.hpp" -class QLineEditWrap : public Napi::ObjectWrap { +class DLL_EXPORT QLineEditWrap : public Napi::ObjectWrap { QWIDGET_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QListWidget/nlistwidget.hpp b/src/cpp/include/nodegui/QtWidgets/QListWidget/nlistwidget.hpp index d550f66a1..af50463d1 100644 --- a/src/cpp/include/nodegui/QtWidgets/QListWidget/nlistwidget.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QListWidget/nlistwidget.hpp @@ -1,14 +1,14 @@ #pragma once - #include #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QListView/qlistview_macro.h" #include "QtWidgets/QListWidgetItem/qlistwidgetitem_wrap.h" #include "core/NodeWidget/nodewidget.h" -class NListWidget : public QListWidget, public NodeWidget { +class DLL_EXPORT NListWidget : public QListWidget, public NodeWidget { Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QListWidget) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QListWidget/qlistwidget_wrap.h b/src/cpp/include/nodegui/QtWidgets/QListWidget/qlistwidget_wrap.h index c0028646d..64b51e5aa 100644 --- a/src/cpp/include/nodegui/QtWidgets/QListWidget/qlistwidget_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QListWidget/qlistwidget_wrap.h @@ -9,7 +9,7 @@ #include "QtWidgets/QListView/qlistview_macro.h" #include "QtWidgets/QListWidget/nlistwidget.hpp" -class QListWidgetWrap : public Napi::ObjectWrap { +class DLL_EXPORT QListWidgetWrap : public Napi::ObjectWrap { private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QListWidgetItem/qlistwidgetitem_wrap.h b/src/cpp/include/nodegui/QtWidgets/QListWidgetItem/qlistwidgetitem_wrap.h index ffc44046d..e3d3cd315 100644 --- a/src/cpp/include/nodegui/QtWidgets/QListWidgetItem/qlistwidgetitem_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QListWidgetItem/qlistwidgetitem_wrap.h @@ -1,14 +1,13 @@ #pragma once #include -#include #include -#include "Extras/Utils/nutils.h" #include "core/Component/component_wrap.h" -class QListWidgetItemWrap : public Napi::ObjectWrap { +class DLL_EXPORT QListWidgetItemWrap + : public Napi::ObjectWrap { private: QListWidgetItem* instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QMainWindow/nmainwindow.hpp b/src/cpp/include/nodegui/QtWidgets/QMainWindow/nmainwindow.hpp index b330722e8..02380b4a7 100644 --- a/src/cpp/include/nodegui/QtWidgets/QMainWindow/nmainwindow.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QMainWindow/nmainwindow.hpp @@ -1,12 +1,12 @@ #pragma once - #include #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" -class NMainWindow : public QMainWindow, public NodeWidget { +class DLL_EXPORT NMainWindow : public QMainWindow, public NodeWidget { Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QMainWindow) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QMainWindow/qmainwindow_wrap.h b/src/cpp/include/nodegui/QtWidgets/QMainWindow/qmainwindow_wrap.h index f48f3eaf1..9e8b49401 100644 --- a/src/cpp/include/nodegui/QtWidgets/QMainWindow/qmainwindow_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QMainWindow/qmainwindow_wrap.h @@ -4,10 +4,11 @@ #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nmainwindow.hpp" -class QMainWindowWrap : public Napi::ObjectWrap { +class DLL_EXPORT QMainWindowWrap : public Napi::ObjectWrap { QWIDGET_WRAPPED_METHODS_DECLARATION private: diff --git a/src/cpp/include/nodegui/QtWidgets/QMenu/nmenu.hpp b/src/cpp/include/nodegui/QtWidgets/QMenu/nmenu.hpp index 3abf78657..b81f5a1e5 100644 --- a/src/cpp/include/nodegui/QtWidgets/QMenu/nmenu.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QMenu/nmenu.hpp @@ -1,12 +1,12 @@ #pragma once - #include #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QWidget/qwidget_macro.h" -class NMenu : public QMenu, public NodeWidget { +class DLL_EXPORT NMenu : public QMenu, public NodeWidget { Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QMenu) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QMenu/qmenu_wrap.h b/src/cpp/include/nodegui/QtWidgets/QMenu/qmenu_wrap.h index f70a58329..6d4a59fb3 100644 --- a/src/cpp/include/nodegui/QtWidgets/QMenu/qmenu_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QMenu/qmenu_wrap.h @@ -4,9 +4,10 @@ #include +#include "Extras/Utils/nutils.h" #include "nmenu.hpp" -class QMenuWrap : public Napi::ObjectWrap { +class DLL_EXPORT QMenuWrap : public Napi::ObjectWrap { QWIDGET_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QMenuBar/nmenubar.hpp b/src/cpp/include/nodegui/QtWidgets/QMenuBar/nmenubar.hpp index b50b8a703..6a8d21138 100644 --- a/src/cpp/include/nodegui/QtWidgets/QMenuBar/nmenubar.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QMenuBar/nmenubar.hpp @@ -1,12 +1,12 @@ #pragma once - #include #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QWidget/qwidget_macro.h" -class NMenuBar : public QMenuBar, public NodeWidget { +class DLL_EXPORT NMenuBar : public QMenuBar, public NodeWidget { Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QMenuBar) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QMenuBar/qmenubar_wrap.h b/src/cpp/include/nodegui/QtWidgets/QMenuBar/qmenubar_wrap.h index 3f0bacba6..d175868f4 100644 --- a/src/cpp/include/nodegui/QtWidgets/QMenuBar/qmenubar_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QMenuBar/qmenubar_wrap.h @@ -4,9 +4,10 @@ #include +#include "Extras/Utils/nutils.h" #include "nmenubar.hpp" -class QMenuBarWrap : public Napi::ObjectWrap { +class DLL_EXPORT QMenuBarWrap : public Napi::ObjectWrap { QWIDGET_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QMessageBox/nmessagebox.hpp b/src/cpp/include/nodegui/QtWidgets/QMessageBox/nmessagebox.hpp index 487c11b20..9d809eba4 100644 --- a/src/cpp/include/nodegui/QtWidgets/QMessageBox/nmessagebox.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QMessageBox/nmessagebox.hpp @@ -1,14 +1,14 @@ #pragma once - #include #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QDialog/qdialog_macro.h" #include "QtWidgets/QPushButton/qpushbutton_wrap.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" -class NMessageBox : public QMessageBox, public NodeWidget { +class DLL_EXPORT NMessageBox : public QMessageBox, public NodeWidget { public: Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QMessageBox) diff --git a/src/cpp/include/nodegui/QtWidgets/QMessageBox/qmessagebox_wrap.h b/src/cpp/include/nodegui/QtWidgets/QMessageBox/qmessagebox_wrap.h index 2670ade44..7a1ac737d 100644 --- a/src/cpp/include/nodegui/QtWidgets/QMessageBox/qmessagebox_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QMessageBox/qmessagebox_wrap.h @@ -8,7 +8,7 @@ #include "QtWidgets/QMessageBox/nmessagebox.hpp" #include "QtWidgets/QWidget/qwidget_macro.h" -class QMessageBoxWrap : public Napi::ObjectWrap { +class DLL_EXPORT QMessageBoxWrap : public Napi::ObjectWrap { QDIALOG_WRAPPED_METHODS_DECLARATION private: QPointer instance; @@ -27,6 +27,6 @@ class QMessageBoxWrap : public Napi::ObjectWrap { Napi::Value done(const Napi::CallbackInfo& info); }; namespace StaticQMessageBoxWrapMethods { -Napi::Value about(const Napi::CallbackInfo& info); -Napi::Value aboutQt(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value about(const Napi::CallbackInfo& info); +DLL_EXPORT Napi::Value aboutQt(const Napi::CallbackInfo& info); }; // namespace StaticQMessageBoxWrapMethods diff --git a/src/cpp/include/nodegui/QtWidgets/QPainter/qpainter_wrap.h b/src/cpp/include/nodegui/QtWidgets/QPainter/qpainter_wrap.h index 0aea85a40..b06440c6f 100644 --- a/src/cpp/include/nodegui/QtWidgets/QPainter/qpainter_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QPainter/qpainter_wrap.h @@ -7,7 +7,7 @@ #include "Extras/Utils/nutils.h" #include "core/Component/component_wrap.h" -class QPainterWrap : public Napi::ObjectWrap { +class DLL_EXPORT QPainterWrap : public Napi::ObjectWrap { COMPONENT_WRAPPED_METHODS_DECLARATION private: QPainter* instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QPlainTextEdit/nplaintextedit.hpp b/src/cpp/include/nodegui/QtWidgets/QPlainTextEdit/nplaintextedit.hpp index 086ff363c..7d93019c0 100644 --- a/src/cpp/include/nodegui/QtWidgets/QPlainTextEdit/nplaintextedit.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QPlainTextEdit/nplaintextedit.hpp @@ -1,10 +1,10 @@ #pragma once - #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h" #include "core/NodeWidget/nodewidget.h" -class NPlainTextEdit : public QPlainTextEdit, public NodeWidget { +class DLL_EXPORT NPlainTextEdit : public QPlainTextEdit, public NodeWidget { Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QPlainTextEdit) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QPlainTextEdit/qplaintextedit_wrap.h b/src/cpp/include/nodegui/QtWidgets/QPlainTextEdit/qplaintextedit_wrap.h index c1f684625..fb710ae80 100644 --- a/src/cpp/include/nodegui/QtWidgets/QPlainTextEdit/qplaintextedit_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QPlainTextEdit/qplaintextedit_wrap.h @@ -4,11 +4,13 @@ #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nplaintextedit.hpp" -class QPlainTextEditWrap : public Napi::ObjectWrap { +class DLL_EXPORT QPlainTextEditWrap + : public Napi::ObjectWrap { QABSTRACTSCROLLAREA_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QProgressBar/nprogressbar.hpp b/src/cpp/include/nodegui/QtWidgets/QProgressBar/nprogressbar.hpp index d6a1f0589..0c7f368a0 100644 --- a/src/cpp/include/nodegui/QtWidgets/QProgressBar/nprogressbar.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QProgressBar/nprogressbar.hpp @@ -1,11 +1,11 @@ #pragma once - #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" -class NProgressBar : public QProgressBar, public NodeWidget { +class DLL_EXPORT NProgressBar : public QProgressBar, public NodeWidget { Q_OBJECT public: NODEWIDGET_IMPLEMENTATIONS(QProgressBar) diff --git a/src/cpp/include/nodegui/QtWidgets/QProgressBar/qprogressbar_wrap.h b/src/cpp/include/nodegui/QtWidgets/QProgressBar/qprogressbar_wrap.h index af3e30177..780f5dd86 100644 --- a/src/cpp/include/nodegui/QtWidgets/QProgressBar/qprogressbar_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QProgressBar/qprogressbar_wrap.h @@ -4,10 +4,11 @@ #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nprogressbar.hpp" -class QProgressBarWrap : public Napi::ObjectWrap { +class DLL_EXPORT QProgressBarWrap : public Napi::ObjectWrap { QWIDGET_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QPushButton/npushbutton.hpp b/src/cpp/include/nodegui/QtWidgets/QPushButton/npushbutton.hpp index 9ea88a978..f7b899d60 100644 --- a/src/cpp/include/nodegui/QtWidgets/QPushButton/npushbutton.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QPushButton/npushbutton.hpp @@ -1,13 +1,13 @@ #pragma once - #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QAbstractButton/qabstractbutton_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" -class NPushButton : public QPushButton, public NodeWidget { +class DLL_EXPORT NPushButton : public QPushButton, public NodeWidget { Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QPushButton) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QPushButton/qpushbutton_wrap.h b/src/cpp/include/nodegui/QtWidgets/QPushButton/qpushbutton_wrap.h index d92215f6f..a858a6540 100644 --- a/src/cpp/include/nodegui/QtWidgets/QPushButton/qpushbutton_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QPushButton/qpushbutton_wrap.h @@ -8,7 +8,7 @@ #include "QtWidgets/QAbstractButton/qabstractbutton_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "npushbutton.hpp" -class QPushButtonWrap : public Napi::ObjectWrap { +class DLL_EXPORT QPushButtonWrap : public Napi::ObjectWrap { QABSTRACTBUTTON_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QRadioButton/nradiobutton.hpp b/src/cpp/include/nodegui/QtWidgets/QRadioButton/nradiobutton.hpp index aeac1d9b3..2ed223e2f 100644 --- a/src/cpp/include/nodegui/QtWidgets/QRadioButton/nradiobutton.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QRadioButton/nradiobutton.hpp @@ -1,12 +1,12 @@ #pragma once - #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QAbstractButton/qabstractbutton_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" -class NRadioButton : public QRadioButton, public NodeWidget { +class DLL_EXPORT NRadioButton : public QRadioButton, public NodeWidget { Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QRadioButton) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QRadioButton/qradiobutton_wrap.h b/src/cpp/include/nodegui/QtWidgets/QRadioButton/qradiobutton_wrap.h index 9dafa674f..0d0572003 100644 --- a/src/cpp/include/nodegui/QtWidgets/QRadioButton/qradiobutton_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QRadioButton/qradiobutton_wrap.h @@ -4,11 +4,12 @@ #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QAbstractButton/qabstractbutton_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nradiobutton.hpp" -class QRadioButtonWrap : public Napi::ObjectWrap { +class DLL_EXPORT QRadioButtonWrap : public Napi::ObjectWrap { QABSTRACTBUTTON_WRAPPED_METHODS_DECLARATION private: diff --git a/src/cpp/include/nodegui/QtWidgets/QScrollArea/nscrollarea.hpp b/src/cpp/include/nodegui/QtWidgets/QScrollArea/nscrollarea.hpp index f2f8f7aab..07b353694 100644 --- a/src/cpp/include/nodegui/QtWidgets/QScrollArea/nscrollarea.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QScrollArea/nscrollarea.hpp @@ -1,11 +1,11 @@ #pragma once - #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h" #include "core/NodeWidget/nodewidget.h" -class NScrollArea : public QScrollArea, public NodeWidget { +class DLL_EXPORT NScrollArea : public QScrollArea, public NodeWidget { Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QScrollArea) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QScrollArea/qscrollarea_wrap.h b/src/cpp/include/nodegui/QtWidgets/QScrollArea/qscrollarea_wrap.h index 762ae1a4c..3607f39eb 100644 --- a/src/cpp/include/nodegui/QtWidgets/QScrollArea/qscrollarea_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QScrollArea/qscrollarea_wrap.h @@ -4,10 +4,11 @@ #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h" #include "nscrollarea.hpp" -class QScrollAreaWrap : public Napi::ObjectWrap { +class DLL_EXPORT QScrollAreaWrap : public Napi::ObjectWrap { QABSTRACTSCROLLAREA_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QShortcut/nshortcut.hpp b/src/cpp/include/nodegui/QtWidgets/QShortcut/nshortcut.hpp index be1e152a4..933db17f6 100644 --- a/src/cpp/include/nodegui/QtWidgets/QShortcut/nshortcut.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QShortcut/nshortcut.hpp @@ -1,12 +1,12 @@ #pragma once - #include +#include "Extras/Utils/nutils.h" #include "QtCore/QObject/qobject_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" -class NShortcut : public QShortcut, public EventWidget { +class DLL_EXPORT NShortcut : public QShortcut, public EventWidget { Q_OBJECT EVENTWIDGET_IMPLEMENTATIONS(QShortcut) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QShortcut/qshortcut_wrap.h b/src/cpp/include/nodegui/QtWidgets/QShortcut/qshortcut_wrap.h index 4b75a211c..ae4c14fe5 100644 --- a/src/cpp/include/nodegui/QtWidgets/QShortcut/qshortcut_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QShortcut/qshortcut_wrap.h @@ -4,10 +4,11 @@ #include +#include "Extras/Utils/nutils.h" #include "QtCore/QObject/qobject_macro.h" #include "nshortcut.hpp" -class QShortcutWrap : public Napi::ObjectWrap { +class DLL_EXPORT QShortcutWrap : public Napi::ObjectWrap { QOBJECT_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QSlider/nslider.hpp b/src/cpp/include/nodegui/QtWidgets/QSlider/nslider.hpp index f70da83b2..2f844f3e4 100644 --- a/src/cpp/include/nodegui/QtWidgets/QSlider/nslider.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QSlider/nslider.hpp @@ -1,11 +1,11 @@ #pragma once - #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QAbstractSlider/qabstractslider_macro.h" #include "core/NodeWidget/nodewidget.h" -class NSlider : public QSlider, public NodeWidget { +class DLL_EXPORT NSlider : public QSlider, public NodeWidget { Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QSlider) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QSlider/qslider_wrap.h b/src/cpp/include/nodegui/QtWidgets/QSlider/qslider_wrap.h index a850e0721..ff1c463a7 100644 --- a/src/cpp/include/nodegui/QtWidgets/QSlider/qslider_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QSlider/qslider_wrap.h @@ -4,11 +4,12 @@ #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QAbstractSlider/qabstractslider_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nslider.hpp" -class QSliderWrap : public Napi::ObjectWrap { +class DLL_EXPORT QSliderWrap : public Napi::ObjectWrap { QABSTRACTSLIDER_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QSpinBox/nspinbox.hpp b/src/cpp/include/nodegui/QtWidgets/QSpinBox/nspinbox.hpp index a96299cf3..9cc1556bd 100644 --- a/src/cpp/include/nodegui/QtWidgets/QSpinBox/nspinbox.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QSpinBox/nspinbox.hpp @@ -1,12 +1,12 @@ #pragma once - #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" -class NSpinBox : public QSpinBox, public NodeWidget { +class DLL_EXPORT NSpinBox : public QSpinBox, public NodeWidget { Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QSpinBox) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QSpinBox/qspinbox_wrap.h b/src/cpp/include/nodegui/QtWidgets/QSpinBox/qspinbox_wrap.h index d50c21fef..1ba4bede6 100644 --- a/src/cpp/include/nodegui/QtWidgets/QSpinBox/qspinbox_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QSpinBox/qspinbox_wrap.h @@ -8,7 +8,7 @@ #include "QtWidgets/QWidget/qwidget_macro.h" #include "nspinbox.hpp" -class QSpinBoxWrap : public Napi::ObjectWrap { +class DLL_EXPORT QSpinBoxWrap : public Napi::ObjectWrap { QWIDGET_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QStackedWidget/nstackedwidget.hpp b/src/cpp/include/nodegui/QtWidgets/QStackedWidget/nstackedwidget.hpp index 79ee6c2df..165c15e0f 100644 --- a/src/cpp/include/nodegui/QtWidgets/QStackedWidget/nstackedwidget.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QStackedWidget/nstackedwidget.hpp @@ -1,12 +1,12 @@ #pragma once - #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" -class NStackedWidget : public QStackedWidget, public NodeWidget { +class DLL_EXPORT NStackedWidget : public QStackedWidget, public NodeWidget { Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QStackedWidget) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QStackedWidget/qstackedwidget_wrap.h b/src/cpp/include/nodegui/QtWidgets/QStackedWidget/qstackedwidget_wrap.h index 30e12eebd..42b681c36 100644 --- a/src/cpp/include/nodegui/QtWidgets/QStackedWidget/qstackedwidget_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QStackedWidget/qstackedwidget_wrap.h @@ -8,7 +8,8 @@ #include "QtWidgets/QStackedWidget/nstackedwidget.hpp" #include "QtWidgets/QWidget/qwidget_macro.h" -class QStackedWidgetWrap : public Napi::ObjectWrap { +class DLL_EXPORT QStackedWidgetWrap + : public Napi::ObjectWrap { QWIDGET_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QStatusBar/nstatusbar.hpp b/src/cpp/include/nodegui/QtWidgets/QStatusBar/nstatusbar.hpp index d8aa2935c..bb5220276 100644 --- a/src/cpp/include/nodegui/QtWidgets/QStatusBar/nstatusbar.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QStatusBar/nstatusbar.hpp @@ -1,12 +1,12 @@ #pragma once - #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" -class NStatusBar : public QStatusBar, public NodeWidget { +class DLL_EXPORT NStatusBar : public QStatusBar, public NodeWidget { Q_OBJECT public: diff --git a/src/cpp/include/nodegui/QtWidgets/QStatusBar/qstatusbar_wrap.h b/src/cpp/include/nodegui/QtWidgets/QStatusBar/qstatusbar_wrap.h index c6861eccd..4d471663d 100644 --- a/src/cpp/include/nodegui/QtWidgets/QStatusBar/qstatusbar_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QStatusBar/qstatusbar_wrap.h @@ -4,10 +4,11 @@ #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nstatusbar.hpp" -class QStatusBarWrap : public Napi::ObjectWrap { +class DLL_EXPORT QStatusBarWrap : public Napi::ObjectWrap { QWIDGET_WRAPPED_METHODS_DECLARATION private: diff --git a/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/nsystemtrayicon.hpp b/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/nsystemtrayicon.hpp index 43808d856..7664017ce 100644 --- a/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/nsystemtrayicon.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/nsystemtrayicon.hpp @@ -1,12 +1,12 @@ #pragma once - #include +#include "Extras/Utils/nutils.h" #include "QtCore/QObject/qobject_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" -class NSystemTrayIcon : public QSystemTrayIcon, public EventWidget { +class DLL_EXPORT NSystemTrayIcon : public QSystemTrayIcon, public EventWidget { Q_OBJECT EVENTWIDGET_IMPLEMENTATIONS(QSystemTrayIcon) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/qsystemtrayicon_wrap.h b/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/qsystemtrayicon_wrap.h index 67af3ca85..c13284c4c 100644 --- a/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/qsystemtrayicon_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/qsystemtrayicon_wrap.h @@ -4,9 +4,12 @@ #include +#include "Extras/Utils/nutils.h" #include "QtCore/QObject/qobject_macro.h" #include "nsystemtrayicon.hpp" -class QSystemTrayIconWrap : public Napi::ObjectWrap { + +class DLL_EXPORT QSystemTrayIconWrap + : public Napi::ObjectWrap { QOBJECT_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QTabWidget/ntabwidget.hpp b/src/cpp/include/nodegui/QtWidgets/QTabWidget/ntabwidget.hpp index 1e7904a27..26fc9597a 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTabWidget/ntabwidget.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QTabWidget/ntabwidget.hpp @@ -1,12 +1,12 @@ #pragma once - #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" -class NTabWidget : public QTabWidget, public NodeWidget { +class DLL_EXPORT NTabWidget : public QTabWidget, public NodeWidget { Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QTabWidget) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QTabWidget/qtabwidget_wrap.h b/src/cpp/include/nodegui/QtWidgets/QTabWidget/qtabwidget_wrap.h index ca42e8060..fb9772dc6 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTabWidget/qtabwidget_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QTabWidget/qtabwidget_wrap.h @@ -8,7 +8,7 @@ #include "QtWidgets/QTabWidget/ntabwidget.hpp" #include "QtWidgets/QWidget/qwidget_macro.h" -class QTabWidgetWrap : public Napi::ObjectWrap { +class DLL_EXPORT QTabWidgetWrap : public Napi::ObjectWrap { QWIDGET_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QTableWidget/ntablewidget.hpp b/src/cpp/include/nodegui/QtWidgets/QTableWidget/ntablewidget.hpp index 97081a72a..e90af88fb 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTableWidget/ntablewidget.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QTableWidget/ntablewidget.hpp @@ -1,12 +1,12 @@ #pragma once - #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" -class NTableWidget : public QTableWidget, public NodeWidget { +class DLL_EXPORT NTableWidget : public QTableWidget, public NodeWidget { public: Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QTableWidget) diff --git a/src/cpp/include/nodegui/QtWidgets/QTableWidget/qtablewidget_wrap.h b/src/cpp/include/nodegui/QtWidgets/QTableWidget/qtablewidget_wrap.h index fd50636da..aa5460940 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTableWidget/qtablewidget_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QTableWidget/qtablewidget_wrap.h @@ -8,7 +8,7 @@ #include "QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h" #include "QtWidgets/QTableWidget/ntablewidget.hpp" -class QTableWidgetWrap : public Napi::ObjectWrap { +class DLL_EXPORT QTableWidgetWrap : public Napi::ObjectWrap { QABSTRACTSCROLLAREA_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QTableWidgetItem/qtablewidgetitem_wrap.h b/src/cpp/include/nodegui/QtWidgets/QTableWidgetItem/qtablewidgetitem_wrap.h index 79873d12f..b870edffd 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTableWidgetItem/qtablewidgetitem_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QTableWidgetItem/qtablewidgetitem_wrap.h @@ -7,7 +7,8 @@ #include "Extras/Utils/nutils.h" #include "core/Component/component_wrap.h" -class QTableWidgetItemWrap : public Napi::ObjectWrap { +class DLL_EXPORT QTableWidgetItemWrap + : public Napi::ObjectWrap { COMPONENT_WRAPPED_METHODS_DECLARATION private: QTableWidgetItem* instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QTimeEdit/ntimeedit.hpp b/src/cpp/include/nodegui/QtWidgets/QTimeEdit/ntimeedit.hpp index bb40ff08b..5b2349ad1 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTimeEdit/ntimeedit.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QTimeEdit/ntimeedit.hpp @@ -1,12 +1,12 @@ #pragma once - #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QDateTimeEdit/qdatetimeedit_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" -class NTimeEdit : public QTimeEdit, public NodeWidget { +class DLL_EXPORT NTimeEdit : public QTimeEdit, public NodeWidget { Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QTimeEdit) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QTimeEdit/qtimeedit_wrap.h b/src/cpp/include/nodegui/QtWidgets/QTimeEdit/qtimeedit_wrap.h index dfa373165..3a0f8de43 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTimeEdit/qtimeedit_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QTimeEdit/qtimeedit_wrap.h @@ -9,7 +9,7 @@ #include "QtWidgets/QDateTimeEdit/qdatetimeedit_macro.h" #include "ntimeedit.hpp" -class QTimeEditWrap : public Napi::ObjectWrap { +class DLL_EXPORT QTimeEditWrap : public Napi::ObjectWrap { QDATETIMEEDIT_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QToolButton/ntoolbutton.hpp b/src/cpp/include/nodegui/QtWidgets/QToolButton/ntoolbutton.hpp index f1c033c16..54d338de4 100644 --- a/src/cpp/include/nodegui/QtWidgets/QToolButton/ntoolbutton.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QToolButton/ntoolbutton.hpp @@ -1,14 +1,14 @@ #pragma once - #include #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QAbstractButton/qabstractbutton_macro.h" #include "QtWidgets/QAction/qaction_wrap.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" -class NToolButton : public QToolButton, public NodeWidget { +class DLL_EXPORT NToolButton : public QToolButton, public NodeWidget { Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QToolButton) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QToolButton/qtoolbutton_wrap.h b/src/cpp/include/nodegui/QtWidgets/QToolButton/qtoolbutton_wrap.h index 64a4c8908..9ce41ba94 100644 --- a/src/cpp/include/nodegui/QtWidgets/QToolButton/qtoolbutton_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QToolButton/qtoolbutton_wrap.h @@ -9,7 +9,7 @@ #include "QtWidgets/QWidget/qwidget_macro.h" #include "ntoolbutton.hpp" -class QToolButtonWrap : public Napi::ObjectWrap { +class DLL_EXPORT QToolButtonWrap : public Napi::ObjectWrap { QABSTRACTBUTTON_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QTreeWidget/ntreewidget.hpp b/src/cpp/include/nodegui/QtWidgets/QTreeWidget/ntreewidget.hpp index d096d6ca1..23774928a 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTreeWidget/ntreewidget.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QTreeWidget/ntreewidget.hpp @@ -1,13 +1,13 @@ #pragma once - #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h" #include "QtWidgets/QTreeWidgetItem/qtreewidgetitem_wrap.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" -class NTreeWidget : public QTreeWidget, public NodeWidget { +class DLL_EXPORT NTreeWidget : public QTreeWidget, public NodeWidget { Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QTreeWidget) diff --git a/src/cpp/include/nodegui/QtWidgets/QTreeWidget/qtreewidget_wrap.h b/src/cpp/include/nodegui/QtWidgets/QTreeWidget/qtreewidget_wrap.h index bc6cf6081..8febe97ec 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTreeWidget/qtreewidget_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QTreeWidget/qtreewidget_wrap.h @@ -4,10 +4,11 @@ #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "ntreewidget.hpp" -class QTreeWidgetWrap : public Napi::ObjectWrap { +class DLL_EXPORT QTreeWidgetWrap : public Napi::ObjectWrap { QWIDGET_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QTreeWidgetItem/qtreewidgetitem_wrap.h b/src/cpp/include/nodegui/QtWidgets/QTreeWidgetItem/qtreewidgetitem_wrap.h index 83653f567..911696372 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTreeWidgetItem/qtreewidgetitem_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QTreeWidgetItem/qtreewidgetitem_wrap.h @@ -7,7 +7,8 @@ #include "Extras/Utils/nutils.h" #include "core/Component/component_wrap.h" -class QTreeWidgetItemWrap : public Napi::ObjectWrap { +class DLL_EXPORT QTreeWidgetItemWrap + : public Napi::ObjectWrap { COMPONENT_WRAPPED_METHODS_DECLARATION private: QTreeWidgetItem *instance; diff --git a/src/cpp/include/nodegui/QtWidgets/QWidget/nwidget.hpp b/src/cpp/include/nodegui/QtWidgets/QWidget/nwidget.hpp index 2eca30f89..a177e06cd 100644 --- a/src/cpp/include/nodegui/QtWidgets/QWidget/nwidget.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QWidget/nwidget.hpp @@ -4,10 +4,11 @@ #include #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" -class NWidget : public QWidget, public NodeWidget { +class DLL_EXPORT NWidget : public QWidget, public NodeWidget { Q_OBJECT NODEWIDGET_IMPLEMENTATIONS(QWidget) public: diff --git a/src/cpp/include/nodegui/QtWidgets/QWidget/qwidget_wrap.h b/src/cpp/include/nodegui/QtWidgets/QWidget/qwidget_wrap.h index ec4aa90ae..b8d0a5b78 100644 --- a/src/cpp/include/nodegui/QtWidgets/QWidget/qwidget_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QWidget/qwidget_wrap.h @@ -4,10 +4,11 @@ #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nwidget.hpp" -class QWidgetWrap : public Napi::ObjectWrap { +class DLL_EXPORT QWidgetWrap : public Napi::ObjectWrap { QWIDGET_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/core/Component/component_wrap.h b/src/cpp/include/nodegui/core/Component/component_wrap.h index ef6e4b3ae..906f5b16b 100644 --- a/src/cpp/include/nodegui/core/Component/component_wrap.h +++ b/src/cpp/include/nodegui/core/Component/component_wrap.h @@ -9,8 +9,12 @@ #include +#include "Extras/Utils/nutils.h" #include "component_macro.h" -class ComponentWrap : public Napi::ObjectWrap { +class DLL_EXPORT ComponentWrap : public Napi::ObjectWrap { + public: + ComponentWrap(const Napi::CallbackInfo& info) + : Napi::ObjectWrap(info) {} COMPONENT_WRAPPED_METHODS_DECLARATION }; diff --git a/src/cpp/include/nodegui/core/Events/eventsmap.h b/src/cpp/include/nodegui/core/Events/eventsmap.h index bbc3bd123..7783e92bd 100644 --- a/src/cpp/include/nodegui/core/Events/eventsmap.h +++ b/src/cpp/include/nodegui/core/Events/eventsmap.h @@ -2,7 +2,9 @@ #include #include -class EventsMap { +#include "Extras/Utils/nutils.h" + +class DLL_EXPORT EventsMap { public: static std::unordered_map eventTypes; // static std::unordered_map keyEvents; diff --git a/src/cpp/include/nodegui/core/Events/eventwidget.h b/src/cpp/include/nodegui/core/Events/eventwidget.h index 5d1496b94..ca65d0ca1 100644 --- a/src/cpp/include/nodegui/core/Events/eventwidget.h +++ b/src/cpp/include/nodegui/core/Events/eventwidget.h @@ -1,12 +1,11 @@ #pragma once #include - #include - +#include "Extras/Utils/nutils.h" #include "core/Events/eventsmap.h" -class EventWidget { +class DLL_EXPORT EventWidget { public: Napi::FunctionReference emitOnNode; std::unordered_map subscribedEvents; diff --git a/src/cpp/include/nodegui/core/Events/eventwidget_macro.h b/src/cpp/include/nodegui/core/Events/eventwidget_macro.h index 2c426bc3f..f28a9acf9 100644 --- a/src/cpp/include/nodegui/core/Events/eventwidget_macro.h +++ b/src/cpp/include/nodegui/core/Events/eventwidget_macro.h @@ -1,5 +1,4 @@ #pragma once - #include #include "core/Component/component_macro.h" diff --git a/src/cpp/include/nodegui/core/FlexLayout/flexitem.h b/src/cpp/include/nodegui/core/FlexLayout/flexitem.h index 1e9f3f632..0a30697b9 100644 --- a/src/cpp/include/nodegui/core/FlexLayout/flexitem.h +++ b/src/cpp/include/nodegui/core/FlexLayout/flexitem.h @@ -1,5 +1,6 @@ #pragma once +#include "Extras/Utils/nutils.h" #include "deps/yoga/YGNode.h" /* @@ -8,7 +9,7 @@ of this one since it inherits from FlexItem. */ -class FlexItem { +class DLL_EXPORT FlexItem { YGNodeRef node; public: diff --git a/src/cpp/include/nodegui/core/FlexLayout/flexlayout.hpp b/src/cpp/include/nodegui/core/FlexLayout/flexlayout.hpp index 7bb179794..1419a68c7 100644 --- a/src/cpp/include/nodegui/core/FlexLayout/flexlayout.hpp +++ b/src/cpp/include/nodegui/core/FlexLayout/flexlayout.hpp @@ -1,8 +1,8 @@ #pragma once - #include #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QLayout/qlayout_macro.h" #include "core/Events/eventwidget_macro.h" #include "deps/yoga/YGNode.h" @@ -20,7 +20,7 @@ YGNodeNew(); FlexLayout * flayout = new FlexLayout(container,root); flayout->addWidget(btn2, child2); */ -class FlexLayout : public QLayout, public EventWidget { +class DLL_EXPORT FlexLayout : public QLayout, public EventWidget { Q_OBJECT private: YGNodeRef node; @@ -56,5 +56,3 @@ class FlexLayout : public QLayout, public EventWidget { EVENTWIDGET_IMPLEMENTATIONS(QLayout) void connectSignalsToEventEmitter(); }; - -// class FlexLayoutWorker: public Q \ No newline at end of file diff --git a/src/cpp/include/nodegui/core/FlexLayout/flexlayout_wrap.h b/src/cpp/include/nodegui/core/FlexLayout/flexlayout_wrap.h index d6fdefefc..0b105ec48 100644 --- a/src/cpp/include/nodegui/core/FlexLayout/flexlayout_wrap.h +++ b/src/cpp/include/nodegui/core/FlexLayout/flexlayout_wrap.h @@ -4,10 +4,11 @@ #include +#include "Extras/Utils/nutils.h" #include "QtWidgets/QLayout/qlayout_macro.h" #include "flexlayout.hpp" -class FlexLayoutWrap : public Napi::ObjectWrap { +class DLL_EXPORT FlexLayoutWrap : public Napi::ObjectWrap { QLAYOUT_WRAPPED_METHODS_DECLARATION private: QPointer instance; diff --git a/src/cpp/include/nodegui/core/FlexLayout/flexutils.h b/src/cpp/include/nodegui/core/FlexLayout/flexutils.h index 927a5d8fb..2a0a014b6 100644 --- a/src/cpp/include/nodegui/core/FlexLayout/flexutils.h +++ b/src/cpp/include/nodegui/core/FlexLayout/flexutils.h @@ -3,9 +3,10 @@ #include #include +#include "Extras/Utils/nutils.h" #include "deps/yoga/YGNode.h" -class FlexNodeContext { +class DLL_EXPORT FlexNodeContext { void* _widget; QLayoutItem* _layoutItem; @@ -17,13 +18,14 @@ class FlexNodeContext { void setLayoutItem(QLayoutItem* item); }; namespace flexutils { -YGSize measureQtWidget(YGNodeRef node, float width, YGMeasureMode widthMode, - float height, YGMeasureMode heightMode); -QRect getFlexNodeGeometry(YGNodeRef node); -void setFlexNodeGeometry(YGNodeRef node, const QRect& geometry); -FlexNodeContext* getFlexNodeContext(YGNodeRef node); -bool isFlexNodeSizeControlled(YGNodeRef node); -void configureFlexNode(QWidget* widget, YGNodeRef node, - bool isLeafNode = false); +DLL_EXPORT YGSize measureQtWidget(YGNodeRef node, float width, + YGMeasureMode widthMode, float height, + YGMeasureMode heightMode); +DLL_EXPORT QRect getFlexNodeGeometry(YGNodeRef node); +DLL_EXPORT void setFlexNodeGeometry(YGNodeRef node, const QRect& geometry); +DLL_EXPORT FlexNodeContext* getFlexNodeContext(YGNodeRef node); +DLL_EXPORT bool isFlexNodeSizeControlled(YGNodeRef node); +DLL_EXPORT void configureFlexNode(QWidget* widget, YGNodeRef node, + bool isLeafNode = false); } // namespace flexutils \ No newline at end of file diff --git a/src/cpp/include/nodegui/core/NodeWidget/nodewidget.h b/src/cpp/include/nodegui/core/NodeWidget/nodewidget.h index bf02bfdc8..7def0fae3 100644 --- a/src/cpp/include/nodegui/core/NodeWidget/nodewidget.h +++ b/src/cpp/include/nodegui/core/NodeWidget/nodewidget.h @@ -1,9 +1,10 @@ #pragma once +#include "Extras/Utils/nutils.h" #include "core/Events/eventwidget_macro.h" #include "core/YogaWidget/yogawidget.h" // class to unify all the custom features + add extra features if needed -class NodeWidget : public YogaWidget, public EventWidget {}; +class DLL_EXPORT NodeWidget : public YogaWidget, public EventWidget {}; #ifndef NODEWIDGET_IMPLEMENTATIONS #define NODEWIDGET_IMPLEMENTATIONS(BaseWidgetName) \ diff --git a/src/cpp/include/nodegui/core/YogaWidget/nodestyle.h b/src/cpp/include/nodegui/core/YogaWidget/nodestyle.h index c6af82e9a..8ed8235bf 100644 --- a/src/cpp/include/nodegui/core/YogaWidget/nodestyle.h +++ b/src/cpp/include/nodegui/core/YogaWidget/nodestyle.h @@ -3,6 +3,7 @@ #include #include +#include "Extras/Utils/nutils.h" #include "deps/yoga/YGStyle.h" /* @@ -22,7 +23,7 @@ struct NodeValueUnit { } }; -class NodeStyle { +class DLL_EXPORT NodeStyle { public: static std::unordered_map NodeAlign; diff --git a/src/cpp/include/nodegui/core/YogaWidget/yogawidget.h b/src/cpp/include/nodegui/core/YogaWidget/yogawidget.h index f3c708d10..2a0a050ee 100644 --- a/src/cpp/include/nodegui/core/YogaWidget/yogawidget.h +++ b/src/cpp/include/nodegui/core/YogaWidget/yogawidget.h @@ -1,6 +1,7 @@ #pragma once #include +#include "Extras/Utils/nutils.h" #include "core/FlexLayout/flexitem.h" #include "nodestyle.h" @@ -84,7 +85,7 @@ necessary q_properties. #endif -class YogaWidget : public FlexItem { +class DLL_EXPORT YogaWidget : public FlexItem { public: QString _yDisplay; QString _yAlignItems; diff --git a/src/cpp/lib/QtGui/QKeySequence/qkeysequence_wrap.cpp b/src/cpp/lib/QtGui/QKeySequence/qkeysequence_wrap.cpp index ff8c57ab6..80723a179 100644 --- a/src/cpp/lib/QtGui/QKeySequence/qkeysequence_wrap.cpp +++ b/src/cpp/lib/QtGui/QKeySequence/qkeysequence_wrap.cpp @@ -1,6 +1,6 @@ #include "QtGui/QKeySequence/qkeysequence_wrap.h" -#include "Extras/Utils/nutils.h" +#include "QtCore/QVariant/qvariant_wrap.h" #include "QtGui/QPixmap/qpixmap_wrap.h" Napi::FunctionReference QKeySequenceWrap::constructor; diff --git a/src/cpp/lib/QtWidgets/QListWidgetItem/qlistwidgetitem_wrap.cpp b/src/cpp/lib/QtWidgets/QListWidgetItem/qlistwidgetitem_wrap.cpp index 6038e883f..13e0102ec 100644 --- a/src/cpp/lib/QtWidgets/QListWidgetItem/qlistwidgetitem_wrap.cpp +++ b/src/cpp/lib/QtWidgets/QListWidgetItem/qlistwidgetitem_wrap.cpp @@ -2,6 +2,7 @@ #include "Extras/Utils/nutils.h" #include "QtCore/QSize/qsize_wrap.h" +#include "QtCore/QVariant/qvariant_wrap.h" #include "QtGui/QIcon/qicon_wrap.h" #include "core/Component/component_wrap.h" diff --git a/src/cpp/lib/QtWidgets/QStatusBar/qstatusbar_wrap.cpp b/src/cpp/lib/QtWidgets/QStatusBar/qstatusbar_wrap.cpp index 9dee90421..6f319c053 100644 --- a/src/cpp/lib/QtWidgets/QStatusBar/qstatusbar_wrap.cpp +++ b/src/cpp/lib/QtWidgets/QStatusBar/qstatusbar_wrap.cpp @@ -40,7 +40,7 @@ Napi::Value QStatusBarWrap::fromQStatusBar(Napi::Env env, return env.Null(); } - auto statusBarWrap = QStatusBarWrap::constructor.New( + return QStatusBarWrap::constructor.New( {Napi::External::New(env, statusBar), Napi::Boolean::New(env, true)}); }