diff --git a/README-1.txt b/README-1.txt index a9e9a4b..94479ac 100644 --- a/README-1.txt +++ b/README-1.txt @@ -167,8 +167,8 @@ You might want to put this in your ~/.eclrc file: eql:*break-on-errors* t) It is HIGHLY RECOMMENDED to integrate the wrapper functions, see README-3-OPTIONAL. -This will bring you very convenient symbol tab-completion of all Qt functions in -Emacs/Slime. +This will make all Qt functions real Lisp functions, which also means symbol tab- +completion, both in Emacs/Slime and with ecl-readline. diff --git a/helper/generate.lisp b/helper/generate.lisp index 48eb7c7..1e2dd64 100644 --- a/helper/generate.lisp +++ b/helper/generate.lisp @@ -1204,8 +1204,7 @@ (unless (or (find* arg skip) (find* arg all-classes) (search "Abstract" arg) - (search "Base" arg) - (search "QStyleOption" arg)) + (search "Base" arg)) (incf *missing-types*) (write-line arg s))))))) diff --git a/helper/missing-types.txt b/helper/missing-types.txt index d39367e..b5b94b8 100644 --- a/helper/missing-types.txt +++ b/helper/missing-types.txt @@ -64,6 +64,22 @@ QStaticText QStringRef QStyleHintReturn QStyleHints +QStyleOptionButton +QStyleOptionComboBox +QStyleOptionComplex +QStyleOptionDockWidget +QStyleOptionFrame +QStyleOptionGroupBox +QStyleOptionHeader +QStyleOptionMenuItem +QStyleOptionProgressBar +QStyleOptionRubberBand +QStyleOptionSlider +QStyleOptionSpinBox +QStyleOptionTab +QStyleOptionTabWidgetFrame +QStyleOptionToolButton +QStyleOptionViewItem QSurfaceFormat QThread QTouchDevice diff --git a/helper/my-class-lists/gui/q-names.lisp b/helper/my-class-lists/gui/q-names.lisp index 9b2c632..50b1f71 100644 --- a/helper/my-class-lists/gui/q-names.lisp +++ b/helper/my-class-lists/gui/q-names.lisp @@ -127,6 +127,7 @@ "QProgressBar" "QProgressDialog" "QPropertyAnimation" + "QProxyStyle" "QPushButton" "QRadioButton" "QRegExpValidator" diff --git a/helper/parse-enums.lisp b/helper/parse-enums.lisp index 853f3c6..ede634c 100644 --- a/helper/parse-enums.lisp +++ b/helper/parse-enums.lisp @@ -7,15 +7,9 @@ (load "share") (defparameter *skip* - (list "QStyle::CC_" - "QStyle::CT_" - "QStyle::CE_" - "QStyle::PM_" + (list "QStyle::PM_" "QStyle::PE_" - "QStyle::RSIP_" - "QStyle::SP_" "QStyle::SH_" - "QStyle::SC_" "QStyle::SE_" "QStyle::SO_")) diff --git a/helper/parsed/q-methods.lisp b/helper/parsed/q-methods.lisp index db03fe6..b9ac734 100644 --- a/helper/parsed/q-methods.lisp +++ b/helper/parsed/q-methods.lisp @@ -3392,6 +3392,34 @@ "void setPropertyName ( const QByteArray & )" "void setTargetObject ( QObject * )" "QObject * targetObject () const") + (("QProxyStyle" . "QCommonStyle") + "new QProxyStyle ( QStyle * = 0 )" + "new QProxyStyle ( const QString & )" + "QStyle * baseStyle () const" + "void setBaseStyle ( QStyle * )" + "virtual void drawComplexControl ( ComplexControl , const QStyleOptionComplex * , QPainter * , const QWidget * = 0 ) const" + "virtual void drawControl ( ControlElement , const QStyleOption * , QPainter * , const QWidget * = 0 ) const" + "virtual void drawItemPixmap ( QPainter * , const QRect & , int , const QPixmap & ) const" + "virtual void drawItemText ( QPainter * , const QRect & , int , const QPalette & , bool , const QString & , QPalette::ColorRole = QPalette::NoRole ) const" + "virtual void drawPrimitive ( PrimitiveElement , const QStyleOption * , QPainter * , const QWidget * = 0 ) const" + "virtual QPixmap generatedIconPixmap ( QIcon::Mode , const QPixmap & , const QStyleOption * ) const" + "virtual SubControl hitTestComplexControl ( ComplexControl , const QStyleOptionComplex * , const QPoint & , const QWidget * = 0 ) const" + "virtual QRect itemPixmapRect ( const QRect & , int , const QPixmap & ) const" + "virtual QRect itemTextRect ( const QFontMetrics & , const QRect & , int , bool , const QString & ) const" + "virtual int layoutSpacing ( QSizePolicy::ControlType , QSizePolicy::ControlType , Qt::Orientation , const QStyleOption * = 0 , const QWidget * = 0 ) const" + "virtual int pixelMetric ( PixelMetric , const QStyleOption * = 0 , const QWidget * = 0 ) const" + "virtual void polish ( QWidget * )" + "virtual void polish ( QPalette & )" + "virtual void polish ( QApplication * )" + "virtual QSize sizeFromContents ( ContentsType , const QStyleOption * , const QSize & , const QWidget * ) const" + "virtual QIcon standardIcon ( StandardPixmap , const QStyleOption * = 0 , const QWidget * = 0 ) const" + "virtual QPalette standardPalette () const" + "virtual QPixmap standardPixmap ( StandardPixmap , const QStyleOption * , const QWidget * = 0 ) const" + "virtual int styleHint ( StyleHint , const QStyleOption * = 0 , const QWidget * = 0 , QStyleHintReturn * = 0 ) const" + "virtual QRect subControlRect ( ComplexControl , const QStyleOptionComplex * , SubControl , const QWidget * ) const" + "virtual QRect subElementRect ( SubElement , const QStyleOption * , const QWidget * ) const" + "virtual void unpolish ( QWidget * )" + "virtual void unpolish ( QApplication * )") (("QPushButton" . "QAbstractButton") "new QPushButton ( QWidget * = 0 )" "new QPushButton ( const QString & , QWidget * = 0 )" diff --git a/helper/parsed/q-override.lisp b/helper/parsed/q-override.lisp index 402f0bb..da18c33 100644 --- a/helper/parsed/q-override.lisp +++ b/helper/parsed/q-override.lisp @@ -1192,6 +1192,31 @@ "virtual bool event ( QEvent * )" "virtual void updateCurrentValue ( const QVariant & )" "virtual void updateState ( QAbstractAnimation::State , QAbstractAnimation::State )") + (("QProxyStyle" . "QCommonStyle") + "virtual void drawComplexControl ( ComplexControl , const QStyleOptionComplex * , QPainter * , const QWidget * = 0 ) const" + "virtual void drawControl ( ControlElement , const QStyleOption * , QPainter * , const QWidget * = 0 ) const" + "virtual void drawItemPixmap ( QPainter * , const QRect & , int , const QPixmap & ) const" + "virtual void drawItemText ( QPainter * , const QRect & , int , const QPalette & , bool , const QString & , QPalette::ColorRole = QPalette::NoRole ) const" + "virtual void drawPrimitive ( PrimitiveElement , const QStyleOption * , QPainter * , const QWidget * = 0 ) const" + "virtual QPixmap generatedIconPixmap ( QIcon::Mode , const QPixmap & , const QStyleOption * ) const" + "virtual SubControl hitTestComplexControl ( ComplexControl , const QStyleOptionComplex * , const QPoint & , const QWidget * = 0 ) const" + "virtual QRect itemPixmapRect ( const QRect & , int , const QPixmap & ) const" + "virtual QRect itemTextRect ( const QFontMetrics & , const QRect & , int , bool , const QString & ) const" + "virtual int layoutSpacing ( QSizePolicy::ControlType , QSizePolicy::ControlType , Qt::Orientation , const QStyleOption * = 0 , const QWidget * = 0 ) const" + "virtual int pixelMetric ( PixelMetric , const QStyleOption * = 0 , const QWidget * = 0 ) const" + "virtual void polish ( QWidget * )" + "virtual void polish ( QPalette & )" + "virtual void polish ( QApplication * )" + "virtual QSize sizeFromContents ( ContentsType , const QStyleOption * , const QSize & , const QWidget * ) const" + "virtual QIcon standardIcon ( StandardPixmap , const QStyleOption * = 0 , const QWidget * = 0 ) const" + "virtual QPalette standardPalette () const" + "virtual QPixmap standardPixmap ( StandardPixmap , const QStyleOption * , const QWidget * = 0 ) const" + "virtual int styleHint ( StyleHint , const QStyleOption * = 0 , const QWidget * = 0 , QStyleHintReturn * = 0 ) const" + "virtual QRect subControlRect ( ComplexControl , const QStyleOptionComplex * , SubControl , const QWidget * ) const" + "virtual QRect subElementRect ( SubElement , const QStyleOption * , const QWidget * ) const" + "virtual void unpolish ( QWidget * )" + "virtual void unpolish ( QApplication * )" + "virtual bool event ( QEvent * )") (("QPushButton" . "QAbstractButton") "virtual QSize minimumSizeHint () const" "virtual QSize sizeHint () const" diff --git a/src/eql.cpp b/src/eql.cpp index 6bebfad..e5629d7 100644 --- a/src/eql.cpp +++ b/src/eql.cpp @@ -7,7 +7,7 @@ #include #include -const char EQL::version[] = "16.12.3"; // Dec 2016 +const char EQL::version[] = "16.12.4"; // Dec 2016 extern "C" void ini_EQL(cl_object); diff --git a/src/eql_lib.pro b/src/eql_lib.pro index 69ed574..928a468 100644 --- a/src/eql_lib.pro +++ b/src/eql_lib.pro @@ -31,3 +31,7 @@ SOURCES += gen/_lobjects.cpp \ ecl_fun.cpp \ extras.cpp \ eql.cpp + +gcc { + QMAKE_CXXFLAGS_WARN_ON += -Wno-clobbered +} diff --git a/src/gen/_lobjects.cpp b/src/gen/_lobjects.cpp index 0331d12..50f667c 100644 --- a/src/gen/_lobjects.cpp +++ b/src/gen/_lobjects.cpp @@ -208,6 +208,7 @@ NumList LProcess::overrideIds = NumList() << 318 << 126 << 127 << 128 << 129 << NumList LProgressBar::overrideIds = NumList() << 319 << 24 << 25 << 20; NumList LProgressDialog::overrideIds = NumList() << 25 << 12 << 27 << 40 << 41; NumList LPropertyAnimation::overrideIds = NumList() << 320 << 4; +NumList LProxyStyle::overrideIds = NumList() << 192 << 193 << 209 << 210 << 194 << 195 << 196 << 211 << 212 << 197 << 198 << 201 << 199 << 200 << 202 << 213 << 214 << 203 << 204 << 205 << 206 << 207 << 208; NumList LPushButton::overrideIds = NumList() << 24 << 25 << 13 << 14 << 10 << 15 << 20; NumList LRadioButton::overrideIds = NumList() << 24 << 25 << 10 << 17 << 20; NumList LRegExpValidator::overrideIds = NumList() << 144; @@ -440,7 +441,7 @@ void LObjects::ini(EQL* e) { ok = true; eql = e; dynObject = new DynObject; - Q = new QObject* [242]; for(int i = 0; i < 242; ++i) { Q[i] = 0; } + Q = new QObject* [243]; for(int i = 0; i < 243; ++i) { Q[i] = 0; } N = new QObject* [215]; for(int i = 0; i < 215; ++i) { N[i] = 0; } Q[0] = new Q1; Q[1] = new Q2; @@ -569,7 +570,7 @@ void LObjects::ini(EQL* e) { Q[157] = new Q158; Q[158] = new Q159; Q[159] = new Q160; - Q[161] = new Q162; + Q[160] = new Q161; Q[162] = new Q163; Q[163] = new Q164; Q[164] = new Q165; @@ -586,7 +587,7 @@ void LObjects::ini(EQL* e) { Q[175] = new Q176; Q[176] = new Q177; Q[177] = new Q178; - Q[183] = new Q184; + Q[178] = new Q179; Q[184] = new Q185; Q[185] = new Q186; Q[186] = new Q187; @@ -595,7 +596,7 @@ void LObjects::ini(EQL* e) { Q[189] = new Q190; Q[190] = new Q191; Q[191] = new Q192; - Q[194] = new Q195; + Q[192] = new Q193; Q[195] = new Q196; Q[196] = new Q197; Q[197] = new Q198; @@ -604,7 +605,7 @@ void LObjects::ini(EQL* e) { Q[200] = new Q201; Q[201] = new Q202; Q[202] = new Q203; - Q[205] = new Q206; + Q[203] = new Q204; Q[206] = new Q207; Q[207] = new Q208; Q[208] = new Q209; @@ -621,17 +622,18 @@ void LObjects::ini(EQL* e) { Q[219] = new Q220; Q[220] = new Q221; Q[221] = new Q222; - Q[223] = new Q224; + Q[222] = new Q223; Q[224] = new Q225; Q[225] = new Q226; Q[226] = new Q227; Q[227] = new Q228; Q[228] = new Q229; - Q[237] = new Q238; + Q[229] = new Q230; Q[238] = new Q239; Q[239] = new Q240; Q[240] = new Q241; Q[241] = new Q242; + Q[242] = new Q243; N[0] = new N1; N[1] = new N2; N[2] = new N3; @@ -961,90 +963,91 @@ void LObjects::ini(EQL* e) { q_names["QProgressBar"] = 156; q_names["QProgressDialog"] = 157; q_names["QPropertyAnimation"] = 158; - q_names["QPushButton"] = 159; - q_names["QRadioButton"] = 160; - q_names["QRadioTuner"] = 161; - q_names["QRegExpValidator"] = 162; - q_names["QRubberBand"] = 163; - q_names["QScreen"] = 164; - q_names["QScrollArea"] = 165; - q_names["QScrollBar"] = 166; - q_names["QSequentialAnimationGroup"] = 167; - q_names["QSessionManager"] = 168; - q_names["QSettings"] = 169; - q_names["QShortcut"] = 170; - q_names["QSignalTransition"] = 171; - q_names["QSizeGrip"] = 172; - q_names["QSlider"] = 173; - q_names["QSortFilterProxyModel"] = 174; - q_names["QSpinBox"] = 175; - q_names["QSplashScreen"] = 176; - q_names["QSplitter"] = 177; - q_names["QSplitterHandle"] = 178; - q_names["QSqlDriver"] = 179; - q_names["QSqlQueryModel"] = 180; - q_names["QSqlRelationalDelegate"] = 181; - q_names["QSqlRelationalTableModel"] = 182; - q_names["QSqlTableModel"] = 183; - q_names["QStackedLayout"] = 184; - q_names["QStackedWidget"] = 185; - q_names["QStandardItemModel"] = 186; - q_names["QState"] = 187; - q_names["QStateMachine"] = 188; - q_names["QStatusBar"] = 189; - q_names["QStringListModel"] = 190; - q_names["QStyle"] = 191; - q_names["QStyledItemDelegate"] = 192; - q_names["QSvgRenderer"] = 193; - q_names["QSvgWidget"] = 194; - q_names["QSwipeGesture"] = 195; - q_names["QSyntaxHighlighter"] = 196; - q_names["QSystemTrayIcon"] = 197; - q_names["QTabBar"] = 198; - q_names["QTabWidget"] = 199; - q_names["QTableView"] = 200; - q_names["QTableWidget"] = 201; - q_names["QTapAndHoldGesture"] = 202; - q_names["QTapGesture"] = 203; - q_names["QTcpServer"] = 204; - q_names["QTcpSocket"] = 205; - q_names["QTextBlockGroup"] = 206; - q_names["QTextBrowser"] = 207; - q_names["QTextDocument"] = 208; - q_names["QTextEdit"] = 209; - q_names["QTextFrame"] = 210; - q_names["QTextList"] = 211; - q_names["QTextObject"] = 212; - q_names["QTextTable"] = 213; - q_names["QTimeEdit"] = 214; - q_names["QTimeLine"] = 215; - q_names["QTimer"] = 216; - q_names["QToolBar"] = 217; - q_names["QToolBox"] = 218; - q_names["QToolButton"] = 219; - q_names["QTranslator"] = 220; - q_names["QTreeView"] = 221; - q_names["QTreeWidget"] = 222; - q_names["QUdpSocket"] = 223; - q_names["QUndoGroup"] = 224; - q_names["QUndoStack"] = 225; - q_names["QUndoView"] = 226; - q_names["QVBoxLayout"] = 227; - q_names["QValidator"] = 228; - q_names["QVariantAnimation"] = 229; - q_names["QVideoWidget"] = 230; - q_names["QVideoWidgetControl"] = 231; - q_names["QWebFrame"] = 232; - q_names["QWebHistoryInterface"] = 233; - q_names["QWebInspector"] = 234; - q_names["QWebPage"] = 235; - q_names["QWebPluginFactory"] = 236; - q_names["QWebView"] = 237; - q_names["QWidget"] = 238; - q_names["QWidgetAction"] = 239; - q_names["QWindow"] = 240; - q_names["QWizard"] = 241; - q_names["QWizardPage"] = 242; + q_names["QProxyStyle"] = 159; + q_names["QPushButton"] = 160; + q_names["QRadioButton"] = 161; + q_names["QRadioTuner"] = 162; + q_names["QRegExpValidator"] = 163; + q_names["QRubberBand"] = 164; + q_names["QScreen"] = 165; + q_names["QScrollArea"] = 166; + q_names["QScrollBar"] = 167; + q_names["QSequentialAnimationGroup"] = 168; + q_names["QSessionManager"] = 169; + q_names["QSettings"] = 170; + q_names["QShortcut"] = 171; + q_names["QSignalTransition"] = 172; + q_names["QSizeGrip"] = 173; + q_names["QSlider"] = 174; + q_names["QSortFilterProxyModel"] = 175; + q_names["QSpinBox"] = 176; + q_names["QSplashScreen"] = 177; + q_names["QSplitter"] = 178; + q_names["QSplitterHandle"] = 179; + q_names["QSqlDriver"] = 180; + q_names["QSqlQueryModel"] = 181; + q_names["QSqlRelationalDelegate"] = 182; + q_names["QSqlRelationalTableModel"] = 183; + q_names["QSqlTableModel"] = 184; + q_names["QStackedLayout"] = 185; + q_names["QStackedWidget"] = 186; + q_names["QStandardItemModel"] = 187; + q_names["QState"] = 188; + q_names["QStateMachine"] = 189; + q_names["QStatusBar"] = 190; + q_names["QStringListModel"] = 191; + q_names["QStyle"] = 192; + q_names["QStyledItemDelegate"] = 193; + q_names["QSvgRenderer"] = 194; + q_names["QSvgWidget"] = 195; + q_names["QSwipeGesture"] = 196; + q_names["QSyntaxHighlighter"] = 197; + q_names["QSystemTrayIcon"] = 198; + q_names["QTabBar"] = 199; + q_names["QTabWidget"] = 200; + q_names["QTableView"] = 201; + q_names["QTableWidget"] = 202; + q_names["QTapAndHoldGesture"] = 203; + q_names["QTapGesture"] = 204; + q_names["QTcpServer"] = 205; + q_names["QTcpSocket"] = 206; + q_names["QTextBlockGroup"] = 207; + q_names["QTextBrowser"] = 208; + q_names["QTextDocument"] = 209; + q_names["QTextEdit"] = 210; + q_names["QTextFrame"] = 211; + q_names["QTextList"] = 212; + q_names["QTextObject"] = 213; + q_names["QTextTable"] = 214; + q_names["QTimeEdit"] = 215; + q_names["QTimeLine"] = 216; + q_names["QTimer"] = 217; + q_names["QToolBar"] = 218; + q_names["QToolBox"] = 219; + q_names["QToolButton"] = 220; + q_names["QTranslator"] = 221; + q_names["QTreeView"] = 222; + q_names["QTreeWidget"] = 223; + q_names["QUdpSocket"] = 224; + q_names["QUndoGroup"] = 225; + q_names["QUndoStack"] = 226; + q_names["QUndoView"] = 227; + q_names["QVBoxLayout"] = 228; + q_names["QValidator"] = 229; + q_names["QVariantAnimation"] = 230; + q_names["QVideoWidget"] = 231; + q_names["QVideoWidgetControl"] = 232; + q_names["QWebFrame"] = 233; + q_names["QWebHistoryInterface"] = 234; + q_names["QWebInspector"] = 235; + q_names["QWebPage"] = 236; + q_names["QWebPluginFactory"] = 237; + q_names["QWebView"] = 238; + q_names["QWidget"] = 239; + q_names["QWidgetAction"] = 240; + q_names["QWindow"] = 241; + q_names["QWizard"] = 242; + q_names["QWizardPage"] = 243; n_names["QAbstractGraphicsShapeItem"] = 1; n_names["QAccessible"] = 2; n_names["QAccessibleEvent"] = 3; @@ -2462,71 +2465,72 @@ const QMetaObject* LObjects::staticMetaObject(const QByteArray& name, int n) { case 156: m = &QProgressBar::staticMetaObject; break; case 157: m = &QProgressDialog::staticMetaObject; break; case 158: m = &QPropertyAnimation::staticMetaObject; break; - case 159: m = &QPushButton::staticMetaObject; break; - case 160: m = &QRadioButton::staticMetaObject; break; - case 162: m = &QRegExpValidator::staticMetaObject; break; - case 163: m = &QRubberBand::staticMetaObject; break; - case 164: m = &QScreen::staticMetaObject; break; - case 165: m = &QScrollArea::staticMetaObject; break; - case 166: m = &QScrollBar::staticMetaObject; break; - case 167: m = &QSequentialAnimationGroup::staticMetaObject; break; - case 168: m = &QSessionManager::staticMetaObject; break; - case 169: m = &QSettings::staticMetaObject; break; - case 170: m = &QShortcut::staticMetaObject; break; - case 171: m = &QSignalTransition::staticMetaObject; break; - case 172: m = &QSizeGrip::staticMetaObject; break; - case 173: m = &QSlider::staticMetaObject; break; - case 174: m = &QSortFilterProxyModel::staticMetaObject; break; - case 175: m = &QSpinBox::staticMetaObject; break; - case 176: m = &QSplashScreen::staticMetaObject; break; - case 177: m = &QSplitter::staticMetaObject; break; - case 178: m = &QSplitterHandle::staticMetaObject; break; - case 184: m = &QStackedLayout::staticMetaObject; break; - case 185: m = &QStackedWidget::staticMetaObject; break; - case 186: m = &QStandardItemModel::staticMetaObject; break; - case 187: m = &QState::staticMetaObject; break; - case 188: m = &QStateMachine::staticMetaObject; break; - case 189: m = &QStatusBar::staticMetaObject; break; - case 190: m = &QStringListModel::staticMetaObject; break; - case 191: m = &QStyle::staticMetaObject; break; - case 192: m = &QStyledItemDelegate::staticMetaObject; break; - case 195: m = &QSwipeGesture::staticMetaObject; break; - case 196: m = &QSyntaxHighlighter::staticMetaObject; break; - case 197: m = &QSystemTrayIcon::staticMetaObject; break; - case 198: m = &QTabBar::staticMetaObject; break; - case 199: m = &QTabWidget::staticMetaObject; break; - case 200: m = &QTableView::staticMetaObject; break; - case 201: m = &QTableWidget::staticMetaObject; break; - case 202: m = &QTapAndHoldGesture::staticMetaObject; break; - case 203: m = &QTapGesture::staticMetaObject; break; - case 206: m = &QTextBlockGroup::staticMetaObject; break; - case 207: m = &QTextBrowser::staticMetaObject; break; - case 208: m = &QTextDocument::staticMetaObject; break; - case 209: m = &QTextEdit::staticMetaObject; break; - case 210: m = &QTextFrame::staticMetaObject; break; - case 211: m = &QTextList::staticMetaObject; break; - case 212: m = &QTextObject::staticMetaObject; break; - case 213: m = &QTextTable::staticMetaObject; break; - case 214: m = &QTimeEdit::staticMetaObject; break; - case 215: m = &QTimeLine::staticMetaObject; break; - case 216: m = &QTimer::staticMetaObject; break; - case 217: m = &QToolBar::staticMetaObject; break; - case 218: m = &QToolBox::staticMetaObject; break; - case 219: m = &QToolButton::staticMetaObject; break; - case 220: m = &QTranslator::staticMetaObject; break; - case 221: m = &QTreeView::staticMetaObject; break; - case 222: m = &QTreeWidget::staticMetaObject; break; - case 224: m = &QUndoGroup::staticMetaObject; break; - case 225: m = &QUndoStack::staticMetaObject; break; - case 226: m = &QUndoView::staticMetaObject; break; - case 227: m = &QVBoxLayout::staticMetaObject; break; - case 228: m = &QValidator::staticMetaObject; break; - case 229: m = &QVariantAnimation::staticMetaObject; break; - case 238: m = &QWidget::staticMetaObject; break; - case 239: m = &QWidgetAction::staticMetaObject; break; - case 240: m = &QWindow::staticMetaObject; break; - case 241: m = &QWizard::staticMetaObject; break; - case 242: m = &QWizardPage::staticMetaObject; break; + case 159: m = &QProxyStyle::staticMetaObject; break; + case 160: m = &QPushButton::staticMetaObject; break; + case 161: m = &QRadioButton::staticMetaObject; break; + case 163: m = &QRegExpValidator::staticMetaObject; break; + case 164: m = &QRubberBand::staticMetaObject; break; + case 165: m = &QScreen::staticMetaObject; break; + case 166: m = &QScrollArea::staticMetaObject; break; + case 167: m = &QScrollBar::staticMetaObject; break; + case 168: m = &QSequentialAnimationGroup::staticMetaObject; break; + case 169: m = &QSessionManager::staticMetaObject; break; + case 170: m = &QSettings::staticMetaObject; break; + case 171: m = &QShortcut::staticMetaObject; break; + case 172: m = &QSignalTransition::staticMetaObject; break; + case 173: m = &QSizeGrip::staticMetaObject; break; + case 174: m = &QSlider::staticMetaObject; break; + case 175: m = &QSortFilterProxyModel::staticMetaObject; break; + case 176: m = &QSpinBox::staticMetaObject; break; + case 177: m = &QSplashScreen::staticMetaObject; break; + case 178: m = &QSplitter::staticMetaObject; break; + case 179: m = &QSplitterHandle::staticMetaObject; break; + case 185: m = &QStackedLayout::staticMetaObject; break; + case 186: m = &QStackedWidget::staticMetaObject; break; + case 187: m = &QStandardItemModel::staticMetaObject; break; + case 188: m = &QState::staticMetaObject; break; + case 189: m = &QStateMachine::staticMetaObject; break; + case 190: m = &QStatusBar::staticMetaObject; break; + case 191: m = &QStringListModel::staticMetaObject; break; + case 192: m = &QStyle::staticMetaObject; break; + case 193: m = &QStyledItemDelegate::staticMetaObject; break; + case 196: m = &QSwipeGesture::staticMetaObject; break; + case 197: m = &QSyntaxHighlighter::staticMetaObject; break; + case 198: m = &QSystemTrayIcon::staticMetaObject; break; + case 199: m = &QTabBar::staticMetaObject; break; + case 200: m = &QTabWidget::staticMetaObject; break; + case 201: m = &QTableView::staticMetaObject; break; + case 202: m = &QTableWidget::staticMetaObject; break; + case 203: m = &QTapAndHoldGesture::staticMetaObject; break; + case 204: m = &QTapGesture::staticMetaObject; break; + case 207: m = &QTextBlockGroup::staticMetaObject; break; + case 208: m = &QTextBrowser::staticMetaObject; break; + case 209: m = &QTextDocument::staticMetaObject; break; + case 210: m = &QTextEdit::staticMetaObject; break; + case 211: m = &QTextFrame::staticMetaObject; break; + case 212: m = &QTextList::staticMetaObject; break; + case 213: m = &QTextObject::staticMetaObject; break; + case 214: m = &QTextTable::staticMetaObject; break; + case 215: m = &QTimeEdit::staticMetaObject; break; + case 216: m = &QTimeLine::staticMetaObject; break; + case 217: m = &QTimer::staticMetaObject; break; + case 218: m = &QToolBar::staticMetaObject; break; + case 219: m = &QToolBox::staticMetaObject; break; + case 220: m = &QToolButton::staticMetaObject; break; + case 221: m = &QTranslator::staticMetaObject; break; + case 222: m = &QTreeView::staticMetaObject; break; + case 223: m = &QTreeWidget::staticMetaObject; break; + case 225: m = &QUndoGroup::staticMetaObject; break; + case 226: m = &QUndoStack::staticMetaObject; break; + case 227: m = &QUndoView::staticMetaObject; break; + case 228: m = &QVBoxLayout::staticMetaObject; break; + case 229: m = &QValidator::staticMetaObject; break; + case 230: m = &QVariantAnimation::staticMetaObject; break; + case 239: m = &QWidget::staticMetaObject; break; + case 240: m = &QWidgetAction::staticMetaObject; break; + case 241: m = &QWindow::staticMetaObject; break; + case 242: m = &QWizard::staticMetaObject; break; + case 243: m = &QWizardPage::staticMetaObject; break; case 94: case 95: case 96: @@ -2553,9 +2557,9 @@ const QMetaObject* LObjects::staticMetaObject(const QByteArray& name, int n) { case 123: case 124: case 125: - case 161: - case 230: + case 162: case 231: + case 232: if(staticMetaObject_multimedia) { m = staticMetaObject_multimedia(n); } break; @@ -2567,33 +2571,33 @@ const QMetaObject* LObjects::staticMetaObject(const QByteArray& name, int n) { case 133: case 134: case 135: - case 204: case 205: - case 223: + case 206: + case 224: if(staticMetaObject_network) { m = staticMetaObject_network(n); } break; - case 179: case 180: case 181: case 182: case 183: + case 184: if(staticMetaObject_sql) { m = staticMetaObject_sql(n); } break; case 82: - case 193: case 194: + case 195: if(staticMetaObject_svg) { m = staticMetaObject_svg(n); } break; case 87: - case 232: case 233: case 234: case 235: case 236: case 237: + case 238: if(staticMetaObject_webkit) { m = staticMetaObject_webkit(n); } break; } @@ -3034,68 +3038,69 @@ StrList LObjects::overrideFunctions(const QByteArray& name) { case 156: ids = LProgressBar::overrideIds; break; case 157: ids = LProgressDialog::overrideIds; break; case 158: ids = LPropertyAnimation::overrideIds; break; - case 159: ids = LPushButton::overrideIds; break; - case 160: ids = LRadioButton::overrideIds; break; - case 162: ids = LRegExpValidator::overrideIds; break; - case 163: ids = LRubberBand::overrideIds; break; - case 165: ids = LScrollArea::overrideIds; break; - case 166: ids = LScrollBar::overrideIds; break; - case 167: ids = LSequentialAnimationGroup::overrideIds; break; - case 169: ids = LSettings::overrideIds; break; - case 170: ids = LShortcut::overrideIds; break; - case 171: ids = LSignalTransition::overrideIds; break; - case 172: ids = LSizeGrip::overrideIds; break; - case 173: ids = LSlider::overrideIds; break; - case 174: ids = LSortFilterProxyModel::overrideIds; break; - case 175: ids = LSpinBox::overrideIds; break; - case 176: ids = LSplashScreen::overrideIds; break; - case 177: ids = LSplitter::overrideIds; break; - case 178: ids = LSplitterHandle::overrideIds; break; - case 184: ids = LStackedLayout::overrideIds; break; - case 185: ids = LStackedWidget::overrideIds; break; - case 186: ids = LStandardItemModel::overrideIds; break; - case 187: ids = LState::overrideIds; break; - case 188: ids = LStateMachine::overrideIds; break; - case 189: ids = LStatusBar::overrideIds; break; - case 190: ids = LStringListModel::overrideIds; break; - case 192: ids = LStyledItemDelegate::overrideIds; break; - case 195: ids = LSwipeGesture::overrideIds; break; - case 196: ids = LSyntaxHighlighter::overrideIds; break; - case 197: ids = LSystemTrayIcon::overrideIds; break; - case 198: ids = LTabBar::overrideIds; break; - case 199: ids = LTabWidget::overrideIds; break; - case 200: ids = LTableView::overrideIds; break; - case 201: ids = LTableWidget::overrideIds; break; - case 202: ids = LTapAndHoldGesture::overrideIds; break; - case 203: ids = LTapGesture::overrideIds; break; - case 206: ids = LTextBlockGroup::overrideIds; break; - case 207: ids = LTextBrowser::overrideIds; break; - case 208: ids = LTextDocument::overrideIds; break; - case 209: ids = LTextEdit::overrideIds; break; - case 210: ids = LTextFrame::overrideIds; break; - case 211: ids = LTextList::overrideIds; break; - case 212: ids = LTextObject::overrideIds; break; - case 213: ids = LTextTable::overrideIds; break; - case 214: ids = LTimeEdit::overrideIds; break; - case 215: ids = LTimeLine::overrideIds; break; - case 216: ids = LTimer::overrideIds; break; - case 217: ids = LToolBar::overrideIds; break; - case 218: ids = LToolBox::overrideIds; break; - case 219: ids = LToolButton::overrideIds; break; - case 220: ids = LTranslator::overrideIds; break; - case 221: ids = LTreeView::overrideIds; break; - case 222: ids = LTreeWidget::overrideIds; break; - case 224: ids = LUndoGroup::overrideIds; break; - case 225: ids = LUndoStack::overrideIds; break; - case 226: ids = LUndoView::overrideIds; break; - case 227: ids = LVBoxLayout::overrideIds; break; - case 228: ids = LValidator::overrideIds; break; - case 229: ids = LVariantAnimation::overrideIds; break; - case 238: ids = LWidget::overrideIds; break; - case 239: ids = LWidgetAction::overrideIds; break; - case 240: ids = LWindow::overrideIds; break; - case 241: ids = LWizard::overrideIds; break; - case 242: ids = LWizardPage::overrideIds; break; + case 159: ids = LProxyStyle::overrideIds; break; + case 160: ids = LPushButton::overrideIds; break; + case 161: ids = LRadioButton::overrideIds; break; + case 163: ids = LRegExpValidator::overrideIds; break; + case 164: ids = LRubberBand::overrideIds; break; + case 166: ids = LScrollArea::overrideIds; break; + case 167: ids = LScrollBar::overrideIds; break; + case 168: ids = LSequentialAnimationGroup::overrideIds; break; + case 170: ids = LSettings::overrideIds; break; + case 171: ids = LShortcut::overrideIds; break; + case 172: ids = LSignalTransition::overrideIds; break; + case 173: ids = LSizeGrip::overrideIds; break; + case 174: ids = LSlider::overrideIds; break; + case 175: ids = LSortFilterProxyModel::overrideIds; break; + case 176: ids = LSpinBox::overrideIds; break; + case 177: ids = LSplashScreen::overrideIds; break; + case 178: ids = LSplitter::overrideIds; break; + case 179: ids = LSplitterHandle::overrideIds; break; + case 185: ids = LStackedLayout::overrideIds; break; + case 186: ids = LStackedWidget::overrideIds; break; + case 187: ids = LStandardItemModel::overrideIds; break; + case 188: ids = LState::overrideIds; break; + case 189: ids = LStateMachine::overrideIds; break; + case 190: ids = LStatusBar::overrideIds; break; + case 191: ids = LStringListModel::overrideIds; break; + case 193: ids = LStyledItemDelegate::overrideIds; break; + case 196: ids = LSwipeGesture::overrideIds; break; + case 197: ids = LSyntaxHighlighter::overrideIds; break; + case 198: ids = LSystemTrayIcon::overrideIds; break; + case 199: ids = LTabBar::overrideIds; break; + case 200: ids = LTabWidget::overrideIds; break; + case 201: ids = LTableView::overrideIds; break; + case 202: ids = LTableWidget::overrideIds; break; + case 203: ids = LTapAndHoldGesture::overrideIds; break; + case 204: ids = LTapGesture::overrideIds; break; + case 207: ids = LTextBlockGroup::overrideIds; break; + case 208: ids = LTextBrowser::overrideIds; break; + case 209: ids = LTextDocument::overrideIds; break; + case 210: ids = LTextEdit::overrideIds; break; + case 211: ids = LTextFrame::overrideIds; break; + case 212: ids = LTextList::overrideIds; break; + case 213: ids = LTextObject::overrideIds; break; + case 214: ids = LTextTable::overrideIds; break; + case 215: ids = LTimeEdit::overrideIds; break; + case 216: ids = LTimeLine::overrideIds; break; + case 217: ids = LTimer::overrideIds; break; + case 218: ids = LToolBar::overrideIds; break; + case 219: ids = LToolBox::overrideIds; break; + case 220: ids = LToolButton::overrideIds; break; + case 221: ids = LTranslator::overrideIds; break; + case 222: ids = LTreeView::overrideIds; break; + case 223: ids = LTreeWidget::overrideIds; break; + case 225: ids = LUndoGroup::overrideIds; break; + case 226: ids = LUndoStack::overrideIds; break; + case 227: ids = LUndoView::overrideIds; break; + case 228: ids = LVBoxLayout::overrideIds; break; + case 229: ids = LValidator::overrideIds; break; + case 230: ids = LVariantAnimation::overrideIds; break; + case 239: ids = LWidget::overrideIds; break; + case 240: ids = LWidgetAction::overrideIds; break; + case 241: ids = LWindow::overrideIds; break; + case 242: ids = LWizard::overrideIds; break; + case 243: ids = LWizardPage::overrideIds; break; case 94: case 95: case 96: @@ -3124,9 +3129,9 @@ StrList LObjects::overrideFunctions(const QByteArray& name) { case 123: case 124: case 125: - case 161: - case 230: + case 162: case 231: + case 232: if(override_multimedia) { NumList* _ids = override_multimedia(name); if(_ids) { @@ -3140,39 +3145,39 @@ StrList LObjects::overrideFunctions(const QByteArray& name) { case 133: case 134: case 135: - case 204: case 205: - case 223: + case 206: + case 224: if(override_network) { NumList* _ids = override_network(name); if(_ids) { ids = *_ids; }} break; - case 179: case 180: case 181: case 182: case 183: + case 184: if(override_sql) { NumList* _ids = override_sql(name); if(_ids) { ids = *_ids; }} break; case 82: - case 193: case 194: + case 195: if(override_svg) { NumList* _ids = override_svg(name); if(_ids) { ids = *_ids; }} break; case 87: - case 232: case 233: case 234: case 235: case 236: case 237: + case 238: if(override_webkit) { NumList* _ids = override_webkit(name); if(_ids) { diff --git a/src/gen/_main_q_classes.h b/src/gen/_main_q_classes.h index 5fa5052..a652519 100644 --- a/src/gen/_main_q_classes.h +++ b/src/gen/_main_q_classes.h @@ -4320,9 +4320,45 @@ public: void timerEvent(QTimerEvent* x1) { quint64 id = LObjects::override_id(unique, 8); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 8, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPropertyAnimation::timerEvent(x1); }} }; -class LPushButton : public QPushButton { +class LProxyStyle : public QProxyStyle { Q_OBJECT friend class Q159; +public: + LProxyStyle(uint u, QStyle* x1 = 0) : QProxyStyle(x1), unique(u) {} + LProxyStyle(uint u, const QString& x1) : QProxyStyle(x1), unique(u) {} + + static NumList overrideIds; + uint unique; + + void drawComplexControl(ComplexControl x1, const QStyleOptionComplex* x2, QPainter* x3, const QWidget* x4 = 0) const { quint64 id = LObjects::override_id(unique, 192); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2, &x3, &x4 }; callOverrideFun(fun, 192, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QProxyStyle::drawComplexControl(x1, x2, x3, x4); }} + void drawControl(ControlElement x1, const QStyleOption* x2, QPainter* x3, const QWidget* x4 = 0) const { quint64 id = LObjects::override_id(unique, 193); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2, &x3, &x4 }; callOverrideFun(fun, 193, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QProxyStyle::drawControl(x1, x2, x3, x4); }} + void drawItemPixmap(QPainter* x1, const QRect& x2, int x3, const QPixmap& x4) const { quint64 id = LObjects::override_id(unique, 209); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2, &x3, &x4 }; callOverrideFun(fun, 209, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QProxyStyle::drawItemPixmap(x1, x2, x3, x4); }} + void drawItemText(QPainter* x1, const QRect& x2, int x3, const QPalette& x4, bool x5, const QString& x6, QPalette::ColorRole x7 = QPalette::NoRole) const { quint64 id = LObjects::override_id(unique, 210); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2, &x3, &x4, &x5, &x6, &x7 }; callOverrideFun(fun, 210, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QProxyStyle::drawItemText(x1, x2, x3, x4, x5, x6, x7); }} + void drawPrimitive(PrimitiveElement x1, const QStyleOption* x2, QPainter* x3, const QWidget* x4 = 0) const { quint64 id = LObjects::override_id(unique, 194); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2, &x3, &x4 }; callOverrideFun(fun, 194, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QProxyStyle::drawPrimitive(x1, x2, x3, x4); }} + QPixmap generatedIconPixmap(QIcon::Mode x1, const QPixmap& x2, const QStyleOption* x3) const { quint64 id = LObjects::override_id(unique, 195); void* fun = LObjects::overrideFun(id); QPixmap ret; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2, &x3 }; ret = callOverrideFun(fun, 195, args, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QProxyStyle::generatedIconPixmap(x1, x2, x3); } return ret; } + SubControl hitTestComplexControl(ComplexControl x1, const QStyleOptionComplex* x2, const QPoint& x3, const QWidget* x4 = 0) const { quint64 id = LObjects::override_id(unique, 196); void* fun = LObjects::overrideFun(id); SubControl ret = (SubControl)0; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2, &x3, &x4 }; ret = (SubControl)callOverrideFun(fun, 196, args, id).toInt(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QProxyStyle::hitTestComplexControl(x1, x2, x3, x4); } return ret; } + QRect itemPixmapRect(const QRect& x1, int x2, const QPixmap& x3) const { quint64 id = LObjects::override_id(unique, 211); void* fun = LObjects::overrideFun(id); QRect ret; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2, &x3 }; ret = callOverrideFun(fun, 211, args, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QProxyStyle::itemPixmapRect(x1, x2, x3); } return ret; } + QRect itemTextRect(const QFontMetrics& x1, const QRect& x2, int x3, bool x4, const QString& x5) const { quint64 id = LObjects::override_id(unique, 212); void* fun = LObjects::overrideFun(id); QRect ret; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2, &x3, &x4, &x5 }; ret = callOverrideFun(fun, 212, args, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QProxyStyle::itemTextRect(x1, x2, x3, x4, x5); } return ret; } + int layoutSpacing(QSizePolicy::ControlType x1, QSizePolicy::ControlType x2, Qt::Orientation x3, const QStyleOption* x4 = 0, const QWidget* x5 = 0) const { quint64 id = LObjects::override_id(unique, 197); void* fun = LObjects::overrideFun(id); int ret = 0; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2, &x3, &x4, &x5 }; ret = callOverrideFun(fun, 197, args, id).toInt(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QProxyStyle::layoutSpacing(x1, x2, x3, x4, x5); } return ret; } + int pixelMetric(PixelMetric x1, const QStyleOption* x2 = 0, const QWidget* x3 = 0) const { quint64 id = LObjects::override_id(unique, 198); void* fun = LObjects::overrideFun(id); int ret = 0; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2, &x3 }; ret = callOverrideFun(fun, 198, args, id).toInt(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QProxyStyle::pixelMetric(x1, x2, x3); } return ret; } + void polish(QWidget* x1) { quint64 id = LObjects::override_id(unique, 201); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 201, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QProxyStyle::polish(x1); }} + QSize sizeFromContents(ContentsType x1, const QStyleOption* x2, const QSize& x3, const QWidget* x4) const { quint64 id = LObjects::override_id(unique, 202); void* fun = LObjects::overrideFun(id); QSize ret; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2, &x3, &x4 }; ret = callOverrideFun(fun, 202, args, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QProxyStyle::sizeFromContents(x1, x2, x3, x4); } return ret; } + QIcon standardIcon(StandardPixmap x1, const QStyleOption* x2 = 0, const QWidget* x3 = 0) const { quint64 id = LObjects::override_id(unique, 213); void* fun = LObjects::overrideFun(id); QIcon ret; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2, &x3 }; ret = callOverrideFun(fun, 213, args, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QProxyStyle::standardIcon(x1, x2, x3); } return ret; } + QPalette standardPalette() const { quint64 id = LObjects::override_id(unique, 214); void* fun = LObjects::overrideFun(id); QPalette ret; if(fun && (LObjects::calling != id)) { ret = callOverrideFun(fun, 214, 0, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QProxyStyle::standardPalette(); } return ret; } + QPixmap standardPixmap(StandardPixmap x1, const QStyleOption* x2, const QWidget* x3 = 0) const { quint64 id = LObjects::override_id(unique, 203); void* fun = LObjects::overrideFun(id); QPixmap ret; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2, &x3 }; ret = callOverrideFun(fun, 203, args, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QProxyStyle::standardPixmap(x1, x2, x3); } return ret; } + int styleHint(StyleHint x1, const QStyleOption* x2 = 0, const QWidget* x3 = 0, QStyleHintReturn* x4 = 0) const { quint64 id = LObjects::override_id(unique, 204); void* fun = LObjects::overrideFun(id); int ret = 0; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2, &x3, &x4 }; ret = callOverrideFun(fun, 204, args, id).toInt(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QProxyStyle::styleHint(x1, x2, x3, x4); } return ret; } + QRect subControlRect(ComplexControl x1, const QStyleOptionComplex* x2, SubControl x3, const QWidget* x4) const { quint64 id = LObjects::override_id(unique, 205); void* fun = LObjects::overrideFun(id); QRect ret; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2, &x3, &x4 }; ret = callOverrideFun(fun, 205, args, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QProxyStyle::subControlRect(x1, x2, x3, x4); } return ret; } + QRect subElementRect(SubElement x1, const QStyleOption* x2, const QWidget* x3) const { quint64 id = LObjects::override_id(unique, 206); void* fun = LObjects::overrideFun(id); QRect ret; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2, &x3 }; ret = callOverrideFun(fun, 206, args, id).value(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QProxyStyle::subElementRect(x1, x2, x3); } return ret; } + void unpolish(QWidget* x1) { quint64 id = LObjects::override_id(unique, 207); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 207, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QProxyStyle::unpolish(x1); }} + bool eventFilter(QObject* x1, QEvent* x2) { quint64 id = LObjects::override_id(unique, 5); void* fun = LObjects::overrideFun(id); bool ret = false; if(fun && (LObjects::calling != id)) { const void* args[] = { &x1, &x2 }; ret = callOverrideFun(fun, 5, args, id).toBool(); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { ret = QProxyStyle::eventFilter(x1, x2); } return ret; } + void childEvent(QChildEvent* x1) { quint64 id = LObjects::override_id(unique, 6); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 6, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QProxyStyle::childEvent(x1); }} + void customEvent(QEvent* x1) { quint64 id = LObjects::override_id(unique, 7); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 7, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QProxyStyle::customEvent(x1); }} + void timerEvent(QTimerEvent* x1) { quint64 id = LObjects::override_id(unique, 8); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 8, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QProxyStyle::timerEvent(x1); }} +}; + +class LPushButton : public QPushButton { + Q_OBJECT + friend class Q160; public: LPushButton(uint u, QWidget* x1 = 0) : QPushButton(x1), unique(u) {} LPushButton(uint u, const QString& x1, QWidget* x2 = 0) : QPushButton(x1, x2), unique(u) {} @@ -4376,7 +4412,7 @@ public: class LRadioButton : public QRadioButton { Q_OBJECT - friend class Q160; + friend class Q161; public: LRadioButton(uint u, QWidget* x1 = 0) : QRadioButton(x1), unique(u) {} LRadioButton(uint u, const QString& x1, QWidget* x2 = 0) : QRadioButton(x1, x2), unique(u) {} @@ -4429,7 +4465,7 @@ public: class LRegExpValidator : public QRegExpValidator { Q_OBJECT - friend class Q162; + friend class Q163; public: LRegExpValidator(uint u, QObject* x1 = 0) : QRegExpValidator(x1), unique(u) {} LRegExpValidator(uint u, const QRegExp& x1, QObject* x2 = 0) : QRegExpValidator(x1, x2), unique(u) {} @@ -4447,7 +4483,7 @@ public: class LRubberBand : public QRubberBand { Q_OBJECT - friend class Q163; + friend class Q164; public: LRubberBand(uint u, Shape x1, QWidget* x2 = 0) : QRubberBand(x1, x2), unique(u) {} @@ -4496,7 +4532,7 @@ public: class LScrollArea : public QScrollArea { Q_OBJECT - friend class Q165; + friend class Q166; public: LScrollArea(uint u, QWidget* x1 = 0) : QScrollArea(x1), unique(u) {} @@ -4549,7 +4585,7 @@ public: class LScrollBar : public QScrollBar { Q_OBJECT - friend class Q166; + friend class Q167; public: LScrollBar(uint u, QWidget* x1 = 0) : QScrollBar(x1), unique(u) {} LScrollBar(uint u, Qt::Orientation x1, QWidget* x2 = 0) : QScrollBar(x1, x2), unique(u) {} @@ -4600,7 +4636,7 @@ public: class LSequentialAnimationGroup : public QSequentialAnimationGroup { Q_OBJECT - friend class Q167; + friend class Q168; public: LSequentialAnimationGroup(uint u, QObject* x1 = 0) : QSequentialAnimationGroup(x1), unique(u) {} @@ -4619,7 +4655,7 @@ public: class LSettings : public QSettings { Q_OBJECT - friend class Q169; + friend class Q170; public: LSettings(uint u, const QString& x1, const QString& x2 = QString(), QObject* x3 = 0) : QSettings(x1, x2, x3), unique(u) {} LSettings(uint u, Scope x1, const QString& x2, const QString& x3 = QString(), QObject* x4 = 0) : QSettings(x1, x2, x3, x4), unique(u) {} @@ -4638,7 +4674,7 @@ public: class LShortcut : public QShortcut { Q_OBJECT - friend class Q170; + friend class Q171; public: LShortcut(uint u, QWidget* x1) : QShortcut(x1), unique(u) {} LShortcut(uint u, const QKeySequence& x1, QWidget* x2, const char* x3 = 0, const char* x4 = 0, Qt::ShortcutContext x5 = Qt::WindowShortcut) : QShortcut(x1, x2, x3, x4, x5), unique(u) {} @@ -4654,7 +4690,7 @@ public: class LSignalTransition : public QSignalTransition { Q_OBJECT - friend class Q171; + friend class Q172; public: LSignalTransition(uint u, QState* x1 = 0) : QSignalTransition(x1), unique(u) {} LSignalTransition(uint u, const QObject* x1, const char* x2, QState* x3 = 0) : QSignalTransition(x1, x2, x3), unique(u) {} @@ -4672,7 +4708,7 @@ public: class LSizeGrip : public QSizeGrip { Q_OBJECT - friend class Q172; + friend class Q173; public: LSizeGrip(uint u, QWidget* x1) : QSizeGrip(x1), unique(u) {} @@ -4722,7 +4758,7 @@ public: class LSlider : public QSlider { Q_OBJECT - friend class Q173; + friend class Q174; public: LSlider(uint u, QWidget* x1 = 0) : QSlider(x1), unique(u) {} LSlider(uint u, Qt::Orientation x1, QWidget* x2 = 0) : QSlider(x1, x2), unique(u) {} @@ -4773,7 +4809,7 @@ public: class LSortFilterProxyModel : public QSortFilterProxyModel { Q_OBJECT - friend class Q174; + friend class Q175; public: LSortFilterProxyModel(uint u, QObject* x1 = 0) : QSortFilterProxyModel(x1), unique(u) {} @@ -4827,7 +4863,7 @@ public: class LSpinBox : public QSpinBox { Q_OBJECT - friend class Q175; + friend class Q176; public: LSpinBox(uint u, QWidget* x1 = 0) : QSpinBox(x1), unique(u) {} @@ -4882,7 +4918,7 @@ public: class LSplashScreen : public QSplashScreen { Q_OBJECT - friend class Q176; + friend class Q177; public: LSplashScreen(uint u, const QPixmap& x1 = QPixmap(), Qt::WindowFlags x2 = 0) : QSplashScreen(x1, x2), unique(u) {} LSplashScreen(uint u, QWidget* x1, const QPixmap& x2 = QPixmap(), Qt::WindowFlags x3 = 0) : QSplashScreen(x1, x2, x3), unique(u) {} @@ -4933,7 +4969,7 @@ public: class LSplitter : public QSplitter { Q_OBJECT - friend class Q177; + friend class Q178; public: LSplitter(uint u, QWidget* x1 = 0) : QSplitter(x1), unique(u) {} LSplitter(uint u, Qt::Orientation x1, QWidget* x2 = 0) : QSplitter(x1, x2), unique(u) {} @@ -4983,7 +5019,7 @@ public: class LSplitterHandle : public QSplitterHandle { Q_OBJECT - friend class Q178; + friend class Q179; public: static NumList overrideIds; @@ -5031,7 +5067,7 @@ public: class LStackedLayout : public QStackedLayout { Q_OBJECT - friend class Q184; + friend class Q185; public: LStackedLayout(uint u) : unique(u) {} LStackedLayout(uint u, QWidget* x1) : QStackedLayout(x1), unique(u) {} @@ -5065,7 +5101,7 @@ public: class LStackedWidget : public QStackedWidget { Q_OBJECT - friend class Q185; + friend class Q186; public: LStackedWidget(uint u, QWidget* x1 = 0) : QStackedWidget(x1), unique(u) {} @@ -5114,7 +5150,7 @@ public: class LStandardItemModel : public QStandardItemModel { Q_OBJECT - friend class Q186; + friend class Q187; public: LStandardItemModel(uint u, QObject* x1 = 0) : QStandardItemModel(x1), unique(u) {} LStandardItemModel(uint u, int x1, int x2, QObject* x3 = 0) : QStandardItemModel(x1, x2, x3), unique(u) {} @@ -5159,7 +5195,7 @@ public: class LState : public QState { Q_OBJECT - friend class Q187; + friend class Q188; public: LState(uint u, QState* x1 = 0) : QState(x1), unique(u) {} LState(uint u, ChildMode x1, QState* x2 = 0) : QState(x1, x2), unique(u) {} @@ -5177,7 +5213,7 @@ public: class LStateMachine : public QStateMachine { Q_OBJECT - friend class Q188; + friend class Q189; public: LStateMachine(uint u, QObject* x1 = 0) : QStateMachine(x1), unique(u) {} LStateMachine(uint u, QState::ChildMode x1, QObject* x2 = 0) : QStateMachine(x1, x2), unique(u) {} @@ -5195,7 +5231,7 @@ public: class LStatusBar : public QStatusBar { Q_OBJECT - friend class Q189; + friend class Q190; public: LStatusBar(uint u, QWidget* x1 = 0) : QStatusBar(x1), unique(u) {} @@ -5244,7 +5280,7 @@ public: class LStringListModel : public QStringListModel { Q_OBJECT - friend class Q190; + friend class Q191; public: LStringListModel(uint u, QObject* x1 = 0) : QStringListModel(x1), unique(u) {} LStringListModel(uint u, const QStringList& x1, QObject* x2 = 0) : QStringListModel(x1, x2), unique(u) {} @@ -5286,7 +5322,7 @@ public: class LStyledItemDelegate : public QStyledItemDelegate { Q_OBJECT - friend class Q192; + friend class Q193; public: LStyledItemDelegate(uint u, QObject* x1 = 0) : QStyledItemDelegate(x1), unique(u) {} @@ -5312,7 +5348,7 @@ public: class LSwipeGesture : public QSwipeGesture { Q_OBJECT - friend class Q195; + friend class Q196; public: static NumList overrideIds; @@ -5326,7 +5362,7 @@ public: class LSyntaxHighlighter : public QSyntaxHighlighter { Q_OBJECT - friend class Q196; + friend class Q197; public: LSyntaxHighlighter(uint u, QObject* x1) : QSyntaxHighlighter(x1), unique(u) {} LSyntaxHighlighter(uint u, QTextDocument* x1) : QSyntaxHighlighter(x1), unique(u) {} @@ -5343,7 +5379,7 @@ public: class LSystemTrayIcon : public QSystemTrayIcon { Q_OBJECT - friend class Q197; + friend class Q198; public: LSystemTrayIcon(uint u, QObject* x1 = 0) : QSystemTrayIcon(x1), unique(u) {} LSystemTrayIcon(uint u, const QIcon& x1, QObject* x2 = 0) : QSystemTrayIcon(x1, x2), unique(u) {} @@ -5359,7 +5395,7 @@ public: class LTabBar : public QTabBar { Q_OBJECT - friend class Q198; + friend class Q199; public: LTabBar(uint u, QWidget* x1 = 0) : QTabBar(x1), unique(u) {} @@ -5413,7 +5449,7 @@ public: class LTabWidget : public QTabWidget { Q_OBJECT - friend class Q199; + friend class Q200; public: LTabWidget(uint u, QWidget* x1 = 0) : QTabWidget(x1), unique(u) {} @@ -5464,7 +5500,7 @@ public: class LTableView : public QTableView { Q_OBJECT - friend class Q200; + friend class Q201; public: LTableView(uint u, QWidget* x1 = 0) : QTableView(x1), unique(u) {} @@ -5540,7 +5576,7 @@ public: class LTableWidget : public QTableWidget { Q_OBJECT - friend class Q201; + friend class Q202; public: LTableWidget(uint u, QWidget* x1 = 0) : QTableWidget(x1), unique(u) {} LTableWidget(uint u, int x1, int x2, QWidget* x3 = 0) : QTableWidget(x1, x2, x3), unique(u) {} @@ -5620,7 +5656,7 @@ public: class LTapAndHoldGesture : public QTapAndHoldGesture { Q_OBJECT - friend class Q202; + friend class Q203; public: static NumList overrideIds; @@ -5634,7 +5670,7 @@ public: class LTapGesture : public QTapGesture { Q_OBJECT - friend class Q203; + friend class Q204; public: static NumList overrideIds; @@ -5648,7 +5684,7 @@ public: class LTextBlockGroup : public QTextBlockGroup { Q_OBJECT - friend class Q206; + friend class Q207; public: static NumList overrideIds; @@ -5665,7 +5701,7 @@ public: class LTextBrowser : public QTextBrowser { Q_OBJECT - friend class Q207; + friend class Q208; public: LTextBrowser(uint u, QWidget* x1 = 0) : QTextBrowser(x1), unique(u) {} @@ -5722,7 +5758,7 @@ public: class LTextDocument : public QTextDocument { Q_OBJECT - friend class Q208; + friend class Q209; public: LTextDocument(uint u, QObject* x1 = 0) : QTextDocument(x1), unique(u) {} LTextDocument(uint u, const QString& x1, QObject* x2 = 0) : QTextDocument(x1, x2), unique(u) {} @@ -5741,7 +5777,7 @@ public: class LTextEdit : public QTextEdit { Q_OBJECT - friend class Q209; + friend class Q210; public: LTextEdit(uint u, QWidget* x1 = 0) : QTextEdit(x1), unique(u) {} LTextEdit(uint u, const QString& x1, QWidget* x2 = 0) : QTextEdit(x1, x2), unique(u) {} @@ -5799,7 +5835,7 @@ public: class LTextFrame : public QTextFrame { Q_OBJECT - friend class Q210; + friend class Q211; public: LTextFrame(uint u, QTextDocument* x1) : QTextFrame(x1), unique(u) {} @@ -5814,7 +5850,7 @@ public: class LTextList : public QTextList { Q_OBJECT - friend class Q211; + friend class Q212; public: static NumList overrideIds; @@ -5831,7 +5867,7 @@ public: class LTextObject : public QTextObject { Q_OBJECT - friend class Q212; + friend class Q213; public: static NumList overrideIds; @@ -5845,7 +5881,7 @@ public: class LTextTable : public QTextTable { Q_OBJECT - friend class Q213; + friend class Q214; public: static NumList overrideIds; @@ -5859,7 +5895,7 @@ public: class LTimeEdit : public QTimeEdit { Q_OBJECT - friend class Q214; + friend class Q215; public: LTimeEdit(uint u, QWidget* x1 = 0) : QTimeEdit(x1), unique(u) {} LTimeEdit(uint u, const QTime& x1, QWidget* x2 = 0) : QTimeEdit(x1, x2), unique(u) {} @@ -5916,7 +5952,7 @@ public: class LTimeLine : public QTimeLine { Q_OBJECT - friend class Q215; + friend class Q216; public: LTimeLine(uint u, int x1 = 1000, QObject* x2 = 0) : QTimeLine(x1, x2), unique(u) {} @@ -5932,7 +5968,7 @@ public: class LTimer : public QTimer { Q_OBJECT - friend class Q216; + friend class Q217; public: LTimer(uint u, QObject* x1 = 0) : QTimer(x1), unique(u) {} @@ -5947,7 +5983,7 @@ public: class LToolBar : public QToolBar { Q_OBJECT - friend class Q217; + friend class Q218; public: LToolBar(uint u, const QString& x1, QWidget* x2 = 0) : QToolBar(x1, x2), unique(u) {} LToolBar(uint u, QWidget* x1 = 0) : QToolBar(x1), unique(u) {} @@ -5997,7 +6033,7 @@ public: class LToolBox : public QToolBox { Q_OBJECT - friend class Q218; + friend class Q219; public: LToolBox(uint u, QWidget* x1 = 0, Qt::WindowFlags x2 = 0) : QToolBox(x1, x2), unique(u) {} @@ -6048,7 +6084,7 @@ public: class LToolButton : public QToolButton { Q_OBJECT - friend class Q219; + friend class Q220; public: LToolButton(uint u, QWidget* x1 = 0) : QToolButton(x1), unique(u) {} @@ -6100,7 +6136,7 @@ public: class LTranslator : public QTranslator { Q_OBJECT - friend class Q220; + friend class Q221; public: LTranslator(uint u, QObject* x1 = 0) : QTranslator(x1), unique(u) {} @@ -6117,7 +6153,7 @@ public: class LTreeView : public QTreeView { Q_OBJECT - friend class Q221; + friend class Q222; public: LTreeView(uint u, QWidget* x1 = 0) : QTreeView(x1), unique(u) {} @@ -6200,7 +6236,7 @@ public: class LTreeWidget : public QTreeWidget { Q_OBJECT - friend class Q222; + friend class Q223; public: LTreeWidget(uint u, QWidget* x1 = 0) : QTreeWidget(x1), unique(u) {} @@ -6286,7 +6322,7 @@ public: class LUndoGroup : public QUndoGroup { Q_OBJECT - friend class Q224; + friend class Q225; public: LUndoGroup(uint u, QObject* x1 = 0) : QUndoGroup(x1), unique(u) {} @@ -6301,7 +6337,7 @@ public: class LUndoStack : public QUndoStack { Q_OBJECT - friend class Q225; + friend class Q226; public: LUndoStack(uint u, QObject* x1 = 0) : QUndoStack(x1), unique(u) {} @@ -6316,7 +6352,7 @@ public: class LUndoView : public QUndoView { Q_OBJECT - friend class Q226; + friend class Q227; public: LUndoView(uint u, QWidget* x1 = 0) : QUndoView(x1), unique(u) {} LUndoView(uint u, QUndoStack* x1, QWidget* x2 = 0) : QUndoView(x1, x2), unique(u) {} @@ -6396,7 +6432,7 @@ public: class LVBoxLayout : public QVBoxLayout { Q_OBJECT - friend class Q227; + friend class Q228; public: LVBoxLayout(uint u) : unique(u) {} LVBoxLayout(uint u, QWidget* x1) : QVBoxLayout(x1), unique(u) {} @@ -6430,7 +6466,7 @@ public: class LValidator : public QValidator { Q_OBJECT - friend class Q228; + friend class Q229; public: LValidator(uint u, QObject* x1 = 0) : QValidator(x1), unique(u) {} @@ -6447,7 +6483,7 @@ public: class LVariantAnimation : public QVariantAnimation { Q_OBJECT - friend class Q229; + friend class Q230; public: LVariantAnimation(uint u, QObject* x1 = 0) : QVariantAnimation(x1), unique(u) {} @@ -6468,7 +6504,7 @@ public: class LWidget : public QWidget { Q_OBJECT - friend class Q238; + friend class Q239; public: LWidget(uint u, QWidget* x1 = 0, Qt::WindowFlags x2 = 0) : QWidget(x1, x2), unique(u) {} @@ -6517,7 +6553,7 @@ public: class LWidgetAction : public QWidgetAction { Q_OBJECT - friend class Q239; + friend class Q240; public: LWidgetAction(uint u, QObject* x1) : QWidgetAction(x1), unique(u) {} @@ -6534,7 +6570,7 @@ public: class LWindow : public QWindow { Q_OBJECT - friend class Q240; + friend class Q241; public: LWindow(uint u, QScreen* x1 = 0) : QWindow(x1), unique(u) {} LWindow(uint u, QWindow* x1) : QWindow(x1), unique(u) {} @@ -6570,7 +6606,7 @@ public: class LWizard : public QWizard { Q_OBJECT - friend class Q241; + friend class Q242; public: LWizard(uint u, QWidget* x1 = 0, Qt::WindowFlags x2 = 0) : QWizard(x1, x2), unique(u) {} @@ -6625,7 +6661,7 @@ public: class LWizardPage : public QWizardPage { Q_OBJECT - friend class Q242; + friend class Q243; public: LWizardPage(uint u, QWidget* x1 = 0) : QWizardPage(x1), unique(u) {} diff --git a/src/gen/_main_q_methods.h b/src/gen/_main_q_methods.h index bdaa99e..68f24dc 100644 --- a/src/gen/_main_q_methods.h +++ b/src/gen/_main_q_methods.h @@ -1425,7 +1425,7 @@ public: Q_INVOKABLE QStringList SsystemEnvironment() { return QProcess::systemEnvironment(); } }; -class EQL_EXPORT Q164 : public Q136 { // QScreen +class EQL_EXPORT Q165 : public Q136 { // QScreen Q_OBJECT public: Q_INVOKABLE int MangleBetween(QScreen* o, Qt::ScreenOrientation x1, Qt::ScreenOrientation x2) const { return o->angleBetween(x1, x2); } @@ -1462,7 +1462,7 @@ public: Q_INVOKABLE QSize MvirtualSize(QScreen* o) const { return o->virtualSize(); } }; -class EQL_EXPORT Q167 : public Q21 { // QSequentialAnimationGroup +class EQL_EXPORT Q168 : public Q21 { // QSequentialAnimationGroup Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LSequentialAnimationGroup(u, x1); } @@ -1472,7 +1472,7 @@ public: Q_INVOKABLE int Mduration(QSequentialAnimationGroup* o) const { return o->duration(); } }; -class EQL_EXPORT Q168 : public Q136 { // QSessionManager +class EQL_EXPORT Q169 : public Q136 { // QSessionManager Q_OBJECT public: Q_INVOKABLE bool MallowsErrorInteraction(QSessionManager* o) { return o->allowsErrorInteraction(); } @@ -1493,7 +1493,7 @@ public: Q_INVOKABLE void MsetRestartHint(QSessionManager* o, QSessionManager::RestartHint x1) { o->setRestartHint(x1); } }; -class EQL_EXPORT Q169 : public Q136 { // QSettings +class EQL_EXPORT Q170 : public Q136 { // QSettings Q_OBJECT public: Q_INVOKABLE void* C(uint u, const QString& x1, const QString& x2 = QString(), QObject* x3 = 0) { return new LSettings(u, x1, x2, x3); } @@ -1535,7 +1535,7 @@ public: Q_INVOKABLE void SsetPath(QSettings::Format x1, QSettings::Scope x2, const QString& x3) { QSettings::setPath(x1, x2, x3); } }; -class EQL_EXPORT Q170 : public Q136 { // QShortcut +class EQL_EXPORT Q171 : public Q136 { // QShortcut Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1) { return new LShortcut(u, x1); } @@ -1554,7 +1554,7 @@ public: Q_INVOKABLE QString MwhatsThis(QShortcut* o) const { return o->whatsThis(); } }; -class EQL_EXPORT Q171 : public Q17 { // QSignalTransition +class EQL_EXPORT Q172 : public Q17 { // QSignalTransition Q_OBJECT public: Q_INVOKABLE void* C(uint u, QState* x1 = 0) { return new LSignalTransition(u, x1); } @@ -1565,7 +1565,7 @@ public: Q_INVOKABLE QByteArray Msignal(QSignalTransition* o) const { return o->signal(); } }; -class EQL_EXPORT Q174 : public Q9 { // QSortFilterProxyModel +class EQL_EXPORT Q175 : public Q9 { // QSortFilterProxyModel Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LSortFilterProxyModel(u, x1); } @@ -1620,7 +1620,7 @@ public: Q_INVOKABLE int MsupportedDropActions(QSortFilterProxyModel* o) const { return o->supportedDropActions(); } }; -class EQL_EXPORT Q184 : public Q111 { // QStackedLayout +class EQL_EXPORT Q185 : public Q111 { // QStackedLayout Q_OBJECT public: Q_INVOKABLE void* C(uint u) { return new LStackedLayout(u); } @@ -1644,7 +1644,7 @@ public: Q_INVOKABLE QLayoutItem* MtakeAt(QStackedLayout* o, int x1) { return o->takeAt(x1); } }; -class EQL_EXPORT Q186 : public Q4 { // QStandardItemModel +class EQL_EXPORT Q187 : public Q4 { // QStandardItemModel Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LStandardItemModel(u, x1); } @@ -1704,7 +1704,7 @@ public: Q_INVOKABLE int MsupportedDropActions(QStandardItemModel* o) const { return o->supportedDropActions(); } }; -class EQL_EXPORT Q187 : public Q14 { // QState +class EQL_EXPORT Q188 : public Q14 { // QState Q_OBJECT public: Q_INVOKABLE void* C(uint u, QState* x1 = 0) { return new LState(u, x1); } @@ -1723,7 +1723,7 @@ public: Q_INVOKABLE QList Mtransitions(QState* o) const { return o->transitions(); } }; -class EQL_EXPORT Q188 : public Q187 { // QStateMachine +class EQL_EXPORT Q189 : public Q188 { // QStateMachine Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LStateMachine(u, x1); } @@ -1747,7 +1747,7 @@ public: Q_INVOKABLE bool MeventFilter(QStateMachine* o, QObject* x1, QEvent* x2) { return o->eventFilter(x1, x2); } }; -class EQL_EXPORT Q190 : public Q6 { // QStringListModel +class EQL_EXPORT Q191 : public Q6 { // QStringListModel Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LStringListModel(u, x1); } @@ -1765,7 +1765,7 @@ public: Q_INVOKABLE int MsupportedDropActions(QStringListModel* o) const { return o->supportedDropActions(); } }; -class EQL_EXPORT Q191 : public Q136 { // QStyle +class EQL_EXPORT Q192 : public Q136 { // QStyle Q_OBJECT public: Q_INVOKABLE int McombinedLayoutSpacing(QStyle* o, QSizePolicy::ControlTypes x1, QSizePolicy::ControlTypes x2, Qt::Orientation x3, QStyleOption* x4 = 0, QWidget* x5 = 0) const { return o->combinedLayoutSpacing(x1, x2, x3, x4, x5); } @@ -1788,7 +1788,7 @@ public: Q_INVOKABLE QRect SvisualRect(Qt::LayoutDirection x1, const QRect& x2, const QRect& x3) { return QStyle::visualRect(x1, x2, x3); } }; -class EQL_EXPORT Q192 : public Q3 { // QStyledItemDelegate +class EQL_EXPORT Q193 : public Q3 { // QStyledItemDelegate Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LStyledItemDelegate(u, x1); } @@ -1803,7 +1803,7 @@ public: Q_INVOKABLE void MupdateEditorGeometry(QStyledItemDelegate* o, QWidget* x1, const QStyleOptionViewItem& x2, const QModelIndex& x3) const { o->updateEditorGeometry(x1, x2, x3); } }; -class EQL_EXPORT Q195 : public Q70 { // QSwipeGesture +class EQL_EXPORT Q196 : public Q70 { // QSwipeGesture Q_OBJECT public: Q_INVOKABLE int MhorizontalDirection(QSwipeGesture* o) const { return o->horizontalDirection(); } @@ -1812,7 +1812,7 @@ public: Q_INVOKABLE int MverticalDirection(QSwipeGesture* o) const { return o->verticalDirection(); } }; -class EQL_EXPORT Q196 : public Q136 { // QSyntaxHighlighter +class EQL_EXPORT Q197 : public Q136 { // QSyntaxHighlighter Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1) { return new LSyntaxHighlighter(u, x1); } @@ -1831,7 +1831,7 @@ public: Q_INVOKABLE void MsetFormat(QSyntaxHighlighter* o, int x1, int x2, const QFont& x3) { ((LSyntaxHighlighter*)o)->setFormat(x1, x2, x3); } }; -class EQL_EXPORT Q197 : public Q136 { // QSystemTrayIcon +class EQL_EXPORT Q198 : public Q136 { // QSystemTrayIcon Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LSystemTrayIcon(u, x1); } @@ -1848,7 +1848,7 @@ public: Q_INVOKABLE bool SsupportsMessages() { return QSystemTrayIcon::supportsMessages(); } }; -class EQL_EXPORT Q202 : public Q70 { // QTapAndHoldGesture +class EQL_EXPORT Q203 : public Q70 { // QTapAndHoldGesture Q_OBJECT public: Q_INVOKABLE QPointF Mposition(QTapAndHoldGesture* o) const { return o->position(); } @@ -1857,14 +1857,14 @@ public: Q_INVOKABLE int Stimeout() { return QTapAndHoldGesture::timeout(); } }; -class EQL_EXPORT Q203 : public Q70 { // QTapGesture +class EQL_EXPORT Q204 : public Q70 { // QTapGesture Q_OBJECT public: Q_INVOKABLE QPointF Mposition(QTapGesture* o) const { return o->position(); } Q_INVOKABLE void MsetPosition(QTapGesture* o, const QPointF& x1) { o->setPosition(x1); } }; -class EQL_EXPORT Q208 : public Q136 { // QTextDocument +class EQL_EXPORT Q209 : public Q136 { // QTextDocument Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LTextDocument(u, x1); } @@ -1945,7 +1945,7 @@ public: Q_INVOKABLE bool MuseDesignMetrics(QTextDocument* o) const { return o->useDesignMetrics(); } }; -class EQL_EXPORT Q212 : public Q136 { // QTextObject +class EQL_EXPORT Q213 : public Q136 { // QTextObject Q_OBJECT public: Q_INVOKABLE QTextDocument* Mdocument(QTextObject* o) const { return o->document(); } @@ -1955,7 +1955,7 @@ public: Q_INVOKABLE void MsetFormat(QTextObject* o, const QTextFormat& x1) { ((LTextObject*)o)->setFormat(x1); } }; -class EQL_EXPORT Q215 : public Q136 { // QTimeLine +class EQL_EXPORT Q216 : public Q136 { // QTimeLine Q_OBJECT public: Q_INVOKABLE void* C(uint u, int x1 = 1000, QObject* x2 = 0) { return new LTimeLine(u, x1, x2); } @@ -1984,7 +1984,7 @@ public: Q_INVOKABLE qreal MvalueForTime(QTimeLine* o, int x1) const { return o->valueForTime(x1); } }; -class EQL_EXPORT Q216 : public Q136 { // QTimer +class EQL_EXPORT Q217 : public Q136 { // QTimer Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LTimer(u, x1); } @@ -1998,7 +1998,7 @@ public: Q_INVOKABLE int MtimerType(QTimer* o) const { return o->timerType(); } }; -class EQL_EXPORT Q220 : public Q136 { // QTranslator +class EQL_EXPORT Q221 : public Q136 { // QTranslator Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LTranslator(u, x1); } @@ -2008,7 +2008,7 @@ public: Q_INVOKABLE QString Mtranslate(QTranslator* o, const char* x1, const char* x2, const char* x3 = 0, int x4 = -1) const { return o->translate(x1, x2, x3, x4); } }; -class EQL_EXPORT Q224 : public Q136 { // QUndoGroup +class EQL_EXPORT Q225 : public Q136 { // QUndoGroup Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LUndoGroup(u, x1); } @@ -2025,7 +2025,7 @@ public: Q_INVOKABLE QString MundoText(QUndoGroup* o) const { return o->undoText(); } }; -class EQL_EXPORT Q225 : public Q136 { // QUndoStack +class EQL_EXPORT Q226 : public Q136 { // QUndoStack Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LUndoStack(u, x1); } @@ -2050,7 +2050,7 @@ public: Q_INVOKABLE QString MundoText(QUndoStack* o) const { return o->undoText(); } }; -class EQL_EXPORT Q228 : public Q136 { // QValidator +class EQL_EXPORT Q229 : public Q136 { // QValidator Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LValidator(u, x1); } @@ -2060,7 +2060,7 @@ public: Q_INVOKABLE int Mvalidate(QValidator* o, QString& x1, int& x2) const { return o->validate(x1, x2); } }; -class EQL_EXPORT Q229 : public Q1 { // QVariantAnimation +class EQL_EXPORT Q230 : public Q1 { // QVariantAnimation Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LVariantAnimation(u, x1); } @@ -2076,7 +2076,7 @@ public: Q_INVOKABLE int Mduration(QVariantAnimation* o) const { return o->duration(); } }; -class EQL_EXPORT Q238 : public Q136 { // QWidget +class EQL_EXPORT Q239 : public Q136 { // QWidget Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0, Qt::WindowFlags x2 = 0) { return new LWidget(u, x1, x2); } @@ -2296,7 +2296,7 @@ public: Q_INVOKABLE void SsetTabOrder(QWidget* x1, QWidget* x2) { QWidget::setTabOrder(x1, x2); } }; -class EQL_EXPORT Q239 : public Q19 { // QWidgetAction +class EQL_EXPORT Q240 : public Q19 { // QWidgetAction Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1) { return new LWidgetAction(u, x1); } @@ -2307,7 +2307,7 @@ public: Q_INVOKABLE QList McreatedWidgets(QWidgetAction* o) const { return ((LWidgetAction*)o)->createdWidgets(); } }; -class EQL_EXPORT Q240 : public Q136 { // QWindow +class EQL_EXPORT Q241 : public Q136 { // QWindow Q_OBJECT public: Q_INVOKABLE void* C(uint u, QScreen* x1 = 0) { return new LWindow(u, x1); } @@ -2393,7 +2393,7 @@ public: Q_INVOKABLE QWindow* SfromWinId(WId x1) { return QWindow::fromWinId(x1); } }; -class EQL_EXPORT Q242 : public Q238 { // QWizardPage +class EQL_EXPORT Q243 : public Q239 { // QWizardPage Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LWizardPage(u, x1); } @@ -2420,7 +2420,7 @@ public: Q_INVOKABLE QWizard* Mwizard(QWizardPage* o) const { return ((LWizardPage*)o)->wizard(); } }; -class EQL_EXPORT Q2 : public Q238 { // QAbstractButton +class EQL_EXPORT Q2 : public Q239 { // QAbstractButton Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LAbstractButton(u, x1); } @@ -2447,7 +2447,7 @@ public: Q_INVOKABLE QString Mtext(QAbstractButton* o) const { return o->text(); } }; -class EQL_EXPORT Q11 : public Q238 { // QAbstractSlider +class EQL_EXPORT Q11 : public Q239 { // QAbstractSlider Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LAbstractSlider(u, x1); } @@ -2476,7 +2476,7 @@ public: Q_INVOKABLE void MsetRepeatAction(QAbstractSlider* o, QAbstractSlider::SliderAction x1, int x2 = 500, int x3 = 50) { ((LAbstractSlider*)o)->setRepeatAction(x1, x2, x3); } }; -class EQL_EXPORT Q13 : public Q238 { // QAbstractSpinBox +class EQL_EXPORT Q13 : public Q239 { // QAbstractSpinBox Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LAbstractSpinBox(u, x1); } @@ -2625,7 +2625,7 @@ public: Q_INVOKABLE qlonglong Msize(QBuffer* o) const { return o->size(); } }; -class EQL_EXPORT Q28 : public Q238 { // QCalendarWidget +class EQL_EXPORT Q28 : public Q239 { // QCalendarWidget Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LCalendarWidget(u, x1); } @@ -2676,7 +2676,7 @@ public: Q_INVOKABLE QSize MsizeHint(QCheckBox* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q39 : public Q238 { // QComboBox +class EQL_EXPORT Q39 : public Q239 { // QComboBox Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LComboBox(u, x1); } @@ -2743,7 +2743,7 @@ public: Q_INVOKABLE QSize MsizeHint(QComboBox* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q41 : public Q191 { // QCommonStyle +class EQL_EXPORT Q41 : public Q192 { // QCommonStyle Q_OBJECT public: Q_INVOKABLE void* C(uint u) { return new LCommonStyle(u); } @@ -2821,7 +2821,7 @@ public: Q_INVOKABLE void MstepBy(QDateTimeEdit* o, int x1) { o->stepBy(x1); } }; -class EQL_EXPORT Q47 : public Q238 { // QDesktopWidget +class EQL_EXPORT Q47 : public Q239 { // QDesktopWidget Q_OBJECT public: Q_INVOKABLE const QRect MavailableGeometry(QDesktopWidget* o, int x1 = -1) const { return o->availableGeometry(x1); } @@ -2852,7 +2852,7 @@ public: Q_INVOKABLE QSize MsizeHint(QDial* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q49 : public Q238 { // QDialog +class EQL_EXPORT Q49 : public Q239 { // QDialog Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0, Qt::WindowFlags x2 = 0) { return new LDialog(u, x1, x2); } @@ -2866,7 +2866,7 @@ public: Q_INVOKABLE QSize MsizeHint(QDialog* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q50 : public Q238 { // QDialogButtonBox +class EQL_EXPORT Q50 : public Q239 { // QDialogButtonBox Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LDialogButtonBox(u, x1); } @@ -2890,7 +2890,7 @@ public: Q_INVOKABLE int MstandardButtons(QDialogButtonBox* o) const { return o->standardButtons(); } }; -class EQL_EXPORT Q52 : public Q238 { // QDockWidget +class EQL_EXPORT Q52 : public Q239 { // QDockWidget Q_OBJECT public: Q_INVOKABLE void* C(uint u, const QString& x1, QWidget* x2 = 0, Qt::WindowFlags x3 = 0) { return new LDockWidget(u, x1, x2, x3); } @@ -2935,7 +2935,7 @@ public: Q_INVOKABLE int Mvalidate(QDoubleSpinBox* o, QString& x1, int& x2) const { return o->validate(x1, x2); } }; -class EQL_EXPORT Q54 : public Q228 { // QDoubleValidator +class EQL_EXPORT Q54 : public Q229 { // QDoubleValidator Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LDoubleValidator(u, x1); } @@ -3039,7 +3039,7 @@ public: Q_INVOKABLE QUrl SgetSaveFileUrl(QWidget* x1 = 0, const QString& x2 = QString(), const QUrl& x3 = QUrl(), const QString& x4 = QString(), QString* x5 = 0, QFileDialog::Options x6 = 0, const QStringList& x7 = QStringList()) { return QFileDialog::getSaveFileUrl(x1, x2, x3, x4, x5, x6, x7); } }; -class EQL_EXPORT Q65 : public Q238 { // QFocusFrame +class EQL_EXPORT Q65 : public Q239 { // QFocusFrame Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LFocusFrame(u, x1); } @@ -3128,7 +3128,7 @@ public: Q_INVOKABLE QLayoutItem* MtakeAt(QFormLayout* o, int x1) { return o->takeAt(x1); } }; -class EQL_EXPORT Q69 : public Q238 { // QFrame +class EQL_EXPORT Q69 : public Q239 { // QFrame Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0, Qt::WindowFlags x2 = 0) { return new LFrame(u, x1, x2); } @@ -3262,7 +3262,7 @@ public: Q_INVOKABLE QLayoutItem* MtakeAt(QGridLayout* o, int x1) { return o->takeAt(x1); } }; -class EQL_EXPORT Q90 : public Q238 { // QGroupBox +class EQL_EXPORT Q90 : public Q239 { // QGroupBox Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LGroupBox(u, x1); } @@ -3341,7 +3341,7 @@ public: Q_INVOKABLE QString SgetText(QWidget* x1, const QString& x2, const QString& x3, QLineEdit::EchoMode x4 = QLineEdit::Normal, const QString& x5 = QString(), bool* x6 = 0, Qt::WindowFlags x7 = 0, Qt::InputMethodHints x8 = Qt::ImhNone) { return QInputDialog::getText(x1, x2, x3, x4, x5, x6, x7, x8); } }; -class EQL_EXPORT Q105 : public Q228 { // QIntValidator +class EQL_EXPORT Q105 : public Q229 { // QIntValidator Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LIntValidator(u, x1); } @@ -3410,7 +3410,7 @@ public: Q_INVOKABLE QSize MsizeHint(QLabel* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q113 : public Q238 { // QLineEdit +class EQL_EXPORT Q113 : public Q239 { // QLineEdit Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LLineEdit(u, x1); } @@ -3475,7 +3475,7 @@ public: Q_INVOKABLE QSize MsizeHint(QLineEdit* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q118 : public Q238 { // QMainWindow +class EQL_EXPORT Q118 : public Q239 { // QMainWindow Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0, Qt::WindowFlags x2 = 0) { return new LMainWindow(u, x1, x2); } @@ -3528,7 +3528,7 @@ public: Q_INVOKABLE bool MunifiedTitleAndToolBarOnMac(QMainWindow* o) const { return o->unifiedTitleAndToolBarOnMac(); } }; -class EQL_EXPORT Q120 : public Q238 { // QMdiSubWindow +class EQL_EXPORT Q120 : public Q239 { // QMdiSubWindow Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0, Qt::WindowFlags x2 = 0) { return new LMdiSubWindow(u, x1, x2); } @@ -3548,7 +3548,7 @@ public: Q_INVOKABLE QSize MsizeHint(QMdiSubWindow* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q126 : public Q238 { // QMenu +class EQL_EXPORT Q126 : public Q239 { // QMenu Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LMenu(u, x1); } @@ -3595,7 +3595,7 @@ public: Q_INVOKABLE QAction* Sexec(const QList& x1, const QPoint& x2, QAction* x3 = 0, QWidget* x4 = 0) { return QMenu::exec(x1, x2, x3, x4); } }; -class EQL_EXPORT Q127 : public Q238 { // QMenuBar +class EQL_EXPORT Q127 : public Q239 { // QMenuBar Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LMenuBar(u, x1); } @@ -3674,7 +3674,7 @@ public: Q_INVOKABLE int Swarning(QWidget* x1, const QString& x2, const QString& x3, QMessageBox::StandardButtons x4 = QMessageBox::Ok, QMessageBox::StandardButton x5 = QMessageBox::NoButton) { return QMessageBox::warning(x1, x2, x3, x4, x5); } }; -class EQL_EXPORT Q140 : public Q238 { // QOpenGLWidget +class EQL_EXPORT Q140 : public Q239 { // QOpenGLWidget Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0, Qt::WindowFlags x2 = 0) { return new LOpenGLWidget(u, x1, x2); } @@ -3702,7 +3702,7 @@ public: Q_INVOKABLE void MsetVisible(QPageSetupDialog* o, bool x1) { o->setVisible(x1); } }; -class EQL_EXPORT Q143 : public Q240 { // QPaintDeviceWindow +class EQL_EXPORT Q143 : public Q241 { // QPaintDeviceWindow Q_OBJECT public: Q_INVOKABLE void Mupdate(QPaintDeviceWindow* o, const QRect& x1) { o->update(x1); } @@ -3720,7 +3720,7 @@ public: Q_INVOKABLE void MsetVisible(QPrintPreviewDialog* o, bool x1) { o->setVisible(x1); } }; -class EQL_EXPORT Q154 : public Q238 { // QPrintPreviewWidget +class EQL_EXPORT Q154 : public Q239 { // QPrintPreviewWidget Q_OBJECT public: Q_INVOKABLE void* C(uint u, QPrinter* x1, QWidget* x2 = 0, Qt::WindowFlags x3 = 0) { return new LPrintPreviewWidget(u, x1, x2, x3); } @@ -3734,7 +3734,7 @@ public: Q_INVOKABLE void MsetVisible(QPrintPreviewWidget* o, bool x1) { o->setVisible(x1); } }; -class EQL_EXPORT Q156 : public Q238 { // QProgressBar +class EQL_EXPORT Q156 : public Q239 { // QProgressBar Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LProgressBar(u, x1); } @@ -3781,7 +3781,7 @@ public: Q_INVOKABLE QSize MsizeHint(QProgressDialog* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q158 : public Q229 { // QPropertyAnimation +class EQL_EXPORT Q158 : public Q230 { // QPropertyAnimation Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LPropertyAnimation(u, x1); } @@ -3792,7 +3792,39 @@ public: Q_INVOKABLE QObject* MtargetObject(QPropertyAnimation* o) const { return o->targetObject(); } }; -class EQL_EXPORT Q159 : public Q2 { // QPushButton +class EQL_EXPORT Q159 : public Q41 { // QProxyStyle + Q_OBJECT +public: + Q_INVOKABLE void* C(uint u, QStyle* x1 = 0) { return new LProxyStyle(u, x1); } + Q_INVOKABLE void* C(uint u, const QString& x1) { return new LProxyStyle(u, x1); } + Q_INVOKABLE QStyle* MbaseStyle(QProxyStyle* o) const { return o->baseStyle(); } + Q_INVOKABLE void MsetBaseStyle(QProxyStyle* o, QStyle* x1) { o->setBaseStyle(x1); } + Q_INVOKABLE void MdrawComplexControl(QProxyStyle* o, QProxyStyle::ComplexControl x1, const QStyleOptionComplex* x2, QPainter* x3, const QWidget* x4 = 0) const { o->drawComplexControl(x1, x2, x3, x4); } + Q_INVOKABLE void MdrawControl(QProxyStyle* o, QProxyStyle::ControlElement x1, const QStyleOption* x2, QPainter* x3, const QWidget* x4 = 0) const { o->drawControl(x1, x2, x3, x4); } + Q_INVOKABLE void MdrawItemPixmap(QProxyStyle* o, QPainter* x1, const QRect& x2, int x3, const QPixmap& x4) const { o->drawItemPixmap(x1, x2, x3, x4); } + Q_INVOKABLE void MdrawItemText(QProxyStyle* o, QPainter* x1, const QRect& x2, int x3, const QPalette& x4, bool x5, const QString& x6, QPalette::ColorRole x7 = QPalette::NoRole) const { o->drawItemText(x1, x2, x3, x4, x5, x6, x7); } + Q_INVOKABLE void MdrawPrimitive(QProxyStyle* o, QProxyStyle::PrimitiveElement x1, const QStyleOption* x2, QPainter* x3, const QWidget* x4 = 0) const { o->drawPrimitive(x1, x2, x3, x4); } + Q_INVOKABLE QPixmap MgeneratedIconPixmap(QProxyStyle* o, QIcon::Mode x1, const QPixmap& x2, const QStyleOption* x3) const { return o->generatedIconPixmap(x1, x2, x3); } + Q_INVOKABLE int MhitTestComplexControl(QProxyStyle* o, QProxyStyle::ComplexControl x1, const QStyleOptionComplex* x2, const QPoint& x3, const QWidget* x4 = 0) const { return o->hitTestComplexControl(x1, x2, x3, x4); } + Q_INVOKABLE QRect MitemPixmapRect(QProxyStyle* o, const QRect& x1, int x2, const QPixmap& x3) const { return o->itemPixmapRect(x1, x2, x3); } + Q_INVOKABLE QRect MitemTextRect(QProxyStyle* o, const QFontMetrics& x1, const QRect& x2, int x3, bool x4, const QString& x5) const { return o->itemTextRect(x1, x2, x3, x4, x5); } + Q_INVOKABLE int MlayoutSpacing(QProxyStyle* o, QSizePolicy::ControlType x1, QSizePolicy::ControlType x2, Qt::Orientation x3, const QStyleOption* x4 = 0, const QWidget* x5 = 0) const { return o->layoutSpacing(x1, x2, x3, x4, x5); } + Q_INVOKABLE int MpixelMetric(QProxyStyle* o, QProxyStyle::PixelMetric x1, const QStyleOption* x2 = 0, const QWidget* x3 = 0) const { return o->pixelMetric(x1, x2, x3); } + Q_INVOKABLE void Mpolish(QProxyStyle* o, QWidget* x1) { o->polish(x1); } + Q_INVOKABLE void Mpolish(QProxyStyle* o, QPalette& x1) { o->polish(x1); } + Q_INVOKABLE void Mpolish(QProxyStyle* o, QApplication* x1) { o->polish(x1); } + Q_INVOKABLE QSize MsizeFromContents(QProxyStyle* o, QProxyStyle::ContentsType x1, const QStyleOption* x2, const QSize& x3, const QWidget* x4) const { return o->sizeFromContents(x1, x2, x3, x4); } + Q_INVOKABLE QIcon MstandardIcon(QProxyStyle* o, QProxyStyle::StandardPixmap x1, const QStyleOption* x2 = 0, const QWidget* x3 = 0) const { return o->standardIcon(x1, x2, x3); } + Q_INVOKABLE QPalette MstandardPalette(QProxyStyle* o) const { return o->standardPalette(); } + Q_INVOKABLE QPixmap MstandardPixmap(QProxyStyle* o, QProxyStyle::StandardPixmap x1, const QStyleOption* x2, const QWidget* x3 = 0) const { return o->standardPixmap(x1, x2, x3); } + Q_INVOKABLE int MstyleHint(QProxyStyle* o, QProxyStyle::StyleHint x1, const QStyleOption* x2 = 0, const QWidget* x3 = 0, QStyleHintReturn* x4 = 0) const { return o->styleHint(x1, x2, x3, x4); } + Q_INVOKABLE QRect MsubControlRect(QProxyStyle* o, QProxyStyle::ComplexControl x1, const QStyleOptionComplex* x2, QProxyStyle::SubControl x3, const QWidget* x4) const { return o->subControlRect(x1, x2, x3, x4); } + Q_INVOKABLE QRect MsubElementRect(QProxyStyle* o, QProxyStyle::SubElement x1, const QStyleOption* x2, const QWidget* x3) const { return o->subElementRect(x1, x2, x3); } + Q_INVOKABLE void Munpolish(QProxyStyle* o, QWidget* x1) { o->unpolish(x1); } + Q_INVOKABLE void Munpolish(QProxyStyle* o, QApplication* x1) { o->unpolish(x1); } +}; + +class EQL_EXPORT Q160 : public Q2 { // QPushButton Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LPushButton(u, x1); } @@ -3811,7 +3843,7 @@ public: Q_INVOKABLE QSize MsizeHint(QPushButton* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q160 : public Q2 { // QRadioButton +class EQL_EXPORT Q161 : public Q2 { // QRadioButton Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LRadioButton(u, x1); } @@ -3821,7 +3853,7 @@ public: Q_INVOKABLE QSize MsizeHint(QRadioButton* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q162 : public Q228 { // QRegExpValidator +class EQL_EXPORT Q163 : public Q229 { // QRegExpValidator Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LRegExpValidator(u, x1); } @@ -3831,7 +3863,7 @@ public: Q_INVOKABLE int Mvalidate(QRegExpValidator* o, QString& x1, int& x2) const { return o->validate(x1, x2); } }; -class EQL_EXPORT Q163 : public Q238 { // QRubberBand +class EQL_EXPORT Q164 : public Q239 { // QRubberBand Q_OBJECT public: Q_INVOKABLE void* C(uint u, QRubberBand::Shape x1, QWidget* x2 = 0) { return new LRubberBand(u, x1, x2); } @@ -3845,7 +3877,7 @@ public: Q_INVOKABLE void MinitStyleOption(QRubberBand* o, QStyleOptionRubberBand* x1) const { ((LRubberBand*)o)->initStyleOption(x1); } }; -class EQL_EXPORT Q166 : public Q11 { // QScrollBar +class EQL_EXPORT Q167 : public Q11 { // QScrollBar Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LScrollBar(u, x1); } @@ -3855,7 +3887,7 @@ public: Q_INVOKABLE QSize MsizeHint(QScrollBar* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q172 : public Q238 { // QSizeGrip +class EQL_EXPORT Q173 : public Q239 { // QSizeGrip Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1) { return new LSizeGrip(u, x1); } @@ -3863,7 +3895,7 @@ public: Q_INVOKABLE QSize MsizeHint(QSizeGrip* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q173 : public Q11 { // QSlider +class EQL_EXPORT Q174 : public Q11 { // QSlider Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LSlider(u, x1); } @@ -3878,7 +3910,7 @@ public: Q_INVOKABLE QSize MsizeHint(QSlider* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q175 : public Q13 { // QSpinBox +class EQL_EXPORT Q176 : public Q13 { // QSpinBox Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LSpinBox(u, x1); } @@ -3899,7 +3931,7 @@ public: Q_INVOKABLE int Mvalue(QSpinBox* o) const { return o->value(); } }; -class EQL_EXPORT Q176 : public Q238 { // QSplashScreen +class EQL_EXPORT Q177 : public Q239 { // QSplashScreen Q_OBJECT public: Q_INVOKABLE void* C(uint u, const QPixmap& x1 = QPixmap(), Qt::WindowFlags x2 = 0) { return new LSplashScreen(u, x1, x2); } @@ -3911,7 +3943,7 @@ public: Q_INVOKABLE void MsetPixmap(QSplashScreen* o, const QPixmap& x1) { o->setPixmap(x1); } }; -class EQL_EXPORT Q177 : public Q69 { // QSplitter +class EQL_EXPORT Q178 : public Q69 { // QSplitter Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LSplitter(u, x1); } @@ -3943,7 +3975,7 @@ public: Q_INVOKABLE QSize MsizeHint(QSplitter* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q178 : public Q238 { // QSplitterHandle +class EQL_EXPORT Q179 : public Q239 { // QSplitterHandle Q_OBJECT public: Q_INVOKABLE bool MopaqueResize(QSplitterHandle* o) const { return o->opaqueResize(); } @@ -3955,7 +3987,7 @@ public: Q_INVOKABLE QSize MsizeHint(QSplitterHandle* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q185 : public Q69 { // QStackedWidget +class EQL_EXPORT Q186 : public Q69 { // QStackedWidget Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LStackedWidget(u, x1); } @@ -3969,7 +4001,7 @@ public: Q_INVOKABLE QWidget* Mwidget(QStackedWidget* o, int x1) const { return o->widget(x1); } }; -class EQL_EXPORT Q189 : public Q238 { // QStatusBar +class EQL_EXPORT Q190 : public Q239 { // QStatusBar Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LStatusBar(u, x1); } @@ -3985,7 +4017,7 @@ public: Q_INVOKABLE void Mreformat(QStatusBar* o) { ((LStatusBar*)o)->reformat(); } }; -class EQL_EXPORT Q198 : public Q238 { // QTabBar +class EQL_EXPORT Q199 : public Q239 { // QTabBar Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LTabBar(u, x1); } @@ -4044,7 +4076,7 @@ public: Q_INVOKABLE QSize MsizeHint(QTabBar* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q199 : public Q238 { // QTabWidget +class EQL_EXPORT Q200 : public Q239 { // QTabWidget Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LTabWidget(u, x1); } @@ -4098,13 +4130,13 @@ public: Q_INVOKABLE QSize MsizeHint(QTabWidget* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q206 : public Q212 { // QTextBlockGroup +class EQL_EXPORT Q207 : public Q213 { // QTextBlockGroup Q_OBJECT public: Q_INVOKABLE QList MblockList(QTextBlockGroup* o) const { return ((LTextBlockGroup*)o)->blockList(); } }; -class EQL_EXPORT Q210 : public Q212 { // QTextFrame +class EQL_EXPORT Q211 : public Q213 { // QTextFrame Q_OBJECT public: Q_INVOKABLE void* C(uint u, QTextDocument* x1) { return new LTextFrame(u, x1); } @@ -4118,7 +4150,7 @@ public: Q_INVOKABLE void MsetFrameFormat(QTextFrame* o, const QTextFrameFormat& x1) { o->setFrameFormat(x1); } }; -class EQL_EXPORT Q211 : public Q206 { // QTextList +class EQL_EXPORT Q212 : public Q207 { // QTextList Q_OBJECT public: Q_INVOKABLE void Madd(QTextList* o, const QTextBlock& x1) { o->add(x1); } @@ -4132,7 +4164,7 @@ public: Q_INVOKABLE void MsetFormat(QTextList* o, const QTextListFormat& x1) { o->setFormat(x1); } }; -class EQL_EXPORT Q213 : public Q210 { // QTextTable +class EQL_EXPORT Q214 : public Q211 { // QTextTable Q_OBJECT public: Q_INVOKABLE void MappendColumns(QTextTable* o, int x1) { o->appendColumns(x1); } @@ -4156,14 +4188,14 @@ public: Q_INVOKABLE void MsplitCell(QTextTable* o, int x1, int x2, int x3, int x4) { o->splitCell(x1, x2, x3, x4); } }; -class EQL_EXPORT Q214 : public Q46 { // QTimeEdit +class EQL_EXPORT Q215 : public Q46 { // QTimeEdit Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LTimeEdit(u, x1); } Q_INVOKABLE void* C(uint u, const QTime& x1, QWidget* x2 = 0) { return new LTimeEdit(u, x1, x2); } }; -class EQL_EXPORT Q217 : public Q238 { // QToolBar +class EQL_EXPORT Q218 : public Q239 { // QToolBar Q_OBJECT public: Q_INVOKABLE void* C(uint u, const QString& x1, QWidget* x2 = 0) { return new LToolBar(u, x1, x2); } @@ -4195,7 +4227,7 @@ public: Q_INVOKABLE QWidget* MwidgetForAction(QToolBar* o, QAction* x1) const { return o->widgetForAction(x1); } }; -class EQL_EXPORT Q218 : public Q69 { // QToolBox +class EQL_EXPORT Q219 : public Q69 { // QToolBox Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0, Qt::WindowFlags x2 = 0) { return new LToolBox(u, x1, x2); } @@ -4219,7 +4251,7 @@ public: Q_INVOKABLE QWidget* Mwidget(QToolBox* o, int x1) const { return o->widget(x1); } }; -class EQL_EXPORT Q219 : public Q2 { // QToolButton +class EQL_EXPORT Q220 : public Q2 { // QToolButton Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LToolButton(u, x1); } @@ -4237,14 +4269,14 @@ public: Q_INVOKABLE QSize MsizeHint(QToolButton* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q227 : public Q25 { // QVBoxLayout +class EQL_EXPORT Q228 : public Q25 { // QVBoxLayout Q_OBJECT public: Q_INVOKABLE void* C(uint u) { return new LVBoxLayout(u); } Q_INVOKABLE void* C(uint u, QWidget* x1) { return new LVBoxLayout(u, x1); } }; -class EQL_EXPORT Q241 : public Q49 { // QWizard +class EQL_EXPORT Q242 : public Q49 { // QWizard Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0, Qt::WindowFlags x2 = 0) { return new LWizard(u, x1, x2); } @@ -4354,7 +4386,7 @@ public: Q_INVOKABLE QColor SstandardColor(int x1) { return QColorDialog::standardColor(x1); } }; -class EQL_EXPORT Q40 : public Q159 { // QCommandLinkButton +class EQL_EXPORT Q40 : public Q160 { // QCommandLinkButton Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LCommandLinkButton(u, x1); } @@ -4613,7 +4645,7 @@ public: Q_INVOKABLE void MsetVisible(QPrintDialog* o, bool x1) { o->setVisible(x1); } }; -class EQL_EXPORT Q165 : public Q10 { // QScrollArea +class EQL_EXPORT Q166 : public Q10 { // QScrollArea Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LScrollArea(u, x1); } @@ -4630,7 +4662,7 @@ public: Q_INVOKABLE QSize MsizeHint(QScrollArea* o) const { return o->sizeHint(); } }; -class EQL_EXPORT Q209 : public Q10 { // QTextEdit +class EQL_EXPORT Q210 : public Q10 { // QTextEdit Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LTextEdit(u, x1); } @@ -4937,7 +4969,7 @@ public: Q_INVOKABLE void MdropEvent(QListWidget* o, QDropEvent* x1) { o->dropEvent(x1); } }; -class EQL_EXPORT Q200 : public Q5 { // QTableView +class EQL_EXPORT Q201 : public Q5 { // QTableView Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LTableView(u, x1); } @@ -4977,7 +5009,7 @@ public: Q_INVOKABLE void MsetSelectionModel(QTableView* o, QItemSelectionModel* x1) { o->setSelectionModel(x1); } }; -class EQL_EXPORT Q201 : public Q200 { // QTableWidget +class EQL_EXPORT Q202 : public Q201 { // QTableWidget Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LTableWidget(u, x1); } @@ -5029,7 +5061,7 @@ public: Q_INVOKABLE QList Mitems(QTableWidget* o, const QMimeData* x1) const { return ((LTableWidget*)o)->items(x1); } }; -class EQL_EXPORT Q207 : public Q209 { // QTextBrowser +class EQL_EXPORT Q208 : public Q210 { // QTextBrowser Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LTextBrowser(u, x1); } @@ -5050,7 +5082,7 @@ public: Q_INVOKABLE QVariant MloadResource(QTextBrowser* o, int x1, const QUrl& x2) { return o->loadResource(x1, x2); } }; -class EQL_EXPORT Q221 : public Q5 { // QTreeView +class EQL_EXPORT Q222 : public Q5 { // QTreeView Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LTreeView(u, x1); } @@ -5111,7 +5143,7 @@ public: Q_INVOKABLE QRect MvisualRect(QTreeView* o, const QModelIndex& x1) const { return o->visualRect(x1); } }; -class EQL_EXPORT Q222 : public Q221 { // QTreeWidget +class EQL_EXPORT Q223 : public Q222 { // QTreeWidget Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LTreeWidget(u, x1); } @@ -5157,7 +5189,7 @@ public: Q_INVOKABLE void MsetSelectionModel(QTreeWidget* o, QItemSelectionModel* x1) { o->setSelectionModel(x1); } }; -class EQL_EXPORT Q226 : public Q114 { // QUndoView +class EQL_EXPORT Q227 : public Q114 { // QUndoView Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LUndoView(u, x1); } diff --git a/src/gen/help/_q_methods.h b/src/gen/help/_q_methods.h index 0541480..2ae3b74 100644 --- a/src/gen/help/_q_methods.h +++ b/src/gen/help/_q_methods.h @@ -65,7 +65,7 @@ public: Q_INVOKABLE QHelpSearchResultWidget* MresultWidget(QHelpSearchEngine* o) { return o->resultWidget(); } }; -class Q97 : public Q190 { // QHelpIndexModel +class Q97 : public Q191 { // QHelpIndexModel Q_OBJECT public: Q_INVOKABLE void McreateIndex(QHelpIndexModel* o, const QString& x1) { o->createIndex(x1); } @@ -73,7 +73,7 @@ public: Q_INVOKABLE bool MisCreatingIndex(QHelpIndexModel* o) const { return o->isCreatingIndex(); } }; -class Q100 : public Q238 { // QHelpSearchQueryWidget +class Q100 : public Q239 { // QHelpSearchQueryWidget Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LHelpSearchQueryWidget(u, x1); } @@ -84,13 +84,13 @@ public: Q_INVOKABLE void MsetQuery(QHelpSearchQueryWidget* o, const QList& x1) { o->setQuery(x1); } }; -class Q101 : public Q238 { // QHelpSearchResultWidget +class Q101 : public Q239 { // QHelpSearchResultWidget Q_OBJECT public: Q_INVOKABLE QUrl MlinkAt(QHelpSearchResultWidget* o, const QPoint& x1) { return o->linkAt(x1); } }; -class Q95 : public Q221 { // QHelpContentWidget +class Q95 : public Q222 { // QHelpContentWidget Q_OBJECT public: Q_INVOKABLE QModelIndex MindexOf(QHelpContentWidget* o, const QUrl& x1) { return o->indexOf(x1); } diff --git a/src/gen/multimedia/_ini.cpp b/src/gen/multimedia/_ini.cpp index b3e0e7e..d2c8fff 100644 --- a/src/gen/multimedia/_ini.cpp +++ b/src/gen/multimedia/_ini.cpp @@ -47,9 +47,9 @@ void ini() { LObjects::Q[122] = new Q123; LObjects::Q[123] = new Q124; LObjects::Q[124] = new Q125; - LObjects::Q[160] = new Q161; - LObjects::Q[229] = new Q230; + LObjects::Q[161] = new Q162; LObjects::Q[230] = new Q231; + LObjects::Q[231] = new Q232; LObjects::N[7] = new N8; LObjects::N[8] = new N9; LObjects::N[9] = new N10; @@ -78,9 +78,9 @@ const QMetaObject* staticMetaObject(int n) { case 123: m = &QMediaPlaylist::staticMetaObject; break; case 124: m = &QMediaRecorder::staticMetaObject; break; case 125: m = &QMediaService::staticMetaObject; break; - case 161: m = &QRadioTuner::staticMetaObject; break; - case 230: m = &QVideoWidget::staticMetaObject; break; - case 231: m = &QVideoWidgetControl::staticMetaObject; break; } + case 162: m = &QRadioTuner::staticMetaObject; break; + case 231: m = &QVideoWidget::staticMetaObject; break; + case 232: m = &QVideoWidgetControl::staticMetaObject; break; } return m; } void deleteNObject(int n, void* p, int gc) { @@ -110,9 +110,9 @@ NumList* overrideFunctions(const QByteArray& name) { case 122: ids = &LMediaPlayer::overrideIds; break; case 123: ids = &LMediaPlaylist::overrideIds; break; case 124: ids = &LMediaRecorder::overrideIds; break; - case 161: ids = &LRadioTuner::overrideIds; break; - case 230: ids = &LVideoWidget::overrideIds; break; - case 231: ids = &LVideoWidgetControl::overrideIds; break; }} + case 162: ids = &LRadioTuner::overrideIds; break; + case 231: ids = &LVideoWidget::overrideIds; break; + case 232: ids = &LVideoWidgetControl::overrideIds; break; }} else { n = LObjects::n_names.value(name); switch(n) { diff --git a/src/gen/multimedia/_q_classes.h b/src/gen/multimedia/_q_classes.h index b3661b8..0d80f73 100644 --- a/src/gen/multimedia/_q_classes.h +++ b/src/gen/multimedia/_q_classes.h @@ -222,7 +222,7 @@ public: class LRadioTuner : public QRadioTuner { Q_OBJECT - friend class Q161; + friend class Q162; public: LRadioTuner(uint u, QObject* x1 = 0) : QRadioTuner(x1), unique(u) {} @@ -242,7 +242,7 @@ public: class LVideoWidget : public QVideoWidget { Q_OBJECT - friend class Q230; + friend class Q231; public: LVideoWidget(uint u, QWidget* x1 = 0) : QVideoWidget(x1), unique(u) {} @@ -291,7 +291,7 @@ public: class LVideoWidgetControl : public QVideoWidgetControl { Q_OBJECT - friend class Q231; + friend class Q232; public: static NumList overrideIds; diff --git a/src/gen/multimedia/_q_methods.h b/src/gen/multimedia/_q_methods.h index 77f2bb2..7eeab7c 100644 --- a/src/gen/multimedia/_q_methods.h +++ b/src/gen/multimedia/_q_methods.h @@ -11,7 +11,7 @@ QT_BEGIN_NAMESPACE -class Q231 : public QObject { // QVideoWidgetControl +class Q232 : public QObject { // QVideoWidgetControl Q_OBJECT public: Q_INVOKABLE int MaspectRatioMode(QVideoWidgetControl* o) const { return o->aspectRatioMode(); } @@ -297,7 +297,7 @@ class Q125 : public Q136 { // QMediaService public: }; -class Q161 : public Q121 { // QRadioTuner +class Q162 : public Q121 { // QRadioTuner Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LRadioTuner(u, x1); } @@ -362,7 +362,7 @@ public: Q_INVOKABLE int Mavailability(QCamera* o) const { return o->availability(); } }; -class Q230 : public Q238 { // QVideoWidget +class Q231 : public Q239 { // QVideoWidget Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LVideoWidget(u, x1); } @@ -376,7 +376,7 @@ public: Q_INVOKABLE QSize MsizeHint(QVideoWidget* o) const { return o->sizeHint(); } }; -class Q34 : public Q230 { // QCameraViewfinder +class Q34 : public Q231 { // QCameraViewfinder Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LCameraViewfinder(u, x1); } diff --git a/src/gen/network/_ini.cpp b/src/gen/network/_ini.cpp index 0e94cba..4205bf4 100644 --- a/src/gen/network/_ini.cpp +++ b/src/gen/network/_ini.cpp @@ -43,9 +43,9 @@ void ini() { LObjects::Q[132] = new Q133; LObjects::Q[133] = new Q134; LObjects::Q[134] = new Q135; - LObjects::Q[203] = new Q204; LObjects::Q[204] = new Q205; - LObjects::Q[222] = new Q223; + LObjects::Q[205] = new Q206; + LObjects::Q[223] = new Q224; LObjects::N[10] = new N11; LObjects::N[73] = new N74; LObjects::N[74] = new N75; @@ -74,9 +74,9 @@ const QMetaObject* staticMetaObject(int n) { case 133: m = &QNetworkCookieJar::staticMetaObject; break; case 134: m = &QNetworkDiskCache::staticMetaObject; break; case 135: m = &QNetworkReply::staticMetaObject; break; - case 204: m = &QTcpServer::staticMetaObject; break; - case 205: m = &QTcpSocket::staticMetaObject; break; - case 223: m = &QUdpSocket::staticMetaObject; break; } + case 205: m = &QTcpServer::staticMetaObject; break; + case 206: m = &QTcpSocket::staticMetaObject; break; + case 224: m = &QUdpSocket::staticMetaObject; break; } return m; } void deleteNObject(int n, void* p, int gc) { @@ -109,9 +109,9 @@ NumList* overrideFunctions(const QByteArray& name) { case 132: ids = &LNetworkAccessManager::overrideIds; break; case 133: ids = &LNetworkCookieJar::overrideIds; break; case 134: ids = &LNetworkDiskCache::overrideIds; break; - case 204: ids = <cpServer::overrideIds; break; - case 205: ids = <cpSocket::overrideIds; break; - case 223: ids = &LUdpSocket::overrideIds; break; }} + case 205: ids = <cpServer::overrideIds; break; + case 206: ids = <cpSocket::overrideIds; break; + case 224: ids = &LUdpSocket::overrideIds; break; }} else { n = LObjects::n_names.value(name); switch(n) { diff --git a/src/gen/network/_q_classes.h b/src/gen/network/_q_classes.h index 6ef5c80..b400d2b 100644 --- a/src/gen/network/_q_classes.h +++ b/src/gen/network/_q_classes.h @@ -156,7 +156,7 @@ public: class LTcpServer : public QTcpServer { Q_OBJECT - friend class Q204; + friend class Q205; public: LTcpServer(uint u, QObject* x1 = 0) : QTcpServer(x1), unique(u) {} @@ -173,7 +173,7 @@ public: class LTcpSocket : public QTcpSocket { Q_OBJECT - friend class Q205; + friend class Q206; public: LTcpSocket(uint u, QObject* x1 = 0) : QTcpSocket(x1), unique(u) {} @@ -212,7 +212,7 @@ public: class LUdpSocket : public QUdpSocket { Q_OBJECT - friend class Q223; + friend class Q224; public: LUdpSocket(uint u, QObject* x1 = 0) : QUdpSocket(x1), unique(u) {} diff --git a/src/gen/network/_q_methods.h b/src/gen/network/_q_methods.h index 13da5fe..7d9cfa0 100644 --- a/src/gen/network/_q_methods.h +++ b/src/gen/network/_q_methods.h @@ -147,7 +147,7 @@ public: Q_INVOKABLE void Mclose(QNetworkReply* o) { o->close(); } }; -class Q204 : public Q136 { // QTcpServer +class Q205 : public Q136 { // QTcpServer Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LTcpServer(u, x1); } @@ -218,13 +218,13 @@ public: Q_INVOKABLE bool MwaitForReadyRead(QAbstractSocket* o, int x1 = 30000) { return o->waitForReadyRead(x1); } }; -class Q205 : public Q12 { // QTcpSocket +class Q206 : public Q12 { // QTcpSocket Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LTcpSocket(u, x1); } }; -class Q223 : public Q12 { // QUdpSocket +class Q224 : public Q12 { // QUdpSocket Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LUdpSocket(u, x1); } diff --git a/src/gen/sql/_ini.cpp b/src/gen/sql/_ini.cpp index f7cbf4b..14781db 100644 --- a/src/gen/sql/_ini.cpp +++ b/src/gen/sql/_ini.cpp @@ -23,11 +23,11 @@ NumList LSqlResult::overrideIds = NumList() << 332 << 468 << 469 << 459 << 107 < void ini() { static bool _ = false; if(_) return; _ = true; ini2(); - LObjects::Q[178] = new Q179; LObjects::Q[179] = new Q180; LObjects::Q[180] = new Q181; LObjects::Q[181] = new Q182; LObjects::Q[182] = new Q183; + LObjects::Q[183] = new Q184; LObjects::N[137] = new N138; LObjects::N[138] = new N139; LObjects::N[139] = new N140; @@ -40,11 +40,11 @@ void ini() { const QMetaObject* staticMetaObject(int n) { const QMetaObject* m = 0; switch(n) { - case 179: m = &QSqlDriver::staticMetaObject; break; - case 180: m = &QSqlQueryModel::staticMetaObject; break; - case 181: m = &QSqlRelationalDelegate::staticMetaObject; break; - case 182: m = &QSqlRelationalTableModel::staticMetaObject; break; - case 183: m = &QSqlTableModel::staticMetaObject; break; } + case 180: m = &QSqlDriver::staticMetaObject; break; + case 181: m = &QSqlQueryModel::staticMetaObject; break; + case 182: m = &QSqlRelationalDelegate::staticMetaObject; break; + case 183: m = &QSqlRelationalTableModel::staticMetaObject; break; + case 184: m = &QSqlTableModel::staticMetaObject; break; } return m; } void deleteNObject(int n, void* p, int gc) { @@ -63,11 +63,11 @@ NumList* overrideFunctions(const QByteArray& name) { int n = LObjects::q_names.value(name, -1); if(n != -1) { switch(n) { - case 179: ids = &LSqlDriver::overrideIds; break; - case 180: ids = &LSqlQueryModel::overrideIds; break; - case 181: ids = &LSqlRelationalDelegate::overrideIds; break; - case 182: ids = &LSqlRelationalTableModel::overrideIds; break; - case 183: ids = &LSqlTableModel::overrideIds; break; }} + case 180: ids = &LSqlDriver::overrideIds; break; + case 181: ids = &LSqlQueryModel::overrideIds; break; + case 182: ids = &LSqlRelationalDelegate::overrideIds; break; + case 183: ids = &LSqlRelationalTableModel::overrideIds; break; + case 184: ids = &LSqlTableModel::overrideIds; break; }} else { n = LObjects::n_names.value(name); switch(n) { diff --git a/src/gen/sql/_q_classes.h b/src/gen/sql/_q_classes.h index d568275..0542640 100644 --- a/src/gen/sql/_q_classes.h +++ b/src/gen/sql/_q_classes.h @@ -13,7 +13,7 @@ QT_BEGIN_NAMESPACE class LSqlDriver : public QSqlDriver { Q_OBJECT - friend class Q179; + friend class Q180; public: LSqlDriver(uint u, QObject* x1 = 0) : QSqlDriver(x1), unique(u) {} @@ -51,7 +51,7 @@ public: class LSqlQueryModel : public QSqlQueryModel { Q_OBJECT - friend class Q180; + friend class Q181; public: LSqlQueryModel(uint u, QObject* x1 = 0) : QSqlQueryModel(x1), unique(u) {} @@ -95,7 +95,7 @@ public: class LSqlRelationalDelegate : public QSqlRelationalDelegate { Q_OBJECT - friend class Q181; + friend class Q182; public: LSqlRelationalDelegate(uint u, QObject* x1 = 0) : QSqlRelationalDelegate(x1), unique(u) {} @@ -123,7 +123,7 @@ public: class LSqlRelationalTableModel : public QSqlRelationalTableModel { Q_OBJECT - friend class Q182; + friend class Q183; public: LSqlRelationalTableModel(uint u, QObject* x1 = 0, QSqlDatabase x2 = QSqlDatabase()) : QSqlRelationalTableModel(x1, x2), unique(u) {} @@ -180,7 +180,7 @@ public: class LSqlTableModel : public QSqlTableModel { Q_OBJECT - friend class Q183; + friend class Q184; public: LSqlTableModel(uint u, QObject* x1 = 0, QSqlDatabase x2 = QSqlDatabase()) : QSqlTableModel(x1, x2), unique(u) {} diff --git a/src/gen/sql/_q_methods.h b/src/gen/sql/_q_methods.h index 5b06ac3..291bdc7 100644 --- a/src/gen/sql/_q_methods.h +++ b/src/gen/sql/_q_methods.h @@ -11,7 +11,7 @@ QT_BEGIN_NAMESPACE -class Q179 : public Q136 { // QSqlDriver +class Q180 : public Q136 { // QSqlDriver Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LSqlDriver(u, x1); } @@ -42,7 +42,7 @@ public: Q_INVOKABLE bool MunsubscribeFromNotification(QSqlDriver* o, const QString& x1) { return o->unsubscribeFromNotification(x1); } }; -class Q180 : public Q15 { // QSqlQueryModel +class Q181 : public Q15 { // QSqlQueryModel Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LSqlQueryModel(u, x1); } @@ -65,7 +65,7 @@ public: Q_INVOKABLE bool MsetHeaderData(QSqlQueryModel* o, int x1, Qt::Orientation x2, const QVariant& x3, int x4 = Qt::EditRole) { return o->setHeaderData(x1, x2, x3, x4); } }; -class Q181 : public Q106 { // QSqlRelationalDelegate +class Q182 : public Q106 { // QSqlRelationalDelegate Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LSqlRelationalDelegate(u, x1); } @@ -73,7 +73,7 @@ public: Q_INVOKABLE void MsetModelData(QSqlRelationalDelegate* o, QWidget* x1, QAbstractItemModel* x2, const QModelIndex& x3) const { o->setModelData(x1, x2, x3); } }; -class Q183 : public Q180 { // QSqlTableModel +class Q184 : public Q181 { // QSqlTableModel Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0, QSqlDatabase x2 = QSqlDatabase()) { return new LSqlTableModel(u, x1, x2); } @@ -109,7 +109,7 @@ public: Q_INVOKABLE void Msort(QSqlTableModel* o, int x1, Qt::SortOrder x2) { o->sort(x1, x2); } }; -class Q182 : public Q183 { // QSqlRelationalTableModel +class Q183 : public Q184 { // QSqlRelationalTableModel Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0, QSqlDatabase x2 = QSqlDatabase()) { return new LSqlRelationalTableModel(u, x1, x2); } diff --git a/src/gen/svg/_ini.cpp b/src/gen/svg/_ini.cpp index ddf140f..1187db6 100644 --- a/src/gen/svg/_ini.cpp +++ b/src/gen/svg/_ini.cpp @@ -15,16 +15,16 @@ void ini() { static bool _ = false; if(_) return; _ = true; ini2(); LObjects::Q[81] = new Q82; - LObjects::Q[192] = new Q193; LObjects::Q[193] = new Q194; + LObjects::Q[194] = new Q195; LObjects::N[156] = new N157; } const QMetaObject* staticMetaObject(int n) { const QMetaObject* m = 0; switch(n) { case 82: m = &QGraphicsSvgItem::staticMetaObject; break; - case 193: m = &QSvgRenderer::staticMetaObject; break; - case 194: m = &QSvgWidget::staticMetaObject; break; } + case 194: m = &QSvgRenderer::staticMetaObject; break; + case 195: m = &QSvgWidget::staticMetaObject; break; } return m; } void deleteNObject(int n, void* p, int gc) { @@ -37,8 +37,8 @@ NumList* overrideFunctions(const QByteArray& name) { if(n != -1) { switch(n) { case 82: ids = &LGraphicsSvgItem::overrideIds; break; - case 193: ids = &LSvgRenderer::overrideIds; break; - case 194: ids = &LSvgWidget::overrideIds; break; }} + case 194: ids = &LSvgRenderer::overrideIds; break; + case 195: ids = &LSvgWidget::overrideIds; break; }} else { n = LObjects::n_names.value(name); switch(n) { diff --git a/src/gen/svg/_q_classes.h b/src/gen/svg/_q_classes.h index 1e52000..dfbf34d 100644 --- a/src/gen/svg/_q_classes.h +++ b/src/gen/svg/_q_classes.h @@ -32,7 +32,7 @@ public: class LSvgRenderer : public QSvgRenderer { Q_OBJECT - friend class Q193; + friend class Q194; public: LSvgRenderer(uint u, QObject* x1 = 0) : QSvgRenderer(x1), unique(u) {} LSvgRenderer(uint u, const QString& x1, QObject* x2 = 0) : QSvgRenderer(x1, x2), unique(u) {} @@ -49,7 +49,7 @@ public: class LSvgWidget : public QSvgWidget { Q_OBJECT - friend class Q194; + friend class Q195; public: LSvgWidget(uint u, QWidget* x1 = 0) : QSvgWidget(x1), unique(u) {} LSvgWidget(uint u, const QString& x1, QWidget* x2 = 0) : QSvgWidget(x1, x2), unique(u) {} diff --git a/src/gen/svg/_q_methods.h b/src/gen/svg/_q_methods.h index 514f64a..af1a03b 100644 --- a/src/gen/svg/_q_methods.h +++ b/src/gen/svg/_q_methods.h @@ -27,7 +27,7 @@ public: Q_INVOKABLE int Mtype(QGraphicsSvgItem* o) const { return o->type(); } }; -class Q193 : public Q136 { // QSvgRenderer +class Q194 : public Q136 { // QSvgRenderer Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LSvgRenderer(u, x1); } @@ -47,7 +47,7 @@ public: Q_INVOKABLE QRectF MviewBoxF(QSvgRenderer* o) const { return o->viewBoxF(); } }; -class Q194 : public Q238 { // QSvgWidget +class Q195 : public Q239 { // QSvgWidget Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LSvgWidget(u, x1); } diff --git a/src/gen/webkit/_ini.cpp b/src/gen/webkit/_ini.cpp index f8f1c05..4aae32c 100644 --- a/src/gen/webkit/_ini.cpp +++ b/src/gen/webkit/_ini.cpp @@ -23,12 +23,12 @@ void ini() { static bool _ = false; if(_) return; _ = true; ini2(); LObjects::Q[86] = new Q87; - LObjects::Q[231] = new Q232; LObjects::Q[232] = new Q233; LObjects::Q[233] = new Q234; LObjects::Q[234] = new Q235; LObjects::Q[235] = new Q236; LObjects::Q[236] = new Q237; + LObjects::Q[237] = new Q238; LObjects::N[201] = new N202; LObjects::N[202] = new N203; LObjects::N[203] = new N204; @@ -42,12 +42,12 @@ const QMetaObject* staticMetaObject(int n) { const QMetaObject* m = 0; switch(n) { case 87: m = &QGraphicsWebView::staticMetaObject; break; - case 232: m = &QWebFrame::staticMetaObject; break; - case 233: m = &QWebHistoryInterface::staticMetaObject; break; - case 234: m = &QWebInspector::staticMetaObject; break; - case 235: m = &QWebPage::staticMetaObject; break; - case 236: m = &QWebPluginFactory::staticMetaObject; break; - case 237: m = &QWebView::staticMetaObject; break; } + case 233: m = &QWebFrame::staticMetaObject; break; + case 234: m = &QWebHistoryInterface::staticMetaObject; break; + case 235: m = &QWebInspector::staticMetaObject; break; + case 236: m = &QWebPage::staticMetaObject; break; + case 237: m = &QWebPluginFactory::staticMetaObject; break; + case 238: m = &QWebView::staticMetaObject; break; } return m; } void deleteNObject(int n, void* p, int gc) { @@ -65,11 +65,11 @@ NumList* overrideFunctions(const QByteArray& name) { if(n != -1) { switch(n) { case 87: ids = &LGraphicsWebView::overrideIds; break; - case 233: ids = &LWebHistoryInterface::overrideIds; break; - case 234: ids = &LWebInspector::overrideIds; break; - case 235: ids = &LWebPage::overrideIds; break; - case 236: ids = &LWebPluginFactory::overrideIds; break; - case 237: ids = &LWebView::overrideIds; break; }} + case 234: ids = &LWebHistoryInterface::overrideIds; break; + case 235: ids = &LWebInspector::overrideIds; break; + case 236: ids = &LWebPage::overrideIds; break; + case 237: ids = &LWebPluginFactory::overrideIds; break; + case 238: ids = &LWebView::overrideIds; break; }} else { n = LObjects::n_names.value(name); switch(n) { diff --git a/src/gen/webkit/_q_classes.h b/src/gen/webkit/_q_classes.h index 92328d4..e7f136e 100644 --- a/src/gen/webkit/_q_classes.h +++ b/src/gen/webkit/_q_classes.h @@ -73,7 +73,7 @@ public: class LWebHistoryInterface : public QWebHistoryInterface { Q_OBJECT - friend class Q233; + friend class Q234; public: LWebHistoryInterface(uint u, QObject* x1 = 0) : QWebHistoryInterface(x1), unique(u) {} @@ -90,7 +90,7 @@ public: class LWebInspector : public QWebInspector { Q_OBJECT - friend class Q234; + friend class Q235; public: LWebInspector(uint u, QWidget* x1 = 0) : QWebInspector(x1), unique(u) {} @@ -139,7 +139,7 @@ public: class LWebPage : public QWebPage { Q_OBJECT - friend class Q235; + friend class Q236; public: LWebPage(uint u, QObject* x1 = 0) : QWebPage(x1), unique(u) {} @@ -167,7 +167,7 @@ public: class LWebPluginFactory : public QWebPluginFactory { Q_OBJECT - friend class Q236; + friend class Q237; public: LWebPluginFactory(uint u, QObject* x1 = 0) : QWebPluginFactory(x1), unique(u) {} @@ -185,7 +185,7 @@ public: class LWebView : public QWebView { Q_OBJECT - friend class Q237; + friend class Q238; public: LWebView(uint u, QWidget* x1 = 0) : QWebView(x1), unique(u) {} diff --git a/src/gen/webkit/_q_methods.h b/src/gen/webkit/_q_methods.h index b138839..9d6b599 100644 --- a/src/gen/webkit/_q_methods.h +++ b/src/gen/webkit/_q_methods.h @@ -11,7 +11,7 @@ QT_BEGIN_NAMESPACE -class Q232 : public Q136 { // QWebFrame +class Q233 : public Q136 { // QWebFrame Q_OBJECT public: Q_INVOKABLE void MaddToJavaScriptWindowObject(QWebFrame* o, const QString& x1, QObject* x2, QWebFrame::ValueOwnership x3 = QWebFrame::QtOwnership) { o->addToJavaScriptWindowObject(x1, x2, x3); } @@ -62,7 +62,7 @@ public: Q_INVOKABLE bool Mevent(QWebFrame* o, QEvent* x1) { return o->event(x1); } }; -class Q233 : public Q136 { // QWebHistoryInterface +class Q234 : public Q136 { // QWebHistoryInterface Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LWebHistoryInterface(u, x1); } @@ -72,7 +72,7 @@ public: Q_INVOKABLE void SsetDefaultInterface(QWebHistoryInterface* x1) { QWebHistoryInterface::setDefaultInterface(x1); } }; -class Q235 : public Q136 { // QWebPage +class Q236 : public Q136 { // QWebPage Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LWebPage(u, x1); } @@ -126,7 +126,7 @@ public: Q_INVOKABLE bool Mevent(QWebPage* o, QEvent* x1) { return o->event(x1); } }; -class Q236 : public Q136 { // QWebPluginFactory +class Q237 : public Q136 { // QWebPluginFactory Q_OBJECT public: Q_INVOKABLE void* C(uint u, QObject* x1 = 0) { return new LWebPluginFactory(u, x1); } @@ -173,7 +173,7 @@ public: Q_INVOKABLE void MupdateGeometry(QGraphicsWebView* o) { o->updateGeometry(); } }; -class Q234 : public Q238 { // QWebInspector +class Q235 : public Q239 { // QWebInspector Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LWebInspector(u, x1); } @@ -183,7 +183,7 @@ public: Q_INVOKABLE QSize MsizeHint(QWebInspector* o) const { return o->sizeHint(); } }; -class Q237 : public Q238 { // QWebView +class Q238 : public Q239 { // QWebView Q_OBJECT public: Q_INVOKABLE void* C(uint u, QWidget* x1 = 0) { return new LWebView(u, x1); } diff --git a/src/lisp/all-wrappers-1.lisp b/src/lisp/all-wrappers-1.lisp index 5737276..8efab74 100644 --- a/src/lisp/all-wrappers-1.lisp +++ b/src/lisp/all-wrappers-1.lisp @@ -373,6 +373,7 @@ #:|band| #:|baseName| #:|baseSize| + #:|baseStyle| #:|baseUrlChanged| #:|baseUrl| #:|base| @@ -384,6 +385,7 @@ #:|beforeUpdate| #:|before| #:|begin(QImage*)| + #:|begin(QPdfWriter*)| #:|begin(QPicture*)| #:|begin(QPixmap*)| #:|begin(QPrinter*)| @@ -1197,9 +1199,7 @@ #:|drawLines(QVector)| #:|drawLines(QVector)| #:|drawLines(const QLine*...)| - #:|drawLines(const QLineF*...)| - #:|drawLines(const QPointF*...)| - #:|drawLines|)) + #:|drawLines(const QLineF*...)|)) (in-package :eql) diff --git a/src/lisp/all-wrappers-10.lisp b/src/lisp/all-wrappers-10.lisp index 26c8e1a..45402dd 100644 --- a/src/lisp/all-wrappers-10.lisp +++ b/src/lisp/all-wrappers-10.lisp @@ -1,5 +1,8 @@ (in-package :eql) +(defun |selectMimeTypeFilter| (object &rest arguments) + (%qinvoke-method object nil "selectMimeTypeFilter" arguments)) + (defun |selectNameFilter| (object &rest arguments) (%qinvoke-method object nil "selectNameFilter" arguments)) @@ -216,15 +219,6 @@ (defun |setAddress(QString)| (object &rest arguments) (%qinvoke-method object nil "setAddress(QString)" arguments)) -(defun |setAddress(const quint8*)| (object &rest arguments) - (%qinvoke-method object nil "setAddress(const quint8*)" arguments)) - -(defun |setAddress(const sockaddr*)| (object &rest arguments) - (%qinvoke-method object nil "setAddress(const sockaddr*)" arguments)) - -(defun |setAddress(quint8*)| (object &rest arguments) - (%qinvoke-method object nil "setAddress(quint8*)" arguments)) - (defun |setAddress(uint)| (object &rest arguments) (%qinvoke-method object nil "setAddress(uint)" arguments)) @@ -486,6 +480,9 @@ (defun |setBaseSize| (object &rest arguments) (%qinvoke-method object nil "setBaseSize" arguments)) +(defun |setBaseStyle| (object &rest arguments) + (%qinvoke-method object nil "setBaseStyle" arguments)) + (defun |setBaseUrl| (object &rest arguments) (%qinvoke-method object nil "setBaseUrl" arguments)) @@ -3599,3 +3596,6 @@ (defun |setStyleHint| (object &rest arguments) (%qinvoke-method object nil "setStyleHint" arguments)) + +(defun |setStyleName| (object &rest arguments) + (%qinvoke-method object nil "setStyleName" arguments)) diff --git a/src/lisp/all-wrappers-11.lisp b/src/lisp/all-wrappers-11.lisp index 07ad471..948b002 100644 --- a/src/lisp/all-wrappers-11.lisp +++ b/src/lisp/all-wrappers-11.lisp @@ -1,8 +1,5 @@ (in-package :eql) -(defun |setStyleName| (object &rest arguments) - (%qinvoke-method object nil "setStyleName" arguments)) - (defun |setStyleProperty| (object &rest arguments) (%qinvoke-method object nil "setStyleProperty" arguments)) @@ -1143,6 +1140,9 @@ (defun |standardColor.QColorDialog| (&rest arguments) (%qinvoke-method "QColorDialog" nil "standardColor" arguments)) +(defun |standardIcon| (object &rest arguments) + (%qinvoke-method object nil "standardIcon" arguments)) + (defun |standardLocations.QStandardPaths| (&rest arguments) (%qinvoke-method "QStandardPaths" nil "standardLocations" arguments)) diff --git a/src/lisp/all-wrappers-2.lisp b/src/lisp/all-wrappers-2.lisp index eaeef6e..cb4ca29 100644 --- a/src/lisp/all-wrappers-2.lisp +++ b/src/lisp/all-wrappers-2.lisp @@ -1,5 +1,7 @@ (defpackage :eql (:export + #:|drawLines(const QPointF*...)| + #:|drawLines| #:|drawLine| #:|drawPath| #:|drawPicture(QPoint...)| @@ -870,7 +872,6 @@ #:|interfaceFromIndex.QNetworkInterface| #:|interfaceFromName.QNetworkInterface| #:|internalDelayedPopup| - #:|internalId| #:|interpretText| #:|intersected(QRect)| #:|intersected(QRegion)| @@ -1198,5 +1199,4 @@ #:|kernelVersion.QSysInfo| #:|kerning| #:|keyBindings.QKeySequence| - #:|keyBindingsForAction| - #:|keyExchangeMethod|)) + #:|keyBindingsForAction|)) diff --git a/src/lisp/all-wrappers-3.lisp b/src/lisp/all-wrappers-3.lisp index 17a1a14..49bc505 100644 --- a/src/lisp/all-wrappers-3.lisp +++ b/src/lisp/all-wrappers-3.lisp @@ -1,5 +1,6 @@ (defpackage :eql (:export + #:|keyExchangeMethod| #:|keyValueAt| #:|keyValues| #:|keyboardGrabber.QWidget| @@ -1198,5 +1199,4 @@ #:|select(QModelIndex...)| #:|selectAll| #:|selectColumn| - #:|selectFile| - #:|selectMimeTypeFilter|)) + #:|selectFile|)) diff --git a/src/lisp/all-wrappers-4.lisp b/src/lisp/all-wrappers-4.lisp index 9159c44..8fb2db7 100644 --- a/src/lisp/all-wrappers-4.lisp +++ b/src/lisp/all-wrappers-4.lisp @@ -1,5 +1,6 @@ (defpackage :eql (:export + #:|selectMimeTypeFilter| #:|selectNameFilter| #:|selectRow| #:|selectUrl| @@ -72,9 +73,6 @@ #:|setActive| #:|setActualVisibleContentRect| #:|setAddress(QString)| - #:|setAddress(const quint8*)| - #:|setAddress(const sockaddr*)| - #:|setAddress(quint8*)| #:|setAddress(uint)| #:|setAddresses| #:|setAddress| @@ -162,6 +160,7 @@ #:|setBand| #:|setBar| #:|setBaseSize| + #:|setBaseStyle| #:|setBaseUrl| #:|setBatchSize| #:|setBinMode| @@ -1199,4 +1198,5 @@ #:|setStyle(QString).QApplication| #:|setStyle(QStyle*).QApplication| #:|setStyle.QApplication| - #:|setStyleHint|)) + #:|setStyleHint| + #:|setStyleName|)) diff --git a/src/lisp/all-wrappers-5.lisp b/src/lisp/all-wrappers-5.lisp index a4514b6..4c5c9eb 100644 --- a/src/lisp/all-wrappers-5.lisp +++ b/src/lisp/all-wrappers-5.lisp @@ -1,6 +1,5 @@ (defpackage :eql (:export - #:|setStyleName| #:|setStyleProperty| #:|setStyleSheet| #:|setStyleStrategy| @@ -381,6 +380,7 @@ #:|standardButtons| #:|standardButton| #:|standardColor.QColorDialog| + #:|standardIcon| #:|standardLocations.QStandardPaths| #:|standardPalette| #:|standardPixmap| diff --git a/src/lisp/all-wrappers-7.lisp b/src/lisp/all-wrappers-7.lisp index d7645bc..3f73d70 100644 --- a/src/lisp/all-wrappers-7.lisp +++ b/src/lisp/all-wrappers-7.lisp @@ -1119,6 +1119,9 @@ (defun |baseSize| (object &rest arguments) (%qinvoke-method object nil "baseSize" arguments)) +(defun |baseStyle| (object &rest arguments) + (%qinvoke-method object nil "baseStyle" arguments)) + (defun |baseUrlChanged| (object &rest arguments) (%qinvoke-method object nil "baseUrlChanged" arguments)) @@ -1152,6 +1155,9 @@ (defun |begin(QImage*)| (object &rest arguments) (%qinvoke-method object nil "begin(QImage*)" arguments)) +(defun |begin(QPdfWriter*)| (object &rest arguments) + (%qinvoke-method object nil "begin(QPdfWriter*)" arguments)) + (defun |begin(QPicture*)| (object &rest arguments) (%qinvoke-method object nil "begin(QPicture*)" arguments)) @@ -3593,9 +3599,3 @@ (defun |drawLines(const QLineF*...)| (object &rest arguments) (%qinvoke-method object nil "drawLines(const QLineF*...)" arguments)) - -(defun |drawLines(const QPointF*...)| (object &rest arguments) - (%qinvoke-method object nil "drawLines(const QPointF*...)" arguments)) - -(defun |drawLines| (object &rest arguments) - (%qinvoke-method object nil "drawLines" arguments)) diff --git a/src/lisp/all-wrappers-8.lisp b/src/lisp/all-wrappers-8.lisp index d9f4531..63aa2fd 100644 --- a/src/lisp/all-wrappers-8.lisp +++ b/src/lisp/all-wrappers-8.lisp @@ -1,5 +1,11 @@ (in-package :eql) +(defun |drawLines(const QPointF*...)| (object &rest arguments) + (%qinvoke-method object nil "drawLines(const QPointF*...)" arguments)) + +(defun |drawLines| (object &rest arguments) + (%qinvoke-method object nil "drawLines" arguments)) + (defun |drawLine| (object &rest arguments) (%qinvoke-method object nil "drawLine" arguments)) @@ -2610,9 +2616,6 @@ (defun |internalDelayedPopup| (object &rest arguments) (%qinvoke-method object nil "internalDelayedPopup" arguments)) -(defun |internalId| (object &rest arguments) - (%qinvoke-method object nil "internalId" arguments)) - (defun |interpretText| (object &rest arguments) (%qinvoke-method object nil "interpretText" arguments)) @@ -3596,6 +3599,3 @@ (defun |keyBindingsForAction| (object &rest arguments) (%qinvoke-method object nil "keyBindingsForAction" arguments)) - -(defun |keyExchangeMethod| (object &rest arguments) - (%qinvoke-method object nil "keyExchangeMethod" arguments)) diff --git a/src/lisp/all-wrappers-9.lisp b/src/lisp/all-wrappers-9.lisp index f2bc7ae..776b5cd 100644 --- a/src/lisp/all-wrappers-9.lisp +++ b/src/lisp/all-wrappers-9.lisp @@ -1,5 +1,8 @@ (in-package :eql) +(defun |keyExchangeMethod| (object &rest arguments) + (%qinvoke-method object nil "keyExchangeMethod" arguments)) + (defun |keyValueAt| (object &rest arguments) (%qinvoke-method object nil "keyValueAt" arguments)) @@ -3596,6 +3599,3 @@ (defun |selectFile| (object &rest arguments) (%qinvoke-method object nil "selectFile" arguments)) - -(defun |selectMimeTypeFilter| (object &rest arguments) - (%qinvoke-method object nil "selectMimeTypeFilter" arguments)) diff --git a/src/lisp/enum-lists/parsed-enums.lisp b/src/lisp/enum-lists/parsed-enums.lisp index 1bf9c7e..a18a24a 100644 --- a/src/lisp/enum-lists/parsed-enums.lisp +++ b/src/lisp/enum-lists/parsed-enums.lisp @@ -863,6 +863,160 @@ ("|QStateMachine.NoCommonAncestorForTransitionError|" . 3) ("|QStateMachine.NormalPriority|" . 0) ("|QStateMachine.HighPriority|" . 1) +("|QStyle.CC_SpinBox|" . 0) +("|QStyle.CC_ComboBox|" . 1) +("|QStyle.CC_ScrollBar|" . 2) +("|QStyle.CC_Slider|" . 3) +("|QStyle.CC_ToolButton|" . 4) +("|QStyle.CC_TitleBar|" . 5) +("|QStyle.CC_GroupBox|" . 7) +("|QStyle.CC_Dial|" . 6) +("|QStyle.CC_MdiControls|" . 8) +("|QStyle.CC_CustomBase|" . #xf0000000) +("|QStyle.CT_CheckBox|" . 1) +("|QStyle.CT_ComboBox|" . 4) +("|QStyle.CT_HeaderSection|" . 19) +("|QStyle.CT_LineEdit|" . 14) +("|QStyle.CT_Menu|" . 10) +("|QStyle.CT_MenuBar|" . 9) +("|QStyle.CT_MenuBarItem|" . 8) +("|QStyle.CT_MenuItem|" . 7) +("|QStyle.CT_ProgressBar|" . 6) +("|QStyle.CT_PushButton|" . 0) +("|QStyle.CT_RadioButton|" . 2) +("|QStyle.CT_SizeGrip|" . 16) +("|QStyle.CT_Slider|" . 12) +("|QStyle.CT_ScrollBar|" . 13) +("|QStyle.CT_SpinBox|" . 15) +("|QStyle.CT_Splitter|" . 5) +("|QStyle.CT_TabBarTab|" . 11) +("|QStyle.CT_TabWidget|" . 17) +("|QStyle.CT_ToolButton|" . 3) +("|QStyle.CT_GroupBox|" . 20) +("|QStyle.CT_ItemViewItem|" . 22) +("|QStyle.CT_CustomBase|" . #xf0000000) +("|QStyle.CT_MdiControls|" . 21) +("|QStyle.CE_PushButton|" . 0) +("|QStyle.CE_PushButtonBevel|" . 1) +("|QStyle.CE_PushButtonLabel|" . 2) +("|QStyle.CE_DockWidgetTitle|" . 30) +("|QStyle.CE_Splitter|" . 28) +("|QStyle.CE_CheckBox|" . 3) +("|QStyle.CE_CheckBoxLabel|" . 4) +("|QStyle.CE_RadioButton|" . 5) +("|QStyle.CE_RadioButtonLabel|" . 6) +("|QStyle.CE_TabBarTab|" . 7) +("|QStyle.CE_TabBarTabShape|" . 8) +("|QStyle.CE_TabBarTabLabel|" . 9) +("|QStyle.CE_ProgressBar|" . 10) +("|QStyle.CE_ProgressBarGroove|" . 11) +("|QStyle.CE_ProgressBarContents|" . 12) +("|QStyle.CE_ProgressBarLabel|" . 13) +("|QStyle.CE_ToolButtonLabel|" . 22) +("|QStyle.CE_MenuBarItem|" . 20) +("|QStyle.CE_MenuBarEmptyArea|" . 21) +("|QStyle.CE_MenuItem|" . 14) +("|QStyle.CE_MenuScroller|" . 15) +("|QStyle.CE_MenuTearoff|" . 18) +("|QStyle.CE_MenuEmptyArea|" . 19) +("|QStyle.CE_MenuHMargin|" . 17) +("|QStyle.CE_MenuVMargin|" . 16) +("|QStyle.CE_ToolBoxTab|" . 26) +("|QStyle.CE_SizeGrip|" . 27) +("|QStyle.CE_Header|" . 23) +("|QStyle.CE_HeaderSection|" . 24) +("|QStyle.CE_HeaderLabel|" . 25) +("|QStyle.CE_ScrollBarAddLine|" . 31) +("|QStyle.CE_ScrollBarSubLine|" . 32) +("|QStyle.CE_ScrollBarAddPage|" . 33) +("|QStyle.CE_ScrollBarSubPage|" . 34) +("|QStyle.CE_ScrollBarSlider|" . 35) +("|QStyle.CE_ScrollBarFirst|" . 36) +("|QStyle.CE_ScrollBarLast|" . 37) +("|QStyle.CE_RubberBand|" . 29) +("|QStyle.CE_FocusFrame|" . 38) +("|QStyle.CE_ItemViewItem|" . 45) +("|QStyle.CE_CustomBase|" . #xf0000000) +("|QStyle.CE_ComboBoxLabel|" . 39) +("|QStyle.CE_ToolBar|" . 40) +("|QStyle.CE_ToolBoxTabShape|" . 41) +("|QStyle.CE_ToolBoxTabLabel|" . 42) +("|QStyle.CE_HeaderEmptyArea|" . 43) +("|QStyle.CE_ShapedFrame|" . 46) +("|QStyle.RSIP_OnMouseClickAndAlreadyFocused|" . 0) +("|QStyle.RSIP_OnMouseClick|" . 1) +("|QStyle.SP_TitleBarMinButton|" . 1) +("|QStyle.SP_TitleBarMenuButton|" . 0) +("|QStyle.SP_TitleBarMaxButton|" . 2) +("|QStyle.SP_TitleBarCloseButton|" . 3) +("|QStyle.SP_TitleBarNormalButton|" . 4) +("|QStyle.SP_TitleBarShadeButton|" . 5) +("|QStyle.SP_TitleBarUnshadeButton|" . 6) +("|QStyle.SP_TitleBarContextHelpButton|" . 7) +("|QStyle.SP_MessageBoxInformation|" . 9) +("|QStyle.SP_MessageBoxWarning|" . 10) +("|QStyle.SP_MessageBoxCritical|" . 11) +("|QStyle.SP_MessageBoxQuestion|" . 12) +("|QStyle.SP_DesktopIcon|" . 13) +("|QStyle.SP_TrashIcon|" . 14) +("|QStyle.SP_ComputerIcon|" . 15) +("|QStyle.SP_DriveFDIcon|" . 16) +("|QStyle.SP_DriveHDIcon|" . 17) +("|QStyle.SP_DriveCDIcon|" . 18) +("|QStyle.SP_DriveDVDIcon|" . 19) +("|QStyle.SP_DriveNetIcon|" . 20) +("|QStyle.SP_DirHomeIcon|" . 56) +("|QStyle.SP_DirOpenIcon|" . 21) +("|QStyle.SP_DirClosedIcon|" . 22) +("|QStyle.SP_DirIcon|" . 38) +("|QStyle.SP_DirLinkIcon|" . 23) +("|QStyle.SP_DirLinkOpenIcon|" . 24) +("|QStyle.SP_FileIcon|" . 25) +("|QStyle.SP_FileLinkIcon|" . 26) +("|QStyle.SP_FileDialogStart|" . 29) +("|QStyle.SP_FileDialogEnd|" . 30) +("|QStyle.SP_FileDialogToParent|" . 31) +("|QStyle.SP_FileDialogNewFolder|" . 32) +("|QStyle.SP_FileDialogDetailedView|" . 33) +("|QStyle.SP_FileDialogInfoView|" . 34) +("|QStyle.SP_FileDialogContentsView|" . 35) +("|QStyle.SP_FileDialogListView|" . 36) +("|QStyle.SP_FileDialogBack|" . 37) +("|QStyle.SP_DockWidgetCloseButton|" . 8) +("|QStyle.SP_ToolBarHorizontalExtensionButton|" . 27) +("|QStyle.SP_ToolBarVerticalExtensionButton|" . 28) +("|QStyle.SP_DialogOkButton|" . 39) +("|QStyle.SP_DialogCancelButton|" . 40) +("|QStyle.SP_DialogHelpButton|" . 41) +("|QStyle.SP_DialogOpenButton|" . 42) +("|QStyle.SP_DialogSaveButton|" . 43) +("|QStyle.SP_DialogCloseButton|" . 44) +("|QStyle.SP_DialogApplyButton|" . 45) +("|QStyle.SP_DialogResetButton|" . 46) +("|QStyle.SP_DialogDiscardButton|" . 47) +("|QStyle.SP_DialogYesButton|" . 48) +("|QStyle.SP_DialogNoButton|" . 49) +("|QStyle.SP_ArrowUp|" . 50) +("|QStyle.SP_ArrowDown|" . 51) +("|QStyle.SP_ArrowLeft|" . 52) +("|QStyle.SP_ArrowRight|" . 53) +("|QStyle.SP_ArrowBack|" . 54) +("|QStyle.SP_ArrowForward|" . 55) +("|QStyle.SP_CommandLink|" . 57) +("|QStyle.SP_VistaShield|" . 58) +("|QStyle.SP_BrowserReload|" . 59) +("|QStyle.SP_BrowserStop|" . 60) +("|QStyle.SP_MediaPlay|" . 61) +("|QStyle.SP_MediaStop|" . 62) +("|QStyle.SP_MediaPause|" . 63) +("|QStyle.SP_MediaSkipForward|" . 64) +("|QStyle.SP_MediaSkipBackward|" . 65) +("|QStyle.SP_MediaSeekForward|" . 66) +("|QStyle.SP_MediaSeekBackward|" . 67) +("|QStyle.SP_MediaVolume|" . 68) +("|QStyle.SP_MediaVolumeMuted|" . 69) +("|QStyle.SP_LineEditClearButton|" . 70) +("|QStyle.SP_CustomBase|" . #xf0000000) ("|QStyle.State_None|" . #x00000000) ("|QStyle.State_Active|" . #x00010000) ("|QStyle.State_AutoRaise|" . #x00001000) @@ -888,6 +1042,48 @@ ("|QStyle.State_UpArrow|" . #x00004000) ("|QStyle.State_Mini|" . #x08000000) ("|QStyle.State_Small|" . #x04000000) +("|QStyle.SC_None|" . #x00000000) +("|QStyle.SC_ScrollBarAddLine|" . #x00000001) +("|QStyle.SC_ScrollBarSubLine|" . #x00000002) +("|QStyle.SC_ScrollBarAddPage|" . #x00000004) +("|QStyle.SC_ScrollBarSubPage|" . #x00000008) +("|QStyle.SC_ScrollBarFirst|" . #x00000010) +("|QStyle.SC_ScrollBarLast|" . #x00000020) +("|QStyle.SC_ScrollBarSlider|" . #x00000040) +("|QStyle.SC_ScrollBarGroove|" . #x00000080) +("|QStyle.SC_SpinBoxUp|" . #x00000001) +("|QStyle.SC_SpinBoxDown|" . #x00000002) +("|QStyle.SC_SpinBoxFrame|" . #x00000004) +("|QStyle.SC_SpinBoxEditField|" . #x00000008) +("|QStyle.SC_ComboBoxEditField|" . #x00000002) +("|QStyle.SC_ComboBoxArrow|" . #x00000004) +("|QStyle.SC_ComboBoxFrame|" . #x00000001) +("|QStyle.SC_ComboBoxListBoxPopup|" . #x00000008) +("|QStyle.SC_SliderGroove|" . #x00000001) +("|QStyle.SC_SliderHandle|" . #x00000002) +("|QStyle.SC_SliderTickmarks|" . #x00000004) +("|QStyle.SC_ToolButton|" . #x00000001) +("|QStyle.SC_ToolButtonMenu|" . #x00000002) +("|QStyle.SC_TitleBarSysMenu|" . #x00000001) +("|QStyle.SC_TitleBarMinButton|" . #x00000002) +("|QStyle.SC_TitleBarMaxButton|" . #x00000004) +("|QStyle.SC_TitleBarCloseButton|" . #x00000008) +("|QStyle.SC_TitleBarLabel|" . #x00000100) +("|QStyle.SC_TitleBarNormalButton|" . #x00000010) +("|QStyle.SC_TitleBarShadeButton|" . #x00000020) +("|QStyle.SC_TitleBarUnshadeButton|" . #x00000040) +("|QStyle.SC_TitleBarContextHelpButton|" . #x00000080) +("|QStyle.SC_DialHandle|" . #x00000002) +("|QStyle.SC_DialGroove|" . #x00000001) +("|QStyle.SC_DialTickmarks|" . #x00000004) +("|QStyle.SC_GroupBoxFrame|" . #x00000008) +("|QStyle.SC_GroupBoxLabel|" . #x00000002) +("|QStyle.SC_GroupBoxCheckBox|" . #x00000001) +("|QStyle.SC_GroupBoxContents|" . #x00000004) +("|QStyle.SC_MdiNormalButton|" . #x00000002) +("|QStyle.SC_MdiMinButton|" . #x00000001) +("|QStyle.SC_MdiCloseButton|" . #x00000004) +("|QStyle.SC_All|" . #xffffffff) ("|QSwipeGesture.NoDirection|" . 0) ("|QSwipeGesture.Left|" . 1) ("|QSwipeGesture.Right|" . 2)