From 28b328dea18d8f2a04562de28cfa3d150e30adb6 Mon Sep 17 00:00:00 2001 From: Atul R Date: Fri, 14 Feb 2020 21:25:19 +0100 Subject: [PATCH] cleans up export snippet --- package.json | 4 ++-- src/cpp/include/nodegui/Extras/Export/export.h | 10 ++++++++++ src/cpp/include/nodegui/Extras/Utils/nutils.h | 11 +---------- src/cpp/include/nodegui/QtCore/QDate/qdate_wrap.h | 2 +- .../include/nodegui/QtCore/QDateTime/qdatetime_wrap.h | 2 +- .../nodegui/QtCore/QModelIndex/qmodelindex_wrap.h | 2 +- src/cpp/include/nodegui/QtCore/QObject/nobject.hpp | 2 +- src/cpp/include/nodegui/QtCore/QObject/qobject_wrap.h | 2 +- src/cpp/include/nodegui/QtCore/QPoint/qpoint_wrap.h | 2 +- src/cpp/include/nodegui/QtCore/QRect/qrect_wrap.h | 2 +- src/cpp/include/nodegui/QtCore/QSize/qsize_wrap.h | 2 +- src/cpp/include/nodegui/QtCore/QTime/qtime_wrap.h | 2 +- src/cpp/include/nodegui/QtCore/QUrl/qurl_wrap.h | 2 +- .../include/nodegui/QtCore/QVariant/qvariant_wrap.h | 2 +- .../nodegui/QtGui/QApplication/qapplication_wrap.h | 2 +- .../nodegui/QtGui/QClipboard/qclipboard_wrap.h | 2 +- src/cpp/include/nodegui/QtGui/QColor/qcolor_wrap.h | 2 +- src/cpp/include/nodegui/QtGui/QCursor/qcursor_wrap.h | 2 +- .../nodegui/QtGui/QEvent/QKeyEvent/qkeyevent_wrap.h | 2 +- .../QtGui/QEvent/QMouseEvent/qmouseevent_wrap.h | 2 +- src/cpp/include/nodegui/QtGui/QFont/qfont_wrap.h | 2 +- .../nodegui/QtGui/QFontDatabase/qfontdatabase_wrap.h | 2 +- src/cpp/include/nodegui/QtGui/QIcon/qicon_wrap.h | 2 +- .../nodegui/QtGui/QKeySequence/qkeysequence_wrap.h | 2 +- src/cpp/include/nodegui/QtGui/QMovie/nmovie.hpp | 2 +- src/cpp/include/nodegui/QtGui/QMovie/qmovie_wrap.h | 2 +- src/cpp/include/nodegui/QtGui/QPixmap/qpixmap_wrap.h | 2 +- src/cpp/include/nodegui/QtGui/QStyle/qstyle_wrap.h | 2 +- src/cpp/include/nodegui/QtWidgets/QAction/naction.hpp | 2 +- .../include/nodegui/QtWidgets/QAction/qaction_wrap.h | 2 +- .../nodegui/QtWidgets/QBoxLayout/nboxlayout.hpp | 2 +- .../nodegui/QtWidgets/QBoxLayout/qboxlayout_wrap.h | 2 +- .../nodegui/QtWidgets/QButtonGroup/nbuttongroup.hpp | 2 +- .../QtWidgets/QButtonGroup/qbuttongroup_wrap.h | 2 +- .../QtWidgets/QCalendarWidget/ncalendarwidget.hpp | 2 +- .../QtWidgets/QCalendarWidget/qcalendarwidget_wrap.h | 2 +- .../include/nodegui/QtWidgets/QCheckBox/ncheckbox.hpp | 2 +- .../nodegui/QtWidgets/QCheckBox/qcheckbox_wrap.h | 2 +- .../include/nodegui/QtWidgets/QComboBox/ncombobox.hpp | 2 +- .../nodegui/QtWidgets/QComboBox/qcombobox_wrap.h | 2 +- .../include/nodegui/QtWidgets/QDateEdit/ndateedit.hpp | 2 +- .../nodegui/QtWidgets/QDateEdit/qdateedit_wrap.h | 2 +- .../nodegui/QtWidgets/QDateTimeEdit/ndatetimeedit.hpp | 2 +- .../QtWidgets/QDateTimeEdit/qdatetimeedit_wrap.h | 2 +- src/cpp/include/nodegui/QtWidgets/QDial/ndial.hpp | 2 +- src/cpp/include/nodegui/QtWidgets/QDial/qdial_wrap.h | 2 +- src/cpp/include/nodegui/QtWidgets/QDialog/ndialog.hpp | 2 +- .../include/nodegui/QtWidgets/QDialog/qdialog_wrap.h | 2 +- .../nodegui/QtWidgets/QFileDialog/nfiledialog.hpp | 2 +- .../nodegui/QtWidgets/QFileDialog/qfiledialog_wrap.h | 2 +- .../nodegui/QtWidgets/QGridLayout/ngridlayout.hpp | 2 +- .../nodegui/QtWidgets/QGridLayout/qgridlayout_wrap.h | 2 +- .../include/nodegui/QtWidgets/QGroupBox/ngroupbox.hpp | 2 +- .../nodegui/QtWidgets/QGroupBox/qgroupbox_wrap.h | 2 +- .../nodegui/QtWidgets/QInputDialog/ninputdialog.hpp | 2 +- .../QtWidgets/QInputDialog/qinputdialog_wrap.h | 2 +- src/cpp/include/nodegui/QtWidgets/QLabel/nlabel.hpp | 3 ++- .../include/nodegui/QtWidgets/QLabel/qlabel_wrap.h | 3 ++- src/cpp/include/nodegui/QtWidgets/QLayout/nlayout.hpp | 2 +- .../include/nodegui/QtWidgets/QLayout/qlayout_wrap.h | 2 +- .../include/nodegui/QtWidgets/QLineEdit/nlineedit.hpp | 2 +- .../nodegui/QtWidgets/QLineEdit/qlineedit_wrap.h | 2 +- .../nodegui/QtWidgets/QListWidget/nlistwidget.hpp | 2 +- .../nodegui/QtWidgets/QListWidget/qlistwidget_wrap.h | 2 +- .../nodegui/QtWidgets/QMainWindow/nmainwindow.hpp | 2 +- .../nodegui/QtWidgets/QMainWindow/qmainwindow_wrap.h | 2 +- src/cpp/include/nodegui/QtWidgets/QMenu/nmenu.hpp | 2 +- src/cpp/include/nodegui/QtWidgets/QMenu/qmenu_wrap.h | 2 +- .../include/nodegui/QtWidgets/QMenuBar/nmenubar.hpp | 2 +- .../nodegui/QtWidgets/QMenuBar/qmenubar_wrap.h | 2 +- .../nodegui/QtWidgets/QMessageBox/nmessagebox.hpp | 2 +- .../nodegui/QtWidgets/QMessageBox/qmessagebox_wrap.h | 2 +- .../nodegui/QtWidgets/QPainter/qpainter_wrap.h | 2 +- .../QtWidgets/QPlainTextEdit/nplaintextedit.hpp | 2 +- .../QtWidgets/QPlainTextEdit/qplaintextedit_wrap.h | 2 +- .../nodegui/QtWidgets/QProgressBar/nprogressbar.hpp | 2 +- .../QtWidgets/QProgressBar/qprogressbar_wrap.h | 2 +- .../nodegui/QtWidgets/QPushButton/npushbutton.hpp | 2 +- .../nodegui/QtWidgets/QPushButton/qpushbutton_wrap.h | 2 +- .../nodegui/QtWidgets/QRadioButton/nradiobutton.hpp | 2 +- .../QtWidgets/QRadioButton/qradiobutton_wrap.h | 2 +- .../nodegui/QtWidgets/QScrollArea/nscrollarea.hpp | 2 +- .../nodegui/QtWidgets/QScrollArea/qscrollarea_wrap.h | 2 +- .../nodegui/QtWidgets/QScrollBar/nscrollbar.hpp | 2 +- .../nodegui/QtWidgets/QScrollBar/qscrollbar_wrap.h | 2 +- .../include/nodegui/QtWidgets/QShortcut/nshortcut.hpp | 2 +- .../nodegui/QtWidgets/QShortcut/qshortcut_wrap.h | 2 +- src/cpp/include/nodegui/QtWidgets/QSlider/nslider.hpp | 2 +- .../include/nodegui/QtWidgets/QSlider/qslider_wrap.h | 2 +- .../include/nodegui/QtWidgets/QSpinBox/nspinbox.hpp | 2 +- .../nodegui/QtWidgets/QSpinBox/qspinbox_wrap.h | 2 +- .../QtWidgets/QStackedWidget/nstackedwidget.hpp | 3 ++- .../QtWidgets/QStackedWidget/qstackedwidget_wrap.h | 2 +- .../nodegui/QtWidgets/QStatusBar/nstatusbar.hpp | 2 +- .../nodegui/QtWidgets/QStatusBar/qstatusbar_wrap.h | 2 +- .../QtWidgets/QSystemTrayIcon/nsystemtrayicon.hpp | 2 +- .../QtWidgets/QSystemTrayIcon/qsystemtrayicon_wrap.h | 2 +- .../nodegui/QtWidgets/QTabWidget/ntabwidget.hpp | 2 +- .../nodegui/QtWidgets/QTabWidget/qtabwidget_wrap.h | 2 +- .../nodegui/QtWidgets/QTableWidget/ntablewidget.hpp | 2 +- .../QtWidgets/QTableWidget/qtablewidget_wrap.h | 2 +- .../QTableWidgetItem/qtablewidgetitem_wrap.h | 2 +- .../include/nodegui/QtWidgets/QTimeEdit/ntimeedit.hpp | 2 +- .../nodegui/QtWidgets/QTimeEdit/qtimeedit_wrap.h | 2 +- .../nodegui/QtWidgets/QToolButton/ntoolbutton.hpp | 2 +- .../nodegui/QtWidgets/QToolButton/qtoolbutton_wrap.h | 2 +- .../nodegui/QtWidgets/QTreeWidget/ntreewidget.hpp | 2 +- .../nodegui/QtWidgets/QTreeWidget/qtreewidget_wrap.h | 2 +- .../QtWidgets/QTreeWidgetItem/qtreewidgetitem_wrap.h | 2 +- src/cpp/include/nodegui/QtWidgets/QWidget/nwidget.hpp | 2 +- .../include/nodegui/QtWidgets/QWidget/qwidget_wrap.h | 2 +- .../include/nodegui/core/Component/component_wrap.h | 2 +- src/cpp/include/nodegui/core/Events/eventsmap.h | 2 +- src/cpp/include/nodegui/core/Events/eventwidget.h | 2 +- src/cpp/include/nodegui/core/FlexLayout/flexitem.h | 2 +- .../include/nodegui/core/FlexLayout/flexlayout.hpp | 2 +- .../include/nodegui/core/FlexLayout/flexlayout_wrap.h | 2 +- src/cpp/include/nodegui/core/FlexLayout/flexutils.h | 2 +- src/cpp/include/nodegui/core/NodeWidget/nodewidget.h | 2 +- src/cpp/include/nodegui/core/YogaWidget/nodestyle.h | 2 +- src/cpp/include/nodegui/core/YogaWidget/yogawidget.h | 2 +- src/cpp/lib/QtGui/QKeySequence/qkeysequence_wrap.cpp | 2 +- src/cpp/lib/core/FlexLayout/flexlayout.cpp | 1 - 123 files changed, 135 insertions(+), 132 deletions(-) create mode 100644 src/cpp/include/nodegui/Extras/Export/export.h diff --git a/package.json b/package.json index 6da9fe6e5..32cc92af7 100644 --- a/package.json +++ b/package.json @@ -11,9 +11,9 @@ "dev": "npm run build && qode dist/demo.js", "build": "tsc && npm run build:addon", "postinstall": "cross-env node ./scripts/skip.js || npm run prebuild:install || npm run build:addon", - "build:addon": "cross-env CMAKE_BUILD_PARALLEL_LEVEL=8 cmake-js compile", + "build:addon": "cross-env CMAKE_BUILD_PARALLEL_LEVEL=8 cmake-js build", "prebuild:install": "prebuild-install --backend=cmake-js --runtime=napi --verbose", - "test": "qode ./node_modules/jest/bin/jest -i", + "test": "qode ./node_modules/jest/bin/jest", "lint:cpp": "clang-format -i --glob=src/cpp/**/*.[h,c]*", "lint:ts": "tsc --noEmit && cross-env eslint './src/**/*.{ts,tsx,js,jsx}' --fix", "docs": "typedoc && node ./website/docs/scripts/fixdocs.js" diff --git a/src/cpp/include/nodegui/Extras/Export/export.h b/src/cpp/include/nodegui/Extras/Export/export.h new file mode 100644 index 000000000..86e5b498b --- /dev/null +++ b/src/cpp/include/nodegui/Extras/Export/export.h @@ -0,0 +1,10 @@ + +#ifdef _WINDLL +#ifdef ENABLE_DLL_EXPORT +#define DLL_EXPORT __declspec(dllexport) +#else +#define DLL_EXPORT __declspec(dllimport) +#endif +#else +#define DLL_EXPORT +#endif \ No newline at end of file diff --git a/src/cpp/include/nodegui/Extras/Utils/nutils.h b/src/cpp/include/nodegui/Extras/Utils/nutils.h index 89c1bbc10..ebf58af06 100644 --- a/src/cpp/include/nodegui/Extras/Utils/nutils.h +++ b/src/cpp/include/nodegui/Extras/Utils/nutils.h @@ -1,15 +1,5 @@ #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 @@ -17,6 +7,7 @@ #include "core/FlexLayout/flexutils.h" #include "deps/yoga/YGNode.h" +#include "Extras/Export/export.h" namespace extrautils { DLL_EXPORT QVariant* convertToQVariant(Napi::Env& env, Napi::Value& value); diff --git a/src/cpp/include/nodegui/QtCore/QDate/qdate_wrap.h b/src/cpp/include/nodegui/QtCore/QDate/qdate_wrap.h index 677c6921f..4bb91bf25 100644 --- a/src/cpp/include/nodegui/QtCore/QDate/qdate_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QDate/qdate_wrap.h @@ -5,7 +5,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QDateWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtCore/QDateTime/qdatetime_wrap.h b/src/cpp/include/nodegui/QtCore/QDateTime/qdatetime_wrap.h index 06372afa7..8dfdd7f8b 100644 --- a/src/cpp/include/nodegui/QtCore/QDateTime/qdatetime_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QDateTime/qdatetime_wrap.h @@ -5,7 +5,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QDateTimeWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtCore/QModelIndex/qmodelindex_wrap.h b/src/cpp/include/nodegui/QtCore/QModelIndex/qmodelindex_wrap.h index 98a8f7924..32ca3e95d 100644 --- a/src/cpp/include/nodegui/QtCore/QModelIndex/qmodelindex_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QModelIndex/qmodelindex_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QModelIndexWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtCore/QObject/nobject.hpp b/src/cpp/include/nodegui/QtCore/QObject/nobject.hpp index d10340d4d..8ae9c46f7 100644 --- a/src/cpp/include/nodegui/QtCore/QObject/nobject.hpp +++ b/src/cpp/include/nodegui/QtCore/QObject/nobject.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtCore/QObject/qobject_macro.h" #include "core/Events/eventwidget.h" #include "core/Events/eventwidget_macro.h" diff --git a/src/cpp/include/nodegui/QtCore/QObject/qobject_wrap.h b/src/cpp/include/nodegui/QtCore/QObject/qobject_wrap.h index 8f44486e3..a0129e050 100644 --- a/src/cpp/include/nodegui/QtCore/QObject/qobject_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QObject/qobject_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtCore/QObject/nobject.hpp" #include "QtCore/QObject/qobject_macro.h" diff --git a/src/cpp/include/nodegui/QtCore/QPoint/qpoint_wrap.h b/src/cpp/include/nodegui/QtCore/QPoint/qpoint_wrap.h index d6c3b0c0e..ae560c4f5 100644 --- a/src/cpp/include/nodegui/QtCore/QPoint/qpoint_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QPoint/qpoint_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QPointWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtCore/QRect/qrect_wrap.h b/src/cpp/include/nodegui/QtCore/QRect/qrect_wrap.h index 2ba304e4f..5e98fed50 100644 --- a/src/cpp/include/nodegui/QtCore/QRect/qrect_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QRect/qrect_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QRectWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtCore/QSize/qsize_wrap.h b/src/cpp/include/nodegui/QtCore/QSize/qsize_wrap.h index f76546618..5e263d8cd 100644 --- a/src/cpp/include/nodegui/QtCore/QSize/qsize_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QSize/qsize_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QSizeWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtCore/QTime/qtime_wrap.h b/src/cpp/include/nodegui/QtCore/QTime/qtime_wrap.h index b27135db1..71b3e5000 100644 --- a/src/cpp/include/nodegui/QtCore/QTime/qtime_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QTime/qtime_wrap.h @@ -5,7 +5,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QTimeWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtCore/QUrl/qurl_wrap.h b/src/cpp/include/nodegui/QtCore/QUrl/qurl_wrap.h index c89c12705..405e43b32 100644 --- a/src/cpp/include/nodegui/QtCore/QUrl/qurl_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QUrl/qurl_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QUrlWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtCore/QVariant/qvariant_wrap.h b/src/cpp/include/nodegui/QtCore/QVariant/qvariant_wrap.h index 0cd57774b..e6423469d 100644 --- a/src/cpp/include/nodegui/QtCore/QVariant/qvariant_wrap.h +++ b/src/cpp/include/nodegui/QtCore/QVariant/qvariant_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QVariantWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtGui/QApplication/qapplication_wrap.h b/src/cpp/include/nodegui/QtGui/QApplication/qapplication_wrap.h index 75357a270..5a97f6258 100644 --- a/src/cpp/include/nodegui/QtGui/QApplication/qapplication_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QApplication/qapplication_wrap.h @@ -5,7 +5,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QApplicationWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtGui/QClipboard/qclipboard_wrap.h b/src/cpp/include/nodegui/QtGui/QClipboard/qclipboard_wrap.h index 3d37e63a4..51b1b003e 100644 --- a/src/cpp/include/nodegui/QtGui/QClipboard/qclipboard_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QClipboard/qclipboard_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QClipboardWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtGui/QColor/qcolor_wrap.h b/src/cpp/include/nodegui/QtGui/QColor/qcolor_wrap.h index d28fbc1dd..d6593a3a4 100644 --- a/src/cpp/include/nodegui/QtGui/QColor/qcolor_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QColor/qcolor_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QColorWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtGui/QCursor/qcursor_wrap.h b/src/cpp/include/nodegui/QtGui/QCursor/qcursor_wrap.h index e698448ad..5708d2150 100644 --- a/src/cpp/include/nodegui/QtGui/QCursor/qcursor_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QCursor/qcursor_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QCursorWrap : public Napi::ObjectWrap { 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 596f56cf9..09f68975a 100644 --- a/src/cpp/include/nodegui/QtGui/QEvent/QKeyEvent/qkeyevent_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QEvent/QKeyEvent/qkeyevent_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QKeyEventWrap : public Napi::ObjectWrap { 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 e9cac08ce..e59701f99 100644 --- a/src/cpp/include/nodegui/QtGui/QEvent/QMouseEvent/qmouseevent_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QEvent/QMouseEvent/qmouseevent_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QMouseEventWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtGui/QFont/qfont_wrap.h b/src/cpp/include/nodegui/QtGui/QFont/qfont_wrap.h index 349267b39..f258ceaf4 100644 --- a/src/cpp/include/nodegui/QtGui/QFont/qfont_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QFont/qfont_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QFontWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtGui/QFontDatabase/qfontdatabase_wrap.h b/src/cpp/include/nodegui/QtGui/QFontDatabase/qfontdatabase_wrap.h index e296eb903..81e4e6d1b 100644 --- a/src/cpp/include/nodegui/QtGui/QFontDatabase/qfontdatabase_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QFontDatabase/qfontdatabase_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QFontDatabaseWrap diff --git a/src/cpp/include/nodegui/QtGui/QIcon/qicon_wrap.h b/src/cpp/include/nodegui/QtGui/QIcon/qicon_wrap.h index 0ec94d651..839a970d6 100644 --- a/src/cpp/include/nodegui/QtGui/QIcon/qicon_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QIcon/qicon_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QIconWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtGui/QKeySequence/qkeysequence_wrap.h b/src/cpp/include/nodegui/QtGui/QKeySequence/qkeysequence_wrap.h index e2195a23b..4fdf4f525 100644 --- a/src/cpp/include/nodegui/QtGui/QKeySequence/qkeysequence_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QKeySequence/qkeysequence_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QKeySequenceWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtGui/QMovie/nmovie.hpp b/src/cpp/include/nodegui/QtGui/QMovie/nmovie.hpp index 26a213ca0..b9159dbc6 100644 --- a/src/cpp/include/nodegui/QtGui/QMovie/nmovie.hpp +++ b/src/cpp/include/nodegui/QtGui/QMovie/nmovie.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtCore/QObject/qobject_macro.h" #include "QtCore/QRect/qrect_wrap.h" #include "QtCore/QSize/qsize_wrap.h" diff --git a/src/cpp/include/nodegui/QtGui/QMovie/qmovie_wrap.h b/src/cpp/include/nodegui/QtGui/QMovie/qmovie_wrap.h index 9a8f5558d..d287937ef 100644 --- a/src/cpp/include/nodegui/QtGui/QMovie/qmovie_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QMovie/qmovie_wrap.h @@ -6,7 +6,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtCore/QObject/qobject_macro.h" #include "nmovie.hpp" diff --git a/src/cpp/include/nodegui/QtGui/QPixmap/qpixmap_wrap.h b/src/cpp/include/nodegui/QtGui/QPixmap/qpixmap_wrap.h index 9d3e77ad2..446fc771a 100644 --- a/src/cpp/include/nodegui/QtGui/QPixmap/qpixmap_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QPixmap/qpixmap_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QPixmapWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtGui/QStyle/qstyle_wrap.h b/src/cpp/include/nodegui/QtGui/QStyle/qstyle_wrap.h index 07d65c774..c1f5d9948 100644 --- a/src/cpp/include/nodegui/QtGui/QStyle/qstyle_wrap.h +++ b/src/cpp/include/nodegui/QtGui/QStyle/qstyle_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_macro.h" class DLL_EXPORT QStyleWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtWidgets/QAction/naction.hpp b/src/cpp/include/nodegui/QtWidgets/QAction/naction.hpp index 39feea1aa..f28b0a80e 100644 --- a/src/cpp/include/nodegui/QtWidgets/QAction/naction.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QAction/naction.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtCore/QObject/qobject_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QAction/qaction_wrap.h b/src/cpp/include/nodegui/QtWidgets/QAction/qaction_wrap.h index 070fc2362..a8bb475e7 100644 --- a/src/cpp/include/nodegui/QtWidgets/QAction/qaction_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QAction/qaction_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtCore/QObject/qobject_macro.h" #include "naction.hpp" class DLL_EXPORT QActionWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtWidgets/QBoxLayout/nboxlayout.hpp b/src/cpp/include/nodegui/QtWidgets/QBoxLayout/nboxlayout.hpp index 80a06a501..0f5fb9eb1 100644 --- a/src/cpp/include/nodegui/QtWidgets/QBoxLayout/nboxlayout.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QBoxLayout/nboxlayout.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QLayout/qlayout_macro.h" #include "core/Events/eventwidget_macro.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QBoxLayout/qboxlayout_wrap.h b/src/cpp/include/nodegui/QtWidgets/QBoxLayout/qboxlayout_wrap.h index 8e5657e6e..b84a85bde 100644 --- a/src/cpp/include/nodegui/QtWidgets/QBoxLayout/qboxlayout_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QBoxLayout/qboxlayout_wrap.h @@ -5,7 +5,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QBoxLayout/nboxlayout.hpp" #include "QtWidgets/QLayout/qlayout_macro.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QButtonGroup/nbuttongroup.hpp b/src/cpp/include/nodegui/QtWidgets/QButtonGroup/nbuttongroup.hpp index 1d8c7b653..2ec5d5d20 100644 --- a/src/cpp/include/nodegui/QtWidgets/QButtonGroup/nbuttongroup.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QButtonGroup/nbuttongroup.hpp @@ -2,7 +2,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtCore/QObject/qobject_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QButtonGroup/qbuttongroup_wrap.h b/src/cpp/include/nodegui/QtWidgets/QButtonGroup/qbuttongroup_wrap.h index ed58872a4..1f79b7722 100644 --- a/src/cpp/include/nodegui/QtWidgets/QButtonGroup/qbuttongroup_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QButtonGroup/qbuttongroup_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtCore/QObject/qobject_macro.h" #include "nbuttongroup.hpp" class DLL_EXPORT QButtonGroupWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtWidgets/QCalendarWidget/ncalendarwidget.hpp b/src/cpp/include/nodegui/QtWidgets/QCalendarWidget/ncalendarwidget.hpp index d1dfa60b3..cc803e2c2 100644 --- a/src/cpp/include/nodegui/QtWidgets/QCalendarWidget/ncalendarwidget.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QCalendarWidget/ncalendarwidget.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtCore/QDate/qdate_wrap.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QCalendarWidget/qcalendarwidget_wrap.h b/src/cpp/include/nodegui/QtWidgets/QCalendarWidget/qcalendarwidget_wrap.h index ff82ef26e..30cdd66cd 100644 --- a/src/cpp/include/nodegui/QtWidgets/QCalendarWidget/qcalendarwidget_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QCalendarWidget/qcalendarwidget_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QCalendarWidget/ncalendarwidget.hpp" #include "QtWidgets/QWidget/qwidget_macro.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QCheckBox/ncheckbox.hpp b/src/cpp/include/nodegui/QtWidgets/QCheckBox/ncheckbox.hpp index f745c2ddf..9a3684b19 100644 --- a/src/cpp/include/nodegui/QtWidgets/QCheckBox/ncheckbox.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QCheckBox/ncheckbox.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractButton/qabstractbutton_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QCheckBox/qcheckbox_wrap.h b/src/cpp/include/nodegui/QtWidgets/QCheckBox/qcheckbox_wrap.h index 5e4a474df..67809fe2d 100644 --- a/src/cpp/include/nodegui/QtWidgets/QCheckBox/qcheckbox_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QCheckBox/qcheckbox_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractButton/qabstractbutton_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "ncheckbox.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QComboBox/ncombobox.hpp b/src/cpp/include/nodegui/QtWidgets/QComboBox/ncombobox.hpp index 5debbf809..7147c4cb9 100644 --- a/src/cpp/include/nodegui/QtWidgets/QComboBox/ncombobox.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QComboBox/ncombobox.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QComboBox/qcombobox_wrap.h b/src/cpp/include/nodegui/QtWidgets/QComboBox/qcombobox_wrap.h index 3bf3e658c..291fe7e62 100644 --- a/src/cpp/include/nodegui/QtWidgets/QComboBox/qcombobox_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QComboBox/qcombobox_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QComboBox/ncombobox.hpp" #include "QtWidgets/QWidget/qwidget_macro.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QDateEdit/ndateedit.hpp b/src/cpp/include/nodegui/QtWidgets/QDateEdit/ndateedit.hpp index aade7255c..16a7e0639 100644 --- a/src/cpp/include/nodegui/QtWidgets/QDateEdit/ndateedit.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QDateEdit/ndateedit.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QDateTimeEdit/qdatetimeedit_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QDateEdit/qdateedit_wrap.h b/src/cpp/include/nodegui/QtWidgets/QDateEdit/qdateedit_wrap.h index 9b0f9c196..37d09271e 100644 --- a/src/cpp/include/nodegui/QtWidgets/QDateEdit/qdateedit_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QDateEdit/qdateedit_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QDateTimeEdit/qdatetimeedit_macro.h" #include "ndateedit.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/ndatetimeedit.hpp b/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/ndatetimeedit.hpp index 27cd7728a..2557b11d9 100644 --- a/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/ndatetimeedit.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/ndatetimeedit.hpp @@ -3,7 +3,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QDateTimeEdit/qdatetimeedit_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/qdatetimeedit_wrap.h b/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/qdatetimeedit_wrap.h index 5430bc454..7f6ffcc83 100644 --- a/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/qdatetimeedit_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QDateTimeEdit/qdatetimeedit_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QDateTimeEdit/qdatetimeedit_macro.h" #include "ndatetimeedit.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QDial/ndial.hpp b/src/cpp/include/nodegui/QtWidgets/QDial/ndial.hpp index b747c0173..117136f22 100644 --- a/src/cpp/include/nodegui/QtWidgets/QDial/ndial.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QDial/ndial.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractSlider/qabstractslider_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QDial/qdial_wrap.h b/src/cpp/include/nodegui/QtWidgets/QDial/qdial_wrap.h index 1e00f8ada..f6fa9c4e6 100644 --- a/src/cpp/include/nodegui/QtWidgets/QDial/qdial_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QDial/qdial_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractSlider/qabstractslider_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "ndial.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QDialog/ndialog.hpp b/src/cpp/include/nodegui/QtWidgets/QDialog/ndialog.hpp index 7b824905a..ffc115103 100644 --- a/src/cpp/include/nodegui/QtWidgets/QDialog/ndialog.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QDialog/ndialog.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QDialog/qdialog_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QDialog/qdialog_wrap.h b/src/cpp/include/nodegui/QtWidgets/QDialog/qdialog_wrap.h index f20b3c178..374ed1d96 100644 --- a/src/cpp/include/nodegui/QtWidgets/QDialog/qdialog_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QDialog/qdialog_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QDialog/qdialog_macro.h" #include "ndialog.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QFileDialog/nfiledialog.hpp b/src/cpp/include/nodegui/QtWidgets/QFileDialog/nfiledialog.hpp index e200381ff..032db8046 100644 --- a/src/cpp/include/nodegui/QtWidgets/QFileDialog/nfiledialog.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QFileDialog/nfiledialog.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QDialog/qdialog_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QFileDialog/qfiledialog_wrap.h b/src/cpp/include/nodegui/QtWidgets/QFileDialog/qfiledialog_wrap.h index 44a53d53e..85ad21697 100644 --- a/src/cpp/include/nodegui/QtWidgets/QFileDialog/qfiledialog_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QFileDialog/qfiledialog_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QDialog/qdialog_macro.h" #include "QtWidgets/QFileDialog/nfiledialog.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QGridLayout/ngridlayout.hpp b/src/cpp/include/nodegui/QtWidgets/QGridLayout/ngridlayout.hpp index 419eb4ea7..0be6f53aa 100644 --- a/src/cpp/include/nodegui/QtWidgets/QGridLayout/ngridlayout.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QGridLayout/ngridlayout.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QLayout/qlayout_macro.h" #include "core/Events/eventwidget_macro.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QGridLayout/qgridlayout_wrap.h b/src/cpp/include/nodegui/QtWidgets/QGridLayout/qgridlayout_wrap.h index 73581730d..f6f355904 100644 --- a/src/cpp/include/nodegui/QtWidgets/QGridLayout/qgridlayout_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QGridLayout/qgridlayout_wrap.h @@ -5,7 +5,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QGridLayout/ngridlayout.hpp" #include "QtWidgets/QLayout/qlayout_macro.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QGroupBox/ngroupbox.hpp b/src/cpp/include/nodegui/QtWidgets/QGroupBox/ngroupbox.hpp index 7fa83b313..b2e3780b9 100644 --- a/src/cpp/include/nodegui/QtWidgets/QGroupBox/ngroupbox.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QGroupBox/ngroupbox.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QGroupBox/qgroupbox_wrap.h b/src/cpp/include/nodegui/QtWidgets/QGroupBox/qgroupbox_wrap.h index fa2696377..e0aaffff2 100644 --- a/src/cpp/include/nodegui/QtWidgets/QGroupBox/qgroupbox_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QGroupBox/qgroupbox_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "ngroupbox.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QInputDialog/ninputdialog.hpp b/src/cpp/include/nodegui/QtWidgets/QInputDialog/ninputdialog.hpp index f492f303b..986027d8c 100644 --- a/src/cpp/include/nodegui/QtWidgets/QInputDialog/ninputdialog.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QInputDialog/ninputdialog.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QDialog/qdialog_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QInputDialog/qinputdialog_wrap.h b/src/cpp/include/nodegui/QtWidgets/QInputDialog/qinputdialog_wrap.h index 998697d77..71079fea5 100644 --- a/src/cpp/include/nodegui/QtWidgets/QInputDialog/qinputdialog_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QInputDialog/qinputdialog_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QInputDialog/ninputdialog.hpp" #include "QtWidgets/QWidget/qwidget_macro.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QLabel/nlabel.hpp b/src/cpp/include/nodegui/QtWidgets/QLabel/nlabel.hpp index 9fa0029b2..2705122c3 100644 --- a/src/cpp/include/nodegui/QtWidgets/QLabel/nlabel.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QLabel/nlabel.hpp @@ -2,8 +2,9 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QFrame/qframe_macro.h" +#include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" class DLL_EXPORT NLabel : public QLabel, public NodeWidget { diff --git a/src/cpp/include/nodegui/QtWidgets/QLabel/qlabel_wrap.h b/src/cpp/include/nodegui/QtWidgets/QLabel/qlabel_wrap.h index ce8a3f1c9..5d4e1d89a 100644 --- a/src/cpp/include/nodegui/QtWidgets/QLabel/qlabel_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QLabel/qlabel_wrap.h @@ -4,8 +4,9 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QFrame/qframe_macro.h" +#include "QtWidgets/QWidget/qwidget_macro.h" #include "nlabel.hpp" class DLL_EXPORT QLabelWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtWidgets/QLayout/nlayout.hpp b/src/cpp/include/nodegui/QtWidgets/QLayout/nlayout.hpp index e49e3afda..cf51888b4 100644 --- a/src/cpp/include/nodegui/QtWidgets/QLayout/nlayout.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QLayout/nlayout.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QLayout/qlayout_macro.h" #include "core/Events/eventwidget_macro.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QLayout/qlayout_wrap.h b/src/cpp/include/nodegui/QtWidgets/QLayout/qlayout_wrap.h index 6da2522c2..3d3e06de0 100644 --- a/src/cpp/include/nodegui/QtWidgets/QLayout/qlayout_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QLayout/qlayout_wrap.h @@ -5,7 +5,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QLayout/nlayout.hpp" #include "QtWidgets/QLayout/qlayout_macro.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QLineEdit/nlineedit.hpp b/src/cpp/include/nodegui/QtWidgets/QLineEdit/nlineedit.hpp index baf2d3023..786567919 100644 --- a/src/cpp/include/nodegui/QtWidgets/QLineEdit/nlineedit.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QLineEdit/nlineedit.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QLineEdit/qlineedit_wrap.h b/src/cpp/include/nodegui/QtWidgets/QLineEdit/qlineedit_wrap.h index 20c1a8f37..ad7e8ff37 100644 --- a/src/cpp/include/nodegui/QtWidgets/QLineEdit/qlineedit_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QLineEdit/qlineedit_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nlineedit.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QListWidget/nlistwidget.hpp b/src/cpp/include/nodegui/QtWidgets/QListWidget/nlistwidget.hpp index af50463d1..546eee712 100644 --- a/src/cpp/include/nodegui/QtWidgets/QListWidget/nlistwidget.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QListWidget/nlistwidget.hpp @@ -3,7 +3,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QListView/qlistview_macro.h" #include "QtWidgets/QListWidgetItem/qlistwidgetitem_wrap.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QListWidget/qlistwidget_wrap.h b/src/cpp/include/nodegui/QtWidgets/QListWidget/qlistwidget_wrap.h index 64b51e5aa..ff1f6c8ff 100644 --- a/src/cpp/include/nodegui/QtWidgets/QListWidget/qlistwidget_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QListWidget/qlistwidget_wrap.h @@ -5,7 +5,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QListView/qlistview_macro.h" #include "QtWidgets/QListWidget/nlistwidget.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QMainWindow/nmainwindow.hpp b/src/cpp/include/nodegui/QtWidgets/QMainWindow/nmainwindow.hpp index 02380b4a7..bde89767d 100644 --- a/src/cpp/include/nodegui/QtWidgets/QMainWindow/nmainwindow.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QMainWindow/nmainwindow.hpp @@ -2,7 +2,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QMainWindow/qmainwindow_wrap.h b/src/cpp/include/nodegui/QtWidgets/QMainWindow/qmainwindow_wrap.h index 9e8b49401..056c707f9 100644 --- a/src/cpp/include/nodegui/QtWidgets/QMainWindow/qmainwindow_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QMainWindow/qmainwindow_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nmainwindow.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QMenu/nmenu.hpp b/src/cpp/include/nodegui/QtWidgets/QMenu/nmenu.hpp index b81f5a1e5..1f815fd69 100644 --- a/src/cpp/include/nodegui/QtWidgets/QMenu/nmenu.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QMenu/nmenu.hpp @@ -3,7 +3,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" class DLL_EXPORT NMenu : public QMenu, public NodeWidget { diff --git a/src/cpp/include/nodegui/QtWidgets/QMenu/qmenu_wrap.h b/src/cpp/include/nodegui/QtWidgets/QMenu/qmenu_wrap.h index 03d686260..fd1d4186f 100644 --- a/src/cpp/include/nodegui/QtWidgets/QMenu/qmenu_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QMenu/qmenu_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "nmenu.hpp" class DLL_EXPORT QMenuWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtWidgets/QMenuBar/nmenubar.hpp b/src/cpp/include/nodegui/QtWidgets/QMenuBar/nmenubar.hpp index 6a8d21138..1fde962ad 100644 --- a/src/cpp/include/nodegui/QtWidgets/QMenuBar/nmenubar.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QMenuBar/nmenubar.hpp @@ -3,7 +3,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" class DLL_EXPORT NMenuBar : public QMenuBar, public NodeWidget { diff --git a/src/cpp/include/nodegui/QtWidgets/QMenuBar/qmenubar_wrap.h b/src/cpp/include/nodegui/QtWidgets/QMenuBar/qmenubar_wrap.h index a980d8a08..dd04274ab 100644 --- a/src/cpp/include/nodegui/QtWidgets/QMenuBar/qmenubar_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QMenuBar/qmenubar_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "nmenubar.hpp" class DLL_EXPORT QMenuBarWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtWidgets/QMessageBox/nmessagebox.hpp b/src/cpp/include/nodegui/QtWidgets/QMessageBox/nmessagebox.hpp index 9d809eba4..079fe054d 100644 --- a/src/cpp/include/nodegui/QtWidgets/QMessageBox/nmessagebox.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QMessageBox/nmessagebox.hpp @@ -2,7 +2,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QDialog/qdialog_macro.h" #include "QtWidgets/QPushButton/qpushbutton_wrap.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QMessageBox/qmessagebox_wrap.h b/src/cpp/include/nodegui/QtWidgets/QMessageBox/qmessagebox_wrap.h index 7a1ac737d..c21c7e883 100644 --- a/src/cpp/include/nodegui/QtWidgets/QMessageBox/qmessagebox_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QMessageBox/qmessagebox_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QMessageBox/nmessagebox.hpp" #include "QtWidgets/QWidget/qwidget_macro.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QPainter/qpainter_wrap.h b/src/cpp/include/nodegui/QtWidgets/QPainter/qpainter_wrap.h index b06440c6f..83f8c5679 100644 --- a/src/cpp/include/nodegui/QtWidgets/QPainter/qpainter_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QPainter/qpainter_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_wrap.h" class DLL_EXPORT QPainterWrap : public Napi::ObjectWrap { diff --git a/src/cpp/include/nodegui/QtWidgets/QPlainTextEdit/nplaintextedit.hpp b/src/cpp/include/nodegui/QtWidgets/QPlainTextEdit/nplaintextedit.hpp index 7d93019c0..4353a7486 100644 --- a/src/cpp/include/nodegui/QtWidgets/QPlainTextEdit/nplaintextedit.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QPlainTextEdit/nplaintextedit.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h" #include "core/NodeWidget/nodewidget.h" class DLL_EXPORT NPlainTextEdit : public QPlainTextEdit, public NodeWidget { diff --git a/src/cpp/include/nodegui/QtWidgets/QPlainTextEdit/qplaintextedit_wrap.h b/src/cpp/include/nodegui/QtWidgets/QPlainTextEdit/qplaintextedit_wrap.h index fb710ae80..b3627711c 100644 --- a/src/cpp/include/nodegui/QtWidgets/QPlainTextEdit/qplaintextedit_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QPlainTextEdit/qplaintextedit_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nplaintextedit.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QProgressBar/nprogressbar.hpp b/src/cpp/include/nodegui/QtWidgets/QProgressBar/nprogressbar.hpp index 8d9c25ce2..c0ee6674c 100644 --- a/src/cpp/include/nodegui/QtWidgets/QProgressBar/nprogressbar.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QProgressBar/nprogressbar.hpp @@ -2,7 +2,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QProgressBar/qprogressbar_wrap.h b/src/cpp/include/nodegui/QtWidgets/QProgressBar/qprogressbar_wrap.h index 289459f91..e19f97171 100644 --- a/src/cpp/include/nodegui/QtWidgets/QProgressBar/qprogressbar_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QProgressBar/qprogressbar_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nprogressbar.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QPushButton/npushbutton.hpp b/src/cpp/include/nodegui/QtWidgets/QPushButton/npushbutton.hpp index efb967eef..35947c6a1 100644 --- a/src/cpp/include/nodegui/QtWidgets/QPushButton/npushbutton.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QPushButton/npushbutton.hpp @@ -2,7 +2,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractButton/qabstractbutton_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QPushButton/qpushbutton_wrap.h b/src/cpp/include/nodegui/QtWidgets/QPushButton/qpushbutton_wrap.h index a048e1dda..92f4bd660 100644 --- a/src/cpp/include/nodegui/QtWidgets/QPushButton/qpushbutton_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QPushButton/qpushbutton_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractButton/qabstractbutton_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "npushbutton.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QRadioButton/nradiobutton.hpp b/src/cpp/include/nodegui/QtWidgets/QRadioButton/nradiobutton.hpp index 2ed223e2f..2415fb3a0 100644 --- a/src/cpp/include/nodegui/QtWidgets/QRadioButton/nradiobutton.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QRadioButton/nradiobutton.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractButton/qabstractbutton_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QRadioButton/qradiobutton_wrap.h b/src/cpp/include/nodegui/QtWidgets/QRadioButton/qradiobutton_wrap.h index 0d0572003..bd2fc0be0 100644 --- a/src/cpp/include/nodegui/QtWidgets/QRadioButton/qradiobutton_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QRadioButton/qradiobutton_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractButton/qabstractbutton_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nradiobutton.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QScrollArea/nscrollarea.hpp b/src/cpp/include/nodegui/QtWidgets/QScrollArea/nscrollarea.hpp index 4ce9df0c4..ce8254bc3 100644 --- a/src/cpp/include/nodegui/QtWidgets/QScrollArea/nscrollarea.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QScrollArea/nscrollarea.hpp @@ -2,7 +2,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QScrollArea/qscrollarea_wrap.h b/src/cpp/include/nodegui/QtWidgets/QScrollArea/qscrollarea_wrap.h index 7dfd639cd..1c3022e9e 100644 --- a/src/cpp/include/nodegui/QtWidgets/QScrollArea/qscrollarea_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QScrollArea/qscrollarea_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h" #include "nscrollarea.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QScrollBar/nscrollbar.hpp b/src/cpp/include/nodegui/QtWidgets/QScrollBar/nscrollbar.hpp index fb4e0f340..8266cd6e9 100644 --- a/src/cpp/include/nodegui/QtWidgets/QScrollBar/nscrollbar.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QScrollBar/nscrollbar.hpp @@ -2,7 +2,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractSlider/qabstractslider_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QScrollBar/qscrollbar_wrap.h b/src/cpp/include/nodegui/QtWidgets/QScrollBar/qscrollbar_wrap.h index 5acb222df..ffd8c9a1c 100644 --- a/src/cpp/include/nodegui/QtWidgets/QScrollBar/qscrollbar_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QScrollBar/qscrollbar_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractSlider/qabstractslider_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nscrollbar.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QShortcut/nshortcut.hpp b/src/cpp/include/nodegui/QtWidgets/QShortcut/nshortcut.hpp index 933db17f6..777548c38 100644 --- a/src/cpp/include/nodegui/QtWidgets/QShortcut/nshortcut.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QShortcut/nshortcut.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtCore/QObject/qobject_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QShortcut/qshortcut_wrap.h b/src/cpp/include/nodegui/QtWidgets/QShortcut/qshortcut_wrap.h index ae4c14fe5..052f962dc 100644 --- a/src/cpp/include/nodegui/QtWidgets/QShortcut/qshortcut_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QShortcut/qshortcut_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtCore/QObject/qobject_macro.h" #include "nshortcut.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QSlider/nslider.hpp b/src/cpp/include/nodegui/QtWidgets/QSlider/nslider.hpp index 2f844f3e4..ae3e2d9f5 100644 --- a/src/cpp/include/nodegui/QtWidgets/QSlider/nslider.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QSlider/nslider.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractSlider/qabstractslider_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QSlider/qslider_wrap.h b/src/cpp/include/nodegui/QtWidgets/QSlider/qslider_wrap.h index ff1c463a7..653ec702c 100644 --- a/src/cpp/include/nodegui/QtWidgets/QSlider/qslider_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QSlider/qslider_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractSlider/qabstractslider_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nslider.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QSpinBox/nspinbox.hpp b/src/cpp/include/nodegui/QtWidgets/QSpinBox/nspinbox.hpp index d6865f0a2..e07ee9d31 100644 --- a/src/cpp/include/nodegui/QtWidgets/QSpinBox/nspinbox.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QSpinBox/nspinbox.hpp @@ -2,7 +2,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractSpinBox/qabstractspinbox_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QSpinBox/qspinbox_wrap.h b/src/cpp/include/nodegui/QtWidgets/QSpinBox/qspinbox_wrap.h index 4e87f7294..e26389542 100644 --- a/src/cpp/include/nodegui/QtWidgets/QSpinBox/qspinbox_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QSpinBox/qspinbox_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractSpinBox/qabstractspinbox_macro.h" #include "nspinbox.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QStackedWidget/nstackedwidget.hpp b/src/cpp/include/nodegui/QtWidgets/QStackedWidget/nstackedwidget.hpp index c05629e4e..052f5a70f 100644 --- a/src/cpp/include/nodegui/QtWidgets/QStackedWidget/nstackedwidget.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QStackedWidget/nstackedwidget.hpp @@ -2,8 +2,9 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QFrame/qframe_macro.h" +#include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QStackedWidget/qstackedwidget_wrap.h b/src/cpp/include/nodegui/QtWidgets/QStackedWidget/qstackedwidget_wrap.h index f141d8dcd..e29fed9d6 100644 --- a/src/cpp/include/nodegui/QtWidgets/QStackedWidget/qstackedwidget_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QStackedWidget/qstackedwidget_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QFrame/qframe_macro.h" #include "QtWidgets/QStackedWidget/nstackedwidget.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QStatusBar/nstatusbar.hpp b/src/cpp/include/nodegui/QtWidgets/QStatusBar/nstatusbar.hpp index bb5220276..598b5563d 100644 --- a/src/cpp/include/nodegui/QtWidgets/QStatusBar/nstatusbar.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QStatusBar/nstatusbar.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QStatusBar/qstatusbar_wrap.h b/src/cpp/include/nodegui/QtWidgets/QStatusBar/qstatusbar_wrap.h index 4d471663d..eaa6a774e 100644 --- a/src/cpp/include/nodegui/QtWidgets/QStatusBar/qstatusbar_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QStatusBar/qstatusbar_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nstatusbar.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/nsystemtrayicon.hpp b/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/nsystemtrayicon.hpp index 7664017ce..4f8c2a7a8 100644 --- a/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/nsystemtrayicon.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/nsystemtrayicon.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtCore/QObject/qobject_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/qsystemtrayicon_wrap.h b/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/qsystemtrayicon_wrap.h index c13284c4c..1fcdf9695 100644 --- a/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/qsystemtrayicon_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QSystemTrayIcon/qsystemtrayicon_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtCore/QObject/qobject_macro.h" #include "nsystemtrayicon.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QTabWidget/ntabwidget.hpp b/src/cpp/include/nodegui/QtWidgets/QTabWidget/ntabwidget.hpp index 26fc9597a..1c3bf656d 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTabWidget/ntabwidget.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QTabWidget/ntabwidget.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QTabWidget/qtabwidget_wrap.h b/src/cpp/include/nodegui/QtWidgets/QTabWidget/qtabwidget_wrap.h index dc98676de..88f96f8c0 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTabWidget/qtabwidget_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QTabWidget/qtabwidget_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QTabWidget/ntabwidget.hpp" #include "QtWidgets/QWidget/qwidget_macro.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QTableWidget/ntablewidget.hpp b/src/cpp/include/nodegui/QtWidgets/QTableWidget/ntablewidget.hpp index e90af88fb..27bc11064 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTableWidget/ntablewidget.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QTableWidget/ntablewidget.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QTableWidget/qtablewidget_wrap.h b/src/cpp/include/nodegui/QtWidgets/QTableWidget/qtablewidget_wrap.h index aa5460940..79984bc2d 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTableWidget/qtablewidget_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QTableWidget/qtablewidget_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h" #include "QtWidgets/QTableWidget/ntablewidget.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QTableWidgetItem/qtablewidgetitem_wrap.h b/src/cpp/include/nodegui/QtWidgets/QTableWidgetItem/qtablewidgetitem_wrap.h index b870edffd..06a22db24 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTableWidgetItem/qtablewidgetitem_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QTableWidgetItem/qtablewidgetitem_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_wrap.h" class DLL_EXPORT QTableWidgetItemWrap diff --git a/src/cpp/include/nodegui/QtWidgets/QTimeEdit/ntimeedit.hpp b/src/cpp/include/nodegui/QtWidgets/QTimeEdit/ntimeedit.hpp index 5b2349ad1..0879c84e6 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTimeEdit/ntimeedit.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QTimeEdit/ntimeedit.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QDateTimeEdit/qdatetimeedit_macro.h" #include "core/NodeWidget/nodewidget.h" #include "napi.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QTimeEdit/qtimeedit_wrap.h b/src/cpp/include/nodegui/QtWidgets/QTimeEdit/qtimeedit_wrap.h index 3a0f8de43..fe322e4d4 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTimeEdit/qtimeedit_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QTimeEdit/qtimeedit_wrap.h @@ -5,7 +5,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QDateTimeEdit/qdatetimeedit_macro.h" #include "ntimeedit.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QToolButton/ntoolbutton.hpp b/src/cpp/include/nodegui/QtWidgets/QToolButton/ntoolbutton.hpp index e6e42d835..ac8a5fa51 100644 --- a/src/cpp/include/nodegui/QtWidgets/QToolButton/ntoolbutton.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QToolButton/ntoolbutton.hpp @@ -3,7 +3,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractButton/qabstractbutton_macro.h" #include "QtWidgets/QAction/qaction_wrap.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QToolButton/qtoolbutton_wrap.h b/src/cpp/include/nodegui/QtWidgets/QToolButton/qtoolbutton_wrap.h index b9f052c11..fe3f765e7 100644 --- a/src/cpp/include/nodegui/QtWidgets/QToolButton/qtoolbutton_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QToolButton/qtoolbutton_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractButton/qabstractbutton_macro.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "ntoolbutton.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QTreeWidget/ntreewidget.hpp b/src/cpp/include/nodegui/QtWidgets/QTreeWidget/ntreewidget.hpp index 23774928a..7a1756383 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTreeWidget/ntreewidget.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QTreeWidget/ntreewidget.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QAbstractScrollArea/qabstractscrollarea_macro.h" #include "QtWidgets/QTreeWidgetItem/qtreewidgetitem_wrap.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QTreeWidget/qtreewidget_wrap.h b/src/cpp/include/nodegui/QtWidgets/QTreeWidget/qtreewidget_wrap.h index 8febe97ec..b8c5720b4 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTreeWidget/qtreewidget_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QTreeWidget/qtreewidget_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "ntreewidget.hpp" diff --git a/src/cpp/include/nodegui/QtWidgets/QTreeWidgetItem/qtreewidgetitem_wrap.h b/src/cpp/include/nodegui/QtWidgets/QTreeWidgetItem/qtreewidgetitem_wrap.h index 911696372..50db3433b 100644 --- a/src/cpp/include/nodegui/QtWidgets/QTreeWidgetItem/qtreewidgetitem_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QTreeWidgetItem/qtreewidgetitem_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Component/component_wrap.h" class DLL_EXPORT QTreeWidgetItemWrap diff --git a/src/cpp/include/nodegui/QtWidgets/QWidget/nwidget.hpp b/src/cpp/include/nodegui/QtWidgets/QWidget/nwidget.hpp index a177e06cd..47fc2f436 100644 --- a/src/cpp/include/nodegui/QtWidgets/QWidget/nwidget.hpp +++ b/src/cpp/include/nodegui/QtWidgets/QWidget/nwidget.hpp @@ -4,7 +4,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "core/NodeWidget/nodewidget.h" diff --git a/src/cpp/include/nodegui/QtWidgets/QWidget/qwidget_wrap.h b/src/cpp/include/nodegui/QtWidgets/QWidget/qwidget_wrap.h index b8d0a5b78..baec964da 100644 --- a/src/cpp/include/nodegui/QtWidgets/QWidget/qwidget_wrap.h +++ b/src/cpp/include/nodegui/QtWidgets/QWidget/qwidget_wrap.h @@ -4,7 +4,7 @@ #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QWidget/qwidget_macro.h" #include "nwidget.hpp" diff --git a/src/cpp/include/nodegui/core/Component/component_wrap.h b/src/cpp/include/nodegui/core/Component/component_wrap.h index 906f5b16b..4643875a9 100644 --- a/src/cpp/include/nodegui/core/Component/component_wrap.h +++ b/src/cpp/include/nodegui/core/Component/component_wrap.h @@ -9,8 +9,8 @@ #include -#include "Extras/Utils/nutils.h" #include "component_macro.h" +#include "Extras/Export/export.h" class DLL_EXPORT ComponentWrap : public Napi::ObjectWrap { public: diff --git a/src/cpp/include/nodegui/core/Events/eventsmap.h b/src/cpp/include/nodegui/core/Events/eventsmap.h index 7783e92bd..2e0cdf50a 100644 --- a/src/cpp/include/nodegui/core/Events/eventsmap.h +++ b/src/cpp/include/nodegui/core/Events/eventsmap.h @@ -2,7 +2,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" class DLL_EXPORT EventsMap { public: diff --git a/src/cpp/include/nodegui/core/Events/eventwidget.h b/src/cpp/include/nodegui/core/Events/eventwidget.h index aad98c5f3..10ba80089 100644 --- a/src/cpp/include/nodegui/core/Events/eventwidget.h +++ b/src/cpp/include/nodegui/core/Events/eventwidget.h @@ -4,8 +4,8 @@ #include -#include "Extras/Utils/nutils.h" #include "core/Events/eventsmap.h" +#include "Extras/Export/export.h" class DLL_EXPORT EventWidget { public: diff --git a/src/cpp/include/nodegui/core/FlexLayout/flexitem.h b/src/cpp/include/nodegui/core/FlexLayout/flexitem.h index 0a30697b9..b237e1b4a 100644 --- a/src/cpp/include/nodegui/core/FlexLayout/flexitem.h +++ b/src/cpp/include/nodegui/core/FlexLayout/flexitem.h @@ -1,7 +1,7 @@ #pragma once -#include "Extras/Utils/nutils.h" #include "deps/yoga/YGNode.h" +#include "Extras/Export/export.h" /* FlexItem class is used to extend regular QWidget Classes to include diff --git a/src/cpp/include/nodegui/core/FlexLayout/flexlayout.hpp b/src/cpp/include/nodegui/core/FlexLayout/flexlayout.hpp index 1419a68c7..bf9524d37 100644 --- a/src/cpp/include/nodegui/core/FlexLayout/flexlayout.hpp +++ b/src/cpp/include/nodegui/core/FlexLayout/flexlayout.hpp @@ -2,7 +2,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "QtWidgets/QLayout/qlayout_macro.h" #include "core/Events/eventwidget_macro.h" #include "deps/yoga/YGNode.h" diff --git a/src/cpp/include/nodegui/core/FlexLayout/flexlayout_wrap.h b/src/cpp/include/nodegui/core/FlexLayout/flexlayout_wrap.h index 0b105ec48..9ca52a3bb 100644 --- a/src/cpp/include/nodegui/core/FlexLayout/flexlayout_wrap.h +++ b/src/cpp/include/nodegui/core/FlexLayout/flexlayout_wrap.h @@ -4,9 +4,9 @@ #include -#include "Extras/Utils/nutils.h" #include "QtWidgets/QLayout/qlayout_macro.h" #include "flexlayout.hpp" +#include "Extras/Export/export.h" class DLL_EXPORT FlexLayoutWrap : public Napi::ObjectWrap { QLAYOUT_WRAPPED_METHODS_DECLARATION diff --git a/src/cpp/include/nodegui/core/FlexLayout/flexutils.h b/src/cpp/include/nodegui/core/FlexLayout/flexutils.h index 2a0a014b6..65cb1eeaf 100644 --- a/src/cpp/include/nodegui/core/FlexLayout/flexutils.h +++ b/src/cpp/include/nodegui/core/FlexLayout/flexutils.h @@ -3,7 +3,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "deps/yoga/YGNode.h" class DLL_EXPORT FlexNodeContext { diff --git a/src/cpp/include/nodegui/core/NodeWidget/nodewidget.h b/src/cpp/include/nodegui/core/NodeWidget/nodewidget.h index 7def0fae3..43c31749e 100644 --- a/src/cpp/include/nodegui/core/NodeWidget/nodewidget.h +++ b/src/cpp/include/nodegui/core/NodeWidget/nodewidget.h @@ -1,5 +1,5 @@ #pragma once -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/Events/eventwidget_macro.h" #include "core/YogaWidget/yogawidget.h" diff --git a/src/cpp/include/nodegui/core/YogaWidget/nodestyle.h b/src/cpp/include/nodegui/core/YogaWidget/nodestyle.h index 8ed8235bf..a51eb682e 100644 --- a/src/cpp/include/nodegui/core/YogaWidget/nodestyle.h +++ b/src/cpp/include/nodegui/core/YogaWidget/nodestyle.h @@ -3,7 +3,7 @@ #include #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "deps/yoga/YGStyle.h" /* diff --git a/src/cpp/include/nodegui/core/YogaWidget/yogawidget.h b/src/cpp/include/nodegui/core/YogaWidget/yogawidget.h index 2a0a050ee..c823cfd36 100644 --- a/src/cpp/include/nodegui/core/YogaWidget/yogawidget.h +++ b/src/cpp/include/nodegui/core/YogaWidget/yogawidget.h @@ -1,7 +1,7 @@ #pragma once #include -#include "Extras/Utils/nutils.h" +#include "Extras/Export/export.h" #include "core/FlexLayout/flexitem.h" #include "nodestyle.h" diff --git a/src/cpp/lib/QtGui/QKeySequence/qkeysequence_wrap.cpp b/src/cpp/lib/QtGui/QKeySequence/qkeysequence_wrap.cpp index 80723a179..021d1133c 100644 --- a/src/cpp/lib/QtGui/QKeySequence/qkeysequence_wrap.cpp +++ b/src/cpp/lib/QtGui/QKeySequence/qkeysequence_wrap.cpp @@ -1,5 +1,5 @@ #include "QtGui/QKeySequence/qkeysequence_wrap.h" - +#include "Extras/Utils/nutils.h" #include "QtCore/QVariant/qvariant_wrap.h" #include "QtGui/QPixmap/qpixmap_wrap.h" diff --git a/src/cpp/lib/core/FlexLayout/flexlayout.cpp b/src/cpp/lib/core/FlexLayout/flexlayout.cpp index 47dff4717..e2ecfb7f7 100644 --- a/src/cpp/lib/core/FlexLayout/flexlayout.cpp +++ b/src/cpp/lib/core/FlexLayout/flexlayout.cpp @@ -3,7 +3,6 @@ #include #include -#include "Extras/Utils/nutils.h" #include "core/FlexLayout/flexitem.h" #include "core/FlexLayout/flexutils.h" #include "core/YogaWidget/yogawidget.h"