From 98494f50d6b39a959e13ff71394fb942e88dc945 Mon Sep 17 00:00:00 2001 From: Atul R Date: Fri, 7 Jun 2019 20:13:09 +0200 Subject: [PATCH] added yoga properties to all widgets --- config/moc.gypi | 8 +- package.json | 3 +- scripts/automoc.js | 39 +++ src/cpp/QtGui/QWidget/qwidget_wrap.cpp | 10 +- src/cpp/QtWidgets/QCheckBox/ncheckbox.h | 16 + src/cpp/QtWidgets/QCheckBox/ncheckbox_moc.cpp | 326 ++++++++++++++++++ .../QtWidgets/QCheckBox/qcheckbox_wrap.cpp | 14 +- src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.h | 11 +- .../QGridLayout/qgridlayout_wrap.cpp | 10 +- src/cpp/QtWidgets/QLabel/qlabel_wrap.cpp | 10 +- src/cpp/QtWidgets/QLineEdit/nlineedit.h | 16 + src/cpp/QtWidgets/QLineEdit/nlineedit_moc.cpp | 326 ++++++++++++++++++ .../QtWidgets/QLineEdit/qlineedit_wrap.cpp | 14 +- src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.h | 11 +- src/cpp/QtWidgets/QMainWindow/nmainwindow.h | 16 + .../QtWidgets/QMainWindow/nmainwindow_moc.cpp | 326 ++++++++++++++++++ .../QMainWindow/qmainwindow_wrap.cpp | 14 +- .../QtWidgets/QMainWindow/qmainwindow_wrap.h | 10 +- src/cpp/QtWidgets/QProgressBar/nprogressbar.h | 16 + .../QProgressBar/nprogressbar_moc.cpp | 326 ++++++++++++++++++ .../QProgressBar/qprogressbar_wrap.cpp | 14 +- .../QProgressBar/qprogressbar_wrap.h | 12 +- src/cpp/QtWidgets/QPushButton/npushbutton.h | 16 + .../QtWidgets/QPushButton/npushbutton_moc.cpp | 326 ++++++++++++++++++ .../QPushButton/qpushbutton_wrap.cpp | 14 +- .../QtWidgets/QPushButton/qpushbutton_wrap.h | 12 +- src/cpp/QtWidgets/QRadioButton/nradiobutton.h | 16 + .../QRadioButton/nradiobutton_moc.cpp | 326 ++++++++++++++++++ .../QRadioButton/qradiobutton_wrap.cpp | 14 +- .../QRadioButton/qradiobutton_wrap.h | 12 +- src/cpp/core/FlexLayout/flexlayout_wrap.cpp | 12 +- 31 files changed, 2177 insertions(+), 119 deletions(-) create mode 100644 scripts/automoc.js create mode 100644 src/cpp/QtWidgets/QCheckBox/ncheckbox.h create mode 100644 src/cpp/QtWidgets/QCheckBox/ncheckbox_moc.cpp create mode 100644 src/cpp/QtWidgets/QLineEdit/nlineedit.h create mode 100644 src/cpp/QtWidgets/QLineEdit/nlineedit_moc.cpp create mode 100644 src/cpp/QtWidgets/QMainWindow/nmainwindow.h create mode 100644 src/cpp/QtWidgets/QMainWindow/nmainwindow_moc.cpp create mode 100644 src/cpp/QtWidgets/QProgressBar/nprogressbar.h create mode 100644 src/cpp/QtWidgets/QProgressBar/nprogressbar_moc.cpp create mode 100644 src/cpp/QtWidgets/QPushButton/npushbutton.h create mode 100644 src/cpp/QtWidgets/QPushButton/npushbutton_moc.cpp create mode 100644 src/cpp/QtWidgets/QRadioButton/nradiobutton.h create mode 100644 src/cpp/QtWidgets/QRadioButton/nradiobutton_moc.cpp diff --git a/config/moc.gypi b/config/moc.gypi index 1804d9034..5cd9987ce 100644 --- a/config/moc.gypi +++ b/config/moc.gypi @@ -4,6 +4,12 @@ "sources": [ "../src/cpp/QtGui/QWidget/nwidget_moc.cpp", "../src/cpp/QtWidgets/QLabel/nlabel_moc.cpp", - ], + "../src/cpp/QtWidgets/QCheckBox/ncheckbox_moc.cpp", + "../src/cpp/QtWidgets/QLineEdit/nlineedit_moc.cpp", + "../src/cpp/QtWidgets/QMainWindow/nmainwindow_moc.cpp", + "../src/cpp/QtWidgets/QProgressBar/nprogressbar_moc.cpp", + "../src/cpp/QtWidgets/QPushButton/npushbutton_moc.cpp", + "../src/cpp/QtWidgets/QRadioButton/nradiobutton_moc.cpp" + ] } } diff --git a/package.json b/package.json index b56840f12..e51560d13 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,8 @@ "build:addon": "node-gyp -j 8 build", "rebuild:addon": "node-gyp -j 8 build", "build:lib": "rm -rf ./dist/ && tsc", - "dev": "yarn build:lib && qode dist/demo.js" + "dev": "yarn build:lib && qode dist/demo.js", + "automoc": "node ./scripts/automoc.js" }, "dependencies": { "bindings": "^1.5.0", diff --git a/scripts/automoc.js b/scripts/automoc.js new file mode 100644 index 000000000..ccc377e7f --- /dev/null +++ b/scripts/automoc.js @@ -0,0 +1,39 @@ +const path = require("path"); +const fs = require("fs"); +const process = require("child_process"); + +const parseMocGypi = () => { + const MOC_GYPI_PATH = path.resolve(__dirname, "../config/moc.gypi"); + const fileText = fs.readFileSync(MOC_GYPI_PATH); + return JSON.parse(fileText); +}; + +const main = () => { + const includeFilePath = path.resolve( + __dirname, + "../src/cpp/core/YogaWidget/yogawidget.h" + ); + const config = parseMocGypi(); + const mocFiles = config["target_defaults"]["sources"]; + mocFiles.forEach(eachMocFilePath => { + const parsed = path.parse(eachMocFilePath); + const possibleOriginalHeaderFile = path.format({ + ...parsed, + name: parsed.name.replace("_moc", ""), + ext: ".h", + base: undefined + }); + const infile = path.resolve(__dirname, possibleOriginalHeaderFile); + const outfile = path.resolve(__dirname, eachMocFilePath); + const command = `moc ${infile} -o ${outfile} --include ${includeFilePath}`; + console.log(command); + process.exec(command, (error, stdout, stderr) => { + if (error) { + console.error(`exec error: ${error}`); + return; + } + }); + }); +}; + +main(); diff --git a/src/cpp/QtGui/QWidget/qwidget_wrap.cpp b/src/cpp/QtGui/QWidget/qwidget_wrap.cpp index 17206d4a7..fd13418bd 100644 --- a/src/cpp/QtGui/QWidget/qwidget_wrap.cpp +++ b/src/cpp/QtGui/QWidget/qwidget_wrap.cpp @@ -25,13 +25,9 @@ QWidgetWrap::QWidgetWrap(const Napi::CallbackInfo& info): Napi::ObjectWrap(); - QWidgetWrap* w_parent = Napi::ObjectWrap::Unwrap(object_parent); - this->instance = new NWidget(w_parent->getInternalInstance()); //this sets the parent to current widget - }else{ - extrautils::throwTypeError(env, "Wrong type of arguments"); - } + Napi::Object parentObject = info[0].As(); + QWidgetWrap* parentWidgetWrap = Napi::ObjectWrap::Unwrap(parentObject); + this->instance = new NWidget(parentWidgetWrap->getInternalInstance()); //this sets the parent to current widget }else if (info.Length() == 0){ this->instance = new NWidget(); }else { diff --git a/src/cpp/QtWidgets/QCheckBox/ncheckbox.h b/src/cpp/QtWidgets/QCheckBox/ncheckbox.h new file mode 100644 index 000000000..430339a3b --- /dev/null +++ b/src/cpp/QtWidgets/QCheckBox/ncheckbox.h @@ -0,0 +1,16 @@ +#pragma once + +#include +#include +#include "src/cpp/core/YogaWidget/yogawidget.h" + +class NCheckBox: public QCheckBox, public YogaWidget +{ + +public: + SET_YOGA_WIDGET_Q_PROPERTIES + using QCheckBox::QCheckBox; //inherit all constructors of QCheckBox + Q_OBJECT +}; + + diff --git a/src/cpp/QtWidgets/QCheckBox/ncheckbox_moc.cpp b/src/cpp/QtWidgets/QCheckBox/ncheckbox_moc.cpp new file mode 100644 index 000000000..82da26250 --- /dev/null +++ b/src/cpp/QtWidgets/QCheckBox/ncheckbox_moc.cpp @@ -0,0 +1,326 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'ncheckbox.h' +** +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.1) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "ncheckbox.h" +#include +#include +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'ncheckbox.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 67 +#error "This file was generated using the moc from 5.12.1. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED +struct qt_meta_stringdata_NCheckBox_t { + QByteArrayData data[45]; + char stringdata0[487]; +}; +#define QT_MOC_LITERAL(idx, ofs, len) \ + Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ + qptrdiff(offsetof(qt_meta_stringdata_NCheckBox_t, stringdata0) + ofs \ + - idx * sizeof(QByteArrayData)) \ + ) +static const qt_meta_stringdata_NCheckBox_t qt_meta_stringdata_NCheckBox = { + { +QT_MOC_LITERAL(0, 0, 9), // "NCheckBox" +QT_MOC_LITERAL(1, 10, 7), // "display" +QT_MOC_LITERAL(2, 18, 10), // "alignItems" +QT_MOC_LITERAL(3, 29, 12), // "alignContent" +QT_MOC_LITERAL(4, 42, 9), // "alignSelf" +QT_MOC_LITERAL(5, 52, 14), // "justifyContent" +QT_MOC_LITERAL(6, 67, 9), // "direction" +QT_MOC_LITERAL(7, 77, 13), // "flexDirection" +QT_MOC_LITERAL(8, 91, 8), // "overflow" +QT_MOC_LITERAL(9, 100, 8), // "position" +QT_MOC_LITERAL(10, 109, 8), // "flexWrap" +QT_MOC_LITERAL(11, 118, 4), // "flex" +QT_MOC_LITERAL(12, 123, 8), // "flexGrow" +QT_MOC_LITERAL(13, 132, 10), // "flexShrink" +QT_MOC_LITERAL(14, 143, 11), // "aspectRatio" +QT_MOC_LITERAL(15, 155, 3), // "top" +QT_MOC_LITERAL(16, 159, 5), // "right" +QT_MOC_LITERAL(17, 165, 6), // "bottom" +QT_MOC_LITERAL(18, 172, 4), // "left" +QT_MOC_LITERAL(19, 177, 9), // "flexBasis" +QT_MOC_LITERAL(20, 187, 8), // "minWidth" +QT_MOC_LITERAL(21, 196, 9), // "minHeight" +QT_MOC_LITERAL(22, 206, 8), // "maxWidth" +QT_MOC_LITERAL(23, 215, 9), // "maxHeight" +QT_MOC_LITERAL(24, 225, 10), // "paddingTop" +QT_MOC_LITERAL(25, 236, 12), // "paddingRight" +QT_MOC_LITERAL(26, 249, 13), // "paddingBottom" +QT_MOC_LITERAL(27, 263, 11), // "paddingLeft" +QT_MOC_LITERAL(28, 275, 17), // "paddingHorizontal" +QT_MOC_LITERAL(29, 293, 15), // "paddingVertical" +QT_MOC_LITERAL(30, 309, 7), // "padding" +QT_MOC_LITERAL(31, 317, 9), // "marginTop" +QT_MOC_LITERAL(32, 327, 11), // "marginRight" +QT_MOC_LITERAL(33, 339, 12), // "marginBottom" +QT_MOC_LITERAL(34, 352, 10), // "marginLeft" +QT_MOC_LITERAL(35, 363, 16), // "marginHorizontal" +QT_MOC_LITERAL(36, 380, 14), // "marginVertical" +QT_MOC_LITERAL(37, 395, 6), // "margin" +QT_MOC_LITERAL(38, 402, 9), // "borderTop" +QT_MOC_LITERAL(39, 412, 11), // "borderRight" +QT_MOC_LITERAL(40, 424, 12), // "borderBottom" +QT_MOC_LITERAL(41, 437, 10), // "borderLeft" +QT_MOC_LITERAL(42, 448, 16), // "borderHorizontal" +QT_MOC_LITERAL(43, 465, 14), // "borderVertical" +QT_MOC_LITERAL(44, 480, 6) // "border" + + }, + "NCheckBox\0display\0alignItems\0alignContent\0" + "alignSelf\0justifyContent\0direction\0" + "flexDirection\0overflow\0position\0" + "flexWrap\0flex\0flexGrow\0flexShrink\0" + "aspectRatio\0top\0right\0bottom\0left\0" + "flexBasis\0minWidth\0minHeight\0maxWidth\0" + "maxHeight\0paddingTop\0paddingRight\0" + "paddingBottom\0paddingLeft\0paddingHorizontal\0" + "paddingVertical\0padding\0marginTop\0" + "marginRight\0marginBottom\0marginLeft\0" + "marginHorizontal\0marginVertical\0margin\0" + "borderTop\0borderRight\0borderBottom\0" + "borderLeft\0borderHorizontal\0borderVertical\0" + "border" +}; +#undef QT_MOC_LITERAL + +static const uint qt_meta_data_NCheckBox[] = { + + // content: + 8, // revision + 0, // classname + 0, 0, // classinfo + 0, 0, // methods + 44, 14, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // properties: name, type, flags + 1, QMetaType::QString, 0x00095003, + 2, QMetaType::QString, 0x00095003, + 3, QMetaType::QString, 0x00095003, + 4, QMetaType::QString, 0x00095003, + 5, QMetaType::QString, 0x00095003, + 6, QMetaType::QString, 0x00095003, + 7, QMetaType::QString, 0x00095003, + 8, QMetaType::QString, 0x00095003, + 9, QMetaType::QString, 0x00095003, + 10, QMetaType::QString, 0x00095003, + 11, QMetaType::Float, 0x00095003, + 12, QMetaType::Float, 0x00095003, + 13, QMetaType::Float, 0x00095003, + 14, QMetaType::Float, 0x00095003, + 15, QMetaType::QString, 0x00095003, + 16, QMetaType::QString, 0x00095003, + 17, QMetaType::QString, 0x00095003, + 18, QMetaType::QString, 0x00095003, + 19, QMetaType::QString, 0x00095003, + 20, QMetaType::QString, 0x00095003, + 21, QMetaType::QString, 0x00095003, + 22, QMetaType::QString, 0x00095003, + 23, QMetaType::QString, 0x00095003, + 24, QMetaType::QString, 0x00095003, + 25, QMetaType::QString, 0x00095003, + 26, QMetaType::QString, 0x00095003, + 27, QMetaType::QString, 0x00095003, + 28, QMetaType::QString, 0x00095003, + 29, QMetaType::QString, 0x00095003, + 30, QMetaType::QString, 0x00095003, + 31, QMetaType::QString, 0x00095003, + 32, QMetaType::QString, 0x00095003, + 33, QMetaType::QString, 0x00095003, + 34, QMetaType::QString, 0x00095003, + 35, QMetaType::QString, 0x00095003, + 36, QMetaType::QString, 0x00095003, + 37, QMetaType::QString, 0x00095003, + 38, QMetaType::Float, 0x00095003, + 39, QMetaType::Float, 0x00095003, + 40, QMetaType::Float, 0x00095003, + 41, QMetaType::Float, 0x00095003, + 42, QMetaType::Float, 0x00095003, + 43, QMetaType::Float, 0x00095003, + 44, QMetaType::Float, 0x00095003, + + 0 // eod +}; + +void NCheckBox::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + +#ifndef QT_NO_PROPERTIES + if (_c == QMetaObject::ReadProperty) { + auto *_t = static_cast(_o); + Q_UNUSED(_t) + void *_v = _a[0]; + switch (_id) { + case 0: *reinterpret_cast< QString*>(_v) = _t->_yDisplay; break; + case 1: *reinterpret_cast< QString*>(_v) = _t->_yAlignItems; break; + case 2: *reinterpret_cast< QString*>(_v) = _t->_yAlignContent; break; + case 3: *reinterpret_cast< QString*>(_v) = _t->_yAlignSelf; break; + case 4: *reinterpret_cast< QString*>(_v) = _t->_yJustifyContent; break; + case 5: *reinterpret_cast< QString*>(_v) = _t->_yDirection; break; + case 6: *reinterpret_cast< QString*>(_v) = _t->_yFlexDirection; break; + case 7: *reinterpret_cast< QString*>(_v) = _t->_yOverflow; break; + case 8: *reinterpret_cast< QString*>(_v) = _t->_yPosition; break; + case 9: *reinterpret_cast< QString*>(_v) = _t->_yFlexWrap; break; + case 10: *reinterpret_cast< float*>(_v) = _t->_yFlex; break; + case 11: *reinterpret_cast< float*>(_v) = _t->_yFlexGrow; break; + case 12: *reinterpret_cast< float*>(_v) = _t->_yFlexShrink; break; + case 13: *reinterpret_cast< float*>(_v) = _t->_yAspectRatio; break; + case 14: *reinterpret_cast< QString*>(_v) = _t->_yTop; break; + case 15: *reinterpret_cast< QString*>(_v) = _t->_yRight; break; + case 16: *reinterpret_cast< QString*>(_v) = _t->_yBottom; break; + case 17: *reinterpret_cast< QString*>(_v) = _t->_yLeft; break; + case 18: *reinterpret_cast< QString*>(_v) = _t->_yFlexBasis; break; + case 19: *reinterpret_cast< QString*>(_v) = _t->_yMinWidth; break; + case 20: *reinterpret_cast< QString*>(_v) = _t->_yMinHeight; break; + case 21: *reinterpret_cast< QString*>(_v) = _t->_yMaxWidth; break; + case 22: *reinterpret_cast< QString*>(_v) = _t->_yMaxHeight; break; + case 23: *reinterpret_cast< QString*>(_v) = _t->_yPaddingTop; break; + case 24: *reinterpret_cast< QString*>(_v) = _t->_yPaddingRight; break; + case 25: *reinterpret_cast< QString*>(_v) = _t->_yPaddingBottom; break; + case 26: *reinterpret_cast< QString*>(_v) = _t->_yPaddingLeft; break; + case 27: *reinterpret_cast< QString*>(_v) = _t->_yPaddingHorizontal; break; + case 28: *reinterpret_cast< QString*>(_v) = _t->_yPaddingVertical; break; + case 29: *reinterpret_cast< QString*>(_v) = _t->_yPadding; break; + case 30: *reinterpret_cast< QString*>(_v) = _t->_yMarginTop; break; + case 31: *reinterpret_cast< QString*>(_v) = _t->_yMarginRight; break; + case 32: *reinterpret_cast< QString*>(_v) = _t->_yMarginBottom; break; + case 33: *reinterpret_cast< QString*>(_v) = _t->_yMarginLeft; break; + case 34: *reinterpret_cast< QString*>(_v) = _t->_yMarginHorizontal; break; + case 35: *reinterpret_cast< QString*>(_v) = _t->_yMarginVertical; break; + case 36: *reinterpret_cast< QString*>(_v) = _t->_yMargin; break; + case 37: *reinterpret_cast< float*>(_v) = _t->_yBorderTop; break; + case 38: *reinterpret_cast< float*>(_v) = _t->_yBorderRight; break; + case 39: *reinterpret_cast< float*>(_v) = _t->_yBorderBottom; break; + case 40: *reinterpret_cast< float*>(_v) = _t->_yBorderLeft; break; + case 41: *reinterpret_cast< float*>(_v) = _t->_yBorderHorizontal; break; + case 42: *reinterpret_cast< float*>(_v) = _t->_yBorderVertical; break; + case 43: *reinterpret_cast< float*>(_v) = _t->_yBorder; break; + default: break; + } + } else if (_c == QMetaObject::WriteProperty) { + auto *_t = static_cast(_o); + Q_UNUSED(_t) + void *_v = _a[0]; + switch (_id) { + case 0: _t->setYDisplay(*reinterpret_cast< QString*>(_v)); break; + case 1: _t->setYAlignItems(*reinterpret_cast< QString*>(_v)); break; + case 2: _t->setYAlignContent(*reinterpret_cast< QString*>(_v)); break; + case 3: _t->setYAlignSelf(*reinterpret_cast< QString*>(_v)); break; + case 4: _t->setYJustifyContent(*reinterpret_cast< QString*>(_v)); break; + case 5: _t->setYDirection(*reinterpret_cast< QString*>(_v)); break; + case 6: _t->setYFlexDirection(*reinterpret_cast< QString*>(_v)); break; + case 7: _t->setYOverflow(*reinterpret_cast< QString*>(_v)); break; + case 8: _t->setYPosition(*reinterpret_cast< QString*>(_v)); break; + case 9: _t->setYFlexWrap(*reinterpret_cast< QString*>(_v)); break; + case 10: _t->setYFlex(*reinterpret_cast< float*>(_v)); break; + case 11: _t->setYFlexGrow(*reinterpret_cast< float*>(_v)); break; + case 12: _t->setYFlexShrink(*reinterpret_cast< float*>(_v)); break; + case 13: _t->setYAspectRatio(*reinterpret_cast< float*>(_v)); break; + case 14: _t->setYNodeTop(*reinterpret_cast< QString*>(_v)); break; + case 15: _t->setYNodeRight(*reinterpret_cast< QString*>(_v)); break; + case 16: _t->setYNodeBottom(*reinterpret_cast< QString*>(_v)); break; + case 17: _t->setYNodeLeft(*reinterpret_cast< QString*>(_v)); break; + case 18: _t->setYFlexBasis(*reinterpret_cast< QString*>(_v)); break; + case 19: _t->setYMinWidth(*reinterpret_cast< QString*>(_v)); break; + case 20: _t->setYMinHeight(*reinterpret_cast< QString*>(_v)); break; + case 21: _t->setYMaxWidth(*reinterpret_cast< QString*>(_v)); break; + case 22: _t->setYMaxHeight(*reinterpret_cast< QString*>(_v)); break; + case 23: _t->setYPaddingTop(*reinterpret_cast< QString*>(_v)); break; + case 24: _t->setYPaddingRight(*reinterpret_cast< QString*>(_v)); break; + case 25: _t->setYPaddingBottom(*reinterpret_cast< QString*>(_v)); break; + case 26: _t->setYPaddingLeft(*reinterpret_cast< QString*>(_v)); break; + case 27: _t->setYPaddingHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 28: _t->setYPaddingVertical(*reinterpret_cast< QString*>(_v)); break; + case 29: _t->setYPadding(*reinterpret_cast< QString*>(_v)); break; + case 30: _t->setYMarginTop(*reinterpret_cast< QString*>(_v)); break; + case 31: _t->setYMarginRight(*reinterpret_cast< QString*>(_v)); break; + case 32: _t->setYMarginBottom(*reinterpret_cast< QString*>(_v)); break; + case 33: _t->setYMarginLeft(*reinterpret_cast< QString*>(_v)); break; + case 34: _t->setYMarginHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 35: _t->setYMarginVertical(*reinterpret_cast< QString*>(_v)); break; + case 36: _t->setYMarginAll(*reinterpret_cast< QString*>(_v)); break; + case 37: _t->setYBorderTop(*reinterpret_cast< float*>(_v)); break; + case 38: _t->setYBorderRight(*reinterpret_cast< float*>(_v)); break; + case 39: _t->setYBorderBottom(*reinterpret_cast< float*>(_v)); break; + case 40: _t->setYBorderLeft(*reinterpret_cast< float*>(_v)); break; + case 41: _t->setYBorderHorizontal(*reinterpret_cast< float*>(_v)); break; + case 42: _t->setYBorderVertical(*reinterpret_cast< float*>(_v)); break; + case 43: _t->setYBorder(*reinterpret_cast< float*>(_v)); break; + default: break; + } + } else if (_c == QMetaObject::ResetProperty) { + } +#endif // QT_NO_PROPERTIES + Q_UNUSED(_o); + Q_UNUSED(_id); + Q_UNUSED(_c); + Q_UNUSED(_a); +} + +QT_INIT_METAOBJECT const QMetaObject NCheckBox::staticMetaObject = { { + &QCheckBox::staticMetaObject, + qt_meta_stringdata_NCheckBox.data, + qt_meta_data_NCheckBox, + qt_static_metacall, + nullptr, + nullptr +} }; + + +const QMetaObject *NCheckBox::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject; +} + +void *NCheckBox::qt_metacast(const char *_clname) +{ + if (!_clname) return nullptr; + if (!strcmp(_clname, qt_meta_stringdata_NCheckBox.stringdata0)) + return static_cast(this); + if (!strcmp(_clname, "YogaWidget")) + return static_cast< YogaWidget*>(this); + return QCheckBox::qt_metacast(_clname); +} + +int NCheckBox::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QCheckBox::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + +#ifndef QT_NO_PROPERTIES + if (_c == QMetaObject::ReadProperty || _c == QMetaObject::WriteProperty + || _c == QMetaObject::ResetProperty || _c == QMetaObject::RegisterPropertyMetaType) { + qt_static_metacall(this, _c, _id, _a); + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyDesignable) { + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyScriptable) { + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyStored) { + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyEditable) { + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyUser) { + _id -= 44; + } +#endif // QT_NO_PROPERTIES + return _id; +} +QT_WARNING_POP +QT_END_MOC_NAMESPACE diff --git a/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.cpp b/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.cpp index e194ad1f2..3da499871 100644 --- a/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.cpp +++ b/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.cpp @@ -18,7 +18,7 @@ Napi::Object QCheckBoxWrap::init(Napi::Env env, Napi::Object exports) { return exports; } -QCheckBox* QCheckBoxWrap::getInternalInstance() { +NCheckBox* QCheckBoxWrap::getInternalInstance() { return this->instance; } @@ -27,15 +27,11 @@ QCheckBoxWrap::QCheckBoxWrap(const Napi::CallbackInfo& info): Napi::ObjectWrap(); - QWidgetWrap* w_parent = Napi::ObjectWrap::Unwrap(object_parent); - this->instance = new QCheckBox(w_parent->getInternalInstance()); //this sets the parent to current widget - }else{ - extrautils::throwTypeError(env, "Wrong type of arguments"); - } + Napi::Object parentObject = info[0].As(); + QWidgetWrap* parentWidgetWrap = Napi::ObjectWrap::Unwrap(parentObject); + this->instance = new NCheckBox(parentWidgetWrap->getInternalInstance()); //this sets the parent to current widget }else if (info.Length() == 0){ - this->instance = new QCheckBox(); + this->instance = new NCheckBox(); }else { extrautils::throwTypeError(env, "Wrong number of arguments"); } diff --git a/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.h b/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.h index b0be3f4b7..e0c7e516e 100644 --- a/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.h +++ b/src/cpp/QtWidgets/QCheckBox/qcheckbox_wrap.h @@ -1,17 +1,17 @@ -#ifndef QCHECKBOX_WRAP_H -#define QCHECKBOX_WRAP_H +#pragma once + #include -#include +#include "ncheckbox.h" #include "src/cpp/QtGui/QWidget/qwidget_macro.h" class QCheckBoxWrap : public Napi::ObjectWrap{ private: - QCheckBox* instance; + NCheckBox* instance; public: static Napi::Object init(Napi::Env env, Napi::Object exports); QCheckBoxWrap(const Napi::CallbackInfo& info); ~QCheckBoxWrap(); - QCheckBox* getInternalInstance(); + NCheckBox* getInternalInstance(); //class constructor static Napi::FunctionReference constructor; //wrapped methods @@ -20,4 +20,3 @@ class QCheckBoxWrap : public Napi::ObjectWrap{ QWIDGET_WRAPPED_METHODS_DECLARATION }; -#endif \ No newline at end of file diff --git a/src/cpp/QtWidgets/QGridLayout/qgridlayout_wrap.cpp b/src/cpp/QtWidgets/QGridLayout/qgridlayout_wrap.cpp index cd907fac0..8040bbb9d 100644 --- a/src/cpp/QtWidgets/QGridLayout/qgridlayout_wrap.cpp +++ b/src/cpp/QtWidgets/QGridLayout/qgridlayout_wrap.cpp @@ -24,13 +24,9 @@ QGridLayoutWrap::QGridLayoutWrap(const Napi::CallbackInfo& info): Napi::ObjectWr Napi::HandleScope scope(env); if(info.Length() == 1) { - if(info[0].IsObject()){ - Napi::Object object_parent = info[0].As(); - QWidgetWrap* w_parent = Napi::ObjectWrap::Unwrap(object_parent); - this->instance = new QGridLayout(w_parent->getInternalInstance()); //this sets the parent to current widget - }else{ - extrautils::throwTypeError(env, "Wrong type of arguments"); - } + Napi::Object parentObject = info[0].As(); + QWidgetWrap* parentWidgetWrap = Napi::ObjectWrap::Unwrap(parentObject); + this->instance = new QGridLayout(parentWidgetWrap->getInternalInstance()); //this sets the parent to current widget }else if (info.Length() == 0){ this->instance = new QGridLayout(); }else { diff --git a/src/cpp/QtWidgets/QLabel/qlabel_wrap.cpp b/src/cpp/QtWidgets/QLabel/qlabel_wrap.cpp index b6cd589c7..1d4a69c3b 100644 --- a/src/cpp/QtWidgets/QLabel/qlabel_wrap.cpp +++ b/src/cpp/QtWidgets/QLabel/qlabel_wrap.cpp @@ -30,13 +30,9 @@ QLabelWrap::QLabelWrap(const Napi::CallbackInfo& info): Napi::ObjectWrap(); - QWidgetWrap* w_parent = Napi::ObjectWrap::Unwrap(object_parent); - this->instance = new NLabel(w_parent->getInternalInstance()); //this sets the parent to current widget - }else{ - extrautils::throwTypeError(env, "Wrong type of arguments"); - } + Napi::Object parentObject = info[0].As(); + QWidgetWrap* parentWidgetWrap = Napi::ObjectWrap::Unwrap(parentObject); + this->instance = new NLabel(parentWidgetWrap->getInternalInstance()); //this sets the parent to current widget }else if (info.Length() == 0){ this->instance = new NLabel(); }else { diff --git a/src/cpp/QtWidgets/QLineEdit/nlineedit.h b/src/cpp/QtWidgets/QLineEdit/nlineedit.h new file mode 100644 index 000000000..818ca1c5f --- /dev/null +++ b/src/cpp/QtWidgets/QLineEdit/nlineedit.h @@ -0,0 +1,16 @@ +#pragma once + +#include +#include +#include "src/cpp/core/YogaWidget/yogawidget.h" + +class NLineEdit: public QLineEdit, public YogaWidget +{ + +public: + SET_YOGA_WIDGET_Q_PROPERTIES + using QLineEdit::QLineEdit; //inherit all constructors of QLineEdit + Q_OBJECT +}; + + diff --git a/src/cpp/QtWidgets/QLineEdit/nlineedit_moc.cpp b/src/cpp/QtWidgets/QLineEdit/nlineedit_moc.cpp new file mode 100644 index 000000000..9ce57e639 --- /dev/null +++ b/src/cpp/QtWidgets/QLineEdit/nlineedit_moc.cpp @@ -0,0 +1,326 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'nlineedit.h' +** +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.1) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "nlineedit.h" +#include +#include +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'nlineedit.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 67 +#error "This file was generated using the moc from 5.12.1. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED +struct qt_meta_stringdata_NLineEdit_t { + QByteArrayData data[45]; + char stringdata0[487]; +}; +#define QT_MOC_LITERAL(idx, ofs, len) \ + Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ + qptrdiff(offsetof(qt_meta_stringdata_NLineEdit_t, stringdata0) + ofs \ + - idx * sizeof(QByteArrayData)) \ + ) +static const qt_meta_stringdata_NLineEdit_t qt_meta_stringdata_NLineEdit = { + { +QT_MOC_LITERAL(0, 0, 9), // "NLineEdit" +QT_MOC_LITERAL(1, 10, 7), // "display" +QT_MOC_LITERAL(2, 18, 10), // "alignItems" +QT_MOC_LITERAL(3, 29, 12), // "alignContent" +QT_MOC_LITERAL(4, 42, 9), // "alignSelf" +QT_MOC_LITERAL(5, 52, 14), // "justifyContent" +QT_MOC_LITERAL(6, 67, 9), // "direction" +QT_MOC_LITERAL(7, 77, 13), // "flexDirection" +QT_MOC_LITERAL(8, 91, 8), // "overflow" +QT_MOC_LITERAL(9, 100, 8), // "position" +QT_MOC_LITERAL(10, 109, 8), // "flexWrap" +QT_MOC_LITERAL(11, 118, 4), // "flex" +QT_MOC_LITERAL(12, 123, 8), // "flexGrow" +QT_MOC_LITERAL(13, 132, 10), // "flexShrink" +QT_MOC_LITERAL(14, 143, 11), // "aspectRatio" +QT_MOC_LITERAL(15, 155, 3), // "top" +QT_MOC_LITERAL(16, 159, 5), // "right" +QT_MOC_LITERAL(17, 165, 6), // "bottom" +QT_MOC_LITERAL(18, 172, 4), // "left" +QT_MOC_LITERAL(19, 177, 9), // "flexBasis" +QT_MOC_LITERAL(20, 187, 8), // "minWidth" +QT_MOC_LITERAL(21, 196, 9), // "minHeight" +QT_MOC_LITERAL(22, 206, 8), // "maxWidth" +QT_MOC_LITERAL(23, 215, 9), // "maxHeight" +QT_MOC_LITERAL(24, 225, 10), // "paddingTop" +QT_MOC_LITERAL(25, 236, 12), // "paddingRight" +QT_MOC_LITERAL(26, 249, 13), // "paddingBottom" +QT_MOC_LITERAL(27, 263, 11), // "paddingLeft" +QT_MOC_LITERAL(28, 275, 17), // "paddingHorizontal" +QT_MOC_LITERAL(29, 293, 15), // "paddingVertical" +QT_MOC_LITERAL(30, 309, 7), // "padding" +QT_MOC_LITERAL(31, 317, 9), // "marginTop" +QT_MOC_LITERAL(32, 327, 11), // "marginRight" +QT_MOC_LITERAL(33, 339, 12), // "marginBottom" +QT_MOC_LITERAL(34, 352, 10), // "marginLeft" +QT_MOC_LITERAL(35, 363, 16), // "marginHorizontal" +QT_MOC_LITERAL(36, 380, 14), // "marginVertical" +QT_MOC_LITERAL(37, 395, 6), // "margin" +QT_MOC_LITERAL(38, 402, 9), // "borderTop" +QT_MOC_LITERAL(39, 412, 11), // "borderRight" +QT_MOC_LITERAL(40, 424, 12), // "borderBottom" +QT_MOC_LITERAL(41, 437, 10), // "borderLeft" +QT_MOC_LITERAL(42, 448, 16), // "borderHorizontal" +QT_MOC_LITERAL(43, 465, 14), // "borderVertical" +QT_MOC_LITERAL(44, 480, 6) // "border" + + }, + "NLineEdit\0display\0alignItems\0alignContent\0" + "alignSelf\0justifyContent\0direction\0" + "flexDirection\0overflow\0position\0" + "flexWrap\0flex\0flexGrow\0flexShrink\0" + "aspectRatio\0top\0right\0bottom\0left\0" + "flexBasis\0minWidth\0minHeight\0maxWidth\0" + "maxHeight\0paddingTop\0paddingRight\0" + "paddingBottom\0paddingLeft\0paddingHorizontal\0" + "paddingVertical\0padding\0marginTop\0" + "marginRight\0marginBottom\0marginLeft\0" + "marginHorizontal\0marginVertical\0margin\0" + "borderTop\0borderRight\0borderBottom\0" + "borderLeft\0borderHorizontal\0borderVertical\0" + "border" +}; +#undef QT_MOC_LITERAL + +static const uint qt_meta_data_NLineEdit[] = { + + // content: + 8, // revision + 0, // classname + 0, 0, // classinfo + 0, 0, // methods + 44, 14, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // properties: name, type, flags + 1, QMetaType::QString, 0x00095003, + 2, QMetaType::QString, 0x00095003, + 3, QMetaType::QString, 0x00095003, + 4, QMetaType::QString, 0x00095003, + 5, QMetaType::QString, 0x00095003, + 6, QMetaType::QString, 0x00095003, + 7, QMetaType::QString, 0x00095003, + 8, QMetaType::QString, 0x00095003, + 9, QMetaType::QString, 0x00095003, + 10, QMetaType::QString, 0x00095003, + 11, QMetaType::Float, 0x00095003, + 12, QMetaType::Float, 0x00095003, + 13, QMetaType::Float, 0x00095003, + 14, QMetaType::Float, 0x00095003, + 15, QMetaType::QString, 0x00095003, + 16, QMetaType::QString, 0x00095003, + 17, QMetaType::QString, 0x00095003, + 18, QMetaType::QString, 0x00095003, + 19, QMetaType::QString, 0x00095003, + 20, QMetaType::QString, 0x00095003, + 21, QMetaType::QString, 0x00095003, + 22, QMetaType::QString, 0x00095003, + 23, QMetaType::QString, 0x00095003, + 24, QMetaType::QString, 0x00095003, + 25, QMetaType::QString, 0x00095003, + 26, QMetaType::QString, 0x00095003, + 27, QMetaType::QString, 0x00095003, + 28, QMetaType::QString, 0x00095003, + 29, QMetaType::QString, 0x00095003, + 30, QMetaType::QString, 0x00095003, + 31, QMetaType::QString, 0x00095003, + 32, QMetaType::QString, 0x00095003, + 33, QMetaType::QString, 0x00095003, + 34, QMetaType::QString, 0x00095003, + 35, QMetaType::QString, 0x00095003, + 36, QMetaType::QString, 0x00095003, + 37, QMetaType::QString, 0x00095003, + 38, QMetaType::Float, 0x00095003, + 39, QMetaType::Float, 0x00095003, + 40, QMetaType::Float, 0x00095003, + 41, QMetaType::Float, 0x00095003, + 42, QMetaType::Float, 0x00095003, + 43, QMetaType::Float, 0x00095003, + 44, QMetaType::Float, 0x00095003, + + 0 // eod +}; + +void NLineEdit::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + +#ifndef QT_NO_PROPERTIES + if (_c == QMetaObject::ReadProperty) { + auto *_t = static_cast(_o); + Q_UNUSED(_t) + void *_v = _a[0]; + switch (_id) { + case 0: *reinterpret_cast< QString*>(_v) = _t->_yDisplay; break; + case 1: *reinterpret_cast< QString*>(_v) = _t->_yAlignItems; break; + case 2: *reinterpret_cast< QString*>(_v) = _t->_yAlignContent; break; + case 3: *reinterpret_cast< QString*>(_v) = _t->_yAlignSelf; break; + case 4: *reinterpret_cast< QString*>(_v) = _t->_yJustifyContent; break; + case 5: *reinterpret_cast< QString*>(_v) = _t->_yDirection; break; + case 6: *reinterpret_cast< QString*>(_v) = _t->_yFlexDirection; break; + case 7: *reinterpret_cast< QString*>(_v) = _t->_yOverflow; break; + case 8: *reinterpret_cast< QString*>(_v) = _t->_yPosition; break; + case 9: *reinterpret_cast< QString*>(_v) = _t->_yFlexWrap; break; + case 10: *reinterpret_cast< float*>(_v) = _t->_yFlex; break; + case 11: *reinterpret_cast< float*>(_v) = _t->_yFlexGrow; break; + case 12: *reinterpret_cast< float*>(_v) = _t->_yFlexShrink; break; + case 13: *reinterpret_cast< float*>(_v) = _t->_yAspectRatio; break; + case 14: *reinterpret_cast< QString*>(_v) = _t->_yTop; break; + case 15: *reinterpret_cast< QString*>(_v) = _t->_yRight; break; + case 16: *reinterpret_cast< QString*>(_v) = _t->_yBottom; break; + case 17: *reinterpret_cast< QString*>(_v) = _t->_yLeft; break; + case 18: *reinterpret_cast< QString*>(_v) = _t->_yFlexBasis; break; + case 19: *reinterpret_cast< QString*>(_v) = _t->_yMinWidth; break; + case 20: *reinterpret_cast< QString*>(_v) = _t->_yMinHeight; break; + case 21: *reinterpret_cast< QString*>(_v) = _t->_yMaxWidth; break; + case 22: *reinterpret_cast< QString*>(_v) = _t->_yMaxHeight; break; + case 23: *reinterpret_cast< QString*>(_v) = _t->_yPaddingTop; break; + case 24: *reinterpret_cast< QString*>(_v) = _t->_yPaddingRight; break; + case 25: *reinterpret_cast< QString*>(_v) = _t->_yPaddingBottom; break; + case 26: *reinterpret_cast< QString*>(_v) = _t->_yPaddingLeft; break; + case 27: *reinterpret_cast< QString*>(_v) = _t->_yPaddingHorizontal; break; + case 28: *reinterpret_cast< QString*>(_v) = _t->_yPaddingVertical; break; + case 29: *reinterpret_cast< QString*>(_v) = _t->_yPadding; break; + case 30: *reinterpret_cast< QString*>(_v) = _t->_yMarginTop; break; + case 31: *reinterpret_cast< QString*>(_v) = _t->_yMarginRight; break; + case 32: *reinterpret_cast< QString*>(_v) = _t->_yMarginBottom; break; + case 33: *reinterpret_cast< QString*>(_v) = _t->_yMarginLeft; break; + case 34: *reinterpret_cast< QString*>(_v) = _t->_yMarginHorizontal; break; + case 35: *reinterpret_cast< QString*>(_v) = _t->_yMarginVertical; break; + case 36: *reinterpret_cast< QString*>(_v) = _t->_yMargin; break; + case 37: *reinterpret_cast< float*>(_v) = _t->_yBorderTop; break; + case 38: *reinterpret_cast< float*>(_v) = _t->_yBorderRight; break; + case 39: *reinterpret_cast< float*>(_v) = _t->_yBorderBottom; break; + case 40: *reinterpret_cast< float*>(_v) = _t->_yBorderLeft; break; + case 41: *reinterpret_cast< float*>(_v) = _t->_yBorderHorizontal; break; + case 42: *reinterpret_cast< float*>(_v) = _t->_yBorderVertical; break; + case 43: *reinterpret_cast< float*>(_v) = _t->_yBorder; break; + default: break; + } + } else if (_c == QMetaObject::WriteProperty) { + auto *_t = static_cast(_o); + Q_UNUSED(_t) + void *_v = _a[0]; + switch (_id) { + case 0: _t->setYDisplay(*reinterpret_cast< QString*>(_v)); break; + case 1: _t->setYAlignItems(*reinterpret_cast< QString*>(_v)); break; + case 2: _t->setYAlignContent(*reinterpret_cast< QString*>(_v)); break; + case 3: _t->setYAlignSelf(*reinterpret_cast< QString*>(_v)); break; + case 4: _t->setYJustifyContent(*reinterpret_cast< QString*>(_v)); break; + case 5: _t->setYDirection(*reinterpret_cast< QString*>(_v)); break; + case 6: _t->setYFlexDirection(*reinterpret_cast< QString*>(_v)); break; + case 7: _t->setYOverflow(*reinterpret_cast< QString*>(_v)); break; + case 8: _t->setYPosition(*reinterpret_cast< QString*>(_v)); break; + case 9: _t->setYFlexWrap(*reinterpret_cast< QString*>(_v)); break; + case 10: _t->setYFlex(*reinterpret_cast< float*>(_v)); break; + case 11: _t->setYFlexGrow(*reinterpret_cast< float*>(_v)); break; + case 12: _t->setYFlexShrink(*reinterpret_cast< float*>(_v)); break; + case 13: _t->setYAspectRatio(*reinterpret_cast< float*>(_v)); break; + case 14: _t->setYNodeTop(*reinterpret_cast< QString*>(_v)); break; + case 15: _t->setYNodeRight(*reinterpret_cast< QString*>(_v)); break; + case 16: _t->setYNodeBottom(*reinterpret_cast< QString*>(_v)); break; + case 17: _t->setYNodeLeft(*reinterpret_cast< QString*>(_v)); break; + case 18: _t->setYFlexBasis(*reinterpret_cast< QString*>(_v)); break; + case 19: _t->setYMinWidth(*reinterpret_cast< QString*>(_v)); break; + case 20: _t->setYMinHeight(*reinterpret_cast< QString*>(_v)); break; + case 21: _t->setYMaxWidth(*reinterpret_cast< QString*>(_v)); break; + case 22: _t->setYMaxHeight(*reinterpret_cast< QString*>(_v)); break; + case 23: _t->setYPaddingTop(*reinterpret_cast< QString*>(_v)); break; + case 24: _t->setYPaddingRight(*reinterpret_cast< QString*>(_v)); break; + case 25: _t->setYPaddingBottom(*reinterpret_cast< QString*>(_v)); break; + case 26: _t->setYPaddingLeft(*reinterpret_cast< QString*>(_v)); break; + case 27: _t->setYPaddingHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 28: _t->setYPaddingVertical(*reinterpret_cast< QString*>(_v)); break; + case 29: _t->setYPadding(*reinterpret_cast< QString*>(_v)); break; + case 30: _t->setYMarginTop(*reinterpret_cast< QString*>(_v)); break; + case 31: _t->setYMarginRight(*reinterpret_cast< QString*>(_v)); break; + case 32: _t->setYMarginBottom(*reinterpret_cast< QString*>(_v)); break; + case 33: _t->setYMarginLeft(*reinterpret_cast< QString*>(_v)); break; + case 34: _t->setYMarginHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 35: _t->setYMarginVertical(*reinterpret_cast< QString*>(_v)); break; + case 36: _t->setYMarginAll(*reinterpret_cast< QString*>(_v)); break; + case 37: _t->setYBorderTop(*reinterpret_cast< float*>(_v)); break; + case 38: _t->setYBorderRight(*reinterpret_cast< float*>(_v)); break; + case 39: _t->setYBorderBottom(*reinterpret_cast< float*>(_v)); break; + case 40: _t->setYBorderLeft(*reinterpret_cast< float*>(_v)); break; + case 41: _t->setYBorderHorizontal(*reinterpret_cast< float*>(_v)); break; + case 42: _t->setYBorderVertical(*reinterpret_cast< float*>(_v)); break; + case 43: _t->setYBorder(*reinterpret_cast< float*>(_v)); break; + default: break; + } + } else if (_c == QMetaObject::ResetProperty) { + } +#endif // QT_NO_PROPERTIES + Q_UNUSED(_o); + Q_UNUSED(_id); + Q_UNUSED(_c); + Q_UNUSED(_a); +} + +QT_INIT_METAOBJECT const QMetaObject NLineEdit::staticMetaObject = { { + &QLineEdit::staticMetaObject, + qt_meta_stringdata_NLineEdit.data, + qt_meta_data_NLineEdit, + qt_static_metacall, + nullptr, + nullptr +} }; + + +const QMetaObject *NLineEdit::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject; +} + +void *NLineEdit::qt_metacast(const char *_clname) +{ + if (!_clname) return nullptr; + if (!strcmp(_clname, qt_meta_stringdata_NLineEdit.stringdata0)) + return static_cast(this); + if (!strcmp(_clname, "YogaWidget")) + return static_cast< YogaWidget*>(this); + return QLineEdit::qt_metacast(_clname); +} + +int NLineEdit::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QLineEdit::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + +#ifndef QT_NO_PROPERTIES + if (_c == QMetaObject::ReadProperty || _c == QMetaObject::WriteProperty + || _c == QMetaObject::ResetProperty || _c == QMetaObject::RegisterPropertyMetaType) { + qt_static_metacall(this, _c, _id, _a); + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyDesignable) { + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyScriptable) { + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyStored) { + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyEditable) { + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyUser) { + _id -= 44; + } +#endif // QT_NO_PROPERTIES + return _id; +} +QT_WARNING_POP +QT_END_MOC_NAMESPACE diff --git a/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.cpp b/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.cpp index 3c1ea90c2..3beabfc10 100644 --- a/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.cpp +++ b/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.cpp @@ -18,7 +18,7 @@ Napi::Object QLineEditWrap::init(Napi::Env env, Napi::Object exports) { return exports; } -QLineEdit* QLineEditWrap::getInternalInstance() { +NLineEdit* QLineEditWrap::getInternalInstance() { return this->instance; } @@ -27,15 +27,11 @@ QLineEditWrap::QLineEditWrap(const Napi::CallbackInfo& info): Napi::ObjectWrap(); - QWidgetWrap* w_parent = Napi::ObjectWrap::Unwrap(object_parent); - this->instance = new QLineEdit(w_parent->getInternalInstance()); //this sets the parent to current widget - }else{ - extrautils::throwTypeError(env, "Wrong type of arguments"); - } + Napi::Object parentObject = info[0].As(); + QWidgetWrap* parentWidgetWrap = Napi::ObjectWrap::Unwrap(parentObject); + this->instance = new NLineEdit(parentWidgetWrap->getInternalInstance()); //this sets the parent to current widget }else if (info.Length() == 0){ - this->instance = new QLineEdit(); + this->instance = new NLineEdit(); }else { extrautils::throwTypeError(env, "Wrong number of arguments"); } diff --git a/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.h b/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.h index 6a3e8938e..408cbe48c 100644 --- a/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.h +++ b/src/cpp/QtWidgets/QLineEdit/qlineedit_wrap.h @@ -1,17 +1,17 @@ -#ifndef QLINEEDIT_WRAP_H -#define QLINEEDIT_WRAP_H +#pragma once + #include -#include +#include "nlineedit.h" #include "src/cpp/QtGui/QWidget/qwidget_macro.h" class QLineEditWrap : public Napi::ObjectWrap{ private: - QLineEdit* instance; + NLineEdit* instance; public: static Napi::Object init(Napi::Env env, Napi::Object exports); QLineEditWrap(const Napi::CallbackInfo& info); ~QLineEditWrap(); - QLineEdit* getInternalInstance(); + NLineEdit* getInternalInstance(); //class constructor static Napi::FunctionReference constructor; //wrapped methods @@ -19,4 +19,3 @@ class QLineEditWrap : public Napi::ObjectWrap{ QWIDGET_WRAPPED_METHODS_DECLARATION }; -#endif \ No newline at end of file diff --git a/src/cpp/QtWidgets/QMainWindow/nmainwindow.h b/src/cpp/QtWidgets/QMainWindow/nmainwindow.h new file mode 100644 index 000000000..47b46a1d8 --- /dev/null +++ b/src/cpp/QtWidgets/QMainWindow/nmainwindow.h @@ -0,0 +1,16 @@ +#pragma once + +#include +#include +#include "src/cpp/core/YogaWidget/yogawidget.h" + +class NMainWindow: public QMainWindow, public YogaWidget +{ + +public: + SET_YOGA_WIDGET_Q_PROPERTIES + using QMainWindow::QMainWindow; //inherit all constructors of QMainWindow + Q_OBJECT +}; + + diff --git a/src/cpp/QtWidgets/QMainWindow/nmainwindow_moc.cpp b/src/cpp/QtWidgets/QMainWindow/nmainwindow_moc.cpp new file mode 100644 index 000000000..c3f4b4129 --- /dev/null +++ b/src/cpp/QtWidgets/QMainWindow/nmainwindow_moc.cpp @@ -0,0 +1,326 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'nmainwindow.h' +** +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.1) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "nmainwindow.h" +#include +#include +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'nmainwindow.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 67 +#error "This file was generated using the moc from 5.12.1. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED +struct qt_meta_stringdata_NMainWindow_t { + QByteArrayData data[45]; + char stringdata0[489]; +}; +#define QT_MOC_LITERAL(idx, ofs, len) \ + Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ + qptrdiff(offsetof(qt_meta_stringdata_NMainWindow_t, stringdata0) + ofs \ + - idx * sizeof(QByteArrayData)) \ + ) +static const qt_meta_stringdata_NMainWindow_t qt_meta_stringdata_NMainWindow = { + { +QT_MOC_LITERAL(0, 0, 11), // "NMainWindow" +QT_MOC_LITERAL(1, 12, 7), // "display" +QT_MOC_LITERAL(2, 20, 10), // "alignItems" +QT_MOC_LITERAL(3, 31, 12), // "alignContent" +QT_MOC_LITERAL(4, 44, 9), // "alignSelf" +QT_MOC_LITERAL(5, 54, 14), // "justifyContent" +QT_MOC_LITERAL(6, 69, 9), // "direction" +QT_MOC_LITERAL(7, 79, 13), // "flexDirection" +QT_MOC_LITERAL(8, 93, 8), // "overflow" +QT_MOC_LITERAL(9, 102, 8), // "position" +QT_MOC_LITERAL(10, 111, 8), // "flexWrap" +QT_MOC_LITERAL(11, 120, 4), // "flex" +QT_MOC_LITERAL(12, 125, 8), // "flexGrow" +QT_MOC_LITERAL(13, 134, 10), // "flexShrink" +QT_MOC_LITERAL(14, 145, 11), // "aspectRatio" +QT_MOC_LITERAL(15, 157, 3), // "top" +QT_MOC_LITERAL(16, 161, 5), // "right" +QT_MOC_LITERAL(17, 167, 6), // "bottom" +QT_MOC_LITERAL(18, 174, 4), // "left" +QT_MOC_LITERAL(19, 179, 9), // "flexBasis" +QT_MOC_LITERAL(20, 189, 8), // "minWidth" +QT_MOC_LITERAL(21, 198, 9), // "minHeight" +QT_MOC_LITERAL(22, 208, 8), // "maxWidth" +QT_MOC_LITERAL(23, 217, 9), // "maxHeight" +QT_MOC_LITERAL(24, 227, 10), // "paddingTop" +QT_MOC_LITERAL(25, 238, 12), // "paddingRight" +QT_MOC_LITERAL(26, 251, 13), // "paddingBottom" +QT_MOC_LITERAL(27, 265, 11), // "paddingLeft" +QT_MOC_LITERAL(28, 277, 17), // "paddingHorizontal" +QT_MOC_LITERAL(29, 295, 15), // "paddingVertical" +QT_MOC_LITERAL(30, 311, 7), // "padding" +QT_MOC_LITERAL(31, 319, 9), // "marginTop" +QT_MOC_LITERAL(32, 329, 11), // "marginRight" +QT_MOC_LITERAL(33, 341, 12), // "marginBottom" +QT_MOC_LITERAL(34, 354, 10), // "marginLeft" +QT_MOC_LITERAL(35, 365, 16), // "marginHorizontal" +QT_MOC_LITERAL(36, 382, 14), // "marginVertical" +QT_MOC_LITERAL(37, 397, 6), // "margin" +QT_MOC_LITERAL(38, 404, 9), // "borderTop" +QT_MOC_LITERAL(39, 414, 11), // "borderRight" +QT_MOC_LITERAL(40, 426, 12), // "borderBottom" +QT_MOC_LITERAL(41, 439, 10), // "borderLeft" +QT_MOC_LITERAL(42, 450, 16), // "borderHorizontal" +QT_MOC_LITERAL(43, 467, 14), // "borderVertical" +QT_MOC_LITERAL(44, 482, 6) // "border" + + }, + "NMainWindow\0display\0alignItems\0" + "alignContent\0alignSelf\0justifyContent\0" + "direction\0flexDirection\0overflow\0" + "position\0flexWrap\0flex\0flexGrow\0" + "flexShrink\0aspectRatio\0top\0right\0" + "bottom\0left\0flexBasis\0minWidth\0minHeight\0" + "maxWidth\0maxHeight\0paddingTop\0" + "paddingRight\0paddingBottom\0paddingLeft\0" + "paddingHorizontal\0paddingVertical\0" + "padding\0marginTop\0marginRight\0" + "marginBottom\0marginLeft\0marginHorizontal\0" + "marginVertical\0margin\0borderTop\0" + "borderRight\0borderBottom\0borderLeft\0" + "borderHorizontal\0borderVertical\0border" +}; +#undef QT_MOC_LITERAL + +static const uint qt_meta_data_NMainWindow[] = { + + // content: + 8, // revision + 0, // classname + 0, 0, // classinfo + 0, 0, // methods + 44, 14, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // properties: name, type, flags + 1, QMetaType::QString, 0x00095003, + 2, QMetaType::QString, 0x00095003, + 3, QMetaType::QString, 0x00095003, + 4, QMetaType::QString, 0x00095003, + 5, QMetaType::QString, 0x00095003, + 6, QMetaType::QString, 0x00095003, + 7, QMetaType::QString, 0x00095003, + 8, QMetaType::QString, 0x00095003, + 9, QMetaType::QString, 0x00095003, + 10, QMetaType::QString, 0x00095003, + 11, QMetaType::Float, 0x00095003, + 12, QMetaType::Float, 0x00095003, + 13, QMetaType::Float, 0x00095003, + 14, QMetaType::Float, 0x00095003, + 15, QMetaType::QString, 0x00095003, + 16, QMetaType::QString, 0x00095003, + 17, QMetaType::QString, 0x00095003, + 18, QMetaType::QString, 0x00095003, + 19, QMetaType::QString, 0x00095003, + 20, QMetaType::QString, 0x00095003, + 21, QMetaType::QString, 0x00095003, + 22, QMetaType::QString, 0x00095003, + 23, QMetaType::QString, 0x00095003, + 24, QMetaType::QString, 0x00095003, + 25, QMetaType::QString, 0x00095003, + 26, QMetaType::QString, 0x00095003, + 27, QMetaType::QString, 0x00095003, + 28, QMetaType::QString, 0x00095003, + 29, QMetaType::QString, 0x00095003, + 30, QMetaType::QString, 0x00095003, + 31, QMetaType::QString, 0x00095003, + 32, QMetaType::QString, 0x00095003, + 33, QMetaType::QString, 0x00095003, + 34, QMetaType::QString, 0x00095003, + 35, QMetaType::QString, 0x00095003, + 36, QMetaType::QString, 0x00095003, + 37, QMetaType::QString, 0x00095003, + 38, QMetaType::Float, 0x00095003, + 39, QMetaType::Float, 0x00095003, + 40, QMetaType::Float, 0x00095003, + 41, QMetaType::Float, 0x00095003, + 42, QMetaType::Float, 0x00095003, + 43, QMetaType::Float, 0x00095003, + 44, QMetaType::Float, 0x00095003, + + 0 // eod +}; + +void NMainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + +#ifndef QT_NO_PROPERTIES + if (_c == QMetaObject::ReadProperty) { + auto *_t = static_cast(_o); + Q_UNUSED(_t) + void *_v = _a[0]; + switch (_id) { + case 0: *reinterpret_cast< QString*>(_v) = _t->_yDisplay; break; + case 1: *reinterpret_cast< QString*>(_v) = _t->_yAlignItems; break; + case 2: *reinterpret_cast< QString*>(_v) = _t->_yAlignContent; break; + case 3: *reinterpret_cast< QString*>(_v) = _t->_yAlignSelf; break; + case 4: *reinterpret_cast< QString*>(_v) = _t->_yJustifyContent; break; + case 5: *reinterpret_cast< QString*>(_v) = _t->_yDirection; break; + case 6: *reinterpret_cast< QString*>(_v) = _t->_yFlexDirection; break; + case 7: *reinterpret_cast< QString*>(_v) = _t->_yOverflow; break; + case 8: *reinterpret_cast< QString*>(_v) = _t->_yPosition; break; + case 9: *reinterpret_cast< QString*>(_v) = _t->_yFlexWrap; break; + case 10: *reinterpret_cast< float*>(_v) = _t->_yFlex; break; + case 11: *reinterpret_cast< float*>(_v) = _t->_yFlexGrow; break; + case 12: *reinterpret_cast< float*>(_v) = _t->_yFlexShrink; break; + case 13: *reinterpret_cast< float*>(_v) = _t->_yAspectRatio; break; + case 14: *reinterpret_cast< QString*>(_v) = _t->_yTop; break; + case 15: *reinterpret_cast< QString*>(_v) = _t->_yRight; break; + case 16: *reinterpret_cast< QString*>(_v) = _t->_yBottom; break; + case 17: *reinterpret_cast< QString*>(_v) = _t->_yLeft; break; + case 18: *reinterpret_cast< QString*>(_v) = _t->_yFlexBasis; break; + case 19: *reinterpret_cast< QString*>(_v) = _t->_yMinWidth; break; + case 20: *reinterpret_cast< QString*>(_v) = _t->_yMinHeight; break; + case 21: *reinterpret_cast< QString*>(_v) = _t->_yMaxWidth; break; + case 22: *reinterpret_cast< QString*>(_v) = _t->_yMaxHeight; break; + case 23: *reinterpret_cast< QString*>(_v) = _t->_yPaddingTop; break; + case 24: *reinterpret_cast< QString*>(_v) = _t->_yPaddingRight; break; + case 25: *reinterpret_cast< QString*>(_v) = _t->_yPaddingBottom; break; + case 26: *reinterpret_cast< QString*>(_v) = _t->_yPaddingLeft; break; + case 27: *reinterpret_cast< QString*>(_v) = _t->_yPaddingHorizontal; break; + case 28: *reinterpret_cast< QString*>(_v) = _t->_yPaddingVertical; break; + case 29: *reinterpret_cast< QString*>(_v) = _t->_yPadding; break; + case 30: *reinterpret_cast< QString*>(_v) = _t->_yMarginTop; break; + case 31: *reinterpret_cast< QString*>(_v) = _t->_yMarginRight; break; + case 32: *reinterpret_cast< QString*>(_v) = _t->_yMarginBottom; break; + case 33: *reinterpret_cast< QString*>(_v) = _t->_yMarginLeft; break; + case 34: *reinterpret_cast< QString*>(_v) = _t->_yMarginHorizontal; break; + case 35: *reinterpret_cast< QString*>(_v) = _t->_yMarginVertical; break; + case 36: *reinterpret_cast< QString*>(_v) = _t->_yMargin; break; + case 37: *reinterpret_cast< float*>(_v) = _t->_yBorderTop; break; + case 38: *reinterpret_cast< float*>(_v) = _t->_yBorderRight; break; + case 39: *reinterpret_cast< float*>(_v) = _t->_yBorderBottom; break; + case 40: *reinterpret_cast< float*>(_v) = _t->_yBorderLeft; break; + case 41: *reinterpret_cast< float*>(_v) = _t->_yBorderHorizontal; break; + case 42: *reinterpret_cast< float*>(_v) = _t->_yBorderVertical; break; + case 43: *reinterpret_cast< float*>(_v) = _t->_yBorder; break; + default: break; + } + } else if (_c == QMetaObject::WriteProperty) { + auto *_t = static_cast(_o); + Q_UNUSED(_t) + void *_v = _a[0]; + switch (_id) { + case 0: _t->setYDisplay(*reinterpret_cast< QString*>(_v)); break; + case 1: _t->setYAlignItems(*reinterpret_cast< QString*>(_v)); break; + case 2: _t->setYAlignContent(*reinterpret_cast< QString*>(_v)); break; + case 3: _t->setYAlignSelf(*reinterpret_cast< QString*>(_v)); break; + case 4: _t->setYJustifyContent(*reinterpret_cast< QString*>(_v)); break; + case 5: _t->setYDirection(*reinterpret_cast< QString*>(_v)); break; + case 6: _t->setYFlexDirection(*reinterpret_cast< QString*>(_v)); break; + case 7: _t->setYOverflow(*reinterpret_cast< QString*>(_v)); break; + case 8: _t->setYPosition(*reinterpret_cast< QString*>(_v)); break; + case 9: _t->setYFlexWrap(*reinterpret_cast< QString*>(_v)); break; + case 10: _t->setYFlex(*reinterpret_cast< float*>(_v)); break; + case 11: _t->setYFlexGrow(*reinterpret_cast< float*>(_v)); break; + case 12: _t->setYFlexShrink(*reinterpret_cast< float*>(_v)); break; + case 13: _t->setYAspectRatio(*reinterpret_cast< float*>(_v)); break; + case 14: _t->setYNodeTop(*reinterpret_cast< QString*>(_v)); break; + case 15: _t->setYNodeRight(*reinterpret_cast< QString*>(_v)); break; + case 16: _t->setYNodeBottom(*reinterpret_cast< QString*>(_v)); break; + case 17: _t->setYNodeLeft(*reinterpret_cast< QString*>(_v)); break; + case 18: _t->setYFlexBasis(*reinterpret_cast< QString*>(_v)); break; + case 19: _t->setYMinWidth(*reinterpret_cast< QString*>(_v)); break; + case 20: _t->setYMinHeight(*reinterpret_cast< QString*>(_v)); break; + case 21: _t->setYMaxWidth(*reinterpret_cast< QString*>(_v)); break; + case 22: _t->setYMaxHeight(*reinterpret_cast< QString*>(_v)); break; + case 23: _t->setYPaddingTop(*reinterpret_cast< QString*>(_v)); break; + case 24: _t->setYPaddingRight(*reinterpret_cast< QString*>(_v)); break; + case 25: _t->setYPaddingBottom(*reinterpret_cast< QString*>(_v)); break; + case 26: _t->setYPaddingLeft(*reinterpret_cast< QString*>(_v)); break; + case 27: _t->setYPaddingHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 28: _t->setYPaddingVertical(*reinterpret_cast< QString*>(_v)); break; + case 29: _t->setYPadding(*reinterpret_cast< QString*>(_v)); break; + case 30: _t->setYMarginTop(*reinterpret_cast< QString*>(_v)); break; + case 31: _t->setYMarginRight(*reinterpret_cast< QString*>(_v)); break; + case 32: _t->setYMarginBottom(*reinterpret_cast< QString*>(_v)); break; + case 33: _t->setYMarginLeft(*reinterpret_cast< QString*>(_v)); break; + case 34: _t->setYMarginHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 35: _t->setYMarginVertical(*reinterpret_cast< QString*>(_v)); break; + case 36: _t->setYMarginAll(*reinterpret_cast< QString*>(_v)); break; + case 37: _t->setYBorderTop(*reinterpret_cast< float*>(_v)); break; + case 38: _t->setYBorderRight(*reinterpret_cast< float*>(_v)); break; + case 39: _t->setYBorderBottom(*reinterpret_cast< float*>(_v)); break; + case 40: _t->setYBorderLeft(*reinterpret_cast< float*>(_v)); break; + case 41: _t->setYBorderHorizontal(*reinterpret_cast< float*>(_v)); break; + case 42: _t->setYBorderVertical(*reinterpret_cast< float*>(_v)); break; + case 43: _t->setYBorder(*reinterpret_cast< float*>(_v)); break; + default: break; + } + } else if (_c == QMetaObject::ResetProperty) { + } +#endif // QT_NO_PROPERTIES + Q_UNUSED(_o); + Q_UNUSED(_id); + Q_UNUSED(_c); + Q_UNUSED(_a); +} + +QT_INIT_METAOBJECT const QMetaObject NMainWindow::staticMetaObject = { { + &QMainWindow::staticMetaObject, + qt_meta_stringdata_NMainWindow.data, + qt_meta_data_NMainWindow, + qt_static_metacall, + nullptr, + nullptr +} }; + + +const QMetaObject *NMainWindow::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject; +} + +void *NMainWindow::qt_metacast(const char *_clname) +{ + if (!_clname) return nullptr; + if (!strcmp(_clname, qt_meta_stringdata_NMainWindow.stringdata0)) + return static_cast(this); + if (!strcmp(_clname, "YogaWidget")) + return static_cast< YogaWidget*>(this); + return QMainWindow::qt_metacast(_clname); +} + +int NMainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QMainWindow::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + +#ifndef QT_NO_PROPERTIES + if (_c == QMetaObject::ReadProperty || _c == QMetaObject::WriteProperty + || _c == QMetaObject::ResetProperty || _c == QMetaObject::RegisterPropertyMetaType) { + qt_static_metacall(this, _c, _id, _a); + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyDesignable) { + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyScriptable) { + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyStored) { + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyEditable) { + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyUser) { + _id -= 44; + } +#endif // QT_NO_PROPERTIES + return _id; +} +QT_WARNING_POP +QT_END_MOC_NAMESPACE diff --git a/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.cpp b/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.cpp index a45462882..966e7a747 100644 --- a/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.cpp +++ b/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.cpp @@ -16,7 +16,7 @@ Napi::Object QMainWindowWrap::init(Napi::Env env, Napi::Object exports) { return exports; } -QMainWindow* QMainWindowWrap::getInternalInstance() { +NMainWindow* QMainWindowWrap::getInternalInstance() { return this->instance; } @@ -25,15 +25,11 @@ QMainWindowWrap::QMainWindowWrap(const Napi::CallbackInfo& info): Napi::ObjectWr Napi::HandleScope scope(env); if(info.Length() == 1) { - if(info[0].IsObject()){ - Napi::Object object_parent = info[0].As(); - QWidgetWrap* w_parent = Napi::ObjectWrap::Unwrap(object_parent); - this->instance = new QMainWindow(w_parent->getInternalInstance()); //this sets the parent to current widget - }else{ - extrautils::throwTypeError(env, "Wrong type of arguments"); - } + Napi::Object parentObject = info[0].As(); + QWidgetWrap* parentWidgetWrap = Napi::ObjectWrap::Unwrap(parentObject); + this->instance = new NMainWindow(parentWidgetWrap->getInternalInstance()); //this sets the parent to current widget }else if (info.Length() == 0){ - this->instance = new QMainWindow(); + this->instance = new NMainWindow(); }else { extrautils::throwTypeError(env, "Wrong number of arguments"); } diff --git a/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.h b/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.h index fddd6c32d..f8e37cced 100644 --- a/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.h +++ b/src/cpp/QtWidgets/QMainWindow/qmainwindow_wrap.h @@ -1,19 +1,18 @@ -#ifndef QMAINWINDOW_WRAP_H -#define QMAINWINDOW_WRAP_H +#pragma once #include -#include +#include "nmainwindow.h" #include "src/cpp/QtGui/QWidget/qwidget_macro.h" class QMainWindowWrap : public Napi::ObjectWrap{ private: - QMainWindow* instance; + NMainWindow* instance; public: static Napi::Object init(Napi::Env env, Napi::Object exports); QMainWindowWrap(const Napi::CallbackInfo& info); ~QMainWindowWrap(); - QMainWindow* getInternalInstance(); + NMainWindow* getInternalInstance(); //class constructor static Napi::FunctionReference constructor; //wrapped methods @@ -22,4 +21,3 @@ public: QWIDGET_WRAPPED_METHODS_DECLARATION }; -#endif \ No newline at end of file diff --git a/src/cpp/QtWidgets/QProgressBar/nprogressbar.h b/src/cpp/QtWidgets/QProgressBar/nprogressbar.h new file mode 100644 index 000000000..58d44f824 --- /dev/null +++ b/src/cpp/QtWidgets/QProgressBar/nprogressbar.h @@ -0,0 +1,16 @@ +#pragma once + +#include +#include +#include "src/cpp/core/YogaWidget/yogawidget.h" + +class NProgressBar: public QProgressBar, public YogaWidget +{ + +public: + SET_YOGA_WIDGET_Q_PROPERTIES + using QProgressBar::QProgressBar; //inherit all constructors of QProgressBar + Q_OBJECT +}; + + diff --git a/src/cpp/QtWidgets/QProgressBar/nprogressbar_moc.cpp b/src/cpp/QtWidgets/QProgressBar/nprogressbar_moc.cpp new file mode 100644 index 000000000..625f61de3 --- /dev/null +++ b/src/cpp/QtWidgets/QProgressBar/nprogressbar_moc.cpp @@ -0,0 +1,326 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'nprogressbar.h' +** +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.1) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "nprogressbar.h" +#include +#include +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'nprogressbar.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 67 +#error "This file was generated using the moc from 5.12.1. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED +struct qt_meta_stringdata_NProgressBar_t { + QByteArrayData data[45]; + char stringdata0[490]; +}; +#define QT_MOC_LITERAL(idx, ofs, len) \ + Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ + qptrdiff(offsetof(qt_meta_stringdata_NProgressBar_t, stringdata0) + ofs \ + - idx * sizeof(QByteArrayData)) \ + ) +static const qt_meta_stringdata_NProgressBar_t qt_meta_stringdata_NProgressBar = { + { +QT_MOC_LITERAL(0, 0, 12), // "NProgressBar" +QT_MOC_LITERAL(1, 13, 7), // "display" +QT_MOC_LITERAL(2, 21, 10), // "alignItems" +QT_MOC_LITERAL(3, 32, 12), // "alignContent" +QT_MOC_LITERAL(4, 45, 9), // "alignSelf" +QT_MOC_LITERAL(5, 55, 14), // "justifyContent" +QT_MOC_LITERAL(6, 70, 9), // "direction" +QT_MOC_LITERAL(7, 80, 13), // "flexDirection" +QT_MOC_LITERAL(8, 94, 8), // "overflow" +QT_MOC_LITERAL(9, 103, 8), // "position" +QT_MOC_LITERAL(10, 112, 8), // "flexWrap" +QT_MOC_LITERAL(11, 121, 4), // "flex" +QT_MOC_LITERAL(12, 126, 8), // "flexGrow" +QT_MOC_LITERAL(13, 135, 10), // "flexShrink" +QT_MOC_LITERAL(14, 146, 11), // "aspectRatio" +QT_MOC_LITERAL(15, 158, 3), // "top" +QT_MOC_LITERAL(16, 162, 5), // "right" +QT_MOC_LITERAL(17, 168, 6), // "bottom" +QT_MOC_LITERAL(18, 175, 4), // "left" +QT_MOC_LITERAL(19, 180, 9), // "flexBasis" +QT_MOC_LITERAL(20, 190, 8), // "minWidth" +QT_MOC_LITERAL(21, 199, 9), // "minHeight" +QT_MOC_LITERAL(22, 209, 8), // "maxWidth" +QT_MOC_LITERAL(23, 218, 9), // "maxHeight" +QT_MOC_LITERAL(24, 228, 10), // "paddingTop" +QT_MOC_LITERAL(25, 239, 12), // "paddingRight" +QT_MOC_LITERAL(26, 252, 13), // "paddingBottom" +QT_MOC_LITERAL(27, 266, 11), // "paddingLeft" +QT_MOC_LITERAL(28, 278, 17), // "paddingHorizontal" +QT_MOC_LITERAL(29, 296, 15), // "paddingVertical" +QT_MOC_LITERAL(30, 312, 7), // "padding" +QT_MOC_LITERAL(31, 320, 9), // "marginTop" +QT_MOC_LITERAL(32, 330, 11), // "marginRight" +QT_MOC_LITERAL(33, 342, 12), // "marginBottom" +QT_MOC_LITERAL(34, 355, 10), // "marginLeft" +QT_MOC_LITERAL(35, 366, 16), // "marginHorizontal" +QT_MOC_LITERAL(36, 383, 14), // "marginVertical" +QT_MOC_LITERAL(37, 398, 6), // "margin" +QT_MOC_LITERAL(38, 405, 9), // "borderTop" +QT_MOC_LITERAL(39, 415, 11), // "borderRight" +QT_MOC_LITERAL(40, 427, 12), // "borderBottom" +QT_MOC_LITERAL(41, 440, 10), // "borderLeft" +QT_MOC_LITERAL(42, 451, 16), // "borderHorizontal" +QT_MOC_LITERAL(43, 468, 14), // "borderVertical" +QT_MOC_LITERAL(44, 483, 6) // "border" + + }, + "NProgressBar\0display\0alignItems\0" + "alignContent\0alignSelf\0justifyContent\0" + "direction\0flexDirection\0overflow\0" + "position\0flexWrap\0flex\0flexGrow\0" + "flexShrink\0aspectRatio\0top\0right\0" + "bottom\0left\0flexBasis\0minWidth\0minHeight\0" + "maxWidth\0maxHeight\0paddingTop\0" + "paddingRight\0paddingBottom\0paddingLeft\0" + "paddingHorizontal\0paddingVertical\0" + "padding\0marginTop\0marginRight\0" + "marginBottom\0marginLeft\0marginHorizontal\0" + "marginVertical\0margin\0borderTop\0" + "borderRight\0borderBottom\0borderLeft\0" + "borderHorizontal\0borderVertical\0border" +}; +#undef QT_MOC_LITERAL + +static const uint qt_meta_data_NProgressBar[] = { + + // content: + 8, // revision + 0, // classname + 0, 0, // classinfo + 0, 0, // methods + 44, 14, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // properties: name, type, flags + 1, QMetaType::QString, 0x00095003, + 2, QMetaType::QString, 0x00095003, + 3, QMetaType::QString, 0x00095003, + 4, QMetaType::QString, 0x00095003, + 5, QMetaType::QString, 0x00095003, + 6, QMetaType::QString, 0x00095003, + 7, QMetaType::QString, 0x00095003, + 8, QMetaType::QString, 0x00095003, + 9, QMetaType::QString, 0x00095003, + 10, QMetaType::QString, 0x00095003, + 11, QMetaType::Float, 0x00095003, + 12, QMetaType::Float, 0x00095003, + 13, QMetaType::Float, 0x00095003, + 14, QMetaType::Float, 0x00095003, + 15, QMetaType::QString, 0x00095003, + 16, QMetaType::QString, 0x00095003, + 17, QMetaType::QString, 0x00095003, + 18, QMetaType::QString, 0x00095003, + 19, QMetaType::QString, 0x00095003, + 20, QMetaType::QString, 0x00095003, + 21, QMetaType::QString, 0x00095003, + 22, QMetaType::QString, 0x00095003, + 23, QMetaType::QString, 0x00095003, + 24, QMetaType::QString, 0x00095003, + 25, QMetaType::QString, 0x00095003, + 26, QMetaType::QString, 0x00095003, + 27, QMetaType::QString, 0x00095003, + 28, QMetaType::QString, 0x00095003, + 29, QMetaType::QString, 0x00095003, + 30, QMetaType::QString, 0x00095003, + 31, QMetaType::QString, 0x00095003, + 32, QMetaType::QString, 0x00095003, + 33, QMetaType::QString, 0x00095003, + 34, QMetaType::QString, 0x00095003, + 35, QMetaType::QString, 0x00095003, + 36, QMetaType::QString, 0x00095003, + 37, QMetaType::QString, 0x00095003, + 38, QMetaType::Float, 0x00095003, + 39, QMetaType::Float, 0x00095003, + 40, QMetaType::Float, 0x00095003, + 41, QMetaType::Float, 0x00095003, + 42, QMetaType::Float, 0x00095003, + 43, QMetaType::Float, 0x00095003, + 44, QMetaType::Float, 0x00095003, + + 0 // eod +}; + +void NProgressBar::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + +#ifndef QT_NO_PROPERTIES + if (_c == QMetaObject::ReadProperty) { + auto *_t = static_cast(_o); + Q_UNUSED(_t) + void *_v = _a[0]; + switch (_id) { + case 0: *reinterpret_cast< QString*>(_v) = _t->_yDisplay; break; + case 1: *reinterpret_cast< QString*>(_v) = _t->_yAlignItems; break; + case 2: *reinterpret_cast< QString*>(_v) = _t->_yAlignContent; break; + case 3: *reinterpret_cast< QString*>(_v) = _t->_yAlignSelf; break; + case 4: *reinterpret_cast< QString*>(_v) = _t->_yJustifyContent; break; + case 5: *reinterpret_cast< QString*>(_v) = _t->_yDirection; break; + case 6: *reinterpret_cast< QString*>(_v) = _t->_yFlexDirection; break; + case 7: *reinterpret_cast< QString*>(_v) = _t->_yOverflow; break; + case 8: *reinterpret_cast< QString*>(_v) = _t->_yPosition; break; + case 9: *reinterpret_cast< QString*>(_v) = _t->_yFlexWrap; break; + case 10: *reinterpret_cast< float*>(_v) = _t->_yFlex; break; + case 11: *reinterpret_cast< float*>(_v) = _t->_yFlexGrow; break; + case 12: *reinterpret_cast< float*>(_v) = _t->_yFlexShrink; break; + case 13: *reinterpret_cast< float*>(_v) = _t->_yAspectRatio; break; + case 14: *reinterpret_cast< QString*>(_v) = _t->_yTop; break; + case 15: *reinterpret_cast< QString*>(_v) = _t->_yRight; break; + case 16: *reinterpret_cast< QString*>(_v) = _t->_yBottom; break; + case 17: *reinterpret_cast< QString*>(_v) = _t->_yLeft; break; + case 18: *reinterpret_cast< QString*>(_v) = _t->_yFlexBasis; break; + case 19: *reinterpret_cast< QString*>(_v) = _t->_yMinWidth; break; + case 20: *reinterpret_cast< QString*>(_v) = _t->_yMinHeight; break; + case 21: *reinterpret_cast< QString*>(_v) = _t->_yMaxWidth; break; + case 22: *reinterpret_cast< QString*>(_v) = _t->_yMaxHeight; break; + case 23: *reinterpret_cast< QString*>(_v) = _t->_yPaddingTop; break; + case 24: *reinterpret_cast< QString*>(_v) = _t->_yPaddingRight; break; + case 25: *reinterpret_cast< QString*>(_v) = _t->_yPaddingBottom; break; + case 26: *reinterpret_cast< QString*>(_v) = _t->_yPaddingLeft; break; + case 27: *reinterpret_cast< QString*>(_v) = _t->_yPaddingHorizontal; break; + case 28: *reinterpret_cast< QString*>(_v) = _t->_yPaddingVertical; break; + case 29: *reinterpret_cast< QString*>(_v) = _t->_yPadding; break; + case 30: *reinterpret_cast< QString*>(_v) = _t->_yMarginTop; break; + case 31: *reinterpret_cast< QString*>(_v) = _t->_yMarginRight; break; + case 32: *reinterpret_cast< QString*>(_v) = _t->_yMarginBottom; break; + case 33: *reinterpret_cast< QString*>(_v) = _t->_yMarginLeft; break; + case 34: *reinterpret_cast< QString*>(_v) = _t->_yMarginHorizontal; break; + case 35: *reinterpret_cast< QString*>(_v) = _t->_yMarginVertical; break; + case 36: *reinterpret_cast< QString*>(_v) = _t->_yMargin; break; + case 37: *reinterpret_cast< float*>(_v) = _t->_yBorderTop; break; + case 38: *reinterpret_cast< float*>(_v) = _t->_yBorderRight; break; + case 39: *reinterpret_cast< float*>(_v) = _t->_yBorderBottom; break; + case 40: *reinterpret_cast< float*>(_v) = _t->_yBorderLeft; break; + case 41: *reinterpret_cast< float*>(_v) = _t->_yBorderHorizontal; break; + case 42: *reinterpret_cast< float*>(_v) = _t->_yBorderVertical; break; + case 43: *reinterpret_cast< float*>(_v) = _t->_yBorder; break; + default: break; + } + } else if (_c == QMetaObject::WriteProperty) { + auto *_t = static_cast(_o); + Q_UNUSED(_t) + void *_v = _a[0]; + switch (_id) { + case 0: _t->setYDisplay(*reinterpret_cast< QString*>(_v)); break; + case 1: _t->setYAlignItems(*reinterpret_cast< QString*>(_v)); break; + case 2: _t->setYAlignContent(*reinterpret_cast< QString*>(_v)); break; + case 3: _t->setYAlignSelf(*reinterpret_cast< QString*>(_v)); break; + case 4: _t->setYJustifyContent(*reinterpret_cast< QString*>(_v)); break; + case 5: _t->setYDirection(*reinterpret_cast< QString*>(_v)); break; + case 6: _t->setYFlexDirection(*reinterpret_cast< QString*>(_v)); break; + case 7: _t->setYOverflow(*reinterpret_cast< QString*>(_v)); break; + case 8: _t->setYPosition(*reinterpret_cast< QString*>(_v)); break; + case 9: _t->setYFlexWrap(*reinterpret_cast< QString*>(_v)); break; + case 10: _t->setYFlex(*reinterpret_cast< float*>(_v)); break; + case 11: _t->setYFlexGrow(*reinterpret_cast< float*>(_v)); break; + case 12: _t->setYFlexShrink(*reinterpret_cast< float*>(_v)); break; + case 13: _t->setYAspectRatio(*reinterpret_cast< float*>(_v)); break; + case 14: _t->setYNodeTop(*reinterpret_cast< QString*>(_v)); break; + case 15: _t->setYNodeRight(*reinterpret_cast< QString*>(_v)); break; + case 16: _t->setYNodeBottom(*reinterpret_cast< QString*>(_v)); break; + case 17: _t->setYNodeLeft(*reinterpret_cast< QString*>(_v)); break; + case 18: _t->setYFlexBasis(*reinterpret_cast< QString*>(_v)); break; + case 19: _t->setYMinWidth(*reinterpret_cast< QString*>(_v)); break; + case 20: _t->setYMinHeight(*reinterpret_cast< QString*>(_v)); break; + case 21: _t->setYMaxWidth(*reinterpret_cast< QString*>(_v)); break; + case 22: _t->setYMaxHeight(*reinterpret_cast< QString*>(_v)); break; + case 23: _t->setYPaddingTop(*reinterpret_cast< QString*>(_v)); break; + case 24: _t->setYPaddingRight(*reinterpret_cast< QString*>(_v)); break; + case 25: _t->setYPaddingBottom(*reinterpret_cast< QString*>(_v)); break; + case 26: _t->setYPaddingLeft(*reinterpret_cast< QString*>(_v)); break; + case 27: _t->setYPaddingHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 28: _t->setYPaddingVertical(*reinterpret_cast< QString*>(_v)); break; + case 29: _t->setYPadding(*reinterpret_cast< QString*>(_v)); break; + case 30: _t->setYMarginTop(*reinterpret_cast< QString*>(_v)); break; + case 31: _t->setYMarginRight(*reinterpret_cast< QString*>(_v)); break; + case 32: _t->setYMarginBottom(*reinterpret_cast< QString*>(_v)); break; + case 33: _t->setYMarginLeft(*reinterpret_cast< QString*>(_v)); break; + case 34: _t->setYMarginHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 35: _t->setYMarginVertical(*reinterpret_cast< QString*>(_v)); break; + case 36: _t->setYMarginAll(*reinterpret_cast< QString*>(_v)); break; + case 37: _t->setYBorderTop(*reinterpret_cast< float*>(_v)); break; + case 38: _t->setYBorderRight(*reinterpret_cast< float*>(_v)); break; + case 39: _t->setYBorderBottom(*reinterpret_cast< float*>(_v)); break; + case 40: _t->setYBorderLeft(*reinterpret_cast< float*>(_v)); break; + case 41: _t->setYBorderHorizontal(*reinterpret_cast< float*>(_v)); break; + case 42: _t->setYBorderVertical(*reinterpret_cast< float*>(_v)); break; + case 43: _t->setYBorder(*reinterpret_cast< float*>(_v)); break; + default: break; + } + } else if (_c == QMetaObject::ResetProperty) { + } +#endif // QT_NO_PROPERTIES + Q_UNUSED(_o); + Q_UNUSED(_id); + Q_UNUSED(_c); + Q_UNUSED(_a); +} + +QT_INIT_METAOBJECT const QMetaObject NProgressBar::staticMetaObject = { { + &QProgressBar::staticMetaObject, + qt_meta_stringdata_NProgressBar.data, + qt_meta_data_NProgressBar, + qt_static_metacall, + nullptr, + nullptr +} }; + + +const QMetaObject *NProgressBar::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject; +} + +void *NProgressBar::qt_metacast(const char *_clname) +{ + if (!_clname) return nullptr; + if (!strcmp(_clname, qt_meta_stringdata_NProgressBar.stringdata0)) + return static_cast(this); + if (!strcmp(_clname, "YogaWidget")) + return static_cast< YogaWidget*>(this); + return QProgressBar::qt_metacast(_clname); +} + +int NProgressBar::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QProgressBar::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + +#ifndef QT_NO_PROPERTIES + if (_c == QMetaObject::ReadProperty || _c == QMetaObject::WriteProperty + || _c == QMetaObject::ResetProperty || _c == QMetaObject::RegisterPropertyMetaType) { + qt_static_metacall(this, _c, _id, _a); + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyDesignable) { + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyScriptable) { + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyStored) { + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyEditable) { + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyUser) { + _id -= 44; + } +#endif // QT_NO_PROPERTIES + return _id; +} +QT_WARNING_POP +QT_END_MOC_NAMESPACE diff --git a/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp b/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp index 7aa29644c..3f7b51085 100644 --- a/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp +++ b/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.cpp @@ -18,7 +18,7 @@ Napi::Object QProgressBarWrap::init(Napi::Env env, Napi::Object exports) { return exports; } -QProgressBar* QProgressBarWrap::getInternalInstance() { +NProgressBar* QProgressBarWrap::getInternalInstance() { return this->instance; } @@ -27,15 +27,11 @@ QProgressBarWrap::QProgressBarWrap(const Napi::CallbackInfo& info): Napi::Object Napi::HandleScope scope(env); if(info.Length() == 1) { - if(info[0].IsObject()){ - Napi::Object object_parent = info[0].As(); - QWidgetWrap* w_parent = Napi::ObjectWrap::Unwrap(object_parent); - this->instance = new QProgressBar(w_parent->getInternalInstance()); //this sets the parent to current widget - }else{ - extrautils::throwTypeError(env, "Wrong type of arguments"); - } + Napi::Object parentObject = info[0].As(); + QWidgetWrap* parentWidgetWrap = Napi::ObjectWrap::Unwrap(parentObject); + this->instance = new NProgressBar(parentWidgetWrap->getInternalInstance()); //this sets the parent to current widget }else if (info.Length() == 0){ - this->instance = new QProgressBar(); + this->instance = new NProgressBar(); }else { extrautils::throwTypeError(env, "Wrong number of arguments"); } diff --git a/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.h b/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.h index dd92235c4..8fb6f02f9 100644 --- a/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.h +++ b/src/cpp/QtWidgets/QProgressBar/qprogressbar_wrap.h @@ -1,17 +1,17 @@ -#ifndef QPROGRESSBAR_WRAP_H -#define QPROGRESSBAR_WRAP_H +#pragma once + #include -#include +#include "nprogressbar.h" #include "src/cpp/QtGui/QWidget/qwidget_macro.h" class QProgressBarWrap : public Napi::ObjectWrap{ private: - QProgressBar* instance; + NProgressBar* instance; public: static Napi::Object init(Napi::Env env, Napi::Object exports); QProgressBarWrap(const Napi::CallbackInfo& info); ~QProgressBarWrap(); - QProgressBar* getInternalInstance(); + NProgressBar* getInternalInstance(); //class constructor static Napi::FunctionReference constructor; //wrapped methods @@ -19,4 +19,4 @@ class QProgressBarWrap : public Napi::ObjectWrap{ QWIDGET_WRAPPED_METHODS_DECLARATION }; -#endif \ No newline at end of file + diff --git a/src/cpp/QtWidgets/QPushButton/npushbutton.h b/src/cpp/QtWidgets/QPushButton/npushbutton.h new file mode 100644 index 000000000..97da5cf21 --- /dev/null +++ b/src/cpp/QtWidgets/QPushButton/npushbutton.h @@ -0,0 +1,16 @@ +#pragma once + +#include +#include +#include "src/cpp/core/YogaWidget/yogawidget.h" + +class NPushButton: public QPushButton, public YogaWidget +{ + +public: + SET_YOGA_WIDGET_Q_PROPERTIES + using QPushButton::QPushButton; //inherit all constructors of QPushButton + Q_OBJECT +}; + + diff --git a/src/cpp/QtWidgets/QPushButton/npushbutton_moc.cpp b/src/cpp/QtWidgets/QPushButton/npushbutton_moc.cpp new file mode 100644 index 000000000..c979cb52b --- /dev/null +++ b/src/cpp/QtWidgets/QPushButton/npushbutton_moc.cpp @@ -0,0 +1,326 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'npushbutton.h' +** +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.1) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "npushbutton.h" +#include +#include +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'npushbutton.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 67 +#error "This file was generated using the moc from 5.12.1. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED +struct qt_meta_stringdata_NPushButton_t { + QByteArrayData data[45]; + char stringdata0[489]; +}; +#define QT_MOC_LITERAL(idx, ofs, len) \ + Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ + qptrdiff(offsetof(qt_meta_stringdata_NPushButton_t, stringdata0) + ofs \ + - idx * sizeof(QByteArrayData)) \ + ) +static const qt_meta_stringdata_NPushButton_t qt_meta_stringdata_NPushButton = { + { +QT_MOC_LITERAL(0, 0, 11), // "NPushButton" +QT_MOC_LITERAL(1, 12, 7), // "display" +QT_MOC_LITERAL(2, 20, 10), // "alignItems" +QT_MOC_LITERAL(3, 31, 12), // "alignContent" +QT_MOC_LITERAL(4, 44, 9), // "alignSelf" +QT_MOC_LITERAL(5, 54, 14), // "justifyContent" +QT_MOC_LITERAL(6, 69, 9), // "direction" +QT_MOC_LITERAL(7, 79, 13), // "flexDirection" +QT_MOC_LITERAL(8, 93, 8), // "overflow" +QT_MOC_LITERAL(9, 102, 8), // "position" +QT_MOC_LITERAL(10, 111, 8), // "flexWrap" +QT_MOC_LITERAL(11, 120, 4), // "flex" +QT_MOC_LITERAL(12, 125, 8), // "flexGrow" +QT_MOC_LITERAL(13, 134, 10), // "flexShrink" +QT_MOC_LITERAL(14, 145, 11), // "aspectRatio" +QT_MOC_LITERAL(15, 157, 3), // "top" +QT_MOC_LITERAL(16, 161, 5), // "right" +QT_MOC_LITERAL(17, 167, 6), // "bottom" +QT_MOC_LITERAL(18, 174, 4), // "left" +QT_MOC_LITERAL(19, 179, 9), // "flexBasis" +QT_MOC_LITERAL(20, 189, 8), // "minWidth" +QT_MOC_LITERAL(21, 198, 9), // "minHeight" +QT_MOC_LITERAL(22, 208, 8), // "maxWidth" +QT_MOC_LITERAL(23, 217, 9), // "maxHeight" +QT_MOC_LITERAL(24, 227, 10), // "paddingTop" +QT_MOC_LITERAL(25, 238, 12), // "paddingRight" +QT_MOC_LITERAL(26, 251, 13), // "paddingBottom" +QT_MOC_LITERAL(27, 265, 11), // "paddingLeft" +QT_MOC_LITERAL(28, 277, 17), // "paddingHorizontal" +QT_MOC_LITERAL(29, 295, 15), // "paddingVertical" +QT_MOC_LITERAL(30, 311, 7), // "padding" +QT_MOC_LITERAL(31, 319, 9), // "marginTop" +QT_MOC_LITERAL(32, 329, 11), // "marginRight" +QT_MOC_LITERAL(33, 341, 12), // "marginBottom" +QT_MOC_LITERAL(34, 354, 10), // "marginLeft" +QT_MOC_LITERAL(35, 365, 16), // "marginHorizontal" +QT_MOC_LITERAL(36, 382, 14), // "marginVertical" +QT_MOC_LITERAL(37, 397, 6), // "margin" +QT_MOC_LITERAL(38, 404, 9), // "borderTop" +QT_MOC_LITERAL(39, 414, 11), // "borderRight" +QT_MOC_LITERAL(40, 426, 12), // "borderBottom" +QT_MOC_LITERAL(41, 439, 10), // "borderLeft" +QT_MOC_LITERAL(42, 450, 16), // "borderHorizontal" +QT_MOC_LITERAL(43, 467, 14), // "borderVertical" +QT_MOC_LITERAL(44, 482, 6) // "border" + + }, + "NPushButton\0display\0alignItems\0" + "alignContent\0alignSelf\0justifyContent\0" + "direction\0flexDirection\0overflow\0" + "position\0flexWrap\0flex\0flexGrow\0" + "flexShrink\0aspectRatio\0top\0right\0" + "bottom\0left\0flexBasis\0minWidth\0minHeight\0" + "maxWidth\0maxHeight\0paddingTop\0" + "paddingRight\0paddingBottom\0paddingLeft\0" + "paddingHorizontal\0paddingVertical\0" + "padding\0marginTop\0marginRight\0" + "marginBottom\0marginLeft\0marginHorizontal\0" + "marginVertical\0margin\0borderTop\0" + "borderRight\0borderBottom\0borderLeft\0" + "borderHorizontal\0borderVertical\0border" +}; +#undef QT_MOC_LITERAL + +static const uint qt_meta_data_NPushButton[] = { + + // content: + 8, // revision + 0, // classname + 0, 0, // classinfo + 0, 0, // methods + 44, 14, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // properties: name, type, flags + 1, QMetaType::QString, 0x00095003, + 2, QMetaType::QString, 0x00095003, + 3, QMetaType::QString, 0x00095003, + 4, QMetaType::QString, 0x00095003, + 5, QMetaType::QString, 0x00095003, + 6, QMetaType::QString, 0x00095003, + 7, QMetaType::QString, 0x00095003, + 8, QMetaType::QString, 0x00095003, + 9, QMetaType::QString, 0x00095003, + 10, QMetaType::QString, 0x00095003, + 11, QMetaType::Float, 0x00095003, + 12, QMetaType::Float, 0x00095003, + 13, QMetaType::Float, 0x00095003, + 14, QMetaType::Float, 0x00095003, + 15, QMetaType::QString, 0x00095003, + 16, QMetaType::QString, 0x00095003, + 17, QMetaType::QString, 0x00095003, + 18, QMetaType::QString, 0x00095003, + 19, QMetaType::QString, 0x00095003, + 20, QMetaType::QString, 0x00095003, + 21, QMetaType::QString, 0x00095003, + 22, QMetaType::QString, 0x00095003, + 23, QMetaType::QString, 0x00095003, + 24, QMetaType::QString, 0x00095003, + 25, QMetaType::QString, 0x00095003, + 26, QMetaType::QString, 0x00095003, + 27, QMetaType::QString, 0x00095003, + 28, QMetaType::QString, 0x00095003, + 29, QMetaType::QString, 0x00095003, + 30, QMetaType::QString, 0x00095003, + 31, QMetaType::QString, 0x00095003, + 32, QMetaType::QString, 0x00095003, + 33, QMetaType::QString, 0x00095003, + 34, QMetaType::QString, 0x00095003, + 35, QMetaType::QString, 0x00095003, + 36, QMetaType::QString, 0x00095003, + 37, QMetaType::QString, 0x00095003, + 38, QMetaType::Float, 0x00095003, + 39, QMetaType::Float, 0x00095003, + 40, QMetaType::Float, 0x00095003, + 41, QMetaType::Float, 0x00095003, + 42, QMetaType::Float, 0x00095003, + 43, QMetaType::Float, 0x00095003, + 44, QMetaType::Float, 0x00095003, + + 0 // eod +}; + +void NPushButton::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + +#ifndef QT_NO_PROPERTIES + if (_c == QMetaObject::ReadProperty) { + auto *_t = static_cast(_o); + Q_UNUSED(_t) + void *_v = _a[0]; + switch (_id) { + case 0: *reinterpret_cast< QString*>(_v) = _t->_yDisplay; break; + case 1: *reinterpret_cast< QString*>(_v) = _t->_yAlignItems; break; + case 2: *reinterpret_cast< QString*>(_v) = _t->_yAlignContent; break; + case 3: *reinterpret_cast< QString*>(_v) = _t->_yAlignSelf; break; + case 4: *reinterpret_cast< QString*>(_v) = _t->_yJustifyContent; break; + case 5: *reinterpret_cast< QString*>(_v) = _t->_yDirection; break; + case 6: *reinterpret_cast< QString*>(_v) = _t->_yFlexDirection; break; + case 7: *reinterpret_cast< QString*>(_v) = _t->_yOverflow; break; + case 8: *reinterpret_cast< QString*>(_v) = _t->_yPosition; break; + case 9: *reinterpret_cast< QString*>(_v) = _t->_yFlexWrap; break; + case 10: *reinterpret_cast< float*>(_v) = _t->_yFlex; break; + case 11: *reinterpret_cast< float*>(_v) = _t->_yFlexGrow; break; + case 12: *reinterpret_cast< float*>(_v) = _t->_yFlexShrink; break; + case 13: *reinterpret_cast< float*>(_v) = _t->_yAspectRatio; break; + case 14: *reinterpret_cast< QString*>(_v) = _t->_yTop; break; + case 15: *reinterpret_cast< QString*>(_v) = _t->_yRight; break; + case 16: *reinterpret_cast< QString*>(_v) = _t->_yBottom; break; + case 17: *reinterpret_cast< QString*>(_v) = _t->_yLeft; break; + case 18: *reinterpret_cast< QString*>(_v) = _t->_yFlexBasis; break; + case 19: *reinterpret_cast< QString*>(_v) = _t->_yMinWidth; break; + case 20: *reinterpret_cast< QString*>(_v) = _t->_yMinHeight; break; + case 21: *reinterpret_cast< QString*>(_v) = _t->_yMaxWidth; break; + case 22: *reinterpret_cast< QString*>(_v) = _t->_yMaxHeight; break; + case 23: *reinterpret_cast< QString*>(_v) = _t->_yPaddingTop; break; + case 24: *reinterpret_cast< QString*>(_v) = _t->_yPaddingRight; break; + case 25: *reinterpret_cast< QString*>(_v) = _t->_yPaddingBottom; break; + case 26: *reinterpret_cast< QString*>(_v) = _t->_yPaddingLeft; break; + case 27: *reinterpret_cast< QString*>(_v) = _t->_yPaddingHorizontal; break; + case 28: *reinterpret_cast< QString*>(_v) = _t->_yPaddingVertical; break; + case 29: *reinterpret_cast< QString*>(_v) = _t->_yPadding; break; + case 30: *reinterpret_cast< QString*>(_v) = _t->_yMarginTop; break; + case 31: *reinterpret_cast< QString*>(_v) = _t->_yMarginRight; break; + case 32: *reinterpret_cast< QString*>(_v) = _t->_yMarginBottom; break; + case 33: *reinterpret_cast< QString*>(_v) = _t->_yMarginLeft; break; + case 34: *reinterpret_cast< QString*>(_v) = _t->_yMarginHorizontal; break; + case 35: *reinterpret_cast< QString*>(_v) = _t->_yMarginVertical; break; + case 36: *reinterpret_cast< QString*>(_v) = _t->_yMargin; break; + case 37: *reinterpret_cast< float*>(_v) = _t->_yBorderTop; break; + case 38: *reinterpret_cast< float*>(_v) = _t->_yBorderRight; break; + case 39: *reinterpret_cast< float*>(_v) = _t->_yBorderBottom; break; + case 40: *reinterpret_cast< float*>(_v) = _t->_yBorderLeft; break; + case 41: *reinterpret_cast< float*>(_v) = _t->_yBorderHorizontal; break; + case 42: *reinterpret_cast< float*>(_v) = _t->_yBorderVertical; break; + case 43: *reinterpret_cast< float*>(_v) = _t->_yBorder; break; + default: break; + } + } else if (_c == QMetaObject::WriteProperty) { + auto *_t = static_cast(_o); + Q_UNUSED(_t) + void *_v = _a[0]; + switch (_id) { + case 0: _t->setYDisplay(*reinterpret_cast< QString*>(_v)); break; + case 1: _t->setYAlignItems(*reinterpret_cast< QString*>(_v)); break; + case 2: _t->setYAlignContent(*reinterpret_cast< QString*>(_v)); break; + case 3: _t->setYAlignSelf(*reinterpret_cast< QString*>(_v)); break; + case 4: _t->setYJustifyContent(*reinterpret_cast< QString*>(_v)); break; + case 5: _t->setYDirection(*reinterpret_cast< QString*>(_v)); break; + case 6: _t->setYFlexDirection(*reinterpret_cast< QString*>(_v)); break; + case 7: _t->setYOverflow(*reinterpret_cast< QString*>(_v)); break; + case 8: _t->setYPosition(*reinterpret_cast< QString*>(_v)); break; + case 9: _t->setYFlexWrap(*reinterpret_cast< QString*>(_v)); break; + case 10: _t->setYFlex(*reinterpret_cast< float*>(_v)); break; + case 11: _t->setYFlexGrow(*reinterpret_cast< float*>(_v)); break; + case 12: _t->setYFlexShrink(*reinterpret_cast< float*>(_v)); break; + case 13: _t->setYAspectRatio(*reinterpret_cast< float*>(_v)); break; + case 14: _t->setYNodeTop(*reinterpret_cast< QString*>(_v)); break; + case 15: _t->setYNodeRight(*reinterpret_cast< QString*>(_v)); break; + case 16: _t->setYNodeBottom(*reinterpret_cast< QString*>(_v)); break; + case 17: _t->setYNodeLeft(*reinterpret_cast< QString*>(_v)); break; + case 18: _t->setYFlexBasis(*reinterpret_cast< QString*>(_v)); break; + case 19: _t->setYMinWidth(*reinterpret_cast< QString*>(_v)); break; + case 20: _t->setYMinHeight(*reinterpret_cast< QString*>(_v)); break; + case 21: _t->setYMaxWidth(*reinterpret_cast< QString*>(_v)); break; + case 22: _t->setYMaxHeight(*reinterpret_cast< QString*>(_v)); break; + case 23: _t->setYPaddingTop(*reinterpret_cast< QString*>(_v)); break; + case 24: _t->setYPaddingRight(*reinterpret_cast< QString*>(_v)); break; + case 25: _t->setYPaddingBottom(*reinterpret_cast< QString*>(_v)); break; + case 26: _t->setYPaddingLeft(*reinterpret_cast< QString*>(_v)); break; + case 27: _t->setYPaddingHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 28: _t->setYPaddingVertical(*reinterpret_cast< QString*>(_v)); break; + case 29: _t->setYPadding(*reinterpret_cast< QString*>(_v)); break; + case 30: _t->setYMarginTop(*reinterpret_cast< QString*>(_v)); break; + case 31: _t->setYMarginRight(*reinterpret_cast< QString*>(_v)); break; + case 32: _t->setYMarginBottom(*reinterpret_cast< QString*>(_v)); break; + case 33: _t->setYMarginLeft(*reinterpret_cast< QString*>(_v)); break; + case 34: _t->setYMarginHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 35: _t->setYMarginVertical(*reinterpret_cast< QString*>(_v)); break; + case 36: _t->setYMarginAll(*reinterpret_cast< QString*>(_v)); break; + case 37: _t->setYBorderTop(*reinterpret_cast< float*>(_v)); break; + case 38: _t->setYBorderRight(*reinterpret_cast< float*>(_v)); break; + case 39: _t->setYBorderBottom(*reinterpret_cast< float*>(_v)); break; + case 40: _t->setYBorderLeft(*reinterpret_cast< float*>(_v)); break; + case 41: _t->setYBorderHorizontal(*reinterpret_cast< float*>(_v)); break; + case 42: _t->setYBorderVertical(*reinterpret_cast< float*>(_v)); break; + case 43: _t->setYBorder(*reinterpret_cast< float*>(_v)); break; + default: break; + } + } else if (_c == QMetaObject::ResetProperty) { + } +#endif // QT_NO_PROPERTIES + Q_UNUSED(_o); + Q_UNUSED(_id); + Q_UNUSED(_c); + Q_UNUSED(_a); +} + +QT_INIT_METAOBJECT const QMetaObject NPushButton::staticMetaObject = { { + &QPushButton::staticMetaObject, + qt_meta_stringdata_NPushButton.data, + qt_meta_data_NPushButton, + qt_static_metacall, + nullptr, + nullptr +} }; + + +const QMetaObject *NPushButton::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject; +} + +void *NPushButton::qt_metacast(const char *_clname) +{ + if (!_clname) return nullptr; + if (!strcmp(_clname, qt_meta_stringdata_NPushButton.stringdata0)) + return static_cast(this); + if (!strcmp(_clname, "YogaWidget")) + return static_cast< YogaWidget*>(this); + return QPushButton::qt_metacast(_clname); +} + +int NPushButton::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QPushButton::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + +#ifndef QT_NO_PROPERTIES + if (_c == QMetaObject::ReadProperty || _c == QMetaObject::WriteProperty + || _c == QMetaObject::ResetProperty || _c == QMetaObject::RegisterPropertyMetaType) { + qt_static_metacall(this, _c, _id, _a); + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyDesignable) { + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyScriptable) { + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyStored) { + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyEditable) { + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyUser) { + _id -= 44; + } +#endif // QT_NO_PROPERTIES + return _id; +} +QT_WARNING_POP +QT_END_MOC_NAMESPACE diff --git a/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.cpp b/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.cpp index dba85dd8e..6871a4cd5 100644 --- a/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.cpp +++ b/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.cpp @@ -16,7 +16,7 @@ Napi::Object QPushButtonWrap::init(Napi::Env env, Napi::Object exports) { return exports; } -QPushButton* QPushButtonWrap::getInternalInstance() { +NPushButton* QPushButtonWrap::getInternalInstance() { return this->instance; } @@ -25,15 +25,11 @@ QPushButtonWrap::QPushButtonWrap(const Napi::CallbackInfo& info): Napi::ObjectWr Napi::HandleScope scope(env); if(info.Length() == 1) { - if(info[0].IsObject()){ - Napi::Object object_parent = info[0].As(); - QWidgetWrap* parent = Napi::ObjectWrap::Unwrap(object_parent); - this->instance = new QPushButton(parent->getInternalInstance()); //this sets the parent to current widget - }else{ - extrautils::throwTypeError(env, "Wrong type of arguments"); - } + Napi::Object parentObject = info[0].As(); + QWidgetWrap* parentWidgetWrap = Napi::ObjectWrap::Unwrap(parentObject); + this->instance = new NPushButton(parentWidgetWrap->getInternalInstance()); //this sets the parent to current widget }else if (info.Length() == 0){ - this->instance = new QPushButton(); + this->instance = new NPushButton(); }else { extrautils::throwTypeError(env, "Wrong number of arguments"); } diff --git a/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.h b/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.h index d026eb1f8..041acd8cc 100644 --- a/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.h +++ b/src/cpp/QtWidgets/QPushButton/qpushbutton_wrap.h @@ -1,17 +1,17 @@ -#ifndef QPUSHBUTTON_WRAP_H -#define QPUSHBUTTON_WRAP_H +#pragma once + #include -#include +#include "npushbutton.h" #include "src/cpp/QtGui/QWidget/qwidget_macro.h" class QPushButtonWrap : public Napi::ObjectWrap { private: - QPushButton* instance; + NPushButton* instance; public: static Napi::Object init(Napi::Env env, Napi::Object exports); QPushButtonWrap(const Napi::CallbackInfo& info); ~QPushButtonWrap(); - QPushButton* getInternalInstance(); + NPushButton* getInternalInstance(); //class constructor static Napi::FunctionReference constructor; //wrapped methods @@ -20,4 +20,4 @@ class QPushButtonWrap : public Napi::ObjectWrap { QWIDGET_WRAPPED_METHODS_DECLARATION }; -#endif + diff --git a/src/cpp/QtWidgets/QRadioButton/nradiobutton.h b/src/cpp/QtWidgets/QRadioButton/nradiobutton.h new file mode 100644 index 000000000..396c5abaa --- /dev/null +++ b/src/cpp/QtWidgets/QRadioButton/nradiobutton.h @@ -0,0 +1,16 @@ +#pragma once + +#include +#include +#include "src/cpp/core/YogaWidget/yogawidget.h" + +class NRadioButton: public QRadioButton, public YogaWidget +{ + +public: + SET_YOGA_WIDGET_Q_PROPERTIES + using QRadioButton::QRadioButton; //inherit all constructors of QRadioButton + Q_OBJECT +}; + + diff --git a/src/cpp/QtWidgets/QRadioButton/nradiobutton_moc.cpp b/src/cpp/QtWidgets/QRadioButton/nradiobutton_moc.cpp new file mode 100644 index 000000000..396019d74 --- /dev/null +++ b/src/cpp/QtWidgets/QRadioButton/nradiobutton_moc.cpp @@ -0,0 +1,326 @@ +/**************************************************************************** +** Meta object code from reading C++ file 'nradiobutton.h' +** +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.1) +** +** WARNING! All changes made in this file will be lost! +*****************************************************************************/ + +#include "nradiobutton.h" +#include +#include +#if !defined(Q_MOC_OUTPUT_REVISION) +#error "The header file 'nradiobutton.h' doesn't include ." +#elif Q_MOC_OUTPUT_REVISION != 67 +#error "This file was generated using the moc from 5.12.1. It" +#error "cannot be used with the include files from this version of Qt." +#error "(The moc has changed too much.)" +#endif + +QT_BEGIN_MOC_NAMESPACE +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED +struct qt_meta_stringdata_NRadioButton_t { + QByteArrayData data[45]; + char stringdata0[490]; +}; +#define QT_MOC_LITERAL(idx, ofs, len) \ + Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ + qptrdiff(offsetof(qt_meta_stringdata_NRadioButton_t, stringdata0) + ofs \ + - idx * sizeof(QByteArrayData)) \ + ) +static const qt_meta_stringdata_NRadioButton_t qt_meta_stringdata_NRadioButton = { + { +QT_MOC_LITERAL(0, 0, 12), // "NRadioButton" +QT_MOC_LITERAL(1, 13, 7), // "display" +QT_MOC_LITERAL(2, 21, 10), // "alignItems" +QT_MOC_LITERAL(3, 32, 12), // "alignContent" +QT_MOC_LITERAL(4, 45, 9), // "alignSelf" +QT_MOC_LITERAL(5, 55, 14), // "justifyContent" +QT_MOC_LITERAL(6, 70, 9), // "direction" +QT_MOC_LITERAL(7, 80, 13), // "flexDirection" +QT_MOC_LITERAL(8, 94, 8), // "overflow" +QT_MOC_LITERAL(9, 103, 8), // "position" +QT_MOC_LITERAL(10, 112, 8), // "flexWrap" +QT_MOC_LITERAL(11, 121, 4), // "flex" +QT_MOC_LITERAL(12, 126, 8), // "flexGrow" +QT_MOC_LITERAL(13, 135, 10), // "flexShrink" +QT_MOC_LITERAL(14, 146, 11), // "aspectRatio" +QT_MOC_LITERAL(15, 158, 3), // "top" +QT_MOC_LITERAL(16, 162, 5), // "right" +QT_MOC_LITERAL(17, 168, 6), // "bottom" +QT_MOC_LITERAL(18, 175, 4), // "left" +QT_MOC_LITERAL(19, 180, 9), // "flexBasis" +QT_MOC_LITERAL(20, 190, 8), // "minWidth" +QT_MOC_LITERAL(21, 199, 9), // "minHeight" +QT_MOC_LITERAL(22, 209, 8), // "maxWidth" +QT_MOC_LITERAL(23, 218, 9), // "maxHeight" +QT_MOC_LITERAL(24, 228, 10), // "paddingTop" +QT_MOC_LITERAL(25, 239, 12), // "paddingRight" +QT_MOC_LITERAL(26, 252, 13), // "paddingBottom" +QT_MOC_LITERAL(27, 266, 11), // "paddingLeft" +QT_MOC_LITERAL(28, 278, 17), // "paddingHorizontal" +QT_MOC_LITERAL(29, 296, 15), // "paddingVertical" +QT_MOC_LITERAL(30, 312, 7), // "padding" +QT_MOC_LITERAL(31, 320, 9), // "marginTop" +QT_MOC_LITERAL(32, 330, 11), // "marginRight" +QT_MOC_LITERAL(33, 342, 12), // "marginBottom" +QT_MOC_LITERAL(34, 355, 10), // "marginLeft" +QT_MOC_LITERAL(35, 366, 16), // "marginHorizontal" +QT_MOC_LITERAL(36, 383, 14), // "marginVertical" +QT_MOC_LITERAL(37, 398, 6), // "margin" +QT_MOC_LITERAL(38, 405, 9), // "borderTop" +QT_MOC_LITERAL(39, 415, 11), // "borderRight" +QT_MOC_LITERAL(40, 427, 12), // "borderBottom" +QT_MOC_LITERAL(41, 440, 10), // "borderLeft" +QT_MOC_LITERAL(42, 451, 16), // "borderHorizontal" +QT_MOC_LITERAL(43, 468, 14), // "borderVertical" +QT_MOC_LITERAL(44, 483, 6) // "border" + + }, + "NRadioButton\0display\0alignItems\0" + "alignContent\0alignSelf\0justifyContent\0" + "direction\0flexDirection\0overflow\0" + "position\0flexWrap\0flex\0flexGrow\0" + "flexShrink\0aspectRatio\0top\0right\0" + "bottom\0left\0flexBasis\0minWidth\0minHeight\0" + "maxWidth\0maxHeight\0paddingTop\0" + "paddingRight\0paddingBottom\0paddingLeft\0" + "paddingHorizontal\0paddingVertical\0" + "padding\0marginTop\0marginRight\0" + "marginBottom\0marginLeft\0marginHorizontal\0" + "marginVertical\0margin\0borderTop\0" + "borderRight\0borderBottom\0borderLeft\0" + "borderHorizontal\0borderVertical\0border" +}; +#undef QT_MOC_LITERAL + +static const uint qt_meta_data_NRadioButton[] = { + + // content: + 8, // revision + 0, // classname + 0, 0, // classinfo + 0, 0, // methods + 44, 14, // properties + 0, 0, // enums/sets + 0, 0, // constructors + 0, // flags + 0, // signalCount + + // properties: name, type, flags + 1, QMetaType::QString, 0x00095003, + 2, QMetaType::QString, 0x00095003, + 3, QMetaType::QString, 0x00095003, + 4, QMetaType::QString, 0x00095003, + 5, QMetaType::QString, 0x00095003, + 6, QMetaType::QString, 0x00095003, + 7, QMetaType::QString, 0x00095003, + 8, QMetaType::QString, 0x00095003, + 9, QMetaType::QString, 0x00095003, + 10, QMetaType::QString, 0x00095003, + 11, QMetaType::Float, 0x00095003, + 12, QMetaType::Float, 0x00095003, + 13, QMetaType::Float, 0x00095003, + 14, QMetaType::Float, 0x00095003, + 15, QMetaType::QString, 0x00095003, + 16, QMetaType::QString, 0x00095003, + 17, QMetaType::QString, 0x00095003, + 18, QMetaType::QString, 0x00095003, + 19, QMetaType::QString, 0x00095003, + 20, QMetaType::QString, 0x00095003, + 21, QMetaType::QString, 0x00095003, + 22, QMetaType::QString, 0x00095003, + 23, QMetaType::QString, 0x00095003, + 24, QMetaType::QString, 0x00095003, + 25, QMetaType::QString, 0x00095003, + 26, QMetaType::QString, 0x00095003, + 27, QMetaType::QString, 0x00095003, + 28, QMetaType::QString, 0x00095003, + 29, QMetaType::QString, 0x00095003, + 30, QMetaType::QString, 0x00095003, + 31, QMetaType::QString, 0x00095003, + 32, QMetaType::QString, 0x00095003, + 33, QMetaType::QString, 0x00095003, + 34, QMetaType::QString, 0x00095003, + 35, QMetaType::QString, 0x00095003, + 36, QMetaType::QString, 0x00095003, + 37, QMetaType::QString, 0x00095003, + 38, QMetaType::Float, 0x00095003, + 39, QMetaType::Float, 0x00095003, + 40, QMetaType::Float, 0x00095003, + 41, QMetaType::Float, 0x00095003, + 42, QMetaType::Float, 0x00095003, + 43, QMetaType::Float, 0x00095003, + 44, QMetaType::Float, 0x00095003, + + 0 // eod +}; + +void NRadioButton::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) +{ + +#ifndef QT_NO_PROPERTIES + if (_c == QMetaObject::ReadProperty) { + auto *_t = static_cast(_o); + Q_UNUSED(_t) + void *_v = _a[0]; + switch (_id) { + case 0: *reinterpret_cast< QString*>(_v) = _t->_yDisplay; break; + case 1: *reinterpret_cast< QString*>(_v) = _t->_yAlignItems; break; + case 2: *reinterpret_cast< QString*>(_v) = _t->_yAlignContent; break; + case 3: *reinterpret_cast< QString*>(_v) = _t->_yAlignSelf; break; + case 4: *reinterpret_cast< QString*>(_v) = _t->_yJustifyContent; break; + case 5: *reinterpret_cast< QString*>(_v) = _t->_yDirection; break; + case 6: *reinterpret_cast< QString*>(_v) = _t->_yFlexDirection; break; + case 7: *reinterpret_cast< QString*>(_v) = _t->_yOverflow; break; + case 8: *reinterpret_cast< QString*>(_v) = _t->_yPosition; break; + case 9: *reinterpret_cast< QString*>(_v) = _t->_yFlexWrap; break; + case 10: *reinterpret_cast< float*>(_v) = _t->_yFlex; break; + case 11: *reinterpret_cast< float*>(_v) = _t->_yFlexGrow; break; + case 12: *reinterpret_cast< float*>(_v) = _t->_yFlexShrink; break; + case 13: *reinterpret_cast< float*>(_v) = _t->_yAspectRatio; break; + case 14: *reinterpret_cast< QString*>(_v) = _t->_yTop; break; + case 15: *reinterpret_cast< QString*>(_v) = _t->_yRight; break; + case 16: *reinterpret_cast< QString*>(_v) = _t->_yBottom; break; + case 17: *reinterpret_cast< QString*>(_v) = _t->_yLeft; break; + case 18: *reinterpret_cast< QString*>(_v) = _t->_yFlexBasis; break; + case 19: *reinterpret_cast< QString*>(_v) = _t->_yMinWidth; break; + case 20: *reinterpret_cast< QString*>(_v) = _t->_yMinHeight; break; + case 21: *reinterpret_cast< QString*>(_v) = _t->_yMaxWidth; break; + case 22: *reinterpret_cast< QString*>(_v) = _t->_yMaxHeight; break; + case 23: *reinterpret_cast< QString*>(_v) = _t->_yPaddingTop; break; + case 24: *reinterpret_cast< QString*>(_v) = _t->_yPaddingRight; break; + case 25: *reinterpret_cast< QString*>(_v) = _t->_yPaddingBottom; break; + case 26: *reinterpret_cast< QString*>(_v) = _t->_yPaddingLeft; break; + case 27: *reinterpret_cast< QString*>(_v) = _t->_yPaddingHorizontal; break; + case 28: *reinterpret_cast< QString*>(_v) = _t->_yPaddingVertical; break; + case 29: *reinterpret_cast< QString*>(_v) = _t->_yPadding; break; + case 30: *reinterpret_cast< QString*>(_v) = _t->_yMarginTop; break; + case 31: *reinterpret_cast< QString*>(_v) = _t->_yMarginRight; break; + case 32: *reinterpret_cast< QString*>(_v) = _t->_yMarginBottom; break; + case 33: *reinterpret_cast< QString*>(_v) = _t->_yMarginLeft; break; + case 34: *reinterpret_cast< QString*>(_v) = _t->_yMarginHorizontal; break; + case 35: *reinterpret_cast< QString*>(_v) = _t->_yMarginVertical; break; + case 36: *reinterpret_cast< QString*>(_v) = _t->_yMargin; break; + case 37: *reinterpret_cast< float*>(_v) = _t->_yBorderTop; break; + case 38: *reinterpret_cast< float*>(_v) = _t->_yBorderRight; break; + case 39: *reinterpret_cast< float*>(_v) = _t->_yBorderBottom; break; + case 40: *reinterpret_cast< float*>(_v) = _t->_yBorderLeft; break; + case 41: *reinterpret_cast< float*>(_v) = _t->_yBorderHorizontal; break; + case 42: *reinterpret_cast< float*>(_v) = _t->_yBorderVertical; break; + case 43: *reinterpret_cast< float*>(_v) = _t->_yBorder; break; + default: break; + } + } else if (_c == QMetaObject::WriteProperty) { + auto *_t = static_cast(_o); + Q_UNUSED(_t) + void *_v = _a[0]; + switch (_id) { + case 0: _t->setYDisplay(*reinterpret_cast< QString*>(_v)); break; + case 1: _t->setYAlignItems(*reinterpret_cast< QString*>(_v)); break; + case 2: _t->setYAlignContent(*reinterpret_cast< QString*>(_v)); break; + case 3: _t->setYAlignSelf(*reinterpret_cast< QString*>(_v)); break; + case 4: _t->setYJustifyContent(*reinterpret_cast< QString*>(_v)); break; + case 5: _t->setYDirection(*reinterpret_cast< QString*>(_v)); break; + case 6: _t->setYFlexDirection(*reinterpret_cast< QString*>(_v)); break; + case 7: _t->setYOverflow(*reinterpret_cast< QString*>(_v)); break; + case 8: _t->setYPosition(*reinterpret_cast< QString*>(_v)); break; + case 9: _t->setYFlexWrap(*reinterpret_cast< QString*>(_v)); break; + case 10: _t->setYFlex(*reinterpret_cast< float*>(_v)); break; + case 11: _t->setYFlexGrow(*reinterpret_cast< float*>(_v)); break; + case 12: _t->setYFlexShrink(*reinterpret_cast< float*>(_v)); break; + case 13: _t->setYAspectRatio(*reinterpret_cast< float*>(_v)); break; + case 14: _t->setYNodeTop(*reinterpret_cast< QString*>(_v)); break; + case 15: _t->setYNodeRight(*reinterpret_cast< QString*>(_v)); break; + case 16: _t->setYNodeBottom(*reinterpret_cast< QString*>(_v)); break; + case 17: _t->setYNodeLeft(*reinterpret_cast< QString*>(_v)); break; + case 18: _t->setYFlexBasis(*reinterpret_cast< QString*>(_v)); break; + case 19: _t->setYMinWidth(*reinterpret_cast< QString*>(_v)); break; + case 20: _t->setYMinHeight(*reinterpret_cast< QString*>(_v)); break; + case 21: _t->setYMaxWidth(*reinterpret_cast< QString*>(_v)); break; + case 22: _t->setYMaxHeight(*reinterpret_cast< QString*>(_v)); break; + case 23: _t->setYPaddingTop(*reinterpret_cast< QString*>(_v)); break; + case 24: _t->setYPaddingRight(*reinterpret_cast< QString*>(_v)); break; + case 25: _t->setYPaddingBottom(*reinterpret_cast< QString*>(_v)); break; + case 26: _t->setYPaddingLeft(*reinterpret_cast< QString*>(_v)); break; + case 27: _t->setYPaddingHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 28: _t->setYPaddingVertical(*reinterpret_cast< QString*>(_v)); break; + case 29: _t->setYPadding(*reinterpret_cast< QString*>(_v)); break; + case 30: _t->setYMarginTop(*reinterpret_cast< QString*>(_v)); break; + case 31: _t->setYMarginRight(*reinterpret_cast< QString*>(_v)); break; + case 32: _t->setYMarginBottom(*reinterpret_cast< QString*>(_v)); break; + case 33: _t->setYMarginLeft(*reinterpret_cast< QString*>(_v)); break; + case 34: _t->setYMarginHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 35: _t->setYMarginVertical(*reinterpret_cast< QString*>(_v)); break; + case 36: _t->setYMarginAll(*reinterpret_cast< QString*>(_v)); break; + case 37: _t->setYBorderTop(*reinterpret_cast< float*>(_v)); break; + case 38: _t->setYBorderRight(*reinterpret_cast< float*>(_v)); break; + case 39: _t->setYBorderBottom(*reinterpret_cast< float*>(_v)); break; + case 40: _t->setYBorderLeft(*reinterpret_cast< float*>(_v)); break; + case 41: _t->setYBorderHorizontal(*reinterpret_cast< float*>(_v)); break; + case 42: _t->setYBorderVertical(*reinterpret_cast< float*>(_v)); break; + case 43: _t->setYBorder(*reinterpret_cast< float*>(_v)); break; + default: break; + } + } else if (_c == QMetaObject::ResetProperty) { + } +#endif // QT_NO_PROPERTIES + Q_UNUSED(_o); + Q_UNUSED(_id); + Q_UNUSED(_c); + Q_UNUSED(_a); +} + +QT_INIT_METAOBJECT const QMetaObject NRadioButton::staticMetaObject = { { + &QRadioButton::staticMetaObject, + qt_meta_stringdata_NRadioButton.data, + qt_meta_data_NRadioButton, + qt_static_metacall, + nullptr, + nullptr +} }; + + +const QMetaObject *NRadioButton::metaObject() const +{ + return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject; +} + +void *NRadioButton::qt_metacast(const char *_clname) +{ + if (!_clname) return nullptr; + if (!strcmp(_clname, qt_meta_stringdata_NRadioButton.stringdata0)) + return static_cast(this); + if (!strcmp(_clname, "YogaWidget")) + return static_cast< YogaWidget*>(this); + return QRadioButton::qt_metacast(_clname); +} + +int NRadioButton::qt_metacall(QMetaObject::Call _c, int _id, void **_a) +{ + _id = QRadioButton::qt_metacall(_c, _id, _a); + if (_id < 0) + return _id; + +#ifndef QT_NO_PROPERTIES + if (_c == QMetaObject::ReadProperty || _c == QMetaObject::WriteProperty + || _c == QMetaObject::ResetProperty || _c == QMetaObject::RegisterPropertyMetaType) { + qt_static_metacall(this, _c, _id, _a); + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyDesignable) { + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyScriptable) { + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyStored) { + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyEditable) { + _id -= 44; + } else if (_c == QMetaObject::QueryPropertyUser) { + _id -= 44; + } +#endif // QT_NO_PROPERTIES + return _id; +} +QT_WARNING_POP +QT_END_MOC_NAMESPACE diff --git a/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.cpp b/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.cpp index 78b7d162c..0baf63c83 100644 --- a/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.cpp +++ b/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.cpp @@ -18,7 +18,7 @@ Napi::Object QRadioButtonWrap::init(Napi::Env env, Napi::Object exports) { return exports; } -QRadioButton* QRadioButtonWrap::getInternalInstance() { +NRadioButton* QRadioButtonWrap::getInternalInstance() { return this->instance; } @@ -27,15 +27,11 @@ QRadioButtonWrap::QRadioButtonWrap(const Napi::CallbackInfo& info): Napi::Object Napi::HandleScope scope(env); if(info.Length() == 1) { - if(info[0].IsObject()){ - Napi::Object object_parent = info[0].As(); - QWidgetWrap* w_parent = Napi::ObjectWrap::Unwrap(object_parent); - this->instance = new QRadioButton(w_parent->getInternalInstance()); //this sets the parent to current widget - }else{ - extrautils::throwTypeError(env, "Wrong type of arguments"); - } + Napi::Object parentObject = info[0].As(); + QWidgetWrap* parentWidgetWrap = Napi::ObjectWrap::Unwrap(parentObject); + this->instance = new NRadioButton(parentWidgetWrap->getInternalInstance()); //this sets the parent to current widget }else if (info.Length() == 0){ - this->instance = new QRadioButton(); + this->instance = new NRadioButton(); }else { extrautils::throwTypeError(env, "Wrong number of arguments"); } diff --git a/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.h b/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.h index 4725a3ca4..e9414a9fd 100644 --- a/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.h +++ b/src/cpp/QtWidgets/QRadioButton/qradiobutton_wrap.h @@ -1,17 +1,17 @@ -#ifndef QRADIOBUTTON_WRAP_H -#define QRADIOBUTTON_WRAP_H +#pragma once + #include -#include +#include "nradiobutton.h" #include "src/cpp/QtGui/QWidget/qwidget_macro.h" class QRadioButtonWrap : public Napi::ObjectWrap{ private: - QRadioButton* instance; + NRadioButton* instance; public: static Napi::Object init(Napi::Env env, Napi::Object exports); QRadioButtonWrap(const Napi::CallbackInfo& info); ~QRadioButtonWrap(); - QRadioButton* getInternalInstance(); + NRadioButton* getInternalInstance(); //class constructor static Napi::FunctionReference constructor; //wrapped methods @@ -19,4 +19,4 @@ class QRadioButtonWrap : public Napi::ObjectWrap{ QWIDGET_WRAPPED_METHODS_DECLARATION }; -#endif \ No newline at end of file + \ No newline at end of file diff --git a/src/cpp/core/FlexLayout/flexlayout_wrap.cpp b/src/cpp/core/FlexLayout/flexlayout_wrap.cpp index 4b1b33146..c969ba97e 100644 --- a/src/cpp/core/FlexLayout/flexlayout_wrap.cpp +++ b/src/cpp/core/FlexLayout/flexlayout_wrap.cpp @@ -27,13 +27,13 @@ FlexLayoutWrap::FlexLayoutWrap(const Napi::CallbackInfo& info): Napi::ObjectWrap Napi::HandleScope scope(env); if(info.Length() == 2) { - Napi::Object object_parent = info[0].As(); - QWidgetWrap* w_parent = Napi::ObjectWrap::Unwrap(object_parent); - this->instance = new FlexLayout(w_parent->getInternalInstance()); + Napi::Object parentObject = info[0].As(); + QWidgetWrap* parentWidgetWrap = Napi::ObjectWrap::Unwrap(parentObject); + this->instance = new FlexLayout(parentWidgetWrap->getInternalInstance()); } else if(info.Length() == 1) { - Napi::Object object_parent = info[0].As(); - QWidgetWrap* w_parent = Napi::ObjectWrap::Unwrap(object_parent); - this->instance = new FlexLayout(w_parent->getInternalInstance()); //this sets the parent to current widget + Napi::Object parentObject = info[0].As(); + QWidgetWrap* parentWidgetWrap = Napi::ObjectWrap::Unwrap(parentObject); + this->instance = new FlexLayout(parentWidgetWrap->getInternalInstance()); //this sets the parent to current widget }else if (info.Length() == 0){ this->instance = new FlexLayout(); }else {