From a3112f5b48f63b81cef564a8ac721fff5cd49bd2 Mon Sep 17 00:00:00 2001 From: master-atul Date: Wed, 24 Jul 2019 23:47:02 +0200 Subject: [PATCH] Fixes yogalayout in windows and code cleanup --- src/cpp/QtWidgets/QMainWindow/nmainwindow.h | 1 + src/cpp/autogen/ncheckbox_moc.cpp | 191 ++++++++++---------- src/cpp/autogen/nlabel_moc.cpp | 191 ++++++++++---------- src/cpp/autogen/nlineedit_moc.cpp | 191 ++++++++++---------- src/cpp/autogen/nmainwindow_moc.cpp | 190 ++++++++++--------- src/cpp/autogen/nprogressbar_moc.cpp | 190 ++++++++++--------- src/cpp/autogen/npushbutton_moc.cpp | 190 ++++++++++--------- src/cpp/autogen/nradiobutton_moc.cpp | 190 ++++++++++--------- src/cpp/autogen/nwidget_moc.cpp | 191 ++++++++++---------- src/cpp/core/FlexLayout/flexitem.cpp | 2 +- src/cpp/core/FlexLayout/flexlayout_wrap.cpp | 10 +- src/cpp/core/YogaWidget/yogawidget.cpp | 24 +++ src/cpp/core/YogaWidget/yogawidget.h | 6 + 13 files changed, 835 insertions(+), 732 deletions(-) diff --git a/src/cpp/QtWidgets/QMainWindow/nmainwindow.h b/src/cpp/QtWidgets/QMainWindow/nmainwindow.h index dc57de4c3..cc0ea7a36 100644 --- a/src/cpp/QtWidgets/QMainWindow/nmainwindow.h +++ b/src/cpp/QtWidgets/QMainWindow/nmainwindow.h @@ -26,6 +26,7 @@ private: } void resizeEvent(QResizeEvent * event){ calculateLayout(); + QWidget::resizeEvent(event); } }; diff --git a/src/cpp/autogen/ncheckbox_moc.cpp b/src/cpp/autogen/ncheckbox_moc.cpp index 185164613..165e841e1 100644 --- a/src/cpp/autogen/ncheckbox_moc.cpp +++ b/src/cpp/autogen/ncheckbox_moc.cpp @@ -1,18 +1,19 @@ /**************************************************************************** ** Meta object code from reading C++ file 'ncheckbox.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.1) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.13.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ +#include #include "../QtWidgets/QCheckBox/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 "This file was generated using the moc from 5.13.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -21,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_NCheckBox_t { - QByteArrayData data[45]; - char stringdata0[487]; + QByteArrayData data[47]; + char stringdata0[502]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -53,29 +54,31 @@ 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" +QT_MOC_LITERAL(22, 206, 6), // "qWidth" +QT_MOC_LITERAL(23, 213, 7), // "qHeight" +QT_MOC_LITERAL(24, 221, 8), // "maxWidth" +QT_MOC_LITERAL(25, 230, 9), // "maxHeight" +QT_MOC_LITERAL(26, 240, 10), // "paddingTop" +QT_MOC_LITERAL(27, 251, 12), // "paddingRight" +QT_MOC_LITERAL(28, 264, 13), // "paddingBottom" +QT_MOC_LITERAL(29, 278, 11), // "paddingLeft" +QT_MOC_LITERAL(30, 290, 17), // "paddingHorizontal" +QT_MOC_LITERAL(31, 308, 15), // "paddingVertical" +QT_MOC_LITERAL(32, 324, 7), // "padding" +QT_MOC_LITERAL(33, 332, 9), // "marginTop" +QT_MOC_LITERAL(34, 342, 11), // "marginRight" +QT_MOC_LITERAL(35, 354, 12), // "marginBottom" +QT_MOC_LITERAL(36, 367, 10), // "marginLeft" +QT_MOC_LITERAL(37, 378, 16), // "marginHorizontal" +QT_MOC_LITERAL(38, 395, 14), // "marginVertical" +QT_MOC_LITERAL(39, 410, 6), // "margin" +QT_MOC_LITERAL(40, 417, 9), // "borderTop" +QT_MOC_LITERAL(41, 427, 11), // "borderRight" +QT_MOC_LITERAL(42, 439, 12), // "borderBottom" +QT_MOC_LITERAL(43, 452, 10), // "borderLeft" +QT_MOC_LITERAL(44, 463, 16), // "borderHorizontal" +QT_MOC_LITERAL(45, 480, 14), // "borderVertical" +QT_MOC_LITERAL(46, 495, 6) // "border" }, "NCheckBox\0display\0alignItems\0alignContent\0" @@ -83,15 +86,15 @@ QT_MOC_LITERAL(44, 480, 6) // "border" "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" + "flexBasis\0minWidth\0minHeight\0qWidth\0" + "qHeight\0maxWidth\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 @@ -102,7 +105,7 @@ static const uint qt_meta_data_NCheckBox[] = { 0, // classname 0, 0, // classinfo 0, 0, // methods - 44, 14, // properties + 46, 14, // properties 0, 0, // enums/sets 0, 0, // constructors 0, // flags @@ -146,13 +149,15 @@ static const uint qt_meta_data_NCheckBox[] = { 35, QMetaType::QString, 0x00095003, 36, QMetaType::QString, 0x00095003, 37, QMetaType::QString, 0x00095003, - 38, QMetaType::Float, 0x00095003, - 39, QMetaType::Float, 0x00095003, + 38, QMetaType::QString, 0x00095003, + 39, QMetaType::QString, 0x00095003, 40, QMetaType::Float, 0x00095003, 41, QMetaType::Float, 0x00095003, 42, QMetaType::Float, 0x00095003, 43, QMetaType::Float, 0x00095003, 44, QMetaType::Float, 0x00095003, + 45, QMetaType::Float, 0x00095003, + 46, QMetaType::Float, 0x00095003, 0 // eod }; @@ -187,29 +192,31 @@ void NCheckBox::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, v 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; + case 21: *reinterpret_cast< QString*>(_v) = _t->_yWidth; break; + case 22: *reinterpret_cast< QString*>(_v) = _t->_yHeight; break; + case 23: *reinterpret_cast< QString*>(_v) = _t->_yMaxWidth; break; + case 24: *reinterpret_cast< QString*>(_v) = _t->_yMaxHeight; break; + case 25: *reinterpret_cast< QString*>(_v) = _t->_yPaddingTop; break; + case 26: *reinterpret_cast< QString*>(_v) = _t->_yPaddingRight; break; + case 27: *reinterpret_cast< QString*>(_v) = _t->_yPaddingBottom; break; + case 28: *reinterpret_cast< QString*>(_v) = _t->_yPaddingLeft; break; + case 29: *reinterpret_cast< QString*>(_v) = _t->_yPaddingHorizontal; break; + case 30: *reinterpret_cast< QString*>(_v) = _t->_yPaddingVertical; break; + case 31: *reinterpret_cast< QString*>(_v) = _t->_yPadding; break; + case 32: *reinterpret_cast< QString*>(_v) = _t->_yMarginTop; break; + case 33: *reinterpret_cast< QString*>(_v) = _t->_yMarginRight; break; + case 34: *reinterpret_cast< QString*>(_v) = _t->_yMarginBottom; break; + case 35: *reinterpret_cast< QString*>(_v) = _t->_yMarginLeft; break; + case 36: *reinterpret_cast< QString*>(_v) = _t->_yMarginHorizontal; break; + case 37: *reinterpret_cast< QString*>(_v) = _t->_yMarginVertical; break; + case 38: *reinterpret_cast< QString*>(_v) = _t->_yMargin; break; + case 39: *reinterpret_cast< float*>(_v) = _t->_yBorderTop; break; + case 40: *reinterpret_cast< float*>(_v) = _t->_yBorderRight; break; + case 41: *reinterpret_cast< float*>(_v) = _t->_yBorderBottom; break; + case 42: *reinterpret_cast< float*>(_v) = _t->_yBorderLeft; break; + case 43: *reinterpret_cast< float*>(_v) = _t->_yBorderHorizontal; break; + case 44: *reinterpret_cast< float*>(_v) = _t->_yBorderVertical; break; + case 45: *reinterpret_cast< float*>(_v) = _t->_yBorder; break; default: break; } } else if (_c == QMetaObject::WriteProperty) { @@ -238,29 +245,31 @@ void NCheckBox::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, v 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; + case 21: _t->setYWidth(*reinterpret_cast< QString*>(_v)); break; + case 22: _t->setYHeight(*reinterpret_cast< QString*>(_v)); break; + case 23: _t->setYMaxWidth(*reinterpret_cast< QString*>(_v)); break; + case 24: _t->setYMaxHeight(*reinterpret_cast< QString*>(_v)); break; + case 25: _t->setYPaddingTop(*reinterpret_cast< QString*>(_v)); break; + case 26: _t->setYPaddingRight(*reinterpret_cast< QString*>(_v)); break; + case 27: _t->setYPaddingBottom(*reinterpret_cast< QString*>(_v)); break; + case 28: _t->setYPaddingLeft(*reinterpret_cast< QString*>(_v)); break; + case 29: _t->setYPaddingHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 30: _t->setYPaddingVertical(*reinterpret_cast< QString*>(_v)); break; + case 31: _t->setYPadding(*reinterpret_cast< QString*>(_v)); break; + case 32: _t->setYMarginTop(*reinterpret_cast< QString*>(_v)); break; + case 33: _t->setYMarginRight(*reinterpret_cast< QString*>(_v)); break; + case 34: _t->setYMarginBottom(*reinterpret_cast< QString*>(_v)); break; + case 35: _t->setYMarginLeft(*reinterpret_cast< QString*>(_v)); break; + case 36: _t->setYMarginHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 37: _t->setYMarginVertical(*reinterpret_cast< QString*>(_v)); break; + case 38: _t->setYMarginAll(*reinterpret_cast< QString*>(_v)); break; + case 39: _t->setYBorderTop(*reinterpret_cast< float*>(_v)); break; + case 40: _t->setYBorderRight(*reinterpret_cast< float*>(_v)); break; + case 41: _t->setYBorderBottom(*reinterpret_cast< float*>(_v)); break; + case 42: _t->setYBorderLeft(*reinterpret_cast< float*>(_v)); break; + case 43: _t->setYBorderHorizontal(*reinterpret_cast< float*>(_v)); break; + case 44: _t->setYBorderVertical(*reinterpret_cast< float*>(_v)); break; + case 45: _t->setYBorder(*reinterpret_cast< float*>(_v)); break; default: break; } } else if (_c == QMetaObject::ResetProperty) { @@ -307,17 +316,17 @@ int NCheckBox::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_c == QMetaObject::ReadProperty || _c == QMetaObject::WriteProperty || _c == QMetaObject::ResetProperty || _c == QMetaObject::RegisterPropertyMetaType) { qt_static_metacall(this, _c, _id, _a); - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyDesignable) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyScriptable) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyStored) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyEditable) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyUser) { - _id -= 44; + _id -= 46; } #endif // QT_NO_PROPERTIES return _id; diff --git a/src/cpp/autogen/nlabel_moc.cpp b/src/cpp/autogen/nlabel_moc.cpp index 9e5179448..f290086a1 100644 --- a/src/cpp/autogen/nlabel_moc.cpp +++ b/src/cpp/autogen/nlabel_moc.cpp @@ -1,18 +1,19 @@ /**************************************************************************** ** Meta object code from reading C++ file 'nlabel.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.1) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.13.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ +#include #include "../QtWidgets/QLabel/nlabel.h" #include #include #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'nlabel.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.1. It" +#error "This file was generated using the moc from 5.13.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -21,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_NLabel_t { - QByteArrayData data[45]; - char stringdata0[484]; + QByteArrayData data[47]; + char stringdata0[499]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -53,29 +54,31 @@ QT_MOC_LITERAL(18, 169, 4), // "left" QT_MOC_LITERAL(19, 174, 9), // "flexBasis" QT_MOC_LITERAL(20, 184, 8), // "minWidth" QT_MOC_LITERAL(21, 193, 9), // "minHeight" -QT_MOC_LITERAL(22, 203, 8), // "maxWidth" -QT_MOC_LITERAL(23, 212, 9), // "maxHeight" -QT_MOC_LITERAL(24, 222, 10), // "paddingTop" -QT_MOC_LITERAL(25, 233, 12), // "paddingRight" -QT_MOC_LITERAL(26, 246, 13), // "paddingBottom" -QT_MOC_LITERAL(27, 260, 11), // "paddingLeft" -QT_MOC_LITERAL(28, 272, 17), // "paddingHorizontal" -QT_MOC_LITERAL(29, 290, 15), // "paddingVertical" -QT_MOC_LITERAL(30, 306, 7), // "padding" -QT_MOC_LITERAL(31, 314, 9), // "marginTop" -QT_MOC_LITERAL(32, 324, 11), // "marginRight" -QT_MOC_LITERAL(33, 336, 12), // "marginBottom" -QT_MOC_LITERAL(34, 349, 10), // "marginLeft" -QT_MOC_LITERAL(35, 360, 16), // "marginHorizontal" -QT_MOC_LITERAL(36, 377, 14), // "marginVertical" -QT_MOC_LITERAL(37, 392, 6), // "margin" -QT_MOC_LITERAL(38, 399, 9), // "borderTop" -QT_MOC_LITERAL(39, 409, 11), // "borderRight" -QT_MOC_LITERAL(40, 421, 12), // "borderBottom" -QT_MOC_LITERAL(41, 434, 10), // "borderLeft" -QT_MOC_LITERAL(42, 445, 16), // "borderHorizontal" -QT_MOC_LITERAL(43, 462, 14), // "borderVertical" -QT_MOC_LITERAL(44, 477, 6) // "border" +QT_MOC_LITERAL(22, 203, 6), // "qWidth" +QT_MOC_LITERAL(23, 210, 7), // "qHeight" +QT_MOC_LITERAL(24, 218, 8), // "maxWidth" +QT_MOC_LITERAL(25, 227, 9), // "maxHeight" +QT_MOC_LITERAL(26, 237, 10), // "paddingTop" +QT_MOC_LITERAL(27, 248, 12), // "paddingRight" +QT_MOC_LITERAL(28, 261, 13), // "paddingBottom" +QT_MOC_LITERAL(29, 275, 11), // "paddingLeft" +QT_MOC_LITERAL(30, 287, 17), // "paddingHorizontal" +QT_MOC_LITERAL(31, 305, 15), // "paddingVertical" +QT_MOC_LITERAL(32, 321, 7), // "padding" +QT_MOC_LITERAL(33, 329, 9), // "marginTop" +QT_MOC_LITERAL(34, 339, 11), // "marginRight" +QT_MOC_LITERAL(35, 351, 12), // "marginBottom" +QT_MOC_LITERAL(36, 364, 10), // "marginLeft" +QT_MOC_LITERAL(37, 375, 16), // "marginHorizontal" +QT_MOC_LITERAL(38, 392, 14), // "marginVertical" +QT_MOC_LITERAL(39, 407, 6), // "margin" +QT_MOC_LITERAL(40, 414, 9), // "borderTop" +QT_MOC_LITERAL(41, 424, 11), // "borderRight" +QT_MOC_LITERAL(42, 436, 12), // "borderBottom" +QT_MOC_LITERAL(43, 449, 10), // "borderLeft" +QT_MOC_LITERAL(44, 460, 16), // "borderHorizontal" +QT_MOC_LITERAL(45, 477, 14), // "borderVertical" +QT_MOC_LITERAL(46, 492, 6) // "border" }, "NLabel\0display\0alignItems\0alignContent\0" @@ -83,15 +86,15 @@ QT_MOC_LITERAL(44, 477, 6) // "border" "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" + "flexBasis\0minWidth\0minHeight\0qWidth\0" + "qHeight\0maxWidth\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 @@ -102,7 +105,7 @@ static const uint qt_meta_data_NLabel[] = { 0, // classname 0, 0, // classinfo 0, 0, // methods - 44, 14, // properties + 46, 14, // properties 0, 0, // enums/sets 0, 0, // constructors 0, // flags @@ -146,13 +149,15 @@ static const uint qt_meta_data_NLabel[] = { 35, QMetaType::QString, 0x00095003, 36, QMetaType::QString, 0x00095003, 37, QMetaType::QString, 0x00095003, - 38, QMetaType::Float, 0x00095003, - 39, QMetaType::Float, 0x00095003, + 38, QMetaType::QString, 0x00095003, + 39, QMetaType::QString, 0x00095003, 40, QMetaType::Float, 0x00095003, 41, QMetaType::Float, 0x00095003, 42, QMetaType::Float, 0x00095003, 43, QMetaType::Float, 0x00095003, 44, QMetaType::Float, 0x00095003, + 45, QMetaType::Float, 0x00095003, + 46, QMetaType::Float, 0x00095003, 0 // eod }; @@ -187,29 +192,31 @@ void NLabel::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void 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; + case 21: *reinterpret_cast< QString*>(_v) = _t->_yWidth; break; + case 22: *reinterpret_cast< QString*>(_v) = _t->_yHeight; break; + case 23: *reinterpret_cast< QString*>(_v) = _t->_yMaxWidth; break; + case 24: *reinterpret_cast< QString*>(_v) = _t->_yMaxHeight; break; + case 25: *reinterpret_cast< QString*>(_v) = _t->_yPaddingTop; break; + case 26: *reinterpret_cast< QString*>(_v) = _t->_yPaddingRight; break; + case 27: *reinterpret_cast< QString*>(_v) = _t->_yPaddingBottom; break; + case 28: *reinterpret_cast< QString*>(_v) = _t->_yPaddingLeft; break; + case 29: *reinterpret_cast< QString*>(_v) = _t->_yPaddingHorizontal; break; + case 30: *reinterpret_cast< QString*>(_v) = _t->_yPaddingVertical; break; + case 31: *reinterpret_cast< QString*>(_v) = _t->_yPadding; break; + case 32: *reinterpret_cast< QString*>(_v) = _t->_yMarginTop; break; + case 33: *reinterpret_cast< QString*>(_v) = _t->_yMarginRight; break; + case 34: *reinterpret_cast< QString*>(_v) = _t->_yMarginBottom; break; + case 35: *reinterpret_cast< QString*>(_v) = _t->_yMarginLeft; break; + case 36: *reinterpret_cast< QString*>(_v) = _t->_yMarginHorizontal; break; + case 37: *reinterpret_cast< QString*>(_v) = _t->_yMarginVertical; break; + case 38: *reinterpret_cast< QString*>(_v) = _t->_yMargin; break; + case 39: *reinterpret_cast< float*>(_v) = _t->_yBorderTop; break; + case 40: *reinterpret_cast< float*>(_v) = _t->_yBorderRight; break; + case 41: *reinterpret_cast< float*>(_v) = _t->_yBorderBottom; break; + case 42: *reinterpret_cast< float*>(_v) = _t->_yBorderLeft; break; + case 43: *reinterpret_cast< float*>(_v) = _t->_yBorderHorizontal; break; + case 44: *reinterpret_cast< float*>(_v) = _t->_yBorderVertical; break; + case 45: *reinterpret_cast< float*>(_v) = _t->_yBorder; break; default: break; } } else if (_c == QMetaObject::WriteProperty) { @@ -238,29 +245,31 @@ void NLabel::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void 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; + case 21: _t->setYWidth(*reinterpret_cast< QString*>(_v)); break; + case 22: _t->setYHeight(*reinterpret_cast< QString*>(_v)); break; + case 23: _t->setYMaxWidth(*reinterpret_cast< QString*>(_v)); break; + case 24: _t->setYMaxHeight(*reinterpret_cast< QString*>(_v)); break; + case 25: _t->setYPaddingTop(*reinterpret_cast< QString*>(_v)); break; + case 26: _t->setYPaddingRight(*reinterpret_cast< QString*>(_v)); break; + case 27: _t->setYPaddingBottom(*reinterpret_cast< QString*>(_v)); break; + case 28: _t->setYPaddingLeft(*reinterpret_cast< QString*>(_v)); break; + case 29: _t->setYPaddingHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 30: _t->setYPaddingVertical(*reinterpret_cast< QString*>(_v)); break; + case 31: _t->setYPadding(*reinterpret_cast< QString*>(_v)); break; + case 32: _t->setYMarginTop(*reinterpret_cast< QString*>(_v)); break; + case 33: _t->setYMarginRight(*reinterpret_cast< QString*>(_v)); break; + case 34: _t->setYMarginBottom(*reinterpret_cast< QString*>(_v)); break; + case 35: _t->setYMarginLeft(*reinterpret_cast< QString*>(_v)); break; + case 36: _t->setYMarginHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 37: _t->setYMarginVertical(*reinterpret_cast< QString*>(_v)); break; + case 38: _t->setYMarginAll(*reinterpret_cast< QString*>(_v)); break; + case 39: _t->setYBorderTop(*reinterpret_cast< float*>(_v)); break; + case 40: _t->setYBorderRight(*reinterpret_cast< float*>(_v)); break; + case 41: _t->setYBorderBottom(*reinterpret_cast< float*>(_v)); break; + case 42: _t->setYBorderLeft(*reinterpret_cast< float*>(_v)); break; + case 43: _t->setYBorderHorizontal(*reinterpret_cast< float*>(_v)); break; + case 44: _t->setYBorderVertical(*reinterpret_cast< float*>(_v)); break; + case 45: _t->setYBorder(*reinterpret_cast< float*>(_v)); break; default: break; } } else if (_c == QMetaObject::ResetProperty) { @@ -307,17 +316,17 @@ int NLabel::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_c == QMetaObject::ReadProperty || _c == QMetaObject::WriteProperty || _c == QMetaObject::ResetProperty || _c == QMetaObject::RegisterPropertyMetaType) { qt_static_metacall(this, _c, _id, _a); - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyDesignable) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyScriptable) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyStored) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyEditable) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyUser) { - _id -= 44; + _id -= 46; } #endif // QT_NO_PROPERTIES return _id; diff --git a/src/cpp/autogen/nlineedit_moc.cpp b/src/cpp/autogen/nlineedit_moc.cpp index fef87b361..e1242e4b2 100644 --- a/src/cpp/autogen/nlineedit_moc.cpp +++ b/src/cpp/autogen/nlineedit_moc.cpp @@ -1,18 +1,19 @@ /**************************************************************************** ** Meta object code from reading C++ file 'nlineedit.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.1) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.13.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ +#include #include "../QtWidgets/QLineEdit/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 "This file was generated using the moc from 5.13.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -21,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_NLineEdit_t { - QByteArrayData data[45]; - char stringdata0[487]; + QByteArrayData data[47]; + char stringdata0[502]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -53,29 +54,31 @@ 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" +QT_MOC_LITERAL(22, 206, 6), // "qWidth" +QT_MOC_LITERAL(23, 213, 7), // "qHeight" +QT_MOC_LITERAL(24, 221, 8), // "maxWidth" +QT_MOC_LITERAL(25, 230, 9), // "maxHeight" +QT_MOC_LITERAL(26, 240, 10), // "paddingTop" +QT_MOC_LITERAL(27, 251, 12), // "paddingRight" +QT_MOC_LITERAL(28, 264, 13), // "paddingBottom" +QT_MOC_LITERAL(29, 278, 11), // "paddingLeft" +QT_MOC_LITERAL(30, 290, 17), // "paddingHorizontal" +QT_MOC_LITERAL(31, 308, 15), // "paddingVertical" +QT_MOC_LITERAL(32, 324, 7), // "padding" +QT_MOC_LITERAL(33, 332, 9), // "marginTop" +QT_MOC_LITERAL(34, 342, 11), // "marginRight" +QT_MOC_LITERAL(35, 354, 12), // "marginBottom" +QT_MOC_LITERAL(36, 367, 10), // "marginLeft" +QT_MOC_LITERAL(37, 378, 16), // "marginHorizontal" +QT_MOC_LITERAL(38, 395, 14), // "marginVertical" +QT_MOC_LITERAL(39, 410, 6), // "margin" +QT_MOC_LITERAL(40, 417, 9), // "borderTop" +QT_MOC_LITERAL(41, 427, 11), // "borderRight" +QT_MOC_LITERAL(42, 439, 12), // "borderBottom" +QT_MOC_LITERAL(43, 452, 10), // "borderLeft" +QT_MOC_LITERAL(44, 463, 16), // "borderHorizontal" +QT_MOC_LITERAL(45, 480, 14), // "borderVertical" +QT_MOC_LITERAL(46, 495, 6) // "border" }, "NLineEdit\0display\0alignItems\0alignContent\0" @@ -83,15 +86,15 @@ QT_MOC_LITERAL(44, 480, 6) // "border" "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" + "flexBasis\0minWidth\0minHeight\0qWidth\0" + "qHeight\0maxWidth\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 @@ -102,7 +105,7 @@ static const uint qt_meta_data_NLineEdit[] = { 0, // classname 0, 0, // classinfo 0, 0, // methods - 44, 14, // properties + 46, 14, // properties 0, 0, // enums/sets 0, 0, // constructors 0, // flags @@ -146,13 +149,15 @@ static const uint qt_meta_data_NLineEdit[] = { 35, QMetaType::QString, 0x00095003, 36, QMetaType::QString, 0x00095003, 37, QMetaType::QString, 0x00095003, - 38, QMetaType::Float, 0x00095003, - 39, QMetaType::Float, 0x00095003, + 38, QMetaType::QString, 0x00095003, + 39, QMetaType::QString, 0x00095003, 40, QMetaType::Float, 0x00095003, 41, QMetaType::Float, 0x00095003, 42, QMetaType::Float, 0x00095003, 43, QMetaType::Float, 0x00095003, 44, QMetaType::Float, 0x00095003, + 45, QMetaType::Float, 0x00095003, + 46, QMetaType::Float, 0x00095003, 0 // eod }; @@ -187,29 +192,31 @@ void NLineEdit::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, v 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; + case 21: *reinterpret_cast< QString*>(_v) = _t->_yWidth; break; + case 22: *reinterpret_cast< QString*>(_v) = _t->_yHeight; break; + case 23: *reinterpret_cast< QString*>(_v) = _t->_yMaxWidth; break; + case 24: *reinterpret_cast< QString*>(_v) = _t->_yMaxHeight; break; + case 25: *reinterpret_cast< QString*>(_v) = _t->_yPaddingTop; break; + case 26: *reinterpret_cast< QString*>(_v) = _t->_yPaddingRight; break; + case 27: *reinterpret_cast< QString*>(_v) = _t->_yPaddingBottom; break; + case 28: *reinterpret_cast< QString*>(_v) = _t->_yPaddingLeft; break; + case 29: *reinterpret_cast< QString*>(_v) = _t->_yPaddingHorizontal; break; + case 30: *reinterpret_cast< QString*>(_v) = _t->_yPaddingVertical; break; + case 31: *reinterpret_cast< QString*>(_v) = _t->_yPadding; break; + case 32: *reinterpret_cast< QString*>(_v) = _t->_yMarginTop; break; + case 33: *reinterpret_cast< QString*>(_v) = _t->_yMarginRight; break; + case 34: *reinterpret_cast< QString*>(_v) = _t->_yMarginBottom; break; + case 35: *reinterpret_cast< QString*>(_v) = _t->_yMarginLeft; break; + case 36: *reinterpret_cast< QString*>(_v) = _t->_yMarginHorizontal; break; + case 37: *reinterpret_cast< QString*>(_v) = _t->_yMarginVertical; break; + case 38: *reinterpret_cast< QString*>(_v) = _t->_yMargin; break; + case 39: *reinterpret_cast< float*>(_v) = _t->_yBorderTop; break; + case 40: *reinterpret_cast< float*>(_v) = _t->_yBorderRight; break; + case 41: *reinterpret_cast< float*>(_v) = _t->_yBorderBottom; break; + case 42: *reinterpret_cast< float*>(_v) = _t->_yBorderLeft; break; + case 43: *reinterpret_cast< float*>(_v) = _t->_yBorderHorizontal; break; + case 44: *reinterpret_cast< float*>(_v) = _t->_yBorderVertical; break; + case 45: *reinterpret_cast< float*>(_v) = _t->_yBorder; break; default: break; } } else if (_c == QMetaObject::WriteProperty) { @@ -238,29 +245,31 @@ void NLineEdit::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, v 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; + case 21: _t->setYWidth(*reinterpret_cast< QString*>(_v)); break; + case 22: _t->setYHeight(*reinterpret_cast< QString*>(_v)); break; + case 23: _t->setYMaxWidth(*reinterpret_cast< QString*>(_v)); break; + case 24: _t->setYMaxHeight(*reinterpret_cast< QString*>(_v)); break; + case 25: _t->setYPaddingTop(*reinterpret_cast< QString*>(_v)); break; + case 26: _t->setYPaddingRight(*reinterpret_cast< QString*>(_v)); break; + case 27: _t->setYPaddingBottom(*reinterpret_cast< QString*>(_v)); break; + case 28: _t->setYPaddingLeft(*reinterpret_cast< QString*>(_v)); break; + case 29: _t->setYPaddingHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 30: _t->setYPaddingVertical(*reinterpret_cast< QString*>(_v)); break; + case 31: _t->setYPadding(*reinterpret_cast< QString*>(_v)); break; + case 32: _t->setYMarginTop(*reinterpret_cast< QString*>(_v)); break; + case 33: _t->setYMarginRight(*reinterpret_cast< QString*>(_v)); break; + case 34: _t->setYMarginBottom(*reinterpret_cast< QString*>(_v)); break; + case 35: _t->setYMarginLeft(*reinterpret_cast< QString*>(_v)); break; + case 36: _t->setYMarginHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 37: _t->setYMarginVertical(*reinterpret_cast< QString*>(_v)); break; + case 38: _t->setYMarginAll(*reinterpret_cast< QString*>(_v)); break; + case 39: _t->setYBorderTop(*reinterpret_cast< float*>(_v)); break; + case 40: _t->setYBorderRight(*reinterpret_cast< float*>(_v)); break; + case 41: _t->setYBorderBottom(*reinterpret_cast< float*>(_v)); break; + case 42: _t->setYBorderLeft(*reinterpret_cast< float*>(_v)); break; + case 43: _t->setYBorderHorizontal(*reinterpret_cast< float*>(_v)); break; + case 44: _t->setYBorderVertical(*reinterpret_cast< float*>(_v)); break; + case 45: _t->setYBorder(*reinterpret_cast< float*>(_v)); break; default: break; } } else if (_c == QMetaObject::ResetProperty) { @@ -307,17 +316,17 @@ int NLineEdit::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_c == QMetaObject::ReadProperty || _c == QMetaObject::WriteProperty || _c == QMetaObject::ResetProperty || _c == QMetaObject::RegisterPropertyMetaType) { qt_static_metacall(this, _c, _id, _a); - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyDesignable) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyScriptable) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyStored) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyEditable) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyUser) { - _id -= 44; + _id -= 46; } #endif // QT_NO_PROPERTIES return _id; diff --git a/src/cpp/autogen/nmainwindow_moc.cpp b/src/cpp/autogen/nmainwindow_moc.cpp index 67d92dcd4..c180da405 100644 --- a/src/cpp/autogen/nmainwindow_moc.cpp +++ b/src/cpp/autogen/nmainwindow_moc.cpp @@ -1,18 +1,19 @@ /**************************************************************************** ** Meta object code from reading C++ file 'nmainwindow.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.1) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.13.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ +#include #include "../QtWidgets/QMainWindow/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 "This file was generated using the moc from 5.13.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -21,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_NMainWindow_t { - QByteArrayData data[45]; - char stringdata0[489]; + QByteArrayData data[47]; + char stringdata0[504]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -53,29 +54,31 @@ 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" +QT_MOC_LITERAL(22, 208, 6), // "qWidth" +QT_MOC_LITERAL(23, 215, 7), // "qHeight" +QT_MOC_LITERAL(24, 223, 8), // "maxWidth" +QT_MOC_LITERAL(25, 232, 9), // "maxHeight" +QT_MOC_LITERAL(26, 242, 10), // "paddingTop" +QT_MOC_LITERAL(27, 253, 12), // "paddingRight" +QT_MOC_LITERAL(28, 266, 13), // "paddingBottom" +QT_MOC_LITERAL(29, 280, 11), // "paddingLeft" +QT_MOC_LITERAL(30, 292, 17), // "paddingHorizontal" +QT_MOC_LITERAL(31, 310, 15), // "paddingVertical" +QT_MOC_LITERAL(32, 326, 7), // "padding" +QT_MOC_LITERAL(33, 334, 9), // "marginTop" +QT_MOC_LITERAL(34, 344, 11), // "marginRight" +QT_MOC_LITERAL(35, 356, 12), // "marginBottom" +QT_MOC_LITERAL(36, 369, 10), // "marginLeft" +QT_MOC_LITERAL(37, 380, 16), // "marginHorizontal" +QT_MOC_LITERAL(38, 397, 14), // "marginVertical" +QT_MOC_LITERAL(39, 412, 6), // "margin" +QT_MOC_LITERAL(40, 419, 9), // "borderTop" +QT_MOC_LITERAL(41, 429, 11), // "borderRight" +QT_MOC_LITERAL(42, 441, 12), // "borderBottom" +QT_MOC_LITERAL(43, 454, 10), // "borderLeft" +QT_MOC_LITERAL(44, 465, 16), // "borderHorizontal" +QT_MOC_LITERAL(45, 482, 14), // "borderVertical" +QT_MOC_LITERAL(46, 497, 6) // "border" }, "NMainWindow\0display\0alignItems\0" @@ -84,14 +87,15 @@ QT_MOC_LITERAL(44, 482, 6) // "border" "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" + "qWidth\0qHeight\0maxWidth\0maxHeight\0" + "paddingTop\0paddingRight\0paddingBottom\0" + "paddingLeft\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 @@ -102,7 +106,7 @@ static const uint qt_meta_data_NMainWindow[] = { 0, // classname 0, 0, // classinfo 0, 0, // methods - 44, 14, // properties + 46, 14, // properties 0, 0, // enums/sets 0, 0, // constructors 0, // flags @@ -146,13 +150,15 @@ static const uint qt_meta_data_NMainWindow[] = { 35, QMetaType::QString, 0x00095003, 36, QMetaType::QString, 0x00095003, 37, QMetaType::QString, 0x00095003, - 38, QMetaType::Float, 0x00095003, - 39, QMetaType::Float, 0x00095003, + 38, QMetaType::QString, 0x00095003, + 39, QMetaType::QString, 0x00095003, 40, QMetaType::Float, 0x00095003, 41, QMetaType::Float, 0x00095003, 42, QMetaType::Float, 0x00095003, 43, QMetaType::Float, 0x00095003, 44, QMetaType::Float, 0x00095003, + 45, QMetaType::Float, 0x00095003, + 46, QMetaType::Float, 0x00095003, 0 // eod }; @@ -187,29 +193,31 @@ void NMainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, 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; + case 21: *reinterpret_cast< QString*>(_v) = _t->_yWidth; break; + case 22: *reinterpret_cast< QString*>(_v) = _t->_yHeight; break; + case 23: *reinterpret_cast< QString*>(_v) = _t->_yMaxWidth; break; + case 24: *reinterpret_cast< QString*>(_v) = _t->_yMaxHeight; break; + case 25: *reinterpret_cast< QString*>(_v) = _t->_yPaddingTop; break; + case 26: *reinterpret_cast< QString*>(_v) = _t->_yPaddingRight; break; + case 27: *reinterpret_cast< QString*>(_v) = _t->_yPaddingBottom; break; + case 28: *reinterpret_cast< QString*>(_v) = _t->_yPaddingLeft; break; + case 29: *reinterpret_cast< QString*>(_v) = _t->_yPaddingHorizontal; break; + case 30: *reinterpret_cast< QString*>(_v) = _t->_yPaddingVertical; break; + case 31: *reinterpret_cast< QString*>(_v) = _t->_yPadding; break; + case 32: *reinterpret_cast< QString*>(_v) = _t->_yMarginTop; break; + case 33: *reinterpret_cast< QString*>(_v) = _t->_yMarginRight; break; + case 34: *reinterpret_cast< QString*>(_v) = _t->_yMarginBottom; break; + case 35: *reinterpret_cast< QString*>(_v) = _t->_yMarginLeft; break; + case 36: *reinterpret_cast< QString*>(_v) = _t->_yMarginHorizontal; break; + case 37: *reinterpret_cast< QString*>(_v) = _t->_yMarginVertical; break; + case 38: *reinterpret_cast< QString*>(_v) = _t->_yMargin; break; + case 39: *reinterpret_cast< float*>(_v) = _t->_yBorderTop; break; + case 40: *reinterpret_cast< float*>(_v) = _t->_yBorderRight; break; + case 41: *reinterpret_cast< float*>(_v) = _t->_yBorderBottom; break; + case 42: *reinterpret_cast< float*>(_v) = _t->_yBorderLeft; break; + case 43: *reinterpret_cast< float*>(_v) = _t->_yBorderHorizontal; break; + case 44: *reinterpret_cast< float*>(_v) = _t->_yBorderVertical; break; + case 45: *reinterpret_cast< float*>(_v) = _t->_yBorder; break; default: break; } } else if (_c == QMetaObject::WriteProperty) { @@ -238,29 +246,31 @@ void NMainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, 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; + case 21: _t->setYWidth(*reinterpret_cast< QString*>(_v)); break; + case 22: _t->setYHeight(*reinterpret_cast< QString*>(_v)); break; + case 23: _t->setYMaxWidth(*reinterpret_cast< QString*>(_v)); break; + case 24: _t->setYMaxHeight(*reinterpret_cast< QString*>(_v)); break; + case 25: _t->setYPaddingTop(*reinterpret_cast< QString*>(_v)); break; + case 26: _t->setYPaddingRight(*reinterpret_cast< QString*>(_v)); break; + case 27: _t->setYPaddingBottom(*reinterpret_cast< QString*>(_v)); break; + case 28: _t->setYPaddingLeft(*reinterpret_cast< QString*>(_v)); break; + case 29: _t->setYPaddingHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 30: _t->setYPaddingVertical(*reinterpret_cast< QString*>(_v)); break; + case 31: _t->setYPadding(*reinterpret_cast< QString*>(_v)); break; + case 32: _t->setYMarginTop(*reinterpret_cast< QString*>(_v)); break; + case 33: _t->setYMarginRight(*reinterpret_cast< QString*>(_v)); break; + case 34: _t->setYMarginBottom(*reinterpret_cast< QString*>(_v)); break; + case 35: _t->setYMarginLeft(*reinterpret_cast< QString*>(_v)); break; + case 36: _t->setYMarginHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 37: _t->setYMarginVertical(*reinterpret_cast< QString*>(_v)); break; + case 38: _t->setYMarginAll(*reinterpret_cast< QString*>(_v)); break; + case 39: _t->setYBorderTop(*reinterpret_cast< float*>(_v)); break; + case 40: _t->setYBorderRight(*reinterpret_cast< float*>(_v)); break; + case 41: _t->setYBorderBottom(*reinterpret_cast< float*>(_v)); break; + case 42: _t->setYBorderLeft(*reinterpret_cast< float*>(_v)); break; + case 43: _t->setYBorderHorizontal(*reinterpret_cast< float*>(_v)); break; + case 44: _t->setYBorderVertical(*reinterpret_cast< float*>(_v)); break; + case 45: _t->setYBorder(*reinterpret_cast< float*>(_v)); break; default: break; } } else if (_c == QMetaObject::ResetProperty) { @@ -307,17 +317,17 @@ int NMainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_c == QMetaObject::ReadProperty || _c == QMetaObject::WriteProperty || _c == QMetaObject::ResetProperty || _c == QMetaObject::RegisterPropertyMetaType) { qt_static_metacall(this, _c, _id, _a); - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyDesignable) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyScriptable) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyStored) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyEditable) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyUser) { - _id -= 44; + _id -= 46; } #endif // QT_NO_PROPERTIES return _id; diff --git a/src/cpp/autogen/nprogressbar_moc.cpp b/src/cpp/autogen/nprogressbar_moc.cpp index 4b30b1a95..ca1df89cd 100644 --- a/src/cpp/autogen/nprogressbar_moc.cpp +++ b/src/cpp/autogen/nprogressbar_moc.cpp @@ -1,18 +1,19 @@ /**************************************************************************** ** Meta object code from reading C++ file 'nprogressbar.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.1) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.13.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ +#include #include "../QtWidgets/QProgressBar/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 "This file was generated using the moc from 5.13.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -21,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_NProgressBar_t { - QByteArrayData data[45]; - char stringdata0[490]; + QByteArrayData data[47]; + char stringdata0[505]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -53,29 +54,31 @@ 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" +QT_MOC_LITERAL(22, 209, 6), // "qWidth" +QT_MOC_LITERAL(23, 216, 7), // "qHeight" +QT_MOC_LITERAL(24, 224, 8), // "maxWidth" +QT_MOC_LITERAL(25, 233, 9), // "maxHeight" +QT_MOC_LITERAL(26, 243, 10), // "paddingTop" +QT_MOC_LITERAL(27, 254, 12), // "paddingRight" +QT_MOC_LITERAL(28, 267, 13), // "paddingBottom" +QT_MOC_LITERAL(29, 281, 11), // "paddingLeft" +QT_MOC_LITERAL(30, 293, 17), // "paddingHorizontal" +QT_MOC_LITERAL(31, 311, 15), // "paddingVertical" +QT_MOC_LITERAL(32, 327, 7), // "padding" +QT_MOC_LITERAL(33, 335, 9), // "marginTop" +QT_MOC_LITERAL(34, 345, 11), // "marginRight" +QT_MOC_LITERAL(35, 357, 12), // "marginBottom" +QT_MOC_LITERAL(36, 370, 10), // "marginLeft" +QT_MOC_LITERAL(37, 381, 16), // "marginHorizontal" +QT_MOC_LITERAL(38, 398, 14), // "marginVertical" +QT_MOC_LITERAL(39, 413, 6), // "margin" +QT_MOC_LITERAL(40, 420, 9), // "borderTop" +QT_MOC_LITERAL(41, 430, 11), // "borderRight" +QT_MOC_LITERAL(42, 442, 12), // "borderBottom" +QT_MOC_LITERAL(43, 455, 10), // "borderLeft" +QT_MOC_LITERAL(44, 466, 16), // "borderHorizontal" +QT_MOC_LITERAL(45, 483, 14), // "borderVertical" +QT_MOC_LITERAL(46, 498, 6) // "border" }, "NProgressBar\0display\0alignItems\0" @@ -84,14 +87,15 @@ QT_MOC_LITERAL(44, 483, 6) // "border" "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" + "qWidth\0qHeight\0maxWidth\0maxHeight\0" + "paddingTop\0paddingRight\0paddingBottom\0" + "paddingLeft\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 @@ -102,7 +106,7 @@ static const uint qt_meta_data_NProgressBar[] = { 0, // classname 0, 0, // classinfo 0, 0, // methods - 44, 14, // properties + 46, 14, // properties 0, 0, // enums/sets 0, 0, // constructors 0, // flags @@ -146,13 +150,15 @@ static const uint qt_meta_data_NProgressBar[] = { 35, QMetaType::QString, 0x00095003, 36, QMetaType::QString, 0x00095003, 37, QMetaType::QString, 0x00095003, - 38, QMetaType::Float, 0x00095003, - 39, QMetaType::Float, 0x00095003, + 38, QMetaType::QString, 0x00095003, + 39, QMetaType::QString, 0x00095003, 40, QMetaType::Float, 0x00095003, 41, QMetaType::Float, 0x00095003, 42, QMetaType::Float, 0x00095003, 43, QMetaType::Float, 0x00095003, 44, QMetaType::Float, 0x00095003, + 45, QMetaType::Float, 0x00095003, + 46, QMetaType::Float, 0x00095003, 0 // eod }; @@ -187,29 +193,31 @@ void NProgressBar::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id 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; + case 21: *reinterpret_cast< QString*>(_v) = _t->_yWidth; break; + case 22: *reinterpret_cast< QString*>(_v) = _t->_yHeight; break; + case 23: *reinterpret_cast< QString*>(_v) = _t->_yMaxWidth; break; + case 24: *reinterpret_cast< QString*>(_v) = _t->_yMaxHeight; break; + case 25: *reinterpret_cast< QString*>(_v) = _t->_yPaddingTop; break; + case 26: *reinterpret_cast< QString*>(_v) = _t->_yPaddingRight; break; + case 27: *reinterpret_cast< QString*>(_v) = _t->_yPaddingBottom; break; + case 28: *reinterpret_cast< QString*>(_v) = _t->_yPaddingLeft; break; + case 29: *reinterpret_cast< QString*>(_v) = _t->_yPaddingHorizontal; break; + case 30: *reinterpret_cast< QString*>(_v) = _t->_yPaddingVertical; break; + case 31: *reinterpret_cast< QString*>(_v) = _t->_yPadding; break; + case 32: *reinterpret_cast< QString*>(_v) = _t->_yMarginTop; break; + case 33: *reinterpret_cast< QString*>(_v) = _t->_yMarginRight; break; + case 34: *reinterpret_cast< QString*>(_v) = _t->_yMarginBottom; break; + case 35: *reinterpret_cast< QString*>(_v) = _t->_yMarginLeft; break; + case 36: *reinterpret_cast< QString*>(_v) = _t->_yMarginHorizontal; break; + case 37: *reinterpret_cast< QString*>(_v) = _t->_yMarginVertical; break; + case 38: *reinterpret_cast< QString*>(_v) = _t->_yMargin; break; + case 39: *reinterpret_cast< float*>(_v) = _t->_yBorderTop; break; + case 40: *reinterpret_cast< float*>(_v) = _t->_yBorderRight; break; + case 41: *reinterpret_cast< float*>(_v) = _t->_yBorderBottom; break; + case 42: *reinterpret_cast< float*>(_v) = _t->_yBorderLeft; break; + case 43: *reinterpret_cast< float*>(_v) = _t->_yBorderHorizontal; break; + case 44: *reinterpret_cast< float*>(_v) = _t->_yBorderVertical; break; + case 45: *reinterpret_cast< float*>(_v) = _t->_yBorder; break; default: break; } } else if (_c == QMetaObject::WriteProperty) { @@ -238,29 +246,31 @@ void NProgressBar::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id 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; + case 21: _t->setYWidth(*reinterpret_cast< QString*>(_v)); break; + case 22: _t->setYHeight(*reinterpret_cast< QString*>(_v)); break; + case 23: _t->setYMaxWidth(*reinterpret_cast< QString*>(_v)); break; + case 24: _t->setYMaxHeight(*reinterpret_cast< QString*>(_v)); break; + case 25: _t->setYPaddingTop(*reinterpret_cast< QString*>(_v)); break; + case 26: _t->setYPaddingRight(*reinterpret_cast< QString*>(_v)); break; + case 27: _t->setYPaddingBottom(*reinterpret_cast< QString*>(_v)); break; + case 28: _t->setYPaddingLeft(*reinterpret_cast< QString*>(_v)); break; + case 29: _t->setYPaddingHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 30: _t->setYPaddingVertical(*reinterpret_cast< QString*>(_v)); break; + case 31: _t->setYPadding(*reinterpret_cast< QString*>(_v)); break; + case 32: _t->setYMarginTop(*reinterpret_cast< QString*>(_v)); break; + case 33: _t->setYMarginRight(*reinterpret_cast< QString*>(_v)); break; + case 34: _t->setYMarginBottom(*reinterpret_cast< QString*>(_v)); break; + case 35: _t->setYMarginLeft(*reinterpret_cast< QString*>(_v)); break; + case 36: _t->setYMarginHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 37: _t->setYMarginVertical(*reinterpret_cast< QString*>(_v)); break; + case 38: _t->setYMarginAll(*reinterpret_cast< QString*>(_v)); break; + case 39: _t->setYBorderTop(*reinterpret_cast< float*>(_v)); break; + case 40: _t->setYBorderRight(*reinterpret_cast< float*>(_v)); break; + case 41: _t->setYBorderBottom(*reinterpret_cast< float*>(_v)); break; + case 42: _t->setYBorderLeft(*reinterpret_cast< float*>(_v)); break; + case 43: _t->setYBorderHorizontal(*reinterpret_cast< float*>(_v)); break; + case 44: _t->setYBorderVertical(*reinterpret_cast< float*>(_v)); break; + case 45: _t->setYBorder(*reinterpret_cast< float*>(_v)); break; default: break; } } else if (_c == QMetaObject::ResetProperty) { @@ -307,17 +317,17 @@ int NProgressBar::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_c == QMetaObject::ReadProperty || _c == QMetaObject::WriteProperty || _c == QMetaObject::ResetProperty || _c == QMetaObject::RegisterPropertyMetaType) { qt_static_metacall(this, _c, _id, _a); - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyDesignable) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyScriptable) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyStored) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyEditable) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyUser) { - _id -= 44; + _id -= 46; } #endif // QT_NO_PROPERTIES return _id; diff --git a/src/cpp/autogen/npushbutton_moc.cpp b/src/cpp/autogen/npushbutton_moc.cpp index edd37858a..aee4ee49a 100644 --- a/src/cpp/autogen/npushbutton_moc.cpp +++ b/src/cpp/autogen/npushbutton_moc.cpp @@ -1,18 +1,19 @@ /**************************************************************************** ** Meta object code from reading C++ file 'npushbutton.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.1) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.13.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ +#include #include "../QtWidgets/QPushButton/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 "This file was generated using the moc from 5.13.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -21,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_NPushButton_t { - QByteArrayData data[45]; - char stringdata0[489]; + QByteArrayData data[47]; + char stringdata0[504]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -53,29 +54,31 @@ 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" +QT_MOC_LITERAL(22, 208, 6), // "qWidth" +QT_MOC_LITERAL(23, 215, 7), // "qHeight" +QT_MOC_LITERAL(24, 223, 8), // "maxWidth" +QT_MOC_LITERAL(25, 232, 9), // "maxHeight" +QT_MOC_LITERAL(26, 242, 10), // "paddingTop" +QT_MOC_LITERAL(27, 253, 12), // "paddingRight" +QT_MOC_LITERAL(28, 266, 13), // "paddingBottom" +QT_MOC_LITERAL(29, 280, 11), // "paddingLeft" +QT_MOC_LITERAL(30, 292, 17), // "paddingHorizontal" +QT_MOC_LITERAL(31, 310, 15), // "paddingVertical" +QT_MOC_LITERAL(32, 326, 7), // "padding" +QT_MOC_LITERAL(33, 334, 9), // "marginTop" +QT_MOC_LITERAL(34, 344, 11), // "marginRight" +QT_MOC_LITERAL(35, 356, 12), // "marginBottom" +QT_MOC_LITERAL(36, 369, 10), // "marginLeft" +QT_MOC_LITERAL(37, 380, 16), // "marginHorizontal" +QT_MOC_LITERAL(38, 397, 14), // "marginVertical" +QT_MOC_LITERAL(39, 412, 6), // "margin" +QT_MOC_LITERAL(40, 419, 9), // "borderTop" +QT_MOC_LITERAL(41, 429, 11), // "borderRight" +QT_MOC_LITERAL(42, 441, 12), // "borderBottom" +QT_MOC_LITERAL(43, 454, 10), // "borderLeft" +QT_MOC_LITERAL(44, 465, 16), // "borderHorizontal" +QT_MOC_LITERAL(45, 482, 14), // "borderVertical" +QT_MOC_LITERAL(46, 497, 6) // "border" }, "NPushButton\0display\0alignItems\0" @@ -84,14 +87,15 @@ QT_MOC_LITERAL(44, 482, 6) // "border" "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" + "qWidth\0qHeight\0maxWidth\0maxHeight\0" + "paddingTop\0paddingRight\0paddingBottom\0" + "paddingLeft\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 @@ -102,7 +106,7 @@ static const uint qt_meta_data_NPushButton[] = { 0, // classname 0, 0, // classinfo 0, 0, // methods - 44, 14, // properties + 46, 14, // properties 0, 0, // enums/sets 0, 0, // constructors 0, // flags @@ -146,13 +150,15 @@ static const uint qt_meta_data_NPushButton[] = { 35, QMetaType::QString, 0x00095003, 36, QMetaType::QString, 0x00095003, 37, QMetaType::QString, 0x00095003, - 38, QMetaType::Float, 0x00095003, - 39, QMetaType::Float, 0x00095003, + 38, QMetaType::QString, 0x00095003, + 39, QMetaType::QString, 0x00095003, 40, QMetaType::Float, 0x00095003, 41, QMetaType::Float, 0x00095003, 42, QMetaType::Float, 0x00095003, 43, QMetaType::Float, 0x00095003, 44, QMetaType::Float, 0x00095003, + 45, QMetaType::Float, 0x00095003, + 46, QMetaType::Float, 0x00095003, 0 // eod }; @@ -187,29 +193,31 @@ void NPushButton::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, 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; + case 21: *reinterpret_cast< QString*>(_v) = _t->_yWidth; break; + case 22: *reinterpret_cast< QString*>(_v) = _t->_yHeight; break; + case 23: *reinterpret_cast< QString*>(_v) = _t->_yMaxWidth; break; + case 24: *reinterpret_cast< QString*>(_v) = _t->_yMaxHeight; break; + case 25: *reinterpret_cast< QString*>(_v) = _t->_yPaddingTop; break; + case 26: *reinterpret_cast< QString*>(_v) = _t->_yPaddingRight; break; + case 27: *reinterpret_cast< QString*>(_v) = _t->_yPaddingBottom; break; + case 28: *reinterpret_cast< QString*>(_v) = _t->_yPaddingLeft; break; + case 29: *reinterpret_cast< QString*>(_v) = _t->_yPaddingHorizontal; break; + case 30: *reinterpret_cast< QString*>(_v) = _t->_yPaddingVertical; break; + case 31: *reinterpret_cast< QString*>(_v) = _t->_yPadding; break; + case 32: *reinterpret_cast< QString*>(_v) = _t->_yMarginTop; break; + case 33: *reinterpret_cast< QString*>(_v) = _t->_yMarginRight; break; + case 34: *reinterpret_cast< QString*>(_v) = _t->_yMarginBottom; break; + case 35: *reinterpret_cast< QString*>(_v) = _t->_yMarginLeft; break; + case 36: *reinterpret_cast< QString*>(_v) = _t->_yMarginHorizontal; break; + case 37: *reinterpret_cast< QString*>(_v) = _t->_yMarginVertical; break; + case 38: *reinterpret_cast< QString*>(_v) = _t->_yMargin; break; + case 39: *reinterpret_cast< float*>(_v) = _t->_yBorderTop; break; + case 40: *reinterpret_cast< float*>(_v) = _t->_yBorderRight; break; + case 41: *reinterpret_cast< float*>(_v) = _t->_yBorderBottom; break; + case 42: *reinterpret_cast< float*>(_v) = _t->_yBorderLeft; break; + case 43: *reinterpret_cast< float*>(_v) = _t->_yBorderHorizontal; break; + case 44: *reinterpret_cast< float*>(_v) = _t->_yBorderVertical; break; + case 45: *reinterpret_cast< float*>(_v) = _t->_yBorder; break; default: break; } } else if (_c == QMetaObject::WriteProperty) { @@ -238,29 +246,31 @@ void NPushButton::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, 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; + case 21: _t->setYWidth(*reinterpret_cast< QString*>(_v)); break; + case 22: _t->setYHeight(*reinterpret_cast< QString*>(_v)); break; + case 23: _t->setYMaxWidth(*reinterpret_cast< QString*>(_v)); break; + case 24: _t->setYMaxHeight(*reinterpret_cast< QString*>(_v)); break; + case 25: _t->setYPaddingTop(*reinterpret_cast< QString*>(_v)); break; + case 26: _t->setYPaddingRight(*reinterpret_cast< QString*>(_v)); break; + case 27: _t->setYPaddingBottom(*reinterpret_cast< QString*>(_v)); break; + case 28: _t->setYPaddingLeft(*reinterpret_cast< QString*>(_v)); break; + case 29: _t->setYPaddingHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 30: _t->setYPaddingVertical(*reinterpret_cast< QString*>(_v)); break; + case 31: _t->setYPadding(*reinterpret_cast< QString*>(_v)); break; + case 32: _t->setYMarginTop(*reinterpret_cast< QString*>(_v)); break; + case 33: _t->setYMarginRight(*reinterpret_cast< QString*>(_v)); break; + case 34: _t->setYMarginBottom(*reinterpret_cast< QString*>(_v)); break; + case 35: _t->setYMarginLeft(*reinterpret_cast< QString*>(_v)); break; + case 36: _t->setYMarginHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 37: _t->setYMarginVertical(*reinterpret_cast< QString*>(_v)); break; + case 38: _t->setYMarginAll(*reinterpret_cast< QString*>(_v)); break; + case 39: _t->setYBorderTop(*reinterpret_cast< float*>(_v)); break; + case 40: _t->setYBorderRight(*reinterpret_cast< float*>(_v)); break; + case 41: _t->setYBorderBottom(*reinterpret_cast< float*>(_v)); break; + case 42: _t->setYBorderLeft(*reinterpret_cast< float*>(_v)); break; + case 43: _t->setYBorderHorizontal(*reinterpret_cast< float*>(_v)); break; + case 44: _t->setYBorderVertical(*reinterpret_cast< float*>(_v)); break; + case 45: _t->setYBorder(*reinterpret_cast< float*>(_v)); break; default: break; } } else if (_c == QMetaObject::ResetProperty) { @@ -307,17 +317,17 @@ int NPushButton::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_c == QMetaObject::ReadProperty || _c == QMetaObject::WriteProperty || _c == QMetaObject::ResetProperty || _c == QMetaObject::RegisterPropertyMetaType) { qt_static_metacall(this, _c, _id, _a); - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyDesignable) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyScriptable) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyStored) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyEditable) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyUser) { - _id -= 44; + _id -= 46; } #endif // QT_NO_PROPERTIES return _id; diff --git a/src/cpp/autogen/nradiobutton_moc.cpp b/src/cpp/autogen/nradiobutton_moc.cpp index 3ac3c521e..ea22fc754 100644 --- a/src/cpp/autogen/nradiobutton_moc.cpp +++ b/src/cpp/autogen/nradiobutton_moc.cpp @@ -1,18 +1,19 @@ /**************************************************************************** ** Meta object code from reading C++ file 'nradiobutton.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.1) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.13.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ +#include #include "../QtWidgets/QRadioButton/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 "This file was generated using the moc from 5.13.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -21,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_NRadioButton_t { - QByteArrayData data[45]; - char stringdata0[490]; + QByteArrayData data[47]; + char stringdata0[505]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -53,29 +54,31 @@ 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" +QT_MOC_LITERAL(22, 209, 6), // "qWidth" +QT_MOC_LITERAL(23, 216, 7), // "qHeight" +QT_MOC_LITERAL(24, 224, 8), // "maxWidth" +QT_MOC_LITERAL(25, 233, 9), // "maxHeight" +QT_MOC_LITERAL(26, 243, 10), // "paddingTop" +QT_MOC_LITERAL(27, 254, 12), // "paddingRight" +QT_MOC_LITERAL(28, 267, 13), // "paddingBottom" +QT_MOC_LITERAL(29, 281, 11), // "paddingLeft" +QT_MOC_LITERAL(30, 293, 17), // "paddingHorizontal" +QT_MOC_LITERAL(31, 311, 15), // "paddingVertical" +QT_MOC_LITERAL(32, 327, 7), // "padding" +QT_MOC_LITERAL(33, 335, 9), // "marginTop" +QT_MOC_LITERAL(34, 345, 11), // "marginRight" +QT_MOC_LITERAL(35, 357, 12), // "marginBottom" +QT_MOC_LITERAL(36, 370, 10), // "marginLeft" +QT_MOC_LITERAL(37, 381, 16), // "marginHorizontal" +QT_MOC_LITERAL(38, 398, 14), // "marginVertical" +QT_MOC_LITERAL(39, 413, 6), // "margin" +QT_MOC_LITERAL(40, 420, 9), // "borderTop" +QT_MOC_LITERAL(41, 430, 11), // "borderRight" +QT_MOC_LITERAL(42, 442, 12), // "borderBottom" +QT_MOC_LITERAL(43, 455, 10), // "borderLeft" +QT_MOC_LITERAL(44, 466, 16), // "borderHorizontal" +QT_MOC_LITERAL(45, 483, 14), // "borderVertical" +QT_MOC_LITERAL(46, 498, 6) // "border" }, "NRadioButton\0display\0alignItems\0" @@ -84,14 +87,15 @@ QT_MOC_LITERAL(44, 483, 6) // "border" "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" + "qWidth\0qHeight\0maxWidth\0maxHeight\0" + "paddingTop\0paddingRight\0paddingBottom\0" + "paddingLeft\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 @@ -102,7 +106,7 @@ static const uint qt_meta_data_NRadioButton[] = { 0, // classname 0, 0, // classinfo 0, 0, // methods - 44, 14, // properties + 46, 14, // properties 0, 0, // enums/sets 0, 0, // constructors 0, // flags @@ -146,13 +150,15 @@ static const uint qt_meta_data_NRadioButton[] = { 35, QMetaType::QString, 0x00095003, 36, QMetaType::QString, 0x00095003, 37, QMetaType::QString, 0x00095003, - 38, QMetaType::Float, 0x00095003, - 39, QMetaType::Float, 0x00095003, + 38, QMetaType::QString, 0x00095003, + 39, QMetaType::QString, 0x00095003, 40, QMetaType::Float, 0x00095003, 41, QMetaType::Float, 0x00095003, 42, QMetaType::Float, 0x00095003, 43, QMetaType::Float, 0x00095003, 44, QMetaType::Float, 0x00095003, + 45, QMetaType::Float, 0x00095003, + 46, QMetaType::Float, 0x00095003, 0 // eod }; @@ -187,29 +193,31 @@ void NRadioButton::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id 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; + case 21: *reinterpret_cast< QString*>(_v) = _t->_yWidth; break; + case 22: *reinterpret_cast< QString*>(_v) = _t->_yHeight; break; + case 23: *reinterpret_cast< QString*>(_v) = _t->_yMaxWidth; break; + case 24: *reinterpret_cast< QString*>(_v) = _t->_yMaxHeight; break; + case 25: *reinterpret_cast< QString*>(_v) = _t->_yPaddingTop; break; + case 26: *reinterpret_cast< QString*>(_v) = _t->_yPaddingRight; break; + case 27: *reinterpret_cast< QString*>(_v) = _t->_yPaddingBottom; break; + case 28: *reinterpret_cast< QString*>(_v) = _t->_yPaddingLeft; break; + case 29: *reinterpret_cast< QString*>(_v) = _t->_yPaddingHorizontal; break; + case 30: *reinterpret_cast< QString*>(_v) = _t->_yPaddingVertical; break; + case 31: *reinterpret_cast< QString*>(_v) = _t->_yPadding; break; + case 32: *reinterpret_cast< QString*>(_v) = _t->_yMarginTop; break; + case 33: *reinterpret_cast< QString*>(_v) = _t->_yMarginRight; break; + case 34: *reinterpret_cast< QString*>(_v) = _t->_yMarginBottom; break; + case 35: *reinterpret_cast< QString*>(_v) = _t->_yMarginLeft; break; + case 36: *reinterpret_cast< QString*>(_v) = _t->_yMarginHorizontal; break; + case 37: *reinterpret_cast< QString*>(_v) = _t->_yMarginVertical; break; + case 38: *reinterpret_cast< QString*>(_v) = _t->_yMargin; break; + case 39: *reinterpret_cast< float*>(_v) = _t->_yBorderTop; break; + case 40: *reinterpret_cast< float*>(_v) = _t->_yBorderRight; break; + case 41: *reinterpret_cast< float*>(_v) = _t->_yBorderBottom; break; + case 42: *reinterpret_cast< float*>(_v) = _t->_yBorderLeft; break; + case 43: *reinterpret_cast< float*>(_v) = _t->_yBorderHorizontal; break; + case 44: *reinterpret_cast< float*>(_v) = _t->_yBorderVertical; break; + case 45: *reinterpret_cast< float*>(_v) = _t->_yBorder; break; default: break; } } else if (_c == QMetaObject::WriteProperty) { @@ -238,29 +246,31 @@ void NRadioButton::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id 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; + case 21: _t->setYWidth(*reinterpret_cast< QString*>(_v)); break; + case 22: _t->setYHeight(*reinterpret_cast< QString*>(_v)); break; + case 23: _t->setYMaxWidth(*reinterpret_cast< QString*>(_v)); break; + case 24: _t->setYMaxHeight(*reinterpret_cast< QString*>(_v)); break; + case 25: _t->setYPaddingTop(*reinterpret_cast< QString*>(_v)); break; + case 26: _t->setYPaddingRight(*reinterpret_cast< QString*>(_v)); break; + case 27: _t->setYPaddingBottom(*reinterpret_cast< QString*>(_v)); break; + case 28: _t->setYPaddingLeft(*reinterpret_cast< QString*>(_v)); break; + case 29: _t->setYPaddingHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 30: _t->setYPaddingVertical(*reinterpret_cast< QString*>(_v)); break; + case 31: _t->setYPadding(*reinterpret_cast< QString*>(_v)); break; + case 32: _t->setYMarginTop(*reinterpret_cast< QString*>(_v)); break; + case 33: _t->setYMarginRight(*reinterpret_cast< QString*>(_v)); break; + case 34: _t->setYMarginBottom(*reinterpret_cast< QString*>(_v)); break; + case 35: _t->setYMarginLeft(*reinterpret_cast< QString*>(_v)); break; + case 36: _t->setYMarginHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 37: _t->setYMarginVertical(*reinterpret_cast< QString*>(_v)); break; + case 38: _t->setYMarginAll(*reinterpret_cast< QString*>(_v)); break; + case 39: _t->setYBorderTop(*reinterpret_cast< float*>(_v)); break; + case 40: _t->setYBorderRight(*reinterpret_cast< float*>(_v)); break; + case 41: _t->setYBorderBottom(*reinterpret_cast< float*>(_v)); break; + case 42: _t->setYBorderLeft(*reinterpret_cast< float*>(_v)); break; + case 43: _t->setYBorderHorizontal(*reinterpret_cast< float*>(_v)); break; + case 44: _t->setYBorderVertical(*reinterpret_cast< float*>(_v)); break; + case 45: _t->setYBorder(*reinterpret_cast< float*>(_v)); break; default: break; } } else if (_c == QMetaObject::ResetProperty) { @@ -307,17 +317,17 @@ int NRadioButton::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_c == QMetaObject::ReadProperty || _c == QMetaObject::WriteProperty || _c == QMetaObject::ResetProperty || _c == QMetaObject::RegisterPropertyMetaType) { qt_static_metacall(this, _c, _id, _a); - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyDesignable) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyScriptable) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyStored) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyEditable) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyUser) { - _id -= 44; + _id -= 46; } #endif // QT_NO_PROPERTIES return _id; diff --git a/src/cpp/autogen/nwidget_moc.cpp b/src/cpp/autogen/nwidget_moc.cpp index 70f1ad8ce..595b5b235 100644 --- a/src/cpp/autogen/nwidget_moc.cpp +++ b/src/cpp/autogen/nwidget_moc.cpp @@ -1,18 +1,19 @@ /**************************************************************************** ** Meta object code from reading C++ file 'nwidget.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.12.1) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.13.0) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ +#include #include "../QtGui/QWidget/nwidget.h" #include #include #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'nwidget.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.12.1. It" +#error "This file was generated using the moc from 5.13.0. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -21,8 +22,8 @@ QT_BEGIN_MOC_NAMESPACE QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED struct qt_meta_stringdata_NWidget_t { - QByteArrayData data[45]; - char stringdata0[485]; + QByteArrayData data[47]; + char stringdata0[500]; }; #define QT_MOC_LITERAL(idx, ofs, len) \ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ @@ -53,29 +54,31 @@ QT_MOC_LITERAL(18, 170, 4), // "left" QT_MOC_LITERAL(19, 175, 9), // "flexBasis" QT_MOC_LITERAL(20, 185, 8), // "minWidth" QT_MOC_LITERAL(21, 194, 9), // "minHeight" -QT_MOC_LITERAL(22, 204, 8), // "maxWidth" -QT_MOC_LITERAL(23, 213, 9), // "maxHeight" -QT_MOC_LITERAL(24, 223, 10), // "paddingTop" -QT_MOC_LITERAL(25, 234, 12), // "paddingRight" -QT_MOC_LITERAL(26, 247, 13), // "paddingBottom" -QT_MOC_LITERAL(27, 261, 11), // "paddingLeft" -QT_MOC_LITERAL(28, 273, 17), // "paddingHorizontal" -QT_MOC_LITERAL(29, 291, 15), // "paddingVertical" -QT_MOC_LITERAL(30, 307, 7), // "padding" -QT_MOC_LITERAL(31, 315, 9), // "marginTop" -QT_MOC_LITERAL(32, 325, 11), // "marginRight" -QT_MOC_LITERAL(33, 337, 12), // "marginBottom" -QT_MOC_LITERAL(34, 350, 10), // "marginLeft" -QT_MOC_LITERAL(35, 361, 16), // "marginHorizontal" -QT_MOC_LITERAL(36, 378, 14), // "marginVertical" -QT_MOC_LITERAL(37, 393, 6), // "margin" -QT_MOC_LITERAL(38, 400, 9), // "borderTop" -QT_MOC_LITERAL(39, 410, 11), // "borderRight" -QT_MOC_LITERAL(40, 422, 12), // "borderBottom" -QT_MOC_LITERAL(41, 435, 10), // "borderLeft" -QT_MOC_LITERAL(42, 446, 16), // "borderHorizontal" -QT_MOC_LITERAL(43, 463, 14), // "borderVertical" -QT_MOC_LITERAL(44, 478, 6) // "border" +QT_MOC_LITERAL(22, 204, 6), // "qWidth" +QT_MOC_LITERAL(23, 211, 7), // "qHeight" +QT_MOC_LITERAL(24, 219, 8), // "maxWidth" +QT_MOC_LITERAL(25, 228, 9), // "maxHeight" +QT_MOC_LITERAL(26, 238, 10), // "paddingTop" +QT_MOC_LITERAL(27, 249, 12), // "paddingRight" +QT_MOC_LITERAL(28, 262, 13), // "paddingBottom" +QT_MOC_LITERAL(29, 276, 11), // "paddingLeft" +QT_MOC_LITERAL(30, 288, 17), // "paddingHorizontal" +QT_MOC_LITERAL(31, 306, 15), // "paddingVertical" +QT_MOC_LITERAL(32, 322, 7), // "padding" +QT_MOC_LITERAL(33, 330, 9), // "marginTop" +QT_MOC_LITERAL(34, 340, 11), // "marginRight" +QT_MOC_LITERAL(35, 352, 12), // "marginBottom" +QT_MOC_LITERAL(36, 365, 10), // "marginLeft" +QT_MOC_LITERAL(37, 376, 16), // "marginHorizontal" +QT_MOC_LITERAL(38, 393, 14), // "marginVertical" +QT_MOC_LITERAL(39, 408, 6), // "margin" +QT_MOC_LITERAL(40, 415, 9), // "borderTop" +QT_MOC_LITERAL(41, 425, 11), // "borderRight" +QT_MOC_LITERAL(42, 437, 12), // "borderBottom" +QT_MOC_LITERAL(43, 450, 10), // "borderLeft" +QT_MOC_LITERAL(44, 461, 16), // "borderHorizontal" +QT_MOC_LITERAL(45, 478, 14), // "borderVertical" +QT_MOC_LITERAL(46, 493, 6) // "border" }, "NWidget\0display\0alignItems\0alignContent\0" @@ -83,15 +86,15 @@ QT_MOC_LITERAL(44, 478, 6) // "border" "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" + "flexBasis\0minWidth\0minHeight\0qWidth\0" + "qHeight\0maxWidth\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 @@ -102,7 +105,7 @@ static const uint qt_meta_data_NWidget[] = { 0, // classname 0, 0, // classinfo 0, 0, // methods - 44, 14, // properties + 46, 14, // properties 0, 0, // enums/sets 0, 0, // constructors 0, // flags @@ -146,13 +149,15 @@ static const uint qt_meta_data_NWidget[] = { 35, QMetaType::QString, 0x00095003, 36, QMetaType::QString, 0x00095003, 37, QMetaType::QString, 0x00095003, - 38, QMetaType::Float, 0x00095003, - 39, QMetaType::Float, 0x00095003, + 38, QMetaType::QString, 0x00095003, + 39, QMetaType::QString, 0x00095003, 40, QMetaType::Float, 0x00095003, 41, QMetaType::Float, 0x00095003, 42, QMetaType::Float, 0x00095003, 43, QMetaType::Float, 0x00095003, 44, QMetaType::Float, 0x00095003, + 45, QMetaType::Float, 0x00095003, + 46, QMetaType::Float, 0x00095003, 0 // eod }; @@ -187,29 +192,31 @@ void NWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, voi 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; + case 21: *reinterpret_cast< QString*>(_v) = _t->_yWidth; break; + case 22: *reinterpret_cast< QString*>(_v) = _t->_yHeight; break; + case 23: *reinterpret_cast< QString*>(_v) = _t->_yMaxWidth; break; + case 24: *reinterpret_cast< QString*>(_v) = _t->_yMaxHeight; break; + case 25: *reinterpret_cast< QString*>(_v) = _t->_yPaddingTop; break; + case 26: *reinterpret_cast< QString*>(_v) = _t->_yPaddingRight; break; + case 27: *reinterpret_cast< QString*>(_v) = _t->_yPaddingBottom; break; + case 28: *reinterpret_cast< QString*>(_v) = _t->_yPaddingLeft; break; + case 29: *reinterpret_cast< QString*>(_v) = _t->_yPaddingHorizontal; break; + case 30: *reinterpret_cast< QString*>(_v) = _t->_yPaddingVertical; break; + case 31: *reinterpret_cast< QString*>(_v) = _t->_yPadding; break; + case 32: *reinterpret_cast< QString*>(_v) = _t->_yMarginTop; break; + case 33: *reinterpret_cast< QString*>(_v) = _t->_yMarginRight; break; + case 34: *reinterpret_cast< QString*>(_v) = _t->_yMarginBottom; break; + case 35: *reinterpret_cast< QString*>(_v) = _t->_yMarginLeft; break; + case 36: *reinterpret_cast< QString*>(_v) = _t->_yMarginHorizontal; break; + case 37: *reinterpret_cast< QString*>(_v) = _t->_yMarginVertical; break; + case 38: *reinterpret_cast< QString*>(_v) = _t->_yMargin; break; + case 39: *reinterpret_cast< float*>(_v) = _t->_yBorderTop; break; + case 40: *reinterpret_cast< float*>(_v) = _t->_yBorderRight; break; + case 41: *reinterpret_cast< float*>(_v) = _t->_yBorderBottom; break; + case 42: *reinterpret_cast< float*>(_v) = _t->_yBorderLeft; break; + case 43: *reinterpret_cast< float*>(_v) = _t->_yBorderHorizontal; break; + case 44: *reinterpret_cast< float*>(_v) = _t->_yBorderVertical; break; + case 45: *reinterpret_cast< float*>(_v) = _t->_yBorder; break; default: break; } } else if (_c == QMetaObject::WriteProperty) { @@ -238,29 +245,31 @@ void NWidget::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, voi 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; + case 21: _t->setYWidth(*reinterpret_cast< QString*>(_v)); break; + case 22: _t->setYHeight(*reinterpret_cast< QString*>(_v)); break; + case 23: _t->setYMaxWidth(*reinterpret_cast< QString*>(_v)); break; + case 24: _t->setYMaxHeight(*reinterpret_cast< QString*>(_v)); break; + case 25: _t->setYPaddingTop(*reinterpret_cast< QString*>(_v)); break; + case 26: _t->setYPaddingRight(*reinterpret_cast< QString*>(_v)); break; + case 27: _t->setYPaddingBottom(*reinterpret_cast< QString*>(_v)); break; + case 28: _t->setYPaddingLeft(*reinterpret_cast< QString*>(_v)); break; + case 29: _t->setYPaddingHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 30: _t->setYPaddingVertical(*reinterpret_cast< QString*>(_v)); break; + case 31: _t->setYPadding(*reinterpret_cast< QString*>(_v)); break; + case 32: _t->setYMarginTop(*reinterpret_cast< QString*>(_v)); break; + case 33: _t->setYMarginRight(*reinterpret_cast< QString*>(_v)); break; + case 34: _t->setYMarginBottom(*reinterpret_cast< QString*>(_v)); break; + case 35: _t->setYMarginLeft(*reinterpret_cast< QString*>(_v)); break; + case 36: _t->setYMarginHorizontal(*reinterpret_cast< QString*>(_v)); break; + case 37: _t->setYMarginVertical(*reinterpret_cast< QString*>(_v)); break; + case 38: _t->setYMarginAll(*reinterpret_cast< QString*>(_v)); break; + case 39: _t->setYBorderTop(*reinterpret_cast< float*>(_v)); break; + case 40: _t->setYBorderRight(*reinterpret_cast< float*>(_v)); break; + case 41: _t->setYBorderBottom(*reinterpret_cast< float*>(_v)); break; + case 42: _t->setYBorderLeft(*reinterpret_cast< float*>(_v)); break; + case 43: _t->setYBorderHorizontal(*reinterpret_cast< float*>(_v)); break; + case 44: _t->setYBorderVertical(*reinterpret_cast< float*>(_v)); break; + case 45: _t->setYBorder(*reinterpret_cast< float*>(_v)); break; default: break; } } else if (_c == QMetaObject::ResetProperty) { @@ -307,17 +316,17 @@ int NWidget::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_c == QMetaObject::ReadProperty || _c == QMetaObject::WriteProperty || _c == QMetaObject::ResetProperty || _c == QMetaObject::RegisterPropertyMetaType) { qt_static_metacall(this, _c, _id, _a); - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyDesignable) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyScriptable) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyStored) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyEditable) { - _id -= 44; + _id -= 46; } else if (_c == QMetaObject::QueryPropertyUser) { - _id -= 44; + _id -= 46; } #endif // QT_NO_PROPERTIES return _id; diff --git a/src/cpp/core/FlexLayout/flexitem.cpp b/src/cpp/core/FlexLayout/flexitem.cpp index 0972d3f24..a6fa48172 100644 --- a/src/cpp/core/FlexLayout/flexitem.cpp +++ b/src/cpp/core/FlexLayout/flexitem.cpp @@ -3,7 +3,7 @@ FlexItem::FlexItem() { this->node = YGNodeNew(); - YGConfigSetUseWebDefaults(this->node->getConfig(),true); + // YGConfigSetUseWebDefaults(this->node->getConfig(),true); } YGNodeRef FlexItem::getFlexNode() const diff --git a/src/cpp/core/FlexLayout/flexlayout_wrap.cpp b/src/cpp/core/FlexLayout/flexlayout_wrap.cpp index a54decce5..6c14d0d99 100644 --- a/src/cpp/core/FlexLayout/flexlayout_wrap.cpp +++ b/src/cpp/core/FlexLayout/flexlayout_wrap.cpp @@ -25,12 +25,8 @@ FlexLayout* FlexLayoutWrap::getInternalInstance() { FlexLayoutWrap::FlexLayoutWrap(const Napi::CallbackInfo& info): Napi::ObjectWrap(info) { Napi::Env env = info.Env(); Napi::HandleScope scope(env); - - if(info.Length() == 2) { - Napi::Object parentObject = info[0].As(); - QWidgetWrap* parentWidgetWrap = Napi::ObjectWrap::Unwrap(parentObject); - this->instance = new FlexLayout(parentWidgetWrap->getInternalInstance()); - } else if(info.Length() == 1) { + + if(info.Length() == 1) { 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 @@ -68,7 +64,7 @@ Napi::Value FlexLayoutWrap::insertChildBefore(const Napi::CallbackInfo& info) { QWidgetWrap* widget = Napi::ObjectWrap::Unwrap(qwidgetObject); YGNodeRef childNodeRef = childFlexNodeObject.Data(); YGNodeRef beforeChildNodeRef = beforeChildFlexNodeObject.Data(); - + this->instance->insertChildBefore(widget->getInternalInstance(), beforeChildNodeRef, childNodeRef); return env.Null(); diff --git a/src/cpp/core/YogaWidget/yogawidget.cpp b/src/cpp/core/YogaWidget/yogawidget.cpp index e208a35c8..aed73f784 100644 --- a/src/cpp/core/YogaWidget/yogawidget.cpp +++ b/src/cpp/core/YogaWidget/yogawidget.cpp @@ -240,6 +240,30 @@ void YogaWidget::setYMinHeight(QString rawValue){ spdlog::warn("Invalid value: minHeight: {}",rawValue.toStdString()); } } +void YogaWidget::setYWidth(QString rawValue){ + try { + NodeValueUnit measurement = NodeStyle::parseMeasurement(rawValue); + (measurement.unit==YGUnitPercent) + ? YGNodeStyleSetWidthPercent(this->getFlexNode(), measurement.value) + : YGNodeStyleSetWidth(this->getFlexNode(), measurement.value); + this->_yWidth = rawValue; + spdlog::info("set qWidth: {}", rawValue.toStdString()); + }catch(...){ + spdlog::warn("Invalid value: qWidth: {}",rawValue.toStdString()); + } +} +void YogaWidget::setYHeight(QString rawValue){ + try { + NodeValueUnit measurement = NodeStyle::parseMeasurement(rawValue); + (measurement.unit==YGUnitPercent) + ? YGNodeStyleSetHeightPercent(this->getFlexNode(), measurement.value) + : YGNodeStyleSetHeight(this->getFlexNode(), measurement.value); + this->_yHeight = rawValue; + spdlog::info("set qHeight: {}", rawValue.toStdString()); + }catch(...){ + spdlog::warn("Invalid value: qHeight: {}",rawValue.toStdString()); + } +} void YogaWidget::setYMaxWidth(QString rawValue){ try { NodeValueUnit measurement = NodeStyle::parseMeasurement(rawValue); diff --git a/src/cpp/core/YogaWidget/yogawidget.h b/src/cpp/core/YogaWidget/yogawidget.h index 2de29e064..fbe8e1613 100644 --- a/src/cpp/core/YogaWidget/yogawidget.h +++ b/src/cpp/core/YogaWidget/yogawidget.h @@ -42,6 +42,8 @@ All Widgets for which you need to set yoga props via qstylesheet should Q_PROPERTY(QString flexBasis MEMBER _yFlexBasis WRITE setYFlexBasis) \ Q_PROPERTY(QString minWidth MEMBER _yMinWidth WRITE setYMinWidth) \ Q_PROPERTY(QString minHeight MEMBER _yMinHeight WRITE setYMinHeight) \ + Q_PROPERTY(QString qWidth MEMBER _yWidth WRITE setYWidth) \ + Q_PROPERTY(QString qHeight MEMBER _yHeight WRITE setYHeight) \ Q_PROPERTY(QString maxWidth MEMBER _yMaxWidth WRITE setYMaxWidth) \ Q_PROPERTY(QString maxHeight MEMBER _yMaxHeight WRITE setYMaxHeight) \ Q_PROPERTY(QString paddingTop MEMBER _yPaddingTop WRITE setYPaddingTop) \ @@ -95,6 +97,8 @@ public: QString _yMinHeight; QString _yMaxWidth; QString _yMaxHeight; + QString _yWidth; + QString _yHeight; QString _yPaddingTop; QString _yPaddingRight; QString _yPaddingBottom; @@ -138,6 +142,8 @@ public: void setYFlexBasis(QString rawValue); void setYMinWidth(QString rawValue); void setYMinHeight(QString rawValue); + void setYWidth(QString rawValue); + void setYHeight(QString rawValue); void setYMaxWidth(QString rawValue); void setYMaxHeight(QString rawValue); void setYPaddingTop(QString rawValue);