From 6468bb7ab9c9cb70fab09b2b80eab2133b92c568 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Wed, 30 May 2018 00:39:58 +0200 Subject: [PATCH] WIP: refactoring of GSI structure for separated modules. --- scripts/mkqtdecl.sh | 148 +- scripts/mkqtdecl4/QtCore/allofqt.cpp | 76 + scripts/mkqtdecl4/QtDesigner/allofqt.cpp | 2 + scripts/mkqtdecl4/{ => QtGui}/allofqt.cpp | 153 -- scripts/mkqtdecl4/QtNetwork/allofqt.cpp | 30 + scripts/mkqtdecl4/QtSql/allofqt.cpp | 14 + scripts/mkqtdecl4/QtXml/allofqt.cpp | 31 + scripts/mkqtdecl4/mkqtdecl.conf | 2 +- scripts/mkqtdecl_common/produce.rb | 78 +- scripts/mkqtdecl_common/reader_ext.rb | 23 +- src/ant/ant/gsiDeclAnt.cc | 4 +- src/edt/edt/gsiDeclEdt.cc | 2 +- src/ext/ext/extLEFDEFPlugin.cc | 2 +- src/ext/ext/extNetTracerPlugin.cc | 6 +- src/gsi/gsi/gsiClass.cc | 2 +- src/gsi/gsi/gsiClass.h | 39 +- src/gsi/gsi/gsiClassBase.h | 14 + src/gsi/gsi/gsiCommon.h | 32 +- src/gsi/gsi/gsiDeclBasic.cc | 2 +- src/gsi/gsi/gsiDeclInternal.cc | 8 +- src/gsi/gsi/gsiDeclTl.cc | 12 +- src/gsi/gsi/gsiEnums.h | 8 +- src/gsi/unit_tests/gsiTest.cc | 38 +- src/gsiqt/gsiqt.pro | 35 +- src/gsiqt/qt4/QtCore/QtCore.pri | 86 + src/gsiqt/qt4/QtCore/QtCore.pro | 21 + .../qt4/QtCore}/gsiDeclQAbstractItemModel.cc | 10 +- .../qt4/QtCore}/gsiDeclQAbstractListModel.cc | 10 +- .../qt4/QtCore}/gsiDeclQAbstractTableModel.cc | 10 +- .../qt4/QtCore}/gsiDeclQBasicTimer.cc | 8 +- .../qt4/QtCore}/gsiDeclQBuffer.cc | 8 +- .../qt4/QtCore}/gsiDeclQByteArrayMatcher.cc | 8 +- .../qt4/QtCore}/gsiDeclQChildEvent.cc | 12 +- .../qt4/QtCore}/gsiDeclQCoreApplication.cc | 18 +- .../qt4/QtCore}/gsiDeclQCryptographicHash.cc | 16 +- .../qt4/QtCore}/gsiDeclQDataStream.cc | 34 +- .../qt4/QtCore}/gsiDeclQDate.cc | 16 +- .../qt4/QtCore}/gsiDeclQDateTime.cc | 8 +- .../qt4/QtCore}/gsiDeclQDir.cc | 24 +- .../gsiDeclQDynamicPropertyChangeEvent.cc | 10 +- .../qt4/QtCore}/gsiDeclQEasingCurve.cc | 16 +- .../qt4/QtCore}/gsiDeclQEvent.cc | 18 +- .../qt4/QtCore}/gsiDeclQEventLoop.cc | 18 +- .../qt4/QtCore}/gsiDeclQFactoryInterface.cc | 10 +- .../qt4/QtCore}/gsiDeclQFile.cc | 24 +- .../qt4/QtCore}/gsiDeclQFileInfo.cc | 8 +- .../qt4/QtCore}/gsiDeclQFileSystemWatcher.cc | 10 +- .../qt4/QtCore}/gsiDeclQIODevice.cc | 16 +- .../qt4/QtCore}/gsiDeclQLibrary.cc | 18 +- .../qt4/QtCore}/gsiDeclQLibraryInfo.cc | 16 +- .../qt4/QtCore}/gsiDeclQLine.cc | 20 +- .../qt4/QtCore}/gsiDeclQLineF.cc | 28 +- .../qt4/QtCore}/gsiDeclQLocale.cc | 48 +- .../qt4/QtCore}/gsiDeclQMargins.cc | 8 +- .../qt4/QtCore}/gsiDeclQMetaClassInfo.cc | 8 +- .../qt4/QtCore}/gsiDeclQMetaEnum.cc | 8 +- .../qt4/QtCore}/gsiDeclQMetaMethod.cc | 24 +- .../qt4/QtCore}/gsiDeclQMetaObject.cc | 8 +- .../qt4/QtCore}/gsiDeclQMetaProperty.cc | 8 +- .../qt4/QtCore}/gsiDeclQMetaType.cc | 8 +- .../qt4/QtCore}/gsiDeclQMimeData.cc | 10 +- .../qt4/QtCore}/gsiDeclQModelIndex.cc | 8 +- .../qt4/QtCore}/gsiDeclQMutex.cc | 16 +- .../qt4/QtCore}/gsiDeclQObject.cc | 10 +- .../QtCore}/gsiDeclQPersistentModelIndex.cc | 8 +- .../qt4/QtCore}/gsiDeclQPluginLoader.cc | 10 +- .../qt4/QtCore}/gsiDeclQPoint.cc | 26 +- .../qt4/QtCore}/gsiDeclQPointF.cc | 26 +- .../qt4/QtCore}/gsiDeclQProcess.cc | 48 +- .../qt4/QtCore}/gsiDeclQProcessEnvironment.cc | 8 +- .../qt4/QtCore}/gsiDeclQReadLocker.cc | 8 +- .../qt4/QtCore}/gsiDeclQReadWriteLock.cc | 16 +- .../qt4/QtCore}/gsiDeclQRect.cc | 8 +- .../qt4/QtCore}/gsiDeclQRectF.cc | 8 +- .../qt4/QtCore}/gsiDeclQRegExp.cc | 24 +- .../qt4/QtCore}/gsiDeclQResource.cc | 8 +- .../qt4/QtCore}/gsiDeclQSemaphore.cc | 8 +- .../qt4/QtCore}/gsiDeclQSettings.cc | 34 +- .../qt4/QtCore}/gsiDeclQSignalMapper.cc | 10 +- .../qt4/QtCore}/gsiDeclQSize.cc | 8 +- .../qt4/QtCore}/gsiDeclQSizeF.cc | 8 +- .../qt4/QtCore}/gsiDeclQSocketNotifier.cc | 18 +- .../qt4/QtCore}/gsiDeclQStringMatcher.cc | 8 +- .../qt4/QtCore}/gsiDeclQSysInfo.cc | 8 +- .../qt4/QtCore}/gsiDeclQSystemLocale.cc | 18 +- .../qt4/QtCore}/gsiDeclQTemporaryFile.cc | 8 +- .../qt4/QtCore}/gsiDeclQTextCodec.cc | 39 +- .../gsiDeclQTextCodec_ConverterState.cc | 10 +- .../qt4/QtCore}/gsiDeclQTextDecoder.cc | 8 +- .../qt4/QtCore}/gsiDeclQTextEncoder.cc | 8 +- .../qt4/QtCore}/gsiDeclQTextStream.cc | 42 +- .../qt4/QtCore}/gsiDeclQThread.cc | 18 +- .../qt4/QtCore}/gsiDeclQTime.cc | 8 +- .../qt4/QtCore}/gsiDeclQTimeLine.cc | 34 +- .../qt4/QtCore}/gsiDeclQTimer.cc | 10 +- .../qt4/QtCore}/gsiDeclQTimerEvent.cc | 10 +- .../qt4/QtCore}/gsiDeclQTranslator.cc | 10 +- .../qt4/QtCore}/gsiDeclQUrl.cc | 24 +- .../qt4/QtCore}/gsiDeclQWaitCondition.cc | 8 +- .../qt4/QtCore}/gsiDeclQWriteLocker.cc | 8 +- src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQt.cc | 166 +- .../qt4/QtCore/gsiDeclQtCoreTypeTraits.h | 728 ++++++++ .../qt4/QtCore}/gsiDeclQt_1.cc | 196 +-- .../qt4/QtCore}/gsiDeclQt_2.cc | 197 +-- .../qt4/QtCore}/gsiDeclQt_3.cc | 135 +- src/gsiqt/qt4/QtCore/gsiQtCoreCommon.h | 39 + src/gsiqt/qt4/QtCore/gsiQtExternals.h | 259 +++ src/gsiqt/qt4/QtDesigner/QtDesigner.pri | 10 + src/gsiqt/qt4/QtDesigner/QtDesigner.pro | 20 + .../gsiDeclQAbstractFormBuilder.cc | 11 +- .../qt4/QtDesigner}/gsiDeclQFormBuilder.cc | 11 +- .../QtDesigner/gsiDeclQtDesignerTypeTraits.h | 329 ++++ .../qt4/QtDesigner/gsiQtDesignerCommon.h | 39 + src/gsiqt/qt4/QtDesigner/gsiQtExternals.h | 46 + .../qtdecl.pri => gsiqt/qt4/QtGui/QtGui.pri} | 159 +- src/gsiqt/qt4/QtGui/QtGui.pro | 25 + .../qt4/QtGui}/gsiDeclQAbstractButton.cc | 10 +- .../gsiDeclQAbstractGraphicsShapeItem.cc | 10 +- .../QtGui}/gsiDeclQAbstractItemDelegate.cc | 18 +- .../qt4/QtGui}/gsiDeclQAbstractItemView.cc | 58 +- .../QtGui}/gsiDeclQAbstractPageSetupDialog.cc | 10 +- .../qt4/QtGui}/gsiDeclQAbstractPrintDialog.cc | 26 +- .../qt4/QtGui}/gsiDeclQAbstractProxyModel.cc | 10 +- .../qt4/QtGui}/gsiDeclQAbstractScrollArea.cc | 10 +- .../qt4/QtGui}/gsiDeclQAbstractSlider.cc | 18 +- .../qt4/QtGui}/gsiDeclQAbstractSpinBox.cc | 34 +- .../gsiDeclQAbstractTextDocumentLayout.cc | 10 +- ...AbstractTextDocumentLayout_PaintContext.cc | 10 +- ...clQAbstractTextDocumentLayout_Selection.cc | 10 +- .../qt4/QtGui}/gsiDeclQAbstractUndoItem.cc | 10 +- .../qt4/QtGui}/gsiDeclQAccessible.cc | 56 +- .../QtGui}/gsiDeclQAccessibleApplication.cc | 10 +- .../qt4/QtGui}/gsiDeclQAccessibleEvent.cc | 8 +- .../qt4/QtGui}/gsiDeclQAccessibleInterface.cc | 8 +- .../qt4/QtGui}/gsiDeclQAccessibleObject.cc | 8 +- .../qt4/QtGui}/gsiDeclQAccessibleWidget.cc | 8 +- .../qt4/QtGui}/gsiDeclQAction.cc | 42 +- .../qt4/QtGui}/gsiDeclQActionEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQActionGroup.cc | 10 +- .../qt4/QtGui}/gsiDeclQApplication.cc | 18 +- .../qt4/QtGui}/gsiDeclQBitmap.cc | 10 +- .../qt4/QtGui}/gsiDeclQBoxLayout.cc | 18 +- .../qt4/QtGui}/gsiDeclQBrush.cc | 8 +- .../qt4/QtGui}/gsiDeclQButtonGroup.cc | 10 +- .../qt4/QtGui}/gsiDeclQCDEStyle.cc | 10 +- .../qt4/QtGui}/gsiDeclQCalendarWidget.cc | 34 +- .../qt4/QtGui}/gsiDeclQCheckBox.cc | 10 +- .../qt4/QtGui}/gsiDeclQCleanlooksStyle.cc | 10 +- .../qt4/QtGui}/gsiDeclQClipboard.cc | 16 +- .../qt4/QtGui}/gsiDeclQClipboardEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQCloseEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQColor.cc | 16 +- .../qt4/QtGui}/gsiDeclQColorDialog.cc | 18 +- .../qt4/QtGui}/gsiDeclQColormap.cc | 16 +- .../qt4/QtGui}/gsiDeclQColumnView.cc | 10 +- .../qt4/QtGui}/gsiDeclQComboBox.cc | 26 +- .../qt4/QtGui}/gsiDeclQCommandLinkButton.cc | 10 +- .../qt4/QtGui}/gsiDeclQCommonStyle.cc | 10 +- .../qt4/QtGui}/gsiDeclQCompleter.cc | 26 +- .../qt4/QtGui}/gsiDeclQConicalGradient.cc | 8 +- .../qt4/QtGui}/gsiDeclQContextMenuEvent.cc | 18 +- .../qt4/QtGui}/gsiDeclQCursor.cc | 8 +- .../qt4/QtGui}/gsiDeclQDataWidgetMapper.cc | 18 +- .../qt4/QtGui}/gsiDeclQDateEdit.cc | 10 +- .../qt4/QtGui}/gsiDeclQDateTimeEdit.cc | 18 +- .../qt4/QtGui}/gsiDeclQDesktopServices.cc | 16 +- .../qt4/QtGui}/gsiDeclQDesktopWidget.cc | 10 +- .../qt4/QtGui}/gsiDeclQDial.cc | 10 +- .../qt4/QtGui}/gsiDeclQDialog.cc | 10 +- .../qt4/QtGui}/gsiDeclQDialogButtonBox.cc | 26 +- .../qt4/QtGui}/gsiDeclQDirIterator.cc | 18 +- .../qt4/QtGui}/gsiDeclQDirModel.cc | 10 +- .../qt4/QtGui}/gsiDeclQDockWidget.cc | 18 +- .../qt4/QtGui}/gsiDeclQDoubleSpinBox.cc | 10 +- .../qt4/QtGui}/gsiDeclQDoubleValidator.cc | 18 +- .../qt4/QtGui}/gsiDeclQDrag.cc | 10 +- .../qt4/QtGui}/gsiDeclQDragEnterEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQDragLeaveEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQDragMoveEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQDragResponseEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQDropEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQErrorMessage.cc | 10 +- .../qt4/QtGui}/gsiDeclQFileDialog.cc | 50 +- .../qt4/QtGui}/gsiDeclQFileIconProvider.cc | 18 +- .../qt4/QtGui}/gsiDeclQFileOpenEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQFileSystemModel.cc | 10 +- .../qt4/QtGui}/gsiDeclQFocusEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQFocusFrame.cc | 10 +- .../qt4/QtGui}/gsiDeclQFont.cc | 48 +- .../qt4/QtGui}/gsiDeclQFontComboBox.cc | 18 +- .../qt4/QtGui}/gsiDeclQFontDatabase.cc | 16 +- .../qt4/QtGui}/gsiDeclQFontDialog.cc | 18 +- .../qt4/QtGui}/gsiDeclQFontInfo.cc | 8 +- .../qt4/QtGui}/gsiDeclQFontMetrics.cc | 8 +- .../qt4/QtGui}/gsiDeclQFontMetricsF.cc | 8 +- .../qt4/QtGui}/gsiDeclQFormLayout.cc | 34 +- .../qt4/QtGui}/gsiDeclQFrame.cc | 26 +- .../qt4/QtGui}/gsiDeclQGesture.cc | 18 +- .../qt4/QtGui}/gsiDeclQGestureEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQGestureRecognizer.cc | 18 +- .../qt4/QtGui}/gsiDeclQGradient.cc | 40 +- .../qt4/QtGui}/gsiDeclQGraphicsAnchor.cc | 10 +- .../QtGui}/gsiDeclQGraphicsAnchorLayout.cc | 10 +- .../qt4/QtGui}/gsiDeclQGraphicsBlurEffect.cc | 18 +- .../QtGui}/gsiDeclQGraphicsColorizeEffect.cc | 10 +- .../gsiDeclQGraphicsDropShadowEffect.cc | 10 +- .../qt4/QtGui}/gsiDeclQGraphicsEffect.cc | 26 +- .../qt4/QtGui}/gsiDeclQGraphicsEllipseItem.cc | 10 +- .../qt4/QtGui}/gsiDeclQGraphicsGridLayout.cc | 10 +- .../qt4/QtGui}/gsiDeclQGraphicsItem.cc | 42 +- .../QtGui}/gsiDeclQGraphicsItemAnimation.cc | 10 +- .../qt4/QtGui}/gsiDeclQGraphicsItemGroup.cc | 10 +- .../qt4/QtGui}/gsiDeclQGraphicsLayout.cc | 10 +- .../qt4/QtGui}/gsiDeclQGraphicsLayoutItem.cc | 10 +- .../qt4/QtGui}/gsiDeclQGraphicsLineItem.cc | 10 +- .../QtGui}/gsiDeclQGraphicsLinearLayout.cc | 10 +- .../qt4/QtGui}/gsiDeclQGraphicsObject.cc | 10 +- .../QtGui}/gsiDeclQGraphicsOpacityEffect.cc | 10 +- .../qt4/QtGui}/gsiDeclQGraphicsPathItem.cc | 10 +- .../qt4/QtGui}/gsiDeclQGraphicsPixmapItem.cc | 18 +- .../qt4/QtGui}/gsiDeclQGraphicsPolygonItem.cc | 10 +- .../qt4/QtGui}/gsiDeclQGraphicsProxyWidget.cc | 10 +- .../qt4/QtGui}/gsiDeclQGraphicsRectItem.cc | 10 +- .../qt4/QtGui}/gsiDeclQGraphicsRotation.cc | 10 +- .../qt4/QtGui}/gsiDeclQGraphicsScale.cc | 10 +- .../qt4/QtGui}/gsiDeclQGraphicsScene.cc | 26 +- .../gsiDeclQGraphicsSceneContextMenuEvent.cc | 18 +- .../gsiDeclQGraphicsSceneDragDropEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQGraphicsSceneEvent.cc | 10 +- .../QtGui}/gsiDeclQGraphicsSceneHelpEvent.cc | 10 +- .../QtGui}/gsiDeclQGraphicsSceneHoverEvent.cc | 10 +- .../QtGui}/gsiDeclQGraphicsSceneMouseEvent.cc | 10 +- .../QtGui}/gsiDeclQGraphicsSceneMoveEvent.cc | 10 +- .../gsiDeclQGraphicsSceneResizeEvent.cc | 10 +- .../QtGui}/gsiDeclQGraphicsSceneWheelEvent.cc | 10 +- .../QtGui}/gsiDeclQGraphicsSimpleTextItem.cc | 10 +- .../qt4/QtGui}/gsiDeclQGraphicsTextItem.cc | 10 +- .../qt4/QtGui}/gsiDeclQGraphicsTransform.cc | 10 +- .../qt4/QtGui}/gsiDeclQGraphicsView.cc | 50 +- .../qt4/QtGui}/gsiDeclQGraphicsWidget.cc | 10 +- .../qt4/QtGui}/gsiDeclQGridLayout.cc | 10 +- .../qt4/QtGui}/gsiDeclQGroupBox.cc | 10 +- .../qt4/QtGui}/gsiDeclQHBoxLayout.cc | 10 +- .../qt4/QtGui}/gsiDeclQHeaderView.cc | 18 +- .../qt4/QtGui}/gsiDeclQHelpEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQHideEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQHoverEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQIcon.cc | 24 +- .../qt4/QtGui}/gsiDeclQIconDragEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQIconEngine.cc | 10 +- .../qt4/QtGui}/gsiDeclQIconEnginePlugin.cc | 10 +- .../qt4/QtGui}/gsiDeclQIconEnginePluginV2.cc | 10 +- .../qt4/QtGui}/gsiDeclQIconEngineV2.cc | 10 +- .../qt4/QtGui}/gsiDeclQImage.cc | 26 +- .../qt4/QtGui}/gsiDeclQImageIOHandler.cc | 18 +- .../qt4/QtGui}/gsiDeclQImageIOPlugin.cc | 18 +- .../qt4/QtGui}/gsiDeclQImageReader.cc | 16 +- .../qt4/QtGui}/gsiDeclQImageTextKeyLang.cc | 8 +- .../qt4/QtGui}/gsiDeclQImageWriter.cc | 16 +- .../qt4/QtGui}/gsiDeclQInputContext.cc | 18 +- .../qt4/QtGui}/gsiDeclQInputContextFactory.cc | 8 +- .../qt4/QtGui}/gsiDeclQInputContextPlugin.cc | 10 +- .../qt4/QtGui}/gsiDeclQInputDialog.cc | 26 +- .../qt4/QtGui}/gsiDeclQInputEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQInputMethodEvent.cc | 16 +- .../gsiDeclQInputMethodEvent_Attribute.cc | 10 +- .../qt4/QtGui}/gsiDeclQIntValidator.cc | 10 +- .../qt4/QtGui}/gsiDeclQItemDelegate.cc | 10 +- .../QtGui}/gsiDeclQItemEditorCreatorBase.cc | 10 +- .../qt4/QtGui}/gsiDeclQItemEditorFactory.cc | 10 +- .../qt4/QtGui}/gsiDeclQItemSelection.cc | 8 +- .../qt4/QtGui}/gsiDeclQItemSelectionModel.cc | 18 +- .../qt4/QtGui}/gsiDeclQItemSelectionRange.cc | 8 +- .../qt4/QtGui}/gsiDeclQKeyEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQKeySequence.cc | 32 +- .../qt4/QtGui}/gsiDeclQLCDNumber.cc | 26 +- .../qt4/QtGui}/gsiDeclQLabel.cc | 10 +- .../qt4/QtGui}/gsiDeclQLayout.cc | 18 +- .../qt4/QtGui}/gsiDeclQLayoutItem.cc | 10 +- .../qt4/QtGui}/gsiDeclQLineEdit.cc | 18 +- .../qt4/QtGui}/gsiDeclQLinearGradient.cc | 8 +- .../qt4/QtGui}/gsiDeclQListView.cc | 50 +- .../qt4/QtGui}/gsiDeclQListWidget.cc | 10 +- .../qt4/QtGui}/gsiDeclQListWidgetItem.cc | 10 +- .../qt4/QtGui}/gsiDeclQMainWindow.cc | 18 +- .../qt4/QtGui}/gsiDeclQMatrix.cc | 8 +- .../qt4/QtGui}/gsiDeclQMatrix4x4.cc | 8 +- .../qt4/QtGui}/gsiDeclQMdiArea.cc | 34 +- .../qt4/QtGui}/gsiDeclQMdiSubWindow.cc | 18 +- .../qt4/QtGui}/gsiDeclQMenu.cc | 10 +- .../qt4/QtGui}/gsiDeclQMenuBar.cc | 10 +- .../qt4/QtGui}/gsiDeclQMessageBox.cc | 34 +- .../qt4/QtGui}/gsiDeclQMimeSource.cc | 10 +- .../qt4/QtGui}/gsiDeclQMotifStyle.cc | 10 +- .../qt4/QtGui}/gsiDeclQMouseEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQMoveEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQMovie.cc | 26 +- .../qt4/QtGui}/gsiDeclQPageSetupDialog.cc | 18 +- .../qt4/QtGui}/gsiDeclQPaintDevice.cc | 39 +- .../qt4/QtGui}/gsiDeclQPaintEngine.cc | 34 +- .../qt4/QtGui}/gsiDeclQPaintEngineState.cc | 8 +- .../qt4/QtGui}/gsiDeclQPaintEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQPainter.cc | 24 +- .../qt4/QtGui}/gsiDeclQPainterPath.cc | 8 +- .../qt4/QtGui}/gsiDeclQPainterPathStroker.cc | 8 +- .../qt4/QtGui}/gsiDeclQPainterPath_Element.cc | 10 +- .../qt4/QtGui}/gsiDeclQPalette.cc | 24 +- .../qt4/QtGui}/gsiDeclQPanGesture.cc | 10 +- .../qt4/QtGui}/gsiDeclQPen.cc | 8 +- .../qt4/QtGui}/gsiDeclQPicture.cc | 10 +- .../qt4/QtGui}/gsiDeclQPinchGesture.cc | 18 +- .../qt4/QtGui}/gsiDeclQPixmap.cc | 10 +- .../qt4/QtGui}/gsiDeclQPixmapCache.cc | 8 +- .../QtGui}/gsiDeclQPlainTextDocumentLayout.cc | 10 +- .../qt4/QtGui}/gsiDeclQPlainTextEdit.cc | 18 +- .../qt4/QtGui}/gsiDeclQPlastiqueStyle.cc | 10 +- .../qt4/QtGui}/gsiDeclQPolygon.cc | 8 +- .../qt4/QtGui}/gsiDeclQPolygonF.cc | 8 +- .../qt4/QtGui}/gsiDeclQPrintDialog.cc | 10 +- .../qt4/QtGui}/gsiDeclQPrintEngine.cc | 18 +- .../qt4/QtGui}/gsiDeclQPrintPreviewDialog.cc | 10 +- .../qt4/QtGui}/gsiDeclQPrintPreviewWidget.cc | 26 +- .../qt4/QtGui}/gsiDeclQPrinter.cc | 98 +- .../qt4/QtGui}/gsiDeclQPrinterInfo.cc | 8 +- .../qt4/QtGui}/gsiDeclQProgressBar.cc | 18 +- .../qt4/QtGui}/gsiDeclQProgressDialog.cc | 10 +- .../qt4/QtGui}/gsiDeclQPushButton.cc | 10 +- .../qt4/QtGui}/gsiDeclQQuaternion.cc | 8 +- .../qt4/QtGui}/gsiDeclQRadialGradient.cc | 8 +- .../qt4/QtGui}/gsiDeclQRadioButton.cc | 10 +- .../qt4/QtGui}/gsiDeclQRegExpValidator.cc | 10 +- .../qt4/QtGui}/gsiDeclQRegion.cc | 16 +- .../qt4/QtGui}/gsiDeclQResizeEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQRubberBand.cc | 18 +- .../qt4/QtGui}/gsiDeclQScrollArea.cc | 10 +- .../qt4/QtGui}/gsiDeclQScrollBar.cc | 10 +- .../qt4/QtGui}/gsiDeclQShortcut.cc | 10 +- .../qt4/QtGui}/gsiDeclQShortcutEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQShowEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQSizeGrip.cc | 10 +- .../qt4/QtGui}/gsiDeclQSizePolicy.cc | 24 +- .../qt4/QtGui}/gsiDeclQSlider.cc | 18 +- .../QtGui}/gsiDeclQSortFilterProxyModel.cc | 10 +- .../qt4/QtGui}/gsiDeclQSound.cc | 10 +- .../qt4/QtGui}/gsiDeclQSpacerItem.cc | 10 +- .../qt4/QtGui}/gsiDeclQSpinBox.cc | 10 +- .../qt4/QtGui}/gsiDeclQSplashScreen.cc | 10 +- .../qt4/QtGui}/gsiDeclQSplitter.cc | 10 +- .../qt4/QtGui}/gsiDeclQSplitterHandle.cc | 10 +- .../qt4/QtGui}/gsiDeclQStackedLayout.cc | 18 +- .../qt4/QtGui}/gsiDeclQStackedWidget.cc | 10 +- .../qt4/QtGui}/gsiDeclQStandardItem.cc | 10 +- .../qt4/QtGui}/gsiDeclQStandardItemModel.cc | 10 +- .../qt4/QtGui}/gsiDeclQStatusBar.cc | 10 +- .../qt4/QtGui}/gsiDeclQStatusTipEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQStringListModel.cc | 10 +- .../qt4/QtGui}/gsiDeclQStyle.cc | 82 +- .../qt4/QtGui}/gsiDeclQStyleFactory.cc | 8 +- .../qt4/QtGui}/gsiDeclQStyleHintReturn.cc | 8 +- .../qt4/QtGui}/gsiDeclQStyleHintReturnMask.cc | 8 +- .../QtGui}/gsiDeclQStyleHintReturnVariant.cc | 8 +- .../qt4/QtGui}/gsiDeclQStyleOption.cc | 8 +- .../qt4/QtGui}/gsiDeclQStyleOptionButton.cc | 8 +- .../qt4/QtGui}/gsiDeclQStyleOptionComboBox.cc | 8 +- .../qt4/QtGui}/gsiDeclQStyleOptionComplex.cc | 8 +- .../QtGui}/gsiDeclQStyleOptionDockWidget.cc | 8 +- .../QtGui}/gsiDeclQStyleOptionFocusRect.cc | 8 +- .../qt4/QtGui}/gsiDeclQStyleOptionFrame.cc | 8 +- .../qt4/QtGui}/gsiDeclQStyleOptionFrameV2.cc | 8 +- .../qt4/QtGui}/gsiDeclQStyleOptionFrameV3.cc | 8 +- .../QtGui}/gsiDeclQStyleOptionGraphicsItem.cc | 8 +- .../qt4/QtGui}/gsiDeclQStyleOptionGroupBox.cc | 8 +- .../qt4/QtGui}/gsiDeclQStyleOptionHeader.cc | 8 +- .../qt4/QtGui}/gsiDeclQStyleOptionMenuItem.cc | 8 +- .../QtGui}/gsiDeclQStyleOptionProgressBar.cc | 8 +- .../gsiDeclQStyleOptionProgressBarV2.cc | 8 +- .../QtGui}/gsiDeclQStyleOptionQ3DockWindow.cc | 8 +- .../QtGui}/gsiDeclQStyleOptionQ3ListView.cc | 8 +- .../gsiDeclQStyleOptionQ3ListViewItem.cc | 8 +- .../QtGui}/gsiDeclQStyleOptionRubberBand.cc | 8 +- .../qt4/QtGui}/gsiDeclQStyleOptionSizeGrip.cc | 8 +- .../qt4/QtGui}/gsiDeclQStyleOptionSlider.cc | 8 +- .../qt4/QtGui}/gsiDeclQStyleOptionSpinBox.cc | 8 +- .../qt4/QtGui}/gsiDeclQStyleOptionTab.cc | 8 +- .../QtGui}/gsiDeclQStyleOptionTabBarBase.cc | 8 +- .../QtGui}/gsiDeclQStyleOptionTabBarBaseV2.cc | 8 +- .../qt4/QtGui}/gsiDeclQStyleOptionTabV2.cc | 8 +- .../qt4/QtGui}/gsiDeclQStyleOptionTabV3.cc | 8 +- .../gsiDeclQStyleOptionTabWidgetFrame.cc | 8 +- .../qt4/QtGui}/gsiDeclQStyleOptionTitleBar.cc | 8 +- .../qt4/QtGui}/gsiDeclQStyleOptionToolBar.cc | 8 +- .../qt4/QtGui}/gsiDeclQStyleOptionToolBox.cc | 8 +- .../QtGui}/gsiDeclQStyleOptionToolBoxV2.cc | 8 +- .../QtGui}/gsiDeclQStyleOptionToolButton.cc | 8 +- .../qt4/QtGui}/gsiDeclQStyleOptionViewItem.cc | 8 +- .../QtGui}/gsiDeclQStyleOptionViewItemV2.cc | 8 +- .../QtGui}/gsiDeclQStyleOptionViewItemV3.cc | 8 +- .../QtGui}/gsiDeclQStyleOptionViewItemV4.cc | 8 +- .../qt4/QtGui}/gsiDeclQStylePainter.cc | 8 +- .../qt4/QtGui}/gsiDeclQStylePlugin.cc | 10 +- .../qt4/QtGui}/gsiDeclQStyledItemDelegate.cc | 10 +- .../qt4/QtGui}/gsiDeclQSwipeGesture.cc | 18 +- .../qt4/QtGui}/gsiDeclQSyntaxHighlighter.cc | 10 +- .../qt4/QtGui}/gsiDeclQSystemTrayIcon.cc | 26 +- .../qt4/QtGui}/gsiDeclQTabBar.cc | 34 +- .../qt4/QtGui}/gsiDeclQTabWidget.cc | 26 +- .../qt4/QtGui}/gsiDeclQTableView.cc | 10 +- .../qt4/QtGui}/gsiDeclQTableWidget.cc | 10 +- .../qt4/QtGui}/gsiDeclQTableWidgetItem.cc | 10 +- .../gsiDeclQTableWidgetSelectionRange.cc | 8 +- .../qt4/QtGui}/gsiDeclQTabletEvent.cc | 26 +- .../qt4/QtGui}/gsiDeclQTapAndHoldGesture.cc | 10 +- .../qt4/QtGui}/gsiDeclQTapGesture.cc | 10 +- .../qt4/QtGui}/gsiDeclQTextBlock.cc | 8 +- .../qt4/QtGui}/gsiDeclQTextBlockFormat.cc | 8 +- .../qt4/QtGui}/gsiDeclQTextBlockGroup.cc | 10 +- .../qt4/QtGui}/gsiDeclQTextBlockUserData.cc | 10 +- .../qt4/QtGui}/gsiDeclQTextBlock_Iterator.cc | 10 +- .../qt4/QtGui}/gsiDeclQTextBrowser.cc | 10 +- .../qt4/QtGui}/gsiDeclQTextCharFormat.cc | 24 +- .../qt4/QtGui}/gsiDeclQTextCursor.cc | 32 +- .../qt4/QtGui}/gsiDeclQTextDocument.cc | 26 +- .../QtGui}/gsiDeclQTextDocumentFragment.cc | 8 +- .../qt4/QtGui}/gsiDeclQTextDocumentWriter.cc | 8 +- .../qt4/QtGui}/gsiDeclQTextEdit.cc | 26 +- .../QtGui}/gsiDeclQTextEdit_ExtraSelection.cc | 10 +- .../qt4/QtGui}/gsiDeclQTextFormat.cc | 16 +- .../qt4/QtGui}/gsiDeclQTextFragment.cc | 8 +- .../qt4/QtGui}/gsiDeclQTextFrame.cc | 10 +- .../qt4/QtGui}/gsiDeclQTextFrameFormat.cc | 24 +- .../qt4/QtGui}/gsiDeclQTextFrame_Iterator.cc | 10 +- .../qt4/QtGui}/gsiDeclQTextImageFormat.cc | 8 +- .../qt4/QtGui}/gsiDeclQTextInlineObject.cc | 8 +- .../qt4/QtGui}/gsiDeclQTextItem.cc | 16 +- .../qt4/QtGui}/gsiDeclQTextLayout.cc | 16 +- .../QtGui}/gsiDeclQTextLayout_FormatRange.cc | 10 +- .../qt4/QtGui}/gsiDeclQTextLength.cc | 16 +- .../qt4/QtGui}/gsiDeclQTextLine.cc | 24 +- .../qt4/QtGui}/gsiDeclQTextList.cc | 10 +- .../qt4/QtGui}/gsiDeclQTextListFormat.cc | 16 +- .../qt4/QtGui}/gsiDeclQTextObject.cc | 10 +- .../qt4/QtGui}/gsiDeclQTextObjectInterface.cc | 10 +- .../qt4/QtGui}/gsiDeclQTextOption.cc | 24 +- .../qt4/QtGui}/gsiDeclQTextOption_Tab.cc | 22 +- .../qt4/QtGui}/gsiDeclQTextTable.cc | 10 +- .../qt4/QtGui}/gsiDeclQTextTableCell.cc | 8 +- .../qt4/QtGui}/gsiDeclQTextTableCellFormat.cc | 8 +- .../qt4/QtGui}/gsiDeclQTextTableFormat.cc | 8 +- .../qt4/QtGui}/gsiDeclQTimeEdit.cc | 10 +- .../qt4/QtGui}/gsiDeclQToolBar.cc | 10 +- .../qt4/QtGui}/gsiDeclQToolBarChangeEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQToolBox.cc | 10 +- .../qt4/QtGui}/gsiDeclQToolButton.cc | 18 +- .../qt4/QtGui}/gsiDeclQToolTip.cc | 8 +- .../qt4/QtGui}/gsiDeclQTouchEvent.cc | 18 +- .../QtGui}/gsiDeclQTouchEvent_TouchPoint.cc | 10 +- .../qt4/QtGui}/gsiDeclQTransform.cc | 16 +- .../qt4/QtGui}/gsiDeclQTreeView.cc | 10 +- .../qt4/QtGui}/gsiDeclQTreeWidget.cc | 10 +- .../qt4/QtGui}/gsiDeclQTreeWidgetItem.cc | 18 +- .../QtGui}/gsiDeclQTreeWidgetItemIterator.cc | 16 +- .../qt4/QtGui}/gsiDeclQUndoCommand.cc | 10 +- .../qt4/QtGui}/gsiDeclQUndoGroup.cc | 10 +- .../qt4/QtGui}/gsiDeclQUndoStack.cc | 10 +- .../qt4/QtGui}/gsiDeclQUndoView.cc | 10 +- .../qt4/QtGui}/gsiDeclQUnixPrintWidget.cc | 10 +- .../qt4/QtGui}/gsiDeclQVBoxLayout.cc | 10 +- .../qt4/QtGui}/gsiDeclQValidator.cc | 18 +- .../qt4/QtGui}/gsiDeclQVector2D.cc | 8 +- .../qt4/QtGui}/gsiDeclQVector3D.cc | 8 +- .../qt4/QtGui}/gsiDeclQVector4D.cc | 8 +- .../qt4/QtGui}/gsiDeclQWhatsThis.cc | 8 +- .../QtGui}/gsiDeclQWhatsThisClickedEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQWheelEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQWidget.cc | 18 +- .../qt4/QtGui}/gsiDeclQWidgetAction.cc | 10 +- .../qt4/QtGui}/gsiDeclQWidgetItem.cc | 10 +- .../QtGui}/gsiDeclQWindowStateChangeEvent.cc | 10 +- .../qt4/QtGui}/gsiDeclQWindowsStyle.cc | 10 +- .../qt4/QtGui}/gsiDeclQWizard.cc | 42 +- .../qt4/QtGui}/gsiDeclQWizardPage.cc | 10 +- .../qt4/QtGui/gsiDeclQtGuiTypeTraits.h} | 996 +---------- src/gsiqt/qt4/QtGui/gsiQtExternals.h | 1105 ++++++++++++ .../QtGui/gsiQtGuiCommon.h} | 25 +- src/gsiqt/qt4/QtNetwork/QtNetwork.pri | 40 + src/gsiqt/qt4/QtNetwork/QtNetwork.pro | 20 + .../gsiDeclQAbstractNetworkCache.cc | 31 +- .../qt4/QtNetwork}/gsiDeclQAbstractSocket.cc | 48 +- .../qt4/QtNetwork}/gsiDeclQAuthenticator.cc | 8 +- .../qt4/QtNetwork}/gsiDeclQFtp.cc | 50 +- .../qt4/QtNetwork}/gsiDeclQHostAddress.cc | 16 +- .../qt4/QtNetwork}/gsiDeclQHostInfo.cc | 16 +- .../qt4/QtNetwork}/gsiDeclQIPv6Address.cc | 8 +- .../qt4/QtNetwork}/gsiDeclQLocalServer.cc | 10 +- .../qt4/QtNetwork}/gsiDeclQLocalSocket.cc | 24 +- .../gsiDeclQNetworkAccessManager.cc | 18 +- .../QtNetwork}/gsiDeclQNetworkAddressEntry.cc | 8 +- .../gsiDeclQNetworkCacheMetaData.cc | 8 +- .../qt4/QtNetwork}/gsiDeclQNetworkCookie.cc | 16 +- .../QtNetwork}/gsiDeclQNetworkCookieJar.cc | 10 +- .../QtNetwork}/gsiDeclQNetworkDiskCache.cc | 10 +- .../QtNetwork}/gsiDeclQNetworkInterface.cc | 16 +- .../qt4/QtNetwork}/gsiDeclQNetworkProxy.cc | 24 +- .../QtNetwork}/gsiDeclQNetworkProxyFactory.cc | 10 +- .../QtNetwork}/gsiDeclQNetworkProxyQuery.cc | 28 +- .../qt4/QtNetwork}/gsiDeclQNetworkReply.cc | 16 +- .../qt4/QtNetwork}/gsiDeclQNetworkRequest.cc | 24 +- .../qt4/QtNetwork}/gsiDeclQSsl.cc | 46 +- .../qt4/QtNetwork}/gsiDeclQSslCertificate.cc | 16 +- .../qt4/QtNetwork}/gsiDeclQSslCipher.cc | 8 +- .../QtNetwork}/gsiDeclQSslConfiguration.cc | 8 +- .../qt4/QtNetwork}/gsiDeclQSslError.cc | 16 +- .../qt4/QtNetwork}/gsiDeclQSslKey.cc | 8 +- .../qt4/QtNetwork}/gsiDeclQSslSocket.cc | 24 +- .../qt4/QtNetwork}/gsiDeclQTcpServer.cc | 10 +- .../qt4/QtNetwork}/gsiDeclQTcpSocket.cc | 8 +- .../qt4/QtNetwork}/gsiDeclQUdpSocket.cc | 16 +- .../qt4/QtNetwork}/gsiDeclQUrlInfo.cc | 10 +- .../QtNetwork/gsiDeclQtNetworkTypeTraits.h | 443 +++++ src/gsiqt/qt4/QtNetwork/gsiQtExternals.h | 133 ++ src/gsiqt/qt4/QtNetwork/gsiQtNetworkCommon.h | 39 + src/gsiqt/qt4/QtSql/QtSql.pri | 22 + src/gsiqt/qt4/QtSql/QtSql.pro | 20 + .../qt4/QtSql}/gsiDeclQSql.cc | 38 +- .../qt4/QtSql}/gsiDeclQSqlDatabase.cc | 8 +- .../qt4/QtSql}/gsiDeclQSqlDriver.cc | 34 +- .../QtSql}/gsiDeclQSqlDriverCreatorBase.cc | 10 +- .../qt4/QtSql}/gsiDeclQSqlError.cc | 16 +- .../qt4/QtSql}/gsiDeclQSqlField.cc | 16 +- .../qt4/QtSql}/gsiDeclQSqlIndex.cc | 8 +- .../qt4/QtSql}/gsiDeclQSqlQuery.cc | 16 +- .../qt4/QtSql}/gsiDeclQSqlQueryModel.cc | 10 +- .../qt4/QtSql}/gsiDeclQSqlRecord.cc | 8 +- .../qt4/QtSql}/gsiDeclQSqlRelation.cc | 8 +- .../QtSql}/gsiDeclQSqlRelationalTableModel.cc | 10 +- .../qt4/QtSql}/gsiDeclQSqlResult.cc | 10 +- .../qt4/QtSql}/gsiDeclQSqlTableModel.cc | 18 +- src/gsiqt/qt4/QtSql/gsiDeclQtSqlTypeTraits.h | 306 ++++ src/gsiqt/qt4/QtSql/gsiQtExternals.h | 79 + .../qt4/QtSql/gsiQtSqlCommon.h} | 17 +- src/gsiqt/qt4/QtXml/QtXml.pri | 39 + src/gsiqt/qt4/QtXml/QtXml.pro | 20 + .../qt4/QtXml}/gsiDeclQDomAttr.cc | 8 +- .../qt4/QtXml}/gsiDeclQDomCDATASection.cc | 8 +- .../qt4/QtXml}/gsiDeclQDomCharacterData.cc | 8 +- .../qt4/QtXml}/gsiDeclQDomComment.cc | 8 +- .../qt4/QtXml}/gsiDeclQDomDocument.cc | 8 +- .../qt4/QtXml}/gsiDeclQDomDocumentFragment.cc | 8 +- .../qt4/QtXml}/gsiDeclQDomDocumentType.cc | 8 +- .../qt4/QtXml}/gsiDeclQDomElement.cc | 8 +- .../qt4/QtXml}/gsiDeclQDomEntity.cc | 8 +- .../qt4/QtXml}/gsiDeclQDomEntityReference.cc | 8 +- .../qt4/QtXml}/gsiDeclQDomImplementation.cc | 16 +- .../qt4/QtXml}/gsiDeclQDomNamedNodeMap.cc | 8 +- .../qt4/QtXml}/gsiDeclQDomNode.cc | 24 +- .../qt4/QtXml}/gsiDeclQDomNodeList.cc | 8 +- .../qt4/QtXml}/gsiDeclQDomNotation.cc | 8 +- .../gsiDeclQDomProcessingInstruction.cc | 8 +- .../qt4/QtXml}/gsiDeclQDomText.cc | 8 +- .../qt4/QtXml}/gsiDeclQXmlAttributes.cc | 10 +- .../qt4/QtXml}/gsiDeclQXmlContentHandler.cc | 10 +- .../qt4/QtXml}/gsiDeclQXmlDTDHandler.cc | 10 +- .../qt4/QtXml}/gsiDeclQXmlDeclHandler.cc | 10 +- .../qt4/QtXml}/gsiDeclQXmlDefaultHandler.cc | 10 +- .../qt4/QtXml}/gsiDeclQXmlEntityResolver.cc | 8 +- .../qt4/QtXml}/gsiDeclQXmlErrorHandler.cc | 10 +- .../qt4/QtXml}/gsiDeclQXmlInputSource.cc | 10 +- .../qt4/QtXml}/gsiDeclQXmlLexicalHandler.cc | 10 +- .../qt4/QtXml}/gsiDeclQXmlLocator.cc | 10 +- .../qt4/QtXml}/gsiDeclQXmlNamespaceSupport.cc | 8 +- .../qt4/QtXml}/gsiDeclQXmlParseException.cc | 8 +- .../qt4/QtXml}/gsiDeclQXmlReader.cc | 10 +- .../qt4/QtXml}/gsiDeclQXmlSimpleReader.cc | 10 +- src/gsiqt/qt4/QtXml/gsiDeclQtXmlTypeTraits.h | 419 +++++ src/gsiqt/qt4/QtXml/gsiQtExternals.h | 133 ++ .../QtXml/gsiQtXmlCommon.h} | 29 +- src/gsiqt/qt4/qt4.pro | 17 + src/gsiqt/{ => qtbasic}/gsiDeclQt5Basic.cc | 0 src/gsiqt/qtbasic/gsiDeclQtAllTypeTraits.h | 50 + src/gsiqt/{ => qtbasic}/gsiDeclQtBasic.cc | 20 +- src/gsiqt/{ => qtbasic}/gsiQt.cc | 8 +- src/gsiqt/{ => qtbasic}/gsiQt.h | 27 +- src/gsiqt/qtbasic/gsiQtBasicCommon.h | 39 + src/gsiqt/{ => qtbasic}/gsiQtHelper.cc | 2 +- src/gsiqt/{ => qtbasic}/gsiQtHelper.h | 3 +- src/gsiqt/qtbasic/qtbasic.pro | 23 + src/gsiqt4/gsiQtExternals.h | 1555 ----------------- src/gsiqt4/gsiqt.pro | 17 - src/img/img/gsiDeclImg.cc | 6 +- src/klayout.pri | 2 +- src/lay/lay/gsiDeclLayApplication.cc | 4 +- src/lay/lay/gsiDeclLayHelpDialog.cc | 2 +- src/laybasic/laybasic/gsiDeclLayDialogs.cc | 16 +- src/laybasic/laybasic/gsiDeclLayLayers.cc | 8 +- src/laybasic/laybasic/gsiDeclLayMarker.cc | 2 +- src/laybasic/laybasic/gsiDeclLayMenu.cc | 6 +- src/laybasic/laybasic/gsiDeclLayPlugin.cc | 10 +- .../laybasic/gsiDeclLayTechnologies.cc | 4 +- src/lym/lym/gsiDeclLymMacro.cc | 6 +- src/pymod/db/db.pro | 21 + .../db/dbMain.cc} | 27 +- src/pymod/pymod.pro | 4 + src/rdb/rdb/gsiDeclRdb.cc | 12 +- src/tl/tl/tlCommon.h | 57 +- 604 files changed, 9120 insertions(+), 7232 deletions(-) create mode 100644 scripts/mkqtdecl4/QtCore/allofqt.cpp create mode 100644 scripts/mkqtdecl4/QtDesigner/allofqt.cpp rename scripts/mkqtdecl4/{ => QtGui}/allofqt.cpp (69%) create mode 100644 scripts/mkqtdecl4/QtNetwork/allofqt.cpp create mode 100644 scripts/mkqtdecl4/QtSql/allofqt.cpp create mode 100644 scripts/mkqtdecl4/QtXml/allofqt.cpp create mode 100644 src/gsiqt/qt4/QtCore/QtCore.pri create mode 100644 src/gsiqt/qt4/QtCore/QtCore.pro rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQAbstractItemModel.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQAbstractListModel.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQAbstractTableModel.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQBasicTimer.cc (94%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQBuffer.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQByteArrayMatcher.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQChildEvent.cc (94%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQCoreApplication.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQCryptographicHash.cc (94%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQDataStream.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQDate.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQDateTime.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQDir.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQDynamicPropertyChangeEvent.cc (92%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQEasingCurve.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQEvent.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQEventLoop.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQFactoryInterface.cc (93%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQFile.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQFileInfo.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQFileSystemWatcher.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQIODevice.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQLibrary.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQLibraryInfo.cc (93%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQLine.cc (94%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQLineF.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQLocale.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQMargins.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQMetaClassInfo.cc (93%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQMetaEnum.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQMetaMethod.cc (93%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQMetaObject.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQMetaProperty.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQMetaType.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQMimeData.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQModelIndex.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQMutex.cc (92%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQObject.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQPersistentModelIndex.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQPluginLoader.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQPoint.cc (89%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQPointF.cc (90%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQProcess.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQProcessEnvironment.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQReadLocker.cc (94%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQReadWriteLock.cc (94%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQRect.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQRectF.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQRegExp.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQResource.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQSemaphore.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQSettings.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQSignalMapper.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQSize.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQSizeF.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQSocketNotifier.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQStringMatcher.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQSysInfo.cc (89%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQSystemLocale.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQTemporaryFile.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQTextCodec.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQTextCodec_ConverterState.cc (89%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQTextDecoder.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQTextEncoder.cc (93%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQTextStream.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQThread.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQTime.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQTimeLine.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQTimer.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQTimerEvent.cc (91%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQTranslator.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQUrl.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQWaitCondition.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQWriteLocker.cc (94%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQt.cc (84%) create mode 100644 src/gsiqt/qt4/QtCore/gsiDeclQtCoreTypeTraits.h rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQt_1.cc (92%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQt_2.cc (80%) rename src/{gsiqt4 => gsiqt/qt4/QtCore}/gsiDeclQt_3.cc (86%) create mode 100644 src/gsiqt/qt4/QtCore/gsiQtCoreCommon.h create mode 100644 src/gsiqt/qt4/QtCore/gsiQtExternals.h create mode 100644 src/gsiqt/qt4/QtDesigner/QtDesigner.pri create mode 100644 src/gsiqt/qt4/QtDesigner/QtDesigner.pro rename src/{gsiqt4 => gsiqt/qt4/QtDesigner}/gsiDeclQAbstractFormBuilder.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtDesigner}/gsiDeclQFormBuilder.cc (94%) create mode 100644 src/gsiqt/qt4/QtDesigner/gsiDeclQtDesignerTypeTraits.h create mode 100644 src/gsiqt/qt4/QtDesigner/gsiQtDesignerCommon.h create mode 100644 src/gsiqt/qt4/QtDesigner/gsiQtExternals.h rename src/{gsiqt4/qtdecl.pri => gsiqt/qt4/QtGui/QtGui.pri} (71%) create mode 100644 src/gsiqt/qt4/QtGui/QtGui.pro rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQAbstractButton.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQAbstractGraphicsShapeItem.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQAbstractItemDelegate.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQAbstractItemView.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQAbstractPageSetupDialog.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQAbstractPrintDialog.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQAbstractProxyModel.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQAbstractScrollArea.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQAbstractSlider.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQAbstractSpinBox.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQAbstractTextDocumentLayout.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc (86%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQAbstractTextDocumentLayout_Selection.cc (87%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQAbstractUndoItem.cc (94%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQAccessible.cc (94%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQAccessibleApplication.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQAccessibleEvent.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQAccessibleInterface.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQAccessibleObject.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQAccessibleWidget.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQAction.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQActionEvent.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQActionGroup.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQApplication.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQBitmap.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQBoxLayout.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQBrush.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQButtonGroup.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQCDEStyle.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQCalendarWidget.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQCheckBox.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQCleanlooksStyle.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQClipboard.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQClipboardEvent.cc (87%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQCloseEvent.cc (89%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQColor.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQColorDialog.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQColormap.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQColumnView.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQComboBox.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQCommandLinkButton.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQCommonStyle.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQCompleter.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQConicalGradient.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQContextMenuEvent.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQCursor.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQDataWidgetMapper.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQDateEdit.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQDateTimeEdit.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQDesktopServices.cc (94%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQDesktopWidget.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQDial.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQDialog.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQDialogButtonBox.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQDirIterator.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQDirModel.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQDockWidget.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQDoubleSpinBox.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQDoubleValidator.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQDrag.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQDragEnterEvent.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQDragLeaveEvent.cc (91%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQDragMoveEvent.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQDragResponseEvent.cc (92%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQDropEvent.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQErrorMessage.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQFileDialog.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQFileIconProvider.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQFileOpenEvent.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQFileSystemModel.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQFocusEvent.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQFocusFrame.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQFont.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQFontComboBox.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQFontDatabase.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQFontDialog.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQFontInfo.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQFontMetrics.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQFontMetricsF.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQFormLayout.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQFrame.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGesture.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGestureEvent.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGestureRecognizer.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGradient.cc (93%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsAnchor.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsAnchorLayout.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsBlurEffect.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsColorizeEffect.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsDropShadowEffect.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsEffect.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsEllipseItem.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsGridLayout.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsItem.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsItemAnimation.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsItemGroup.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsLayout.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsLayoutItem.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsLineItem.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsLinearLayout.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsObject.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsOpacityEffect.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsPathItem.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsPixmapItem.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsPolygonItem.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsProxyWidget.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsRectItem.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsRotation.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsScale.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsScene.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsSceneContextMenuEvent.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsSceneDragDropEvent.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsSceneEvent.cc (93%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsSceneHelpEvent.cc (94%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsSceneHoverEvent.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsSceneMouseEvent.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsSceneMoveEvent.cc (94%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsSceneResizeEvent.cc (93%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsSceneWheelEvent.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsSimpleTextItem.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsTextItem.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsTransform.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsView.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGraphicsWidget.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGridLayout.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQGroupBox.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQHBoxLayout.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQHeaderView.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQHelpEvent.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQHideEvent.cc (90%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQHoverEvent.cc (94%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQIcon.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQIconDragEvent.cc (91%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQIconEngine.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQIconEnginePlugin.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQIconEnginePluginV2.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQIconEngineV2.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQImage.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQImageIOHandler.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQImageIOPlugin.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQImageReader.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQImageTextKeyLang.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQImageWriter.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQInputContext.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQInputContextFactory.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQInputContextPlugin.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQInputDialog.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQInputEvent.cc (94%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQInputMethodEvent.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQInputMethodEvent_Attribute.cc (90%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQIntValidator.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQItemDelegate.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQItemEditorCreatorBase.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQItemEditorFactory.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQItemSelection.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQItemSelectionModel.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQItemSelectionRange.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQKeyEvent.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQKeySequence.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQLCDNumber.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQLabel.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQLayout.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQLayoutItem.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQLineEdit.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQLinearGradient.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQListView.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQListWidget.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQListWidgetItem.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQMainWindow.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQMatrix.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQMatrix4x4.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQMdiArea.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQMdiSubWindow.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQMenu.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQMenuBar.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQMessageBox.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQMimeSource.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQMotifStyle.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQMouseEvent.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQMoveEvent.cc (93%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQMovie.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPageSetupDialog.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPaintDevice.cc (91%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPaintEngine.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPaintEngineState.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPaintEvent.cc (94%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPainter.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPainterPath.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPainterPathStroker.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPainterPath_Element.cc (94%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPalette.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPanGesture.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPen.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPicture.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPinchGesture.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPixmap.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPixmapCache.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPlainTextDocumentLayout.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPlainTextEdit.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPlastiqueStyle.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPolygon.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPolygonF.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPrintDialog.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPrintEngine.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPrintPreviewDialog.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPrintPreviewWidget.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPrinter.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPrinterInfo.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQProgressBar.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQProgressDialog.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQPushButton.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQQuaternion.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQRadialGradient.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQRadioButton.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQRegExpValidator.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQRegion.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQResizeEvent.cc (94%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQRubberBand.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQScrollArea.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQScrollBar.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQShortcut.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQShortcutEvent.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQShowEvent.cc (90%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQSizeGrip.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQSizePolicy.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQSlider.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQSortFilterProxyModel.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQSound.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQSpacerItem.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQSpinBox.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQSplashScreen.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQSplitter.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQSplitterHandle.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStackedLayout.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStackedWidget.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStandardItem.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStandardItemModel.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStatusBar.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStatusTipEvent.cc (92%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStringListModel.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyle.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleFactory.cc (93%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleHintReturn.cc (90%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleHintReturnMask.cc (89%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleHintReturnVariant.cc (89%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOption.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionButton.cc (93%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionComboBox.cc (92%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionComplex.cc (93%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionDockWidget.cc (92%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionFocusRect.cc (92%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionFrame.cc (93%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionFrameV2.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionFrameV3.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionGraphicsItem.cc (94%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionGroupBox.cc (92%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionHeader.cc (93%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionMenuItem.cc (92%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionProgressBar.cc (92%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionProgressBarV2.cc (94%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionQ3DockWindow.cc (92%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionQ3ListView.cc (92%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionQ3ListViewItem.cc (92%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionRubberBand.cc (92%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionSizeGrip.cc (92%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionSlider.cc (93%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionSpinBox.cc (92%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionTab.cc (93%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionTabBarBase.cc (92%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionTabBarBaseV2.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionTabV2.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionTabV3.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionTabWidgetFrame.cc (92%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionTitleBar.cc (92%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionToolBar.cc (93%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionToolBox.cc (93%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionToolBoxV2.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionToolButton.cc (92%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionViewItem.cc (92%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionViewItemV2.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionViewItemV3.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyleOptionViewItemV4.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStylePainter.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStylePlugin.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQStyledItemDelegate.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQSwipeGesture.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQSyntaxHighlighter.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQSystemTrayIcon.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTabBar.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTabWidget.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTableView.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTableWidget.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTableWidgetItem.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTableWidgetSelectionRange.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTabletEvent.cc (94%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTapAndHoldGesture.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTapGesture.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextBlock.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextBlockFormat.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextBlockGroup.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextBlockUserData.cc (88%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextBlock_Iterator.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextBrowser.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextCharFormat.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextCursor.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextDocument.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextDocumentFragment.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextDocumentWriter.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextEdit.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextEdit_ExtraSelection.cc (87%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextFormat.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextFragment.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextFrame.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextFrameFormat.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextFrame_Iterator.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextImageFormat.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextInlineObject.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextItem.cc (93%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextLayout.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextLayout_FormatRange.cc (88%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextLength.cc (94%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextLine.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextList.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextListFormat.cc (94%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextObject.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextObjectInterface.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextOption.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextOption_Tab.cc (80%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextTable.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextTableCell.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextTableCellFormat.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTextTableFormat.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTimeEdit.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQToolBar.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQToolBarChangeEvent.cc (92%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQToolBox.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQToolButton.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQToolTip.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTouchEvent.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTouchEvent_TouchPoint.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTransform.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTreeView.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTreeWidget.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTreeWidgetItem.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQTreeWidgetItemIterator.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQUndoCommand.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQUndoGroup.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQUndoStack.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQUndoView.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQUnixPrintWidget.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQVBoxLayout.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQValidator.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQVector2D.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQVector3D.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQVector4D.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQWhatsThis.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQWhatsThisClickedEvent.cc (91%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQWheelEvent.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQWidget.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQWidgetAction.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQWidgetItem.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQWindowStateChangeEvent.cc (94%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQWindowsStyle.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQWizard.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtGui}/gsiDeclQWizardPage.cc (99%) rename src/{gsiqt4/gsiDeclQtTypeTraits.h => gsiqt/qt4/QtGui/gsiDeclQtGuiTypeTraits.h} (82%) create mode 100644 src/gsiqt/qt4/QtGui/gsiQtExternals.h rename src/gsiqt/{gsiQtExternals.h => qt4/QtGui/gsiQtGuiCommon.h} (62%) create mode 100644 src/gsiqt/qt4/QtNetwork/QtNetwork.pri create mode 100644 src/gsiqt/qt4/QtNetwork/QtNetwork.pro rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQAbstractNetworkCache.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQAbstractSocket.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQAuthenticator.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQFtp.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQHostAddress.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQHostInfo.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQIPv6Address.cc (93%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQLocalServer.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQLocalSocket.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQNetworkAccessManager.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQNetworkAddressEntry.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQNetworkCacheMetaData.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQNetworkCookie.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQNetworkCookieJar.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQNetworkDiskCache.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQNetworkInterface.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQNetworkProxy.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQNetworkProxyFactory.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQNetworkProxyQuery.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQNetworkReply.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQNetworkRequest.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQSsl.cc (80%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQSslCertificate.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQSslCipher.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQSslConfiguration.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQSslError.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQSslKey.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQSslSocket.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQTcpServer.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQTcpSocket.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQUdpSocket.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtNetwork}/gsiDeclQUrlInfo.cc (99%) create mode 100644 src/gsiqt/qt4/QtNetwork/gsiDeclQtNetworkTypeTraits.h create mode 100644 src/gsiqt/qt4/QtNetwork/gsiQtExternals.h create mode 100644 src/gsiqt/qt4/QtNetwork/gsiQtNetworkCommon.h create mode 100644 src/gsiqt/qt4/QtSql/QtSql.pri create mode 100644 src/gsiqt/qt4/QtSql/QtSql.pro rename src/{gsiqt4 => gsiqt/qt4/QtSql}/gsiDeclQSql.cc (82%) rename src/{gsiqt4 => gsiqt/qt4/QtSql}/gsiDeclQSqlDatabase.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtSql}/gsiDeclQSqlDriver.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtSql}/gsiDeclQSqlDriverCreatorBase.cc (94%) rename src/{gsiqt4 => gsiqt/qt4/QtSql}/gsiDeclQSqlError.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtSql}/gsiDeclQSqlField.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtSql}/gsiDeclQSqlIndex.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtSql}/gsiDeclQSqlQuery.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtSql}/gsiDeclQSqlQueryModel.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtSql}/gsiDeclQSqlRecord.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtSql}/gsiDeclQSqlRelation.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtSql}/gsiDeclQSqlRelationalTableModel.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtSql}/gsiDeclQSqlResult.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtSql}/gsiDeclQSqlTableModel.cc (99%) create mode 100644 src/gsiqt/qt4/QtSql/gsiDeclQtSqlTypeTraits.h create mode 100644 src/gsiqt/qt4/QtSql/gsiQtExternals.h rename src/{gsiqt4/gsiDeclQtAdditional.cc => gsiqt/qt4/QtSql/gsiQtSqlCommon.h} (61%) create mode 100644 src/gsiqt/qt4/QtXml/QtXml.pri create mode 100644 src/gsiqt/qt4/QtXml/QtXml.pro rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQDomAttr.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQDomCDATASection.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQDomCharacterData.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQDomComment.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQDomDocument.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQDomDocumentFragment.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQDomDocumentType.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQDomElement.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQDomEntity.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQDomEntityReference.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQDomImplementation.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQDomNamedNodeMap.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQDomNode.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQDomNodeList.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQDomNotation.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQDomProcessingInstruction.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQDomText.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQXmlAttributes.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQXmlContentHandler.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQXmlDTDHandler.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQXmlDeclHandler.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQXmlDefaultHandler.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQXmlEntityResolver.cc (87%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQXmlErrorHandler.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQXmlInputSource.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQXmlLexicalHandler.cc (98%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQXmlLocator.cc (95%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQXmlNamespaceSupport.cc (97%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQXmlParseException.cc (96%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQXmlReader.cc (99%) rename src/{gsiqt4 => gsiqt/qt4/QtXml}/gsiDeclQXmlSimpleReader.cc (99%) create mode 100644 src/gsiqt/qt4/QtXml/gsiDeclQtXmlTypeTraits.h create mode 100644 src/gsiqt/qt4/QtXml/gsiQtExternals.h rename src/gsiqt/{gsiQtCommon.h => qt4/QtXml/gsiQtXmlCommon.h} (61%) create mode 100644 src/gsiqt/qt4/qt4.pro rename src/gsiqt/{ => qtbasic}/gsiDeclQt5Basic.cc (100%) create mode 100644 src/gsiqt/qtbasic/gsiDeclQtAllTypeTraits.h rename src/gsiqt/{ => qtbasic}/gsiDeclQtBasic.cc (91%) rename src/gsiqt/{ => qtbasic}/gsiQt.cc (96%) rename src/gsiqt/{ => qtbasic}/gsiQt.h (92%) create mode 100644 src/gsiqt/qtbasic/gsiQtBasicCommon.h rename src/gsiqt/{ => qtbasic}/gsiQtHelper.cc (99%) rename src/gsiqt/{ => qtbasic}/gsiQtHelper.h (88%) create mode 100644 src/gsiqt/qtbasic/qtbasic.pro delete mode 100644 src/gsiqt4/gsiQtExternals.h delete mode 100644 src/gsiqt4/gsiqt.pro create mode 100644 src/pymod/db/db.pro rename src/{gsiqt/gsiDeclQtTypeTraits.h => pymod/db/dbMain.cc} (70%) create mode 100644 src/pymod/pymod.pro diff --git a/scripts/mkqtdecl.sh b/scripts/mkqtdecl.sh index 8e03667c7..16e227de1 100755 --- a/scripts/mkqtdecl.sh +++ b/scripts/mkqtdecl.sh @@ -47,12 +47,14 @@ inst_dir_common=`pwd`/scripts/mkqtdecl_common inst_dir4=`pwd`/scripts/mkqtdecl4 inst_dir5=`pwd`/scripts/mkqtdecl5 src_dir=`pwd`/src -src_name4=gsiqt4 -src_name5=gsiqt5 +src_name4=gsiqt/qt4 +src_name5=gsiqt/qt5 src_name=$src_name4 inst_dir=$inst_dir4 +work_dir="mkqtdecl.tmp" + while [ "$1" != "" ]; do a="$1" @@ -92,6 +94,7 @@ while [ "$1" != "" ]; do ;; -qt5) qt="$qt5" + work_dir="mkqtdecl5.tmp" inst_dir="$inst_dir5" src_name="$src_name5" ;; @@ -144,8 +147,6 @@ if ! ruby -e "require 'treetop'" 2>&1; then exit 1 fi -work_dir="./mkqtdecl.tmp" - if [ $update != 0 ]; then if [ -e $work_dir ] && [ $reuse == 0 ]; then @@ -155,71 +156,116 @@ if [ $update != 0 ]; then mkdir -p $work_dir cd $work_dir - cp $inst_dir/{allofqt.cpp,mkqtdecl.conf,mkqtdecl.properties,mkqtdecl.events} . - cp $inst_dir_common/{cpp_parser_classes.rb,cpp_classes.rb,c++.treetop,parse.rb,reader_ext.rb,produce.rb} . + cp -R $inst_dir/Qt* . + for d in Qt*; do + cd $d + cp $inst_dir/{mkqtdecl.conf,mkqtdecl.properties,mkqtdecl.events} . + cp $inst_dir_common/{cpp_parser_classes.rb,cpp_classes.rb,c++.treetop,parse.rb,reader_ext.rb,produce.rb} . + cd .. + done if [ $reuse == 0 ]; then - echo "Running gcc preprocessor .." - # By using -D_GCC_LIMITS_H_ we make the gcc not include constants such as ULONG_MAX which will - # remain as such. This way the generated code is more generic. - gcc -I$qt -fPIC -D_GCC_LIMITS_H_ -E -o allofqt.x allofqt.cpp + for d in Qt*; do - echo "Stripping hash lines .." - egrep -v '^#' allofqt.e - rm allofqt.x + echo "--------------------------------------------------------" + echo "Parsing $d ..." + echo "" - echo "Parsing and producing db .." - ./parse.rb -i allofqt.e -o allofqt.db + cd $d + + echo "Running gcc preprocessor .." + # By using -D_GCC_LIMITS_H_ we make the gcc not include constants such as ULONG_MAX which will + # remain as such. This way the generated code is more generic. + gcc -I$qt -fPIC -D_GCC_LIMITS_H_ -E -o allofqt.x allofqt.cpp + + echo "Stripping hash lines .." + egrep -v '^#' allofqt.e + rm allofqt.x + + echo "Parsing and producing db .." + ./parse.rb -i allofqt.e -o allofqt.db + + cd .. + + done fi - mkdir -p generated + rm -f produced.txt + touch produced.txt - echo "Producing code .." - ./produce.rb -i allofqt.db + # Note the order of the modules is important: first modules get the + # classes first + for d in QtCore QtGui QtDesigner QtNetwork QtSql QtXml; do + + cd $d + + mkdir -p generated + + echo "Producing code .." + ./produce.rb -x ../produced.txt -i allofqt.db -m $d + + # mark classes produced here as done + cat class_list.txt >>../produced.txt + + cd .. + + done else cd $work_dir fi -if [ ! -e generated ]; then - echo "*** ERROR: production output ("`pwd`"/generated) does not exist - production failed?" - exit 1 -fi +for d in Qt*; do -cd generated + echo "--------------------------------------------------------" + echo "Processing $d ..." + echo "" -if [ $dry != 0 ]; then - echo "Synchronizing dry run .." -else - echo "Synchronizing .." -fi + cd $d -count=0 -for f in {*.cc,*.h} qtdecl.pri; do - needs_update=0 - if ! [ -e $src_dir/$src_name/$f ]; then - echo "# INFO: creating new file $src_dir/$src_name/$f" - needs_update=1 - elif ! cmp -s $f $src_dir/$src_name/$f; then - echo "# INFO: out of date: syncing file $src_dir/$src_name/$f" - needs_update=1 + if [ ! -e generated ]; then + echo "*** ERROR: production output ("`pwd`"/generated) does not exist - production failed?" + exit 1 fi - if [ $needs_update != 0 ]; then - count=`expr $count + 1` - if [ $dry != 0 ]; then - echo cp $f $src_dir/$src_name/$f - else - echo === cp $f $src_dir/$src_name/$f - cp $f $src_dir/$src_name/$f + + cd generated + + if [ $dry != 0 ]; then + echo "Synchronizing dry run .." + else + echo "Synchronizing .." + fi + + count=0 + for f in {*.cc,*.h} $d.pri; do + needs_update=0 + if ! [ -e $src_dir/$src_name/$d/$f ]; then + echo "# INFO: creating new file $src_dir/$src_name/$f" + needs_update=1 + elif ! cmp -s $f $src_dir/$src_name/$d/$f; then + echo "# INFO: out of date: syncing file $src_dir/$src_name/$f" + needs_update=1 fi + if [ $needs_update != 0 ]; then + count=`expr $count + 1` + if [ $dry != 0 ]; then + echo cp $f $src_dir/$src_name/$d/$f + else + echo === cp $f $src_dir/$src_name/$d/$f + cp $f $src_dir/$src_name/$d/$f + fi + fi + done + + if [ $dry != 0 ]; then + echo "# INFO: $count files to synchronize" + else + echo "# INFO: $count files synchronized" fi + + cd .. + cd .. + done - -if [ $dry != 0 ]; then - echo "# INFO: $count files to synchronize" -else - echo "# INFO: $count files synchronized" -fi - diff --git a/scripts/mkqtdecl4/QtCore/allofqt.cpp b/scripts/mkqtdecl4/QtCore/allofqt.cpp new file mode 100644 index 000000000..78ff61582 --- /dev/null +++ b/scripts/mkqtdecl4/QtCore/allofqt.cpp @@ -0,0 +1,76 @@ +#include "QtCore/QTextStream" +#include "QtCore/QAbstractItemModel" +#include "QtCore/QAbstractListModel" +#include "QtCore/QAbstractTableModel" +#include "QtCore/QBasicTimer" +#include "QtCore/QByteArrayMatcher" +#include "QtCore/QChildEvent" +#include "QtCore/QCoreApplication" +#include "QtCore/QCryptographicHash" +#include "QtCore/QCustomEvent" +#include "QtCore/QDataStream" +#include "QtCore/QDate" +#include "QtCore/QDateTime" +#include "QtCore/QDir" +#include "QtCore/QDynamicPropertyChangeEvent" +#include "QtCore/QEasingCurve" +#include "QtCore/QEvent" +#include "QtCore/QEventLoop" +#include "QtCore/QFactoryInterface" +#include "QtCore/QFile" +#include "QtCore/QFileInfo" +#include "QtCore/QFileSystemWatcher" +#include "QtCore/QIODevice" +#include "QtCore/QLibrary" +#include "QtCore/QLibraryInfo" +#include "QtCore/QLine" +#include "QtCore/QLineF" +#include "QtCore/QLocale" +#include "QtCore/QMargins" +#include "QtCore/QMetaClassInfo" +#include "QtCore/QMetaEnum" +#include "QtCore/QMetaMethod" +#include "QtCore/QMetaObject" +#include "QtCore/QMetaProperty" +#include "QtCore/QMetaType" +#include "QtCore/QMimeData" +#include "QtCore/QModelIndex" +#include "QtCore/QMutex" +#include "QtCore/QObject" +#include "QtCore/QPersistentModelIndex" +#include "QtCore/QPluginLoader" +#include "QtCore/QPoint" +#include "QtCore/QPointF" +#include "QtCore/QProcess" +#include "QtCore/QProcessEnvironment" +#include "QtCore/QReadLocker" +#include "QtCore/QReadWriteLock" +#include "QtCore/QRect" +#include "QtCore/QRectF" +#include "QtCore/QRegExp" +#include "QtCore/QResource" +#include "QtCore/QSemaphore" +#include "QtCore/QSettings" +#include "QtCore/QSignalMapper" +#include "QtCore/QSize" +#include "QtCore/QSizeF" +#include "QtCore/QSocketNotifier" +#include "QtCore/QStringMatcher" +#include "QtCore/QSysInfo" +#include "QtCore/QSystemLocale" +#include "QtCore/QTemporaryFile" +#include "QtCore/QThread" +#include "QtCore/QTime" +#include "QtCore/QTimeLine" +#include "QtCore/QTimer" +#include "QtCore/QTimerEvent" +#include "QtCore/QTranslator" +#include "QtCore/QUrl" +#include "QtCore/QVariant" +#include "QtCore/QWaitCondition" +#include "QtCore/QWriteLocker" +#include "QtCore/QTextCodec" +#include "QtCore/QTextDecoder" +#include "QtCore/QTextEncoder" +#include "QtCore/QBuffer" +#include "QtCore/Qt" diff --git a/scripts/mkqtdecl4/QtDesigner/allofqt.cpp b/scripts/mkqtdecl4/QtDesigner/allofqt.cpp new file mode 100644 index 000000000..a45b63452 --- /dev/null +++ b/scripts/mkqtdecl4/QtDesigner/allofqt.cpp @@ -0,0 +1,2 @@ +#include "QtDesigner/QAbstractFormBuilder" +#include "QtDesigner/QFormBuilder" diff --git a/scripts/mkqtdecl4/allofqt.cpp b/scripts/mkqtdecl4/QtGui/allofqt.cpp similarity index 69% rename from scripts/mkqtdecl4/allofqt.cpp rename to scripts/mkqtdecl4/QtGui/allofqt.cpp index 519264190..e1b8ef8ef 100644 --- a/scripts/mkqtdecl4/allofqt.cpp +++ b/scripts/mkqtdecl4/QtGui/allofqt.cpp @@ -349,156 +349,3 @@ #include "QtGui/QWizardPage" #include "QtGui/QPrinter" #include "QtGui/QAccessible" -#include "QtCore/QTextStream" -#include "QtCore/QAbstractItemModel" -#include "QtCore/QAbstractListModel" -#include "QtCore/QAbstractTableModel" -#include "QtCore/QBasicTimer" -#include "QtCore/QByteArrayMatcher" -#include "QtCore/QChildEvent" -#include "QtCore/QCoreApplication" -#include "QtCore/QCryptographicHash" -#include "QtCore/QCustomEvent" -#include "QtCore/QDataStream" -#include "QtCore/QDate" -#include "QtCore/QDateTime" -#include "QtCore/QDir" -#include "QtCore/QDynamicPropertyChangeEvent" -#include "QtCore/QEasingCurve" -#include "QtCore/QEvent" -#include "QtCore/QEventLoop" -#include "QtCore/QFactoryInterface" -#include "QtCore/QFile" -#include "QtCore/QFileInfo" -#include "QtCore/QFileSystemWatcher" -#include "QtCore/QIODevice" -#include "QtCore/QLibrary" -#include "QtCore/QLibraryInfo" -#include "QtCore/QLine" -#include "QtCore/QLineF" -#include "QtCore/QLocale" -#include "QtCore/QMargins" -#include "QtCore/QMetaClassInfo" -#include "QtCore/QMetaEnum" -#include "QtCore/QMetaMethod" -#include "QtCore/QMetaObject" -#include "QtCore/QMetaProperty" -#include "QtCore/QMetaType" -#include "QtCore/QMimeData" -#include "QtCore/QModelIndex" -#include "QtCore/QMutex" -#include "QtCore/QObject" -#include "QtCore/QPersistentModelIndex" -#include "QtCore/QPluginLoader" -#include "QtCore/QPoint" -#include "QtCore/QPointF" -#include "QtCore/QProcess" -#include "QtCore/QProcessEnvironment" -#include "QtCore/QReadLocker" -#include "QtCore/QReadWriteLock" -#include "QtCore/QRect" -#include "QtCore/QRectF" -#include "QtCore/QRegExp" -#include "QtCore/QResource" -#include "QtCore/QSemaphore" -#include "QtCore/QSettings" -#include "QtCore/QSignalMapper" -#include "QtCore/QSize" -#include "QtCore/QSizeF" -#include "QtCore/QSocketNotifier" -#include "QtCore/QStringMatcher" -#include "QtCore/QSysInfo" -#include "QtCore/QSystemLocale" -#include "QtCore/QTemporaryFile" -#include "QtCore/QThread" -#include "QtCore/QTime" -#include "QtCore/QTimeLine" -#include "QtCore/QTimer" -#include "QtCore/QTimerEvent" -#include "QtCore/QTranslator" -#include "QtCore/QUrl" -#include "QtCore/QVariant" -#include "QtCore/QWaitCondition" -#include "QtCore/QWriteLocker" -#include "QtCore/QTextCodec" -#include "QtCore/QTextDecoder" -#include "QtCore/QTextEncoder" -#include "QtCore/QBuffer" -#include "QtXml/QDomNode" -#include "QtXml/QDomNodeList" -#include "QtXml/QDomCharacterData" -#include "QtXml/QDomText" -#include "QtXml/QDomAttr" -#include "QtXml/QDomCDATASection" -#include "QtXml/QDomComment" -#include "QtXml/QDomDocument" -#include "QtXml/QDomDocumentFragment" -#include "QtXml/QDomDocumentType" -#include "QtXml/QDomElement" -#include "QtXml/QDomEntity" -#include "QtXml/QDomEntityReference" -#include "QtXml/QDomImplementation" -#include "QtXml/QDomNamedNodeMap" -#include "QtXml/QDomNotation" -#include "QtXml/QDomProcessingInstruction" -#include "QtXml/QXmlAttributes" -#include "QtXml/QXmlContentHandler" -#include "QtXml/QXmlDeclHandler" -#include "QtXml/QXmlDefaultHandler" -#include "QtXml/QXmlDTDHandler" -#include "QtXml/QXmlEntityResolver" -#include "QtXml/QXmlErrorHandler" -#include "QtXml/QXmlInputSource" -#include "QtXml/QXmlLexicalHandler" -#include "QtXml/QXmlLocator" -#include "QtXml/QXmlNamespaceSupport" -#include "QtXml/QXmlParseException" -#include "QtXml/QXmlReader" -#include "QtXml/QXmlSimpleReader" -#include "QtNetwork/QAbstractNetworkCache" -#include "QtNetwork/QAuthenticator" -#include "QtNetwork/QFtp" -#include "QtNetwork/QHostAddress" -#include "QtNetwork/QHostInfo" -#include "QtNetwork/QLocalServer" -#include "QtNetwork/QLocalSocket" -#include "QtNetwork/QNetworkAccessManager" -#include "QtNetwork/QNetworkAddressEntry" -#include "QtNetwork/QNetworkCacheMetaData" -#include "QtNetwork/QNetworkCookie" -#include "QtNetwork/QNetworkCookieJar" -#include "QtNetwork/QNetworkDiskCache" -#include "QtNetwork/QNetworkInterface" -#include "QtNetwork/QNetworkProxy" -#include "QtNetwork/QNetworkProxyFactory" -#include "QtNetwork/QNetworkProxyQuery" -#include "QtNetwork/QNetworkReply" -#include "QtNetwork/QNetworkRequest" -#include "QtNetwork/QSslCertificate" -#include "QtNetwork/QSslCipher" -#include "QtNetwork/QSslConfiguration" -#include "QtNetwork/QSslError" -#include "QtNetwork/QSslKey" -#include "QtNetwork/QSslSocket" -#include "QtNetwork/QTcpServer" -#include "QtNetwork/QTcpSocket" -#include "QtNetwork/QUdpSocket" -#include "QtNetwork/QUrlInfo" -#include "QtNetwork/QAbstractSocket" -#include "QtSql/QSqlDatabase" -#include "QtSql/QSqlDriver" -#include "QtSql/QSqlDriverCreatorBase" -#include "QtSql/QSqlError" -#include "QtSql/QSqlField" -#include "QtSql/QSqlIndex" -#include "QtSql/QSqlQuery" -#include "QtSql/QSqlQueryModel" -#include "QtSql/QSqlRecord" -#include "QtSql/QSqlRelation" -#include "QtSql/QSqlRelationalDelegate" -#include "QtSql/QSqlRelationalTableModel" -#include "QtSql/QSqlResult" -#include "QtSql/QSqlTableModel" -#include "QtDesigner/QAbstractFormBuilder" -#include "QtDesigner/QFormBuilder" -#include "QtCore/Qt" diff --git a/scripts/mkqtdecl4/QtNetwork/allofqt.cpp b/scripts/mkqtdecl4/QtNetwork/allofqt.cpp new file mode 100644 index 000000000..707284c8d --- /dev/null +++ b/scripts/mkqtdecl4/QtNetwork/allofqt.cpp @@ -0,0 +1,30 @@ +#include "QtNetwork/QAbstractNetworkCache" +#include "QtNetwork/QAuthenticator" +#include "QtNetwork/QFtp" +#include "QtNetwork/QHostAddress" +#include "QtNetwork/QHostInfo" +#include "QtNetwork/QLocalServer" +#include "QtNetwork/QLocalSocket" +#include "QtNetwork/QNetworkAccessManager" +#include "QtNetwork/QNetworkAddressEntry" +#include "QtNetwork/QNetworkCacheMetaData" +#include "QtNetwork/QNetworkCookie" +#include "QtNetwork/QNetworkCookieJar" +#include "QtNetwork/QNetworkDiskCache" +#include "QtNetwork/QNetworkInterface" +#include "QtNetwork/QNetworkProxy" +#include "QtNetwork/QNetworkProxyFactory" +#include "QtNetwork/QNetworkProxyQuery" +#include "QtNetwork/QNetworkReply" +#include "QtNetwork/QNetworkRequest" +#include "QtNetwork/QSslCertificate" +#include "QtNetwork/QSslCipher" +#include "QtNetwork/QSslConfiguration" +#include "QtNetwork/QSslError" +#include "QtNetwork/QSslKey" +#include "QtNetwork/QSslSocket" +#include "QtNetwork/QTcpServer" +#include "QtNetwork/QTcpSocket" +#include "QtNetwork/QUdpSocket" +#include "QtNetwork/QUrlInfo" +#include "QtNetwork/QAbstractSocket" diff --git a/scripts/mkqtdecl4/QtSql/allofqt.cpp b/scripts/mkqtdecl4/QtSql/allofqt.cpp new file mode 100644 index 000000000..388fb9a9d --- /dev/null +++ b/scripts/mkqtdecl4/QtSql/allofqt.cpp @@ -0,0 +1,14 @@ +#include "QtSql/QSqlDatabase" +#include "QtSql/QSqlDriver" +#include "QtSql/QSqlDriverCreatorBase" +#include "QtSql/QSqlError" +#include "QtSql/QSqlField" +#include "QtSql/QSqlIndex" +#include "QtSql/QSqlQuery" +#include "QtSql/QSqlQueryModel" +#include "QtSql/QSqlRecord" +#include "QtSql/QSqlRelation" +#include "QtSql/QSqlRelationalDelegate" +#include "QtSql/QSqlRelationalTableModel" +#include "QtSql/QSqlResult" +#include "QtSql/QSqlTableModel" diff --git a/scripts/mkqtdecl4/QtXml/allofqt.cpp b/scripts/mkqtdecl4/QtXml/allofqt.cpp new file mode 100644 index 000000000..70ff9cc45 --- /dev/null +++ b/scripts/mkqtdecl4/QtXml/allofqt.cpp @@ -0,0 +1,31 @@ +#include "QtXml/QDomNode" +#include "QtXml/QDomNodeList" +#include "QtXml/QDomCharacterData" +#include "QtXml/QDomText" +#include "QtXml/QDomAttr" +#include "QtXml/QDomCDATASection" +#include "QtXml/QDomComment" +#include "QtXml/QDomDocument" +#include "QtXml/QDomDocumentFragment" +#include "QtXml/QDomDocumentType" +#include "QtXml/QDomElement" +#include "QtXml/QDomEntity" +#include "QtXml/QDomEntityReference" +#include "QtXml/QDomImplementation" +#include "QtXml/QDomNamedNodeMap" +#include "QtXml/QDomNotation" +#include "QtXml/QDomProcessingInstruction" +#include "QtXml/QXmlAttributes" +#include "QtXml/QXmlContentHandler" +#include "QtXml/QXmlDeclHandler" +#include "QtXml/QXmlDefaultHandler" +#include "QtXml/QXmlDTDHandler" +#include "QtXml/QXmlEntityResolver" +#include "QtXml/QXmlErrorHandler" +#include "QtXml/QXmlInputSource" +#include "QtXml/QXmlLexicalHandler" +#include "QtXml/QXmlLocator" +#include "QtXml/QXmlNamespaceSupport" +#include "QtXml/QXmlParseException" +#include "QtXml/QXmlReader" +#include "QtXml/QXmlSimpleReader" diff --git a/scripts/mkqtdecl4/mkqtdecl.conf b/scripts/mkqtdecl4/mkqtdecl.conf index e157cacfa..35124771c 100644 --- a/scripts/mkqtdecl4/mkqtdecl.conf +++ b/scripts/mkqtdecl4/mkqtdecl.conf @@ -295,7 +295,7 @@ add_native_impl("QChildEvent", <<'CODE', <<'DECL') { public: RawQObjectClass () - : gsi::Class (gsi::qtdecl_QObject (), "QObject_Raw", gsi::Methods (), "@hide") + : gsi::Class (gsi::qtdecl_QObject (), "Qt", "QObject_Raw", gsi::Methods (), "@hide") { } diff --git a/scripts/mkqtdecl_common/produce.rb b/scripts/mkqtdecl_common/produce.rb index 6904c6e6f..1d2034066 100755 --- a/scripts/mkqtdecl_common/produce.rb +++ b/scripts/mkqtdecl_common/produce.rb @@ -27,6 +27,8 @@ require 'reader_ext.rb' input_file = "all.db" conf_file = "mkqtdecl.conf" cls_list = nil +excl_list = {} +modn = "Qt" $gen_dir = "generated" while ARGV.size > 0 @@ -35,8 +37,15 @@ while ARGV.size > 0 input_file = ARGV.shift elsif o == "-c" cls_list = ARGV.shift + elsif o == "-x" + excl_file = ARGV.shift + File.open(excl_file, "r") do |file| + file.each_line { |l| excl_list[l.chop] = true } + end elsif o == "-s" conf_file = ARGV.shift + elsif o == "-m" + modn = ARGV.shift else raise("Invalid option #{o} - usage is 'produce.rb -s mkqtdecl.conf -i all.db -c QWidget,QSizePolicy'") end @@ -363,6 +372,9 @@ class CPPStruct if bd.is_a?(CPPDeclaration) && ! bd.template_decl + # only public ctors are considered - currently protected ones are not used + bd.visibility == :public || next + func = bd.type.func if func @@ -1285,6 +1297,8 @@ end class BindingProducer + attr_accessor :modn + # @brief Read the input file (JSON) # # This method will set up the binding producer for generating @@ -1293,6 +1307,7 @@ class BindingProducer def read(input_file) @source_files = nil + @classes = nil @ext_decls = [] File.open(input_file, "r") do |file| @@ -1386,6 +1401,8 @@ class BindingProducer while cont (cls, clsn) = make_cls_names(decl_obj) + @classes ||= [] + @classes << clsn if index > 0 ofile_name = "gsiDecl#{clsn}_#{index}.cc" @@ -1495,6 +1512,7 @@ END methods = {} struct.collect_all_methods(methods, conf) methods[cls] = struct.collect_ctors + needs_adaptor = struct.needs_adaptor(conf) used_classes = {} @@ -1503,7 +1521,7 @@ END m.each do |bd| vis = bd.visibility - if vis == :public || vis == :protected + if vis == :public || (vis == :protected && needs_adaptor) # don't consider dropped methods conf.target_name(cls, bd, mn) || next @@ -1520,7 +1538,7 @@ END end - used_classes.values.map { |uc| uc.myself }.select { |uc| !conf.is_class_dropped?(uc) && uc != cls }.sort.each do |uc| + used_classes.values.map { |uc| uc.myself || uc.myself_weak }.select { |uc| !conf.is_class_dropped?(uc) && uc != cls }.sort.each do |uc| ofile.puts("#include <#{uc}>") end @@ -1535,8 +1553,8 @@ END end ofile.puts("#include \"gsiQt.h\"") - ofile.puts("#include \"gsiQtCommon.h\"") - ofile.puts("#include \"gsiDeclQtTypeTraits.h\"") + ofile.puts("#include \"gsi#{modn}Common.h\"") + ofile.puts("#include \"gsiDecl#{modn}TypeTraits.h\"") end @@ -1561,7 +1579,7 @@ END if index == 0 ofile.puts("namespace gsi") ofile.puts("{") - ofile.puts("gsi::Class<#{cls}_Namespace> decl_#{cls}_Namespace (\"#{clsn}\",") + ofile.puts("gsi::Class<#{cls}_Namespace> decl_#{cls}_Namespace (\"#{modn}\", \"#{clsn}\",") ofile.puts(" gsi::Methods(),") ofile.puts(" \"@qt\\n@brief This class represents the #{cls} namespace\");") ofile.puts("}") @@ -1597,7 +1615,7 @@ END ofile.puts("namespace qt_gsi") ofile.puts("{") ofile.puts("") - ofile.puts("static gsi::Enum<#{cls}::#{en}> decl_#{clsn}_#{en}_Enum (\"#{clsn}_#{en}\",") + ofile.puts("static gsi::Enum<#{cls}::#{en}> decl_#{clsn}_#{en}_Enum (\"#{modn}\", \"#{clsn}_#{en}\",") edecl = [] @@ -1618,7 +1636,7 @@ END ofile.puts(" \"@qt\\n@brief This class represents the #{cls}::#{en} enum\");") ofile.puts("") - ofile.puts("static gsi::QFlagsClass<#{cls}::#{en} > decl_#{clsn}_#{en}_Enums (\"#{clsn}_QFlags_#{en}\",") + ofile.puts("static gsi::QFlagsClass<#{cls}::#{en} > decl_#{clsn}_#{en}_Enums (\"#{modn}\", \"#{clsn}_QFlags_#{en}\",") ofile.puts(" \"@qt\\n@brief This class represents the QFlags<#{cls}::#{en}> flag set\");") ofile.puts("") @@ -1640,8 +1658,8 @@ END end ofile.puts("static gsi::ClassExt<#{pname}> inject_#{clsn}_#{en}_Enum_in_parent (decl_#{clsn}_#{en}_Enum.defs ());") - ofile.puts("static gsi::ClassExt<#{pname}> decl_#{clsn}_#{en}_Enum_as_child (decl_#{clsn}_#{en}_Enum, \"#{en}\");") - ofile.puts("static gsi::ClassExt<#{pname}> decl_#{clsn}_#{en}_Enums_as_child (decl_#{clsn}_#{en}_Enums, \"QFlags_#{en}\");") + ofile.puts("static gsi::ClassExt<#{pname}> decl_#{clsn}_#{en}_Enum_as_child (decl_#{clsn}_#{en}_Enum, \"#{modn}\", \"#{en}\");") + ofile.puts("static gsi::ClassExt<#{pname}> decl_#{clsn}_#{en}_Enums_as_child (decl_#{clsn}_#{en}_Enums, \"#{modn}\", \"QFlags_#{en}\");") ofile.puts("") ofile.puts("}") @@ -2249,9 +2267,9 @@ END if base_cls ofile.puts("gsi::Class<#{base_cls}> &qtdecl_#{base_clsn} ();") ofile.puts("") - ofile.puts("#{decl_type} decl_#{clsn} (" + "qtdecl_#{base_clsn} (), \"#{clsn}" + (needs_adaptor ? "_Native" : "") + "\",") + ofile.puts("#{decl_type} decl_#{clsn} (" + "qtdecl_#{base_clsn} (), \"#{modn}\", \"#{clsn}" + (needs_adaptor ? "_Native" : "") + "\",") else - ofile.puts("#{decl_type} decl_#{clsn} (" + "\"#{clsn}" + (needs_adaptor ? "_Native" : "") + "\",") + ofile.puts("#{decl_type} decl_#{clsn} (\"#{modn}\", \"#{clsn}" + (needs_adaptor ? "_Native" : "") + "\",") end if native_impl native_impl.each { |n| n[1] && ofile.puts(n[1] + "+") } @@ -2279,7 +2297,7 @@ END pcls = o.myself + "::" + pcls end - ofile.puts("gsi::ClassExt<#{pcls}> decl_#{clsn}_as_child (decl_#{clsn}, \"#{cclsn}\");") + ofile.puts("gsi::ClassExt<#{pcls}> decl_#{clsn}_as_child (decl_#{clsn}, \"#{modn}\", \"#{cclsn}\");") end @@ -2287,11 +2305,11 @@ END if !is_child_class # only for top-level classes external declarations are produced currently - @ext_decls << "#{struct.kind.to_s} #{cls};\nnamespace gsi { GSIQT_PUBLIC gsi::Class<#{cls}> &qtdecl_#{clsn} (); }\n\n" + @ext_decls << "#{struct.kind.to_s} #{cls};\nnamespace gsi { GSI_#{modn.upcase}_PUBLIC gsi::Class<#{cls}> &qtdecl_#{clsn} (); }\n\n" end ofile.puts("") - ofile.puts("GSIQT_PUBLIC gsi::Class<#{cls}> &qtdecl_#{clsn} () { return decl_#{clsn}; }") + ofile.puts("GSI_#{modn.upcase}_PUBLIC gsi::Class<#{cls}> &qtdecl_#{clsn} () { return decl_#{clsn}; }") ofile.puts("") ofile.puts("}") @@ -2772,7 +2790,7 @@ END ofile.puts(" return methods;") ofile.puts("}") ofile.puts("") - ofile.puts("gsi::Class<#{clsn}_Adaptor> decl_#{clsn}_Adaptor (qtdecl_#{clsn} (), \"#{clsn}\",") + ofile.puts("gsi::Class<#{clsn}_Adaptor> decl_#{clsn}_Adaptor (qtdecl_#{clsn} (), \"#{modn}\", \"#{clsn}\",") if native_impl native_impl.each { |n| n[1] && ofile.puts(n[1] + "+") } end @@ -2792,7 +2810,7 @@ END pcls = o.myself + "::" + pcls end - ofile.puts("gsi::ClassExt<#{pcls}> decl_#{clsn}_as_child (decl_#{clsn}_Adaptor, \"#{cclsn}\");") + ofile.puts("gsi::ClassExt<#{pcls}> decl_#{clsn}_as_child (decl_#{clsn}_Adaptor, \"#{modn}\", \"#{cclsn}\");") end @@ -2882,7 +2900,7 @@ END def produce_ttfile(conf) - ttfile_name = "gsiDeclQtTypeTraits.h" + ttfile_name = "gsiDecl#{modn}TypeTraits.h" ttfile_path = $gen_dir + "/" + ttfile_name ttfile_path && File.open(ttfile_path, "w") do |ttfile| @@ -2920,8 +2938,8 @@ END ttfile.puts("* This file has been created automatically") ttfile.puts("*/") ttfile.puts("") - ttfile.puts("#ifndef _HDR_gsiDeclQtTypeTraits") - ttfile.puts("#define _HDR_gsiDeclQtTypeTraits") + ttfile.puts("#ifndef _HDR_gsiDecl#{modn}TypeTraits") + ttfile.puts("#define _HDR_gsiDecl#{modn}TypeTraits") ttfile.puts("") ttfile.puts("#include \"gsiTypes.h\"") ttfile.puts("") @@ -2932,7 +2950,7 @@ END if decl_obj.is_a?(CPPStructDeclaration) - produce_ttfile_traits(ttfile, conf, decl_obj) + decl_obj.myself && produce_ttfile_traits(ttfile, conf, decl_obj) elsif decl_obj.is_a?(CPPNamespace) @@ -3004,7 +3022,7 @@ END extfile.puts("") extfile.puts("#include \"gsiClassBase.h\"") - extfile.puts("#include \"gsiQtCommon.h\"") + extfile.puts("#include \"gsi#{modn}Common.h\"") extfile.puts("") @ext_decls.each do |ed| @@ -3023,7 +3041,7 @@ END def produce_makefile - makefile_name = "qtdecl.pri" + makefile_name = modn + ".pri" makefile_path = $gen_dir + "/" + makefile_name File.open(makefile_path, "w") do |makefile| @@ -3047,6 +3065,16 @@ END end + def produce_class_list + + File.open("class_list.txt", "w") do |list| + (@classes || []).each do |c| + list.puts(c) + end + end + + end + end # --------------------------------------------------------------------- @@ -3058,6 +3086,7 @@ File.open(conf_file, "r") do |file| end bp = BindingProducer::new +bp.modn = modn bp.read(input_file) puts("Collecting used enums ..") @@ -3074,9 +3103,12 @@ if cls_list end else bp.prod_list(conf).each do |decl_obj| - bp.produce_cpp_from_decl(conf, decl_obj) + if decl_obj.myself && !excl_list[decl_obj.myself] + bp.produce_cpp_from_decl(conf, decl_obj) + end end end +bp.produce_class_list puts("Producing type traits file ..") bp.produce_ttfile(conf) diff --git a/scripts/mkqtdecl_common/reader_ext.rb b/scripts/mkqtdecl_common/reader_ext.rb index 400a9280f..2216a025c 100644 --- a/scripts/mkqtdecl_common/reader_ext.rb +++ b/scripts/mkqtdecl_common/reader_ext.rb @@ -35,6 +35,12 @@ class CPPObject nil end + # delivers a string representation of the "weak" name or nil if the object does not have a name + # to contribute. "weak names" are such of second order - e.g. forward declarations. + def myself_weak + nil + end + # delivers a CPPQualifiedId representation of the object's location or nil if the object # does not have a location to contribute def myid @@ -155,8 +161,13 @@ module QualifiedNameResolver @id2obj = {} self.children.each do |d| d.myself && (@id2obj[d.myself] = d) - d.set_parent(self) end + self.children.each do |d| + d.myself_weak && (@id2obj[d.myself_weak] ||= d) + end + self.children.each do |d| + d.set_parent(self) + end # Add other children, for example contributed by base classes if self.respond_to?(:other_children) self.other_children.each do |d| @@ -171,6 +182,11 @@ module QualifiedNameResolver end end + # by default the objects don't have a weak identity + def myself_weak + nil + end + # returns a list of names of child objects def ids (@id2obj || {}).keys.sort @@ -390,6 +406,11 @@ class CPPStructDeclaration end + def myself_weak + # the weak identity will also include forward declarations + self.struct.id.to_s + end + def myself # forward declarations (struct.body_decl == nil and no base classes) don't produce a name and # will therefore not contribute diff --git a/src/ant/ant/gsiDeclAnt.cc b/src/ant/ant/gsiDeclAnt.cc index 65298eceb..62767d378 100644 --- a/src/ant/ant/gsiDeclAnt.cc +++ b/src/ant/ant/gsiDeclAnt.cc @@ -421,9 +421,9 @@ static void register_annotation_template (const ant::Object &a, const std::strin } // NOTE: ant::Object is available as "BasicAnnotation" to allow binding for other methods. -gsi::Class decl_BasicAnnotation ("BasicAnnotation", gsi::Methods (), "@hide\n@alias Annotation"); +gsi::Class decl_BasicAnnotation ("lay", "BasicAnnotation", gsi::Methods (), "@hide\n@alias Annotation"); -gsi::Class decl_Annotation (decl_BasicAnnotation, "Annotation", +gsi::Class decl_Annotation (decl_BasicAnnotation, "lay", "Annotation", gsi::method ("register_template", &gsi::register_annotation_template, gsi::arg ("annotation"), gsi::arg ("title"), gsi::arg ("mode", ruler_mode_normal (), "\\RulerModeNormal"), "@brief Registers the given annotation as a template\n" diff --git a/src/edt/edt/gsiDeclEdt.cc b/src/edt/edt/gsiDeclEdt.cc index 767826540..75d558ba8 100644 --- a/src/edt/edt/gsiDeclEdt.cc +++ b/src/edt/edt/gsiDeclEdt.cc @@ -94,7 +94,7 @@ static db::DCplxTrans dtrans (const lay::ObjectInstPath *p) } } -gsi::Class decl_ObjectInstPath ("ObjectInstPath", +gsi::Class decl_ObjectInstPath ("lay", "ObjectInstPath", gsi::method ("<", &lay::ObjectInstPath::operator<, "@brief Provides an order criterion for two ObjectInstPath objects\n" "@args b\n" diff --git a/src/ext/ext/extLEFDEFPlugin.cc b/src/ext/ext/extLEFDEFPlugin.cc index 395ef2d91..027b1541a 100644 --- a/src/ext/ext/extLEFDEFPlugin.cc +++ b/src/ext/ext/extLEFDEFPlugin.cc @@ -351,7 +351,7 @@ static void set_net_property_name (LEFDEFReaderOptions *config, const tl::Varian } static -gsi::Class decl_lefdef_config ("LEFDEFReaderConfiguration", +gsi::Class decl_lefdef_config ("lay", "LEFDEFReaderConfiguration", gsi::method ("layer_map", (db::LayerMap &(LEFDEFReaderOptions::*) ()) &LEFDEFReaderOptions::layer_map, "@brief Gets the layer map to be used for the LEF/DEF reader\n" "@return A reference to the layer map\n" diff --git a/src/ext/ext/extNetTracerPlugin.cc b/src/ext/ext/extNetTracerPlugin.cc index 1494f55d4..cdea7088f 100644 --- a/src/ext/ext/extNetTracerPlugin.cc +++ b/src/ext/ext/extNetTracerPlugin.cc @@ -169,7 +169,7 @@ static void def_symbol (ext::NetTracerTechnologyComponent *tech, const std::stri gsi::Class &decl_layTechnologyComponent (); -gsi::Class decl_NetTracerTechnology (decl_layTechnologyComponent (), "NetTracerTechnology", +gsi::Class decl_NetTracerTechnology (decl_layTechnologyComponent (), "lay", "NetTracerTechnology", gsi::method_ext ("connection", &def_connection2, gsi::arg("a"), gsi::arg("b"), "@brief Defines a connection between two materials\n" "See the class description for details about this method." @@ -259,7 +259,7 @@ static void trace2_tn (ext::NetTracer *net_tracer, const std::string &tech, cons net_tracer->trace (layout, cell, start_point, start_layer, stop_point, stop_layer, tracer_data); } -gsi::Class decl_NetElement ("NetElement", +gsi::Class decl_NetElement ("lay", "NetElement", gsi::method ("trans", &ext::NetTracerShape::trans, "@brief Gets the transformation to apply for rendering the shape in the original top cell\n" "See the class description for more details about this attribute." @@ -304,7 +304,7 @@ gsi::Class decl_NetElement ("NetElement", "This class has been introduced in version 0.25.\n" ); -gsi::Class decl_NetTracer ("NetTracer", +gsi::Class decl_NetTracer ("lay", "NetTracer", gsi::method_ext ("trace", &trace1, gsi::arg ("tech"), gsi::arg ("layout"), gsi::arg ("cell"), gsi::arg ("start_point"), gsi::arg ("start_layer"), "@brief Runs a net extraction\n" "\n" diff --git a/src/gsi/gsi/gsiClass.cc b/src/gsi/gsi/gsiClass.cc index 804352c39..6c5821f4d 100644 --- a/src/gsi/gsi/gsiClass.cc +++ b/src/gsi/gsi/gsiClass.cc @@ -35,7 +35,7 @@ namespace gsi // The dummy class is just provided to avoid some assertions. struct EmptyClass { }; -static gsi::Class default_cls ("EmptyClass", gsi::Methods ()); +static gsi::Class default_cls ("tl", "EmptyClass", gsi::Methods ()); const ClassBase *fallback_cls_decl (const std::type_info &ti) { diff --git a/src/gsi/gsi/gsiClass.h b/src/gsi/gsi/gsiClass.h index dd54ec586..d3c29b79d 100644 --- a/src/gsi/gsi/gsiClass.h +++ b/src/gsi/gsi/gsiClass.h @@ -578,9 +578,10 @@ public: * This feature is not quite useful usually and is reserved for special use cases * such as including enums into a declaration namespace. */ - ClassExt (const ClassBase &import, const std::string &name, const std::string &doc = std::string ()) + ClassExt (const ClassBase &import, const std::string &module, const std::string &name, const std::string &doc = std::string ()) : ClassBase (doc, Methods ()), mp_declaration (&import) { + set_module (module); set_name (name); } @@ -716,30 +717,34 @@ public: typedef typename tl::type_traits::has_default_constructor has_default_ctor; typedef typename tl::type_traits::has_public_destructor has_public_dtor; - Class (const std::string &name, const Methods &mm, const std::string &doc = std::string (), bool do_register = true) + Class (const std::string &module, const std::string &name, const Methods &mm, const std::string &doc = std::string (), bool do_register = true) : ClassBase (doc, mm, do_register) { + set_module (module); set_name (name); } template - Class (const Class &base, const std::string &name, const Methods &mm, const std::string &doc = std::string (), bool do_register = true) + Class (const Class &base, const std::string &module, const std::string &name, const Methods &mm, const std::string &doc = std::string (), bool do_register = true) : ClassBase (doc, mm, do_register), m_subclass_tester (new SubClassTester::value> ()) { + set_module (module); set_name (name); set_base (&base); } - Class (const std::string &name, const std::string &doc = std::string (), bool do_register = true) + Class (const std::string &module, const std::string &name, const std::string &doc = std::string (), bool do_register = true) : ClassBase (doc, Methods (), do_register) { + set_module (module); set_name (name); } template - Class (const Class &base, const std::string &name, const std::string &doc = std::string (), bool do_register = true) + Class (const Class &base, const std::string &module, const std::string &name, const std::string &doc = std::string (), bool do_register = true) : ClassBase (doc, Methods (), do_register), m_subclass_tester (new SubClassTester::value> ()) { + set_module (module); set_name (name); set_base (&base); } @@ -909,14 +914,14 @@ class SubClass : public Class { public: - SubClass (const std::string &name, const Methods &mm, const std::string &doc = std::string ()) - : Class (name, mm, doc) + SubClass (const std::string &module, const std::string &name, const Methods &mm, const std::string &doc = std::string ()) + : Class (module, name, mm, doc) { // .. nothing yet .. } - SubClass (const std::string &name, const std::string &doc = std::string ()) - : Class (name, doc) + SubClass (const std::string &module, const std::string &name, const std::string &doc = std::string ()) + : Class (module, name, doc) { // .. nothing yet .. } @@ -941,14 +946,14 @@ class GSI_PUBLIC_TEMPLATE ChildClass : public Class { public: - ChildClass (const std::string &name, const Methods &mm, const std::string &doc = std::string ()) - : Class (name, mm, doc) + ChildClass (const std::string &module, const std::string &name, const Methods &mm, const std::string &doc = std::string ()) + : Class (module, name, mm, doc) { // .. nothing yet .. } - ChildClass (const std::string &name, const std::string &doc = std::string ()) - : Class (name, doc) + ChildClass (const std::string &module, const std::string &name, const std::string &doc = std::string ()) + : Class (module, name, doc) { // .. nothing yet .. } @@ -974,14 +979,14 @@ class GSI_PUBLIC_TEMPLATE ChildSubClass : public SubClass { public: - ChildSubClass (const std::string &name, const Methods &mm, const std::string &doc = std::string ()) - : SubClass (name, mm, doc) + ChildSubClass (const std::string &module, const std::string &name, const Methods &mm, const std::string &doc = std::string ()) + : SubClass (module, name, mm, doc) { // .. nothing yet .. } - ChildSubClass (const std::string &name, const std::string &doc = std::string ()) - : SubClass (name, doc) + ChildSubClass (const std::string &module, const std::string &name, const std::string &doc = std::string ()) + : SubClass (module, name, doc) { // .. nothing yet .. } diff --git a/src/gsi/gsi/gsiClassBase.h b/src/gsi/gsi/gsiClassBase.h index d33b648ea..7cd80dbf9 100644 --- a/src/gsi/gsi/gsiClassBase.h +++ b/src/gsi/gsi/gsiClassBase.h @@ -144,6 +144,14 @@ public: return m_name; } + /** + * @brief Gets the module name + */ + const std::string &module () const + { + return m_module; + } + /** * @brief Gets the documentation string */ @@ -559,6 +567,11 @@ protected: m_name = n; } + void set_module (const std::string &m) + { + m_module = m; + } + void set_parent (const ClassBase *parent); void set_base (const ClassBase *base); @@ -568,6 +581,7 @@ private: Methods m_methods; std::vector m_callbacks, m_constructors; std::string m_name; + std::string m_module; tl::weak_collection m_child_classes, m_subclasses; mutable std::auto_ptr mp_data[ClientIndex::MaxClientIndex]; diff --git a/src/gsi/gsi/gsiCommon.h b/src/gsi/gsi/gsiCommon.h index cc54c4ff6..caf7eb4d1 100644 --- a/src/gsi/gsi/gsiCommon.h +++ b/src/gsi/gsi/gsiCommon.h @@ -20,32 +20,22 @@ */ +#include "tlDefs.h" #if !defined(HDR_gsiCommon_h) # define HDR_gsiCommon_h -# if defined _WIN32 || defined __CYGWIN__ - -# ifdef MAKE_GSI_LIBRARY -# define GSI_PUBLIC __declspec(dllexport) -# else -# define GSI_PUBLIC __declspec(dllimport) -# endif -# define GSI_LOCAL -# define GSI_PUBLIC_TEMPLATE - +// NOTE: this is required because we have some forward declarations to +// gsi::Class and gsi::ClassBase in tlVariant.h. +// TODO: there should not be any dependency of tl on gsi. +# ifdef MAKE_GSI_LIBRARY +# define GSI_PUBLIC DEF_INSIDE_PUBLIC +# define GSI_PUBLIC_TEMPLATE DEF_INSIDE_PUBLIC_TEMPLATE +# define GSI_LOCAL DEF_INSIDE_LOCAL # else - -# if __GNUC__ >= 4 || defined(__clang__) -# define GSI_PUBLIC __attribute__ ((visibility ("default"))) -# define GSI_PUBLIC_TEMPLATE __attribute__ ((visibility ("default"))) -# define GSI_LOCAL __attribute__ ((visibility ("hidden"))) -# else -# define GSI_PUBLIC -# define GSI_PUBLIC_TEMPLATE -# define GSI_LOCAL -# endif - +# define GSI_PUBLIC DEF_OUTSIDE_PUBLIC +# define GSI_PUBLIC_TEMPLATE DEF_OUTSIDE_PUBLIC_TEMPLATE +# define GSI_LOCAL DEF_OUTSIDE_LOCAL # endif #endif diff --git a/src/gsi/gsi/gsiDeclBasic.cc b/src/gsi/gsi/gsiDeclBasic.cc index 79df6639d..f434b2eb2 100644 --- a/src/gsi/gsi/gsiDeclBasic.cc +++ b/src/gsi/gsi/gsiDeclBasic.cc @@ -41,7 +41,7 @@ static gsi::Value *new_vv0 () return new gsi::Value (); } -Class decl_Value ("Value", +Class decl_Value ("tl", "Value", gsi::constructor ("new", &new_vv0, "@brief Constructs a nil object.\n" ) + diff --git a/src/gsi/gsi/gsiDeclInternal.cc b/src/gsi/gsi/gsiDeclInternal.cc index 6d3ad78aa..f8cf62092 100644 --- a/src/gsi/gsi/gsiDeclInternal.cc +++ b/src/gsi/gsi/gsiDeclInternal.cc @@ -91,7 +91,7 @@ static tl::Variant default_value (const ArgType *t) return t->spec () ? t->spec ()->default_value () : empty; } -Class decl_ArgType ("ArgType", +Class decl_ArgType ("tl", "ArgType", gsi::method ("TypeVoid|#t_void", &t_void) + gsi::method ("TypeBool|#t_bool", &t_bool) + gsi::method ("TypeChar|#t_char", &t_char) + @@ -201,7 +201,7 @@ static bool _syn_is_setter (const gsi::MethodBase::MethodSynonym *syn) return syn->is_setter; } -Class decl_MethodOverload ("MethodOverload", +Class decl_MethodOverload ("tl", "MethodOverload", gsi::method_ext ("name", &_syn_name, "@brief The name of this overload\n" "This is the raw, unadorned name. I.e. no question mark suffix for predicates, no " @@ -222,7 +222,7 @@ Class decl_MethodOverload ("MethodOverload", "@hide" ); -Class decl_Method ("Method", +Class decl_Method ("tl", "Method", gsi::iterator ("each_argument", &MethodBase::begin_arguments, &MethodBase::end_arguments, "@brief Iterate over all arguments of this method\n" ) + @@ -291,7 +291,7 @@ Class decl_Method ("Method", "@hide" ); -Class decl_Class ("Class", +Class decl_Class ("tl", "Class", gsi::iterator ("each_class", &ClassBase::begin_classes, &ClassBase::end_classes, "@brief Iterate over all classes\n" ) + diff --git a/src/gsi/gsi/gsiDeclTl.cc b/src/gsi/gsi/gsiDeclTl.cc index ff6726817..be1014d2b 100644 --- a/src/gsi/gsi/gsiDeclTl.cc +++ b/src/gsi/gsi/gsiDeclTl.cc @@ -87,7 +87,7 @@ namespace tl { namespace gsi { -Class decl_Logger ("Logger", +Class decl_Logger ("tl", "Logger", gsi::method ("info", &Logger::info, "@brief Writes the given string to the info channel\n" "@args msg\n" @@ -155,7 +155,7 @@ static std::string timer_to_s (const tl::Timer *timer) return tl::sprintf ("%.12gs (user), %.12gs (kernel)", timer->sec_user (), timer->sec_sys ()); } -Class decl_Timer ("Timer", +Class decl_Timer ("tl", "Timer", gsi::method ("user", &tl::Timer::sec_user, "@brief Returns the elapsed CPU time in user mode from start to stop in seconds\n" ) + @@ -217,7 +217,7 @@ namespace tl { namespace gsi { -Class decl_Progress ("Progress", +Class decl_Progress ("tl", "Progress", gsi::method ("desc=", &tl::Progress::set_desc, "@brief Sets the description text of the progress object\n" "@args desc\n" @@ -263,7 +263,7 @@ static void rel_progress_set_2 (tl::RelativeProgress *progress, size_t value, bo progress->set (value, force_yield); } -Class decl_RelativeProgress (decl_Progress, "RelativeProgress", +Class decl_RelativeProgress (decl_Progress, "tl", "RelativeProgress", gsi::constructor ("new", &rel_progress_2, "@brief Creates a relative progress reporter with the given description and maximum value\n" "@args desc, max_value\n" @@ -345,7 +345,7 @@ static void abs_progress_set_2 (tl::AbsoluteProgress *progress, size_t value, bo progress->set (value, force_yield); } -Class decl_AbsoluteProgress (decl_Progress, "AbsoluteProgress", +Class decl_AbsoluteProgress (decl_Progress, "tl", "AbsoluteProgress", gsi::constructor ("new", &abs_progress_1, "@brief Creates an absolute progress reporter with the given description\n" "@args desc, max_value\n" @@ -518,7 +518,7 @@ namespace tl { namespace gsi { -Class decl_ExpressionWrapper ("Expression", +Class decl_ExpressionWrapper ("tl", "Expression", gsi::constructor ("new", &new_expr1, gsi::arg ("expr"), "@brief Creates an expression evaluator\n" ) + diff --git a/src/gsi/gsi/gsiEnums.h b/src/gsi/gsi/gsiEnums.h index 5b8be3982..f0050c5d5 100644 --- a/src/gsi/gsi/gsiEnums.h +++ b/src/gsi/gsi/gsiEnums.h @@ -295,8 +295,8 @@ class Enum : public Class, E> { public: - Enum (const std::string &name, const EnumSpecs &specs, const std::string &doc = std::string ()) - : Class, E> (name, specs.methods (), doc), m_specs (specs) + Enum (const std::string &module, const std::string &name, const EnumSpecs &specs, const std::string &doc = std::string ()) + : Class, E> (module, name, specs.methods (), doc), m_specs (specs) { } @@ -389,8 +389,8 @@ public: typedef int int_repr; #endif - QFlagsClass (const std::string &name, const std::string &doc = std::string ()) - : Class, QFlags > (name, methods (), doc), + QFlagsClass (const std::string &module, const std::string &name, const std::string &doc = std::string ()) + : Class, QFlags > (module, name, methods (), doc), m_enum_ext (ext_methods ()) { } diff --git a/src/gsi/unit_tests/gsiTest.cc b/src/gsi/unit_tests/gsiTest.cc index fe18700c8..644c73be6 100644 --- a/src/gsi/unit_tests/gsiTest.cc +++ b/src/gsi/unit_tests/gsiTest.cc @@ -757,7 +757,7 @@ static gsi::Enum decl_enum ("Enum", static gsi::QFlagsClass decl_qflags_enum ("Enums"); -static gsi::Class decl_a ("A", +static gsi::Class decl_a ("", A", gsi::constructor ("new_a|new", &a_ctor) + gsi::method ("br", &A::br) + gsi::method ("get_e", &A::get_e) + @@ -859,9 +859,9 @@ static gsi::Class decl_a ("A", gsi::iterator ("a8", &A::a8b, &A::a8e) ); -static gsi::Class decl_a_nc (decl_a, "A_NC"); +static gsi::Class decl_a_nc (decl_a, "", "A_NC"); -static gsi::Class decl_b ("B", +static gsi::Class decl_b ("", "B", gsi::method ("inst", &B::inst) + gsi::method ("has_inst", &B::has_inst) + gsi::method ("set_inst", &B::set_inst) + @@ -1028,7 +1028,7 @@ static gsi::ClassExt b_ext ( ); -static gsi::Class decl_c ("C", +static gsi::Class decl_c ("", "C", gsi::callback ("f", &C_P::f, &C_P::f_cb) + gsi::method ("g", &C_P::g) + gsi::method ("s1", &C::s1) + @@ -1040,7 +1040,7 @@ static gsi::Class decl_c ("C", tl::event &ev1_ext (E *e) { return e->ev1; } -static gsi::Class decl_e ("E", +static gsi::Class decl_e ("", "E", gsi::event ("e0", &E::ev0) + gsi::event_ext ("e1", &ev1_ext) + gsi::event ("e2", &E::ev2) + @@ -1062,7 +1062,7 @@ static gsi::Class decl_e ("E", gsi::method ("reset_inst", &E::reset_inst) ); -static gsi::Class decl_f ("F", +static gsi::Class decl_f ("", "F", gsi::method ("ic", &F::ic) + gsi::method ("inc", &F::inc) + gsi::method ("icref", &F::icref) + @@ -1071,7 +1071,7 @@ static gsi::Class decl_f ("F", gsi::method ("x", &F::get_x) ); -static gsi::Class decl_g ("G", +static gsi::Class decl_g ("", "G", gsi::method ("iv", &G::iv) + gsi::method ("sv", &G::sv) + gsi::method ("set_iva", &G::set_iv, gsi::arg ()) + @@ -1085,7 +1085,7 @@ static gsi::Class decl_g ("G", gsi::method ("set_vvc", &G::set_vv, gsi::arg ("", 1), gsi::arg ("", "value")) ); -static gsi::Class decl_x ("X", +static gsi::Class decl_x ("", "X", gsi::constructor ("new", &make_x) + gsi::method ("instances", &X::instances) + gsi::method ("x1", &X::x1) + @@ -1102,7 +1102,7 @@ static gsi::Class decl_x ("X", gsi::method ("s=", &X::set_si) ); -static gsi::Class decl_y (decl_x, "Y", +static gsi::Class decl_y (decl_x, "", "Y", gsi::constructor ("new", &make_y) + gsi::method ("x1", &Y::x1) + gsi::method ("y1", &Y::y1) + @@ -1121,19 +1121,19 @@ static gsi::Class decl_y (decl_x, "Y", gsi::method ("vx_dyn", &Y::vx_dyn) ); -static gsi::SubClass decl_y2 ("Y2", +static gsi::SubClass decl_y2 ("", "Y2", gsi::method ("x1", &Y2::x1) ); -static gsi::ChildSubClass decl_y3 ("Y3", +static gsi::ChildSubClass decl_y3 ("", "Y3", gsi::method ("x1", &Y3::x1) ); -static gsi::ChildClass decl_y4 ("Y4", +static gsi::ChildClass decl_y4 ("", "Y4", gsi::method ("x1", &Y4::x1) ); -gsi::Class decl_z ("Z", +gsi::Class decl_z ("", "Z", gsi::method ("f", &Z_P::f_org) + gsi::callback ("f", &Z_P::f, &Z_P::f_cb) + gsi::method ("f_with_x", &Z_P::f_with_x) + @@ -1144,7 +1144,7 @@ gsi::Class decl_z ("Z", gsi::method ("set_x_keep", &Z_P::set_x_keep) ); -gsi::Class decl_sq ("SQ", +gsi::Class decl_sq ("", "SQ", gsi::method ("trigger_s0", &SQ::trigger_s0) + gsi::method ("trigger_s1", &SQ::trigger_s1) + gsi::method ("trigger_s2", &SQ::trigger_s2) + @@ -1155,7 +1155,7 @@ gsi::Class decl_sq ("SQ", gsi::qt_signal ("s2(const QString &, SQ *)", "s2") ); -gsi::Class decl_se ("SE", +gsi::Class decl_se ("", "SE", gsi::method ("trigger_s0", &SE::trigger_s0) + gsi::method ("trigger_s1", &SE::trigger_s1) + gsi::method ("trigger_s2", &SE::trigger_s2) + @@ -1222,12 +1222,12 @@ int g_virtual (GObject *go) return go->g (); } -static gsi::Class decl_gobject_base ("GObjectBase", +static gsi::Class decl_gobject_base ("", "GObjectBase", gsi::method_ext ("g_virtual", &g_virtual) + gsi::Methods() ); -static gsi::Class decl_gobject (decl_gobject_base, "GObject", +static gsi::Class decl_gobject (decl_gobject_base, "", "GObject", gsi::method_ext ("g_org", &g_org) + gsi::callback ("g", &GObject_P::g, &GObject_P::g_cb) + gsi::method ("g_inst_count", &GObject::g_inst_count) @@ -1238,11 +1238,11 @@ GObject *f_org (GFactory_P *fo, int z) return fo->GFactory::f (z); } -static gsi::Class decl_gfactory_base ("GFactoryBase", +static gsi::Class decl_gfactory_base ("", "GFactoryBase", gsi::factory ("create_f", &GFactory::create_f) ); -static gsi::Class decl_gfactory (decl_gfactory_base, "GFactory", +static gsi::Class decl_gfactory (decl_gfactory_base, "", "GFactory", gsi::method_ext ("f", &f_org) + gsi::factory_callback ("f", &GFactory_P::f, &GFactory_P::f_cb) ); diff --git a/src/gsiqt/gsiqt.pro b/src/gsiqt/gsiqt.pro index fa60a1dfe..a252b470f 100644 --- a/src/gsiqt/gsiqt.pro +++ b/src/gsiqt/gsiqt.pro @@ -1,35 +1,12 @@ -DESTDIR = $$OUT_PWD/.. -TARGET = klayout_gsiqt - -include($$PWD/../lib.pri) - -DEFINES += MAKE_GSIQT_LIBRARY - -# NOTE: db is required since some bridges to db are provided (i.e db::Polygon) -INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$GSIQT_INC -DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$GSIQT_INC - -LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db - -SOURCES += \ - gsiQt.cc \ - gsiDeclQtBasic.cc \ - gsiDeclQt5Basic.cc \ - gsiQtHelper.cc - -HEADERS += \ - gsiQt.h \ - gsiQtCommon.h \ - gsiQtHelper.h +TEMPLATE = subdirs +SUBDIRS = qtbasic equals(HAVE_QT5, "1") { - include($$PWD/../gsiqt5/qtdecl.pri) + SUBDIRS += qt5 + qt5.depends += qtbasic } else { - include($$PWD/../gsiqt4/qtdecl.pri) + SUBDIRS += qt4 + qt4.depends += qtbasic } -gsiqt.depends += gsi -laybasic.depends += gsiqt -lay.depends += gsiqt - diff --git a/src/gsiqt/qt4/QtCore/QtCore.pri b/src/gsiqt/qt4/QtCore/QtCore.pri new file mode 100644 index 000000000..814de99d7 --- /dev/null +++ b/src/gsiqt/qt4/QtCore/QtCore.pri @@ -0,0 +1,86 @@ +# +# Partial QMAKE project file for Qt bindings +# +# DO NOT EDIT THIS FILE. +# This file has been created automatically +# + +SOURCES += \ + $$PWD/gsiDeclQAbstractItemModel.cc \ + $$PWD/gsiDeclQAbstractListModel.cc \ + $$PWD/gsiDeclQAbstractTableModel.cc \ + $$PWD/gsiDeclQBasicTimer.cc \ + $$PWD/gsiDeclQBuffer.cc \ + $$PWD/gsiDeclQByteArrayMatcher.cc \ + $$PWD/gsiDeclQChildEvent.cc \ + $$PWD/gsiDeclQCoreApplication.cc \ + $$PWD/gsiDeclQCryptographicHash.cc \ + $$PWD/gsiDeclQDataStream.cc \ + $$PWD/gsiDeclQDate.cc \ + $$PWD/gsiDeclQDateTime.cc \ + $$PWD/gsiDeclQDir.cc \ + $$PWD/gsiDeclQDynamicPropertyChangeEvent.cc \ + $$PWD/gsiDeclQEasingCurve.cc \ + $$PWD/gsiDeclQEvent.cc \ + $$PWD/gsiDeclQEventLoop.cc \ + $$PWD/gsiDeclQFactoryInterface.cc \ + $$PWD/gsiDeclQFile.cc \ + $$PWD/gsiDeclQFileInfo.cc \ + $$PWD/gsiDeclQFileSystemWatcher.cc \ + $$PWD/gsiDeclQIODevice.cc \ + $$PWD/gsiDeclQLibrary.cc \ + $$PWD/gsiDeclQLibraryInfo.cc \ + $$PWD/gsiDeclQLine.cc \ + $$PWD/gsiDeclQLineF.cc \ + $$PWD/gsiDeclQLocale.cc \ + $$PWD/gsiDeclQMargins.cc \ + $$PWD/gsiDeclQMetaClassInfo.cc \ + $$PWD/gsiDeclQMetaEnum.cc \ + $$PWD/gsiDeclQMetaMethod.cc \ + $$PWD/gsiDeclQMetaObject.cc \ + $$PWD/gsiDeclQMetaProperty.cc \ + $$PWD/gsiDeclQMetaType.cc \ + $$PWD/gsiDeclQMimeData.cc \ + $$PWD/gsiDeclQModelIndex.cc \ + $$PWD/gsiDeclQMutex.cc \ + $$PWD/gsiDeclQObject.cc \ + $$PWD/gsiDeclQPersistentModelIndex.cc \ + $$PWD/gsiDeclQPluginLoader.cc \ + $$PWD/gsiDeclQPoint.cc \ + $$PWD/gsiDeclQPointF.cc \ + $$PWD/gsiDeclQProcess.cc \ + $$PWD/gsiDeclQProcessEnvironment.cc \ + $$PWD/gsiDeclQReadLocker.cc \ + $$PWD/gsiDeclQReadWriteLock.cc \ + $$PWD/gsiDeclQRect.cc \ + $$PWD/gsiDeclQRectF.cc \ + $$PWD/gsiDeclQRegExp.cc \ + $$PWD/gsiDeclQResource.cc \ + $$PWD/gsiDeclQSemaphore.cc \ + $$PWD/gsiDeclQSettings.cc \ + $$PWD/gsiDeclQSignalMapper.cc \ + $$PWD/gsiDeclQSize.cc \ + $$PWD/gsiDeclQSizeF.cc \ + $$PWD/gsiDeclQSocketNotifier.cc \ + $$PWD/gsiDeclQStringMatcher.cc \ + $$PWD/gsiDeclQSysInfo.cc \ + $$PWD/gsiDeclQSystemLocale.cc \ + $$PWD/gsiDeclQTemporaryFile.cc \ + $$PWD/gsiDeclQTextCodec.cc \ + $$PWD/gsiDeclQTextCodec_ConverterState.cc \ + $$PWD/gsiDeclQTextDecoder.cc \ + $$PWD/gsiDeclQTextEncoder.cc \ + $$PWD/gsiDeclQTextStream.cc \ + $$PWD/gsiDeclQThread.cc \ + $$PWD/gsiDeclQTime.cc \ + $$PWD/gsiDeclQTimeLine.cc \ + $$PWD/gsiDeclQTimer.cc \ + $$PWD/gsiDeclQTimerEvent.cc \ + $$PWD/gsiDeclQTranslator.cc \ + $$PWD/gsiDeclQUrl.cc \ + $$PWD/gsiDeclQWaitCondition.cc \ + $$PWD/gsiDeclQWriteLocker.cc \ + $$PWD/gsiDeclQt.cc \ + $$PWD/gsiDeclQt_1.cc \ + $$PWD/gsiDeclQt_2.cc \ + $$PWD/gsiDeclQt_3.cc diff --git a/src/gsiqt/qt4/QtCore/QtCore.pro b/src/gsiqt/qt4/QtCore/QtCore.pro new file mode 100644 index 000000000..f9923714e --- /dev/null +++ b/src/gsiqt/qt4/QtCore/QtCore.pro @@ -0,0 +1,21 @@ + + +DESTDIR = $$OUT_PWD/../../.. +TARGET = klayout_QtCore + +include($$PWD/../../../lib.pri) + +DEFINES += MAKE_GSI_QTCORE_LIBRARY + +# NOTE: db is required since some bridges to db are provided (i.e db::Polygon) +INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$QTBASIC_INC +DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$QTBASIC_INC + +LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic + +SOURCES += \ + +HEADERS += \ + +include(QtCore.pri) + diff --git a/src/gsiqt4/gsiDeclQAbstractItemModel.cc b/src/gsiqt/qt4/QtCore/gsiDeclQAbstractItemModel.cc similarity index 99% rename from src/gsiqt4/gsiDeclQAbstractItemModel.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQAbstractItemModel.cc index be02a8fbc..362ebdc95 100644 --- a/src/gsiqt4/gsiDeclQAbstractItemModel.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQAbstractItemModel.cc @@ -38,8 +38,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1016,11 +1016,11 @@ static gsi::Methods methods_QAbstractItemModel () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QAbstractItemModel (qtdecl_QObject (), "QAbstractItemModel_Native", +qt_gsi::QtNativeClass decl_QAbstractItemModel (qtdecl_QObject (), "QtCore", "QAbstractItemModel_Native", methods_QAbstractItemModel (), "@hide\n@alias QAbstractItemModel"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractItemModel () { return decl_QAbstractItemModel; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QAbstractItemModel () { return decl_QAbstractItemModel; } } @@ -3363,7 +3363,7 @@ static gsi::Methods methods_QAbstractItemModel_Adaptor () { return methods; } -gsi::Class decl_QAbstractItemModel_Adaptor (qtdecl_QAbstractItemModel (), "QAbstractItemModel", +gsi::Class decl_QAbstractItemModel_Adaptor (qtdecl_QAbstractItemModel (), "QtCore", "QAbstractItemModel", methods_QAbstractItemModel_Adaptor (), "@qt\n@brief Binding of QAbstractItemModel"); diff --git a/src/gsiqt4/gsiDeclQAbstractListModel.cc b/src/gsiqt/qt4/QtCore/gsiDeclQAbstractListModel.cc similarity index 99% rename from src/gsiqt4/gsiDeclQAbstractListModel.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQAbstractListModel.cc index 54b27a418..ac85b70f7 100644 --- a/src/gsiqt4/gsiDeclQAbstractListModel.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQAbstractListModel.cc @@ -38,8 +38,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -230,11 +230,11 @@ static gsi::Methods methods_QAbstractListModel () { gsi::Class &qtdecl_QAbstractItemModel (); -qt_gsi::QtNativeClass decl_QAbstractListModel (qtdecl_QAbstractItemModel (), "QAbstractListModel_Native", +qt_gsi::QtNativeClass decl_QAbstractListModel (qtdecl_QAbstractItemModel (), "QtCore", "QAbstractListModel_Native", methods_QAbstractListModel (), "@hide\n@alias QAbstractListModel"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractListModel () { return decl_QAbstractListModel; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QAbstractListModel () { return decl_QAbstractListModel; } } @@ -2449,7 +2449,7 @@ static gsi::Methods methods_QAbstractListModel_Adaptor () { return methods; } -gsi::Class decl_QAbstractListModel_Adaptor (qtdecl_QAbstractListModel (), "QAbstractListModel", +gsi::Class decl_QAbstractListModel_Adaptor (qtdecl_QAbstractListModel (), "QtCore", "QAbstractListModel", methods_QAbstractListModel_Adaptor (), "@qt\n@brief Binding of QAbstractListModel"); diff --git a/src/gsiqt4/gsiDeclQAbstractTableModel.cc b/src/gsiqt/qt4/QtCore/gsiDeclQAbstractTableModel.cc similarity index 99% rename from src/gsiqt4/gsiDeclQAbstractTableModel.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQAbstractTableModel.cc index 98f042bac..f728a19ee 100644 --- a/src/gsiqt4/gsiDeclQAbstractTableModel.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQAbstractTableModel.cc @@ -38,8 +38,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -230,11 +230,11 @@ static gsi::Methods methods_QAbstractTableModel () { gsi::Class &qtdecl_QAbstractItemModel (); -qt_gsi::QtNativeClass decl_QAbstractTableModel (qtdecl_QAbstractItemModel (), "QAbstractTableModel_Native", +qt_gsi::QtNativeClass decl_QAbstractTableModel (qtdecl_QAbstractItemModel (), "QtCore", "QAbstractTableModel_Native", methods_QAbstractTableModel (), "@hide\n@alias QAbstractTableModel"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractTableModel () { return decl_QAbstractTableModel; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QAbstractTableModel () { return decl_QAbstractTableModel; } } @@ -2491,7 +2491,7 @@ static gsi::Methods methods_QAbstractTableModel_Adaptor () { return methods; } -gsi::Class decl_QAbstractTableModel_Adaptor (qtdecl_QAbstractTableModel (), "QAbstractTableModel", +gsi::Class decl_QAbstractTableModel_Adaptor (qtdecl_QAbstractTableModel (), "QtCore", "QAbstractTableModel", methods_QAbstractTableModel_Adaptor (), "@qt\n@brief Binding of QAbstractTableModel"); diff --git a/src/gsiqt4/gsiDeclQBasicTimer.cc b/src/gsiqt/qt4/QtCore/gsiDeclQBasicTimer.cc similarity index 94% rename from src/gsiqt4/gsiDeclQBasicTimer.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQBasicTimer.cc index 226a4ea76..127f5a9ec 100644 --- a/src/gsiqt4/gsiDeclQBasicTimer.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQBasicTimer.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -135,12 +135,12 @@ static gsi::Methods methods_QBasicTimer () { return methods; } -gsi::Class decl_QBasicTimer ("QBasicTimer", +gsi::Class decl_QBasicTimer ("QtCore", "QBasicTimer", methods_QBasicTimer (), "@qt\n@brief Binding of QBasicTimer"); -GSIQT_PUBLIC gsi::Class &qtdecl_QBasicTimer () { return decl_QBasicTimer; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QBasicTimer () { return decl_QBasicTimer; } } diff --git a/src/gsiqt4/gsiDeclQBuffer.cc b/src/gsiqt/qt4/QtCore/gsiDeclQBuffer.cc similarity index 98% rename from src/gsiqt4/gsiDeclQBuffer.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQBuffer.cc index 3f3c0d5de..c2f2805fd 100644 --- a/src/gsiqt4/gsiDeclQBuffer.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQBuffer.cc @@ -34,8 +34,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -447,12 +447,12 @@ static gsi::Methods methods_QBuffer () { gsi::Class &qtdecl_QIODevice (); -qt_gsi::QtNativeClass decl_QBuffer (qtdecl_QIODevice (), "QBuffer", +qt_gsi::QtNativeClass decl_QBuffer (qtdecl_QIODevice (), "QtCore", "QBuffer", methods_QBuffer (), "@qt\n@brief Binding of QBuffer"); -GSIQT_PUBLIC gsi::Class &qtdecl_QBuffer () { return decl_QBuffer; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QBuffer () { return decl_QBuffer; } } diff --git a/src/gsiqt4/gsiDeclQByteArrayMatcher.cc b/src/gsiqt/qt4/QtCore/gsiDeclQByteArrayMatcher.cc similarity index 96% rename from src/gsiqt4/gsiDeclQByteArrayMatcher.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQByteArrayMatcher.cc index 4d1587683..ccc6bb207 100644 --- a/src/gsiqt4/gsiDeclQByteArrayMatcher.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQByteArrayMatcher.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -207,12 +207,12 @@ static gsi::Methods methods_QByteArrayMatcher () { return methods; } -gsi::Class decl_QByteArrayMatcher ("QByteArrayMatcher", +gsi::Class decl_QByteArrayMatcher ("QtCore", "QByteArrayMatcher", methods_QByteArrayMatcher (), "@qt\n@brief Binding of QByteArrayMatcher"); -GSIQT_PUBLIC gsi::Class &qtdecl_QByteArrayMatcher () { return decl_QByteArrayMatcher; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QByteArrayMatcher () { return decl_QByteArrayMatcher; } } diff --git a/src/gsiqt4/gsiDeclQChildEvent.cc b/src/gsiqt/qt4/QtCore/gsiDeclQChildEvent.cc similarity index 94% rename from src/gsiqt4/gsiDeclQChildEvent.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQChildEvent.cc index 8832f490f..9c0972648 100644 --- a/src/gsiqt4/gsiDeclQChildEvent.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQChildEvent.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -51,7 +51,7 @@ { public: RawQObjectClass () - : gsi::Class (gsi::qtdecl_QObject (), "QObject_Raw", gsi::Methods (), "@hide") + : gsi::Class (gsi::qtdecl_QObject (), "Qt", "QObject_Raw", gsi::Methods (), "@hide") { } @@ -138,7 +138,7 @@ static gsi::Methods methods_QChildEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QChildEvent (qtdecl_QEvent (), "QChildEvent_Native", +gsi::Class decl_QChildEvent (qtdecl_QEvent (), "QtCore", "QChildEvent_Native", gsi::Methods(new qt_gsi::GenericMethod ("child", "@brief Method QObject *QChildEvent::child()\n" "NOTE: the object returned by this method is not memory managed. It may be destroyed internally without notice. \n" @@ -150,7 +150,7 @@ gsi::Class decl_QChildEvent (qtdecl_QEvent (), "QChildEvent_Native" methods_QChildEvent (), "@hide\n@alias QChildEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QChildEvent () { return decl_QChildEvent; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QChildEvent () { return decl_QChildEvent; } } @@ -204,7 +204,7 @@ static gsi::Methods methods_QChildEvent_Adaptor () { return methods; } -gsi::Class decl_QChildEvent_Adaptor (qtdecl_QChildEvent (), "QChildEvent", +gsi::Class decl_QChildEvent_Adaptor (qtdecl_QChildEvent (), "QtCore", "QChildEvent", methods_QChildEvent_Adaptor (), "@qt\n@brief Binding of QChildEvent"); diff --git a/src/gsiqt4/gsiDeclQCoreApplication.cc b/src/gsiqt/qt4/QtCore/gsiDeclQCoreApplication.cc similarity index 99% rename from src/gsiqt4/gsiDeclQCoreApplication.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQCoreApplication.cc index b4f793c01..b2ade12fd 100644 --- a/src/gsiqt4/gsiDeclQCoreApplication.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQCoreApplication.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -993,11 +993,11 @@ static gsi::Methods methods_QCoreApplication () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QCoreApplication (qtdecl_QObject (), "QCoreApplication_Native", +qt_gsi::QtNativeClass decl_QCoreApplication (qtdecl_QObject (), "QtCore", "QCoreApplication_Native", methods_QCoreApplication (), "@hide\n@alias QCoreApplication"); -GSIQT_PUBLIC gsi::Class &qtdecl_QCoreApplication () { return decl_QCoreApplication; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QCoreApplication () { return decl_QCoreApplication; } } @@ -1434,7 +1434,7 @@ static gsi::Methods methods_QCoreApplication_Adaptor () { return methods; } -gsi::Class decl_QCoreApplication_Adaptor (qtdecl_QCoreApplication (), "QCoreApplication", +gsi::Class decl_QCoreApplication_Adaptor (qtdecl_QCoreApplication (), "QtCore", "QCoreApplication", methods_QCoreApplication_Adaptor (), "@qt\n@brief Binding of QCoreApplication"); @@ -1445,19 +1445,19 @@ gsi::Class decl_QCoreApplication_Adaptor (qtdecl_QCore namespace qt_gsi { -static gsi::Enum decl_QCoreApplication_Encoding_Enum ("QCoreApplication_Encoding", +static gsi::Enum decl_QCoreApplication_Encoding_Enum ("QtCore", "QCoreApplication_Encoding", gsi::enum_const ("CodecForTr", QCoreApplication::CodecForTr, "@brief Enum constant QCoreApplication::CodecForTr") + gsi::enum_const ("UnicodeUTF8", QCoreApplication::UnicodeUTF8, "@brief Enum constant QCoreApplication::UnicodeUTF8") + gsi::enum_const ("DefaultCodec", QCoreApplication::DefaultCodec, "@brief Enum constant QCoreApplication::DefaultCodec"), "@qt\n@brief This class represents the QCoreApplication::Encoding enum"); -static gsi::QFlagsClass decl_QCoreApplication_Encoding_Enums ("QCoreApplication_QFlags_Encoding", +static gsi::QFlagsClass decl_QCoreApplication_Encoding_Enums ("QtCore", "QCoreApplication_QFlags_Encoding", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QCoreApplication_Encoding_Enum_in_parent (decl_QCoreApplication_Encoding_Enum.defs ()); -static gsi::ClassExt decl_QCoreApplication_Encoding_Enum_as_child (decl_QCoreApplication_Encoding_Enum, "Encoding"); -static gsi::ClassExt decl_QCoreApplication_Encoding_Enums_as_child (decl_QCoreApplication_Encoding_Enums, "QFlags_Encoding"); +static gsi::ClassExt decl_QCoreApplication_Encoding_Enum_as_child (decl_QCoreApplication_Encoding_Enum, "QtCore", "Encoding"); +static gsi::ClassExt decl_QCoreApplication_Encoding_Enums_as_child (decl_QCoreApplication_Encoding_Enums, "QtCore", "QFlags_Encoding"); } diff --git a/src/gsiqt4/gsiDeclQCryptographicHash.cc b/src/gsiqt/qt4/QtCore/gsiDeclQCryptographicHash.cc similarity index 94% rename from src/gsiqt4/gsiDeclQCryptographicHash.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQCryptographicHash.cc index 7d544d2d8..450aeb73a 100644 --- a/src/gsiqt4/gsiDeclQCryptographicHash.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQCryptographicHash.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -166,12 +166,12 @@ static gsi::Methods methods_QCryptographicHash () { return methods; } -gsi::Class decl_QCryptographicHash ("QCryptographicHash", +gsi::Class decl_QCryptographicHash ("QtCore", "QCryptographicHash", methods_QCryptographicHash (), "@qt\n@brief Binding of QCryptographicHash"); -GSIQT_PUBLIC gsi::Class &qtdecl_QCryptographicHash () { return decl_QCryptographicHash; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QCryptographicHash () { return decl_QCryptographicHash; } } @@ -180,19 +180,19 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QCryptographicHash () { retu namespace qt_gsi { -static gsi::Enum decl_QCryptographicHash_Algorithm_Enum ("QCryptographicHash_Algorithm", +static gsi::Enum decl_QCryptographicHash_Algorithm_Enum ("QtCore", "QCryptographicHash_Algorithm", gsi::enum_const ("Md4", QCryptographicHash::Md4, "@brief Enum constant QCryptographicHash::Md4") + gsi::enum_const ("Md5", QCryptographicHash::Md5, "@brief Enum constant QCryptographicHash::Md5") + gsi::enum_const ("Sha1", QCryptographicHash::Sha1, "@brief Enum constant QCryptographicHash::Sha1"), "@qt\n@brief This class represents the QCryptographicHash::Algorithm enum"); -static gsi::QFlagsClass decl_QCryptographicHash_Algorithm_Enums ("QCryptographicHash_QFlags_Algorithm", +static gsi::QFlagsClass decl_QCryptographicHash_Algorithm_Enums ("QtCore", "QCryptographicHash_QFlags_Algorithm", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QCryptographicHash_Algorithm_Enum_in_parent (decl_QCryptographicHash_Algorithm_Enum.defs ()); -static gsi::ClassExt decl_QCryptographicHash_Algorithm_Enum_as_child (decl_QCryptographicHash_Algorithm_Enum, "Algorithm"); -static gsi::ClassExt decl_QCryptographicHash_Algorithm_Enums_as_child (decl_QCryptographicHash_Algorithm_Enums, "QFlags_Algorithm"); +static gsi::ClassExt decl_QCryptographicHash_Algorithm_Enum_as_child (decl_QCryptographicHash_Algorithm_Enum, "QtCore", "Algorithm"); +static gsi::ClassExt decl_QCryptographicHash_Algorithm_Enums_as_child (decl_QCryptographicHash_Algorithm_Enums, "QtCore", "QFlags_Algorithm"); } diff --git a/src/gsiqt4/gsiDeclQDataStream.cc b/src/gsiqt/qt4/QtCore/gsiDeclQDataStream.cc similarity index 96% rename from src/gsiqt4/gsiDeclQDataStream.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQDataStream.cc index 121d9229f..87cead6d6 100644 --- a/src/gsiqt4/gsiDeclQDataStream.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQDataStream.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -554,7 +554,7 @@ static gsi::Methods methods_QDataStream () { return methods; } -gsi::Class decl_QDataStream ("QDataStream_Native", +gsi::Class decl_QDataStream ("QtCore", "QDataStream_Native", gsi::method_ext("read_i8", &f_QDataStream_read_qint8, "@brief Non-ambiguous adaptation of the corresponding operator>>") + gsi::method_ext("read_ui8", &f_QDataStream_read_quint8, "@brief Non-ambiguous adaptation of the corresponding operator>>") + gsi::method_ext("read_i16", &f_QDataStream_read_qint16, "@brief Non-ambiguous adaptation of the corresponding operator>>") + @@ -591,7 +591,7 @@ gsi::Class decl_QDataStream ("QDataStream_Native", methods_QDataStream (), "@hide\n@alias QDataStream"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDataStream () { return decl_QDataStream; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QDataStream () { return decl_QDataStream; } } @@ -716,7 +716,7 @@ static gsi::Methods methods_QDataStream_Adaptor () { return methods; } -gsi::Class decl_QDataStream_Adaptor (qtdecl_QDataStream (), "QDataStream", +gsi::Class decl_QDataStream_Adaptor (qtdecl_QDataStream (), "QtCore", "QDataStream", methods_QDataStream_Adaptor (), "@qt\n@brief Binding of QDataStream"); @@ -727,18 +727,18 @@ gsi::Class decl_QDataStream_Adaptor (qtdecl_QDataStream (), namespace qt_gsi { -static gsi::Enum decl_QDataStream_ByteOrder_Enum ("QDataStream_ByteOrder", +static gsi::Enum decl_QDataStream_ByteOrder_Enum ("QtCore", "QDataStream_ByteOrder", gsi::enum_const ("BigEndian", QDataStream::BigEndian, "@brief Enum constant QDataStream::BigEndian") + gsi::enum_const ("LittleEndian", QDataStream::LittleEndian, "@brief Enum constant QDataStream::LittleEndian"), "@qt\n@brief This class represents the QDataStream::ByteOrder enum"); -static gsi::QFlagsClass decl_QDataStream_ByteOrder_Enums ("QDataStream_QFlags_ByteOrder", +static gsi::QFlagsClass decl_QDataStream_ByteOrder_Enums ("QtCore", "QDataStream_QFlags_ByteOrder", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QDataStream_ByteOrder_Enum_in_parent (decl_QDataStream_ByteOrder_Enum.defs ()); -static gsi::ClassExt decl_QDataStream_ByteOrder_Enum_as_child (decl_QDataStream_ByteOrder_Enum, "ByteOrder"); -static gsi::ClassExt decl_QDataStream_ByteOrder_Enums_as_child (decl_QDataStream_ByteOrder_Enums, "QFlags_ByteOrder"); +static gsi::ClassExt decl_QDataStream_ByteOrder_Enum_as_child (decl_QDataStream_ByteOrder_Enum, "QtCore", "ByteOrder"); +static gsi::ClassExt decl_QDataStream_ByteOrder_Enums_as_child (decl_QDataStream_ByteOrder_Enums, "QtCore", "QFlags_ByteOrder"); } @@ -747,18 +747,18 @@ static gsi::ClassExt decl_QDataStream_ByteOrder_Enums_as_child (dec namespace qt_gsi { -static gsi::Enum decl_QDataStream_FloatingPointPrecision_Enum ("QDataStream_FloatingPointPrecision", +static gsi::Enum decl_QDataStream_FloatingPointPrecision_Enum ("QtCore", "QDataStream_FloatingPointPrecision", gsi::enum_const ("SinglePrecision", QDataStream::SinglePrecision, "@brief Enum constant QDataStream::SinglePrecision") + gsi::enum_const ("DoublePrecision", QDataStream::DoublePrecision, "@brief Enum constant QDataStream::DoublePrecision"), "@qt\n@brief This class represents the QDataStream::FloatingPointPrecision enum"); -static gsi::QFlagsClass decl_QDataStream_FloatingPointPrecision_Enums ("QDataStream_QFlags_FloatingPointPrecision", +static gsi::QFlagsClass decl_QDataStream_FloatingPointPrecision_Enums ("QtCore", "QDataStream_QFlags_FloatingPointPrecision", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QDataStream_FloatingPointPrecision_Enum_in_parent (decl_QDataStream_FloatingPointPrecision_Enum.defs ()); -static gsi::ClassExt decl_QDataStream_FloatingPointPrecision_Enum_as_child (decl_QDataStream_FloatingPointPrecision_Enum, "FloatingPointPrecision"); -static gsi::ClassExt decl_QDataStream_FloatingPointPrecision_Enums_as_child (decl_QDataStream_FloatingPointPrecision_Enums, "QFlags_FloatingPointPrecision"); +static gsi::ClassExt decl_QDataStream_FloatingPointPrecision_Enum_as_child (decl_QDataStream_FloatingPointPrecision_Enum, "QtCore", "FloatingPointPrecision"); +static gsi::ClassExt decl_QDataStream_FloatingPointPrecision_Enums_as_child (decl_QDataStream_FloatingPointPrecision_Enums, "QtCore", "QFlags_FloatingPointPrecision"); } @@ -767,19 +767,19 @@ static gsi::ClassExt decl_QDataStream_FloatingPointPrecision_Enums_ namespace qt_gsi { -static gsi::Enum decl_QDataStream_Status_Enum ("QDataStream_Status", +static gsi::Enum decl_QDataStream_Status_Enum ("QtCore", "QDataStream_Status", gsi::enum_const ("Ok", QDataStream::Ok, "@brief Enum constant QDataStream::Ok") + gsi::enum_const ("ReadPastEnd", QDataStream::ReadPastEnd, "@brief Enum constant QDataStream::ReadPastEnd") + gsi::enum_const ("ReadCorruptData", QDataStream::ReadCorruptData, "@brief Enum constant QDataStream::ReadCorruptData"), "@qt\n@brief This class represents the QDataStream::Status enum"); -static gsi::QFlagsClass decl_QDataStream_Status_Enums ("QDataStream_QFlags_Status", +static gsi::QFlagsClass decl_QDataStream_Status_Enums ("QtCore", "QDataStream_QFlags_Status", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QDataStream_Status_Enum_in_parent (decl_QDataStream_Status_Enum.defs ()); -static gsi::ClassExt decl_QDataStream_Status_Enum_as_child (decl_QDataStream_Status_Enum, "Status"); -static gsi::ClassExt decl_QDataStream_Status_Enums_as_child (decl_QDataStream_Status_Enums, "QFlags_Status"); +static gsi::ClassExt decl_QDataStream_Status_Enum_as_child (decl_QDataStream_Status_Enum, "QtCore", "Status"); +static gsi::ClassExt decl_QDataStream_Status_Enums_as_child (decl_QDataStream_Status_Enums, "QtCore", "QFlags_Status"); } diff --git a/src/gsiqt4/gsiDeclQDate.cc b/src/gsiqt/qt4/QtCore/gsiDeclQDate.cc similarity index 98% rename from src/gsiqt4/gsiDeclQDate.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQDate.cc index 522380300..92ef33723 100644 --- a/src/gsiqt4/gsiDeclQDate.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQDate.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -942,12 +942,12 @@ static gsi::Methods methods_QDate () { return methods; } -gsi::Class decl_QDate ("QDate", +gsi::Class decl_QDate ("QtCore", "QDate", methods_QDate (), "@qt\n@brief Binding of QDate"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDate () { return decl_QDate; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QDate () { return decl_QDate; } } @@ -956,18 +956,18 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QDate () { return decl_QDate; } namespace qt_gsi { -static gsi::Enum decl_QDate_MonthNameType_Enum ("QDate_MonthNameType", +static gsi::Enum decl_QDate_MonthNameType_Enum ("QtCore", "QDate_MonthNameType", gsi::enum_const ("DateFormat", QDate::DateFormat, "@brief Enum constant QDate::DateFormat") + gsi::enum_const ("StandaloneFormat", QDate::StandaloneFormat, "@brief Enum constant QDate::StandaloneFormat"), "@qt\n@brief This class represents the QDate::MonthNameType enum"); -static gsi::QFlagsClass decl_QDate_MonthNameType_Enums ("QDate_QFlags_MonthNameType", +static gsi::QFlagsClass decl_QDate_MonthNameType_Enums ("QtCore", "QDate_QFlags_MonthNameType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QDate_MonthNameType_Enum_in_parent (decl_QDate_MonthNameType_Enum.defs ()); -static gsi::ClassExt decl_QDate_MonthNameType_Enum_as_child (decl_QDate_MonthNameType_Enum, "MonthNameType"); -static gsi::ClassExt decl_QDate_MonthNameType_Enums_as_child (decl_QDate_MonthNameType_Enums, "QFlags_MonthNameType"); +static gsi::ClassExt decl_QDate_MonthNameType_Enum_as_child (decl_QDate_MonthNameType_Enum, "QtCore", "MonthNameType"); +static gsi::ClassExt decl_QDate_MonthNameType_Enums_as_child (decl_QDate_MonthNameType_Enums, "QtCore", "QFlags_MonthNameType"); } diff --git a/src/gsiqt4/gsiDeclQDateTime.cc b/src/gsiqt/qt4/QtCore/gsiDeclQDateTime.cc similarity index 99% rename from src/gsiqt4/gsiDeclQDateTime.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQDateTime.cc index 643147282..5971223c8 100644 --- a/src/gsiqt4/gsiDeclQDateTime.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQDateTime.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -800,12 +800,12 @@ static gsi::Methods methods_QDateTime () { return methods; } -gsi::Class decl_QDateTime ("QDateTime", +gsi::Class decl_QDateTime ("QtCore", "QDateTime", methods_QDateTime (), "@qt\n@brief Binding of QDateTime"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDateTime () { return decl_QDateTime; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QDateTime () { return decl_QDateTime; } } diff --git a/src/gsiqt4/gsiDeclQDir.cc b/src/gsiqt/qt4/QtCore/gsiDeclQDir.cc similarity index 98% rename from src/gsiqt4/gsiDeclQDir.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQDir.cc index bc3872117..5b29015a5 100644 --- a/src/gsiqt4/gsiDeclQDir.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQDir.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1332,12 +1332,12 @@ static gsi::Methods methods_QDir () { return methods; } -gsi::Class decl_QDir ("QDir", +gsi::Class decl_QDir ("QtCore", "QDir", methods_QDir (), "@qt\n@brief Binding of QDir"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDir () { return decl_QDir; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QDir () { return decl_QDir; } } @@ -1346,7 +1346,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QDir () { return decl_QDir; } namespace qt_gsi { -static gsi::Enum decl_QDir_Filter_Enum ("QDir_Filter", +static gsi::Enum decl_QDir_Filter_Enum ("QtCore", "QDir_Filter", gsi::enum_const ("Dirs", QDir::Dirs, "@brief Enum constant QDir::Dirs") + gsi::enum_const ("Files", QDir::Files, "@brief Enum constant QDir::Files") + gsi::enum_const ("Drives", QDir::Drives, "@brief Enum constant QDir::Drives") + @@ -1367,13 +1367,13 @@ static gsi::Enum decl_QDir_Filter_Enum ("QDir_Filter", gsi::enum_const ("NoFilter", QDir::NoFilter, "@brief Enum constant QDir::NoFilter"), "@qt\n@brief This class represents the QDir::Filter enum"); -static gsi::QFlagsClass decl_QDir_Filter_Enums ("QDir_QFlags_Filter", +static gsi::QFlagsClass decl_QDir_Filter_Enums ("QtCore", "QDir_QFlags_Filter", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QDir_Filter_Enum_in_parent (decl_QDir_Filter_Enum.defs ()); -static gsi::ClassExt decl_QDir_Filter_Enum_as_child (decl_QDir_Filter_Enum, "Filter"); -static gsi::ClassExt decl_QDir_Filter_Enums_as_child (decl_QDir_Filter_Enums, "QFlags_Filter"); +static gsi::ClassExt decl_QDir_Filter_Enum_as_child (decl_QDir_Filter_Enum, "QtCore", "Filter"); +static gsi::ClassExt decl_QDir_Filter_Enums_as_child (decl_QDir_Filter_Enums, "QtCore", "QFlags_Filter"); } @@ -1382,7 +1382,7 @@ static gsi::ClassExt decl_QDir_Filter_Enums_as_child (decl_QDir_Filter_Enu namespace qt_gsi { -static gsi::Enum decl_QDir_SortFlag_Enum ("QDir_SortFlag", +static gsi::Enum decl_QDir_SortFlag_Enum ("QtCore", "QDir_SortFlag", gsi::enum_const ("Name", QDir::Name, "@brief Enum constant QDir::Name") + gsi::enum_const ("Time", QDir::Time, "@brief Enum constant QDir::Time") + gsi::enum_const ("Size", QDir::Size, "@brief Enum constant QDir::Size") + @@ -1397,13 +1397,13 @@ static gsi::Enum decl_QDir_SortFlag_Enum ("QDir_SortFlag", gsi::enum_const ("NoSort", QDir::NoSort, "@brief Enum constant QDir::NoSort"), "@qt\n@brief This class represents the QDir::SortFlag enum"); -static gsi::QFlagsClass decl_QDir_SortFlag_Enums ("QDir_QFlags_SortFlag", +static gsi::QFlagsClass decl_QDir_SortFlag_Enums ("QtCore", "QDir_QFlags_SortFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QDir_SortFlag_Enum_in_parent (decl_QDir_SortFlag_Enum.defs ()); -static gsi::ClassExt decl_QDir_SortFlag_Enum_as_child (decl_QDir_SortFlag_Enum, "SortFlag"); -static gsi::ClassExt decl_QDir_SortFlag_Enums_as_child (decl_QDir_SortFlag_Enums, "QFlags_SortFlag"); +static gsi::ClassExt decl_QDir_SortFlag_Enum_as_child (decl_QDir_SortFlag_Enum, "QtCore", "SortFlag"); +static gsi::ClassExt decl_QDir_SortFlag_Enums_as_child (decl_QDir_SortFlag_Enums, "QtCore", "QFlags_SortFlag"); } diff --git a/src/gsiqt4/gsiDeclQDynamicPropertyChangeEvent.cc b/src/gsiqt/qt4/QtCore/gsiDeclQDynamicPropertyChangeEvent.cc similarity index 92% rename from src/gsiqt4/gsiDeclQDynamicPropertyChangeEvent.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQDynamicPropertyChangeEvent.cc index c9092d529..70f6c6674 100644 --- a/src/gsiqt4/gsiDeclQDynamicPropertyChangeEvent.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQDynamicPropertyChangeEvent.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -62,11 +62,11 @@ static gsi::Methods methods_QDynamicPropertyChangeEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QDynamicPropertyChangeEvent (qtdecl_QEvent (), "QDynamicPropertyChangeEvent_Native", +gsi::Class decl_QDynamicPropertyChangeEvent (qtdecl_QEvent (), "QtCore", "QDynamicPropertyChangeEvent_Native", methods_QDynamicPropertyChangeEvent (), "@hide\n@alias QDynamicPropertyChangeEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDynamicPropertyChangeEvent () { return decl_QDynamicPropertyChangeEvent; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QDynamicPropertyChangeEvent () { return decl_QDynamicPropertyChangeEvent; } } @@ -117,7 +117,7 @@ static gsi::Methods methods_QDynamicPropertyChangeEvent_Adaptor () { return methods; } -gsi::Class decl_QDynamicPropertyChangeEvent_Adaptor (qtdecl_QDynamicPropertyChangeEvent (), "QDynamicPropertyChangeEvent", +gsi::Class decl_QDynamicPropertyChangeEvent_Adaptor (qtdecl_QDynamicPropertyChangeEvent (), "QtCore", "QDynamicPropertyChangeEvent", methods_QDynamicPropertyChangeEvent_Adaptor (), "@qt\n@brief Binding of QDynamicPropertyChangeEvent"); diff --git a/src/gsiqt4/gsiDeclQEasingCurve.cc b/src/gsiqt/qt4/QtCore/gsiDeclQEasingCurve.cc similarity index 97% rename from src/gsiqt4/gsiDeclQEasingCurve.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQEasingCurve.cc index f4cc1f732..3921e51b8 100644 --- a/src/gsiqt4/gsiDeclQEasingCurve.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQEasingCurve.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -313,12 +313,12 @@ static gsi::Methods methods_QEasingCurve () { return methods; } -gsi::Class decl_QEasingCurve ("QEasingCurve", +gsi::Class decl_QEasingCurve ("QtCore", "QEasingCurve", methods_QEasingCurve (), "@qt\n@brief Binding of QEasingCurve"); -GSIQT_PUBLIC gsi::Class &qtdecl_QEasingCurve () { return decl_QEasingCurve; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QEasingCurve () { return decl_QEasingCurve; } } @@ -327,7 +327,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QEasingCurve () { return decl_QEas namespace qt_gsi { -static gsi::Enum decl_QEasingCurve_Type_Enum ("QEasingCurve_Type", +static gsi::Enum decl_QEasingCurve_Type_Enum ("QtCore", "QEasingCurve_Type", gsi::enum_const ("Linear", QEasingCurve::Linear, "@brief Enum constant QEasingCurve::Linear") + gsi::enum_const ("InQuad", QEasingCurve::InQuad, "@brief Enum constant QEasingCurve::InQuad") + gsi::enum_const ("OutQuad", QEasingCurve::OutQuad, "@brief Enum constant QEasingCurve::OutQuad") + @@ -377,13 +377,13 @@ static gsi::Enum decl_QEasingCurve_Type_Enum ("QEasingCurve_ gsi::enum_const ("NCurveTypes", QEasingCurve::NCurveTypes, "@brief Enum constant QEasingCurve::NCurveTypes"), "@qt\n@brief This class represents the QEasingCurve::Type enum"); -static gsi::QFlagsClass decl_QEasingCurve_Type_Enums ("QEasingCurve_QFlags_Type", +static gsi::QFlagsClass decl_QEasingCurve_Type_Enums ("QtCore", "QEasingCurve_QFlags_Type", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QEasingCurve_Type_Enum_in_parent (decl_QEasingCurve_Type_Enum.defs ()); -static gsi::ClassExt decl_QEasingCurve_Type_Enum_as_child (decl_QEasingCurve_Type_Enum, "Type"); -static gsi::ClassExt decl_QEasingCurve_Type_Enums_as_child (decl_QEasingCurve_Type_Enums, "QFlags_Type"); +static gsi::ClassExt decl_QEasingCurve_Type_Enum_as_child (decl_QEasingCurve_Type_Enum, "QtCore", "Type"); +static gsi::ClassExt decl_QEasingCurve_Type_Enums_as_child (decl_QEasingCurve_Type_Enums, "QtCore", "QFlags_Type"); } diff --git a/src/gsiqt4/gsiDeclQEvent.cc b/src/gsiqt/qt4/QtCore/gsiDeclQEvent.cc similarity index 98% rename from src/gsiqt4/gsiDeclQEvent.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQEvent.cc index fdfdcd8b9..08a421f86 100644 --- a/src/gsiqt4/gsiDeclQEvent.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQEvent.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -167,11 +167,11 @@ static gsi::Methods methods_QEvent () { return methods; } -gsi::Class decl_QEvent ("QEvent_Native", +gsi::Class decl_QEvent ("QtCore", "QEvent_Native", methods_QEvent (), "@hide\n@alias QEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QEvent () { return decl_QEvent; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QEvent () { return decl_QEvent; } } @@ -222,7 +222,7 @@ static gsi::Methods methods_QEvent_Adaptor () { return methods; } -gsi::Class decl_QEvent_Adaptor (qtdecl_QEvent (), "QEvent", +gsi::Class decl_QEvent_Adaptor (qtdecl_QEvent (), "QtCore", "QEvent", methods_QEvent_Adaptor (), "@qt\n@brief Binding of QEvent"); @@ -233,7 +233,7 @@ gsi::Class decl_QEvent_Adaptor (qtdecl_QEvent (), "QEvent", namespace qt_gsi { -static gsi::Enum decl_QEvent_Type_Enum ("QEvent_Type", +static gsi::Enum decl_QEvent_Type_Enum ("QtCore", "QEvent_Type", gsi::enum_const ("None", QEvent::None, "@brief Enum constant QEvent::None") + gsi::enum_const ("Timer", QEvent::Timer, "@brief Enum constant QEvent::Timer") + gsi::enum_const ("MouseButtonPress", QEvent::MouseButtonPress, "@brief Enum constant QEvent::MouseButtonPress") + @@ -395,13 +395,13 @@ static gsi::Enum decl_QEvent_Type_Enum ("QEvent_Type", gsi::enum_const ("MaxUser", QEvent::MaxUser, "@brief Enum constant QEvent::MaxUser"), "@qt\n@brief This class represents the QEvent::Type enum"); -static gsi::QFlagsClass decl_QEvent_Type_Enums ("QEvent_QFlags_Type", +static gsi::QFlagsClass decl_QEvent_Type_Enums ("QtCore", "QEvent_QFlags_Type", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QEvent_Type_Enum_in_parent (decl_QEvent_Type_Enum.defs ()); -static gsi::ClassExt decl_QEvent_Type_Enum_as_child (decl_QEvent_Type_Enum, "Type"); -static gsi::ClassExt decl_QEvent_Type_Enums_as_child (decl_QEvent_Type_Enums, "QFlags_Type"); +static gsi::ClassExt decl_QEvent_Type_Enum_as_child (decl_QEvent_Type_Enum, "QtCore", "Type"); +static gsi::ClassExt decl_QEvent_Type_Enums_as_child (decl_QEvent_Type_Enums, "QtCore", "QFlags_Type"); } diff --git a/src/gsiqt4/gsiDeclQEventLoop.cc b/src/gsiqt/qt4/QtCore/gsiDeclQEventLoop.cc similarity index 97% rename from src/gsiqt4/gsiDeclQEventLoop.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQEventLoop.cc index c49c9f7ca..8d1f036e6 100644 --- a/src/gsiqt4/gsiDeclQEventLoop.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQEventLoop.cc @@ -34,8 +34,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -299,11 +299,11 @@ static gsi::Methods methods_QEventLoop () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QEventLoop (qtdecl_QObject (), "QEventLoop_Native", +qt_gsi::QtNativeClass decl_QEventLoop (qtdecl_QObject (), "QtCore", "QEventLoop_Native", methods_QEventLoop (), "@hide\n@alias QEventLoop"); -GSIQT_PUBLIC gsi::Class &qtdecl_QEventLoop () { return decl_QEventLoop; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QEventLoop () { return decl_QEventLoop; } } @@ -681,7 +681,7 @@ static gsi::Methods methods_QEventLoop_Adaptor () { return methods; } -gsi::Class decl_QEventLoop_Adaptor (qtdecl_QEventLoop (), "QEventLoop", +gsi::Class decl_QEventLoop_Adaptor (qtdecl_QEventLoop (), "QtCore", "QEventLoop", methods_QEventLoop_Adaptor (), "@qt\n@brief Binding of QEventLoop"); @@ -692,7 +692,7 @@ gsi::Class decl_QEventLoop_Adaptor (qtdecl_QEventLoop (), "Q namespace qt_gsi { -static gsi::Enum decl_QEventLoop_ProcessEventsFlag_Enum ("QEventLoop_ProcessEventsFlag", +static gsi::Enum decl_QEventLoop_ProcessEventsFlag_Enum ("QtCore", "QEventLoop_ProcessEventsFlag", gsi::enum_const ("AllEvents", QEventLoop::AllEvents, "@brief Enum constant QEventLoop::AllEvents") + gsi::enum_const ("ExcludeUserInputEvents", QEventLoop::ExcludeUserInputEvents, "@brief Enum constant QEventLoop::ExcludeUserInputEvents") + gsi::enum_const ("ExcludeSocketNotifiers", QEventLoop::ExcludeSocketNotifiers, "@brief Enum constant QEventLoop::ExcludeSocketNotifiers") + @@ -703,13 +703,13 @@ static gsi::Enum decl_QEventLoop_ProcessEventsFla gsi::enum_const ("DialogExec", QEventLoop::DialogExec, "@brief Enum constant QEventLoop::DialogExec"), "@qt\n@brief This class represents the QEventLoop::ProcessEventsFlag enum"); -static gsi::QFlagsClass decl_QEventLoop_ProcessEventsFlag_Enums ("QEventLoop_QFlags_ProcessEventsFlag", +static gsi::QFlagsClass decl_QEventLoop_ProcessEventsFlag_Enums ("QtCore", "QEventLoop_QFlags_ProcessEventsFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QEventLoop_ProcessEventsFlag_Enum_in_parent (decl_QEventLoop_ProcessEventsFlag_Enum.defs ()); -static gsi::ClassExt decl_QEventLoop_ProcessEventsFlag_Enum_as_child (decl_QEventLoop_ProcessEventsFlag_Enum, "ProcessEventsFlag"); -static gsi::ClassExt decl_QEventLoop_ProcessEventsFlag_Enums_as_child (decl_QEventLoop_ProcessEventsFlag_Enums, "QFlags_ProcessEventsFlag"); +static gsi::ClassExt decl_QEventLoop_ProcessEventsFlag_Enum_as_child (decl_QEventLoop_ProcessEventsFlag_Enum, "QtCore", "ProcessEventsFlag"); +static gsi::ClassExt decl_QEventLoop_ProcessEventsFlag_Enums_as_child (decl_QEventLoop_ProcessEventsFlag_Enums, "QtCore", "QFlags_ProcessEventsFlag"); } diff --git a/src/gsiqt4/gsiDeclQFactoryInterface.cc b/src/gsiqt/qt4/QtCore/gsiDeclQFactoryInterface.cc similarity index 93% rename from src/gsiqt4/gsiDeclQFactoryInterface.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQFactoryInterface.cc index d7a4e878c..537af1bc8 100644 --- a/src/gsiqt4/gsiDeclQFactoryInterface.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQFactoryInterface.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -60,11 +60,11 @@ static gsi::Methods methods_QFactoryInterface () { return methods; } -gsi::Class decl_QFactoryInterface ("QFactoryInterface_Native", +gsi::Class decl_QFactoryInterface ("QtCore", "QFactoryInterface_Native", methods_QFactoryInterface (), "@hide\n@alias QFactoryInterface"); -GSIQT_PUBLIC gsi::Class &qtdecl_QFactoryInterface () { return decl_QFactoryInterface; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QFactoryInterface () { return decl_QFactoryInterface; } } @@ -147,7 +147,7 @@ static gsi::Methods methods_QFactoryInterface_Adaptor () { return methods; } -gsi::Class decl_QFactoryInterface_Adaptor (qtdecl_QFactoryInterface (), "QFactoryInterface", +gsi::Class decl_QFactoryInterface_Adaptor (qtdecl_QFactoryInterface (), "QtCore", "QFactoryInterface", methods_QFactoryInterface_Adaptor (), "@qt\n@brief Binding of QFactoryInterface"); diff --git a/src/gsiqt4/gsiDeclQFile.cc b/src/gsiqt/qt4/QtCore/gsiDeclQFile.cc similarity index 98% rename from src/gsiqt4/gsiDeclQFile.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQFile.cc index e58bb1cb1..fc0f45aa8 100644 --- a/src/gsiqt4/gsiDeclQFile.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQFile.cc @@ -34,8 +34,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -906,12 +906,12 @@ static gsi::Methods methods_QFile () { gsi::Class &qtdecl_QIODevice (); -qt_gsi::QtNativeClass decl_QFile (qtdecl_QIODevice (), "QFile", +qt_gsi::QtNativeClass decl_QFile (qtdecl_QIODevice (), "QtCore", "QFile", methods_QFile (), "@qt\n@brief Binding of QFile"); -GSIQT_PUBLIC gsi::Class &qtdecl_QFile () { return decl_QFile; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QFile () { return decl_QFile; } } @@ -920,7 +920,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QFile () { return decl_QFile; } namespace qt_gsi { -static gsi::Enum decl_QFile_FileError_Enum ("QFile_FileError", +static gsi::Enum decl_QFile_FileError_Enum ("QtCore", "QFile_FileError", gsi::enum_const ("NoError", QFile::NoError, "@brief Enum constant QFile::NoError") + gsi::enum_const ("ReadError", QFile::ReadError, "@brief Enum constant QFile::ReadError") + gsi::enum_const ("WriteError", QFile::WriteError, "@brief Enum constant QFile::WriteError") + @@ -938,13 +938,13 @@ static gsi::Enum decl_QFile_FileError_Enum ("QFile_FileError", gsi::enum_const ("CopyError", QFile::CopyError, "@brief Enum constant QFile::CopyError"), "@qt\n@brief This class represents the QFile::FileError enum"); -static gsi::QFlagsClass decl_QFile_FileError_Enums ("QFile_QFlags_FileError", +static gsi::QFlagsClass decl_QFile_FileError_Enums ("QtCore", "QFile_QFlags_FileError", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QFile_FileError_Enum_in_parent (decl_QFile_FileError_Enum.defs ()); -static gsi::ClassExt decl_QFile_FileError_Enum_as_child (decl_QFile_FileError_Enum, "FileError"); -static gsi::ClassExt decl_QFile_FileError_Enums_as_child (decl_QFile_FileError_Enums, "QFlags_FileError"); +static gsi::ClassExt decl_QFile_FileError_Enum_as_child (decl_QFile_FileError_Enum, "QtCore", "FileError"); +static gsi::ClassExt decl_QFile_FileError_Enums_as_child (decl_QFile_FileError_Enums, "QtCore", "QFlags_FileError"); } @@ -953,7 +953,7 @@ static gsi::ClassExt decl_QFile_FileError_Enums_as_child (decl_QFile_File namespace qt_gsi { -static gsi::Enum decl_QFile_Permission_Enum ("QFile_Permission", +static gsi::Enum decl_QFile_Permission_Enum ("QtCore", "QFile_Permission", gsi::enum_const ("ReadOwner", QFile::ReadOwner, "@brief Enum constant QFile::ReadOwner") + gsi::enum_const ("WriteOwner", QFile::WriteOwner, "@brief Enum constant QFile::WriteOwner") + gsi::enum_const ("ExeOwner", QFile::ExeOwner, "@brief Enum constant QFile::ExeOwner") + @@ -968,13 +968,13 @@ static gsi::Enum decl_QFile_Permission_Enum ("QFile_Permissio gsi::enum_const ("ExeOther", QFile::ExeOther, "@brief Enum constant QFile::ExeOther"), "@qt\n@brief This class represents the QFile::Permission enum"); -static gsi::QFlagsClass decl_QFile_Permission_Enums ("QFile_QFlags_Permission", +static gsi::QFlagsClass decl_QFile_Permission_Enums ("QtCore", "QFile_QFlags_Permission", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QFile_Permission_Enum_in_parent (decl_QFile_Permission_Enum.defs ()); -static gsi::ClassExt decl_QFile_Permission_Enum_as_child (decl_QFile_Permission_Enum, "Permission"); -static gsi::ClassExt decl_QFile_Permission_Enums_as_child (decl_QFile_Permission_Enums, "QFlags_Permission"); +static gsi::ClassExt decl_QFile_Permission_Enum_as_child (decl_QFile_Permission_Enum, "QtCore", "Permission"); +static gsi::ClassExt decl_QFile_Permission_Enums_as_child (decl_QFile_Permission_Enums, "QtCore", "QFlags_Permission"); } diff --git a/src/gsiqt4/gsiDeclQFileInfo.cc b/src/gsiqt/qt4/QtCore/gsiDeclQFileInfo.cc similarity index 99% rename from src/gsiqt4/gsiDeclQFileInfo.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQFileInfo.cc index ed3e37b3e..904758972 100644 --- a/src/gsiqt4/gsiDeclQFileInfo.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQFileInfo.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1012,12 +1012,12 @@ static gsi::Methods methods_QFileInfo () { return methods; } -gsi::Class decl_QFileInfo ("QFileInfo", +gsi::Class decl_QFileInfo ("QtCore", "QFileInfo", methods_QFileInfo (), "@qt\n@brief Binding of QFileInfo"); -GSIQT_PUBLIC gsi::Class &qtdecl_QFileInfo () { return decl_QFileInfo; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QFileInfo () { return decl_QFileInfo; } } diff --git a/src/gsiqt4/gsiDeclQFileSystemWatcher.cc b/src/gsiqt/qt4/QtCore/gsiDeclQFileSystemWatcher.cc similarity index 98% rename from src/gsiqt4/gsiDeclQFileSystemWatcher.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQFileSystemWatcher.cc index 480f277f6..83b58e2b4 100644 --- a/src/gsiqt4/gsiDeclQFileSystemWatcher.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQFileSystemWatcher.cc @@ -34,8 +34,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -282,11 +282,11 @@ static gsi::Methods methods_QFileSystemWatcher () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QFileSystemWatcher (qtdecl_QObject (), "QFileSystemWatcher_Native", +qt_gsi::QtNativeClass decl_QFileSystemWatcher (qtdecl_QObject (), "QtCore", "QFileSystemWatcher_Native", methods_QFileSystemWatcher (), "@hide\n@alias QFileSystemWatcher"); -GSIQT_PUBLIC gsi::Class &qtdecl_QFileSystemWatcher () { return decl_QFileSystemWatcher; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QFileSystemWatcher () { return decl_QFileSystemWatcher; } } @@ -748,7 +748,7 @@ static gsi::Methods methods_QFileSystemWatcher_Adaptor () { return methods; } -gsi::Class decl_QFileSystemWatcher_Adaptor (qtdecl_QFileSystemWatcher (), "QFileSystemWatcher", +gsi::Class decl_QFileSystemWatcher_Adaptor (qtdecl_QFileSystemWatcher (), "QtCore", "QFileSystemWatcher", methods_QFileSystemWatcher_Adaptor (), "@qt\n@brief Binding of QFileSystemWatcher"); diff --git a/src/gsiqt4/gsiDeclQIODevice.cc b/src/gsiqt/qt4/QtCore/gsiDeclQIODevice.cc similarity index 98% rename from src/gsiqt4/gsiDeclQIODevice.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQIODevice.cc index 5f6f3c8ce..e6710cc8e 100644 --- a/src/gsiqt4/gsiDeclQIODevice.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQIODevice.cc @@ -34,8 +34,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -671,12 +671,12 @@ static gsi::Methods methods_QIODevice () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QIODevice (qtdecl_QObject (), "QIODevice", +qt_gsi::QtNativeClass decl_QIODevice (qtdecl_QObject (), "QtCore", "QIODevice", methods_QIODevice (), "@qt\n@brief Binding of QIODevice"); -GSIQT_PUBLIC gsi::Class &qtdecl_QIODevice () { return decl_QIODevice; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QIODevice () { return decl_QIODevice; } } @@ -685,7 +685,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QIODevice () { return decl_QIODevice; namespace qt_gsi { -static gsi::Enum decl_QIODevice_OpenModeFlag_Enum ("QIODevice_OpenModeFlag", +static gsi::Enum decl_QIODevice_OpenModeFlag_Enum ("QtCore", "QIODevice_OpenModeFlag", gsi::enum_const ("NotOpen", QIODevice::NotOpen, "@brief Enum constant QIODevice::NotOpen") + gsi::enum_const ("ReadOnly", QIODevice::ReadOnly, "@brief Enum constant QIODevice::ReadOnly") + gsi::enum_const ("WriteOnly", QIODevice::WriteOnly, "@brief Enum constant QIODevice::WriteOnly") + @@ -696,13 +696,13 @@ static gsi::Enum decl_QIODevice_OpenModeFlag_Enum ("QIO gsi::enum_const ("Unbuffered", QIODevice::Unbuffered, "@brief Enum constant QIODevice::Unbuffered"), "@qt\n@brief This class represents the QIODevice::OpenModeFlag enum"); -static gsi::QFlagsClass decl_QIODevice_OpenModeFlag_Enums ("QIODevice_QFlags_OpenModeFlag", +static gsi::QFlagsClass decl_QIODevice_OpenModeFlag_Enums ("QtCore", "QIODevice_QFlags_OpenModeFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QIODevice_OpenModeFlag_Enum_in_parent (decl_QIODevice_OpenModeFlag_Enum.defs ()); -static gsi::ClassExt decl_QIODevice_OpenModeFlag_Enum_as_child (decl_QIODevice_OpenModeFlag_Enum, "OpenModeFlag"); -static gsi::ClassExt decl_QIODevice_OpenModeFlag_Enums_as_child (decl_QIODevice_OpenModeFlag_Enums, "QFlags_OpenModeFlag"); +static gsi::ClassExt decl_QIODevice_OpenModeFlag_Enum_as_child (decl_QIODevice_OpenModeFlag_Enum, "QtCore", "OpenModeFlag"); +static gsi::ClassExt decl_QIODevice_OpenModeFlag_Enums_as_child (decl_QIODevice_OpenModeFlag_Enums, "QtCore", "QFlags_OpenModeFlag"); } diff --git a/src/gsiqt4/gsiDeclQLibrary.cc b/src/gsiqt/qt4/QtCore/gsiDeclQLibrary.cc similarity index 98% rename from src/gsiqt4/gsiDeclQLibrary.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQLibrary.cc index 4261a0755..e65feee9b 100644 --- a/src/gsiqt4/gsiDeclQLibrary.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQLibrary.cc @@ -34,8 +34,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -465,11 +465,11 @@ static gsi::Methods methods_QLibrary () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QLibrary (qtdecl_QObject (), "QLibrary_Native", +qt_gsi::QtNativeClass decl_QLibrary (qtdecl_QObject (), "QtCore", "QLibrary_Native", methods_QLibrary (), "@hide\n@alias QLibrary"); -GSIQT_PUBLIC gsi::Class &qtdecl_QLibrary () { return decl_QLibrary; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QLibrary () { return decl_QLibrary; } } @@ -955,7 +955,7 @@ static gsi::Methods methods_QLibrary_Adaptor () { return methods; } -gsi::Class decl_QLibrary_Adaptor (qtdecl_QLibrary (), "QLibrary", +gsi::Class decl_QLibrary_Adaptor (qtdecl_QLibrary (), "QtCore", "QLibrary", methods_QLibrary_Adaptor (), "@qt\n@brief Binding of QLibrary"); @@ -966,19 +966,19 @@ gsi::Class decl_QLibrary_Adaptor (qtdecl_QLibrary (), "QLibrar namespace qt_gsi { -static gsi::Enum decl_QLibrary_LoadHint_Enum ("QLibrary_LoadHint", +static gsi::Enum decl_QLibrary_LoadHint_Enum ("QtCore", "QLibrary_LoadHint", gsi::enum_const ("ResolveAllSymbolsHint", QLibrary::ResolveAllSymbolsHint, "@brief Enum constant QLibrary::ResolveAllSymbolsHint") + gsi::enum_const ("ExportExternalSymbolsHint", QLibrary::ExportExternalSymbolsHint, "@brief Enum constant QLibrary::ExportExternalSymbolsHint") + gsi::enum_const ("LoadArchiveMemberHint", QLibrary::LoadArchiveMemberHint, "@brief Enum constant QLibrary::LoadArchiveMemberHint"), "@qt\n@brief This class represents the QLibrary::LoadHint enum"); -static gsi::QFlagsClass decl_QLibrary_LoadHint_Enums ("QLibrary_QFlags_LoadHint", +static gsi::QFlagsClass decl_QLibrary_LoadHint_Enums ("QtCore", "QLibrary_QFlags_LoadHint", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QLibrary_LoadHint_Enum_in_parent (decl_QLibrary_LoadHint_Enum.defs ()); -static gsi::ClassExt decl_QLibrary_LoadHint_Enum_as_child (decl_QLibrary_LoadHint_Enum, "LoadHint"); -static gsi::ClassExt decl_QLibrary_LoadHint_Enums_as_child (decl_QLibrary_LoadHint_Enums, "QFlags_LoadHint"); +static gsi::ClassExt decl_QLibrary_LoadHint_Enum_as_child (decl_QLibrary_LoadHint_Enum, "QtCore", "LoadHint"); +static gsi::ClassExt decl_QLibrary_LoadHint_Enums_as_child (decl_QLibrary_LoadHint_Enums, "QtCore", "QFlags_LoadHint"); } diff --git a/src/gsiqt4/gsiDeclQLibraryInfo.cc b/src/gsiqt/qt4/QtCore/gsiDeclQLibraryInfo.cc similarity index 93% rename from src/gsiqt4/gsiDeclQLibraryInfo.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQLibraryInfo.cc index 0b68cb919..7a1d0ad25 100644 --- a/src/gsiqt4/gsiDeclQLibraryInfo.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQLibraryInfo.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -130,12 +130,12 @@ static gsi::Methods methods_QLibraryInfo () { return methods; } -gsi::Class decl_QLibraryInfo ("QLibraryInfo", +gsi::Class decl_QLibraryInfo ("QtCore", "QLibraryInfo", methods_QLibraryInfo (), "@qt\n@brief Binding of QLibraryInfo"); -GSIQT_PUBLIC gsi::Class &qtdecl_QLibraryInfo () { return decl_QLibraryInfo; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QLibraryInfo () { return decl_QLibraryInfo; } } @@ -144,7 +144,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QLibraryInfo () { return decl_QLib namespace qt_gsi { -static gsi::Enum decl_QLibraryInfo_LibraryLocation_Enum ("QLibraryInfo_LibraryLocation", +static gsi::Enum decl_QLibraryInfo_LibraryLocation_Enum ("QtCore", "QLibraryInfo_LibraryLocation", gsi::enum_const ("PrefixPath", QLibraryInfo::PrefixPath, "@brief Enum constant QLibraryInfo::PrefixPath") + gsi::enum_const ("DocumentationPath", QLibraryInfo::DocumentationPath, "@brief Enum constant QLibraryInfo::DocumentationPath") + gsi::enum_const ("HeadersPath", QLibraryInfo::HeadersPath, "@brief Enum constant QLibraryInfo::HeadersPath") + @@ -158,13 +158,13 @@ static gsi::Enum decl_QLibraryInfo_LibraryLocatio gsi::enum_const ("ExamplesPath", QLibraryInfo::ExamplesPath, "@brief Enum constant QLibraryInfo::ExamplesPath"), "@qt\n@brief This class represents the QLibraryInfo::LibraryLocation enum"); -static gsi::QFlagsClass decl_QLibraryInfo_LibraryLocation_Enums ("QLibraryInfo_QFlags_LibraryLocation", +static gsi::QFlagsClass decl_QLibraryInfo_LibraryLocation_Enums ("QtCore", "QLibraryInfo_QFlags_LibraryLocation", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QLibraryInfo_LibraryLocation_Enum_in_parent (decl_QLibraryInfo_LibraryLocation_Enum.defs ()); -static gsi::ClassExt decl_QLibraryInfo_LibraryLocation_Enum_as_child (decl_QLibraryInfo_LibraryLocation_Enum, "LibraryLocation"); -static gsi::ClassExt decl_QLibraryInfo_LibraryLocation_Enums_as_child (decl_QLibraryInfo_LibraryLocation_Enums, "QFlags_LibraryLocation"); +static gsi::ClassExt decl_QLibraryInfo_LibraryLocation_Enum_as_child (decl_QLibraryInfo_LibraryLocation_Enum, "QtCore", "LibraryLocation"); +static gsi::ClassExt decl_QLibraryInfo_LibraryLocation_Enums_as_child (decl_QLibraryInfo_LibraryLocation_Enums, "QtCore", "QFlags_LibraryLocation"); } diff --git a/src/gsiqt4/gsiDeclQLine.cc b/src/gsiqt/qt4/QtCore/gsiDeclQLine.cc similarity index 94% rename from src/gsiqt4/gsiDeclQLine.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQLine.cc index 28df5ef23..526f4ed70 100644 --- a/src/gsiqt4/gsiDeclQLine.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQLine.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -451,16 +451,6 @@ static void _call_f_y2_c0 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gs } -// QLine ::operator*(const QLine &l, const QMatrix &m) -static QLine op_QLine_operator_star__3701(const QLine *_self, const QMatrix &m) { - return ::operator*(*_self, m); -} - -// QLine ::operator*(const QLine &l, const QTransform &m) -static QLine op_QLine_operator_star__4028(const QLine *_self, const QTransform &m) { - return ::operator*(*_self, m); -} - namespace gsi { @@ -489,17 +479,15 @@ static gsi::Methods methods_QLine () { methods += new qt_gsi::GenericMethod ("x2", "@brief Method int QLine::x2()\n", true, &_init_f_x2_c0, &_call_f_x2_c0); methods += new qt_gsi::GenericMethod ("y1", "@brief Method int QLine::y1()\n", true, &_init_f_y1_c0, &_call_f_y1_c0); methods += new qt_gsi::GenericMethod ("y2", "@brief Method int QLine::y2()\n", true, &_init_f_y2_c0, &_call_f_y2_c0); - methods += gsi::method_ext("*", &::op_QLine_operator_star__3701, gsi::arg ("m"), "@brief Operator QLine ::operator*(const QLine &l, const QMatrix &m)\nThis is the mapping of the global operator to the instance method."); - methods += gsi::method_ext("*", &::op_QLine_operator_star__4028, gsi::arg ("m"), "@brief Operator QLine ::operator*(const QLine &l, const QTransform &m)\nThis is the mapping of the global operator to the instance method."); return methods; } -gsi::Class decl_QLine ("QLine", +gsi::Class decl_QLine ("QtCore", "QLine", methods_QLine (), "@qt\n@brief Binding of QLine"); -GSIQT_PUBLIC gsi::Class &qtdecl_QLine () { return decl_QLine; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QLine () { return decl_QLine; } } diff --git a/src/gsiqt4/gsiDeclQLineF.cc b/src/gsiqt/qt4/QtCore/gsiDeclQLineF.cc similarity index 95% rename from src/gsiqt4/gsiDeclQLineF.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQLineF.cc index 80a5b3618..2cada2934 100644 --- a/src/gsiqt4/gsiDeclQLineF.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQLineF.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -687,16 +687,6 @@ static void _call_f_fromPolar_2034 (const qt_gsi::GenericStaticMethod * /*decl*/ } -// QLineF ::operator*(const QLineF &l, const QMatrix &m) -static QLineF op_QLineF_operator_star__3771(const QLineF *_self, const QMatrix &m) { - return ::operator*(*_self, m); -} - -// QLineF ::operator*(const QLineF &l, const QTransform &m) -static QLineF op_QLineF_operator_star__4098(const QLineF *_self, const QTransform &m) { - return ::operator*(*_self, m); -} - namespace gsi { @@ -738,17 +728,15 @@ static gsi::Methods methods_QLineF () { methods += new qt_gsi::GenericMethod ("y1", "@brief Method double QLineF::y1()\n", true, &_init_f_y1_c0, &_call_f_y1_c0); methods += new qt_gsi::GenericMethod ("y2", "@brief Method double QLineF::y2()\n", true, &_init_f_y2_c0, &_call_f_y2_c0); methods += new qt_gsi::GenericStaticMethod ("fromPolar", "@brief Static method QLineF QLineF::fromPolar(double length, double angle)\nThis method is static and can be called without an instance.", &_init_f_fromPolar_2034, &_call_f_fromPolar_2034); - methods += gsi::method_ext("*", &::op_QLineF_operator_star__3771, gsi::arg ("m"), "@brief Operator QLineF ::operator*(const QLineF &l, const QMatrix &m)\nThis is the mapping of the global operator to the instance method."); - methods += gsi::method_ext("*", &::op_QLineF_operator_star__4098, gsi::arg ("m"), "@brief Operator QLineF ::operator*(const QLineF &l, const QTransform &m)\nThis is the mapping of the global operator to the instance method."); return methods; } -gsi::Class decl_QLineF ("QLineF", +gsi::Class decl_QLineF ("QtCore", "QLineF", methods_QLineF (), "@qt\n@brief Binding of QLineF"); -GSIQT_PUBLIC gsi::Class &qtdecl_QLineF () { return decl_QLineF; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QLineF () { return decl_QLineF; } } @@ -757,19 +745,19 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QLineF () { return decl_QLineF; } namespace qt_gsi { -static gsi::Enum decl_QLineF_IntersectType_Enum ("QLineF_IntersectType", +static gsi::Enum decl_QLineF_IntersectType_Enum ("QtCore", "QLineF_IntersectType", gsi::enum_const ("NoIntersection", QLineF::NoIntersection, "@brief Enum constant QLineF::NoIntersection") + gsi::enum_const ("BoundedIntersection", QLineF::BoundedIntersection, "@brief Enum constant QLineF::BoundedIntersection") + gsi::enum_const ("UnboundedIntersection", QLineF::UnboundedIntersection, "@brief Enum constant QLineF::UnboundedIntersection"), "@qt\n@brief This class represents the QLineF::IntersectType enum"); -static gsi::QFlagsClass decl_QLineF_IntersectType_Enums ("QLineF_QFlags_IntersectType", +static gsi::QFlagsClass decl_QLineF_IntersectType_Enums ("QtCore", "QLineF_QFlags_IntersectType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QLineF_IntersectType_Enum_in_parent (decl_QLineF_IntersectType_Enum.defs ()); -static gsi::ClassExt decl_QLineF_IntersectType_Enum_as_child (decl_QLineF_IntersectType_Enum, "IntersectType"); -static gsi::ClassExt decl_QLineF_IntersectType_Enums_as_child (decl_QLineF_IntersectType_Enums, "QFlags_IntersectType"); +static gsi::ClassExt decl_QLineF_IntersectType_Enum_as_child (decl_QLineF_IntersectType_Enum, "QtCore", "IntersectType"); +static gsi::ClassExt decl_QLineF_IntersectType_Enums_as_child (decl_QLineF_IntersectType_Enums, "QtCore", "QFlags_IntersectType"); } diff --git a/src/gsiqt4/gsiDeclQLocale.cc b/src/gsiqt/qt4/QtCore/gsiDeclQLocale.cc similarity index 98% rename from src/gsiqt4/gsiDeclQLocale.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQLocale.cc index 74d728e2b..95aa62863 100644 --- a/src/gsiqt4/gsiDeclQLocale.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQLocale.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1347,12 +1347,12 @@ static gsi::Methods methods_QLocale () { return methods; } -gsi::Class decl_QLocale ("QLocale", +gsi::Class decl_QLocale ("QtCore", "QLocale", methods_QLocale (), "@qt\n@brief Binding of QLocale"); -GSIQT_PUBLIC gsi::Class &qtdecl_QLocale () { return decl_QLocale; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QLocale () { return decl_QLocale; } } @@ -1361,7 +1361,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QLocale () { return decl_QLocale; } namespace qt_gsi { -static gsi::Enum decl_QLocale_Country_Enum ("QLocale_Country", +static gsi::Enum decl_QLocale_Country_Enum ("QtCore", "QLocale_Country", gsi::enum_const ("AnyCountry", QLocale::AnyCountry, "@brief Enum constant QLocale::AnyCountry") + gsi::enum_const ("Afghanistan", QLocale::Afghanistan, "@brief Enum constant QLocale::Afghanistan") + gsi::enum_const ("Albania", QLocale::Albania, "@brief Enum constant QLocale::Albania") + @@ -1607,13 +1607,13 @@ static gsi::Enum decl_QLocale_Country_Enum ("QLocale_Country", gsi::enum_const ("LastCountry", QLocale::LastCountry, "@brief Enum constant QLocale::LastCountry"), "@qt\n@brief This class represents the QLocale::Country enum"); -static gsi::QFlagsClass decl_QLocale_Country_Enums ("QLocale_QFlags_Country", +static gsi::QFlagsClass decl_QLocale_Country_Enums ("QtCore", "QLocale_QFlags_Country", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QLocale_Country_Enum_in_parent (decl_QLocale_Country_Enum.defs ()); -static gsi::ClassExt decl_QLocale_Country_Enum_as_child (decl_QLocale_Country_Enum, "Country"); -static gsi::ClassExt decl_QLocale_Country_Enums_as_child (decl_QLocale_Country_Enums, "QFlags_Country"); +static gsi::ClassExt decl_QLocale_Country_Enum_as_child (decl_QLocale_Country_Enum, "QtCore", "Country"); +static gsi::ClassExt decl_QLocale_Country_Enums_as_child (decl_QLocale_Country_Enums, "QtCore", "QFlags_Country"); } @@ -1622,19 +1622,19 @@ static gsi::ClassExt decl_QLocale_Country_Enums_as_child (decl_QLocale_ namespace qt_gsi { -static gsi::Enum decl_QLocale_FormatType_Enum ("QLocale_FormatType", +static gsi::Enum decl_QLocale_FormatType_Enum ("QtCore", "QLocale_FormatType", gsi::enum_const ("LongFormat", QLocale::LongFormat, "@brief Enum constant QLocale::LongFormat") + gsi::enum_const ("ShortFormat", QLocale::ShortFormat, "@brief Enum constant QLocale::ShortFormat") + gsi::enum_const ("NarrowFormat", QLocale::NarrowFormat, "@brief Enum constant QLocale::NarrowFormat"), "@qt\n@brief This class represents the QLocale::FormatType enum"); -static gsi::QFlagsClass decl_QLocale_FormatType_Enums ("QLocale_QFlags_FormatType", +static gsi::QFlagsClass decl_QLocale_FormatType_Enums ("QtCore", "QLocale_QFlags_FormatType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QLocale_FormatType_Enum_in_parent (decl_QLocale_FormatType_Enum.defs ()); -static gsi::ClassExt decl_QLocale_FormatType_Enum_as_child (decl_QLocale_FormatType_Enum, "FormatType"); -static gsi::ClassExt decl_QLocale_FormatType_Enums_as_child (decl_QLocale_FormatType_Enums, "QFlags_FormatType"); +static gsi::ClassExt decl_QLocale_FormatType_Enum_as_child (decl_QLocale_FormatType_Enum, "QtCore", "FormatType"); +static gsi::ClassExt decl_QLocale_FormatType_Enums_as_child (decl_QLocale_FormatType_Enums, "QtCore", "QFlags_FormatType"); } @@ -1643,7 +1643,7 @@ static gsi::ClassExt decl_QLocale_FormatType_Enums_as_child (decl_QLoca namespace qt_gsi { -static gsi::Enum decl_QLocale_Language_Enum ("QLocale_Language", +static gsi::Enum decl_QLocale_Language_Enum ("QtCore", "QLocale_Language", gsi::enum_const ("C", QLocale::C, "@brief Enum constant QLocale::C") + gsi::enum_const ("Abkhazian", QLocale::Abkhazian, "@brief Enum constant QLocale::Abkhazian") + gsi::enum_const ("Afan", QLocale::Afan, "@brief Enum constant QLocale::Afan") + @@ -1814,13 +1814,13 @@ static gsi::Enum decl_QLocale_Language_Enum ("QLocale_Languag gsi::enum_const ("LastLanguage", QLocale::LastLanguage, "@brief Enum constant QLocale::LastLanguage"), "@qt\n@brief This class represents the QLocale::Language enum"); -static gsi::QFlagsClass decl_QLocale_Language_Enums ("QLocale_QFlags_Language", +static gsi::QFlagsClass decl_QLocale_Language_Enums ("QtCore", "QLocale_QFlags_Language", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QLocale_Language_Enum_in_parent (decl_QLocale_Language_Enum.defs ()); -static gsi::ClassExt decl_QLocale_Language_Enum_as_child (decl_QLocale_Language_Enum, "Language"); -static gsi::ClassExt decl_QLocale_Language_Enums_as_child (decl_QLocale_Language_Enums, "QFlags_Language"); +static gsi::ClassExt decl_QLocale_Language_Enum_as_child (decl_QLocale_Language_Enum, "QtCore", "Language"); +static gsi::ClassExt decl_QLocale_Language_Enums_as_child (decl_QLocale_Language_Enums, "QtCore", "QFlags_Language"); } @@ -1829,18 +1829,18 @@ static gsi::ClassExt decl_QLocale_Language_Enums_as_child (decl_QLocale namespace qt_gsi { -static gsi::Enum decl_QLocale_MeasurementSystem_Enum ("QLocale_MeasurementSystem", +static gsi::Enum decl_QLocale_MeasurementSystem_Enum ("QtCore", "QLocale_MeasurementSystem", gsi::enum_const ("MetricSystem", QLocale::MetricSystem, "@brief Enum constant QLocale::MetricSystem") + gsi::enum_const ("ImperialSystem", QLocale::ImperialSystem, "@brief Enum constant QLocale::ImperialSystem"), "@qt\n@brief This class represents the QLocale::MeasurementSystem enum"); -static gsi::QFlagsClass decl_QLocale_MeasurementSystem_Enums ("QLocale_QFlags_MeasurementSystem", +static gsi::QFlagsClass decl_QLocale_MeasurementSystem_Enums ("QtCore", "QLocale_QFlags_MeasurementSystem", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QLocale_MeasurementSystem_Enum_in_parent (decl_QLocale_MeasurementSystem_Enum.defs ()); -static gsi::ClassExt decl_QLocale_MeasurementSystem_Enum_as_child (decl_QLocale_MeasurementSystem_Enum, "MeasurementSystem"); -static gsi::ClassExt decl_QLocale_MeasurementSystem_Enums_as_child (decl_QLocale_MeasurementSystem_Enums, "QFlags_MeasurementSystem"); +static gsi::ClassExt decl_QLocale_MeasurementSystem_Enum_as_child (decl_QLocale_MeasurementSystem_Enum, "QtCore", "MeasurementSystem"); +static gsi::ClassExt decl_QLocale_MeasurementSystem_Enums_as_child (decl_QLocale_MeasurementSystem_Enums, "QtCore", "QFlags_MeasurementSystem"); } @@ -1849,18 +1849,18 @@ static gsi::ClassExt decl_QLocale_MeasurementSystem_Enums_as_child (dec namespace qt_gsi { -static gsi::Enum decl_QLocale_NumberOption_Enum ("QLocale_NumberOption", +static gsi::Enum decl_QLocale_NumberOption_Enum ("QtCore", "QLocale_NumberOption", gsi::enum_const ("OmitGroupSeparator", QLocale::OmitGroupSeparator, "@brief Enum constant QLocale::OmitGroupSeparator") + gsi::enum_const ("RejectGroupSeparator", QLocale::RejectGroupSeparator, "@brief Enum constant QLocale::RejectGroupSeparator"), "@qt\n@brief This class represents the QLocale::NumberOption enum"); -static gsi::QFlagsClass decl_QLocale_NumberOption_Enums ("QLocale_QFlags_NumberOption", +static gsi::QFlagsClass decl_QLocale_NumberOption_Enums ("QtCore", "QLocale_QFlags_NumberOption", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QLocale_NumberOption_Enum_in_parent (decl_QLocale_NumberOption_Enum.defs ()); -static gsi::ClassExt decl_QLocale_NumberOption_Enum_as_child (decl_QLocale_NumberOption_Enum, "NumberOption"); -static gsi::ClassExt decl_QLocale_NumberOption_Enums_as_child (decl_QLocale_NumberOption_Enums, "QFlags_NumberOption"); +static gsi::ClassExt decl_QLocale_NumberOption_Enum_as_child (decl_QLocale_NumberOption_Enum, "QtCore", "NumberOption"); +static gsi::ClassExt decl_QLocale_NumberOption_Enums_as_child (decl_QLocale_NumberOption_Enums, "QtCore", "QFlags_NumberOption"); } diff --git a/src/gsiqt4/gsiDeclQMargins.cc b/src/gsiqt/qt4/QtCore/gsiDeclQMargins.cc similarity index 97% rename from src/gsiqt4/gsiDeclQMargins.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQMargins.cc index dfb119e91..baa205b77 100644 --- a/src/gsiqt4/gsiDeclQMargins.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQMargins.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -266,12 +266,12 @@ static gsi::Methods methods_QMargins () { return methods; } -gsi::Class decl_QMargins ("QMargins", +gsi::Class decl_QMargins ("QtCore", "QMargins", methods_QMargins (), "@qt\n@brief Binding of QMargins"); -GSIQT_PUBLIC gsi::Class &qtdecl_QMargins () { return decl_QMargins; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QMargins () { return decl_QMargins; } } diff --git a/src/gsiqt4/gsiDeclQMetaClassInfo.cc b/src/gsiqt/qt4/QtCore/gsiDeclQMetaClassInfo.cc similarity index 93% rename from src/gsiqt4/gsiDeclQMetaClassInfo.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQMetaClassInfo.cc index 1d6061d0a..2dcf39d8e 100644 --- a/src/gsiqt4/gsiDeclQMetaClassInfo.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQMetaClassInfo.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -110,12 +110,12 @@ static gsi::Methods methods_QMetaClassInfo () { return methods; } -gsi::Class decl_QMetaClassInfo ("QMetaClassInfo", +gsi::Class decl_QMetaClassInfo ("QtCore", "QMetaClassInfo", methods_QMetaClassInfo (), "@qt\n@brief Binding of QMetaClassInfo"); -GSIQT_PUBLIC gsi::Class &qtdecl_QMetaClassInfo () { return decl_QMetaClassInfo; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QMetaClassInfo () { return decl_QMetaClassInfo; } } diff --git a/src/gsiqt4/gsiDeclQMetaEnum.cc b/src/gsiqt/qt4/QtCore/gsiDeclQMetaEnum.cc similarity index 97% rename from src/gsiqt4/gsiDeclQMetaEnum.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQMetaEnum.cc index 6e06d40d1..0c7154b90 100644 --- a/src/gsiqt4/gsiDeclQMetaEnum.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQMetaEnum.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -278,12 +278,12 @@ static gsi::Methods methods_QMetaEnum () { return methods; } -gsi::Class decl_QMetaEnum ("QMetaEnum", +gsi::Class decl_QMetaEnum ("QtCore", "QMetaEnum", methods_QMetaEnum (), "@qt\n@brief Binding of QMetaEnum"); -GSIQT_PUBLIC gsi::Class &qtdecl_QMetaEnum () { return decl_QMetaEnum; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QMetaEnum () { return decl_QMetaEnum; } } diff --git a/src/gsiqt4/gsiDeclQMetaMethod.cc b/src/gsiqt/qt4/QtCore/gsiDeclQMetaMethod.cc similarity index 93% rename from src/gsiqt4/gsiDeclQMetaMethod.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQMetaMethod.cc index 1a300c3be..071934d59 100644 --- a/src/gsiqt4/gsiDeclQMetaMethod.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQMetaMethod.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -222,12 +222,12 @@ static gsi::Methods methods_QMetaMethod () { return methods; } -gsi::Class decl_QMetaMethod ("QMetaMethod", +gsi::Class decl_QMetaMethod ("QtCore", "QMetaMethod", methods_QMetaMethod (), "@qt\n@brief Binding of QMetaMethod"); -GSIQT_PUBLIC gsi::Class &qtdecl_QMetaMethod () { return decl_QMetaMethod; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QMetaMethod () { return decl_QMetaMethod; } } @@ -236,19 +236,19 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QMetaMethod () { return decl_QMetaM namespace qt_gsi { -static gsi::Enum decl_QMetaMethod_Access_Enum ("QMetaMethod_Access", +static gsi::Enum decl_QMetaMethod_Access_Enum ("QtCore", "QMetaMethod_Access", gsi::enum_const ("Private", QMetaMethod::Private, "@brief Enum constant QMetaMethod::Private") + gsi::enum_const ("Protected", QMetaMethod::Protected, "@brief Enum constant QMetaMethod::Protected") + gsi::enum_const ("Public", QMetaMethod::Public, "@brief Enum constant QMetaMethod::Public"), "@qt\n@brief This class represents the QMetaMethod::Access enum"); -static gsi::QFlagsClass decl_QMetaMethod_Access_Enums ("QMetaMethod_QFlags_Access", +static gsi::QFlagsClass decl_QMetaMethod_Access_Enums ("QtCore", "QMetaMethod_QFlags_Access", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QMetaMethod_Access_Enum_in_parent (decl_QMetaMethod_Access_Enum.defs ()); -static gsi::ClassExt decl_QMetaMethod_Access_Enum_as_child (decl_QMetaMethod_Access_Enum, "Access"); -static gsi::ClassExt decl_QMetaMethod_Access_Enums_as_child (decl_QMetaMethod_Access_Enums, "QFlags_Access"); +static gsi::ClassExt decl_QMetaMethod_Access_Enum_as_child (decl_QMetaMethod_Access_Enum, "QtCore", "Access"); +static gsi::ClassExt decl_QMetaMethod_Access_Enums_as_child (decl_QMetaMethod_Access_Enums, "QtCore", "QFlags_Access"); } @@ -257,20 +257,20 @@ static gsi::ClassExt decl_QMetaMethod_Access_Enums_as_child (decl_Q namespace qt_gsi { -static gsi::Enum decl_QMetaMethod_MethodType_Enum ("QMetaMethod_MethodType", +static gsi::Enum decl_QMetaMethod_MethodType_Enum ("QtCore", "QMetaMethod_MethodType", gsi::enum_const ("Method", QMetaMethod::Method, "@brief Enum constant QMetaMethod::Method") + gsi::enum_const ("Signal", QMetaMethod::Signal, "@brief Enum constant QMetaMethod::Signal") + gsi::enum_const ("Slot", QMetaMethod::Slot, "@brief Enum constant QMetaMethod::Slot") + gsi::enum_const ("Constructor", QMetaMethod::Constructor, "@brief Enum constant QMetaMethod::Constructor"), "@qt\n@brief This class represents the QMetaMethod::MethodType enum"); -static gsi::QFlagsClass decl_QMetaMethod_MethodType_Enums ("QMetaMethod_QFlags_MethodType", +static gsi::QFlagsClass decl_QMetaMethod_MethodType_Enums ("QtCore", "QMetaMethod_QFlags_MethodType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QMetaMethod_MethodType_Enum_in_parent (decl_QMetaMethod_MethodType_Enum.defs ()); -static gsi::ClassExt decl_QMetaMethod_MethodType_Enum_as_child (decl_QMetaMethod_MethodType_Enum, "MethodType"); -static gsi::ClassExt decl_QMetaMethod_MethodType_Enums_as_child (decl_QMetaMethod_MethodType_Enums, "QFlags_MethodType"); +static gsi::ClassExt decl_QMetaMethod_MethodType_Enum_as_child (decl_QMetaMethod_MethodType_Enum, "QtCore", "MethodType"); +static gsi::ClassExt decl_QMetaMethod_MethodType_Enums_as_child (decl_QMetaMethod_MethodType_Enums, "QtCore", "QFlags_MethodType"); } diff --git a/src/gsiqt4/gsiDeclQMetaObject.cc b/src/gsiqt/qt4/QtCore/gsiDeclQMetaObject.cc similarity index 99% rename from src/gsiqt4/gsiDeclQMetaObject.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQMetaObject.cc index 63f4f0b3b..99bbce000 100644 --- a/src/gsiqt4/gsiDeclQMetaObject.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQMetaObject.cc @@ -34,8 +34,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -793,12 +793,12 @@ static gsi::Methods methods_QMetaObject () { return methods; } -gsi::Class decl_QMetaObject ("QMetaObject", +gsi::Class decl_QMetaObject ("QtCore", "QMetaObject", methods_QMetaObject (), "@qt\n@brief Binding of QMetaObject"); -GSIQT_PUBLIC gsi::Class &qtdecl_QMetaObject () { return decl_QMetaObject; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QMetaObject () { return decl_QMetaObject; } } diff --git a/src/gsiqt4/gsiDeclQMetaProperty.cc b/src/gsiqt/qt4/QtCore/gsiDeclQMetaProperty.cc similarity index 98% rename from src/gsiqt4/gsiDeclQMetaProperty.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQMetaProperty.cc index e2b70d937..e8447473a 100644 --- a/src/gsiqt4/gsiDeclQMetaProperty.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQMetaProperty.cc @@ -33,8 +33,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -532,12 +532,12 @@ static gsi::Methods methods_QMetaProperty () { return methods; } -gsi::Class decl_QMetaProperty ("QMetaProperty", +gsi::Class decl_QMetaProperty ("QtCore", "QMetaProperty", methods_QMetaProperty (), "@qt\n@brief Binding of QMetaProperty"); -GSIQT_PUBLIC gsi::Class &qtdecl_QMetaProperty () { return decl_QMetaProperty; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QMetaProperty () { return decl_QMetaProperty; } } diff --git a/src/gsiqt4/gsiDeclQMetaType.cc b/src/gsiqt/qt4/QtCore/gsiDeclQMetaType.cc similarity index 97% rename from src/gsiqt4/gsiDeclQMetaType.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQMetaType.cc index a45b4726d..2c4af6302 100644 --- a/src/gsiqt4/gsiDeclQMetaType.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQMetaType.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -242,12 +242,12 @@ static gsi::Methods methods_QMetaType () { return methods; } -gsi::Class decl_QMetaType ("QMetaType", +gsi::Class decl_QMetaType ("QtCore", "QMetaType", methods_QMetaType (), "@qt\n@brief Binding of QMetaType"); -GSIQT_PUBLIC gsi::Class &qtdecl_QMetaType () { return decl_QMetaType; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QMetaType () { return decl_QMetaType; } } diff --git a/src/gsiqt4/gsiDeclQMimeData.cc b/src/gsiqt/qt4/QtCore/gsiDeclQMimeData.cc similarity index 99% rename from src/gsiqt4/gsiDeclQMimeData.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQMimeData.cc index b0662c627..9406d0984 100644 --- a/src/gsiqt4/gsiDeclQMimeData.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQMimeData.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -548,11 +548,11 @@ static gsi::Methods methods_QMimeData () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QMimeData (qtdecl_QObject (), "QMimeData_Native", +qt_gsi::QtNativeClass decl_QMimeData (qtdecl_QObject (), "QtCore", "QMimeData_Native", methods_QMimeData (), "@hide\n@alias QMimeData"); -GSIQT_PUBLIC gsi::Class &qtdecl_QMimeData () { return decl_QMimeData; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QMimeData () { return decl_QMimeData; } } @@ -1042,7 +1042,7 @@ static gsi::Methods methods_QMimeData_Adaptor () { return methods; } -gsi::Class decl_QMimeData_Adaptor (qtdecl_QMimeData (), "QMimeData", +gsi::Class decl_QMimeData_Adaptor (qtdecl_QMimeData (), "QtCore", "QMimeData", methods_QMimeData_Adaptor (), "@qt\n@brief Binding of QMimeData"); diff --git a/src/gsiqt4/gsiDeclQModelIndex.cc b/src/gsiqt/qt4/QtCore/gsiDeclQModelIndex.cc similarity index 98% rename from src/gsiqt4/gsiDeclQModelIndex.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQModelIndex.cc index 284e6af7a..76437adac 100644 --- a/src/gsiqt4/gsiDeclQModelIndex.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQModelIndex.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -336,12 +336,12 @@ static gsi::Methods methods_QModelIndex () { return methods; } -gsi::Class decl_QModelIndex ("QModelIndex", +gsi::Class decl_QModelIndex ("QtCore", "QModelIndex", methods_QModelIndex (), "@qt\n@brief Binding of QModelIndex"); -GSIQT_PUBLIC gsi::Class &qtdecl_QModelIndex () { return decl_QModelIndex; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QModelIndex () { return decl_QModelIndex; } } diff --git a/src/gsiqt4/gsiDeclQMutex.cc b/src/gsiqt/qt4/QtCore/gsiDeclQMutex.cc similarity index 92% rename from src/gsiqt4/gsiDeclQMutex.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQMutex.cc index 5674068d8..a61b3ca44 100644 --- a/src/gsiqt4/gsiDeclQMutex.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQMutex.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -135,12 +135,12 @@ static gsi::Methods methods_QMutex () { return methods; } -gsi::Class decl_QMutex ("QMutex", +gsi::Class decl_QMutex ("QtCore", "QMutex", methods_QMutex (), "@qt\n@brief Binding of QMutex"); -GSIQT_PUBLIC gsi::Class &qtdecl_QMutex () { return decl_QMutex; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QMutex () { return decl_QMutex; } } @@ -149,18 +149,18 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QMutex () { return decl_QMutex; } namespace qt_gsi { -static gsi::Enum decl_QMutex_RecursionMode_Enum ("QMutex_RecursionMode", +static gsi::Enum decl_QMutex_RecursionMode_Enum ("QtCore", "QMutex_RecursionMode", gsi::enum_const ("NonRecursive", QMutex::NonRecursive, "@brief Enum constant QMutex::NonRecursive") + gsi::enum_const ("Recursive", QMutex::Recursive, "@brief Enum constant QMutex::Recursive"), "@qt\n@brief This class represents the QMutex::RecursionMode enum"); -static gsi::QFlagsClass decl_QMutex_RecursionMode_Enums ("QMutex_QFlags_RecursionMode", +static gsi::QFlagsClass decl_QMutex_RecursionMode_Enums ("QtCore", "QMutex_QFlags_RecursionMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QMutex_RecursionMode_Enum_in_parent (decl_QMutex_RecursionMode_Enum.defs ()); -static gsi::ClassExt decl_QMutex_RecursionMode_Enum_as_child (decl_QMutex_RecursionMode_Enum, "RecursionMode"); -static gsi::ClassExt decl_QMutex_RecursionMode_Enums_as_child (decl_QMutex_RecursionMode_Enums, "QFlags_RecursionMode"); +static gsi::ClassExt decl_QMutex_RecursionMode_Enum_as_child (decl_QMutex_RecursionMode_Enum, "QtCore", "RecursionMode"); +static gsi::ClassExt decl_QMutex_RecursionMode_Enums_as_child (decl_QMutex_RecursionMode_Enums, "QtCore", "QFlags_RecursionMode"); } diff --git a/src/gsiqt4/gsiDeclQObject.cc b/src/gsiqt/qt4/QtCore/gsiDeclQObject.cc similarity index 99% rename from src/gsiqt4/gsiDeclQObject.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQObject.cc index f7d09e123..a5ef25f34 100644 --- a/src/gsiqt4/gsiDeclQObject.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQObject.cc @@ -33,8 +33,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -751,13 +751,13 @@ static gsi::Methods methods_QObject () { return methods; } -qt_gsi::QtNativeClass decl_QObject ("QObject_Native", +qt_gsi::QtNativeClass decl_QObject ("QtCore", "QObject_Native", gsi::method_ext("findChild", &find_child_impl, "@brief Specialisation for findChild (uses QObject as T).") + methods_QObject (), "@hide\n@alias QObject"); -GSIQT_PUBLIC gsi::Class &qtdecl_QObject () { return decl_QObject; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QObject () { return decl_QObject; } } @@ -1135,7 +1135,7 @@ static gsi::Methods methods_QObject_Adaptor () { return methods; } -gsi::Class decl_QObject_Adaptor (qtdecl_QObject (), "QObject", +gsi::Class decl_QObject_Adaptor (qtdecl_QObject (), "QtCore", "QObject", methods_QObject_Adaptor (), "@qt\n@brief Binding of QObject"); diff --git a/src/gsiqt4/gsiDeclQPersistentModelIndex.cc b/src/gsiqt/qt4/QtCore/gsiDeclQPersistentModelIndex.cc similarity index 98% rename from src/gsiqt4/gsiDeclQPersistentModelIndex.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQPersistentModelIndex.cc index d172f2446..d4a0e5f7d 100644 --- a/src/gsiqt4/gsiDeclQPersistentModelIndex.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQPersistentModelIndex.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -441,14 +441,14 @@ static gsi::Methods methods_QPersistentModelIndex () { return methods; } -gsi::Class decl_QPersistentModelIndex ("QPersistentModelIndex", +gsi::Class decl_QPersistentModelIndex ("QtCore", "QPersistentModelIndex", gsi::method_ext("castToQModelIndex", &castToQModelIndex, "@brief Binding for \"operator const QModelIndex &\".") + methods_QPersistentModelIndex (), "@qt\n@brief Binding of QPersistentModelIndex"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPersistentModelIndex () { return decl_QPersistentModelIndex; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QPersistentModelIndex () { return decl_QPersistentModelIndex; } } diff --git a/src/gsiqt4/gsiDeclQPluginLoader.cc b/src/gsiqt/qt4/QtCore/gsiDeclQPluginLoader.cc similarity index 99% rename from src/gsiqt4/gsiDeclQPluginLoader.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQPluginLoader.cc index 99b86c731..15768d1ef 100644 --- a/src/gsiqt4/gsiDeclQPluginLoader.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQPluginLoader.cc @@ -34,8 +34,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -334,11 +334,11 @@ static gsi::Methods methods_QPluginLoader () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QPluginLoader (qtdecl_QObject (), "QPluginLoader_Native", +qt_gsi::QtNativeClass decl_QPluginLoader (qtdecl_QObject (), "QtCore", "QPluginLoader_Native", methods_QPluginLoader (), "@hide\n@alias QPluginLoader"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPluginLoader () { return decl_QPluginLoader; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QPluginLoader () { return decl_QPluginLoader; } } @@ -750,7 +750,7 @@ static gsi::Methods methods_QPluginLoader_Adaptor () { return methods; } -gsi::Class decl_QPluginLoader_Adaptor (qtdecl_QPluginLoader (), "QPluginLoader", +gsi::Class decl_QPluginLoader_Adaptor (qtdecl_QPluginLoader (), "QtCore", "QPluginLoader", methods_QPluginLoader_Adaptor (), "@qt\n@brief Binding of QPluginLoader"); diff --git a/src/gsiqt4/gsiDeclQPoint.cc b/src/gsiqt/qt4/QtCore/gsiDeclQPoint.cc similarity index 89% rename from src/gsiqt4/gsiDeclQPoint.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQPoint.cc index 000c41dba..a96ce75bc 100644 --- a/src/gsiqt4/gsiDeclQPoint.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQPoint.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -316,21 +316,6 @@ static const QPoint op_QPoint_operator_slash__2777(const QPoint *_self, qreal c) return ::operator/(*_self, c); } -// QPoint ::operator*(const QPoint &p, const QMatrix &m) -static QPoint op_QPoint_operator_star__3831(const QPoint *_self, const QMatrix &m) { - return ::operator*(*_self, m); -} - -// QPoint ::operator*(const QPoint &p, const QTransform &m) -static QPoint op_QPoint_operator_star__4158(const QPoint *_self, const QTransform &m) { - return ::operator*(*_self, m); -} - -// QPoint ::operator*(const QPoint &point, const QMatrix4x4 &matrix) -static QPoint op_QPoint_operator_star__4055u1(const QPoint *_self, const QMatrix4x4 &matrix) { - return ::operator*(*_self, matrix); -} - namespace gsi { @@ -358,18 +343,15 @@ static gsi::Methods methods_QPoint () { methods += gsi::method_ext("*", &::op_QPoint_operator_star__2777, gsi::arg ("c"), "@brief Operator const QPoint ::operator*(const QPoint &p, qreal c)\nThis is the mapping of the global operator to the instance method."); methods += gsi::method_ext("-", &::op_QPoint_operator_minus__1916, "@brief Operator const QPoint ::operator-(const QPoint &p)\nThis is the mapping of the global operator to the instance method."); methods += gsi::method_ext("/", &::op_QPoint_operator_slash__2777, gsi::arg ("c"), "@brief Operator const QPoint ::operator/(const QPoint &p, qreal c)\nThis is the mapping of the global operator to the instance method."); - methods += gsi::method_ext("*", &::op_QPoint_operator_star__3831, gsi::arg ("m"), "@brief Operator QPoint ::operator*(const QPoint &p, const QMatrix &m)\nThis is the mapping of the global operator to the instance method."); - methods += gsi::method_ext("*", &::op_QPoint_operator_star__4158, gsi::arg ("m"), "@brief Operator QPoint ::operator*(const QPoint &p, const QTransform &m)\nThis is the mapping of the global operator to the instance method."); - methods += gsi::method_ext("*", &::op_QPoint_operator_star__4055u1, gsi::arg ("matrix"), "@brief Operator QPoint ::operator*(const QPoint &point, const QMatrix4x4 &matrix)\nThis is the mapping of the global operator to the instance method."); return methods; } -gsi::Class decl_QPoint ("QPoint", +gsi::Class decl_QPoint ("QtCore", "QPoint", methods_QPoint (), "@qt\n@brief Binding of QPoint"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPoint () { return decl_QPoint; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QPoint () { return decl_QPoint; } } diff --git a/src/gsiqt4/gsiDeclQPointF.cc b/src/gsiqt/qt4/QtCore/gsiDeclQPointF.cc similarity index 90% rename from src/gsiqt4/gsiDeclQPointF.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQPointF.cc index a072a0fe4..830310cdd 100644 --- a/src/gsiqt4/gsiDeclQPointF.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQPointF.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -350,21 +350,6 @@ static const QPointF op_QPointF_operator_slash__2847(const QPointF *_self, qreal return ::operator/(*_self, c); } -// QPointF ::operator*(const QPointF &p, const QMatrix &m) -static QPointF op_QPointF_operator_star__3901(const QPointF *_self, const QMatrix &m) { - return ::operator*(*_self, m); -} - -// QPointF ::operator*(const QPointF &p, const QTransform &m) -static QPointF op_QPointF_operator_star__4228(const QPointF *_self, const QTransform &m) { - return ::operator*(*_self, m); -} - -// QPointF ::operator*(const QPointF &point, const QMatrix4x4 &matrix) -static QPointF op_QPointF_operator_star__4125u1(const QPointF *_self, const QMatrix4x4 &matrix) { - return ::operator*(*_self, matrix); -} - namespace gsi { @@ -394,18 +379,15 @@ static gsi::Methods methods_QPointF () { methods += gsi::method_ext("*", &::op_QPointF_operator_star__2847, gsi::arg ("c"), "@brief Operator const QPointF ::operator*(const QPointF &p, qreal c)\nThis is the mapping of the global operator to the instance method."); methods += gsi::method_ext("-", &::op_QPointF_operator_minus__1986, "@brief Operator const QPointF ::operator-(const QPointF &p)\nThis is the mapping of the global operator to the instance method."); methods += gsi::method_ext("/", &::op_QPointF_operator_slash__2847, gsi::arg ("c"), "@brief Operator const QPointF ::operator/(const QPointF &p, qreal c)\nThis is the mapping of the global operator to the instance method."); - methods += gsi::method_ext("*", &::op_QPointF_operator_star__3901, gsi::arg ("m"), "@brief Operator QPointF ::operator*(const QPointF &p, const QMatrix &m)\nThis is the mapping of the global operator to the instance method."); - methods += gsi::method_ext("*", &::op_QPointF_operator_star__4228, gsi::arg ("m"), "@brief Operator QPointF ::operator*(const QPointF &p, const QTransform &m)\nThis is the mapping of the global operator to the instance method."); - methods += gsi::method_ext("*", &::op_QPointF_operator_star__4125u1, gsi::arg ("matrix"), "@brief Operator QPointF ::operator*(const QPointF &point, const QMatrix4x4 &matrix)\nThis is the mapping of the global operator to the instance method."); return methods; } -gsi::Class decl_QPointF ("QPointF", +gsi::Class decl_QPointF ("QtCore", "QPointF", methods_QPointF (), "@qt\n@brief Binding of QPointF"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPointF () { return decl_QPointF; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QPointF () { return decl_QPointF; } } diff --git a/src/gsiqt4/gsiDeclQProcess.cc b/src/gsiqt/qt4/QtCore/gsiDeclQProcess.cc similarity index 97% rename from src/gsiqt4/gsiDeclQProcess.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQProcess.cc index 973dbd8d7..d4ad4c0df 100644 --- a/src/gsiqt4/gsiDeclQProcess.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQProcess.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1052,12 +1052,12 @@ static gsi::Methods methods_QProcess () { gsi::Class &qtdecl_QIODevice (); -qt_gsi::QtNativeClass decl_QProcess (qtdecl_QIODevice (), "QProcess", +qt_gsi::QtNativeClass decl_QProcess (qtdecl_QIODevice (), "QtCore", "QProcess", methods_QProcess (), "@qt\n@brief Binding of QProcess"); -GSIQT_PUBLIC gsi::Class &qtdecl_QProcess () { return decl_QProcess; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QProcess () { return decl_QProcess; } } @@ -1066,18 +1066,18 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QProcess () { return decl_QProcess; } namespace qt_gsi { -static gsi::Enum decl_QProcess_ExitStatus_Enum ("QProcess_ExitStatus", +static gsi::Enum decl_QProcess_ExitStatus_Enum ("QtCore", "QProcess_ExitStatus", gsi::enum_const ("NormalExit", QProcess::NormalExit, "@brief Enum constant QProcess::NormalExit") + gsi::enum_const ("CrashExit", QProcess::CrashExit, "@brief Enum constant QProcess::CrashExit"), "@qt\n@brief This class represents the QProcess::ExitStatus enum"); -static gsi::QFlagsClass decl_QProcess_ExitStatus_Enums ("QProcess_QFlags_ExitStatus", +static gsi::QFlagsClass decl_QProcess_ExitStatus_Enums ("QtCore", "QProcess_QFlags_ExitStatus", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QProcess_ExitStatus_Enum_in_parent (decl_QProcess_ExitStatus_Enum.defs ()); -static gsi::ClassExt decl_QProcess_ExitStatus_Enum_as_child (decl_QProcess_ExitStatus_Enum, "ExitStatus"); -static gsi::ClassExt decl_QProcess_ExitStatus_Enums_as_child (decl_QProcess_ExitStatus_Enums, "QFlags_ExitStatus"); +static gsi::ClassExt decl_QProcess_ExitStatus_Enum_as_child (decl_QProcess_ExitStatus_Enum, "QtCore", "ExitStatus"); +static gsi::ClassExt decl_QProcess_ExitStatus_Enums_as_child (decl_QProcess_ExitStatus_Enums, "QtCore", "QFlags_ExitStatus"); } @@ -1086,18 +1086,18 @@ static gsi::ClassExt decl_QProcess_ExitStatus_Enums_as_child (decl_QPr namespace qt_gsi { -static gsi::Enum decl_QProcess_ProcessChannel_Enum ("QProcess_ProcessChannel", +static gsi::Enum decl_QProcess_ProcessChannel_Enum ("QtCore", "QProcess_ProcessChannel", gsi::enum_const ("StandardOutput", QProcess::StandardOutput, "@brief Enum constant QProcess::StandardOutput") + gsi::enum_const ("StandardError", QProcess::StandardError, "@brief Enum constant QProcess::StandardError"), "@qt\n@brief This class represents the QProcess::ProcessChannel enum"); -static gsi::QFlagsClass decl_QProcess_ProcessChannel_Enums ("QProcess_QFlags_ProcessChannel", +static gsi::QFlagsClass decl_QProcess_ProcessChannel_Enums ("QtCore", "QProcess_QFlags_ProcessChannel", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QProcess_ProcessChannel_Enum_in_parent (decl_QProcess_ProcessChannel_Enum.defs ()); -static gsi::ClassExt decl_QProcess_ProcessChannel_Enum_as_child (decl_QProcess_ProcessChannel_Enum, "ProcessChannel"); -static gsi::ClassExt decl_QProcess_ProcessChannel_Enums_as_child (decl_QProcess_ProcessChannel_Enums, "QFlags_ProcessChannel"); +static gsi::ClassExt decl_QProcess_ProcessChannel_Enum_as_child (decl_QProcess_ProcessChannel_Enum, "QtCore", "ProcessChannel"); +static gsi::ClassExt decl_QProcess_ProcessChannel_Enums_as_child (decl_QProcess_ProcessChannel_Enums, "QtCore", "QFlags_ProcessChannel"); } @@ -1106,19 +1106,19 @@ static gsi::ClassExt decl_QProcess_ProcessChannel_Enums_as_child (decl namespace qt_gsi { -static gsi::Enum decl_QProcess_ProcessChannelMode_Enum ("QProcess_ProcessChannelMode", +static gsi::Enum decl_QProcess_ProcessChannelMode_Enum ("QtCore", "QProcess_ProcessChannelMode", gsi::enum_const ("SeparateChannels", QProcess::SeparateChannels, "@brief Enum constant QProcess::SeparateChannels") + gsi::enum_const ("MergedChannels", QProcess::MergedChannels, "@brief Enum constant QProcess::MergedChannels") + gsi::enum_const ("ForwardedChannels", QProcess::ForwardedChannels, "@brief Enum constant QProcess::ForwardedChannels"), "@qt\n@brief This class represents the QProcess::ProcessChannelMode enum"); -static gsi::QFlagsClass decl_QProcess_ProcessChannelMode_Enums ("QProcess_QFlags_ProcessChannelMode", +static gsi::QFlagsClass decl_QProcess_ProcessChannelMode_Enums ("QtCore", "QProcess_QFlags_ProcessChannelMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QProcess_ProcessChannelMode_Enum_in_parent (decl_QProcess_ProcessChannelMode_Enum.defs ()); -static gsi::ClassExt decl_QProcess_ProcessChannelMode_Enum_as_child (decl_QProcess_ProcessChannelMode_Enum, "ProcessChannelMode"); -static gsi::ClassExt decl_QProcess_ProcessChannelMode_Enums_as_child (decl_QProcess_ProcessChannelMode_Enums, "QFlags_ProcessChannelMode"); +static gsi::ClassExt decl_QProcess_ProcessChannelMode_Enum_as_child (decl_QProcess_ProcessChannelMode_Enum, "QtCore", "ProcessChannelMode"); +static gsi::ClassExt decl_QProcess_ProcessChannelMode_Enums_as_child (decl_QProcess_ProcessChannelMode_Enums, "QtCore", "QFlags_ProcessChannelMode"); } @@ -1127,7 +1127,7 @@ static gsi::ClassExt decl_QProcess_ProcessChannelMode_Enums_as_child ( namespace qt_gsi { -static gsi::Enum decl_QProcess_ProcessError_Enum ("QProcess_ProcessError", +static gsi::Enum decl_QProcess_ProcessError_Enum ("QtCore", "QProcess_ProcessError", gsi::enum_const ("FailedToStart", QProcess::FailedToStart, "@brief Enum constant QProcess::FailedToStart") + gsi::enum_const ("Crashed", QProcess::Crashed, "@brief Enum constant QProcess::Crashed") + gsi::enum_const ("Timedout", QProcess::Timedout, "@brief Enum constant QProcess::Timedout") + @@ -1136,13 +1136,13 @@ static gsi::Enum decl_QProcess_ProcessError_Enum ("QProc gsi::enum_const ("UnknownError", QProcess::UnknownError, "@brief Enum constant QProcess::UnknownError"), "@qt\n@brief This class represents the QProcess::ProcessError enum"); -static gsi::QFlagsClass decl_QProcess_ProcessError_Enums ("QProcess_QFlags_ProcessError", +static gsi::QFlagsClass decl_QProcess_ProcessError_Enums ("QtCore", "QProcess_QFlags_ProcessError", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QProcess_ProcessError_Enum_in_parent (decl_QProcess_ProcessError_Enum.defs ()); -static gsi::ClassExt decl_QProcess_ProcessError_Enum_as_child (decl_QProcess_ProcessError_Enum, "ProcessError"); -static gsi::ClassExt decl_QProcess_ProcessError_Enums_as_child (decl_QProcess_ProcessError_Enums, "QFlags_ProcessError"); +static gsi::ClassExt decl_QProcess_ProcessError_Enum_as_child (decl_QProcess_ProcessError_Enum, "QtCore", "ProcessError"); +static gsi::ClassExt decl_QProcess_ProcessError_Enums_as_child (decl_QProcess_ProcessError_Enums, "QtCore", "QFlags_ProcessError"); } @@ -1151,19 +1151,19 @@ static gsi::ClassExt decl_QProcess_ProcessError_Enums_as_child (decl_Q namespace qt_gsi { -static gsi::Enum decl_QProcess_ProcessState_Enum ("QProcess_ProcessState", +static gsi::Enum decl_QProcess_ProcessState_Enum ("QtCore", "QProcess_ProcessState", gsi::enum_const ("NotRunning", QProcess::NotRunning, "@brief Enum constant QProcess::NotRunning") + gsi::enum_const ("Starting", QProcess::Starting, "@brief Enum constant QProcess::Starting") + gsi::enum_const ("Running", QProcess::Running, "@brief Enum constant QProcess::Running"), "@qt\n@brief This class represents the QProcess::ProcessState enum"); -static gsi::QFlagsClass decl_QProcess_ProcessState_Enums ("QProcess_QFlags_ProcessState", +static gsi::QFlagsClass decl_QProcess_ProcessState_Enums ("QtCore", "QProcess_QFlags_ProcessState", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QProcess_ProcessState_Enum_in_parent (decl_QProcess_ProcessState_Enum.defs ()); -static gsi::ClassExt decl_QProcess_ProcessState_Enum_as_child (decl_QProcess_ProcessState_Enum, "ProcessState"); -static gsi::ClassExt decl_QProcess_ProcessState_Enums_as_child (decl_QProcess_ProcessState_Enums, "QFlags_ProcessState"); +static gsi::ClassExt decl_QProcess_ProcessState_Enum_as_child (decl_QProcess_ProcessState_Enum, "QtCore", "ProcessState"); +static gsi::ClassExt decl_QProcess_ProcessState_Enums_as_child (decl_QProcess_ProcessState_Enums, "QtCore", "QFlags_ProcessState"); } diff --git a/src/gsiqt4/gsiDeclQProcessEnvironment.cc b/src/gsiqt/qt4/QtCore/gsiDeclQProcessEnvironment.cc similarity index 97% rename from src/gsiqt4/gsiDeclQProcessEnvironment.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQProcessEnvironment.cc index bfd31fe9c..c1d18c548 100644 --- a/src/gsiqt4/gsiDeclQProcessEnvironment.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQProcessEnvironment.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -294,12 +294,12 @@ static gsi::Methods methods_QProcessEnvironment () { return methods; } -gsi::Class decl_QProcessEnvironment ("QProcessEnvironment", +gsi::Class decl_QProcessEnvironment ("QtCore", "QProcessEnvironment", methods_QProcessEnvironment (), "@qt\n@brief Binding of QProcessEnvironment"); -GSIQT_PUBLIC gsi::Class &qtdecl_QProcessEnvironment () { return decl_QProcessEnvironment; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QProcessEnvironment () { return decl_QProcessEnvironment; } } diff --git a/src/gsiqt4/gsiDeclQReadLocker.cc b/src/gsiqt/qt4/QtCore/gsiDeclQReadLocker.cc similarity index 94% rename from src/gsiqt4/gsiDeclQReadLocker.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQReadLocker.cc index 006f02388..e1c03673e 100644 --- a/src/gsiqt4/gsiDeclQReadLocker.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQReadLocker.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -116,12 +116,12 @@ static gsi::Methods methods_QReadLocker () { return methods; } -gsi::Class decl_QReadLocker ("QReadLocker", +gsi::Class decl_QReadLocker ("QtCore", "QReadLocker", methods_QReadLocker (), "@qt\n@brief Binding of QReadLocker"); -GSIQT_PUBLIC gsi::Class &qtdecl_QReadLocker () { return decl_QReadLocker; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QReadLocker () { return decl_QReadLocker; } } diff --git a/src/gsiqt4/gsiDeclQReadWriteLock.cc b/src/gsiqt/qt4/QtCore/gsiDeclQReadWriteLock.cc similarity index 94% rename from src/gsiqt4/gsiDeclQReadWriteLock.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQReadWriteLock.cc index 5fd071bb8..ff6acb3ff 100644 --- a/src/gsiqt4/gsiDeclQReadWriteLock.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQReadWriteLock.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -204,12 +204,12 @@ static gsi::Methods methods_QReadWriteLock () { return methods; } -gsi::Class decl_QReadWriteLock ("QReadWriteLock", +gsi::Class decl_QReadWriteLock ("QtCore", "QReadWriteLock", methods_QReadWriteLock (), "@qt\n@brief Binding of QReadWriteLock"); -GSIQT_PUBLIC gsi::Class &qtdecl_QReadWriteLock () { return decl_QReadWriteLock; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QReadWriteLock () { return decl_QReadWriteLock; } } @@ -218,18 +218,18 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QReadWriteLock () { return decl_ namespace qt_gsi { -static gsi::Enum decl_QReadWriteLock_RecursionMode_Enum ("QReadWriteLock_RecursionMode", +static gsi::Enum decl_QReadWriteLock_RecursionMode_Enum ("QtCore", "QReadWriteLock_RecursionMode", gsi::enum_const ("NonRecursive", QReadWriteLock::NonRecursive, "@brief Enum constant QReadWriteLock::NonRecursive") + gsi::enum_const ("Recursive", QReadWriteLock::Recursive, "@brief Enum constant QReadWriteLock::Recursive"), "@qt\n@brief This class represents the QReadWriteLock::RecursionMode enum"); -static gsi::QFlagsClass decl_QReadWriteLock_RecursionMode_Enums ("QReadWriteLock_QFlags_RecursionMode", +static gsi::QFlagsClass decl_QReadWriteLock_RecursionMode_Enums ("QtCore", "QReadWriteLock_QFlags_RecursionMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QReadWriteLock_RecursionMode_Enum_in_parent (decl_QReadWriteLock_RecursionMode_Enum.defs ()); -static gsi::ClassExt decl_QReadWriteLock_RecursionMode_Enum_as_child (decl_QReadWriteLock_RecursionMode_Enum, "RecursionMode"); -static gsi::ClassExt decl_QReadWriteLock_RecursionMode_Enums_as_child (decl_QReadWriteLock_RecursionMode_Enums, "QFlags_RecursionMode"); +static gsi::ClassExt decl_QReadWriteLock_RecursionMode_Enum_as_child (decl_QReadWriteLock_RecursionMode_Enum, "QtCore", "RecursionMode"); +static gsi::ClassExt decl_QReadWriteLock_RecursionMode_Enums_as_child (decl_QReadWriteLock_RecursionMode_Enums, "QtCore", "QFlags_RecursionMode"); } diff --git a/src/gsiqt4/gsiDeclQRect.cc b/src/gsiqt/qt4/QtCore/gsiDeclQRect.cc similarity index 99% rename from src/gsiqt4/gsiDeclQRect.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQRect.cc index efeec9fa1..531d18ac0 100644 --- a/src/gsiqt4/gsiDeclQRect.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQRect.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1487,12 +1487,12 @@ static gsi::Methods methods_QRect () { return methods; } -gsi::Class decl_QRect ("QRect", +gsi::Class decl_QRect ("QtCore", "QRect", methods_QRect (), "@qt\n@brief Binding of QRect"); -GSIQT_PUBLIC gsi::Class &qtdecl_QRect () { return decl_QRect; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QRect () { return decl_QRect; } } diff --git a/src/gsiqt4/gsiDeclQRectF.cc b/src/gsiqt/qt4/QtCore/gsiDeclQRectF.cc similarity index 99% rename from src/gsiqt4/gsiDeclQRectF.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQRectF.cc index 2500f1df3..4b1fba2c9 100644 --- a/src/gsiqt4/gsiDeclQRectF.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQRectF.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1508,12 +1508,12 @@ static gsi::Methods methods_QRectF () { return methods; } -gsi::Class decl_QRectF ("QRectF", +gsi::Class decl_QRectF ("QtCore", "QRectF", methods_QRectF (), "@qt\n@brief Binding of QRectF"); -GSIQT_PUBLIC gsi::Class &qtdecl_QRectF () { return decl_QRectF; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QRectF () { return decl_QRectF; } } diff --git a/src/gsiqt4/gsiDeclQRegExp.cc b/src/gsiqt/qt4/QtCore/gsiDeclQRegExp.cc similarity index 97% rename from src/gsiqt4/gsiDeclQRegExp.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQRegExp.cc index 89f1c98c5..e638d413b 100644 --- a/src/gsiqt4/gsiDeclQRegExp.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQRegExp.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -631,12 +631,12 @@ static gsi::Methods methods_QRegExp () { return methods; } -gsi::Class decl_QRegExp ("QRegExp", +gsi::Class decl_QRegExp ("QtCore", "QRegExp", methods_QRegExp (), "@qt\n@brief Binding of QRegExp"); -GSIQT_PUBLIC gsi::Class &qtdecl_QRegExp () { return decl_QRegExp; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QRegExp () { return decl_QRegExp; } } @@ -645,19 +645,19 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QRegExp () { return decl_QRegExp; } namespace qt_gsi { -static gsi::Enum decl_QRegExp_CaretMode_Enum ("QRegExp_CaretMode", +static gsi::Enum decl_QRegExp_CaretMode_Enum ("QtCore", "QRegExp_CaretMode", gsi::enum_const ("CaretAtZero", QRegExp::CaretAtZero, "@brief Enum constant QRegExp::CaretAtZero") + gsi::enum_const ("CaretAtOffset", QRegExp::CaretAtOffset, "@brief Enum constant QRegExp::CaretAtOffset") + gsi::enum_const ("CaretWontMatch", QRegExp::CaretWontMatch, "@brief Enum constant QRegExp::CaretWontMatch"), "@qt\n@brief This class represents the QRegExp::CaretMode enum"); -static gsi::QFlagsClass decl_QRegExp_CaretMode_Enums ("QRegExp_QFlags_CaretMode", +static gsi::QFlagsClass decl_QRegExp_CaretMode_Enums ("QtCore", "QRegExp_QFlags_CaretMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QRegExp_CaretMode_Enum_in_parent (decl_QRegExp_CaretMode_Enum.defs ()); -static gsi::ClassExt decl_QRegExp_CaretMode_Enum_as_child (decl_QRegExp_CaretMode_Enum, "CaretMode"); -static gsi::ClassExt decl_QRegExp_CaretMode_Enums_as_child (decl_QRegExp_CaretMode_Enums, "QFlags_CaretMode"); +static gsi::ClassExt decl_QRegExp_CaretMode_Enum_as_child (decl_QRegExp_CaretMode_Enum, "QtCore", "CaretMode"); +static gsi::ClassExt decl_QRegExp_CaretMode_Enums_as_child (decl_QRegExp_CaretMode_Enums, "QtCore", "QFlags_CaretMode"); } @@ -666,7 +666,7 @@ static gsi::ClassExt decl_QRegExp_CaretMode_Enums_as_child (decl_QRegEx namespace qt_gsi { -static gsi::Enum decl_QRegExp_PatternSyntax_Enum ("QRegExp_PatternSyntax", +static gsi::Enum decl_QRegExp_PatternSyntax_Enum ("QtCore", "QRegExp_PatternSyntax", gsi::enum_const ("RegExp", QRegExp::RegExp, "@brief Enum constant QRegExp::RegExp") + gsi::enum_const ("Wildcard", QRegExp::Wildcard, "@brief Enum constant QRegExp::Wildcard") + gsi::enum_const ("FixedString", QRegExp::FixedString, "@brief Enum constant QRegExp::FixedString") + @@ -675,13 +675,13 @@ static gsi::Enum decl_QRegExp_PatternSyntax_Enum ("QRegE gsi::enum_const ("W3CXmlSchema11", QRegExp::W3CXmlSchema11, "@brief Enum constant QRegExp::W3CXmlSchema11"), "@qt\n@brief This class represents the QRegExp::PatternSyntax enum"); -static gsi::QFlagsClass decl_QRegExp_PatternSyntax_Enums ("QRegExp_QFlags_PatternSyntax", +static gsi::QFlagsClass decl_QRegExp_PatternSyntax_Enums ("QtCore", "QRegExp_QFlags_PatternSyntax", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QRegExp_PatternSyntax_Enum_in_parent (decl_QRegExp_PatternSyntax_Enum.defs ()); -static gsi::ClassExt decl_QRegExp_PatternSyntax_Enum_as_child (decl_QRegExp_PatternSyntax_Enum, "PatternSyntax"); -static gsi::ClassExt decl_QRegExp_PatternSyntax_Enums_as_child (decl_QRegExp_PatternSyntax_Enums, "QFlags_PatternSyntax"); +static gsi::ClassExt decl_QRegExp_PatternSyntax_Enum_as_child (decl_QRegExp_PatternSyntax_Enum, "QtCore", "PatternSyntax"); +static gsi::ClassExt decl_QRegExp_PatternSyntax_Enums_as_child (decl_QRegExp_PatternSyntax_Enums, "QtCore", "QFlags_PatternSyntax"); } diff --git a/src/gsiqt4/gsiDeclQResource.cc b/src/gsiqt/qt4/QtCore/gsiDeclQResource.cc similarity index 98% rename from src/gsiqt4/gsiDeclQResource.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQResource.cc index aa1c61d35..93e7f7b4e 100644 --- a/src/gsiqt4/gsiDeclQResource.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQResource.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -352,12 +352,12 @@ static gsi::Methods methods_QResource () { return methods; } -gsi::Class decl_QResource ("QResource", +gsi::Class decl_QResource ("QtCore", "QResource", methods_QResource (), "@qt\n@brief Binding of QResource"); -GSIQT_PUBLIC gsi::Class &qtdecl_QResource () { return decl_QResource; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QResource () { return decl_QResource; } } diff --git a/src/gsiqt4/gsiDeclQSemaphore.cc b/src/gsiqt/qt4/QtCore/gsiDeclQSemaphore.cc similarity index 96% rename from src/gsiqt4/gsiDeclQSemaphore.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQSemaphore.cc index aaff8b84f..882319bcf 100644 --- a/src/gsiqt4/gsiDeclQSemaphore.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQSemaphore.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -166,12 +166,12 @@ static gsi::Methods methods_QSemaphore () { return methods; } -gsi::Class decl_QSemaphore ("QSemaphore", +gsi::Class decl_QSemaphore ("QtCore", "QSemaphore", methods_QSemaphore (), "@qt\n@brief Binding of QSemaphore"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSemaphore () { return decl_QSemaphore; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QSemaphore () { return decl_QSemaphore; } } diff --git a/src/gsiqt4/gsiDeclQSettings.cc b/src/gsiqt/qt4/QtCore/gsiDeclQSettings.cc similarity index 98% rename from src/gsiqt4/gsiDeclQSettings.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQSettings.cc index e47185541..bcd240eee 100644 --- a/src/gsiqt4/gsiDeclQSettings.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQSettings.cc @@ -34,8 +34,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -725,11 +725,11 @@ static gsi::Methods methods_QSettings () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QSettings (qtdecl_QObject (), "QSettings_Native", +qt_gsi::QtNativeClass decl_QSettings (qtdecl_QObject (), "QtCore", "QSettings_Native", methods_QSettings (), "@hide\n@alias QSettings"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSettings () { return decl_QSettings; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QSettings () { return decl_QSettings; } } @@ -1282,7 +1282,7 @@ static gsi::Methods methods_QSettings_Adaptor () { return methods; } -gsi::Class decl_QSettings_Adaptor (qtdecl_QSettings (), "QSettings", +gsi::Class decl_QSettings_Adaptor (qtdecl_QSettings (), "QtCore", "QSettings", methods_QSettings_Adaptor (), "@qt\n@brief Binding of QSettings"); @@ -1293,7 +1293,7 @@ gsi::Class decl_QSettings_Adaptor (qtdecl_QSettings (), "QSet namespace qt_gsi { -static gsi::Enum decl_QSettings_Format_Enum ("QSettings_Format", +static gsi::Enum decl_QSettings_Format_Enum ("QtCore", "QSettings_Format", gsi::enum_const ("NativeFormat", QSettings::NativeFormat, "@brief Enum constant QSettings::NativeFormat") + gsi::enum_const ("IniFormat", QSettings::IniFormat, "@brief Enum constant QSettings::IniFormat") + gsi::enum_const ("InvalidFormat", QSettings::InvalidFormat, "@brief Enum constant QSettings::InvalidFormat") + @@ -1315,13 +1315,13 @@ static gsi::Enum decl_QSettings_Format_Enum ("QSettings_Forma gsi::enum_const ("CustomFormat16", QSettings::CustomFormat16, "@brief Enum constant QSettings::CustomFormat16"), "@qt\n@brief This class represents the QSettings::Format enum"); -static gsi::QFlagsClass decl_QSettings_Format_Enums ("QSettings_QFlags_Format", +static gsi::QFlagsClass decl_QSettings_Format_Enums ("QtCore", "QSettings_QFlags_Format", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSettings_Format_Enum_in_parent (decl_QSettings_Format_Enum.defs ()); -static gsi::ClassExt decl_QSettings_Format_Enum_as_child (decl_QSettings_Format_Enum, "Format"); -static gsi::ClassExt decl_QSettings_Format_Enums_as_child (decl_QSettings_Format_Enums, "QFlags_Format"); +static gsi::ClassExt decl_QSettings_Format_Enum_as_child (decl_QSettings_Format_Enum, "QtCore", "Format"); +static gsi::ClassExt decl_QSettings_Format_Enums_as_child (decl_QSettings_Format_Enums, "QtCore", "QFlags_Format"); } @@ -1330,18 +1330,18 @@ static gsi::ClassExt decl_QSettings_Format_Enums_as_child (decl_QSett namespace qt_gsi { -static gsi::Enum decl_QSettings_Scope_Enum ("QSettings_Scope", +static gsi::Enum decl_QSettings_Scope_Enum ("QtCore", "QSettings_Scope", gsi::enum_const ("UserScope", QSettings::UserScope, "@brief Enum constant QSettings::UserScope") + gsi::enum_const ("SystemScope", QSettings::SystemScope, "@brief Enum constant QSettings::SystemScope"), "@qt\n@brief This class represents the QSettings::Scope enum"); -static gsi::QFlagsClass decl_QSettings_Scope_Enums ("QSettings_QFlags_Scope", +static gsi::QFlagsClass decl_QSettings_Scope_Enums ("QtCore", "QSettings_QFlags_Scope", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSettings_Scope_Enum_in_parent (decl_QSettings_Scope_Enum.defs ()); -static gsi::ClassExt decl_QSettings_Scope_Enum_as_child (decl_QSettings_Scope_Enum, "Scope"); -static gsi::ClassExt decl_QSettings_Scope_Enums_as_child (decl_QSettings_Scope_Enums, "QFlags_Scope"); +static gsi::ClassExt decl_QSettings_Scope_Enum_as_child (decl_QSettings_Scope_Enum, "QtCore", "Scope"); +static gsi::ClassExt decl_QSettings_Scope_Enums_as_child (decl_QSettings_Scope_Enums, "QtCore", "QFlags_Scope"); } @@ -1350,19 +1350,19 @@ static gsi::ClassExt decl_QSettings_Scope_Enums_as_child (decl_QSetti namespace qt_gsi { -static gsi::Enum decl_QSettings_Status_Enum ("QSettings_Status", +static gsi::Enum decl_QSettings_Status_Enum ("QtCore", "QSettings_Status", gsi::enum_const ("NoError", QSettings::NoError, "@brief Enum constant QSettings::NoError") + gsi::enum_const ("AccessError", QSettings::AccessError, "@brief Enum constant QSettings::AccessError") + gsi::enum_const ("FormatError", QSettings::FormatError, "@brief Enum constant QSettings::FormatError"), "@qt\n@brief This class represents the QSettings::Status enum"); -static gsi::QFlagsClass decl_QSettings_Status_Enums ("QSettings_QFlags_Status", +static gsi::QFlagsClass decl_QSettings_Status_Enums ("QtCore", "QSettings_QFlags_Status", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSettings_Status_Enum_in_parent (decl_QSettings_Status_Enum.defs ()); -static gsi::ClassExt decl_QSettings_Status_Enum_as_child (decl_QSettings_Status_Enum, "Status"); -static gsi::ClassExt decl_QSettings_Status_Enums_as_child (decl_QSettings_Status_Enums, "QFlags_Status"); +static gsi::ClassExt decl_QSettings_Status_Enum_as_child (decl_QSettings_Status_Enum, "QtCore", "Status"); +static gsi::ClassExt decl_QSettings_Status_Enums_as_child (decl_QSettings_Status_Enums, "QtCore", "QFlags_Status"); } diff --git a/src/gsiqt4/gsiDeclQSignalMapper.cc b/src/gsiqt/qt4/QtCore/gsiDeclQSignalMapper.cc similarity index 99% rename from src/gsiqt4/gsiDeclQSignalMapper.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQSignalMapper.cc index f8da762e6..304b11606 100644 --- a/src/gsiqt4/gsiDeclQSignalMapper.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQSignalMapper.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -404,11 +404,11 @@ static gsi::Methods methods_QSignalMapper () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QSignalMapper (qtdecl_QObject (), "QSignalMapper_Native", +qt_gsi::QtNativeClass decl_QSignalMapper (qtdecl_QObject (), "QtCore", "QSignalMapper_Native", methods_QSignalMapper (), "@hide\n@alias QSignalMapper"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSignalMapper () { return decl_QSignalMapper; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QSignalMapper () { return decl_QSignalMapper; } } @@ -886,7 +886,7 @@ static gsi::Methods methods_QSignalMapper_Adaptor () { return methods; } -gsi::Class decl_QSignalMapper_Adaptor (qtdecl_QSignalMapper (), "QSignalMapper", +gsi::Class decl_QSignalMapper_Adaptor (qtdecl_QSignalMapper (), "QtCore", "QSignalMapper", methods_QSignalMapper_Adaptor (), "@qt\n@brief Binding of QSignalMapper"); diff --git a/src/gsiqt4/gsiDeclQSize.cc b/src/gsiqt/qt4/QtCore/gsiDeclQSize.cc similarity index 98% rename from src/gsiqt4/gsiDeclQSize.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQSize.cc index 2d1b601dc..656974e9c 100644 --- a/src/gsiqt4/gsiDeclQSize.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQSize.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -462,12 +462,12 @@ static gsi::Methods methods_QSize () { return methods; } -gsi::Class decl_QSize ("QSize", +gsi::Class decl_QSize ("QtCore", "QSize", methods_QSize (), "@qt\n@brief Binding of QSize"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSize () { return decl_QSize; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QSize () { return decl_QSize; } } diff --git a/src/gsiqt4/gsiDeclQSizeF.cc b/src/gsiqt/qt4/QtCore/gsiDeclQSizeF.cc similarity index 98% rename from src/gsiqt4/gsiDeclQSizeF.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQSizeF.cc index 4a6980d0a..1fd75f94f 100644 --- a/src/gsiqt4/gsiDeclQSizeF.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQSizeF.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -499,12 +499,12 @@ static gsi::Methods methods_QSizeF () { return methods; } -gsi::Class decl_QSizeF ("QSizeF", +gsi::Class decl_QSizeF ("QtCore", "QSizeF", methods_QSizeF (), "@qt\n@brief Binding of QSizeF"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSizeF () { return decl_QSizeF; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QSizeF () { return decl_QSizeF; } } diff --git a/src/gsiqt4/gsiDeclQSocketNotifier.cc b/src/gsiqt/qt4/QtCore/gsiDeclQSocketNotifier.cc similarity index 98% rename from src/gsiqt4/gsiDeclQSocketNotifier.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQSocketNotifier.cc index d3a3a90c7..758ee3492 100644 --- a/src/gsiqt4/gsiDeclQSocketNotifier.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQSocketNotifier.cc @@ -34,8 +34,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -234,11 +234,11 @@ static gsi::Methods methods_QSocketNotifier () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QSocketNotifier (qtdecl_QObject (), "QSocketNotifier_Native", +qt_gsi::QtNativeClass decl_QSocketNotifier (qtdecl_QObject (), "QtCore", "QSocketNotifier_Native", methods_QSocketNotifier (), "@hide\n@alias QSocketNotifier"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSocketNotifier () { return decl_QSocketNotifier; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QSocketNotifier () { return decl_QSocketNotifier; } } @@ -647,7 +647,7 @@ static gsi::Methods methods_QSocketNotifier_Adaptor () { return methods; } -gsi::Class decl_QSocketNotifier_Adaptor (qtdecl_QSocketNotifier (), "QSocketNotifier", +gsi::Class decl_QSocketNotifier_Adaptor (qtdecl_QSocketNotifier (), "QtCore", "QSocketNotifier", methods_QSocketNotifier_Adaptor (), "@qt\n@brief Binding of QSocketNotifier"); @@ -658,19 +658,19 @@ gsi::Class decl_QSocketNotifier_Adaptor (qtdecl_QSocket namespace qt_gsi { -static gsi::Enum decl_QSocketNotifier_Type_Enum ("QSocketNotifier_Type", +static gsi::Enum decl_QSocketNotifier_Type_Enum ("QtCore", "QSocketNotifier_Type", gsi::enum_const ("Read", QSocketNotifier::Read, "@brief Enum constant QSocketNotifier::Read") + gsi::enum_const ("Write", QSocketNotifier::Write, "@brief Enum constant QSocketNotifier::Write") + gsi::enum_const ("Exception", QSocketNotifier::Exception, "@brief Enum constant QSocketNotifier::Exception"), "@qt\n@brief This class represents the QSocketNotifier::Type enum"); -static gsi::QFlagsClass decl_QSocketNotifier_Type_Enums ("QSocketNotifier_QFlags_Type", +static gsi::QFlagsClass decl_QSocketNotifier_Type_Enums ("QtCore", "QSocketNotifier_QFlags_Type", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSocketNotifier_Type_Enum_in_parent (decl_QSocketNotifier_Type_Enum.defs ()); -static gsi::ClassExt decl_QSocketNotifier_Type_Enum_as_child (decl_QSocketNotifier_Type_Enum, "Type"); -static gsi::ClassExt decl_QSocketNotifier_Type_Enums_as_child (decl_QSocketNotifier_Type_Enums, "QFlags_Type"); +static gsi::ClassExt decl_QSocketNotifier_Type_Enum_as_child (decl_QSocketNotifier_Type_Enum, "QtCore", "Type"); +static gsi::ClassExt decl_QSocketNotifier_Type_Enums_as_child (decl_QSocketNotifier_Type_Enums, "QtCore", "QFlags_Type"); } diff --git a/src/gsiqt4/gsiDeclQStringMatcher.cc b/src/gsiqt/qt4/QtCore/gsiDeclQStringMatcher.cc similarity index 97% rename from src/gsiqt4/gsiDeclQStringMatcher.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQStringMatcher.cc index a3477315e..d801a2d54 100644 --- a/src/gsiqt4/gsiDeclQStringMatcher.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQStringMatcher.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -221,12 +221,12 @@ static gsi::Methods methods_QStringMatcher () { return methods; } -gsi::Class decl_QStringMatcher ("QStringMatcher", +gsi::Class decl_QStringMatcher ("QtCore", "QStringMatcher", methods_QStringMatcher (), "@qt\n@brief Binding of QStringMatcher"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStringMatcher () { return decl_QStringMatcher; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QStringMatcher () { return decl_QStringMatcher; } } diff --git a/src/gsiqt4/gsiDeclQSysInfo.cc b/src/gsiqt/qt4/QtCore/gsiDeclQSysInfo.cc similarity index 89% rename from src/gsiqt4/gsiDeclQSysInfo.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQSysInfo.cc index be128e5d6..f4bad1912 100644 --- a/src/gsiqt4/gsiDeclQSysInfo.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQSysInfo.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -61,12 +61,12 @@ static gsi::Methods methods_QSysInfo () { return methods; } -gsi::Class decl_QSysInfo ("QSysInfo", +gsi::Class decl_QSysInfo ("QtCore", "QSysInfo", methods_QSysInfo (), "@qt\n@brief Binding of QSysInfo"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSysInfo () { return decl_QSysInfo; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QSysInfo () { return decl_QSysInfo; } } diff --git a/src/gsiqt4/gsiDeclQSystemLocale.cc b/src/gsiqt/qt4/QtCore/gsiDeclQSystemLocale.cc similarity index 95% rename from src/gsiqt4/gsiDeclQSystemLocale.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQSystemLocale.cc index 640e6962f..4f5857206 100644 --- a/src/gsiqt4/gsiDeclQSystemLocale.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQSystemLocale.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -84,11 +84,11 @@ static gsi::Methods methods_QSystemLocale () { return methods; } -gsi::Class decl_QSystemLocale ("QSystemLocale_Native", +gsi::Class decl_QSystemLocale ("QtCore", "QSystemLocale_Native", methods_QSystemLocale (), "@hide\n@alias QSystemLocale"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSystemLocale () { return decl_QSystemLocale; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QSystemLocale () { return decl_QSystemLocale; } } @@ -215,7 +215,7 @@ static gsi::Methods methods_QSystemLocale_Adaptor () { return methods; } -gsi::Class decl_QSystemLocale_Adaptor (qtdecl_QSystemLocale (), "QSystemLocale", +gsi::Class decl_QSystemLocale_Adaptor (qtdecl_QSystemLocale (), "QtCore", "QSystemLocale", methods_QSystemLocale_Adaptor (), "@qt\n@brief Binding of QSystemLocale"); @@ -226,7 +226,7 @@ gsi::Class decl_QSystemLocale_Adaptor (qtdecl_QSystemLoca namespace qt_gsi { -static gsi::Enum decl_QSystemLocale_QueryType_Enum ("QSystemLocale_QueryType", +static gsi::Enum decl_QSystemLocale_QueryType_Enum ("QtCore", "QSystemLocale_QueryType", gsi::enum_const ("LanguageId", QSystemLocale::LanguageId, "@brief Enum constant QSystemLocale::LanguageId") + gsi::enum_const ("CountryId", QSystemLocale::CountryId, "@brief Enum constant QSystemLocale::CountryId") + gsi::enum_const ("DecimalPoint", QSystemLocale::DecimalPoint, "@brief Enum constant QSystemLocale::DecimalPoint") + @@ -255,13 +255,13 @@ static gsi::Enum decl_QSystemLocale_QueryType_Enum ("Q gsi::enum_const ("PMText", QSystemLocale::PMText, "@brief Enum constant QSystemLocale::PMText"), "@qt\n@brief This class represents the QSystemLocale::QueryType enum"); -static gsi::QFlagsClass decl_QSystemLocale_QueryType_Enums ("QSystemLocale_QFlags_QueryType", +static gsi::QFlagsClass decl_QSystemLocale_QueryType_Enums ("QtCore", "QSystemLocale_QFlags_QueryType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSystemLocale_QueryType_Enum_in_parent (decl_QSystemLocale_QueryType_Enum.defs ()); -static gsi::ClassExt decl_QSystemLocale_QueryType_Enum_as_child (decl_QSystemLocale_QueryType_Enum, "QueryType"); -static gsi::ClassExt decl_QSystemLocale_QueryType_Enums_as_child (decl_QSystemLocale_QueryType_Enums, "QFlags_QueryType"); +static gsi::ClassExt decl_QSystemLocale_QueryType_Enum_as_child (decl_QSystemLocale_QueryType_Enum, "QtCore", "QueryType"); +static gsi::ClassExt decl_QSystemLocale_QueryType_Enums_as_child (decl_QSystemLocale_QueryType_Enums, "QtCore", "QFlags_QueryType"); } diff --git a/src/gsiqt4/gsiDeclQTemporaryFile.cc b/src/gsiqt/qt4/QtCore/gsiDeclQTemporaryFile.cc similarity index 98% rename from src/gsiqt4/gsiDeclQTemporaryFile.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQTemporaryFile.cc index 523804eb2..584dfb2da 100644 --- a/src/gsiqt4/gsiDeclQTemporaryFile.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQTemporaryFile.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -395,12 +395,12 @@ static gsi::Methods methods_QTemporaryFile () { gsi::Class &qtdecl_QFile (); -qt_gsi::QtNativeClass decl_QTemporaryFile (qtdecl_QFile (), "QTemporaryFile", +qt_gsi::QtNativeClass decl_QTemporaryFile (qtdecl_QFile (), "QtCore", "QTemporaryFile", methods_QTemporaryFile (), "@qt\n@brief Binding of QTemporaryFile"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTemporaryFile () { return decl_QTemporaryFile; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QTemporaryFile () { return decl_QTemporaryFile; } } diff --git a/src/gsiqt4/gsiDeclQTextCodec.cc b/src/gsiqt/qt4/QtCore/gsiDeclQTextCodec.cc similarity index 95% rename from src/gsiqt4/gsiDeclQTextCodec.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQTextCodec.cc index 4a17a320f..d5efffda7 100644 --- a/src/gsiqt4/gsiDeclQTextCodec.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQTextCodec.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -501,11 +501,11 @@ static gsi::Methods methods_QTextCodec () { return methods; } -gsi::Class decl_QTextCodec ("QTextCodec_Native", +gsi::Class decl_QTextCodec ("QtCore", "QTextCodec_Native", methods_QTextCodec (), "@hide\n@alias QTextCodec"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextCodec () { return decl_QTextCodec; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QTextCodec () { return decl_QTextCodec; } } @@ -516,6 +516,12 @@ public: virtual ~QTextCodec_Adaptor(); + // [adaptor ctor] QTextCodec::QTextCodec() + QTextCodec_Adaptor() : QTextCodec() + { + qt_gsi::QtObjectBase::init (this); + } + // [adaptor impl] QList QTextCodec::aliases() QList cbs_aliases_c0_0() const { @@ -606,6 +612,20 @@ public: QTextCodec_Adaptor::~QTextCodec_Adaptor() { } +// Constructor QTextCodec::QTextCodec() (adaptor class) + +static void _init_ctor_QTextCodec_Adaptor_0 (qt_gsi::GenericStaticMethod *decl) +{ + decl->set_return_new (); +} + +static void _call_ctor_QTextCodec_Adaptor_0 (const qt_gsi::GenericStaticMethod * /*decl*/, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + ret.write (new QTextCodec_Adaptor ()); +} + + // QList QTextCodec::aliases() static void _init_cbs_aliases_c0_0 (qt_gsi::GenericMethod *decl) @@ -728,6 +748,7 @@ gsi::Class &qtdecl_QTextCodec (); static gsi::Methods methods_QTextCodec_Adaptor () { gsi::Methods methods; + methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QTextCodec::QTextCodec()\nThis method creates an object of class QTextCodec.", &_init_ctor_QTextCodec_Adaptor_0, &_call_ctor_QTextCodec_Adaptor_0); methods += new qt_gsi::GenericMethod ("aliases", "@hide", true, &_init_cbs_aliases_c0_0, &_call_cbs_aliases_c0_0); methods += new qt_gsi::GenericMethod ("aliases", "@brief Virtual method QList QTextCodec::aliases()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_aliases_c0_0, &_call_cbs_aliases_c0_0, &_set_callback_cbs_aliases_c0_0); methods += new qt_gsi::GenericMethod ("*convertFromUnicode", "@hide", true, &_init_cbs_convertFromUnicode_c5514_0, &_call_cbs_convertFromUnicode_c5514_0); @@ -741,7 +762,7 @@ static gsi::Methods methods_QTextCodec_Adaptor () { return methods; } -gsi::Class decl_QTextCodec_Adaptor (qtdecl_QTextCodec (), "QTextCodec", +gsi::Class decl_QTextCodec_Adaptor (qtdecl_QTextCodec (), "QtCore", "QTextCodec", methods_QTextCodec_Adaptor (), "@qt\n@brief Binding of QTextCodec"); @@ -752,20 +773,20 @@ gsi::Class decl_QTextCodec_Adaptor (qtdecl_QTextCodec (), "Q namespace qt_gsi { -static gsi::Enum decl_QTextCodec_ConversionFlag_Enum ("QTextCodec_ConversionFlag", +static gsi::Enum decl_QTextCodec_ConversionFlag_Enum ("QtCore", "QTextCodec_ConversionFlag", gsi::enum_const ("DefaultConversion", QTextCodec::DefaultConversion, "@brief Enum constant QTextCodec::DefaultConversion") + gsi::enum_const ("ConvertInvalidToNull", QTextCodec::ConvertInvalidToNull, "@brief Enum constant QTextCodec::ConvertInvalidToNull") + gsi::enum_const ("IgnoreHeader", QTextCodec::IgnoreHeader, "@brief Enum constant QTextCodec::IgnoreHeader") + gsi::enum_const ("FreeFunction", QTextCodec::FreeFunction, "@brief Enum constant QTextCodec::FreeFunction"), "@qt\n@brief This class represents the QTextCodec::ConversionFlag enum"); -static gsi::QFlagsClass decl_QTextCodec_ConversionFlag_Enums ("QTextCodec_QFlags_ConversionFlag", +static gsi::QFlagsClass decl_QTextCodec_ConversionFlag_Enums ("QtCore", "QTextCodec_QFlags_ConversionFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTextCodec_ConversionFlag_Enum_in_parent (decl_QTextCodec_ConversionFlag_Enum.defs ()); -static gsi::ClassExt decl_QTextCodec_ConversionFlag_Enum_as_child (decl_QTextCodec_ConversionFlag_Enum, "ConversionFlag"); -static gsi::ClassExt decl_QTextCodec_ConversionFlag_Enums_as_child (decl_QTextCodec_ConversionFlag_Enums, "QFlags_ConversionFlag"); +static gsi::ClassExt decl_QTextCodec_ConversionFlag_Enum_as_child (decl_QTextCodec_ConversionFlag_Enum, "QtCore", "ConversionFlag"); +static gsi::ClassExt decl_QTextCodec_ConversionFlag_Enums_as_child (decl_QTextCodec_ConversionFlag_Enums, "QtCore", "QFlags_ConversionFlag"); } diff --git a/src/gsiqt4/gsiDeclQTextCodec_ConverterState.cc b/src/gsiqt/qt4/QtCore/gsiDeclQTextCodec_ConverterState.cc similarity index 89% rename from src/gsiqt4/gsiDeclQTextCodec_ConverterState.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQTextCodec_ConverterState.cc index e55da1eed..5260d8ffb 100644 --- a/src/gsiqt4/gsiDeclQTextCodec_ConverterState.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQTextCodec_ConverterState.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -65,13 +65,13 @@ static gsi::Methods methods_QTextCodec_ConverterState () { return methods; } -gsi::Class decl_QTextCodec_ConverterState ("QTextCodec_ConverterState", +gsi::Class decl_QTextCodec_ConverterState ("QtCore", "QTextCodec_ConverterState", methods_QTextCodec_ConverterState (), "@qt\n@brief Binding of QTextCodec::ConverterState"); -gsi::ClassExt decl_QTextCodec_ConverterState_as_child (decl_QTextCodec_ConverterState, "ConverterState"); +gsi::ClassExt decl_QTextCodec_ConverterState_as_child (decl_QTextCodec_ConverterState, "QtCore", "ConverterState"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextCodec_ConverterState () { return decl_QTextCodec_ConverterState; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QTextCodec_ConverterState () { return decl_QTextCodec_ConverterState; } } diff --git a/src/gsiqt4/gsiDeclQTextDecoder.cc b/src/gsiqt/qt4/QtCore/gsiDeclQTextDecoder.cc similarity index 95% rename from src/gsiqt4/gsiDeclQTextDecoder.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQTextDecoder.cc index 197588485..ae7c2eb14 100644 --- a/src/gsiqt4/gsiDeclQTextDecoder.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQTextDecoder.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -152,12 +152,12 @@ static gsi::Methods methods_QTextDecoder () { return methods; } -gsi::Class decl_QTextDecoder ("QTextDecoder", +gsi::Class decl_QTextDecoder ("QtCore", "QTextDecoder", methods_QTextDecoder (), "@qt\n@brief Binding of QTextDecoder"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextDecoder () { return decl_QTextDecoder; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QTextDecoder () { return decl_QTextDecoder; } } diff --git a/src/gsiqt4/gsiDeclQTextEncoder.cc b/src/gsiqt/qt4/QtCore/gsiDeclQTextEncoder.cc similarity index 93% rename from src/gsiqt4/gsiDeclQTextEncoder.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQTextEncoder.cc index 55df0012b..be489a62f 100644 --- a/src/gsiqt4/gsiDeclQTextEncoder.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQTextEncoder.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -102,12 +102,12 @@ static gsi::Methods methods_QTextEncoder () { return methods; } -gsi::Class decl_QTextEncoder ("QTextEncoder", +gsi::Class decl_QTextEncoder ("QtCore", "QTextEncoder", methods_QTextEncoder (), "@qt\n@brief Binding of QTextEncoder"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextEncoder () { return decl_QTextEncoder; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QTextEncoder () { return decl_QTextEncoder; } } diff --git a/src/gsiqt4/gsiDeclQTextStream.cc b/src/gsiqt/qt4/QtCore/gsiDeclQTextStream.cc similarity index 97% rename from src/gsiqt4/gsiDeclQTextStream.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQTextStream.cc index 4513ce0f1..44669c356 100644 --- a/src/gsiqt4/gsiDeclQTextStream.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQTextStream.cc @@ -34,8 +34,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -910,7 +910,7 @@ static gsi::Methods methods_QTextStream () { return methods; } -gsi::Class decl_QTextStream ("QTextStream_Native", +gsi::Class decl_QTextStream ("QtCore", "QTextStream_Native", gsi::method_ext("read_s", &f_QTextStream_read_s, "@brief Non-ambiguous adaptation of the corresponding operator>>") + gsi::method_ext("read_us", &f_QTextStream_read_us, "@brief Non-ambiguous adaptation of the corresponding operator>>") + gsi::method_ext("read_i", &f_QTextStream_read_i, "@brief Non-ambiguous adaptation of the corresponding operator>>") + @@ -937,7 +937,7 @@ gsi::Class decl_QTextStream ("QTextStream_Native", methods_QTextStream (), "@hide\n@alias QTextStream"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextStream () { return decl_QTextStream; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QTextStream () { return decl_QTextStream; } } @@ -1043,7 +1043,7 @@ static gsi::Methods methods_QTextStream_Adaptor () { return methods; } -gsi::Class decl_QTextStream_Adaptor (qtdecl_QTextStream (), "QTextStream", +gsi::Class decl_QTextStream_Adaptor (qtdecl_QTextStream (), "QtCore", "QTextStream", methods_QTextStream_Adaptor (), "@qt\n@brief Binding of QTextStream"); @@ -1054,20 +1054,20 @@ gsi::Class decl_QTextStream_Adaptor (qtdecl_QTextStream (), namespace qt_gsi { -static gsi::Enum decl_QTextStream_FieldAlignment_Enum ("QTextStream_FieldAlignment", +static gsi::Enum decl_QTextStream_FieldAlignment_Enum ("QtCore", "QTextStream_FieldAlignment", gsi::enum_const ("AlignLeft", QTextStream::AlignLeft, "@brief Enum constant QTextStream::AlignLeft") + gsi::enum_const ("AlignRight", QTextStream::AlignRight, "@brief Enum constant QTextStream::AlignRight") + gsi::enum_const ("AlignCenter", QTextStream::AlignCenter, "@brief Enum constant QTextStream::AlignCenter") + gsi::enum_const ("AlignAccountingStyle", QTextStream::AlignAccountingStyle, "@brief Enum constant QTextStream::AlignAccountingStyle"), "@qt\n@brief This class represents the QTextStream::FieldAlignment enum"); -static gsi::QFlagsClass decl_QTextStream_FieldAlignment_Enums ("QTextStream_QFlags_FieldAlignment", +static gsi::QFlagsClass decl_QTextStream_FieldAlignment_Enums ("QtCore", "QTextStream_QFlags_FieldAlignment", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTextStream_FieldAlignment_Enum_in_parent (decl_QTextStream_FieldAlignment_Enum.defs ()); -static gsi::ClassExt decl_QTextStream_FieldAlignment_Enum_as_child (decl_QTextStream_FieldAlignment_Enum, "FieldAlignment"); -static gsi::ClassExt decl_QTextStream_FieldAlignment_Enums_as_child (decl_QTextStream_FieldAlignment_Enums, "QFlags_FieldAlignment"); +static gsi::ClassExt decl_QTextStream_FieldAlignment_Enum_as_child (decl_QTextStream_FieldAlignment_Enum, "QtCore", "FieldAlignment"); +static gsi::ClassExt decl_QTextStream_FieldAlignment_Enums_as_child (decl_QTextStream_FieldAlignment_Enums, "QtCore", "QFlags_FieldAlignment"); } @@ -1076,7 +1076,7 @@ static gsi::ClassExt decl_QTextStream_FieldAlignment_Enums_as_child namespace qt_gsi { -static gsi::Enum decl_QTextStream_NumberFlag_Enum ("QTextStream_NumberFlag", +static gsi::Enum decl_QTextStream_NumberFlag_Enum ("QtCore", "QTextStream_NumberFlag", gsi::enum_const ("ShowBase", QTextStream::ShowBase, "@brief Enum constant QTextStream::ShowBase") + gsi::enum_const ("ForcePoint", QTextStream::ForcePoint, "@brief Enum constant QTextStream::ForcePoint") + gsi::enum_const ("ForceSign", QTextStream::ForceSign, "@brief Enum constant QTextStream::ForceSign") + @@ -1084,13 +1084,13 @@ static gsi::Enum decl_QTextStream_NumberFlag_Enum ("QTe gsi::enum_const ("UppercaseDigits", QTextStream::UppercaseDigits, "@brief Enum constant QTextStream::UppercaseDigits"), "@qt\n@brief This class represents the QTextStream::NumberFlag enum"); -static gsi::QFlagsClass decl_QTextStream_NumberFlag_Enums ("QTextStream_QFlags_NumberFlag", +static gsi::QFlagsClass decl_QTextStream_NumberFlag_Enums ("QtCore", "QTextStream_QFlags_NumberFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTextStream_NumberFlag_Enum_in_parent (decl_QTextStream_NumberFlag_Enum.defs ()); -static gsi::ClassExt decl_QTextStream_NumberFlag_Enum_as_child (decl_QTextStream_NumberFlag_Enum, "NumberFlag"); -static gsi::ClassExt decl_QTextStream_NumberFlag_Enums_as_child (decl_QTextStream_NumberFlag_Enums, "QFlags_NumberFlag"); +static gsi::ClassExt decl_QTextStream_NumberFlag_Enum_as_child (decl_QTextStream_NumberFlag_Enum, "QtCore", "NumberFlag"); +static gsi::ClassExt decl_QTextStream_NumberFlag_Enums_as_child (decl_QTextStream_NumberFlag_Enums, "QtCore", "QFlags_NumberFlag"); } @@ -1099,19 +1099,19 @@ static gsi::ClassExt decl_QTextStream_NumberFlag_Enums_as_child (de namespace qt_gsi { -static gsi::Enum decl_QTextStream_RealNumberNotation_Enum ("QTextStream_RealNumberNotation", +static gsi::Enum decl_QTextStream_RealNumberNotation_Enum ("QtCore", "QTextStream_RealNumberNotation", gsi::enum_const ("SmartNotation", QTextStream::SmartNotation, "@brief Enum constant QTextStream::SmartNotation") + gsi::enum_const ("FixedNotation", QTextStream::FixedNotation, "@brief Enum constant QTextStream::FixedNotation") + gsi::enum_const ("ScientificNotation", QTextStream::ScientificNotation, "@brief Enum constant QTextStream::ScientificNotation"), "@qt\n@brief This class represents the QTextStream::RealNumberNotation enum"); -static gsi::QFlagsClass decl_QTextStream_RealNumberNotation_Enums ("QTextStream_QFlags_RealNumberNotation", +static gsi::QFlagsClass decl_QTextStream_RealNumberNotation_Enums ("QtCore", "QTextStream_QFlags_RealNumberNotation", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTextStream_RealNumberNotation_Enum_in_parent (decl_QTextStream_RealNumberNotation_Enum.defs ()); -static gsi::ClassExt decl_QTextStream_RealNumberNotation_Enum_as_child (decl_QTextStream_RealNumberNotation_Enum, "RealNumberNotation"); -static gsi::ClassExt decl_QTextStream_RealNumberNotation_Enums_as_child (decl_QTextStream_RealNumberNotation_Enums, "QFlags_RealNumberNotation"); +static gsi::ClassExt decl_QTextStream_RealNumberNotation_Enum_as_child (decl_QTextStream_RealNumberNotation_Enum, "QtCore", "RealNumberNotation"); +static gsi::ClassExt decl_QTextStream_RealNumberNotation_Enums_as_child (decl_QTextStream_RealNumberNotation_Enums, "QtCore", "QFlags_RealNumberNotation"); } @@ -1120,19 +1120,19 @@ static gsi::ClassExt decl_QTextStream_RealNumberNotation_Enums_as_c namespace qt_gsi { -static gsi::Enum decl_QTextStream_Status_Enum ("QTextStream_Status", +static gsi::Enum decl_QTextStream_Status_Enum ("QtCore", "QTextStream_Status", gsi::enum_const ("Ok", QTextStream::Ok, "@brief Enum constant QTextStream::Ok") + gsi::enum_const ("ReadPastEnd", QTextStream::ReadPastEnd, "@brief Enum constant QTextStream::ReadPastEnd") + gsi::enum_const ("ReadCorruptData", QTextStream::ReadCorruptData, "@brief Enum constant QTextStream::ReadCorruptData"), "@qt\n@brief This class represents the QTextStream::Status enum"); -static gsi::QFlagsClass decl_QTextStream_Status_Enums ("QTextStream_QFlags_Status", +static gsi::QFlagsClass decl_QTextStream_Status_Enums ("QtCore", "QTextStream_QFlags_Status", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTextStream_Status_Enum_in_parent (decl_QTextStream_Status_Enum.defs ()); -static gsi::ClassExt decl_QTextStream_Status_Enum_as_child (decl_QTextStream_Status_Enum, "Status"); -static gsi::ClassExt decl_QTextStream_Status_Enums_as_child (decl_QTextStream_Status_Enums, "QFlags_Status"); +static gsi::ClassExt decl_QTextStream_Status_Enum_as_child (decl_QTextStream_Status_Enum, "QtCore", "Status"); +static gsi::ClassExt decl_QTextStream_Status_Enums_as_child (decl_QTextStream_Status_Enums, "QtCore", "QFlags_Status"); } diff --git a/src/gsiqt4/gsiDeclQThread.cc b/src/gsiqt/qt4/QtCore/gsiDeclQThread.cc similarity index 99% rename from src/gsiqt4/gsiDeclQThread.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQThread.cc index 53a81b15b..66cf4cd94 100644 --- a/src/gsiqt4/gsiDeclQThread.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQThread.cc @@ -33,8 +33,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -433,11 +433,11 @@ static gsi::Methods methods_QThread () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QThread (qtdecl_QObject (), "QThread_Native", +qt_gsi::QtNativeClass decl_QThread (qtdecl_QObject (), "QtCore", "QThread_Native", methods_QThread (), "@hide\n@alias QThread"); -GSIQT_PUBLIC gsi::Class &qtdecl_QThread () { return decl_QThread; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QThread () { return decl_QThread; } } @@ -1036,7 +1036,7 @@ static gsi::Methods methods_QThread_Adaptor () { return methods; } -gsi::Class decl_QThread_Adaptor (qtdecl_QThread (), "QThread", +gsi::Class decl_QThread_Adaptor (qtdecl_QThread (), "QtCore", "QThread", methods_QThread_Adaptor (), "@qt\n@brief Binding of QThread"); @@ -1047,7 +1047,7 @@ gsi::Class decl_QThread_Adaptor (qtdecl_QThread (), "QThread", namespace qt_gsi { -static gsi::Enum decl_QThread_Priority_Enum ("QThread_Priority", +static gsi::Enum decl_QThread_Priority_Enum ("QtCore", "QThread_Priority", gsi::enum_const ("IdlePriority", QThread::IdlePriority, "@brief Enum constant QThread::IdlePriority") + gsi::enum_const ("LowestPriority", QThread::LowestPriority, "@brief Enum constant QThread::LowestPriority") + gsi::enum_const ("LowPriority", QThread::LowPriority, "@brief Enum constant QThread::LowPriority") + @@ -1058,13 +1058,13 @@ static gsi::Enum decl_QThread_Priority_Enum ("QThread_Priorit gsi::enum_const ("InheritPriority", QThread::InheritPriority, "@brief Enum constant QThread::InheritPriority"), "@qt\n@brief This class represents the QThread::Priority enum"); -static gsi::QFlagsClass decl_QThread_Priority_Enums ("QThread_QFlags_Priority", +static gsi::QFlagsClass decl_QThread_Priority_Enums ("QtCore", "QThread_QFlags_Priority", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QThread_Priority_Enum_in_parent (decl_QThread_Priority_Enum.defs ()); -static gsi::ClassExt decl_QThread_Priority_Enum_as_child (decl_QThread_Priority_Enum, "Priority"); -static gsi::ClassExt decl_QThread_Priority_Enums_as_child (decl_QThread_Priority_Enums, "QFlags_Priority"); +static gsi::ClassExt decl_QThread_Priority_Enum_as_child (decl_QThread_Priority_Enum, "QtCore", "Priority"); +static gsi::ClassExt decl_QThread_Priority_Enums_as_child (decl_QThread_Priority_Enums, "QtCore", "QFlags_Priority"); } diff --git a/src/gsiqt4/gsiDeclQTime.cc b/src/gsiqt/qt4/QtCore/gsiDeclQTime.cc similarity index 99% rename from src/gsiqt4/gsiDeclQTime.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQTime.cc index 4aa394b23..80d7409b0 100644 --- a/src/gsiqt4/gsiDeclQTime.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQTime.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -595,12 +595,12 @@ static gsi::Methods methods_QTime () { return methods; } -gsi::Class decl_QTime ("QTime", +gsi::Class decl_QTime ("QtCore", "QTime", methods_QTime (), "@qt\n@brief Binding of QTime"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTime () { return decl_QTime; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QTime () { return decl_QTime; } } diff --git a/src/gsiqt4/gsiDeclQTimeLine.cc b/src/gsiqt/qt4/QtCore/gsiDeclQTimeLine.cc similarity index 98% rename from src/gsiqt4/gsiDeclQTimeLine.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQTimeLine.cc index 16911e962..73dc16c25 100644 --- a/src/gsiqt4/gsiDeclQTimeLine.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQTimeLine.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -703,11 +703,11 @@ static gsi::Methods methods_QTimeLine () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QTimeLine (qtdecl_QObject (), "QTimeLine_Native", +qt_gsi::QtNativeClass decl_QTimeLine (qtdecl_QObject (), "QtCore", "QTimeLine_Native", methods_QTimeLine (), "@hide\n@alias QTimeLine"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTimeLine () { return decl_QTimeLine; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QTimeLine () { return decl_QTimeLine; } } @@ -1231,7 +1231,7 @@ static gsi::Methods methods_QTimeLine_Adaptor () { return methods; } -gsi::Class decl_QTimeLine_Adaptor (qtdecl_QTimeLine (), "QTimeLine", +gsi::Class decl_QTimeLine_Adaptor (qtdecl_QTimeLine (), "QtCore", "QTimeLine", methods_QTimeLine_Adaptor (), "@qt\n@brief Binding of QTimeLine"); @@ -1242,7 +1242,7 @@ gsi::Class decl_QTimeLine_Adaptor (qtdecl_QTimeLine (), "QTim namespace qt_gsi { -static gsi::Enum decl_QTimeLine_CurveShape_Enum ("QTimeLine_CurveShape", +static gsi::Enum decl_QTimeLine_CurveShape_Enum ("QtCore", "QTimeLine_CurveShape", gsi::enum_const ("EaseInCurve", QTimeLine::EaseInCurve, "@brief Enum constant QTimeLine::EaseInCurve") + gsi::enum_const ("EaseOutCurve", QTimeLine::EaseOutCurve, "@brief Enum constant QTimeLine::EaseOutCurve") + gsi::enum_const ("EaseInOutCurve", QTimeLine::EaseInOutCurve, "@brief Enum constant QTimeLine::EaseInOutCurve") + @@ -1251,13 +1251,13 @@ static gsi::Enum decl_QTimeLine_CurveShape_Enum ("QTimeLi gsi::enum_const ("CosineCurve", QTimeLine::CosineCurve, "@brief Enum constant QTimeLine::CosineCurve"), "@qt\n@brief This class represents the QTimeLine::CurveShape enum"); -static gsi::QFlagsClass decl_QTimeLine_CurveShape_Enums ("QTimeLine_QFlags_CurveShape", +static gsi::QFlagsClass decl_QTimeLine_CurveShape_Enums ("QtCore", "QTimeLine_QFlags_CurveShape", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTimeLine_CurveShape_Enum_in_parent (decl_QTimeLine_CurveShape_Enum.defs ()); -static gsi::ClassExt decl_QTimeLine_CurveShape_Enum_as_child (decl_QTimeLine_CurveShape_Enum, "CurveShape"); -static gsi::ClassExt decl_QTimeLine_CurveShape_Enums_as_child (decl_QTimeLine_CurveShape_Enums, "QFlags_CurveShape"); +static gsi::ClassExt decl_QTimeLine_CurveShape_Enum_as_child (decl_QTimeLine_CurveShape_Enum, "QtCore", "CurveShape"); +static gsi::ClassExt decl_QTimeLine_CurveShape_Enums_as_child (decl_QTimeLine_CurveShape_Enums, "QtCore", "QFlags_CurveShape"); } @@ -1266,18 +1266,18 @@ static gsi::ClassExt decl_QTimeLine_CurveShape_Enums_as_child (decl_Q namespace qt_gsi { -static gsi::Enum decl_QTimeLine_Direction_Enum ("QTimeLine_Direction", +static gsi::Enum decl_QTimeLine_Direction_Enum ("QtCore", "QTimeLine_Direction", gsi::enum_const ("Forward", QTimeLine::Forward, "@brief Enum constant QTimeLine::Forward") + gsi::enum_const ("Backward", QTimeLine::Backward, "@brief Enum constant QTimeLine::Backward"), "@qt\n@brief This class represents the QTimeLine::Direction enum"); -static gsi::QFlagsClass decl_QTimeLine_Direction_Enums ("QTimeLine_QFlags_Direction", +static gsi::QFlagsClass decl_QTimeLine_Direction_Enums ("QtCore", "QTimeLine_QFlags_Direction", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTimeLine_Direction_Enum_in_parent (decl_QTimeLine_Direction_Enum.defs ()); -static gsi::ClassExt decl_QTimeLine_Direction_Enum_as_child (decl_QTimeLine_Direction_Enum, "Direction"); -static gsi::ClassExt decl_QTimeLine_Direction_Enums_as_child (decl_QTimeLine_Direction_Enums, "QFlags_Direction"); +static gsi::ClassExt decl_QTimeLine_Direction_Enum_as_child (decl_QTimeLine_Direction_Enum, "QtCore", "Direction"); +static gsi::ClassExt decl_QTimeLine_Direction_Enums_as_child (decl_QTimeLine_Direction_Enums, "QtCore", "QFlags_Direction"); } @@ -1286,19 +1286,19 @@ static gsi::ClassExt decl_QTimeLine_Direction_Enums_as_child (decl_QT namespace qt_gsi { -static gsi::Enum decl_QTimeLine_State_Enum ("QTimeLine_State", +static gsi::Enum decl_QTimeLine_State_Enum ("QtCore", "QTimeLine_State", gsi::enum_const ("NotRunning", QTimeLine::NotRunning, "@brief Enum constant QTimeLine::NotRunning") + gsi::enum_const ("Paused", QTimeLine::Paused, "@brief Enum constant QTimeLine::Paused") + gsi::enum_const ("Running", QTimeLine::Running, "@brief Enum constant QTimeLine::Running"), "@qt\n@brief This class represents the QTimeLine::State enum"); -static gsi::QFlagsClass decl_QTimeLine_State_Enums ("QTimeLine_QFlags_State", +static gsi::QFlagsClass decl_QTimeLine_State_Enums ("QtCore", "QTimeLine_QFlags_State", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTimeLine_State_Enum_in_parent (decl_QTimeLine_State_Enum.defs ()); -static gsi::ClassExt decl_QTimeLine_State_Enum_as_child (decl_QTimeLine_State_Enum, "State"); -static gsi::ClassExt decl_QTimeLine_State_Enums_as_child (decl_QTimeLine_State_Enums, "QFlags_State"); +static gsi::ClassExt decl_QTimeLine_State_Enum_as_child (decl_QTimeLine_State_Enum, "QtCore", "State"); +static gsi::ClassExt decl_QTimeLine_State_Enums_as_child (decl_QTimeLine_State_Enums, "QtCore", "QFlags_State"); } diff --git a/src/gsiqt4/gsiDeclQTimer.cc b/src/gsiqt/qt4/QtCore/gsiDeclQTimer.cc similarity index 99% rename from src/gsiqt4/gsiDeclQTimer.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQTimer.cc index 01cea0a11..9cfd541df 100644 --- a/src/gsiqt4/gsiDeclQTimer.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQTimer.cc @@ -34,8 +34,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -326,11 +326,11 @@ static gsi::Methods methods_QTimer () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QTimer (qtdecl_QObject (), "QTimer_Native", +qt_gsi::QtNativeClass decl_QTimer (qtdecl_QObject (), "QtCore", "QTimer_Native", methods_QTimer (), "@hide\n@alias QTimer"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTimer () { return decl_QTimer; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QTimer () { return decl_QTimer; } } @@ -729,7 +729,7 @@ static gsi::Methods methods_QTimer_Adaptor () { return methods; } -gsi::Class decl_QTimer_Adaptor (qtdecl_QTimer (), "QTimer", +gsi::Class decl_QTimer_Adaptor (qtdecl_QTimer (), "QtCore", "QTimer", methods_QTimer_Adaptor (), "@qt\n@brief Binding of QTimer"); diff --git a/src/gsiqt4/gsiDeclQTimerEvent.cc b/src/gsiqt/qt4/QtCore/gsiDeclQTimerEvent.cc similarity index 91% rename from src/gsiqt4/gsiDeclQTimerEvent.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQTimerEvent.cc index 0b6bfcd4f..0f2cb055a 100644 --- a/src/gsiqt4/gsiDeclQTimerEvent.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQTimerEvent.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -62,11 +62,11 @@ static gsi::Methods methods_QTimerEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QTimerEvent (qtdecl_QEvent (), "QTimerEvent_Native", +gsi::Class decl_QTimerEvent (qtdecl_QEvent (), "QtCore", "QTimerEvent_Native", methods_QTimerEvent (), "@hide\n@alias QTimerEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTimerEvent () { return decl_QTimerEvent; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QTimerEvent () { return decl_QTimerEvent; } } @@ -117,7 +117,7 @@ static gsi::Methods methods_QTimerEvent_Adaptor () { return methods; } -gsi::Class decl_QTimerEvent_Adaptor (qtdecl_QTimerEvent (), "QTimerEvent", +gsi::Class decl_QTimerEvent_Adaptor (qtdecl_QTimerEvent (), "QtCore", "QTimerEvent", methods_QTimerEvent_Adaptor (), "@qt\n@brief Binding of QTimerEvent"); diff --git a/src/gsiqt4/gsiDeclQTranslator.cc b/src/gsiqt/qt4/QtCore/gsiDeclQTranslator.cc similarity index 99% rename from src/gsiqt4/gsiDeclQTranslator.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQTranslator.cc index d3a988db4..b7f05208d 100644 --- a/src/gsiqt4/gsiDeclQTranslator.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQTranslator.cc @@ -34,8 +34,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -287,11 +287,11 @@ static gsi::Methods methods_QTranslator () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QTranslator (qtdecl_QObject (), "QTranslator_Native", +qt_gsi::QtNativeClass decl_QTranslator (qtdecl_QObject (), "QtCore", "QTranslator_Native", methods_QTranslator (), "@hide\n@alias QTranslator"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTranslator () { return decl_QTranslator; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QTranslator () { return decl_QTranslator; } } @@ -753,7 +753,7 @@ static gsi::Methods methods_QTranslator_Adaptor () { return methods; } -gsi::Class decl_QTranslator_Adaptor (qtdecl_QTranslator (), "QTranslator", +gsi::Class decl_QTranslator_Adaptor (qtdecl_QTranslator (), "QtCore", "QTranslator", methods_QTranslator_Adaptor (), "@qt\n@brief Binding of QTranslator"); diff --git a/src/gsiqt4/gsiDeclQUrl.cc b/src/gsiqt/qt4/QtCore/gsiDeclQUrl.cc similarity index 99% rename from src/gsiqt4/gsiDeclQUrl.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQUrl.cc index 554545004..f0fc1311a 100644 --- a/src/gsiqt4/gsiDeclQUrl.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQUrl.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1759,12 +1759,12 @@ static gsi::Methods methods_QUrl () { return methods; } -gsi::Class decl_QUrl ("QUrl", +gsi::Class decl_QUrl ("QtCore", "QUrl", methods_QUrl (), "@qt\n@brief Binding of QUrl"); -GSIQT_PUBLIC gsi::Class &qtdecl_QUrl () { return decl_QUrl; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QUrl () { return decl_QUrl; } } @@ -1773,7 +1773,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QUrl () { return decl_QUrl; } namespace qt_gsi { -static gsi::Enum decl_QUrl_FormattingOption_Enum ("QUrl_FormattingOption", +static gsi::Enum decl_QUrl_FormattingOption_Enum ("QtCore", "QUrl_FormattingOption", gsi::enum_const ("None", QUrl::None, "@brief Enum constant QUrl::None") + gsi::enum_const ("RemoveScheme", QUrl::RemoveScheme, "@brief Enum constant QUrl::RemoveScheme") + gsi::enum_const ("RemovePassword", QUrl::RemovePassword, "@brief Enum constant QUrl::RemovePassword") + @@ -1786,13 +1786,13 @@ static gsi::Enum decl_QUrl_FormattingOption_Enum ("QUrl_ gsi::enum_const ("StripTrailingSlash", QUrl::StripTrailingSlash, "@brief Enum constant QUrl::StripTrailingSlash"), "@qt\n@brief This class represents the QUrl::FormattingOption enum"); -static gsi::QFlagsClass decl_QUrl_FormattingOption_Enums ("QUrl_QFlags_FormattingOption", +static gsi::QFlagsClass decl_QUrl_FormattingOption_Enums ("QtCore", "QUrl_QFlags_FormattingOption", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QUrl_FormattingOption_Enum_in_parent (decl_QUrl_FormattingOption_Enum.defs ()); -static gsi::ClassExt decl_QUrl_FormattingOption_Enum_as_child (decl_QUrl_FormattingOption_Enum, "FormattingOption"); -static gsi::ClassExt decl_QUrl_FormattingOption_Enums_as_child (decl_QUrl_FormattingOption_Enums, "QFlags_FormattingOption"); +static gsi::ClassExt decl_QUrl_FormattingOption_Enum_as_child (decl_QUrl_FormattingOption_Enum, "QtCore", "FormattingOption"); +static gsi::ClassExt decl_QUrl_FormattingOption_Enums_as_child (decl_QUrl_FormattingOption_Enums, "QtCore", "QFlags_FormattingOption"); } @@ -1801,18 +1801,18 @@ static gsi::ClassExt decl_QUrl_FormattingOption_Enums_as_child (decl_QUrl_ namespace qt_gsi { -static gsi::Enum decl_QUrl_ParsingMode_Enum ("QUrl_ParsingMode", +static gsi::Enum decl_QUrl_ParsingMode_Enum ("QtCore", "QUrl_ParsingMode", gsi::enum_const ("TolerantMode", QUrl::TolerantMode, "@brief Enum constant QUrl::TolerantMode") + gsi::enum_const ("StrictMode", QUrl::StrictMode, "@brief Enum constant QUrl::StrictMode"), "@qt\n@brief This class represents the QUrl::ParsingMode enum"); -static gsi::QFlagsClass decl_QUrl_ParsingMode_Enums ("QUrl_QFlags_ParsingMode", +static gsi::QFlagsClass decl_QUrl_ParsingMode_Enums ("QtCore", "QUrl_QFlags_ParsingMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QUrl_ParsingMode_Enum_in_parent (decl_QUrl_ParsingMode_Enum.defs ()); -static gsi::ClassExt decl_QUrl_ParsingMode_Enum_as_child (decl_QUrl_ParsingMode_Enum, "ParsingMode"); -static gsi::ClassExt decl_QUrl_ParsingMode_Enums_as_child (decl_QUrl_ParsingMode_Enums, "QFlags_ParsingMode"); +static gsi::ClassExt decl_QUrl_ParsingMode_Enum_as_child (decl_QUrl_ParsingMode_Enum, "QtCore", "ParsingMode"); +static gsi::ClassExt decl_QUrl_ParsingMode_Enums_as_child (decl_QUrl_ParsingMode_Enums, "QtCore", "QFlags_ParsingMode"); } diff --git a/src/gsiqt4/gsiDeclQWaitCondition.cc b/src/gsiqt/qt4/QtCore/gsiDeclQWaitCondition.cc similarity index 95% rename from src/gsiqt4/gsiDeclQWaitCondition.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQWaitCondition.cc index 56854fb8f..4708ed38d 100644 --- a/src/gsiqt4/gsiDeclQWaitCondition.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQWaitCondition.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -143,12 +143,12 @@ static gsi::Methods methods_QWaitCondition () { return methods; } -gsi::Class decl_QWaitCondition ("QWaitCondition", +gsi::Class decl_QWaitCondition ("QtCore", "QWaitCondition", methods_QWaitCondition (), "@qt\n@brief Binding of QWaitCondition"); -GSIQT_PUBLIC gsi::Class &qtdecl_QWaitCondition () { return decl_QWaitCondition; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QWaitCondition () { return decl_QWaitCondition; } } diff --git a/src/gsiqt4/gsiDeclQWriteLocker.cc b/src/gsiqt/qt4/QtCore/gsiDeclQWriteLocker.cc similarity index 94% rename from src/gsiqt4/gsiDeclQWriteLocker.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQWriteLocker.cc index c278552cc..561062a86 100644 --- a/src/gsiqt4/gsiDeclQWriteLocker.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQWriteLocker.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -116,12 +116,12 @@ static gsi::Methods methods_QWriteLocker () { return methods; } -gsi::Class decl_QWriteLocker ("QWriteLocker", +gsi::Class decl_QWriteLocker ("QtCore", "QWriteLocker", methods_QWriteLocker (), "@qt\n@brief Binding of QWriteLocker"); -GSIQT_PUBLIC gsi::Class &qtdecl_QWriteLocker () { return decl_QWriteLocker; } +GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QWriteLocker () { return decl_QWriteLocker; } } diff --git a/src/gsiqt4/gsiDeclQt.cc b/src/gsiqt/qt4/QtCore/gsiDeclQt.cc similarity index 84% rename from src/gsiqt4/gsiDeclQt.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQt.cc index 0f6c67875..bf8cd5d6b 100644 --- a/src/gsiqt4/gsiDeclQt.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQt.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -40,7 +40,7 @@ class Qt_Namespace { }; namespace gsi { -gsi::Class decl_Qt_Namespace ("Qt", +gsi::Class decl_Qt_Namespace ("QtCore", "Qt", gsi::Methods(), "@qt\n@brief This class represents the Qt namespace"); } @@ -50,7 +50,7 @@ gsi::Class decl_Qt_Namespace ("Qt", namespace qt_gsi { -static gsi::Enum decl_Qt_AlignmentFlag_Enum ("Qt_AlignmentFlag", +static gsi::Enum decl_Qt_AlignmentFlag_Enum ("QtCore", "Qt_AlignmentFlag", gsi::enum_const ("AlignLeft", Qt::AlignLeft, "@brief Enum constant Qt::AlignLeft") + gsi::enum_const ("AlignLeading", Qt::AlignLeading, "@brief Enum constant Qt::AlignLeading") + gsi::enum_const ("AlignRight", Qt::AlignRight, "@brief Enum constant Qt::AlignRight") + @@ -66,13 +66,13 @@ static gsi::Enum decl_Qt_AlignmentFlag_Enum ("Qt_AlignmentFla gsi::enum_const ("AlignCenter", Qt::AlignCenter, "@brief Enum constant Qt::AlignCenter"), "@qt\n@brief This class represents the Qt::AlignmentFlag enum"); -static gsi::QFlagsClass decl_Qt_AlignmentFlag_Enums ("Qt_QFlags_AlignmentFlag", +static gsi::QFlagsClass decl_Qt_AlignmentFlag_Enums ("QtCore", "Qt_QFlags_AlignmentFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_AlignmentFlag_Enum_in_parent (decl_Qt_AlignmentFlag_Enum.defs ()); -static gsi::ClassExt decl_Qt_AlignmentFlag_Enum_as_child (decl_Qt_AlignmentFlag_Enum, "AlignmentFlag"); -static gsi::ClassExt decl_Qt_AlignmentFlag_Enums_as_child (decl_Qt_AlignmentFlag_Enums, "QFlags_AlignmentFlag"); +static gsi::ClassExt decl_Qt_AlignmentFlag_Enum_as_child (decl_Qt_AlignmentFlag_Enum, "QtCore", "AlignmentFlag"); +static gsi::ClassExt decl_Qt_AlignmentFlag_Enums_as_child (decl_Qt_AlignmentFlag_Enums, "QtCore", "QFlags_AlignmentFlag"); } @@ -81,18 +81,18 @@ static gsi::ClassExt decl_Qt_AlignmentFlag_Enums_as_child (decl_Qt namespace qt_gsi { -static gsi::Enum decl_Qt_AnchorAttribute_Enum ("Qt_AnchorAttribute", +static gsi::Enum decl_Qt_AnchorAttribute_Enum ("QtCore", "Qt_AnchorAttribute", gsi::enum_const ("AnchorName", Qt::AnchorName, "@brief Enum constant Qt::AnchorName") + gsi::enum_const ("AnchorHref", Qt::AnchorHref, "@brief Enum constant Qt::AnchorHref"), "@qt\n@brief This class represents the Qt::AnchorAttribute enum"); -static gsi::QFlagsClass decl_Qt_AnchorAttribute_Enums ("Qt_QFlags_AnchorAttribute", +static gsi::QFlagsClass decl_Qt_AnchorAttribute_Enums ("QtCore", "Qt_QFlags_AnchorAttribute", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_AnchorAttribute_Enum_in_parent (decl_Qt_AnchorAttribute_Enum.defs ()); -static gsi::ClassExt decl_Qt_AnchorAttribute_Enum_as_child (decl_Qt_AnchorAttribute_Enum, "AnchorAttribute"); -static gsi::ClassExt decl_Qt_AnchorAttribute_Enums_as_child (decl_Qt_AnchorAttribute_Enums, "QFlags_AnchorAttribute"); +static gsi::ClassExt decl_Qt_AnchorAttribute_Enum_as_child (decl_Qt_AnchorAttribute_Enum, "QtCore", "AnchorAttribute"); +static gsi::ClassExt decl_Qt_AnchorAttribute_Enums_as_child (decl_Qt_AnchorAttribute_Enums, "QtCore", "QFlags_AnchorAttribute"); } @@ -101,7 +101,7 @@ static gsi::ClassExt decl_Qt_AnchorAttribute_Enums_as_child (decl_ namespace qt_gsi { -static gsi::Enum decl_Qt_AnchorPoint_Enum ("Qt_AnchorPoint", +static gsi::Enum decl_Qt_AnchorPoint_Enum ("QtCore", "Qt_AnchorPoint", gsi::enum_const ("AnchorLeft", Qt::AnchorLeft, "@brief Enum constant Qt::AnchorLeft") + gsi::enum_const ("AnchorHorizontalCenter", Qt::AnchorHorizontalCenter, "@brief Enum constant Qt::AnchorHorizontalCenter") + gsi::enum_const ("AnchorRight", Qt::AnchorRight, "@brief Enum constant Qt::AnchorRight") + @@ -110,13 +110,13 @@ static gsi::Enum decl_Qt_AnchorPoint_Enum ("Qt_AnchorPoint", gsi::enum_const ("AnchorBottom", Qt::AnchorBottom, "@brief Enum constant Qt::AnchorBottom"), "@qt\n@brief This class represents the Qt::AnchorPoint enum"); -static gsi::QFlagsClass decl_Qt_AnchorPoint_Enums ("Qt_QFlags_AnchorPoint", +static gsi::QFlagsClass decl_Qt_AnchorPoint_Enums ("QtCore", "Qt_QFlags_AnchorPoint", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_AnchorPoint_Enum_in_parent (decl_Qt_AnchorPoint_Enum.defs ()); -static gsi::ClassExt decl_Qt_AnchorPoint_Enum_as_child (decl_Qt_AnchorPoint_Enum, "AnchorPoint"); -static gsi::ClassExt decl_Qt_AnchorPoint_Enums_as_child (decl_Qt_AnchorPoint_Enums, "QFlags_AnchorPoint"); +static gsi::ClassExt decl_Qt_AnchorPoint_Enum_as_child (decl_Qt_AnchorPoint_Enum, "QtCore", "AnchorPoint"); +static gsi::ClassExt decl_Qt_AnchorPoint_Enums_as_child (decl_Qt_AnchorPoint_Enums, "QtCore", "QFlags_AnchorPoint"); } @@ -125,7 +125,7 @@ static gsi::ClassExt decl_Qt_AnchorPoint_Enums_as_child (decl_Qt_A namespace qt_gsi { -static gsi::Enum decl_Qt_ApplicationAttribute_Enum ("Qt_ApplicationAttribute", +static gsi::Enum decl_Qt_ApplicationAttribute_Enum ("QtCore", "Qt_ApplicationAttribute", gsi::enum_const ("AA_ImmediateWidgetCreation", Qt::AA_ImmediateWidgetCreation, "@brief Enum constant Qt::AA_ImmediateWidgetCreation") + gsi::enum_const ("AA_MSWindowsUseDirect3DByDefault", Qt::AA_MSWindowsUseDirect3DByDefault, "@brief Enum constant Qt::AA_MSWindowsUseDirect3DByDefault") + gsi::enum_const ("AA_DontShowIconsInMenus", Qt::AA_DontShowIconsInMenus, "@brief Enum constant Qt::AA_DontShowIconsInMenus") + @@ -138,13 +138,13 @@ static gsi::Enum decl_Qt_ApplicationAttribute_Enum ("Q gsi::enum_const ("AA_AttributeCount", Qt::AA_AttributeCount, "@brief Enum constant Qt::AA_AttributeCount"), "@qt\n@brief This class represents the Qt::ApplicationAttribute enum"); -static gsi::QFlagsClass decl_Qt_ApplicationAttribute_Enums ("Qt_QFlags_ApplicationAttribute", +static gsi::QFlagsClass decl_Qt_ApplicationAttribute_Enums ("QtCore", "Qt_QFlags_ApplicationAttribute", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_ApplicationAttribute_Enum_in_parent (decl_Qt_ApplicationAttribute_Enum.defs ()); -static gsi::ClassExt decl_Qt_ApplicationAttribute_Enum_as_child (decl_Qt_ApplicationAttribute_Enum, "ApplicationAttribute"); -static gsi::ClassExt decl_Qt_ApplicationAttribute_Enums_as_child (decl_Qt_ApplicationAttribute_Enums, "QFlags_ApplicationAttribute"); +static gsi::ClassExt decl_Qt_ApplicationAttribute_Enum_as_child (decl_Qt_ApplicationAttribute_Enum, "QtCore", "ApplicationAttribute"); +static gsi::ClassExt decl_Qt_ApplicationAttribute_Enums_as_child (decl_Qt_ApplicationAttribute_Enums, "QtCore", "QFlags_ApplicationAttribute"); } @@ -153,7 +153,7 @@ static gsi::ClassExt decl_Qt_ApplicationAttribute_Enums_as_child ( namespace qt_gsi { -static gsi::Enum decl_Qt_ArrowType_Enum ("Qt_ArrowType", +static gsi::Enum decl_Qt_ArrowType_Enum ("QtCore", "Qt_ArrowType", gsi::enum_const ("NoArrow", Qt::NoArrow, "@brief Enum constant Qt::NoArrow") + gsi::enum_const ("UpArrow", Qt::UpArrow, "@brief Enum constant Qt::UpArrow") + gsi::enum_const ("DownArrow", Qt::DownArrow, "@brief Enum constant Qt::DownArrow") + @@ -161,13 +161,13 @@ static gsi::Enum decl_Qt_ArrowType_Enum ("Qt_ArrowType", gsi::enum_const ("RightArrow", Qt::RightArrow, "@brief Enum constant Qt::RightArrow"), "@qt\n@brief This class represents the Qt::ArrowType enum"); -static gsi::QFlagsClass decl_Qt_ArrowType_Enums ("Qt_QFlags_ArrowType", +static gsi::QFlagsClass decl_Qt_ArrowType_Enums ("QtCore", "Qt_QFlags_ArrowType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_ArrowType_Enum_in_parent (decl_Qt_ArrowType_Enum.defs ()); -static gsi::ClassExt decl_Qt_ArrowType_Enum_as_child (decl_Qt_ArrowType_Enum, "ArrowType"); -static gsi::ClassExt decl_Qt_ArrowType_Enums_as_child (decl_Qt_ArrowType_Enums, "QFlags_ArrowType"); +static gsi::ClassExt decl_Qt_ArrowType_Enum_as_child (decl_Qt_ArrowType_Enum, "QtCore", "ArrowType"); +static gsi::ClassExt decl_Qt_ArrowType_Enums_as_child (decl_Qt_ArrowType_Enums, "QtCore", "QFlags_ArrowType"); } @@ -176,19 +176,19 @@ static gsi::ClassExt decl_Qt_ArrowType_Enums_as_child (decl_Qt_Arr namespace qt_gsi { -static gsi::Enum decl_Qt_AspectRatioMode_Enum ("Qt_AspectRatioMode", +static gsi::Enum decl_Qt_AspectRatioMode_Enum ("QtCore", "Qt_AspectRatioMode", gsi::enum_const ("IgnoreAspectRatio", Qt::IgnoreAspectRatio, "@brief Enum constant Qt::IgnoreAspectRatio") + gsi::enum_const ("KeepAspectRatio", Qt::KeepAspectRatio, "@brief Enum constant Qt::KeepAspectRatio") + gsi::enum_const ("KeepAspectRatioByExpanding", Qt::KeepAspectRatioByExpanding, "@brief Enum constant Qt::KeepAspectRatioByExpanding"), "@qt\n@brief This class represents the Qt::AspectRatioMode enum"); -static gsi::QFlagsClass decl_Qt_AspectRatioMode_Enums ("Qt_QFlags_AspectRatioMode", +static gsi::QFlagsClass decl_Qt_AspectRatioMode_Enums ("QtCore", "Qt_QFlags_AspectRatioMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_AspectRatioMode_Enum_in_parent (decl_Qt_AspectRatioMode_Enum.defs ()); -static gsi::ClassExt decl_Qt_AspectRatioMode_Enum_as_child (decl_Qt_AspectRatioMode_Enum, "AspectRatioMode"); -static gsi::ClassExt decl_Qt_AspectRatioMode_Enums_as_child (decl_Qt_AspectRatioMode_Enums, "QFlags_AspectRatioMode"); +static gsi::ClassExt decl_Qt_AspectRatioMode_Enum_as_child (decl_Qt_AspectRatioMode_Enum, "QtCore", "AspectRatioMode"); +static gsi::ClassExt decl_Qt_AspectRatioMode_Enums_as_child (decl_Qt_AspectRatioMode_Enums, "QtCore", "QFlags_AspectRatioMode"); } @@ -197,19 +197,19 @@ static gsi::ClassExt decl_Qt_AspectRatioMode_Enums_as_child (decl_ namespace qt_gsi { -static gsi::Enum decl_Qt_Axis_Enum ("Qt_Axis", +static gsi::Enum decl_Qt_Axis_Enum ("QtCore", "Qt_Axis", gsi::enum_const ("XAxis", Qt::XAxis, "@brief Enum constant Qt::XAxis") + gsi::enum_const ("YAxis", Qt::YAxis, "@brief Enum constant Qt::YAxis") + gsi::enum_const ("ZAxis", Qt::ZAxis, "@brief Enum constant Qt::ZAxis"), "@qt\n@brief This class represents the Qt::Axis enum"); -static gsi::QFlagsClass decl_Qt_Axis_Enums ("Qt_QFlags_Axis", +static gsi::QFlagsClass decl_Qt_Axis_Enums ("QtCore", "Qt_QFlags_Axis", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_Axis_Enum_in_parent (decl_Qt_Axis_Enum.defs ()); -static gsi::ClassExt decl_Qt_Axis_Enum_as_child (decl_Qt_Axis_Enum, "Axis"); -static gsi::ClassExt decl_Qt_Axis_Enums_as_child (decl_Qt_Axis_Enums, "QFlags_Axis"); +static gsi::ClassExt decl_Qt_Axis_Enum_as_child (decl_Qt_Axis_Enum, "QtCore", "Axis"); +static gsi::ClassExt decl_Qt_Axis_Enums_as_child (decl_Qt_Axis_Enums, "QtCore", "QFlags_Axis"); } @@ -218,18 +218,18 @@ static gsi::ClassExt decl_Qt_Axis_Enums_as_child (decl_Qt_Axis_Enu namespace qt_gsi { -static gsi::Enum decl_Qt_BGMode_Enum ("Qt_BGMode", +static gsi::Enum decl_Qt_BGMode_Enum ("QtCore", "Qt_BGMode", gsi::enum_const ("TransparentMode", Qt::TransparentMode, "@brief Enum constant Qt::TransparentMode") + gsi::enum_const ("OpaqueMode", Qt::OpaqueMode, "@brief Enum constant Qt::OpaqueMode"), "@qt\n@brief This class represents the Qt::BGMode enum"); -static gsi::QFlagsClass decl_Qt_BGMode_Enums ("Qt_QFlags_BGMode", +static gsi::QFlagsClass decl_Qt_BGMode_Enums ("QtCore", "Qt_QFlags_BGMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_BGMode_Enum_in_parent (decl_Qt_BGMode_Enum.defs ()); -static gsi::ClassExt decl_Qt_BGMode_Enum_as_child (decl_Qt_BGMode_Enum, "BGMode"); -static gsi::ClassExt decl_Qt_BGMode_Enums_as_child (decl_Qt_BGMode_Enums, "QFlags_BGMode"); +static gsi::ClassExt decl_Qt_BGMode_Enum_as_child (decl_Qt_BGMode_Enum, "QtCore", "BGMode"); +static gsi::ClassExt decl_Qt_BGMode_Enums_as_child (decl_Qt_BGMode_Enums, "QtCore", "QFlags_BGMode"); } @@ -238,7 +238,7 @@ static gsi::ClassExt decl_Qt_BGMode_Enums_as_child (decl_Qt_BGMode namespace qt_gsi { -static gsi::Enum decl_Qt_BrushStyle_Enum ("Qt_BrushStyle", +static gsi::Enum decl_Qt_BrushStyle_Enum ("QtCore", "Qt_BrushStyle", gsi::enum_const ("NoBrush", Qt::NoBrush, "@brief Enum constant Qt::NoBrush") + gsi::enum_const ("SolidPattern", Qt::SolidPattern, "@brief Enum constant Qt::SolidPattern") + gsi::enum_const ("Dense1Pattern", Qt::Dense1Pattern, "@brief Enum constant Qt::Dense1Pattern") + @@ -260,13 +260,13 @@ static gsi::Enum decl_Qt_BrushStyle_Enum ("Qt_BrushStyle", gsi::enum_const ("TexturePattern", Qt::TexturePattern, "@brief Enum constant Qt::TexturePattern"), "@qt\n@brief This class represents the Qt::BrushStyle enum"); -static gsi::QFlagsClass decl_Qt_BrushStyle_Enums ("Qt_QFlags_BrushStyle", +static gsi::QFlagsClass decl_Qt_BrushStyle_Enums ("QtCore", "Qt_QFlags_BrushStyle", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_BrushStyle_Enum_in_parent (decl_Qt_BrushStyle_Enum.defs ()); -static gsi::ClassExt decl_Qt_BrushStyle_Enum_as_child (decl_Qt_BrushStyle_Enum, "BrushStyle"); -static gsi::ClassExt decl_Qt_BrushStyle_Enums_as_child (decl_Qt_BrushStyle_Enums, "QFlags_BrushStyle"); +static gsi::ClassExt decl_Qt_BrushStyle_Enum_as_child (decl_Qt_BrushStyle_Enum, "QtCore", "BrushStyle"); +static gsi::ClassExt decl_Qt_BrushStyle_Enums_as_child (decl_Qt_BrushStyle_Enums, "QtCore", "QFlags_BrushStyle"); } @@ -275,18 +275,18 @@ static gsi::ClassExt decl_Qt_BrushStyle_Enums_as_child (decl_Qt_Br namespace qt_gsi { -static gsi::Enum decl_Qt_CaseSensitivity_Enum ("Qt_CaseSensitivity", +static gsi::Enum decl_Qt_CaseSensitivity_Enum ("QtCore", "Qt_CaseSensitivity", gsi::enum_const ("CaseInsensitive", Qt::CaseInsensitive, "@brief Enum constant Qt::CaseInsensitive") + gsi::enum_const ("CaseSensitive", Qt::CaseSensitive, "@brief Enum constant Qt::CaseSensitive"), "@qt\n@brief This class represents the Qt::CaseSensitivity enum"); -static gsi::QFlagsClass decl_Qt_CaseSensitivity_Enums ("Qt_QFlags_CaseSensitivity", +static gsi::QFlagsClass decl_Qt_CaseSensitivity_Enums ("QtCore", "Qt_QFlags_CaseSensitivity", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_CaseSensitivity_Enum_in_parent (decl_Qt_CaseSensitivity_Enum.defs ()); -static gsi::ClassExt decl_Qt_CaseSensitivity_Enum_as_child (decl_Qt_CaseSensitivity_Enum, "CaseSensitivity"); -static gsi::ClassExt decl_Qt_CaseSensitivity_Enums_as_child (decl_Qt_CaseSensitivity_Enums, "QFlags_CaseSensitivity"); +static gsi::ClassExt decl_Qt_CaseSensitivity_Enum_as_child (decl_Qt_CaseSensitivity_Enum, "QtCore", "CaseSensitivity"); +static gsi::ClassExt decl_Qt_CaseSensitivity_Enums_as_child (decl_Qt_CaseSensitivity_Enums, "QtCore", "QFlags_CaseSensitivity"); } @@ -295,19 +295,19 @@ static gsi::ClassExt decl_Qt_CaseSensitivity_Enums_as_child (decl_ namespace qt_gsi { -static gsi::Enum decl_Qt_CheckState_Enum ("Qt_CheckState", +static gsi::Enum decl_Qt_CheckState_Enum ("QtCore", "Qt_CheckState", gsi::enum_const ("Unchecked", Qt::Unchecked, "@brief Enum constant Qt::Unchecked") + gsi::enum_const ("PartiallyChecked", Qt::PartiallyChecked, "@brief Enum constant Qt::PartiallyChecked") + gsi::enum_const ("Checked", Qt::Checked, "@brief Enum constant Qt::Checked"), "@qt\n@brief This class represents the Qt::CheckState enum"); -static gsi::QFlagsClass decl_Qt_CheckState_Enums ("Qt_QFlags_CheckState", +static gsi::QFlagsClass decl_Qt_CheckState_Enums ("QtCore", "Qt_QFlags_CheckState", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_CheckState_Enum_in_parent (decl_Qt_CheckState_Enum.defs ()); -static gsi::ClassExt decl_Qt_CheckState_Enum_as_child (decl_Qt_CheckState_Enum, "CheckState"); -static gsi::ClassExt decl_Qt_CheckState_Enums_as_child (decl_Qt_CheckState_Enums, "QFlags_CheckState"); +static gsi::ClassExt decl_Qt_CheckState_Enum_as_child (decl_Qt_CheckState_Enum, "QtCore", "CheckState"); +static gsi::ClassExt decl_Qt_CheckState_Enums_as_child (decl_Qt_CheckState_Enums, "QtCore", "QFlags_CheckState"); } @@ -316,20 +316,20 @@ static gsi::ClassExt decl_Qt_CheckState_Enums_as_child (decl_Qt_Ch namespace qt_gsi { -static gsi::Enum decl_Qt_ClipOperation_Enum ("Qt_ClipOperation", +static gsi::Enum decl_Qt_ClipOperation_Enum ("QtCore", "Qt_ClipOperation", gsi::enum_const ("NoClip", Qt::NoClip, "@brief Enum constant Qt::NoClip") + gsi::enum_const ("ReplaceClip", Qt::ReplaceClip, "@brief Enum constant Qt::ReplaceClip") + gsi::enum_const ("IntersectClip", Qt::IntersectClip, "@brief Enum constant Qt::IntersectClip") + gsi::enum_const ("UniteClip", Qt::UniteClip, "@brief Enum constant Qt::UniteClip"), "@qt\n@brief This class represents the Qt::ClipOperation enum"); -static gsi::QFlagsClass decl_Qt_ClipOperation_Enums ("Qt_QFlags_ClipOperation", +static gsi::QFlagsClass decl_Qt_ClipOperation_Enums ("QtCore", "Qt_QFlags_ClipOperation", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_ClipOperation_Enum_in_parent (decl_Qt_ClipOperation_Enum.defs ()); -static gsi::ClassExt decl_Qt_ClipOperation_Enum_as_child (decl_Qt_ClipOperation_Enum, "ClipOperation"); -static gsi::ClassExt decl_Qt_ClipOperation_Enums_as_child (decl_Qt_ClipOperation_Enums, "QFlags_ClipOperation"); +static gsi::ClassExt decl_Qt_ClipOperation_Enum_as_child (decl_Qt_ClipOperation_Enum, "QtCore", "ClipOperation"); +static gsi::ClassExt decl_Qt_ClipOperation_Enums_as_child (decl_Qt_ClipOperation_Enums, "QtCore", "QFlags_ClipOperation"); } @@ -338,7 +338,7 @@ static gsi::ClassExt decl_Qt_ClipOperation_Enums_as_child (decl_Qt namespace qt_gsi { -static gsi::Enum decl_Qt_ConnectionType_Enum ("Qt_ConnectionType", +static gsi::Enum decl_Qt_ConnectionType_Enum ("QtCore", "Qt_ConnectionType", gsi::enum_const ("AutoConnection", Qt::AutoConnection, "@brief Enum constant Qt::AutoConnection") + gsi::enum_const ("DirectConnection", Qt::DirectConnection, "@brief Enum constant Qt::DirectConnection") + gsi::enum_const ("QueuedConnection", Qt::QueuedConnection, "@brief Enum constant Qt::QueuedConnection") + @@ -347,13 +347,13 @@ static gsi::Enum decl_Qt_ConnectionType_Enum ("Qt_Connection gsi::enum_const ("UniqueConnection", Qt::UniqueConnection, "@brief Enum constant Qt::UniqueConnection"), "@qt\n@brief This class represents the Qt::ConnectionType enum"); -static gsi::QFlagsClass decl_Qt_ConnectionType_Enums ("Qt_QFlags_ConnectionType", +static gsi::QFlagsClass decl_Qt_ConnectionType_Enums ("QtCore", "Qt_QFlags_ConnectionType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_ConnectionType_Enum_in_parent (decl_Qt_ConnectionType_Enum.defs ()); -static gsi::ClassExt decl_Qt_ConnectionType_Enum_as_child (decl_Qt_ConnectionType_Enum, "ConnectionType"); -static gsi::ClassExt decl_Qt_ConnectionType_Enums_as_child (decl_Qt_ConnectionType_Enums, "QFlags_ConnectionType"); +static gsi::ClassExt decl_Qt_ConnectionType_Enum_as_child (decl_Qt_ConnectionType_Enum, "QtCore", "ConnectionType"); +static gsi::ClassExt decl_Qt_ConnectionType_Enums_as_child (decl_Qt_ConnectionType_Enums, "QtCore", "QFlags_ConnectionType"); } @@ -362,7 +362,7 @@ static gsi::ClassExt decl_Qt_ConnectionType_Enums_as_child (decl_Q namespace qt_gsi { -static gsi::Enum decl_Qt_ContextMenuPolicy_Enum ("Qt_ContextMenuPolicy", +static gsi::Enum decl_Qt_ContextMenuPolicy_Enum ("QtCore", "Qt_ContextMenuPolicy", gsi::enum_const ("NoContextMenu", Qt::NoContextMenu, "@brief Enum constant Qt::NoContextMenu") + gsi::enum_const ("DefaultContextMenu", Qt::DefaultContextMenu, "@brief Enum constant Qt::DefaultContextMenu") + gsi::enum_const ("ActionsContextMenu", Qt::ActionsContextMenu, "@brief Enum constant Qt::ActionsContextMenu") + @@ -370,13 +370,13 @@ static gsi::Enum decl_Qt_ContextMenuPolicy_Enum ("Qt_Cont gsi::enum_const ("PreventContextMenu", Qt::PreventContextMenu, "@brief Enum constant Qt::PreventContextMenu"), "@qt\n@brief This class represents the Qt::ContextMenuPolicy enum"); -static gsi::QFlagsClass decl_Qt_ContextMenuPolicy_Enums ("Qt_QFlags_ContextMenuPolicy", +static gsi::QFlagsClass decl_Qt_ContextMenuPolicy_Enums ("QtCore", "Qt_QFlags_ContextMenuPolicy", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_ContextMenuPolicy_Enum_in_parent (decl_Qt_ContextMenuPolicy_Enum.defs ()); -static gsi::ClassExt decl_Qt_ContextMenuPolicy_Enum_as_child (decl_Qt_ContextMenuPolicy_Enum, "ContextMenuPolicy"); -static gsi::ClassExt decl_Qt_ContextMenuPolicy_Enums_as_child (decl_Qt_ContextMenuPolicy_Enums, "QFlags_ContextMenuPolicy"); +static gsi::ClassExt decl_Qt_ContextMenuPolicy_Enum_as_child (decl_Qt_ContextMenuPolicy_Enum, "QtCore", "ContextMenuPolicy"); +static gsi::ClassExt decl_Qt_ContextMenuPolicy_Enums_as_child (decl_Qt_ContextMenuPolicy_Enums, "QtCore", "QFlags_ContextMenuPolicy"); } @@ -385,18 +385,18 @@ static gsi::ClassExt decl_Qt_ContextMenuPolicy_Enums_as_child (dec namespace qt_gsi { -static gsi::Enum decl_Qt_CoordinateSystem_Enum ("Qt_CoordinateSystem", +static gsi::Enum decl_Qt_CoordinateSystem_Enum ("QtCore", "Qt_CoordinateSystem", gsi::enum_const ("DeviceCoordinates", Qt::DeviceCoordinates, "@brief Enum constant Qt::DeviceCoordinates") + gsi::enum_const ("LogicalCoordinates", Qt::LogicalCoordinates, "@brief Enum constant Qt::LogicalCoordinates"), "@qt\n@brief This class represents the Qt::CoordinateSystem enum"); -static gsi::QFlagsClass decl_Qt_CoordinateSystem_Enums ("Qt_QFlags_CoordinateSystem", +static gsi::QFlagsClass decl_Qt_CoordinateSystem_Enums ("QtCore", "Qt_QFlags_CoordinateSystem", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_CoordinateSystem_Enum_in_parent (decl_Qt_CoordinateSystem_Enum.defs ()); -static gsi::ClassExt decl_Qt_CoordinateSystem_Enum_as_child (decl_Qt_CoordinateSystem_Enum, "CoordinateSystem"); -static gsi::ClassExt decl_Qt_CoordinateSystem_Enums_as_child (decl_Qt_CoordinateSystem_Enums, "QFlags_CoordinateSystem"); +static gsi::ClassExt decl_Qt_CoordinateSystem_Enum_as_child (decl_Qt_CoordinateSystem_Enum, "QtCore", "CoordinateSystem"); +static gsi::ClassExt decl_Qt_CoordinateSystem_Enums_as_child (decl_Qt_CoordinateSystem_Enums, "QtCore", "QFlags_CoordinateSystem"); } @@ -405,20 +405,20 @@ static gsi::ClassExt decl_Qt_CoordinateSystem_Enums_as_child (decl namespace qt_gsi { -static gsi::Enum decl_Qt_Corner_Enum ("Qt_Corner", +static gsi::Enum decl_Qt_Corner_Enum ("QtCore", "Qt_Corner", gsi::enum_const ("TopLeftCorner", Qt::TopLeftCorner, "@brief Enum constant Qt::TopLeftCorner") + gsi::enum_const ("TopRightCorner", Qt::TopRightCorner, "@brief Enum constant Qt::TopRightCorner") + gsi::enum_const ("BottomLeftCorner", Qt::BottomLeftCorner, "@brief Enum constant Qt::BottomLeftCorner") + gsi::enum_const ("BottomRightCorner", Qt::BottomRightCorner, "@brief Enum constant Qt::BottomRightCorner"), "@qt\n@brief This class represents the Qt::Corner enum"); -static gsi::QFlagsClass decl_Qt_Corner_Enums ("Qt_QFlags_Corner", +static gsi::QFlagsClass decl_Qt_Corner_Enums ("QtCore", "Qt_QFlags_Corner", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_Corner_Enum_in_parent (decl_Qt_Corner_Enum.defs ()); -static gsi::ClassExt decl_Qt_Corner_Enum_as_child (decl_Qt_Corner_Enum, "Corner"); -static gsi::ClassExt decl_Qt_Corner_Enums_as_child (decl_Qt_Corner_Enums, "QFlags_Corner"); +static gsi::ClassExt decl_Qt_Corner_Enum_as_child (decl_Qt_Corner_Enum, "QtCore", "Corner"); +static gsi::ClassExt decl_Qt_Corner_Enums_as_child (decl_Qt_Corner_Enums, "QtCore", "QFlags_Corner"); } @@ -427,7 +427,7 @@ static gsi::ClassExt decl_Qt_Corner_Enums_as_child (decl_Qt_Corner namespace qt_gsi { -static gsi::Enum decl_Qt_CursorShape_Enum ("Qt_CursorShape", +static gsi::Enum decl_Qt_CursorShape_Enum ("QtCore", "Qt_CursorShape", gsi::enum_const ("ArrowCursor", Qt::ArrowCursor, "@brief Enum constant Qt::ArrowCursor") + gsi::enum_const ("UpArrowCursor", Qt::UpArrowCursor, "@brief Enum constant Qt::UpArrowCursor") + gsi::enum_const ("CrossCursor", Qt::CrossCursor, "@brief Enum constant Qt::CrossCursor") + @@ -452,13 +452,13 @@ static gsi::Enum decl_Qt_CursorShape_Enum ("Qt_CursorShape", gsi::enum_const ("CustomCursor", Qt::CustomCursor, "@brief Enum constant Qt::CustomCursor"), "@qt\n@brief This class represents the Qt::CursorShape enum"); -static gsi::QFlagsClass decl_Qt_CursorShape_Enums ("Qt_QFlags_CursorShape", +static gsi::QFlagsClass decl_Qt_CursorShape_Enums ("QtCore", "Qt_QFlags_CursorShape", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_CursorShape_Enum_in_parent (decl_Qt_CursorShape_Enum.defs ()); -static gsi::ClassExt decl_Qt_CursorShape_Enum_as_child (decl_Qt_CursorShape_Enum, "CursorShape"); -static gsi::ClassExt decl_Qt_CursorShape_Enums_as_child (decl_Qt_CursorShape_Enums, "QFlags_CursorShape"); +static gsi::ClassExt decl_Qt_CursorShape_Enum_as_child (decl_Qt_CursorShape_Enum, "QtCore", "CursorShape"); +static gsi::ClassExt decl_Qt_CursorShape_Enums_as_child (decl_Qt_CursorShape_Enums, "QtCore", "QFlags_CursorShape"); } @@ -467,7 +467,7 @@ static gsi::ClassExt decl_Qt_CursorShape_Enums_as_child (decl_Qt_C namespace qt_gsi { -static gsi::Enum decl_Qt_DateFormat_Enum ("Qt_DateFormat", +static gsi::Enum decl_Qt_DateFormat_Enum ("QtCore", "Qt_DateFormat", gsi::enum_const ("TextDate", Qt::TextDate, "@brief Enum constant Qt::TextDate") + gsi::enum_const ("ISODate", Qt::ISODate, "@brief Enum constant Qt::ISODate") + gsi::enum_const ("SystemLocaleDate", Qt::SystemLocaleDate, "@brief Enum constant Qt::SystemLocaleDate") + @@ -479,13 +479,13 @@ static gsi::Enum decl_Qt_DateFormat_Enum ("Qt_DateFormat", gsi::enum_const ("DefaultLocaleLongDate", Qt::DefaultLocaleLongDate, "@brief Enum constant Qt::DefaultLocaleLongDate"), "@qt\n@brief This class represents the Qt::DateFormat enum"); -static gsi::QFlagsClass decl_Qt_DateFormat_Enums ("Qt_QFlags_DateFormat", +static gsi::QFlagsClass decl_Qt_DateFormat_Enums ("QtCore", "Qt_QFlags_DateFormat", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_DateFormat_Enum_in_parent (decl_Qt_DateFormat_Enum.defs ()); -static gsi::ClassExt decl_Qt_DateFormat_Enum_as_child (decl_Qt_DateFormat_Enum, "DateFormat"); -static gsi::ClassExt decl_Qt_DateFormat_Enums_as_child (decl_Qt_DateFormat_Enums, "QFlags_DateFormat"); +static gsi::ClassExt decl_Qt_DateFormat_Enum_as_child (decl_Qt_DateFormat_Enum, "QtCore", "DateFormat"); +static gsi::ClassExt decl_Qt_DateFormat_Enums_as_child (decl_Qt_DateFormat_Enums, "QtCore", "QFlags_DateFormat"); } @@ -494,7 +494,7 @@ static gsi::ClassExt decl_Qt_DateFormat_Enums_as_child (decl_Qt_Da namespace qt_gsi { -static gsi::Enum decl_Qt_DayOfWeek_Enum ("Qt_DayOfWeek", +static gsi::Enum decl_Qt_DayOfWeek_Enum ("QtCore", "Qt_DayOfWeek", gsi::enum_const ("Monday", Qt::Monday, "@brief Enum constant Qt::Monday") + gsi::enum_const ("Tuesday", Qt::Tuesday, "@brief Enum constant Qt::Tuesday") + gsi::enum_const ("Wednesday", Qt::Wednesday, "@brief Enum constant Qt::Wednesday") + @@ -504,13 +504,13 @@ static gsi::Enum decl_Qt_DayOfWeek_Enum ("Qt_DayOfWeek", gsi::enum_const ("Sunday", Qt::Sunday, "@brief Enum constant Qt::Sunday"), "@qt\n@brief This class represents the Qt::DayOfWeek enum"); -static gsi::QFlagsClass decl_Qt_DayOfWeek_Enums ("Qt_QFlags_DayOfWeek", +static gsi::QFlagsClass decl_Qt_DayOfWeek_Enums ("QtCore", "Qt_QFlags_DayOfWeek", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_DayOfWeek_Enum_in_parent (decl_Qt_DayOfWeek_Enum.defs ()); -static gsi::ClassExt decl_Qt_DayOfWeek_Enum_as_child (decl_Qt_DayOfWeek_Enum, "DayOfWeek"); -static gsi::ClassExt decl_Qt_DayOfWeek_Enums_as_child (decl_Qt_DayOfWeek_Enums, "QFlags_DayOfWeek"); +static gsi::ClassExt decl_Qt_DayOfWeek_Enum_as_child (decl_Qt_DayOfWeek_Enum, "QtCore", "DayOfWeek"); +static gsi::ClassExt decl_Qt_DayOfWeek_Enums_as_child (decl_Qt_DayOfWeek_Enums, "QtCore", "QFlags_DayOfWeek"); } @@ -519,7 +519,7 @@ static gsi::ClassExt decl_Qt_DayOfWeek_Enums_as_child (decl_Qt_Day namespace qt_gsi { -static gsi::Enum decl_Qt_DockWidgetArea_Enum ("Qt_DockWidgetArea", +static gsi::Enum decl_Qt_DockWidgetArea_Enum ("QtCore", "Qt_DockWidgetArea", gsi::enum_const ("LeftDockWidgetArea", Qt::LeftDockWidgetArea, "@brief Enum constant Qt::LeftDockWidgetArea") + gsi::enum_const ("RightDockWidgetArea", Qt::RightDockWidgetArea, "@brief Enum constant Qt::RightDockWidgetArea") + gsi::enum_const ("TopDockWidgetArea", Qt::TopDockWidgetArea, "@brief Enum constant Qt::TopDockWidgetArea") + @@ -529,13 +529,13 @@ static gsi::Enum decl_Qt_DockWidgetArea_Enum ("Qt_DockWidget gsi::enum_const ("NoDockWidgetArea", Qt::NoDockWidgetArea, "@brief Enum constant Qt::NoDockWidgetArea"), "@qt\n@brief This class represents the Qt::DockWidgetArea enum"); -static gsi::QFlagsClass decl_Qt_DockWidgetArea_Enums ("Qt_QFlags_DockWidgetArea", +static gsi::QFlagsClass decl_Qt_DockWidgetArea_Enums ("QtCore", "Qt_QFlags_DockWidgetArea", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_DockWidgetArea_Enum_in_parent (decl_Qt_DockWidgetArea_Enum.defs ()); -static gsi::ClassExt decl_Qt_DockWidgetArea_Enum_as_child (decl_Qt_DockWidgetArea_Enum, "DockWidgetArea"); -static gsi::ClassExt decl_Qt_DockWidgetArea_Enums_as_child (decl_Qt_DockWidgetArea_Enums, "QFlags_DockWidgetArea"); +static gsi::ClassExt decl_Qt_DockWidgetArea_Enum_as_child (decl_Qt_DockWidgetArea_Enum, "QtCore", "DockWidgetArea"); +static gsi::ClassExt decl_Qt_DockWidgetArea_Enums_as_child (decl_Qt_DockWidgetArea_Enums, "QtCore", "QFlags_DockWidgetArea"); } diff --git a/src/gsiqt/qt4/QtCore/gsiDeclQtCoreTypeTraits.h b/src/gsiqt/qt4/QtCore/gsiDeclQtCoreTypeTraits.h new file mode 100644 index 000000000..1231a7be5 --- /dev/null +++ b/src/gsiqt/qt4/QtCore/gsiDeclQtCoreTypeTraits.h @@ -0,0 +1,728 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2018 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + +/** +* @file generated/gsiDeclQtCoreTypeTraits.h +* @brief Type traits for the Qt binding classes +* +* DO NOT EDIT THIS FILE. +* This file has been created automatically +*/ + +#ifndef _HDR_gsiDeclQtCoreTypeTraits +#define _HDR_gsiDeclQtCoreTypeTraits + +#include "gsiTypes.h" + + +class QAbstractItemModel; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QAbstractItemModel_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QAbstractListModel; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QAbstractListModel_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QAbstractTableModel; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QAbstractTableModel_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QBasicTimer; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QBuffer; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QByteArrayMatcher; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QChildEvent; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_default_constructor; +}; +} + +class QChildEvent_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_default_constructor; +}; +} + +class QCoreApplication; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QCoreApplication_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QCryptographicHash; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QDataStream; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QDataStream_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QDate; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QDateTime; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QDir; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QDynamicPropertyChangeEvent; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_default_constructor; +}; +} + +class QDynamicPropertyChangeEvent_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_default_constructor; +}; +} + +class QEasingCurve; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QEvent; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_default_constructor; +}; +} + +class QEvent_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_default_constructor; +}; +} + +class QEventLoop; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QEventLoop_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +struct QFactoryInterface; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QFactoryInterface_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QFile; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QFileInfo; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QFileSystemWatcher; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QFileSystemWatcher_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QIODevice; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QLibrary; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QLibrary_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QLibraryInfo; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_default_constructor; +}; +} + +class QLine; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QLineF; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QLocale; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QMargins; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QMetaClassInfo; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QMetaEnum; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QMetaMethod; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +struct QMetaObject; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QMetaProperty; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QMetaType; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QMimeData; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QMimeData_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QModelIndex; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QMutex; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QObject; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QObject_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QPersistentModelIndex; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QPluginLoader; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QPluginLoader_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QPoint; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QPointF; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QProcess; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QProcessEnvironment; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QReadLocker; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QReadWriteLock; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QRect; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QRectF; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QRegExp; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QResource; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QSemaphore; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QSettings; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QSettings_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QSignalMapper; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QSignalMapper_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QSize; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSizeF; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSocketNotifier; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QSocketNotifier_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QStringMatcher; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSysInfo; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSystemLocale; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSystemLocale_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QTemporaryFile; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QTextCodec; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; + typedef tl::false_tag has_public_destructor; +}; +} + +class QTextCodec_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +#include +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QTextDecoder; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QTextEncoder; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QTextStream; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QTextStream_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QThread; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QThread_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QTime; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QTimeLine; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QTimeLine_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QTimer; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QTimer_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QTimerEvent; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_default_constructor; +}; +} + +class QTimerEvent_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_default_constructor; +}; +} + +class QTranslator; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QTranslator_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QUrl; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QWaitCondition; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QWriteLocker; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class Qt_Namespace; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + + +#endif diff --git a/src/gsiqt4/gsiDeclQt_1.cc b/src/gsiqt/qt4/QtCore/gsiDeclQt_1.cc similarity index 92% rename from src/gsiqt4/gsiDeclQt_1.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQt_1.cc index 89e7d41c6..76c7347f6 100644 --- a/src/gsiqt4/gsiDeclQt_1.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQt_1.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -43,17 +43,17 @@ class Qt_Namespace { }; namespace qt_gsi { -static gsi::Enum decl_Qt_DockWidgetAreaSizes_Enum ("Qt_DockWidgetAreaSizes", +static gsi::Enum decl_Qt_DockWidgetAreaSizes_Enum ("QtCore", "Qt_DockWidgetAreaSizes", gsi::enum_const ("NDockWidgetAreas", Qt::NDockWidgetAreas, "@brief Enum constant Qt::NDockWidgetAreas"), "@qt\n@brief This class represents the Qt::DockWidgetAreaSizes enum"); -static gsi::QFlagsClass decl_Qt_DockWidgetAreaSizes_Enums ("Qt_QFlags_DockWidgetAreaSizes", +static gsi::QFlagsClass decl_Qt_DockWidgetAreaSizes_Enums ("QtCore", "Qt_QFlags_DockWidgetAreaSizes", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_DockWidgetAreaSizes_Enum_in_parent (decl_Qt_DockWidgetAreaSizes_Enum.defs ()); -static gsi::ClassExt decl_Qt_DockWidgetAreaSizes_Enum_as_child (decl_Qt_DockWidgetAreaSizes_Enum, "DockWidgetAreaSizes"); -static gsi::ClassExt decl_Qt_DockWidgetAreaSizes_Enums_as_child (decl_Qt_DockWidgetAreaSizes_Enums, "QFlags_DockWidgetAreaSizes"); +static gsi::ClassExt decl_Qt_DockWidgetAreaSizes_Enum_as_child (decl_Qt_DockWidgetAreaSizes_Enum, "QtCore", "DockWidgetAreaSizes"); +static gsi::ClassExt decl_Qt_DockWidgetAreaSizes_Enums_as_child (decl_Qt_DockWidgetAreaSizes_Enums, "QtCore", "QFlags_DockWidgetAreaSizes"); } @@ -62,7 +62,7 @@ static gsi::ClassExt decl_Qt_DockWidgetAreaSizes_Enums_as_child (d namespace qt_gsi { -static gsi::Enum decl_Qt_DropAction_Enum ("Qt_DropAction", +static gsi::Enum decl_Qt_DropAction_Enum ("QtCore", "Qt_DropAction", gsi::enum_const ("CopyAction", Qt::CopyAction, "@brief Enum constant Qt::CopyAction") + gsi::enum_const ("MoveAction", Qt::MoveAction, "@brief Enum constant Qt::MoveAction") + gsi::enum_const ("LinkAction", Qt::LinkAction, "@brief Enum constant Qt::LinkAction") + @@ -71,13 +71,13 @@ static gsi::Enum decl_Qt_DropAction_Enum ("Qt_DropAction", gsi::enum_const ("IgnoreAction", Qt::IgnoreAction, "@brief Enum constant Qt::IgnoreAction"), "@qt\n@brief This class represents the Qt::DropAction enum"); -static gsi::QFlagsClass decl_Qt_DropAction_Enums ("Qt_QFlags_DropAction", +static gsi::QFlagsClass decl_Qt_DropAction_Enums ("QtCore", "Qt_QFlags_DropAction", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_DropAction_Enum_in_parent (decl_Qt_DropAction_Enum.defs ()); -static gsi::ClassExt decl_Qt_DropAction_Enum_as_child (decl_Qt_DropAction_Enum, "DropAction"); -static gsi::ClassExt decl_Qt_DropAction_Enums_as_child (decl_Qt_DropAction_Enums, "QFlags_DropAction"); +static gsi::ClassExt decl_Qt_DropAction_Enum_as_child (decl_Qt_DropAction_Enum, "QtCore", "DropAction"); +static gsi::ClassExt decl_Qt_DropAction_Enums_as_child (decl_Qt_DropAction_Enums, "QtCore", "QFlags_DropAction"); } @@ -86,19 +86,19 @@ static gsi::ClassExt decl_Qt_DropAction_Enums_as_child (decl_Qt_Dr namespace qt_gsi { -static gsi::Enum decl_Qt_EventPriority_Enum ("Qt_EventPriority", +static gsi::Enum decl_Qt_EventPriority_Enum ("QtCore", "Qt_EventPriority", gsi::enum_const ("HighEventPriority", Qt::HighEventPriority, "@brief Enum constant Qt::HighEventPriority") + gsi::enum_const ("NormalEventPriority", Qt::NormalEventPriority, "@brief Enum constant Qt::NormalEventPriority") + gsi::enum_const ("LowEventPriority", Qt::LowEventPriority, "@brief Enum constant Qt::LowEventPriority"), "@qt\n@brief This class represents the Qt::EventPriority enum"); -static gsi::QFlagsClass decl_Qt_EventPriority_Enums ("Qt_QFlags_EventPriority", +static gsi::QFlagsClass decl_Qt_EventPriority_Enums ("QtCore", "Qt_QFlags_EventPriority", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_EventPriority_Enum_in_parent (decl_Qt_EventPriority_Enum.defs ()); -static gsi::ClassExt decl_Qt_EventPriority_Enum_as_child (decl_Qt_EventPriority_Enum, "EventPriority"); -static gsi::ClassExt decl_Qt_EventPriority_Enums_as_child (decl_Qt_EventPriority_Enums, "QFlags_EventPriority"); +static gsi::ClassExt decl_Qt_EventPriority_Enum_as_child (decl_Qt_EventPriority_Enum, "QtCore", "EventPriority"); +static gsi::ClassExt decl_Qt_EventPriority_Enums_as_child (decl_Qt_EventPriority_Enums, "QtCore", "QFlags_EventPriority"); } @@ -107,18 +107,18 @@ static gsi::ClassExt decl_Qt_EventPriority_Enums_as_child (decl_Qt namespace qt_gsi { -static gsi::Enum decl_Qt_FillRule_Enum ("Qt_FillRule", +static gsi::Enum decl_Qt_FillRule_Enum ("QtCore", "Qt_FillRule", gsi::enum_const ("OddEvenFill", Qt::OddEvenFill, "@brief Enum constant Qt::OddEvenFill") + gsi::enum_const ("WindingFill", Qt::WindingFill, "@brief Enum constant Qt::WindingFill"), "@qt\n@brief This class represents the Qt::FillRule enum"); -static gsi::QFlagsClass decl_Qt_FillRule_Enums ("Qt_QFlags_FillRule", +static gsi::QFlagsClass decl_Qt_FillRule_Enums ("QtCore", "Qt_QFlags_FillRule", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_FillRule_Enum_in_parent (decl_Qt_FillRule_Enum.defs ()); -static gsi::ClassExt decl_Qt_FillRule_Enum_as_child (decl_Qt_FillRule_Enum, "FillRule"); -static gsi::ClassExt decl_Qt_FillRule_Enums_as_child (decl_Qt_FillRule_Enums, "QFlags_FillRule"); +static gsi::ClassExt decl_Qt_FillRule_Enum_as_child (decl_Qt_FillRule_Enum, "QtCore", "FillRule"); +static gsi::ClassExt decl_Qt_FillRule_Enums_as_child (decl_Qt_FillRule_Enums, "QtCore", "QFlags_FillRule"); } @@ -127,7 +127,7 @@ static gsi::ClassExt decl_Qt_FillRule_Enums_as_child (decl_Qt_Fill namespace qt_gsi { -static gsi::Enum decl_Qt_FocusPolicy_Enum ("Qt_FocusPolicy", +static gsi::Enum decl_Qt_FocusPolicy_Enum ("QtCore", "Qt_FocusPolicy", gsi::enum_const ("NoFocus", Qt::NoFocus, "@brief Enum constant Qt::NoFocus") + gsi::enum_const ("TabFocus", Qt::TabFocus, "@brief Enum constant Qt::TabFocus") + gsi::enum_const ("ClickFocus", Qt::ClickFocus, "@brief Enum constant Qt::ClickFocus") + @@ -135,13 +135,13 @@ static gsi::Enum decl_Qt_FocusPolicy_Enum ("Qt_FocusPolicy", gsi::enum_const ("WheelFocus", Qt::WheelFocus, "@brief Enum constant Qt::WheelFocus"), "@qt\n@brief This class represents the Qt::FocusPolicy enum"); -static gsi::QFlagsClass decl_Qt_FocusPolicy_Enums ("Qt_QFlags_FocusPolicy", +static gsi::QFlagsClass decl_Qt_FocusPolicy_Enums ("QtCore", "Qt_QFlags_FocusPolicy", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_FocusPolicy_Enum_in_parent (decl_Qt_FocusPolicy_Enum.defs ()); -static gsi::ClassExt decl_Qt_FocusPolicy_Enum_as_child (decl_Qt_FocusPolicy_Enum, "FocusPolicy"); -static gsi::ClassExt decl_Qt_FocusPolicy_Enums_as_child (decl_Qt_FocusPolicy_Enums, "QFlags_FocusPolicy"); +static gsi::ClassExt decl_Qt_FocusPolicy_Enum_as_child (decl_Qt_FocusPolicy_Enum, "QtCore", "FocusPolicy"); +static gsi::ClassExt decl_Qt_FocusPolicy_Enums_as_child (decl_Qt_FocusPolicy_Enums, "QtCore", "QFlags_FocusPolicy"); } @@ -150,7 +150,7 @@ static gsi::ClassExt decl_Qt_FocusPolicy_Enums_as_child (decl_Qt_F namespace qt_gsi { -static gsi::Enum decl_Qt_FocusReason_Enum ("Qt_FocusReason", +static gsi::Enum decl_Qt_FocusReason_Enum ("QtCore", "Qt_FocusReason", gsi::enum_const ("MouseFocusReason", Qt::MouseFocusReason, "@brief Enum constant Qt::MouseFocusReason") + gsi::enum_const ("TabFocusReason", Qt::TabFocusReason, "@brief Enum constant Qt::TabFocusReason") + gsi::enum_const ("BacktabFocusReason", Qt::BacktabFocusReason, "@brief Enum constant Qt::BacktabFocusReason") + @@ -162,13 +162,13 @@ static gsi::Enum decl_Qt_FocusReason_Enum ("Qt_FocusReason", gsi::enum_const ("NoFocusReason", Qt::NoFocusReason, "@brief Enum constant Qt::NoFocusReason"), "@qt\n@brief This class represents the Qt::FocusReason enum"); -static gsi::QFlagsClass decl_Qt_FocusReason_Enums ("Qt_QFlags_FocusReason", +static gsi::QFlagsClass decl_Qt_FocusReason_Enums ("QtCore", "Qt_QFlags_FocusReason", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_FocusReason_Enum_in_parent (decl_Qt_FocusReason_Enum.defs ()); -static gsi::ClassExt decl_Qt_FocusReason_Enum_as_child (decl_Qt_FocusReason_Enum, "FocusReason"); -static gsi::ClassExt decl_Qt_FocusReason_Enums_as_child (decl_Qt_FocusReason_Enums, "QFlags_FocusReason"); +static gsi::ClassExt decl_Qt_FocusReason_Enum_as_child (decl_Qt_FocusReason_Enum, "QtCore", "FocusReason"); +static gsi::ClassExt decl_Qt_FocusReason_Enums_as_child (decl_Qt_FocusReason_Enums, "QtCore", "QFlags_FocusReason"); } @@ -177,18 +177,18 @@ static gsi::ClassExt decl_Qt_FocusReason_Enums_as_child (decl_Qt_F namespace qt_gsi { -static gsi::Enum decl_Qt_GestureFlag_Enum ("Qt_GestureFlag", +static gsi::Enum decl_Qt_GestureFlag_Enum ("QtCore", "Qt_GestureFlag", gsi::enum_const ("DontStartGestureOnChildren", Qt::DontStartGestureOnChildren, "@brief Enum constant Qt::DontStartGestureOnChildren") + gsi::enum_const ("ReceivePartialGestures", Qt::ReceivePartialGestures, "@brief Enum constant Qt::ReceivePartialGestures"), "@qt\n@brief This class represents the Qt::GestureFlag enum"); -static gsi::QFlagsClass decl_Qt_GestureFlag_Enums ("Qt_QFlags_GestureFlag", +static gsi::QFlagsClass decl_Qt_GestureFlag_Enums ("QtCore", "Qt_QFlags_GestureFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_GestureFlag_Enum_in_parent (decl_Qt_GestureFlag_Enum.defs ()); -static gsi::ClassExt decl_Qt_GestureFlag_Enum_as_child (decl_Qt_GestureFlag_Enum, "GestureFlag"); -static gsi::ClassExt decl_Qt_GestureFlag_Enums_as_child (decl_Qt_GestureFlag_Enums, "QFlags_GestureFlag"); +static gsi::ClassExt decl_Qt_GestureFlag_Enum_as_child (decl_Qt_GestureFlag_Enum, "QtCore", "GestureFlag"); +static gsi::ClassExt decl_Qt_GestureFlag_Enums_as_child (decl_Qt_GestureFlag_Enums, "QtCore", "QFlags_GestureFlag"); } @@ -197,7 +197,7 @@ static gsi::ClassExt decl_Qt_GestureFlag_Enums_as_child (decl_Qt_G namespace qt_gsi { -static gsi::Enum decl_Qt_GestureState_Enum ("Qt_GestureState", +static gsi::Enum decl_Qt_GestureState_Enum ("QtCore", "Qt_GestureState", gsi::enum_const ("NoGesture", Qt::NoGesture, "@brief Enum constant Qt::NoGesture") + gsi::enum_const ("GestureStarted", Qt::GestureStarted, "@brief Enum constant Qt::GestureStarted") + gsi::enum_const ("GestureUpdated", Qt::GestureUpdated, "@brief Enum constant Qt::GestureUpdated") + @@ -205,13 +205,13 @@ static gsi::Enum decl_Qt_GestureState_Enum ("Qt_GestureState", gsi::enum_const ("GestureCanceled", Qt::GestureCanceled, "@brief Enum constant Qt::GestureCanceled"), "@qt\n@brief This class represents the Qt::GestureState enum"); -static gsi::QFlagsClass decl_Qt_GestureState_Enums ("Qt_QFlags_GestureState", +static gsi::QFlagsClass decl_Qt_GestureState_Enums ("QtCore", "Qt_QFlags_GestureState", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_GestureState_Enum_in_parent (decl_Qt_GestureState_Enum.defs ()); -static gsi::ClassExt decl_Qt_GestureState_Enum_as_child (decl_Qt_GestureState_Enum, "GestureState"); -static gsi::ClassExt decl_Qt_GestureState_Enums_as_child (decl_Qt_GestureState_Enums, "QFlags_GestureState"); +static gsi::ClassExt decl_Qt_GestureState_Enum_as_child (decl_Qt_GestureState_Enum, "QtCore", "GestureState"); +static gsi::ClassExt decl_Qt_GestureState_Enums_as_child (decl_Qt_GestureState_Enums, "QtCore", "QFlags_GestureState"); } @@ -220,7 +220,7 @@ static gsi::ClassExt decl_Qt_GestureState_Enums_as_child (decl_Qt_ namespace qt_gsi { -static gsi::Enum decl_Qt_GestureType_Enum ("Qt_GestureType", +static gsi::Enum decl_Qt_GestureType_Enum ("QtCore", "Qt_GestureType", gsi::enum_const ("TapGesture", Qt::TapGesture, "@brief Enum constant Qt::TapGesture") + gsi::enum_const ("TapAndHoldGesture", Qt::TapAndHoldGesture, "@brief Enum constant Qt::TapAndHoldGesture") + gsi::enum_const ("PanGesture", Qt::PanGesture, "@brief Enum constant Qt::PanGesture") + @@ -230,13 +230,13 @@ static gsi::Enum decl_Qt_GestureType_Enum ("Qt_GestureType", gsi::enum_const ("LastGestureType", Qt::LastGestureType, "@brief Enum constant Qt::LastGestureType"), "@qt\n@brief This class represents the Qt::GestureType enum"); -static gsi::QFlagsClass decl_Qt_GestureType_Enums ("Qt_QFlags_GestureType", +static gsi::QFlagsClass decl_Qt_GestureType_Enums ("QtCore", "Qt_QFlags_GestureType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_GestureType_Enum_in_parent (decl_Qt_GestureType_Enum.defs ()); -static gsi::ClassExt decl_Qt_GestureType_Enum_as_child (decl_Qt_GestureType_Enum, "GestureType"); -static gsi::ClassExt decl_Qt_GestureType_Enums_as_child (decl_Qt_GestureType_Enums, "QFlags_GestureType"); +static gsi::ClassExt decl_Qt_GestureType_Enum_as_child (decl_Qt_GestureType_Enum, "QtCore", "GestureType"); +static gsi::ClassExt decl_Qt_GestureType_Enums_as_child (decl_Qt_GestureType_Enums, "QtCore", "QFlags_GestureType"); } @@ -245,7 +245,7 @@ static gsi::ClassExt decl_Qt_GestureType_Enums_as_child (decl_Qt_G namespace qt_gsi { -static gsi::Enum decl_Qt_GlobalColor_Enum ("Qt_GlobalColor", +static gsi::Enum decl_Qt_GlobalColor_Enum ("QtCore", "Qt_GlobalColor", gsi::enum_const ("color0", Qt::color0, "@brief Enum constant Qt::color0") + gsi::enum_const ("color1", Qt::color1, "@brief Enum constant Qt::color1") + gsi::enum_const ("black", Qt::black, "@brief Enum constant Qt::black") + @@ -268,33 +268,13 @@ static gsi::Enum decl_Qt_GlobalColor_Enum ("Qt_GlobalColor", gsi::enum_const ("transparent", Qt::transparent, "@brief Enum constant Qt::transparent"), "@qt\n@brief This class represents the Qt::GlobalColor enum"); -static gsi::QFlagsClass decl_Qt_GlobalColor_Enums ("Qt_QFlags_GlobalColor", +static gsi::QFlagsClass decl_Qt_GlobalColor_Enums ("QtCore", "Qt_QFlags_GlobalColor", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_GlobalColor_Enum_in_parent (decl_Qt_GlobalColor_Enum.defs ()); -static gsi::ClassExt decl_Qt_GlobalColor_Enum_as_child (decl_Qt_GlobalColor_Enum, "GlobalColor"); -static gsi::ClassExt decl_Qt_GlobalColor_Enums_as_child (decl_Qt_GlobalColor_Enums, "QFlags_GlobalColor"); - -} - - -// Implementation of the enum wrapper class for Qt::HitTestAccuracy -namespace qt_gsi -{ - -static gsi::Enum decl_Qt_HitTestAccuracy_Enum ("Qt_HitTestAccuracy", - gsi::enum_const ("ExactHit", Qt::ExactHit, "@brief Enum constant Qt::ExactHit") + - gsi::enum_const ("FuzzyHit", Qt::FuzzyHit, "@brief Enum constant Qt::FuzzyHit"), - "@qt\n@brief This class represents the Qt::HitTestAccuracy enum"); - -static gsi::QFlagsClass decl_Qt_HitTestAccuracy_Enums ("Qt_QFlags_HitTestAccuracy", - "@qt\n@brief This class represents the QFlags flag set"); - -// Inject the declarations into the parent -static gsi::ClassExt inject_Qt_HitTestAccuracy_Enum_in_parent (decl_Qt_HitTestAccuracy_Enum.defs ()); -static gsi::ClassExt decl_Qt_HitTestAccuracy_Enum_as_child (decl_Qt_HitTestAccuracy_Enum, "HitTestAccuracy"); -static gsi::ClassExt decl_Qt_HitTestAccuracy_Enums_as_child (decl_Qt_HitTestAccuracy_Enums, "QFlags_HitTestAccuracy"); +static gsi::ClassExt decl_Qt_GlobalColor_Enum_as_child (decl_Qt_GlobalColor_Enum, "QtCore", "GlobalColor"); +static gsi::ClassExt decl_Qt_GlobalColor_Enums_as_child (decl_Qt_GlobalColor_Enums, "QtCore", "QFlags_GlobalColor"); } @@ -303,7 +283,7 @@ static gsi::ClassExt decl_Qt_HitTestAccuracy_Enums_as_child (decl_ namespace qt_gsi { -static gsi::Enum decl_Qt_ImageConversionFlag_Enum ("Qt_ImageConversionFlag", +static gsi::Enum decl_Qt_ImageConversionFlag_Enum ("QtCore", "Qt_ImageConversionFlag", gsi::enum_const ("ColorMode_Mask", Qt::ColorMode_Mask, "@brief Enum constant Qt::ColorMode_Mask") + gsi::enum_const ("AutoColor", Qt::AutoColor, "@brief Enum constant Qt::AutoColor") + gsi::enum_const ("ColorOnly", Qt::ColorOnly, "@brief Enum constant Qt::ColorOnly") + @@ -324,13 +304,13 @@ static gsi::Enum decl_Qt_ImageConversionFlag_Enum ("Qt_ gsi::enum_const ("NoOpaqueDetection", Qt::NoOpaqueDetection, "@brief Enum constant Qt::NoOpaqueDetection"), "@qt\n@brief This class represents the Qt::ImageConversionFlag enum"); -static gsi::QFlagsClass decl_Qt_ImageConversionFlag_Enums ("Qt_QFlags_ImageConversionFlag", +static gsi::QFlagsClass decl_Qt_ImageConversionFlag_Enums ("QtCore", "Qt_QFlags_ImageConversionFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_ImageConversionFlag_Enum_in_parent (decl_Qt_ImageConversionFlag_Enum.defs ()); -static gsi::ClassExt decl_Qt_ImageConversionFlag_Enum_as_child (decl_Qt_ImageConversionFlag_Enum, "ImageConversionFlag"); -static gsi::ClassExt decl_Qt_ImageConversionFlag_Enums_as_child (decl_Qt_ImageConversionFlag_Enums, "QFlags_ImageConversionFlag"); +static gsi::ClassExt decl_Qt_ImageConversionFlag_Enum_as_child (decl_Qt_ImageConversionFlag_Enum, "QtCore", "ImageConversionFlag"); +static gsi::ClassExt decl_Qt_ImageConversionFlag_Enums_as_child (decl_Qt_ImageConversionFlag_Enums, "QtCore", "QFlags_ImageConversionFlag"); } @@ -339,17 +319,17 @@ static gsi::ClassExt decl_Qt_ImageConversionFlag_Enums_as_child (d namespace qt_gsi { -static gsi::Enum decl_Qt_Initialization_Enum ("Qt_Initialization", +static gsi::Enum decl_Qt_Initialization_Enum ("QtCore", "Qt_Initialization", gsi::enum_const ("Uninitialized", Qt::Uninitialized, "@brief Enum constant Qt::Uninitialized"), "@qt\n@brief This class represents the Qt::Initialization enum"); -static gsi::QFlagsClass decl_Qt_Initialization_Enums ("Qt_QFlags_Initialization", +static gsi::QFlagsClass decl_Qt_Initialization_Enums ("QtCore", "Qt_QFlags_Initialization", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_Initialization_Enum_in_parent (decl_Qt_Initialization_Enum.defs ()); -static gsi::ClassExt decl_Qt_Initialization_Enum_as_child (decl_Qt_Initialization_Enum, "Initialization"); -static gsi::ClassExt decl_Qt_Initialization_Enums_as_child (decl_Qt_Initialization_Enums, "QFlags_Initialization"); +static gsi::ClassExt decl_Qt_Initialization_Enum_as_child (decl_Qt_Initialization_Enum, "QtCore", "Initialization"); +static gsi::ClassExt decl_Qt_Initialization_Enums_as_child (decl_Qt_Initialization_Enums, "QtCore", "QFlags_Initialization"); } @@ -358,7 +338,7 @@ static gsi::ClassExt decl_Qt_Initialization_Enums_as_child (decl_Q namespace qt_gsi { -static gsi::Enum decl_Qt_InputMethodHint_Enum ("Qt_InputMethodHint", +static gsi::Enum decl_Qt_InputMethodHint_Enum ("QtCore", "Qt_InputMethodHint", gsi::enum_const ("ImhNone", Qt::ImhNone, "@brief Enum constant Qt::ImhNone") + gsi::enum_const ("ImhHiddenText", Qt::ImhHiddenText, "@brief Enum constant Qt::ImhHiddenText") + gsi::enum_const ("ImhNoAutoUppercase", Qt::ImhNoAutoUppercase, "@brief Enum constant Qt::ImhNoAutoUppercase") + @@ -376,13 +356,13 @@ static gsi::Enum decl_Qt_InputMethodHint_Enum ("Qt_InputMet gsi::enum_const ("ImhExclusiveInputMask", Qt::ImhExclusiveInputMask, "@brief Enum constant Qt::ImhExclusiveInputMask"), "@qt\n@brief This class represents the Qt::InputMethodHint enum"); -static gsi::QFlagsClass decl_Qt_InputMethodHint_Enums ("Qt_QFlags_InputMethodHint", +static gsi::QFlagsClass decl_Qt_InputMethodHint_Enums ("QtCore", "Qt_QFlags_InputMethodHint", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_InputMethodHint_Enum_in_parent (decl_Qt_InputMethodHint_Enum.defs ()); -static gsi::ClassExt decl_Qt_InputMethodHint_Enum_as_child (decl_Qt_InputMethodHint_Enum, "InputMethodHint"); -static gsi::ClassExt decl_Qt_InputMethodHint_Enums_as_child (decl_Qt_InputMethodHint_Enums, "QFlags_InputMethodHint"); +static gsi::ClassExt decl_Qt_InputMethodHint_Enum_as_child (decl_Qt_InputMethodHint_Enum, "QtCore", "InputMethodHint"); +static gsi::ClassExt decl_Qt_InputMethodHint_Enums_as_child (decl_Qt_InputMethodHint_Enums, "QtCore", "QFlags_InputMethodHint"); } @@ -391,7 +371,7 @@ static gsi::ClassExt decl_Qt_InputMethodHint_Enums_as_child (decl_ namespace qt_gsi { -static gsi::Enum decl_Qt_InputMethodQuery_Enum ("Qt_InputMethodQuery", +static gsi::Enum decl_Qt_InputMethodQuery_Enum ("QtCore", "Qt_InputMethodQuery", gsi::enum_const ("ImMicroFocus", Qt::ImMicroFocus, "@brief Enum constant Qt::ImMicroFocus") + gsi::enum_const ("ImFont", Qt::ImFont, "@brief Enum constant Qt::ImFont") + gsi::enum_const ("ImCursorPosition", Qt::ImCursorPosition, "@brief Enum constant Qt::ImCursorPosition") + @@ -401,13 +381,13 @@ static gsi::Enum decl_Qt_InputMethodQuery_Enum ("Qt_InputM gsi::enum_const ("ImAnchorPosition", Qt::ImAnchorPosition, "@brief Enum constant Qt::ImAnchorPosition"), "@qt\n@brief This class represents the Qt::InputMethodQuery enum"); -static gsi::QFlagsClass decl_Qt_InputMethodQuery_Enums ("Qt_QFlags_InputMethodQuery", +static gsi::QFlagsClass decl_Qt_InputMethodQuery_Enums ("QtCore", "Qt_QFlags_InputMethodQuery", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_InputMethodQuery_Enum_in_parent (decl_Qt_InputMethodQuery_Enum.defs ()); -static gsi::ClassExt decl_Qt_InputMethodQuery_Enum_as_child (decl_Qt_InputMethodQuery_Enum, "InputMethodQuery"); -static gsi::ClassExt decl_Qt_InputMethodQuery_Enums_as_child (decl_Qt_InputMethodQuery_Enums, "QFlags_InputMethodQuery"); +static gsi::ClassExt decl_Qt_InputMethodQuery_Enum_as_child (decl_Qt_InputMethodQuery_Enum, "QtCore", "InputMethodQuery"); +static gsi::ClassExt decl_Qt_InputMethodQuery_Enums_as_child (decl_Qt_InputMethodQuery_Enums, "QtCore", "QFlags_InputMethodQuery"); } @@ -416,7 +396,7 @@ static gsi::ClassExt decl_Qt_InputMethodQuery_Enums_as_child (decl namespace qt_gsi { -static gsi::Enum decl_Qt_ItemDataRole_Enum ("Qt_ItemDataRole", +static gsi::Enum decl_Qt_ItemDataRole_Enum ("QtCore", "Qt_ItemDataRole", gsi::enum_const ("DisplayRole", Qt::DisplayRole, "@brief Enum constant Qt::DisplayRole") + gsi::enum_const ("DecorationRole", Qt::DecorationRole, "@brief Enum constant Qt::DecorationRole") + gsi::enum_const ("EditRole", Qt::EditRole, "@brief Enum constant Qt::EditRole") + @@ -441,13 +421,13 @@ static gsi::Enum decl_Qt_ItemDataRole_Enum ("Qt_ItemDataRole", gsi::enum_const ("UserRole", Qt::UserRole, "@brief Enum constant Qt::UserRole"), "@qt\n@brief This class represents the Qt::ItemDataRole enum"); -static gsi::QFlagsClass decl_Qt_ItemDataRole_Enums ("Qt_QFlags_ItemDataRole", +static gsi::QFlagsClass decl_Qt_ItemDataRole_Enums ("QtCore", "Qt_QFlags_ItemDataRole", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_ItemDataRole_Enum_in_parent (decl_Qt_ItemDataRole_Enum.defs ()); -static gsi::ClassExt decl_Qt_ItemDataRole_Enum_as_child (decl_Qt_ItemDataRole_Enum, "ItemDataRole"); -static gsi::ClassExt decl_Qt_ItemDataRole_Enums_as_child (decl_Qt_ItemDataRole_Enums, "QFlags_ItemDataRole"); +static gsi::ClassExt decl_Qt_ItemDataRole_Enum_as_child (decl_Qt_ItemDataRole_Enum, "QtCore", "ItemDataRole"); +static gsi::ClassExt decl_Qt_ItemDataRole_Enums_as_child (decl_Qt_ItemDataRole_Enums, "QtCore", "QFlags_ItemDataRole"); } @@ -456,7 +436,7 @@ static gsi::ClassExt decl_Qt_ItemDataRole_Enums_as_child (decl_Qt_ namespace qt_gsi { -static gsi::Enum decl_Qt_ItemFlag_Enum ("Qt_ItemFlag", +static gsi::Enum decl_Qt_ItemFlag_Enum ("QtCore", "Qt_ItemFlag", gsi::enum_const ("NoItemFlags", Qt::NoItemFlags, "@brief Enum constant Qt::NoItemFlags") + gsi::enum_const ("ItemIsSelectable", Qt::ItemIsSelectable, "@brief Enum constant Qt::ItemIsSelectable") + gsi::enum_const ("ItemIsEditable", Qt::ItemIsEditable, "@brief Enum constant Qt::ItemIsEditable") + @@ -467,13 +447,13 @@ static gsi::Enum decl_Qt_ItemFlag_Enum ("Qt_ItemFlag", gsi::enum_const ("ItemIsTristate", Qt::ItemIsTristate, "@brief Enum constant Qt::ItemIsTristate"), "@qt\n@brief This class represents the Qt::ItemFlag enum"); -static gsi::QFlagsClass decl_Qt_ItemFlag_Enums ("Qt_QFlags_ItemFlag", +static gsi::QFlagsClass decl_Qt_ItemFlag_Enums ("QtCore", "Qt_QFlags_ItemFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_ItemFlag_Enum_in_parent (decl_Qt_ItemFlag_Enum.defs ()); -static gsi::ClassExt decl_Qt_ItemFlag_Enum_as_child (decl_Qt_ItemFlag_Enum, "ItemFlag"); -static gsi::ClassExt decl_Qt_ItemFlag_Enums_as_child (decl_Qt_ItemFlag_Enums, "QFlags_ItemFlag"); +static gsi::ClassExt decl_Qt_ItemFlag_Enum_as_child (decl_Qt_ItemFlag_Enum, "QtCore", "ItemFlag"); +static gsi::ClassExt decl_Qt_ItemFlag_Enums_as_child (decl_Qt_ItemFlag_Enums, "QtCore", "QFlags_ItemFlag"); } @@ -482,20 +462,20 @@ static gsi::ClassExt decl_Qt_ItemFlag_Enums_as_child (decl_Qt_Item namespace qt_gsi { -static gsi::Enum decl_Qt_ItemSelectionMode_Enum ("Qt_ItemSelectionMode", +static gsi::Enum decl_Qt_ItemSelectionMode_Enum ("QtCore", "Qt_ItemSelectionMode", gsi::enum_const ("ContainsItemShape", Qt::ContainsItemShape, "@brief Enum constant Qt::ContainsItemShape") + gsi::enum_const ("IntersectsItemShape", Qt::IntersectsItemShape, "@brief Enum constant Qt::IntersectsItemShape") + gsi::enum_const ("ContainsItemBoundingRect", Qt::ContainsItemBoundingRect, "@brief Enum constant Qt::ContainsItemBoundingRect") + gsi::enum_const ("IntersectsItemBoundingRect", Qt::IntersectsItemBoundingRect, "@brief Enum constant Qt::IntersectsItemBoundingRect"), "@qt\n@brief This class represents the Qt::ItemSelectionMode enum"); -static gsi::QFlagsClass decl_Qt_ItemSelectionMode_Enums ("Qt_QFlags_ItemSelectionMode", +static gsi::QFlagsClass decl_Qt_ItemSelectionMode_Enums ("QtCore", "Qt_QFlags_ItemSelectionMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_ItemSelectionMode_Enum_in_parent (decl_Qt_ItemSelectionMode_Enum.defs ()); -static gsi::ClassExt decl_Qt_ItemSelectionMode_Enum_as_child (decl_Qt_ItemSelectionMode_Enum, "ItemSelectionMode"); -static gsi::ClassExt decl_Qt_ItemSelectionMode_Enums_as_child (decl_Qt_ItemSelectionMode_Enums, "QFlags_ItemSelectionMode"); +static gsi::ClassExt decl_Qt_ItemSelectionMode_Enum_as_child (decl_Qt_ItemSelectionMode_Enum, "QtCore", "ItemSelectionMode"); +static gsi::ClassExt decl_Qt_ItemSelectionMode_Enums_as_child (decl_Qt_ItemSelectionMode_Enums, "QtCore", "QFlags_ItemSelectionMode"); } @@ -504,7 +484,7 @@ static gsi::ClassExt decl_Qt_ItemSelectionMode_Enums_as_child (dec namespace qt_gsi { -static gsi::Enum decl_Qt_Key_Enum ("Qt_Key", +static gsi::Enum decl_Qt_Key_Enum ("QtCore", "Qt_Key", gsi::enum_const ("Key_Escape", Qt::Key_Escape, "@brief Enum constant Qt::Key_Escape") + gsi::enum_const ("Key_Tab", Qt::Key_Tab, "@brief Enum constant Qt::Key_Tab") + gsi::enum_const ("Key_Backtab", Qt::Key_Backtab, "@brief Enum constant Qt::Key_Backtab") + @@ -916,13 +896,13 @@ static gsi::Enum decl_Qt_Key_Enum ("Qt_Key", gsi::enum_const ("Key_unknown", Qt::Key_unknown, "@brief Enum constant Qt::Key_unknown"), "@qt\n@brief This class represents the Qt::Key enum"); -static gsi::QFlagsClass decl_Qt_Key_Enums ("Qt_QFlags_Key", +static gsi::QFlagsClass decl_Qt_Key_Enums ("QtCore", "Qt_QFlags_Key", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_Key_Enum_in_parent (decl_Qt_Key_Enum.defs ()); -static gsi::ClassExt decl_Qt_Key_Enum_as_child (decl_Qt_Key_Enum, "Key"); -static gsi::ClassExt decl_Qt_Key_Enums_as_child (decl_Qt_Key_Enums, "QFlags_Key"); +static gsi::ClassExt decl_Qt_Key_Enum_as_child (decl_Qt_Key_Enum, "QtCore", "Key"); +static gsi::ClassExt decl_Qt_Key_Enums_as_child (decl_Qt_Key_Enums, "QtCore", "QFlags_Key"); } @@ -931,7 +911,7 @@ static gsi::ClassExt decl_Qt_Key_Enums_as_child (decl_Qt_Key_Enums namespace qt_gsi { -static gsi::Enum decl_Qt_KeyboardModifier_Enum ("Qt_KeyboardModifier", +static gsi::Enum decl_Qt_KeyboardModifier_Enum ("QtCore", "Qt_KeyboardModifier", gsi::enum_const ("NoModifier", Qt::NoModifier, "@brief Enum constant Qt::NoModifier") + gsi::enum_const ("ShiftModifier", Qt::ShiftModifier, "@brief Enum constant Qt::ShiftModifier") + gsi::enum_const ("ControlModifier", Qt::ControlModifier, "@brief Enum constant Qt::ControlModifier") + @@ -942,13 +922,33 @@ static gsi::Enum decl_Qt_KeyboardModifier_Enum ("Qt_Keyboa gsi::enum_const ("KeyboardModifierMask", Qt::KeyboardModifierMask, "@brief Enum constant Qt::KeyboardModifierMask"), "@qt\n@brief This class represents the Qt::KeyboardModifier enum"); -static gsi::QFlagsClass decl_Qt_KeyboardModifier_Enums ("Qt_QFlags_KeyboardModifier", +static gsi::QFlagsClass decl_Qt_KeyboardModifier_Enums ("QtCore", "Qt_QFlags_KeyboardModifier", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_KeyboardModifier_Enum_in_parent (decl_Qt_KeyboardModifier_Enum.defs ()); -static gsi::ClassExt decl_Qt_KeyboardModifier_Enum_as_child (decl_Qt_KeyboardModifier_Enum, "KeyboardModifier"); -static gsi::ClassExt decl_Qt_KeyboardModifier_Enums_as_child (decl_Qt_KeyboardModifier_Enums, "QFlags_KeyboardModifier"); +static gsi::ClassExt decl_Qt_KeyboardModifier_Enum_as_child (decl_Qt_KeyboardModifier_Enum, "QtCore", "KeyboardModifier"); +static gsi::ClassExt decl_Qt_KeyboardModifier_Enums_as_child (decl_Qt_KeyboardModifier_Enums, "QtCore", "QFlags_KeyboardModifier"); + +} + + +// Implementation of the enum wrapper class for Qt::LayoutDirection +namespace qt_gsi +{ + +static gsi::Enum decl_Qt_LayoutDirection_Enum ("QtCore", "Qt_LayoutDirection", + gsi::enum_const ("LeftToRight", Qt::LeftToRight, "@brief Enum constant Qt::LeftToRight") + + gsi::enum_const ("RightToLeft", Qt::RightToLeft, "@brief Enum constant Qt::RightToLeft"), + "@qt\n@brief This class represents the Qt::LayoutDirection enum"); + +static gsi::QFlagsClass decl_Qt_LayoutDirection_Enums ("QtCore", "Qt_QFlags_LayoutDirection", + "@qt\n@brief This class represents the QFlags flag set"); + +// Inject the declarations into the parent +static gsi::ClassExt inject_Qt_LayoutDirection_Enum_in_parent (decl_Qt_LayoutDirection_Enum.defs ()); +static gsi::ClassExt decl_Qt_LayoutDirection_Enum_as_child (decl_Qt_LayoutDirection_Enum, "QtCore", "LayoutDirection"); +static gsi::ClassExt decl_Qt_LayoutDirection_Enums_as_child (decl_Qt_LayoutDirection_Enums, "QtCore", "QFlags_LayoutDirection"); } diff --git a/src/gsiqt4/gsiDeclQt_2.cc b/src/gsiqt/qt4/QtCore/gsiDeclQt_2.cc similarity index 80% rename from src/gsiqt4/gsiDeclQt_2.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQt_2.cc index bfb56d103..6e29e0852 100644 --- a/src/gsiqt4/gsiDeclQt_2.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQt_2.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -39,42 +39,22 @@ class Qt_Namespace { }; -// Implementation of the enum wrapper class for Qt::LayoutDirection -namespace qt_gsi -{ - -static gsi::Enum decl_Qt_LayoutDirection_Enum ("Qt_LayoutDirection", - gsi::enum_const ("LeftToRight", Qt::LeftToRight, "@brief Enum constant Qt::LeftToRight") + - gsi::enum_const ("RightToLeft", Qt::RightToLeft, "@brief Enum constant Qt::RightToLeft"), - "@qt\n@brief This class represents the Qt::LayoutDirection enum"); - -static gsi::QFlagsClass decl_Qt_LayoutDirection_Enums ("Qt_QFlags_LayoutDirection", - "@qt\n@brief This class represents the QFlags flag set"); - -// Inject the declarations into the parent -static gsi::ClassExt inject_Qt_LayoutDirection_Enum_in_parent (decl_Qt_LayoutDirection_Enum.defs ()); -static gsi::ClassExt decl_Qt_LayoutDirection_Enum_as_child (decl_Qt_LayoutDirection_Enum, "LayoutDirection"); -static gsi::ClassExt decl_Qt_LayoutDirection_Enums_as_child (decl_Qt_LayoutDirection_Enums, "QFlags_LayoutDirection"); - -} - - // Implementation of the enum wrapper class for Qt::MaskMode namespace qt_gsi { -static gsi::Enum decl_Qt_MaskMode_Enum ("Qt_MaskMode", +static gsi::Enum decl_Qt_MaskMode_Enum ("QtCore", "Qt_MaskMode", gsi::enum_const ("MaskInColor", Qt::MaskInColor, "@brief Enum constant Qt::MaskInColor") + gsi::enum_const ("MaskOutColor", Qt::MaskOutColor, "@brief Enum constant Qt::MaskOutColor"), "@qt\n@brief This class represents the Qt::MaskMode enum"); -static gsi::QFlagsClass decl_Qt_MaskMode_Enums ("Qt_QFlags_MaskMode", +static gsi::QFlagsClass decl_Qt_MaskMode_Enums ("QtCore", "Qt_QFlags_MaskMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_MaskMode_Enum_in_parent (decl_Qt_MaskMode_Enum.defs ()); -static gsi::ClassExt decl_Qt_MaskMode_Enum_as_child (decl_Qt_MaskMode_Enum, "MaskMode"); -static gsi::ClassExt decl_Qt_MaskMode_Enums_as_child (decl_Qt_MaskMode_Enums, "QFlags_MaskMode"); +static gsi::ClassExt decl_Qt_MaskMode_Enum_as_child (decl_Qt_MaskMode_Enum, "QtCore", "MaskMode"); +static gsi::ClassExt decl_Qt_MaskMode_Enums_as_child (decl_Qt_MaskMode_Enums, "QtCore", "QFlags_MaskMode"); } @@ -83,7 +63,7 @@ static gsi::ClassExt decl_Qt_MaskMode_Enums_as_child (decl_Qt_Mask namespace qt_gsi { -static gsi::Enum decl_Qt_MatchFlag_Enum ("Qt_MatchFlag", +static gsi::Enum decl_Qt_MatchFlag_Enum ("QtCore", "Qt_MatchFlag", gsi::enum_const ("MatchExactly", Qt::MatchExactly, "@brief Enum constant Qt::MatchExactly") + gsi::enum_const ("MatchContains", Qt::MatchContains, "@brief Enum constant Qt::MatchContains") + gsi::enum_const ("MatchStartsWith", Qt::MatchStartsWith, "@brief Enum constant Qt::MatchStartsWith") + @@ -96,13 +76,13 @@ static gsi::Enum decl_Qt_MatchFlag_Enum ("Qt_MatchFlag", gsi::enum_const ("MatchRecursive", Qt::MatchRecursive, "@brief Enum constant Qt::MatchRecursive"), "@qt\n@brief This class represents the Qt::MatchFlag enum"); -static gsi::QFlagsClass decl_Qt_MatchFlag_Enums ("Qt_QFlags_MatchFlag", +static gsi::QFlagsClass decl_Qt_MatchFlag_Enums ("QtCore", "Qt_QFlags_MatchFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_MatchFlag_Enum_in_parent (decl_Qt_MatchFlag_Enum.defs ()); -static gsi::ClassExt decl_Qt_MatchFlag_Enum_as_child (decl_Qt_MatchFlag_Enum, "MatchFlag"); -static gsi::ClassExt decl_Qt_MatchFlag_Enums_as_child (decl_Qt_MatchFlag_Enums, "QFlags_MatchFlag"); +static gsi::ClassExt decl_Qt_MatchFlag_Enum_as_child (decl_Qt_MatchFlag_Enum, "QtCore", "MatchFlag"); +static gsi::ClassExt decl_Qt_MatchFlag_Enums_as_child (decl_Qt_MatchFlag_Enums, "QtCore", "QFlags_MatchFlag"); } @@ -111,7 +91,7 @@ static gsi::ClassExt decl_Qt_MatchFlag_Enums_as_child (decl_Qt_Mat namespace qt_gsi { -static gsi::Enum decl_Qt_Modifier_Enum ("Qt_Modifier", +static gsi::Enum decl_Qt_Modifier_Enum ("QtCore", "Qt_Modifier", gsi::enum_const ("META", Qt::META, "@brief Enum constant Qt::META") + gsi::enum_const ("SHIFT", Qt::SHIFT, "@brief Enum constant Qt::SHIFT") + gsi::enum_const ("CTRL", Qt::CTRL, "@brief Enum constant Qt::CTRL") + @@ -120,13 +100,13 @@ static gsi::Enum decl_Qt_Modifier_Enum ("Qt_Modifier", gsi::enum_const ("UNICODE_ACCEL", Qt::UNICODE_ACCEL, "@brief Enum constant Qt::UNICODE_ACCEL"), "@qt\n@brief This class represents the Qt::Modifier enum"); -static gsi::QFlagsClass decl_Qt_Modifier_Enums ("Qt_QFlags_Modifier", +static gsi::QFlagsClass decl_Qt_Modifier_Enums ("QtCore", "Qt_QFlags_Modifier", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_Modifier_Enum_in_parent (decl_Qt_Modifier_Enum.defs ()); -static gsi::ClassExt decl_Qt_Modifier_Enum_as_child (decl_Qt_Modifier_Enum, "Modifier"); -static gsi::ClassExt decl_Qt_Modifier_Enums_as_child (decl_Qt_Modifier_Enums, "QFlags_Modifier"); +static gsi::ClassExt decl_Qt_Modifier_Enum_as_child (decl_Qt_Modifier_Enum, "QtCore", "Modifier"); +static gsi::ClassExt decl_Qt_Modifier_Enums_as_child (decl_Qt_Modifier_Enums, "QtCore", "QFlags_Modifier"); } @@ -135,7 +115,7 @@ static gsi::ClassExt decl_Qt_Modifier_Enums_as_child (decl_Qt_Modi namespace qt_gsi { -static gsi::Enum decl_Qt_MouseButton_Enum ("Qt_MouseButton", +static gsi::Enum decl_Qt_MouseButton_Enum ("QtCore", "Qt_MouseButton", gsi::enum_const ("NoButton", Qt::NoButton, "@brief Enum constant Qt::NoButton") + gsi::enum_const ("LeftButton", Qt::LeftButton, "@brief Enum constant Qt::LeftButton") + gsi::enum_const ("RightButton", Qt::RightButton, "@brief Enum constant Qt::RightButton") + @@ -145,13 +125,13 @@ static gsi::Enum decl_Qt_MouseButton_Enum ("Qt_MouseButton", gsi::enum_const ("MouseButtonMask", Qt::MouseButtonMask, "@brief Enum constant Qt::MouseButtonMask"), "@qt\n@brief This class represents the Qt::MouseButton enum"); -static gsi::QFlagsClass decl_Qt_MouseButton_Enums ("Qt_QFlags_MouseButton", +static gsi::QFlagsClass decl_Qt_MouseButton_Enums ("QtCore", "Qt_QFlags_MouseButton", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_MouseButton_Enum_in_parent (decl_Qt_MouseButton_Enum.defs ()); -static gsi::ClassExt decl_Qt_MouseButton_Enum_as_child (decl_Qt_MouseButton_Enum, "MouseButton"); -static gsi::ClassExt decl_Qt_MouseButton_Enums_as_child (decl_Qt_MouseButton_Enums, "QFlags_MouseButton"); +static gsi::ClassExt decl_Qt_MouseButton_Enum_as_child (decl_Qt_MouseButton_Enum, "QtCore", "MouseButton"); +static gsi::ClassExt decl_Qt_MouseButton_Enums_as_child (decl_Qt_MouseButton_Enums, "QtCore", "QFlags_MouseButton"); } @@ -160,7 +140,7 @@ static gsi::ClassExt decl_Qt_MouseButton_Enums_as_child (decl_Qt_M namespace qt_gsi { -static gsi::Enum decl_Qt_NavigationMode_Enum ("Qt_NavigationMode", +static gsi::Enum decl_Qt_NavigationMode_Enum ("QtCore", "Qt_NavigationMode", gsi::enum_const ("NavigationModeNone", Qt::NavigationModeNone, "@brief Enum constant Qt::NavigationModeNone") + gsi::enum_const ("NavigationModeKeypadTabOrder", Qt::NavigationModeKeypadTabOrder, "@brief Enum constant Qt::NavigationModeKeypadTabOrder") + gsi::enum_const ("NavigationModeKeypadDirectional", Qt::NavigationModeKeypadDirectional, "@brief Enum constant Qt::NavigationModeKeypadDirectional") + @@ -168,13 +148,13 @@ static gsi::Enum decl_Qt_NavigationMode_Enum ("Qt_Navigation gsi::enum_const ("NavigationModeCursorForceVisible", Qt::NavigationModeCursorForceVisible, "@brief Enum constant Qt::NavigationModeCursorForceVisible"), "@qt\n@brief This class represents the Qt::NavigationMode enum"); -static gsi::QFlagsClass decl_Qt_NavigationMode_Enums ("Qt_QFlags_NavigationMode", +static gsi::QFlagsClass decl_Qt_NavigationMode_Enums ("QtCore", "Qt_QFlags_NavigationMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_NavigationMode_Enum_in_parent (decl_Qt_NavigationMode_Enum.defs ()); -static gsi::ClassExt decl_Qt_NavigationMode_Enum_as_child (decl_Qt_NavigationMode_Enum, "NavigationMode"); -static gsi::ClassExt decl_Qt_NavigationMode_Enums_as_child (decl_Qt_NavigationMode_Enums, "QFlags_NavigationMode"); +static gsi::ClassExt decl_Qt_NavigationMode_Enum_as_child (decl_Qt_NavigationMode_Enum, "QtCore", "NavigationMode"); +static gsi::ClassExt decl_Qt_NavigationMode_Enums_as_child (decl_Qt_NavigationMode_Enums, "QtCore", "QFlags_NavigationMode"); } @@ -183,18 +163,18 @@ static gsi::ClassExt decl_Qt_NavigationMode_Enums_as_child (decl_Q namespace qt_gsi { -static gsi::Enum decl_Qt_Orientation_Enum ("Qt_Orientation", +static gsi::Enum decl_Qt_Orientation_Enum ("QtCore", "Qt_Orientation", gsi::enum_const ("Horizontal", Qt::Horizontal, "@brief Enum constant Qt::Horizontal") + gsi::enum_const ("Vertical", Qt::Vertical, "@brief Enum constant Qt::Vertical"), "@qt\n@brief This class represents the Qt::Orientation enum"); -static gsi::QFlagsClass decl_Qt_Orientation_Enums ("Qt_QFlags_Orientation", +static gsi::QFlagsClass decl_Qt_Orientation_Enums ("QtCore", "Qt_QFlags_Orientation", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_Orientation_Enum_in_parent (decl_Qt_Orientation_Enum.defs ()); -static gsi::ClassExt decl_Qt_Orientation_Enum_as_child (decl_Qt_Orientation_Enum, "Orientation"); -static gsi::ClassExt decl_Qt_Orientation_Enums_as_child (decl_Qt_Orientation_Enums, "QFlags_Orientation"); +static gsi::ClassExt decl_Qt_Orientation_Enum_as_child (decl_Qt_Orientation_Enum, "QtCore", "Orientation"); +static gsi::ClassExt decl_Qt_Orientation_Enums_as_child (decl_Qt_Orientation_Enums, "QtCore", "QFlags_Orientation"); } @@ -203,20 +183,20 @@ static gsi::ClassExt decl_Qt_Orientation_Enums_as_child (decl_Qt_O namespace qt_gsi { -static gsi::Enum decl_Qt_PenCapStyle_Enum ("Qt_PenCapStyle", +static gsi::Enum decl_Qt_PenCapStyle_Enum ("QtCore", "Qt_PenCapStyle", gsi::enum_const ("FlatCap", Qt::FlatCap, "@brief Enum constant Qt::FlatCap") + gsi::enum_const ("SquareCap", Qt::SquareCap, "@brief Enum constant Qt::SquareCap") + gsi::enum_const ("RoundCap", Qt::RoundCap, "@brief Enum constant Qt::RoundCap") + gsi::enum_const ("MPenCapStyle", Qt::MPenCapStyle, "@brief Enum constant Qt::MPenCapStyle"), "@qt\n@brief This class represents the Qt::PenCapStyle enum"); -static gsi::QFlagsClass decl_Qt_PenCapStyle_Enums ("Qt_QFlags_PenCapStyle", +static gsi::QFlagsClass decl_Qt_PenCapStyle_Enums ("QtCore", "Qt_QFlags_PenCapStyle", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_PenCapStyle_Enum_in_parent (decl_Qt_PenCapStyle_Enum.defs ()); -static gsi::ClassExt decl_Qt_PenCapStyle_Enum_as_child (decl_Qt_PenCapStyle_Enum, "PenCapStyle"); -static gsi::ClassExt decl_Qt_PenCapStyle_Enums_as_child (decl_Qt_PenCapStyle_Enums, "QFlags_PenCapStyle"); +static gsi::ClassExt decl_Qt_PenCapStyle_Enum_as_child (decl_Qt_PenCapStyle_Enum, "QtCore", "PenCapStyle"); +static gsi::ClassExt decl_Qt_PenCapStyle_Enums_as_child (decl_Qt_PenCapStyle_Enums, "QtCore", "QFlags_PenCapStyle"); } @@ -225,7 +205,7 @@ static gsi::ClassExt decl_Qt_PenCapStyle_Enums_as_child (decl_Qt_P namespace qt_gsi { -static gsi::Enum decl_Qt_PenJoinStyle_Enum ("Qt_PenJoinStyle", +static gsi::Enum decl_Qt_PenJoinStyle_Enum ("QtCore", "Qt_PenJoinStyle", gsi::enum_const ("MiterJoin", Qt::MiterJoin, "@brief Enum constant Qt::MiterJoin") + gsi::enum_const ("BevelJoin", Qt::BevelJoin, "@brief Enum constant Qt::BevelJoin") + gsi::enum_const ("RoundJoin", Qt::RoundJoin, "@brief Enum constant Qt::RoundJoin") + @@ -233,13 +213,13 @@ static gsi::Enum decl_Qt_PenJoinStyle_Enum ("Qt_PenJoinStyle", gsi::enum_const ("MPenJoinStyle", Qt::MPenJoinStyle, "@brief Enum constant Qt::MPenJoinStyle"), "@qt\n@brief This class represents the Qt::PenJoinStyle enum"); -static gsi::QFlagsClass decl_Qt_PenJoinStyle_Enums ("Qt_QFlags_PenJoinStyle", +static gsi::QFlagsClass decl_Qt_PenJoinStyle_Enums ("QtCore", "Qt_QFlags_PenJoinStyle", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_PenJoinStyle_Enum_in_parent (decl_Qt_PenJoinStyle_Enum.defs ()); -static gsi::ClassExt decl_Qt_PenJoinStyle_Enum_as_child (decl_Qt_PenJoinStyle_Enum, "PenJoinStyle"); -static gsi::ClassExt decl_Qt_PenJoinStyle_Enums_as_child (decl_Qt_PenJoinStyle_Enums, "QFlags_PenJoinStyle"); +static gsi::ClassExt decl_Qt_PenJoinStyle_Enum_as_child (decl_Qt_PenJoinStyle_Enum, "QtCore", "PenJoinStyle"); +static gsi::ClassExt decl_Qt_PenJoinStyle_Enums_as_child (decl_Qt_PenJoinStyle_Enums, "QtCore", "QFlags_PenJoinStyle"); } @@ -248,7 +228,7 @@ static gsi::ClassExt decl_Qt_PenJoinStyle_Enums_as_child (decl_Qt_ namespace qt_gsi { -static gsi::Enum decl_Qt_PenStyle_Enum ("Qt_PenStyle", +static gsi::Enum decl_Qt_PenStyle_Enum ("QtCore", "Qt_PenStyle", gsi::enum_const ("NoPen", Qt::NoPen, "@brief Enum constant Qt::NoPen") + gsi::enum_const ("SolidLine", Qt::SolidLine, "@brief Enum constant Qt::SolidLine") + gsi::enum_const ("DashLine", Qt::DashLine, "@brief Enum constant Qt::DashLine") + @@ -259,13 +239,13 @@ static gsi::Enum decl_Qt_PenStyle_Enum ("Qt_PenStyle", gsi::enum_const ("MPenStyle", Qt::MPenStyle, "@brief Enum constant Qt::MPenStyle"), "@qt\n@brief This class represents the Qt::PenStyle enum"); -static gsi::QFlagsClass decl_Qt_PenStyle_Enums ("Qt_QFlags_PenStyle", +static gsi::QFlagsClass decl_Qt_PenStyle_Enums ("QtCore", "Qt_QFlags_PenStyle", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_PenStyle_Enum_in_parent (decl_Qt_PenStyle_Enum.defs ()); -static gsi::ClassExt decl_Qt_PenStyle_Enum_as_child (decl_Qt_PenStyle_Enum, "PenStyle"); -static gsi::ClassExt decl_Qt_PenStyle_Enums_as_child (decl_Qt_PenStyle_Enums, "QFlags_PenStyle"); +static gsi::ClassExt decl_Qt_PenStyle_Enum_as_child (decl_Qt_PenStyle_Enum, "QtCore", "PenStyle"); +static gsi::ClassExt decl_Qt_PenStyle_Enums_as_child (decl_Qt_PenStyle_Enums, "QtCore", "QFlags_PenStyle"); } @@ -274,19 +254,19 @@ static gsi::ClassExt decl_Qt_PenStyle_Enums_as_child (decl_Qt_PenS namespace qt_gsi { -static gsi::Enum decl_Qt_ScrollBarPolicy_Enum ("Qt_ScrollBarPolicy", +static gsi::Enum decl_Qt_ScrollBarPolicy_Enum ("QtCore", "Qt_ScrollBarPolicy", gsi::enum_const ("ScrollBarAsNeeded", Qt::ScrollBarAsNeeded, "@brief Enum constant Qt::ScrollBarAsNeeded") + gsi::enum_const ("ScrollBarAlwaysOff", Qt::ScrollBarAlwaysOff, "@brief Enum constant Qt::ScrollBarAlwaysOff") + gsi::enum_const ("ScrollBarAlwaysOn", Qt::ScrollBarAlwaysOn, "@brief Enum constant Qt::ScrollBarAlwaysOn"), "@qt\n@brief This class represents the Qt::ScrollBarPolicy enum"); -static gsi::QFlagsClass decl_Qt_ScrollBarPolicy_Enums ("Qt_QFlags_ScrollBarPolicy", +static gsi::QFlagsClass decl_Qt_ScrollBarPolicy_Enums ("QtCore", "Qt_QFlags_ScrollBarPolicy", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_ScrollBarPolicy_Enum_in_parent (decl_Qt_ScrollBarPolicy_Enum.defs ()); -static gsi::ClassExt decl_Qt_ScrollBarPolicy_Enum_as_child (decl_Qt_ScrollBarPolicy_Enum, "ScrollBarPolicy"); -static gsi::ClassExt decl_Qt_ScrollBarPolicy_Enums_as_child (decl_Qt_ScrollBarPolicy_Enums, "QFlags_ScrollBarPolicy"); +static gsi::ClassExt decl_Qt_ScrollBarPolicy_Enum_as_child (decl_Qt_ScrollBarPolicy_Enum, "QtCore", "ScrollBarPolicy"); +static gsi::ClassExt decl_Qt_ScrollBarPolicy_Enums_as_child (decl_Qt_ScrollBarPolicy_Enums, "QtCore", "QFlags_ScrollBarPolicy"); } @@ -295,20 +275,20 @@ static gsi::ClassExt decl_Qt_ScrollBarPolicy_Enums_as_child (decl_ namespace qt_gsi { -static gsi::Enum decl_Qt_ShortcutContext_Enum ("Qt_ShortcutContext", +static gsi::Enum decl_Qt_ShortcutContext_Enum ("QtCore", "Qt_ShortcutContext", gsi::enum_const ("WidgetShortcut", Qt::WidgetShortcut, "@brief Enum constant Qt::WidgetShortcut") + gsi::enum_const ("WindowShortcut", Qt::WindowShortcut, "@brief Enum constant Qt::WindowShortcut") + gsi::enum_const ("ApplicationShortcut", Qt::ApplicationShortcut, "@brief Enum constant Qt::ApplicationShortcut") + gsi::enum_const ("WidgetWithChildrenShortcut", Qt::WidgetWithChildrenShortcut, "@brief Enum constant Qt::WidgetWithChildrenShortcut"), "@qt\n@brief This class represents the Qt::ShortcutContext enum"); -static gsi::QFlagsClass decl_Qt_ShortcutContext_Enums ("Qt_QFlags_ShortcutContext", +static gsi::QFlagsClass decl_Qt_ShortcutContext_Enums ("QtCore", "Qt_QFlags_ShortcutContext", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_ShortcutContext_Enum_in_parent (decl_Qt_ShortcutContext_Enum.defs ()); -static gsi::ClassExt decl_Qt_ShortcutContext_Enum_as_child (decl_Qt_ShortcutContext_Enum, "ShortcutContext"); -static gsi::ClassExt decl_Qt_ShortcutContext_Enums_as_child (decl_Qt_ShortcutContext_Enums, "QFlags_ShortcutContext"); +static gsi::ClassExt decl_Qt_ShortcutContext_Enum_as_child (decl_Qt_ShortcutContext_Enum, "QtCore", "ShortcutContext"); +static gsi::ClassExt decl_Qt_ShortcutContext_Enums_as_child (decl_Qt_ShortcutContext_Enums, "QtCore", "QFlags_ShortcutContext"); } @@ -317,7 +297,7 @@ static gsi::ClassExt decl_Qt_ShortcutContext_Enums_as_child (decl_ namespace qt_gsi { -static gsi::Enum decl_Qt_SizeHint_Enum ("Qt_SizeHint", +static gsi::Enum decl_Qt_SizeHint_Enum ("QtCore", "Qt_SizeHint", gsi::enum_const ("MinimumSize", Qt::MinimumSize, "@brief Enum constant Qt::MinimumSize") + gsi::enum_const ("PreferredSize", Qt::PreferredSize, "@brief Enum constant Qt::PreferredSize") + gsi::enum_const ("MaximumSize", Qt::MaximumSize, "@brief Enum constant Qt::MaximumSize") + @@ -325,13 +305,13 @@ static gsi::Enum decl_Qt_SizeHint_Enum ("Qt_SizeHint", gsi::enum_const ("NSizeHints", Qt::NSizeHints, "@brief Enum constant Qt::NSizeHints"), "@qt\n@brief This class represents the Qt::SizeHint enum"); -static gsi::QFlagsClass decl_Qt_SizeHint_Enums ("Qt_QFlags_SizeHint", +static gsi::QFlagsClass decl_Qt_SizeHint_Enums ("QtCore", "Qt_QFlags_SizeHint", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_SizeHint_Enum_in_parent (decl_Qt_SizeHint_Enum.defs ()); -static gsi::ClassExt decl_Qt_SizeHint_Enum_as_child (decl_Qt_SizeHint_Enum, "SizeHint"); -static gsi::ClassExt decl_Qt_SizeHint_Enums_as_child (decl_Qt_SizeHint_Enums, "QFlags_SizeHint"); +static gsi::ClassExt decl_Qt_SizeHint_Enum_as_child (decl_Qt_SizeHint_Enum, "QtCore", "SizeHint"); +static gsi::ClassExt decl_Qt_SizeHint_Enums_as_child (decl_Qt_SizeHint_Enums, "QtCore", "QFlags_SizeHint"); } @@ -340,18 +320,18 @@ static gsi::ClassExt decl_Qt_SizeHint_Enums_as_child (decl_Qt_Size namespace qt_gsi { -static gsi::Enum decl_Qt_SizeMode_Enum ("Qt_SizeMode", +static gsi::Enum decl_Qt_SizeMode_Enum ("QtCore", "Qt_SizeMode", gsi::enum_const ("AbsoluteSize", Qt::AbsoluteSize, "@brief Enum constant Qt::AbsoluteSize") + gsi::enum_const ("RelativeSize", Qt::RelativeSize, "@brief Enum constant Qt::RelativeSize"), "@qt\n@brief This class represents the Qt::SizeMode enum"); -static gsi::QFlagsClass decl_Qt_SizeMode_Enums ("Qt_QFlags_SizeMode", +static gsi::QFlagsClass decl_Qt_SizeMode_Enums ("QtCore", "Qt_QFlags_SizeMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_SizeMode_Enum_in_parent (decl_Qt_SizeMode_Enum.defs ()); -static gsi::ClassExt decl_Qt_SizeMode_Enum_as_child (decl_Qt_SizeMode_Enum, "SizeMode"); -static gsi::ClassExt decl_Qt_SizeMode_Enums_as_child (decl_Qt_SizeMode_Enums, "QFlags_SizeMode"); +static gsi::ClassExt decl_Qt_SizeMode_Enum_as_child (decl_Qt_SizeMode_Enum, "QtCore", "SizeMode"); +static gsi::ClassExt decl_Qt_SizeMode_Enums_as_child (decl_Qt_SizeMode_Enums, "QtCore", "QFlags_SizeMode"); } @@ -360,18 +340,18 @@ static gsi::ClassExt decl_Qt_SizeMode_Enums_as_child (decl_Qt_Size namespace qt_gsi { -static gsi::Enum decl_Qt_SortOrder_Enum ("Qt_SortOrder", +static gsi::Enum decl_Qt_SortOrder_Enum ("QtCore", "Qt_SortOrder", gsi::enum_const ("AscendingOrder", Qt::AscendingOrder, "@brief Enum constant Qt::AscendingOrder") + gsi::enum_const ("DescendingOrder", Qt::DescendingOrder, "@brief Enum constant Qt::DescendingOrder"), "@qt\n@brief This class represents the Qt::SortOrder enum"); -static gsi::QFlagsClass decl_Qt_SortOrder_Enums ("Qt_QFlags_SortOrder", +static gsi::QFlagsClass decl_Qt_SortOrder_Enums ("QtCore", "Qt_QFlags_SortOrder", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_SortOrder_Enum_in_parent (decl_Qt_SortOrder_Enum.defs ()); -static gsi::ClassExt decl_Qt_SortOrder_Enum_as_child (decl_Qt_SortOrder_Enum, "SortOrder"); -static gsi::ClassExt decl_Qt_SortOrder_Enums_as_child (decl_Qt_SortOrder_Enums, "QFlags_SortOrder"); +static gsi::ClassExt decl_Qt_SortOrder_Enum_as_child (decl_Qt_SortOrder_Enum, "QtCore", "SortOrder"); +static gsi::ClassExt decl_Qt_SortOrder_Enums_as_child (decl_Qt_SortOrder_Enums, "QtCore", "QFlags_SortOrder"); } @@ -380,20 +360,20 @@ static gsi::ClassExt decl_Qt_SortOrder_Enums_as_child (decl_Qt_Sor namespace qt_gsi { -static gsi::Enum decl_Qt_TextElideMode_Enum ("Qt_TextElideMode", +static gsi::Enum decl_Qt_TextElideMode_Enum ("QtCore", "Qt_TextElideMode", gsi::enum_const ("ElideLeft", Qt::ElideLeft, "@brief Enum constant Qt::ElideLeft") + gsi::enum_const ("ElideRight", Qt::ElideRight, "@brief Enum constant Qt::ElideRight") + gsi::enum_const ("ElideMiddle", Qt::ElideMiddle, "@brief Enum constant Qt::ElideMiddle") + gsi::enum_const ("ElideNone", Qt::ElideNone, "@brief Enum constant Qt::ElideNone"), "@qt\n@brief This class represents the Qt::TextElideMode enum"); -static gsi::QFlagsClass decl_Qt_TextElideMode_Enums ("Qt_QFlags_TextElideMode", +static gsi::QFlagsClass decl_Qt_TextElideMode_Enums ("QtCore", "Qt_QFlags_TextElideMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_TextElideMode_Enum_in_parent (decl_Qt_TextElideMode_Enum.defs ()); -static gsi::ClassExt decl_Qt_TextElideMode_Enum_as_child (decl_Qt_TextElideMode_Enum, "TextElideMode"); -static gsi::ClassExt decl_Qt_TextElideMode_Enums_as_child (decl_Qt_TextElideMode_Enums, "QFlags_TextElideMode"); +static gsi::ClassExt decl_Qt_TextElideMode_Enum_as_child (decl_Qt_TextElideMode_Enum, "QtCore", "TextElideMode"); +static gsi::ClassExt decl_Qt_TextElideMode_Enums_as_child (decl_Qt_TextElideMode_Enums, "QtCore", "QFlags_TextElideMode"); } @@ -402,7 +382,7 @@ static gsi::ClassExt decl_Qt_TextElideMode_Enums_as_child (decl_Qt namespace qt_gsi { -static gsi::Enum decl_Qt_TextFlag_Enum ("Qt_TextFlag", +static gsi::Enum decl_Qt_TextFlag_Enum ("QtCore", "Qt_TextFlag", gsi::enum_const ("TextSingleLine", Qt::TextSingleLine, "@brief Enum constant Qt::TextSingleLine") + gsi::enum_const ("TextDontClip", Qt::TextDontClip, "@brief Enum constant Qt::TextDontClip") + gsi::enum_const ("TextExpandTabs", Qt::TextExpandTabs, "@brief Enum constant Qt::TextExpandTabs") + @@ -418,13 +398,13 @@ static gsi::Enum decl_Qt_TextFlag_Enum ("Qt_TextFlag", gsi::enum_const ("TextLongestVariant", Qt::TextLongestVariant, "@brief Enum constant Qt::TextLongestVariant"), "@qt\n@brief This class represents the Qt::TextFlag enum"); -static gsi::QFlagsClass decl_Qt_TextFlag_Enums ("Qt_QFlags_TextFlag", +static gsi::QFlagsClass decl_Qt_TextFlag_Enums ("QtCore", "Qt_QFlags_TextFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_TextFlag_Enum_in_parent (decl_Qt_TextFlag_Enum.defs ()); -static gsi::ClassExt decl_Qt_TextFlag_Enum_as_child (decl_Qt_TextFlag_Enum, "TextFlag"); -static gsi::ClassExt decl_Qt_TextFlag_Enums_as_child (decl_Qt_TextFlag_Enums, "QFlags_TextFlag"); +static gsi::ClassExt decl_Qt_TextFlag_Enum_as_child (decl_Qt_TextFlag_Enum, "QtCore", "TextFlag"); +static gsi::ClassExt decl_Qt_TextFlag_Enums_as_child (decl_Qt_TextFlag_Enums, "QtCore", "QFlags_TextFlag"); } @@ -433,20 +413,20 @@ static gsi::ClassExt decl_Qt_TextFlag_Enums_as_child (decl_Qt_Text namespace qt_gsi { -static gsi::Enum decl_Qt_TextFormat_Enum ("Qt_TextFormat", +static gsi::Enum decl_Qt_TextFormat_Enum ("QtCore", "Qt_TextFormat", gsi::enum_const ("PlainText", Qt::PlainText, "@brief Enum constant Qt::PlainText") + gsi::enum_const ("RichText", Qt::RichText, "@brief Enum constant Qt::RichText") + gsi::enum_const ("AutoText", Qt::AutoText, "@brief Enum constant Qt::AutoText") + gsi::enum_const ("LogText", Qt::LogText, "@brief Enum constant Qt::LogText"), "@qt\n@brief This class represents the Qt::TextFormat enum"); -static gsi::QFlagsClass decl_Qt_TextFormat_Enums ("Qt_QFlags_TextFormat", +static gsi::QFlagsClass decl_Qt_TextFormat_Enums ("QtCore", "Qt_QFlags_TextFormat", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_TextFormat_Enum_in_parent (decl_Qt_TextFormat_Enum.defs ()); -static gsi::ClassExt decl_Qt_TextFormat_Enum_as_child (decl_Qt_TextFormat_Enum, "TextFormat"); -static gsi::ClassExt decl_Qt_TextFormat_Enums_as_child (decl_Qt_TextFormat_Enums, "QFlags_TextFormat"); +static gsi::ClassExt decl_Qt_TextFormat_Enum_as_child (decl_Qt_TextFormat_Enum, "QtCore", "TextFormat"); +static gsi::ClassExt decl_Qt_TextFormat_Enums_as_child (decl_Qt_TextFormat_Enums, "QtCore", "QFlags_TextFormat"); } @@ -455,7 +435,7 @@ static gsi::ClassExt decl_Qt_TextFormat_Enums_as_child (decl_Qt_Te namespace qt_gsi { -static gsi::Enum decl_Qt_TextInteractionFlag_Enum ("Qt_TextInteractionFlag", +static gsi::Enum decl_Qt_TextInteractionFlag_Enum ("QtCore", "Qt_TextInteractionFlag", gsi::enum_const ("NoTextInteraction", Qt::NoTextInteraction, "@brief Enum constant Qt::NoTextInteraction") + gsi::enum_const ("TextSelectableByMouse", Qt::TextSelectableByMouse, "@brief Enum constant Qt::TextSelectableByMouse") + gsi::enum_const ("TextSelectableByKeyboard", Qt::TextSelectableByKeyboard, "@brief Enum constant Qt::TextSelectableByKeyboard") + @@ -466,13 +446,13 @@ static gsi::Enum decl_Qt_TextInteractionFlag_Enum ("Qt_ gsi::enum_const ("TextBrowserInteraction", Qt::TextBrowserInteraction, "@brief Enum constant Qt::TextBrowserInteraction"), "@qt\n@brief This class represents the Qt::TextInteractionFlag enum"); -static gsi::QFlagsClass decl_Qt_TextInteractionFlag_Enums ("Qt_QFlags_TextInteractionFlag", +static gsi::QFlagsClass decl_Qt_TextInteractionFlag_Enums ("QtCore", "Qt_QFlags_TextInteractionFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_TextInteractionFlag_Enum_in_parent (decl_Qt_TextInteractionFlag_Enum.defs ()); -static gsi::ClassExt decl_Qt_TextInteractionFlag_Enum_as_child (decl_Qt_TextInteractionFlag_Enum, "TextInteractionFlag"); -static gsi::ClassExt decl_Qt_TextInteractionFlag_Enums_as_child (decl_Qt_TextInteractionFlag_Enums, "QFlags_TextInteractionFlag"); +static gsi::ClassExt decl_Qt_TextInteractionFlag_Enum_as_child (decl_Qt_TextInteractionFlag_Enum, "QtCore", "TextInteractionFlag"); +static gsi::ClassExt decl_Qt_TextInteractionFlag_Enums_as_child (decl_Qt_TextInteractionFlag_Enums, "QtCore", "QFlags_TextInteractionFlag"); } @@ -481,19 +461,40 @@ static gsi::ClassExt decl_Qt_TextInteractionFlag_Enums_as_child (d namespace qt_gsi { -static gsi::Enum decl_Qt_TileRule_Enum ("Qt_TileRule", +static gsi::Enum decl_Qt_TileRule_Enum ("QtCore", "Qt_TileRule", gsi::enum_const ("StretchTile", Qt::StretchTile, "@brief Enum constant Qt::StretchTile") + gsi::enum_const ("RepeatTile", Qt::RepeatTile, "@brief Enum constant Qt::RepeatTile") + gsi::enum_const ("RoundTile", Qt::RoundTile, "@brief Enum constant Qt::RoundTile"), "@qt\n@brief This class represents the Qt::TileRule enum"); -static gsi::QFlagsClass decl_Qt_TileRule_Enums ("Qt_QFlags_TileRule", +static gsi::QFlagsClass decl_Qt_TileRule_Enums ("QtCore", "Qt_QFlags_TileRule", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_TileRule_Enum_in_parent (decl_Qt_TileRule_Enum.defs ()); -static gsi::ClassExt decl_Qt_TileRule_Enum_as_child (decl_Qt_TileRule_Enum, "TileRule"); -static gsi::ClassExt decl_Qt_TileRule_Enums_as_child (decl_Qt_TileRule_Enums, "QFlags_TileRule"); +static gsi::ClassExt decl_Qt_TileRule_Enum_as_child (decl_Qt_TileRule_Enum, "QtCore", "TileRule"); +static gsi::ClassExt decl_Qt_TileRule_Enums_as_child (decl_Qt_TileRule_Enums, "QtCore", "QFlags_TileRule"); + +} + + +// Implementation of the enum wrapper class for Qt::TimeSpec +namespace qt_gsi +{ + +static gsi::Enum decl_Qt_TimeSpec_Enum ("QtCore", "Qt_TimeSpec", + gsi::enum_const ("LocalTime", Qt::LocalTime, "@brief Enum constant Qt::LocalTime") + + gsi::enum_const ("UTC", Qt::UTC, "@brief Enum constant Qt::UTC") + + gsi::enum_const ("OffsetFromUTC", Qt::OffsetFromUTC, "@brief Enum constant Qt::OffsetFromUTC"), + "@qt\n@brief This class represents the Qt::TimeSpec enum"); + +static gsi::QFlagsClass decl_Qt_TimeSpec_Enums ("QtCore", "Qt_QFlags_TimeSpec", + "@qt\n@brief This class represents the QFlags flag set"); + +// Inject the declarations into the parent +static gsi::ClassExt inject_Qt_TimeSpec_Enum_in_parent (decl_Qt_TimeSpec_Enum.defs ()); +static gsi::ClassExt decl_Qt_TimeSpec_Enum_as_child (decl_Qt_TimeSpec_Enum, "QtCore", "TimeSpec"); +static gsi::ClassExt decl_Qt_TimeSpec_Enums_as_child (decl_Qt_TimeSpec_Enums, "QtCore", "QFlags_TimeSpec"); } diff --git a/src/gsiqt4/gsiDeclQt_3.cc b/src/gsiqt/qt4/QtCore/gsiDeclQt_3.cc similarity index 86% rename from src/gsiqt4/gsiDeclQt_3.cc rename to src/gsiqt/qt4/QtCore/gsiDeclQt_3.cc index 1515ff573..e389a5dc4 100644 --- a/src/gsiqt4/gsiDeclQt_3.cc +++ b/src/gsiqt/qt4/QtCore/gsiDeclQt_3.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtCoreCommon.h" +#include "gsiDeclQtCoreTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -39,32 +39,11 @@ class Qt_Namespace { }; -// Implementation of the enum wrapper class for Qt::TimeSpec -namespace qt_gsi -{ - -static gsi::Enum decl_Qt_TimeSpec_Enum ("Qt_TimeSpec", - gsi::enum_const ("LocalTime", Qt::LocalTime, "@brief Enum constant Qt::LocalTime") + - gsi::enum_const ("UTC", Qt::UTC, "@brief Enum constant Qt::UTC") + - gsi::enum_const ("OffsetFromUTC", Qt::OffsetFromUTC, "@brief Enum constant Qt::OffsetFromUTC"), - "@qt\n@brief This class represents the Qt::TimeSpec enum"); - -static gsi::QFlagsClass decl_Qt_TimeSpec_Enums ("Qt_QFlags_TimeSpec", - "@qt\n@brief This class represents the QFlags flag set"); - -// Inject the declarations into the parent -static gsi::ClassExt inject_Qt_TimeSpec_Enum_in_parent (decl_Qt_TimeSpec_Enum.defs ()); -static gsi::ClassExt decl_Qt_TimeSpec_Enum_as_child (decl_Qt_TimeSpec_Enum, "TimeSpec"); -static gsi::ClassExt decl_Qt_TimeSpec_Enums_as_child (decl_Qt_TimeSpec_Enums, "QFlags_TimeSpec"); - -} - - // Implementation of the enum wrapper class for Qt::ToolBarArea namespace qt_gsi { -static gsi::Enum decl_Qt_ToolBarArea_Enum ("Qt_ToolBarArea", +static gsi::Enum decl_Qt_ToolBarArea_Enum ("QtCore", "Qt_ToolBarArea", gsi::enum_const ("LeftToolBarArea", Qt::LeftToolBarArea, "@brief Enum constant Qt::LeftToolBarArea") + gsi::enum_const ("RightToolBarArea", Qt::RightToolBarArea, "@brief Enum constant Qt::RightToolBarArea") + gsi::enum_const ("TopToolBarArea", Qt::TopToolBarArea, "@brief Enum constant Qt::TopToolBarArea") + @@ -74,13 +53,13 @@ static gsi::Enum decl_Qt_ToolBarArea_Enum ("Qt_ToolBarArea", gsi::enum_const ("NoToolBarArea", Qt::NoToolBarArea, "@brief Enum constant Qt::NoToolBarArea"), "@qt\n@brief This class represents the Qt::ToolBarArea enum"); -static gsi::QFlagsClass decl_Qt_ToolBarArea_Enums ("Qt_QFlags_ToolBarArea", +static gsi::QFlagsClass decl_Qt_ToolBarArea_Enums ("QtCore", "Qt_QFlags_ToolBarArea", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_ToolBarArea_Enum_in_parent (decl_Qt_ToolBarArea_Enum.defs ()); -static gsi::ClassExt decl_Qt_ToolBarArea_Enum_as_child (decl_Qt_ToolBarArea_Enum, "ToolBarArea"); -static gsi::ClassExt decl_Qt_ToolBarArea_Enums_as_child (decl_Qt_ToolBarArea_Enums, "QFlags_ToolBarArea"); +static gsi::ClassExt decl_Qt_ToolBarArea_Enum_as_child (decl_Qt_ToolBarArea_Enum, "QtCore", "ToolBarArea"); +static gsi::ClassExt decl_Qt_ToolBarArea_Enums_as_child (decl_Qt_ToolBarArea_Enums, "QtCore", "QFlags_ToolBarArea"); } @@ -89,17 +68,17 @@ static gsi::ClassExt decl_Qt_ToolBarArea_Enums_as_child (decl_Qt_T namespace qt_gsi { -static gsi::Enum decl_Qt_ToolBarAreaSizes_Enum ("Qt_ToolBarAreaSizes", +static gsi::Enum decl_Qt_ToolBarAreaSizes_Enum ("QtCore", "Qt_ToolBarAreaSizes", gsi::enum_const ("NToolBarAreas", Qt::NToolBarAreas, "@brief Enum constant Qt::NToolBarAreas"), "@qt\n@brief This class represents the Qt::ToolBarAreaSizes enum"); -static gsi::QFlagsClass decl_Qt_ToolBarAreaSizes_Enums ("Qt_QFlags_ToolBarAreaSizes", +static gsi::QFlagsClass decl_Qt_ToolBarAreaSizes_Enums ("QtCore", "Qt_QFlags_ToolBarAreaSizes", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_ToolBarAreaSizes_Enum_in_parent (decl_Qt_ToolBarAreaSizes_Enum.defs ()); -static gsi::ClassExt decl_Qt_ToolBarAreaSizes_Enum_as_child (decl_Qt_ToolBarAreaSizes_Enum, "ToolBarAreaSizes"); -static gsi::ClassExt decl_Qt_ToolBarAreaSizes_Enums_as_child (decl_Qt_ToolBarAreaSizes_Enums, "QFlags_ToolBarAreaSizes"); +static gsi::ClassExt decl_Qt_ToolBarAreaSizes_Enum_as_child (decl_Qt_ToolBarAreaSizes_Enum, "QtCore", "ToolBarAreaSizes"); +static gsi::ClassExt decl_Qt_ToolBarAreaSizes_Enums_as_child (decl_Qt_ToolBarAreaSizes_Enums, "QtCore", "QFlags_ToolBarAreaSizes"); } @@ -108,7 +87,7 @@ static gsi::ClassExt decl_Qt_ToolBarAreaSizes_Enums_as_child (decl namespace qt_gsi { -static gsi::Enum decl_Qt_ToolButtonStyle_Enum ("Qt_ToolButtonStyle", +static gsi::Enum decl_Qt_ToolButtonStyle_Enum ("QtCore", "Qt_ToolButtonStyle", gsi::enum_const ("ToolButtonIconOnly", Qt::ToolButtonIconOnly, "@brief Enum constant Qt::ToolButtonIconOnly") + gsi::enum_const ("ToolButtonTextOnly", Qt::ToolButtonTextOnly, "@brief Enum constant Qt::ToolButtonTextOnly") + gsi::enum_const ("ToolButtonTextBesideIcon", Qt::ToolButtonTextBesideIcon, "@brief Enum constant Qt::ToolButtonTextBesideIcon") + @@ -116,13 +95,13 @@ static gsi::Enum decl_Qt_ToolButtonStyle_Enum ("Qt_ToolButt gsi::enum_const ("ToolButtonFollowStyle", Qt::ToolButtonFollowStyle, "@brief Enum constant Qt::ToolButtonFollowStyle"), "@qt\n@brief This class represents the Qt::ToolButtonStyle enum"); -static gsi::QFlagsClass decl_Qt_ToolButtonStyle_Enums ("Qt_QFlags_ToolButtonStyle", +static gsi::QFlagsClass decl_Qt_ToolButtonStyle_Enums ("QtCore", "Qt_QFlags_ToolButtonStyle", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_ToolButtonStyle_Enum_in_parent (decl_Qt_ToolButtonStyle_Enum.defs ()); -static gsi::ClassExt decl_Qt_ToolButtonStyle_Enum_as_child (decl_Qt_ToolButtonStyle_Enum, "ToolButtonStyle"); -static gsi::ClassExt decl_Qt_ToolButtonStyle_Enums_as_child (decl_Qt_ToolButtonStyle_Enums, "QFlags_ToolButtonStyle"); +static gsi::ClassExt decl_Qt_ToolButtonStyle_Enum_as_child (decl_Qt_ToolButtonStyle_Enum, "QtCore", "ToolButtonStyle"); +static gsi::ClassExt decl_Qt_ToolButtonStyle_Enums_as_child (decl_Qt_ToolButtonStyle_Enums, "QtCore", "QFlags_ToolButtonStyle"); } @@ -131,7 +110,7 @@ static gsi::ClassExt decl_Qt_ToolButtonStyle_Enums_as_child (decl_ namespace qt_gsi { -static gsi::Enum decl_Qt_TouchPointState_Enum ("Qt_TouchPointState", +static gsi::Enum decl_Qt_TouchPointState_Enum ("QtCore", "Qt_TouchPointState", gsi::enum_const ("TouchPointPressed", Qt::TouchPointPressed, "@brief Enum constant Qt::TouchPointPressed") + gsi::enum_const ("TouchPointMoved", Qt::TouchPointMoved, "@brief Enum constant Qt::TouchPointMoved") + gsi::enum_const ("TouchPointStationary", Qt::TouchPointStationary, "@brief Enum constant Qt::TouchPointStationary") + @@ -140,13 +119,13 @@ static gsi::Enum decl_Qt_TouchPointState_Enum ("Qt_TouchPoi gsi::enum_const ("TouchPointPrimary", Qt::TouchPointPrimary, "@brief Enum constant Qt::TouchPointPrimary"), "@qt\n@brief This class represents the Qt::TouchPointState enum"); -static gsi::QFlagsClass decl_Qt_TouchPointState_Enums ("Qt_QFlags_TouchPointState", +static gsi::QFlagsClass decl_Qt_TouchPointState_Enums ("QtCore", "Qt_QFlags_TouchPointState", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_TouchPointState_Enum_in_parent (decl_Qt_TouchPointState_Enum.defs ()); -static gsi::ClassExt decl_Qt_TouchPointState_Enum_as_child (decl_Qt_TouchPointState_Enum, "TouchPointState"); -static gsi::ClassExt decl_Qt_TouchPointState_Enums_as_child (decl_Qt_TouchPointState_Enums, "QFlags_TouchPointState"); +static gsi::ClassExt decl_Qt_TouchPointState_Enum_as_child (decl_Qt_TouchPointState_Enum, "QtCore", "TouchPointState"); +static gsi::ClassExt decl_Qt_TouchPointState_Enums_as_child (decl_Qt_TouchPointState_Enums, "QtCore", "QFlags_TouchPointState"); } @@ -155,18 +134,18 @@ static gsi::ClassExt decl_Qt_TouchPointState_Enums_as_child (decl_ namespace qt_gsi { -static gsi::Enum decl_Qt_TransformationMode_Enum ("Qt_TransformationMode", +static gsi::Enum decl_Qt_TransformationMode_Enum ("QtCore", "Qt_TransformationMode", gsi::enum_const ("FastTransformation", Qt::FastTransformation, "@brief Enum constant Qt::FastTransformation") + gsi::enum_const ("SmoothTransformation", Qt::SmoothTransformation, "@brief Enum constant Qt::SmoothTransformation"), "@qt\n@brief This class represents the Qt::TransformationMode enum"); -static gsi::QFlagsClass decl_Qt_TransformationMode_Enums ("Qt_QFlags_TransformationMode", +static gsi::QFlagsClass decl_Qt_TransformationMode_Enums ("QtCore", "Qt_QFlags_TransformationMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_TransformationMode_Enum_in_parent (decl_Qt_TransformationMode_Enum.defs ()); -static gsi::ClassExt decl_Qt_TransformationMode_Enum_as_child (decl_Qt_TransformationMode_Enum, "TransformationMode"); -static gsi::ClassExt decl_Qt_TransformationMode_Enums_as_child (decl_Qt_TransformationMode_Enums, "QFlags_TransformationMode"); +static gsi::ClassExt decl_Qt_TransformationMode_Enum_as_child (decl_Qt_TransformationMode_Enum, "QtCore", "TransformationMode"); +static gsi::ClassExt decl_Qt_TransformationMode_Enums_as_child (decl_Qt_TransformationMode_Enums, "QtCore", "QFlags_TransformationMode"); } @@ -175,7 +154,7 @@ static gsi::ClassExt decl_Qt_TransformationMode_Enums_as_child (de namespace qt_gsi { -static gsi::Enum decl_Qt_UIEffect_Enum ("Qt_UIEffect", +static gsi::Enum decl_Qt_UIEffect_Enum ("QtCore", "Qt_UIEffect", gsi::enum_const ("UI_General", Qt::UI_General, "@brief Enum constant Qt::UI_General") + gsi::enum_const ("UI_AnimateMenu", Qt::UI_AnimateMenu, "@brief Enum constant Qt::UI_AnimateMenu") + gsi::enum_const ("UI_FadeMenu", Qt::UI_FadeMenu, "@brief Enum constant Qt::UI_FadeMenu") + @@ -185,35 +164,13 @@ static gsi::Enum decl_Qt_UIEffect_Enum ("Qt_UIEffect", gsi::enum_const ("UI_AnimateToolBox", Qt::UI_AnimateToolBox, "@brief Enum constant Qt::UI_AnimateToolBox"), "@qt\n@brief This class represents the Qt::UIEffect enum"); -static gsi::QFlagsClass decl_Qt_UIEffect_Enums ("Qt_QFlags_UIEffect", +static gsi::QFlagsClass decl_Qt_UIEffect_Enums ("QtCore", "Qt_QFlags_UIEffect", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_UIEffect_Enum_in_parent (decl_Qt_UIEffect_Enum.defs ()); -static gsi::ClassExt decl_Qt_UIEffect_Enum_as_child (decl_Qt_UIEffect_Enum, "UIEffect"); -static gsi::ClassExt decl_Qt_UIEffect_Enums_as_child (decl_Qt_UIEffect_Enums, "QFlags_UIEffect"); - -} - - -// Implementation of the enum wrapper class for Qt::WhiteSpaceMode -namespace qt_gsi -{ - -static gsi::Enum decl_Qt_WhiteSpaceMode_Enum ("Qt_WhiteSpaceMode", - gsi::enum_const ("WhiteSpaceNormal", Qt::WhiteSpaceNormal, "@brief Enum constant Qt::WhiteSpaceNormal") + - gsi::enum_const ("WhiteSpacePre", Qt::WhiteSpacePre, "@brief Enum constant Qt::WhiteSpacePre") + - gsi::enum_const ("WhiteSpaceNoWrap", Qt::WhiteSpaceNoWrap, "@brief Enum constant Qt::WhiteSpaceNoWrap") + - gsi::enum_const ("WhiteSpaceModeUndefined", Qt::WhiteSpaceModeUndefined, "@brief Enum constant Qt::WhiteSpaceModeUndefined"), - "@qt\n@brief This class represents the Qt::WhiteSpaceMode enum"); - -static gsi::QFlagsClass decl_Qt_WhiteSpaceMode_Enums ("Qt_QFlags_WhiteSpaceMode", - "@qt\n@brief This class represents the QFlags flag set"); - -// Inject the declarations into the parent -static gsi::ClassExt inject_Qt_WhiteSpaceMode_Enum_in_parent (decl_Qt_WhiteSpaceMode_Enum.defs ()); -static gsi::ClassExt decl_Qt_WhiteSpaceMode_Enum_as_child (decl_Qt_WhiteSpaceMode_Enum, "WhiteSpaceMode"); -static gsi::ClassExt decl_Qt_WhiteSpaceMode_Enums_as_child (decl_Qt_WhiteSpaceMode_Enums, "QFlags_WhiteSpaceMode"); +static gsi::ClassExt decl_Qt_UIEffect_Enum_as_child (decl_Qt_UIEffect_Enum, "QtCore", "UIEffect"); +static gsi::ClassExt decl_Qt_UIEffect_Enums_as_child (decl_Qt_UIEffect_Enums, "QtCore", "QFlags_UIEffect"); } @@ -222,7 +179,7 @@ static gsi::ClassExt decl_Qt_WhiteSpaceMode_Enums_as_child (decl_Q namespace qt_gsi { -static gsi::Enum decl_Qt_WidgetAttribute_Enum ("Qt_WidgetAttribute", +static gsi::Enum decl_Qt_WidgetAttribute_Enum ("QtCore", "Qt_WidgetAttribute", gsi::enum_const ("WA_Disabled", Qt::WA_Disabled, "@brief Enum constant Qt::WA_Disabled") + gsi::enum_const ("WA_UnderMouse", Qt::WA_UnderMouse, "@brief Enum constant Qt::WA_UnderMouse") + gsi::enum_const ("WA_MouseTracking", Qt::WA_MouseTracking, "@brief Enum constant Qt::WA_MouseTracking") + @@ -337,13 +294,13 @@ static gsi::Enum decl_Qt_WidgetAttribute_Enum ("Qt_WidgetAt gsi::enum_const ("WA_AttributeCount", Qt::WA_AttributeCount, "@brief Enum constant Qt::WA_AttributeCount"), "@qt\n@brief This class represents the Qt::WidgetAttribute enum"); -static gsi::QFlagsClass decl_Qt_WidgetAttribute_Enums ("Qt_QFlags_WidgetAttribute", +static gsi::QFlagsClass decl_Qt_WidgetAttribute_Enums ("QtCore", "Qt_QFlags_WidgetAttribute", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_WidgetAttribute_Enum_in_parent (decl_Qt_WidgetAttribute_Enum.defs ()); -static gsi::ClassExt decl_Qt_WidgetAttribute_Enum_as_child (decl_Qt_WidgetAttribute_Enum, "WidgetAttribute"); -static gsi::ClassExt decl_Qt_WidgetAttribute_Enums_as_child (decl_Qt_WidgetAttribute_Enums, "QFlags_WidgetAttribute"); +static gsi::ClassExt decl_Qt_WidgetAttribute_Enum_as_child (decl_Qt_WidgetAttribute_Enum, "QtCore", "WidgetAttribute"); +static gsi::ClassExt decl_Qt_WidgetAttribute_Enums_as_child (decl_Qt_WidgetAttribute_Enums, "QtCore", "QFlags_WidgetAttribute"); } @@ -352,7 +309,7 @@ static gsi::ClassExt decl_Qt_WidgetAttribute_Enums_as_child (decl_ namespace qt_gsi { -static gsi::Enum decl_Qt_WindowFrameSection_Enum ("Qt_WindowFrameSection", +static gsi::Enum decl_Qt_WindowFrameSection_Enum ("QtCore", "Qt_WindowFrameSection", gsi::enum_const ("NoSection", Qt::NoSection, "@brief Enum constant Qt::NoSection") + gsi::enum_const ("LeftSection", Qt::LeftSection, "@brief Enum constant Qt::LeftSection") + gsi::enum_const ("TopLeftSection", Qt::TopLeftSection, "@brief Enum constant Qt::TopLeftSection") + @@ -365,13 +322,13 @@ static gsi::Enum decl_Qt_WindowFrameSection_Enum ("Qt_Wi gsi::enum_const ("TitleBarArea", Qt::TitleBarArea, "@brief Enum constant Qt::TitleBarArea"), "@qt\n@brief This class represents the Qt::WindowFrameSection enum"); -static gsi::QFlagsClass decl_Qt_WindowFrameSection_Enums ("Qt_QFlags_WindowFrameSection", +static gsi::QFlagsClass decl_Qt_WindowFrameSection_Enums ("QtCore", "Qt_QFlags_WindowFrameSection", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_WindowFrameSection_Enum_in_parent (decl_Qt_WindowFrameSection_Enum.defs ()); -static gsi::ClassExt decl_Qt_WindowFrameSection_Enum_as_child (decl_Qt_WindowFrameSection_Enum, "WindowFrameSection"); -static gsi::ClassExt decl_Qt_WindowFrameSection_Enums_as_child (decl_Qt_WindowFrameSection_Enums, "QFlags_WindowFrameSection"); +static gsi::ClassExt decl_Qt_WindowFrameSection_Enum_as_child (decl_Qt_WindowFrameSection_Enum, "QtCore", "WindowFrameSection"); +static gsi::ClassExt decl_Qt_WindowFrameSection_Enums_as_child (decl_Qt_WindowFrameSection_Enums, "QtCore", "QFlags_WindowFrameSection"); } @@ -380,19 +337,19 @@ static gsi::ClassExt decl_Qt_WindowFrameSection_Enums_as_child (de namespace qt_gsi { -static gsi::Enum decl_Qt_WindowModality_Enum ("Qt_WindowModality", +static gsi::Enum decl_Qt_WindowModality_Enum ("QtCore", "Qt_WindowModality", gsi::enum_const ("NonModal", Qt::NonModal, "@brief Enum constant Qt::NonModal") + gsi::enum_const ("WindowModal", Qt::WindowModal, "@brief Enum constant Qt::WindowModal") + gsi::enum_const ("ApplicationModal", Qt::ApplicationModal, "@brief Enum constant Qt::ApplicationModal"), "@qt\n@brief This class represents the Qt::WindowModality enum"); -static gsi::QFlagsClass decl_Qt_WindowModality_Enums ("Qt_QFlags_WindowModality", +static gsi::QFlagsClass decl_Qt_WindowModality_Enums ("QtCore", "Qt_QFlags_WindowModality", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_WindowModality_Enum_in_parent (decl_Qt_WindowModality_Enum.defs ()); -static gsi::ClassExt decl_Qt_WindowModality_Enum_as_child (decl_Qt_WindowModality_Enum, "WindowModality"); -static gsi::ClassExt decl_Qt_WindowModality_Enums_as_child (decl_Qt_WindowModality_Enums, "QFlags_WindowModality"); +static gsi::ClassExt decl_Qt_WindowModality_Enum_as_child (decl_Qt_WindowModality_Enum, "QtCore", "WindowModality"); +static gsi::ClassExt decl_Qt_WindowModality_Enums_as_child (decl_Qt_WindowModality_Enums, "QtCore", "QFlags_WindowModality"); } @@ -401,7 +358,7 @@ static gsi::ClassExt decl_Qt_WindowModality_Enums_as_child (decl_Q namespace qt_gsi { -static gsi::Enum decl_Qt_WindowState_Enum ("Qt_WindowState", +static gsi::Enum decl_Qt_WindowState_Enum ("QtCore", "Qt_WindowState", gsi::enum_const ("WindowNoState", Qt::WindowNoState, "@brief Enum constant Qt::WindowNoState") + gsi::enum_const ("WindowMinimized", Qt::WindowMinimized, "@brief Enum constant Qt::WindowMinimized") + gsi::enum_const ("WindowMaximized", Qt::WindowMaximized, "@brief Enum constant Qt::WindowMaximized") + @@ -409,13 +366,13 @@ static gsi::Enum decl_Qt_WindowState_Enum ("Qt_WindowState", gsi::enum_const ("WindowActive", Qt::WindowActive, "@brief Enum constant Qt::WindowActive"), "@qt\n@brief This class represents the Qt::WindowState enum"); -static gsi::QFlagsClass decl_Qt_WindowState_Enums ("Qt_QFlags_WindowState", +static gsi::QFlagsClass decl_Qt_WindowState_Enums ("QtCore", "Qt_QFlags_WindowState", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_WindowState_Enum_in_parent (decl_Qt_WindowState_Enum.defs ()); -static gsi::ClassExt decl_Qt_WindowState_Enum_as_child (decl_Qt_WindowState_Enum, "WindowState"); -static gsi::ClassExt decl_Qt_WindowState_Enums_as_child (decl_Qt_WindowState_Enums, "QFlags_WindowState"); +static gsi::ClassExt decl_Qt_WindowState_Enum_as_child (decl_Qt_WindowState_Enum, "QtCore", "WindowState"); +static gsi::ClassExt decl_Qt_WindowState_Enums_as_child (decl_Qt_WindowState_Enums, "QtCore", "QFlags_WindowState"); } @@ -424,7 +381,7 @@ static gsi::ClassExt decl_Qt_WindowState_Enums_as_child (decl_Qt_W namespace qt_gsi { -static gsi::Enum decl_Qt_WindowType_Enum ("Qt_WindowType", +static gsi::Enum decl_Qt_WindowType_Enum ("QtCore", "Qt_WindowType", gsi::enum_const ("Widget", Qt::Widget, "@brief Enum constant Qt::Widget") + gsi::enum_const ("Window", Qt::Window, "@brief Enum constant Qt::Window") + gsi::enum_const ("Dialog", Qt::Dialog, "@brief Enum constant Qt::Dialog") + @@ -456,13 +413,13 @@ static gsi::Enum decl_Qt_WindowType_Enum ("Qt_WindowType", gsi::enum_const ("BypassGraphicsProxyWidget", Qt::BypassGraphicsProxyWidget, "@brief Enum constant Qt::BypassGraphicsProxyWidget"), "@qt\n@brief This class represents the Qt::WindowType enum"); -static gsi::QFlagsClass decl_Qt_WindowType_Enums ("Qt_QFlags_WindowType", +static gsi::QFlagsClass decl_Qt_WindowType_Enums ("QtCore", "Qt_QFlags_WindowType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_Qt_WindowType_Enum_in_parent (decl_Qt_WindowType_Enum.defs ()); -static gsi::ClassExt decl_Qt_WindowType_Enum_as_child (decl_Qt_WindowType_Enum, "WindowType"); -static gsi::ClassExt decl_Qt_WindowType_Enums_as_child (decl_Qt_WindowType_Enums, "QFlags_WindowType"); +static gsi::ClassExt decl_Qt_WindowType_Enum_as_child (decl_Qt_WindowType_Enum, "QtCore", "WindowType"); +static gsi::ClassExt decl_Qt_WindowType_Enums_as_child (decl_Qt_WindowType_Enums, "QtCore", "QFlags_WindowType"); } diff --git a/src/gsiqt/qt4/QtCore/gsiQtCoreCommon.h b/src/gsiqt/qt4/QtCore/gsiQtCoreCommon.h new file mode 100644 index 000000000..bbd8d1771 --- /dev/null +++ b/src/gsiqt/qt4/QtCore/gsiQtCoreCommon.h @@ -0,0 +1,39 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2018 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + + +#include "tlDefs.h" + +#if !defined(HDR_gsiQtCoreCommon_h) +# define HDR_gsiQtCoreCommon_h + +# ifdef MAKE_GSI_QTCORE_LIBRARY +# define GSI_QTCORE_PUBLIC DEF_INSIDE_PUBLIC +# define GSI_QTCORE_PUBLIC_TEMPLATE DEF_INSIDE_PUBLIC_TEMPLATE +# define GSI_QTCORE_LOCAL DEF_INSIDE_LOCAL +# else +# define GSI_QTCORE_PUBLIC DEF_OUTSIDE_PUBLIC +# define GSI_QTCORE_PUBLIC_TEMPLATE DEF_OUTSIDE_PUBLIC_TEMPLATE +# define GSI_QTCORE_LOCAL DEF_OUTSIDE_LOCAL +# endif + +#endif diff --git a/src/gsiqt/qt4/QtCore/gsiQtExternals.h b/src/gsiqt/qt4/QtCore/gsiQtExternals.h new file mode 100644 index 000000000..dcd8744a0 --- /dev/null +++ b/src/gsiqt/qt4/QtCore/gsiQtExternals.h @@ -0,0 +1,259 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2018 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + +/* + External declarations for for Qt bindings + + DO NOT EDIT THIS FILE. + This file has been created automatically +*/ + +#if !defined(HDR_gsiQtExternals) +#define HDR_gsiQtExternals + +#include "gsiClassBase.h" +#include "gsiQtCoreCommon.h" + +class QAbstractItemModel; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QAbstractItemModel (); } + +class QAbstractListModel; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QAbstractListModel (); } + +class QAbstractTableModel; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QAbstractTableModel (); } + +class QBasicTimer; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QBasicTimer (); } + +class QBuffer; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QBuffer (); } + +class QByteArrayMatcher; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QByteArrayMatcher (); } + +class QChildEvent; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QChildEvent (); } + +class QCoreApplication; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QCoreApplication (); } + +class QCryptographicHash; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QCryptographicHash (); } + +class QDataStream; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QDataStream (); } + +class QDate; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QDate (); } + +class QDateTime; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QDateTime (); } + +class QDir; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QDir (); } + +class QDynamicPropertyChangeEvent; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QDynamicPropertyChangeEvent (); } + +class QEasingCurve; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QEasingCurve (); } + +class QEvent; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QEvent (); } + +class QEventLoop; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QEventLoop (); } + +struct QFactoryInterface; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QFactoryInterface (); } + +class QFile; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QFile (); } + +class QFileInfo; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QFileInfo (); } + +class QFileSystemWatcher; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QFileSystemWatcher (); } + +class QIODevice; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QIODevice (); } + +class QLibrary; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QLibrary (); } + +class QLibraryInfo; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QLibraryInfo (); } + +class QLine; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QLine (); } + +class QLineF; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QLineF (); } + +class QLocale; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QLocale (); } + +class QMargins; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QMargins (); } + +class QMetaClassInfo; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QMetaClassInfo (); } + +class QMetaEnum; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QMetaEnum (); } + +class QMetaMethod; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QMetaMethod (); } + +struct QMetaObject; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QMetaObject (); } + +class QMetaProperty; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QMetaProperty (); } + +class QMetaType; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QMetaType (); } + +class QMimeData; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QMimeData (); } + +class QModelIndex; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QModelIndex (); } + +class QMutex; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QMutex (); } + +class QObject; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QObject (); } + +class QPersistentModelIndex; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QPersistentModelIndex (); } + +class QPluginLoader; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QPluginLoader (); } + +class QPoint; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QPoint (); } + +class QPointF; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QPointF (); } + +class QProcess; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QProcess (); } + +class QProcessEnvironment; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QProcessEnvironment (); } + +class QReadLocker; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QReadLocker (); } + +class QReadWriteLock; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QReadWriteLock (); } + +class QRect; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QRect (); } + +class QRectF; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QRectF (); } + +class QRegExp; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QRegExp (); } + +class QResource; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QResource (); } + +class QSemaphore; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QSemaphore (); } + +class QSettings; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QSettings (); } + +class QSignalMapper; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QSignalMapper (); } + +class QSize; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QSize (); } + +class QSizeF; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QSizeF (); } + +class QSocketNotifier; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QSocketNotifier (); } + +class QStringMatcher; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QStringMatcher (); } + +class QSysInfo; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QSysInfo (); } + +class QSystemLocale; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QSystemLocale (); } + +class QTemporaryFile; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QTemporaryFile (); } + +class QTextCodec; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QTextCodec (); } + +class QTextDecoder; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QTextDecoder (); } + +class QTextEncoder; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QTextEncoder (); } + +class QTextStream; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QTextStream (); } + +class QThread; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QThread (); } + +class QTime; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QTime (); } + +class QTimeLine; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QTimeLine (); } + +class QTimer; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QTimer (); } + +class QTimerEvent; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QTimerEvent (); } + +class QTranslator; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QTranslator (); } + +class QUrl; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QUrl (); } + +class QWaitCondition; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QWaitCondition (); } + +class QWriteLocker; +namespace gsi { GSI_QTCORE_PUBLIC gsi::Class &qtdecl_QWriteLocker (); } + + +#define QT_EXTERNAL_BASE(X) gsi::qtdecl_##X(), + +#endif + diff --git a/src/gsiqt/qt4/QtDesigner/QtDesigner.pri b/src/gsiqt/qt4/QtDesigner/QtDesigner.pri new file mode 100644 index 000000000..177518cfb --- /dev/null +++ b/src/gsiqt/qt4/QtDesigner/QtDesigner.pri @@ -0,0 +1,10 @@ +# +# Partial QMAKE project file for Qt bindings +# +# DO NOT EDIT THIS FILE. +# This file has been created automatically +# + +SOURCES += \ + $$PWD/gsiDeclQAbstractFormBuilder.cc \ + $$PWD/gsiDeclQFormBuilder.cc diff --git a/src/gsiqt/qt4/QtDesigner/QtDesigner.pro b/src/gsiqt/qt4/QtDesigner/QtDesigner.pro new file mode 100644 index 000000000..dd5a019dd --- /dev/null +++ b/src/gsiqt/qt4/QtDesigner/QtDesigner.pro @@ -0,0 +1,20 @@ + + +DESTDIR = $$OUT_PWD/../../.. +TARGET = klayout_QtDesigner + +include($$PWD/../../../lib.pri) + +DEFINES += MAKE_GSI_QTDESIGNER_LIBRARY + +INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC +DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC + +LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic + +SOURCES += \ + +HEADERS += \ + +include(QtDesigner.pri) + diff --git a/src/gsiqt4/gsiDeclQAbstractFormBuilder.cc b/src/gsiqt/qt4/QtDesigner/gsiDeclQAbstractFormBuilder.cc similarity index 95% rename from src/gsiqt4/gsiDeclQAbstractFormBuilder.cc rename to src/gsiqt/qt4/QtDesigner/gsiDeclQAbstractFormBuilder.cc index 4fe73467c..72eedeaf7 100644 --- a/src/gsiqt4/gsiDeclQAbstractFormBuilder.cc +++ b/src/gsiqt/qt4/QtDesigner/gsiDeclQAbstractFormBuilder.cc @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -46,13 +47,15 @@ #include #include #include +#include #include #include +#include #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtDesignerCommon.h" +#include "gsiDeclQtDesignerTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -204,12 +207,12 @@ static gsi::Methods methods_QAbstractFormBuilder () { return methods; } -gsi::Class decl_QAbstractFormBuilder ("QAbstractFormBuilder", +gsi::Class decl_QAbstractFormBuilder ("QtDesigner", "QAbstractFormBuilder", methods_QAbstractFormBuilder (), "@qt\n@brief Binding of QAbstractFormBuilder"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractFormBuilder () { return decl_QAbstractFormBuilder; } +GSI_QTDESIGNER_PUBLIC gsi::Class &qtdecl_QAbstractFormBuilder () { return decl_QAbstractFormBuilder; } } diff --git a/src/gsiqt4/gsiDeclQFormBuilder.cc b/src/gsiqt/qt4/QtDesigner/gsiDeclQFormBuilder.cc similarity index 94% rename from src/gsiqt4/gsiDeclQFormBuilder.cc rename to src/gsiqt/qt4/QtDesigner/gsiDeclQFormBuilder.cc index 0232dc0fe..4cc1f144d 100644 --- a/src/gsiqt4/gsiDeclQFormBuilder.cc +++ b/src/gsiqt/qt4/QtDesigner/gsiDeclQFormBuilder.cc @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -46,13 +47,15 @@ #include #include #include +#include #include #include +#include #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtDesignerCommon.h" +#include "gsiDeclQtDesignerTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -160,12 +163,12 @@ static gsi::Methods methods_QFormBuilder () { gsi::Class &qtdecl_QAbstractFormBuilder (); -gsi::Class decl_QFormBuilder (qtdecl_QAbstractFormBuilder (), "QFormBuilder", +gsi::Class decl_QFormBuilder (qtdecl_QAbstractFormBuilder (), "QtDesigner", "QFormBuilder", methods_QFormBuilder (), "@qt\n@brief Binding of QFormBuilder"); -GSIQT_PUBLIC gsi::Class &qtdecl_QFormBuilder () { return decl_QFormBuilder; } +GSI_QTDESIGNER_PUBLIC gsi::Class &qtdecl_QFormBuilder () { return decl_QFormBuilder; } } diff --git a/src/gsiqt/qt4/QtDesigner/gsiDeclQtDesignerTypeTraits.h b/src/gsiqt/qt4/QtDesigner/gsiDeclQtDesignerTypeTraits.h new file mode 100644 index 000000000..a17df888f --- /dev/null +++ b/src/gsiqt/qt4/QtDesigner/gsiDeclQtDesignerTypeTraits.h @@ -0,0 +1,329 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2018 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + +/** +* @file generated/gsiDeclQtDesignerTypeTraits.h +* @brief Type traits for the Qt binding classes +* +* DO NOT EDIT THIS FILE. +* This file has been created automatically +*/ + +#ifndef _HDR_gsiDeclQtDesignerTypeTraits +#define _HDR_gsiDeclQtDesignerTypeTraits + +#include "gsiTypes.h" + + +class QAbstractFormBuilder; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QBrush; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QColor; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QConicalGradient; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QDataStream; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QDataStream_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QDir; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QFile; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QFileInfo; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QFormBuilder; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QGradient; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QIODevice; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QImage; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QImage_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QImageTextKeyLang; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QLine; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QLineF; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QLinearGradient; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QMatrix; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +struct QMetaObject; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QObject; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QObject_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QPaintDevice; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QPaintDevice_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QPainterPath; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +#include +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QPainterPathStroker; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QPalette; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QPixmap; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QPixmap_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QPoint; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QPointF; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QPolygon; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QPolygonF; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QRadialGradient; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QRect; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QRectF; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QRegExp; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QRegion; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSize; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSizeF; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSizePolicy; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QStringMatcher; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSysInfo; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QTransform; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class Qt_Namespace; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + + +#endif diff --git a/src/gsiqt/qt4/QtDesigner/gsiQtDesignerCommon.h b/src/gsiqt/qt4/QtDesigner/gsiQtDesignerCommon.h new file mode 100644 index 000000000..e9dca54a8 --- /dev/null +++ b/src/gsiqt/qt4/QtDesigner/gsiQtDesignerCommon.h @@ -0,0 +1,39 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2018 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + + +#include "tlDefs.h" + +#if !defined(HDR_gsiQtDesignerCommon_h) +# define HDR_gsiQtDesignerCommon_h + +# ifdef MAKE_GSI_QTDESIGNER_LIBRARY +# define GSI_QTDESIGNER_PUBLIC DEF_INSIDE_PUBLIC +# define GSI_QTDESIGNER_PUBLIC_TEMPLATE DEF_INSIDE_PUBLIC_TEMPLATE +# define GSI_QTDESIGNER_LOCAL DEF_INSIDE_LOCAL +# else +# define GSI_QTDESIGNER_PUBLIC DEF_OUTSIDE_PUBLIC +# define GSI_QTDESIGNER_PUBLIC_TEMPLATE DEF_OUTSIDE_PUBLIC_TEMPLATE +# define GSI_QTDESIGNER_LOCAL DEF_OUTSIDE_LOCAL +# endif + +#endif diff --git a/src/gsiqt/qt4/QtDesigner/gsiQtExternals.h b/src/gsiqt/qt4/QtDesigner/gsiQtExternals.h new file mode 100644 index 000000000..7c1366cda --- /dev/null +++ b/src/gsiqt/qt4/QtDesigner/gsiQtExternals.h @@ -0,0 +1,46 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2018 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + +/* + External declarations for for Qt bindings + + DO NOT EDIT THIS FILE. + This file has been created automatically +*/ + +#if !defined(HDR_gsiQtExternals) +#define HDR_gsiQtExternals + +#include "gsiClassBase.h" +#include "gsiQtDesignerCommon.h" + +class QAbstractFormBuilder; +namespace gsi { GSI_QTDESIGNER_PUBLIC gsi::Class &qtdecl_QAbstractFormBuilder (); } + +class QFormBuilder; +namespace gsi { GSI_QTDESIGNER_PUBLIC gsi::Class &qtdecl_QFormBuilder (); } + + +#define QT_EXTERNAL_BASE(X) gsi::qtdecl_##X(), + +#endif + diff --git a/src/gsiqt4/qtdecl.pri b/src/gsiqt/qt4/QtGui/QtGui.pri similarity index 71% rename from src/gsiqt4/qtdecl.pri rename to src/gsiqt/qt4/QtGui/QtGui.pri index f7710596a..7989c966e 100644 --- a/src/gsiqt4/qtdecl.pri +++ b/src/gsiqt/qt4/QtGui/QtGui.pri @@ -7,21 +7,15 @@ SOURCES += \ $$PWD/gsiDeclQAbstractButton.cc \ - $$PWD/gsiDeclQAbstractFormBuilder.cc \ $$PWD/gsiDeclQAbstractGraphicsShapeItem.cc \ $$PWD/gsiDeclQAbstractItemDelegate.cc \ - $$PWD/gsiDeclQAbstractItemModel.cc \ $$PWD/gsiDeclQAbstractItemView.cc \ - $$PWD/gsiDeclQAbstractListModel.cc \ - $$PWD/gsiDeclQAbstractNetworkCache.cc \ $$PWD/gsiDeclQAbstractPageSetupDialog.cc \ $$PWD/gsiDeclQAbstractPrintDialog.cc \ $$PWD/gsiDeclQAbstractProxyModel.cc \ $$PWD/gsiDeclQAbstractScrollArea.cc \ $$PWD/gsiDeclQAbstractSlider.cc \ - $$PWD/gsiDeclQAbstractSocket.cc \ $$PWD/gsiDeclQAbstractSpinBox.cc \ - $$PWD/gsiDeclQAbstractTableModel.cc \ $$PWD/gsiDeclQAbstractTextDocumentLayout.cc \ $$PWD/gsiDeclQAbstractTextDocumentLayout_Selection.cc \ $$PWD/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc \ @@ -36,18 +30,13 @@ SOURCES += \ $$PWD/gsiDeclQActionEvent.cc \ $$PWD/gsiDeclQActionGroup.cc \ $$PWD/gsiDeclQApplication.cc \ - $$PWD/gsiDeclQAuthenticator.cc \ - $$PWD/gsiDeclQBasicTimer.cc \ $$PWD/gsiDeclQBitmap.cc \ $$PWD/gsiDeclQBoxLayout.cc \ $$PWD/gsiDeclQBrush.cc \ - $$PWD/gsiDeclQBuffer.cc \ $$PWD/gsiDeclQButtonGroup.cc \ - $$PWD/gsiDeclQByteArrayMatcher.cc \ $$PWD/gsiDeclQCDEStyle.cc \ $$PWD/gsiDeclQCalendarWidget.cc \ $$PWD/gsiDeclQCheckBox.cc \ - $$PWD/gsiDeclQChildEvent.cc \ $$PWD/gsiDeclQCleanlooksStyle.cc \ $$PWD/gsiDeclQClipboard.cc \ $$PWD/gsiDeclQClipboardEvent.cc \ @@ -62,41 +51,18 @@ SOURCES += \ $$PWD/gsiDeclQCompleter.cc \ $$PWD/gsiDeclQConicalGradient.cc \ $$PWD/gsiDeclQContextMenuEvent.cc \ - $$PWD/gsiDeclQCoreApplication.cc \ - $$PWD/gsiDeclQCryptographicHash.cc \ $$PWD/gsiDeclQCursor.cc \ - $$PWD/gsiDeclQDataStream.cc \ $$PWD/gsiDeclQDataWidgetMapper.cc \ - $$PWD/gsiDeclQDate.cc \ $$PWD/gsiDeclQDateEdit.cc \ - $$PWD/gsiDeclQDateTime.cc \ $$PWD/gsiDeclQDateTimeEdit.cc \ $$PWD/gsiDeclQDesktopServices.cc \ $$PWD/gsiDeclQDesktopWidget.cc \ $$PWD/gsiDeclQDial.cc \ $$PWD/gsiDeclQDialog.cc \ $$PWD/gsiDeclQDialogButtonBox.cc \ - $$PWD/gsiDeclQDir.cc \ $$PWD/gsiDeclQDirIterator.cc \ $$PWD/gsiDeclQDirModel.cc \ $$PWD/gsiDeclQDockWidget.cc \ - $$PWD/gsiDeclQDomAttr.cc \ - $$PWD/gsiDeclQDomCDATASection.cc \ - $$PWD/gsiDeclQDomCharacterData.cc \ - $$PWD/gsiDeclQDomComment.cc \ - $$PWD/gsiDeclQDomDocument.cc \ - $$PWD/gsiDeclQDomDocumentFragment.cc \ - $$PWD/gsiDeclQDomDocumentType.cc \ - $$PWD/gsiDeclQDomElement.cc \ - $$PWD/gsiDeclQDomEntity.cc \ - $$PWD/gsiDeclQDomEntityReference.cc \ - $$PWD/gsiDeclQDomImplementation.cc \ - $$PWD/gsiDeclQDomNamedNodeMap.cc \ - $$PWD/gsiDeclQDomNode.cc \ - $$PWD/gsiDeclQDomNodeList.cc \ - $$PWD/gsiDeclQDomNotation.cc \ - $$PWD/gsiDeclQDomProcessingInstruction.cc \ - $$PWD/gsiDeclQDomText.cc \ $$PWD/gsiDeclQDoubleSpinBox.cc \ $$PWD/gsiDeclQDoubleValidator.cc \ $$PWD/gsiDeclQDrag.cc \ @@ -105,19 +71,11 @@ SOURCES += \ $$PWD/gsiDeclQDragMoveEvent.cc \ $$PWD/gsiDeclQDragResponseEvent.cc \ $$PWD/gsiDeclQDropEvent.cc \ - $$PWD/gsiDeclQDynamicPropertyChangeEvent.cc \ - $$PWD/gsiDeclQEasingCurve.cc \ $$PWD/gsiDeclQErrorMessage.cc \ - $$PWD/gsiDeclQEvent.cc \ - $$PWD/gsiDeclQEventLoop.cc \ - $$PWD/gsiDeclQFactoryInterface.cc \ - $$PWD/gsiDeclQFile.cc \ $$PWD/gsiDeclQFileDialog.cc \ $$PWD/gsiDeclQFileIconProvider.cc \ - $$PWD/gsiDeclQFileInfo.cc \ $$PWD/gsiDeclQFileOpenEvent.cc \ $$PWD/gsiDeclQFileSystemModel.cc \ - $$PWD/gsiDeclQFileSystemWatcher.cc \ $$PWD/gsiDeclQFocusEvent.cc \ $$PWD/gsiDeclQFocusFrame.cc \ $$PWD/gsiDeclQFont.cc \ @@ -127,10 +85,8 @@ SOURCES += \ $$PWD/gsiDeclQFontInfo.cc \ $$PWD/gsiDeclQFontMetrics.cc \ $$PWD/gsiDeclQFontMetricsF.cc \ - $$PWD/gsiDeclQFormBuilder.cc \ $$PWD/gsiDeclQFormLayout.cc \ $$PWD/gsiDeclQFrame.cc \ - $$PWD/gsiDeclQFtp.cc \ $$PWD/gsiDeclQGesture.cc \ $$PWD/gsiDeclQGestureEvent.cc \ $$PWD/gsiDeclQGestureRecognizer.cc \ @@ -180,11 +136,7 @@ SOURCES += \ $$PWD/gsiDeclQHeaderView.cc \ $$PWD/gsiDeclQHelpEvent.cc \ $$PWD/gsiDeclQHideEvent.cc \ - $$PWD/gsiDeclQHostAddress.cc \ - $$PWD/gsiDeclQHostInfo.cc \ $$PWD/gsiDeclQHoverEvent.cc \ - $$PWD/gsiDeclQIODevice.cc \ - $$PWD/gsiDeclQIPv6Address.cc \ $$PWD/gsiDeclQIcon.cc \ $$PWD/gsiDeclQIconDragEvent.cc \ $$PWD/gsiDeclQIconEngine.cc \ @@ -217,20 +169,12 @@ SOURCES += \ $$PWD/gsiDeclQLabel.cc \ $$PWD/gsiDeclQLayout.cc \ $$PWD/gsiDeclQLayoutItem.cc \ - $$PWD/gsiDeclQLibrary.cc \ - $$PWD/gsiDeclQLibraryInfo.cc \ - $$PWD/gsiDeclQLine.cc \ $$PWD/gsiDeclQLineEdit.cc \ - $$PWD/gsiDeclQLineF.cc \ $$PWD/gsiDeclQLinearGradient.cc \ $$PWD/gsiDeclQListView.cc \ $$PWD/gsiDeclQListWidget.cc \ $$PWD/gsiDeclQListWidgetItem.cc \ - $$PWD/gsiDeclQLocalServer.cc \ - $$PWD/gsiDeclQLocalSocket.cc \ - $$PWD/gsiDeclQLocale.cc \ $$PWD/gsiDeclQMainWindow.cc \ - $$PWD/gsiDeclQMargins.cc \ $$PWD/gsiDeclQMatrix.cc \ $$PWD/gsiDeclQMatrix4x4.cc \ $$PWD/gsiDeclQMdiArea.cc \ @@ -238,33 +182,11 @@ SOURCES += \ $$PWD/gsiDeclQMenu.cc \ $$PWD/gsiDeclQMenuBar.cc \ $$PWD/gsiDeclQMessageBox.cc \ - $$PWD/gsiDeclQMetaClassInfo.cc \ - $$PWD/gsiDeclQMetaEnum.cc \ - $$PWD/gsiDeclQMetaMethod.cc \ - $$PWD/gsiDeclQMetaObject.cc \ - $$PWD/gsiDeclQMetaProperty.cc \ - $$PWD/gsiDeclQMetaType.cc \ - $$PWD/gsiDeclQMimeData.cc \ $$PWD/gsiDeclQMimeSource.cc \ - $$PWD/gsiDeclQModelIndex.cc \ $$PWD/gsiDeclQMotifStyle.cc \ $$PWD/gsiDeclQMouseEvent.cc \ $$PWD/gsiDeclQMoveEvent.cc \ $$PWD/gsiDeclQMovie.cc \ - $$PWD/gsiDeclQMutex.cc \ - $$PWD/gsiDeclQNetworkAccessManager.cc \ - $$PWD/gsiDeclQNetworkAddressEntry.cc \ - $$PWD/gsiDeclQNetworkCacheMetaData.cc \ - $$PWD/gsiDeclQNetworkCookie.cc \ - $$PWD/gsiDeclQNetworkCookieJar.cc \ - $$PWD/gsiDeclQNetworkDiskCache.cc \ - $$PWD/gsiDeclQNetworkInterface.cc \ - $$PWD/gsiDeclQNetworkProxy.cc \ - $$PWD/gsiDeclQNetworkProxyFactory.cc \ - $$PWD/gsiDeclQNetworkProxyQuery.cc \ - $$PWD/gsiDeclQNetworkReply.cc \ - $$PWD/gsiDeclQNetworkRequest.cc \ - $$PWD/gsiDeclQObject.cc \ $$PWD/gsiDeclQPageSetupDialog.cc \ $$PWD/gsiDeclQPaintDevice.cc \ $$PWD/gsiDeclQPaintEngine.cc \ @@ -277,7 +199,6 @@ SOURCES += \ $$PWD/gsiDeclQPalette.cc \ $$PWD/gsiDeclQPanGesture.cc \ $$PWD/gsiDeclQPen.cc \ - $$PWD/gsiDeclQPersistentModelIndex.cc \ $$PWD/gsiDeclQPicture.cc \ $$PWD/gsiDeclQPinchGesture.cc \ $$PWD/gsiDeclQPixmap.cc \ @@ -285,9 +206,6 @@ SOURCES += \ $$PWD/gsiDeclQPlainTextDocumentLayout.cc \ $$PWD/gsiDeclQPlainTextEdit.cc \ $$PWD/gsiDeclQPlastiqueStyle.cc \ - $$PWD/gsiDeclQPluginLoader.cc \ - $$PWD/gsiDeclQPoint.cc \ - $$PWD/gsiDeclQPointF.cc \ $$PWD/gsiDeclQPolygon.cc \ $$PWD/gsiDeclQPolygonF.cc \ $$PWD/gsiDeclQPrintDialog.cc \ @@ -296,38 +214,24 @@ SOURCES += \ $$PWD/gsiDeclQPrintPreviewWidget.cc \ $$PWD/gsiDeclQPrinter.cc \ $$PWD/gsiDeclQPrinterInfo.cc \ - $$PWD/gsiDeclQProcess.cc \ - $$PWD/gsiDeclQProcessEnvironment.cc \ $$PWD/gsiDeclQProgressBar.cc \ $$PWD/gsiDeclQProgressDialog.cc \ $$PWD/gsiDeclQPushButton.cc \ $$PWD/gsiDeclQQuaternion.cc \ $$PWD/gsiDeclQRadialGradient.cc \ $$PWD/gsiDeclQRadioButton.cc \ - $$PWD/gsiDeclQReadLocker.cc \ - $$PWD/gsiDeclQReadWriteLock.cc \ - $$PWD/gsiDeclQRect.cc \ - $$PWD/gsiDeclQRectF.cc \ - $$PWD/gsiDeclQRegExp.cc \ $$PWD/gsiDeclQRegExpValidator.cc \ $$PWD/gsiDeclQRegion.cc \ $$PWD/gsiDeclQResizeEvent.cc \ - $$PWD/gsiDeclQResource.cc \ $$PWD/gsiDeclQRubberBand.cc \ $$PWD/gsiDeclQScrollArea.cc \ $$PWD/gsiDeclQScrollBar.cc \ - $$PWD/gsiDeclQSemaphore.cc \ - $$PWD/gsiDeclQSettings.cc \ $$PWD/gsiDeclQShortcut.cc \ $$PWD/gsiDeclQShortcutEvent.cc \ $$PWD/gsiDeclQShowEvent.cc \ - $$PWD/gsiDeclQSignalMapper.cc \ - $$PWD/gsiDeclQSize.cc \ - $$PWD/gsiDeclQSizeF.cc \ $$PWD/gsiDeclQSizeGrip.cc \ $$PWD/gsiDeclQSizePolicy.cc \ $$PWD/gsiDeclQSlider.cc \ - $$PWD/gsiDeclQSocketNotifier.cc \ $$PWD/gsiDeclQSortFilterProxyModel.cc \ $$PWD/gsiDeclQSound.cc \ $$PWD/gsiDeclQSpacerItem.cc \ @@ -335,27 +239,6 @@ SOURCES += \ $$PWD/gsiDeclQSplashScreen.cc \ $$PWD/gsiDeclQSplitter.cc \ $$PWD/gsiDeclQSplitterHandle.cc \ - $$PWD/gsiDeclQSql.cc \ - $$PWD/gsiDeclQSqlDatabase.cc \ - $$PWD/gsiDeclQSqlDriver.cc \ - $$PWD/gsiDeclQSqlDriverCreatorBase.cc \ - $$PWD/gsiDeclQSqlError.cc \ - $$PWD/gsiDeclQSqlField.cc \ - $$PWD/gsiDeclQSqlIndex.cc \ - $$PWD/gsiDeclQSqlQuery.cc \ - $$PWD/gsiDeclQSqlQueryModel.cc \ - $$PWD/gsiDeclQSqlRecord.cc \ - $$PWD/gsiDeclQSqlRelation.cc \ - $$PWD/gsiDeclQSqlRelationalTableModel.cc \ - $$PWD/gsiDeclQSqlResult.cc \ - $$PWD/gsiDeclQSqlTableModel.cc \ - $$PWD/gsiDeclQSsl.cc \ - $$PWD/gsiDeclQSslCertificate.cc \ - $$PWD/gsiDeclQSslCipher.cc \ - $$PWD/gsiDeclQSslConfiguration.cc \ - $$PWD/gsiDeclQSslError.cc \ - $$PWD/gsiDeclQSslKey.cc \ - $$PWD/gsiDeclQSslSocket.cc \ $$PWD/gsiDeclQStackedLayout.cc \ $$PWD/gsiDeclQStackedWidget.cc \ $$PWD/gsiDeclQStandardItem.cc \ @@ -363,7 +246,6 @@ SOURCES += \ $$PWD/gsiDeclQStatusBar.cc \ $$PWD/gsiDeclQStatusTipEvent.cc \ $$PWD/gsiDeclQStringListModel.cc \ - $$PWD/gsiDeclQStringMatcher.cc \ $$PWD/gsiDeclQStyle.cc \ $$PWD/gsiDeclQStyleFactory.cc \ $$PWD/gsiDeclQStyleHintReturn.cc \ @@ -411,8 +293,6 @@ SOURCES += \ $$PWD/gsiDeclQStyledItemDelegate.cc \ $$PWD/gsiDeclQSwipeGesture.cc \ $$PWD/gsiDeclQSyntaxHighlighter.cc \ - $$PWD/gsiDeclQSysInfo.cc \ - $$PWD/gsiDeclQSystemLocale.cc \ $$PWD/gsiDeclQSystemTrayIcon.cc \ $$PWD/gsiDeclQTabBar.cc \ $$PWD/gsiDeclQTabWidget.cc \ @@ -423,9 +303,6 @@ SOURCES += \ $$PWD/gsiDeclQTabletEvent.cc \ $$PWD/gsiDeclQTapAndHoldGesture.cc \ $$PWD/gsiDeclQTapGesture.cc \ - $$PWD/gsiDeclQTcpServer.cc \ - $$PWD/gsiDeclQTcpSocket.cc \ - $$PWD/gsiDeclQTemporaryFile.cc \ $$PWD/gsiDeclQTextBlock.cc \ $$PWD/gsiDeclQTextBlock_Iterator.cc \ $$PWD/gsiDeclQTextBlockFormat.cc \ @@ -433,16 +310,12 @@ SOURCES += \ $$PWD/gsiDeclQTextBlockUserData.cc \ $$PWD/gsiDeclQTextBrowser.cc \ $$PWD/gsiDeclQTextCharFormat.cc \ - $$PWD/gsiDeclQTextCodec.cc \ - $$PWD/gsiDeclQTextCodec_ConverterState.cc \ $$PWD/gsiDeclQTextCursor.cc \ - $$PWD/gsiDeclQTextDecoder.cc \ $$PWD/gsiDeclQTextDocument.cc \ $$PWD/gsiDeclQTextDocumentFragment.cc \ $$PWD/gsiDeclQTextDocumentWriter.cc \ $$PWD/gsiDeclQTextEdit.cc \ $$PWD/gsiDeclQTextEdit_ExtraSelection.cc \ - $$PWD/gsiDeclQTextEncoder.cc \ $$PWD/gsiDeclQTextFormat.cc \ $$PWD/gsiDeclQTextFragment.cc \ $$PWD/gsiDeclQTextFrame.cc \ @@ -461,17 +334,11 @@ SOURCES += \ $$PWD/gsiDeclQTextObjectInterface.cc \ $$PWD/gsiDeclQTextOption.cc \ $$PWD/gsiDeclQTextOption_Tab.cc \ - $$PWD/gsiDeclQTextStream.cc \ $$PWD/gsiDeclQTextTable.cc \ $$PWD/gsiDeclQTextTableCell.cc \ $$PWD/gsiDeclQTextTableCellFormat.cc \ $$PWD/gsiDeclQTextTableFormat.cc \ - $$PWD/gsiDeclQThread.cc \ - $$PWD/gsiDeclQTime.cc \ $$PWD/gsiDeclQTimeEdit.cc \ - $$PWD/gsiDeclQTimeLine.cc \ - $$PWD/gsiDeclQTimer.cc \ - $$PWD/gsiDeclQTimerEvent.cc \ $$PWD/gsiDeclQToolBar.cc \ $$PWD/gsiDeclQToolBarChangeEvent.cc \ $$PWD/gsiDeclQToolBox.cc \ @@ -480,25 +347,20 @@ SOURCES += \ $$PWD/gsiDeclQTouchEvent.cc \ $$PWD/gsiDeclQTouchEvent_TouchPoint.cc \ $$PWD/gsiDeclQTransform.cc \ - $$PWD/gsiDeclQTranslator.cc \ $$PWD/gsiDeclQTreeView.cc \ $$PWD/gsiDeclQTreeWidget.cc \ $$PWD/gsiDeclQTreeWidgetItem.cc \ $$PWD/gsiDeclQTreeWidgetItemIterator.cc \ - $$PWD/gsiDeclQUdpSocket.cc \ $$PWD/gsiDeclQUndoCommand.cc \ $$PWD/gsiDeclQUndoGroup.cc \ $$PWD/gsiDeclQUndoStack.cc \ $$PWD/gsiDeclQUndoView.cc \ $$PWD/gsiDeclQUnixPrintWidget.cc \ - $$PWD/gsiDeclQUrl.cc \ - $$PWD/gsiDeclQUrlInfo.cc \ $$PWD/gsiDeclQVBoxLayout.cc \ $$PWD/gsiDeclQValidator.cc \ $$PWD/gsiDeclQVector2D.cc \ $$PWD/gsiDeclQVector3D.cc \ $$PWD/gsiDeclQVector4D.cc \ - $$PWD/gsiDeclQWaitCondition.cc \ $$PWD/gsiDeclQWhatsThis.cc \ $$PWD/gsiDeclQWhatsThisClickedEvent.cc \ $$PWD/gsiDeclQWheelEvent.cc \ @@ -508,23 +370,4 @@ SOURCES += \ $$PWD/gsiDeclQWindowStateChangeEvent.cc \ $$PWD/gsiDeclQWindowsStyle.cc \ $$PWD/gsiDeclQWizard.cc \ - $$PWD/gsiDeclQWizardPage.cc \ - $$PWD/gsiDeclQWriteLocker.cc \ - $$PWD/gsiDeclQXmlAttributes.cc \ - $$PWD/gsiDeclQXmlContentHandler.cc \ - $$PWD/gsiDeclQXmlDTDHandler.cc \ - $$PWD/gsiDeclQXmlDeclHandler.cc \ - $$PWD/gsiDeclQXmlDefaultHandler.cc \ - $$PWD/gsiDeclQXmlEntityResolver.cc \ - $$PWD/gsiDeclQXmlErrorHandler.cc \ - $$PWD/gsiDeclQXmlInputSource.cc \ - $$PWD/gsiDeclQXmlLexicalHandler.cc \ - $$PWD/gsiDeclQXmlLocator.cc \ - $$PWD/gsiDeclQXmlNamespaceSupport.cc \ - $$PWD/gsiDeclQXmlParseException.cc \ - $$PWD/gsiDeclQXmlReader.cc \ - $$PWD/gsiDeclQXmlSimpleReader.cc \ - $$PWD/gsiDeclQt.cc \ - $$PWD/gsiDeclQt_1.cc \ - $$PWD/gsiDeclQt_2.cc \ - $$PWD/gsiDeclQt_3.cc + $$PWD/gsiDeclQWizardPage.cc diff --git a/src/gsiqt/qt4/QtGui/QtGui.pro b/src/gsiqt/qt4/QtGui/QtGui.pro new file mode 100644 index 000000000..2e17c13d5 --- /dev/null +++ b/src/gsiqt/qt4/QtGui/QtGui.pro @@ -0,0 +1,25 @@ + + +DESTDIR = $$OUT_PWD/../../.. +TARGET = klayout_QtGui + +include($$PWD/../../../lib.pri) + +DEFINES += MAKE_GSI_QTGUI_LIBRARY + +INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC +DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC + +LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic + +# there are some bridges between db and Qt, hence this: +INCLUDEPATH += $$DB_INC +DEPENDPATH += $$DB_INC +LIBS += -lklayout_db + +SOURCES += \ + +HEADERS += \ + +include(QtGui.pri) + diff --git a/src/gsiqt4/gsiDeclQAbstractButton.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractButton.cc similarity index 99% rename from src/gsiqt4/gsiDeclQAbstractButton.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQAbstractButton.cc index 124499c2c..a2102c89a 100644 --- a/src/gsiqt4/gsiDeclQAbstractButton.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractButton.cc @@ -78,8 +78,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -691,11 +691,11 @@ static gsi::Methods methods_QAbstractButton () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QAbstractButton (qtdecl_QWidget (), "QAbstractButton_Native", +qt_gsi::QtNativeClass decl_QAbstractButton (qtdecl_QWidget (), "QtGui", "QAbstractButton_Native", methods_QAbstractButton (), "@hide\n@alias QAbstractButton"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractButton () { return decl_QAbstractButton; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAbstractButton () { return decl_QAbstractButton; } } @@ -3106,7 +3106,7 @@ static gsi::Methods methods_QAbstractButton_Adaptor () { return methods; } -gsi::Class decl_QAbstractButton_Adaptor (qtdecl_QAbstractButton (), "QAbstractButton", +gsi::Class decl_QAbstractButton_Adaptor (qtdecl_QAbstractButton (), "QtGui", "QAbstractButton", methods_QAbstractButton_Adaptor (), "@qt\n@brief Binding of QAbstractButton"); diff --git a/src/gsiqt4/gsiDeclQAbstractGraphicsShapeItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractGraphicsShapeItem.cc similarity index 99% rename from src/gsiqt4/gsiDeclQAbstractGraphicsShapeItem.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQAbstractGraphicsShapeItem.cc index 7be146adf..06aa22c44 100644 --- a/src/gsiqt4/gsiDeclQAbstractGraphicsShapeItem.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractGraphicsShapeItem.cc @@ -58,8 +58,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -185,11 +185,11 @@ static gsi::Methods methods_QAbstractGraphicsShapeItem () { gsi::Class &qtdecl_QGraphicsItem (); -gsi::Class decl_QAbstractGraphicsShapeItem (qtdecl_QGraphicsItem (), "QAbstractGraphicsShapeItem_Native", +gsi::Class decl_QAbstractGraphicsShapeItem (qtdecl_QGraphicsItem (), "QtGui", "QAbstractGraphicsShapeItem_Native", methods_QAbstractGraphicsShapeItem (), "@hide\n@alias QAbstractGraphicsShapeItem"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractGraphicsShapeItem () { return decl_QAbstractGraphicsShapeItem; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAbstractGraphicsShapeItem () { return decl_QAbstractGraphicsShapeItem; } } @@ -1781,7 +1781,7 @@ static gsi::Methods methods_QAbstractGraphicsShapeItem_Adaptor () { return methods; } -gsi::Class decl_QAbstractGraphicsShapeItem_Adaptor (qtdecl_QAbstractGraphicsShapeItem (), "QAbstractGraphicsShapeItem", +gsi::Class decl_QAbstractGraphicsShapeItem_Adaptor (qtdecl_QAbstractGraphicsShapeItem (), "QtGui", "QAbstractGraphicsShapeItem", methods_QAbstractGraphicsShapeItem_Adaptor (), "@qt\n@brief Binding of QAbstractGraphicsShapeItem"); diff --git a/src/gsiqt4/gsiDeclQAbstractItemDelegate.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractItemDelegate.cc similarity index 98% rename from src/gsiqt4/gsiDeclQAbstractItemDelegate.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQAbstractItemDelegate.cc index 27c99bddd..ede206aa2 100644 --- a/src/gsiqt4/gsiDeclQAbstractItemDelegate.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractItemDelegate.cc @@ -43,8 +43,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -417,11 +417,11 @@ static gsi::Methods methods_QAbstractItemDelegate () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QAbstractItemDelegate (qtdecl_QObject (), "QAbstractItemDelegate_Native", +qt_gsi::QtNativeClass decl_QAbstractItemDelegate (qtdecl_QObject (), "QtGui", "QAbstractItemDelegate_Native", methods_QAbstractItemDelegate (), "@hide\n@alias QAbstractItemDelegate"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractItemDelegate () { return decl_QAbstractItemDelegate; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAbstractItemDelegate () { return decl_QAbstractItemDelegate; } } @@ -1212,7 +1212,7 @@ static gsi::Methods methods_QAbstractItemDelegate_Adaptor () { return methods; } -gsi::Class decl_QAbstractItemDelegate_Adaptor (qtdecl_QAbstractItemDelegate (), "QAbstractItemDelegate", +gsi::Class decl_QAbstractItemDelegate_Adaptor (qtdecl_QAbstractItemDelegate (), "QtGui", "QAbstractItemDelegate", methods_QAbstractItemDelegate_Adaptor (), "@qt\n@brief Binding of QAbstractItemDelegate"); @@ -1223,7 +1223,7 @@ gsi::Class decl_QAbstractItemDelegate_Adaptor (qt namespace qt_gsi { -static gsi::Enum decl_QAbstractItemDelegate_EndEditHint_Enum ("QAbstractItemDelegate_EndEditHint", +static gsi::Enum decl_QAbstractItemDelegate_EndEditHint_Enum ("QtGui", "QAbstractItemDelegate_EndEditHint", gsi::enum_const ("NoHint", QAbstractItemDelegate::NoHint, "@brief Enum constant QAbstractItemDelegate::NoHint") + gsi::enum_const ("EditNextItem", QAbstractItemDelegate::EditNextItem, "@brief Enum constant QAbstractItemDelegate::EditNextItem") + gsi::enum_const ("EditPreviousItem", QAbstractItemDelegate::EditPreviousItem, "@brief Enum constant QAbstractItemDelegate::EditPreviousItem") + @@ -1231,13 +1231,13 @@ static gsi::Enum decl_QAbstractItemDelegate_ gsi::enum_const ("RevertModelCache", QAbstractItemDelegate::RevertModelCache, "@brief Enum constant QAbstractItemDelegate::RevertModelCache"), "@qt\n@brief This class represents the QAbstractItemDelegate::EndEditHint enum"); -static gsi::QFlagsClass decl_QAbstractItemDelegate_EndEditHint_Enums ("QAbstractItemDelegate_QFlags_EndEditHint", +static gsi::QFlagsClass decl_QAbstractItemDelegate_EndEditHint_Enums ("QtGui", "QAbstractItemDelegate_QFlags_EndEditHint", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAbstractItemDelegate_EndEditHint_Enum_in_parent (decl_QAbstractItemDelegate_EndEditHint_Enum.defs ()); -static gsi::ClassExt decl_QAbstractItemDelegate_EndEditHint_Enum_as_child (decl_QAbstractItemDelegate_EndEditHint_Enum, "EndEditHint"); -static gsi::ClassExt decl_QAbstractItemDelegate_EndEditHint_Enums_as_child (decl_QAbstractItemDelegate_EndEditHint_Enums, "QFlags_EndEditHint"); +static gsi::ClassExt decl_QAbstractItemDelegate_EndEditHint_Enum_as_child (decl_QAbstractItemDelegate_EndEditHint_Enum, "QtGui", "EndEditHint"); +static gsi::ClassExt decl_QAbstractItemDelegate_EndEditHint_Enums_as_child (decl_QAbstractItemDelegate_EndEditHint_Enums, "QtGui", "QFlags_EndEditHint"); } diff --git a/src/gsiqt4/gsiDeclQAbstractItemView.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractItemView.cc similarity index 99% rename from src/gsiqt4/gsiDeclQAbstractItemView.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQAbstractItemView.cc index 48f86ae8e..56fa54d23 100644 --- a/src/gsiqt4/gsiDeclQAbstractItemView.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractItemView.cc @@ -84,8 +84,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1522,11 +1522,11 @@ static gsi::Methods methods_QAbstractItemView () { gsi::Class &qtdecl_QAbstractScrollArea (); -qt_gsi::QtNativeClass decl_QAbstractItemView (qtdecl_QAbstractScrollArea (), "QAbstractItemView_Native", +qt_gsi::QtNativeClass decl_QAbstractItemView (qtdecl_QAbstractScrollArea (), "QtGui", "QAbstractItemView_Native", methods_QAbstractItemView (), "@hide\n@alias QAbstractItemView"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractItemView () { return decl_QAbstractItemView; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAbstractItemView () { return decl_QAbstractItemView; } } @@ -5996,7 +5996,7 @@ static gsi::Methods methods_QAbstractItemView_Adaptor () { return methods; } -gsi::Class decl_QAbstractItemView_Adaptor (qtdecl_QAbstractItemView (), "QAbstractItemView", +gsi::Class decl_QAbstractItemView_Adaptor (qtdecl_QAbstractItemView (), "QtGui", "QAbstractItemView", methods_QAbstractItemView_Adaptor (), "@qt\n@brief Binding of QAbstractItemView"); @@ -6007,7 +6007,7 @@ gsi::Class decl_QAbstractItemView_Adaptor (qtdecl_QAb namespace qt_gsi { -static gsi::Enum decl_QAbstractItemView_DragDropMode_Enum ("QAbstractItemView_DragDropMode", +static gsi::Enum decl_QAbstractItemView_DragDropMode_Enum ("QtGui", "QAbstractItemView_DragDropMode", gsi::enum_const ("NoDragDrop", QAbstractItemView::NoDragDrop, "@brief Enum constant QAbstractItemView::NoDragDrop") + gsi::enum_const ("DragOnly", QAbstractItemView::DragOnly, "@brief Enum constant QAbstractItemView::DragOnly") + gsi::enum_const ("DropOnly", QAbstractItemView::DropOnly, "@brief Enum constant QAbstractItemView::DropOnly") + @@ -6015,13 +6015,13 @@ static gsi::Enum decl_QAbstractItemView_DragDro gsi::enum_const ("InternalMove", QAbstractItemView::InternalMove, "@brief Enum constant QAbstractItemView::InternalMove"), "@qt\n@brief This class represents the QAbstractItemView::DragDropMode enum"); -static gsi::QFlagsClass decl_QAbstractItemView_DragDropMode_Enums ("QAbstractItemView_QFlags_DragDropMode", +static gsi::QFlagsClass decl_QAbstractItemView_DragDropMode_Enums ("QtGui", "QAbstractItemView_QFlags_DragDropMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAbstractItemView_DragDropMode_Enum_in_parent (decl_QAbstractItemView_DragDropMode_Enum.defs ()); -static gsi::ClassExt decl_QAbstractItemView_DragDropMode_Enum_as_child (decl_QAbstractItemView_DragDropMode_Enum, "DragDropMode"); -static gsi::ClassExt decl_QAbstractItemView_DragDropMode_Enums_as_child (decl_QAbstractItemView_DragDropMode_Enums, "QFlags_DragDropMode"); +static gsi::ClassExt decl_QAbstractItemView_DragDropMode_Enum_as_child (decl_QAbstractItemView_DragDropMode_Enum, "QtGui", "DragDropMode"); +static gsi::ClassExt decl_QAbstractItemView_DragDropMode_Enums_as_child (decl_QAbstractItemView_DragDropMode_Enums, "QtGui", "QFlags_DragDropMode"); } @@ -6030,7 +6030,7 @@ static gsi::ClassExt decl_QAbstractItemView_DragDropMode_Enum namespace qt_gsi { -static gsi::Enum decl_QAbstractItemView_EditTrigger_Enum ("QAbstractItemView_EditTrigger", +static gsi::Enum decl_QAbstractItemView_EditTrigger_Enum ("QtGui", "QAbstractItemView_EditTrigger", gsi::enum_const ("NoEditTriggers", QAbstractItemView::NoEditTriggers, "@brief Enum constant QAbstractItemView::NoEditTriggers") + gsi::enum_const ("CurrentChanged", QAbstractItemView::CurrentChanged, "@brief Enum constant QAbstractItemView::CurrentChanged") + gsi::enum_const ("DoubleClicked", QAbstractItemView::DoubleClicked, "@brief Enum constant QAbstractItemView::DoubleClicked") + @@ -6040,13 +6040,13 @@ static gsi::Enum decl_QAbstractItemView_EditTrig gsi::enum_const ("AllEditTriggers", QAbstractItemView::AllEditTriggers, "@brief Enum constant QAbstractItemView::AllEditTriggers"), "@qt\n@brief This class represents the QAbstractItemView::EditTrigger enum"); -static gsi::QFlagsClass decl_QAbstractItemView_EditTrigger_Enums ("QAbstractItemView_QFlags_EditTrigger", +static gsi::QFlagsClass decl_QAbstractItemView_EditTrigger_Enums ("QtGui", "QAbstractItemView_QFlags_EditTrigger", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAbstractItemView_EditTrigger_Enum_in_parent (decl_QAbstractItemView_EditTrigger_Enum.defs ()); -static gsi::ClassExt decl_QAbstractItemView_EditTrigger_Enum_as_child (decl_QAbstractItemView_EditTrigger_Enum, "EditTrigger"); -static gsi::ClassExt decl_QAbstractItemView_EditTrigger_Enums_as_child (decl_QAbstractItemView_EditTrigger_Enums, "QFlags_EditTrigger"); +static gsi::ClassExt decl_QAbstractItemView_EditTrigger_Enum_as_child (decl_QAbstractItemView_EditTrigger_Enum, "QtGui", "EditTrigger"); +static gsi::ClassExt decl_QAbstractItemView_EditTrigger_Enums_as_child (decl_QAbstractItemView_EditTrigger_Enums, "QtGui", "QFlags_EditTrigger"); } @@ -6055,20 +6055,20 @@ static gsi::ClassExt decl_QAbstractItemView_EditTrigger_Enums namespace qt_gsi { -static gsi::Enum decl_QAbstractItemView_ScrollHint_Enum ("QAbstractItemView_ScrollHint", +static gsi::Enum decl_QAbstractItemView_ScrollHint_Enum ("QtGui", "QAbstractItemView_ScrollHint", gsi::enum_const ("EnsureVisible", QAbstractItemView::EnsureVisible, "@brief Enum constant QAbstractItemView::EnsureVisible") + gsi::enum_const ("PositionAtTop", QAbstractItemView::PositionAtTop, "@brief Enum constant QAbstractItemView::PositionAtTop") + gsi::enum_const ("PositionAtBottom", QAbstractItemView::PositionAtBottom, "@brief Enum constant QAbstractItemView::PositionAtBottom") + gsi::enum_const ("PositionAtCenter", QAbstractItemView::PositionAtCenter, "@brief Enum constant QAbstractItemView::PositionAtCenter"), "@qt\n@brief This class represents the QAbstractItemView::ScrollHint enum"); -static gsi::QFlagsClass decl_QAbstractItemView_ScrollHint_Enums ("QAbstractItemView_QFlags_ScrollHint", +static gsi::QFlagsClass decl_QAbstractItemView_ScrollHint_Enums ("QtGui", "QAbstractItemView_QFlags_ScrollHint", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAbstractItemView_ScrollHint_Enum_in_parent (decl_QAbstractItemView_ScrollHint_Enum.defs ()); -static gsi::ClassExt decl_QAbstractItemView_ScrollHint_Enum_as_child (decl_QAbstractItemView_ScrollHint_Enum, "ScrollHint"); -static gsi::ClassExt decl_QAbstractItemView_ScrollHint_Enums_as_child (decl_QAbstractItemView_ScrollHint_Enums, "QFlags_ScrollHint"); +static gsi::ClassExt decl_QAbstractItemView_ScrollHint_Enum_as_child (decl_QAbstractItemView_ScrollHint_Enum, "QtGui", "ScrollHint"); +static gsi::ClassExt decl_QAbstractItemView_ScrollHint_Enums_as_child (decl_QAbstractItemView_ScrollHint_Enums, "QtGui", "QFlags_ScrollHint"); } @@ -6077,18 +6077,18 @@ static gsi::ClassExt decl_QAbstractItemView_ScrollHint_Enums_ namespace qt_gsi { -static gsi::Enum decl_QAbstractItemView_ScrollMode_Enum ("QAbstractItemView_ScrollMode", +static gsi::Enum decl_QAbstractItemView_ScrollMode_Enum ("QtGui", "QAbstractItemView_ScrollMode", gsi::enum_const ("ScrollPerItem", QAbstractItemView::ScrollPerItem, "@brief Enum constant QAbstractItemView::ScrollPerItem") + gsi::enum_const ("ScrollPerPixel", QAbstractItemView::ScrollPerPixel, "@brief Enum constant QAbstractItemView::ScrollPerPixel"), "@qt\n@brief This class represents the QAbstractItemView::ScrollMode enum"); -static gsi::QFlagsClass decl_QAbstractItemView_ScrollMode_Enums ("QAbstractItemView_QFlags_ScrollMode", +static gsi::QFlagsClass decl_QAbstractItemView_ScrollMode_Enums ("QtGui", "QAbstractItemView_QFlags_ScrollMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAbstractItemView_ScrollMode_Enum_in_parent (decl_QAbstractItemView_ScrollMode_Enum.defs ()); -static gsi::ClassExt decl_QAbstractItemView_ScrollMode_Enum_as_child (decl_QAbstractItemView_ScrollMode_Enum, "ScrollMode"); -static gsi::ClassExt decl_QAbstractItemView_ScrollMode_Enums_as_child (decl_QAbstractItemView_ScrollMode_Enums, "QFlags_ScrollMode"); +static gsi::ClassExt decl_QAbstractItemView_ScrollMode_Enum_as_child (decl_QAbstractItemView_ScrollMode_Enum, "QtGui", "ScrollMode"); +static gsi::ClassExt decl_QAbstractItemView_ScrollMode_Enums_as_child (decl_QAbstractItemView_ScrollMode_Enums, "QtGui", "QFlags_ScrollMode"); } @@ -6097,19 +6097,19 @@ static gsi::ClassExt decl_QAbstractItemView_ScrollMode_Enums_ namespace qt_gsi { -static gsi::Enum decl_QAbstractItemView_SelectionBehavior_Enum ("QAbstractItemView_SelectionBehavior", +static gsi::Enum decl_QAbstractItemView_SelectionBehavior_Enum ("QtGui", "QAbstractItemView_SelectionBehavior", gsi::enum_const ("SelectItems", QAbstractItemView::SelectItems, "@brief Enum constant QAbstractItemView::SelectItems") + gsi::enum_const ("SelectRows", QAbstractItemView::SelectRows, "@brief Enum constant QAbstractItemView::SelectRows") + gsi::enum_const ("SelectColumns", QAbstractItemView::SelectColumns, "@brief Enum constant QAbstractItemView::SelectColumns"), "@qt\n@brief This class represents the QAbstractItemView::SelectionBehavior enum"); -static gsi::QFlagsClass decl_QAbstractItemView_SelectionBehavior_Enums ("QAbstractItemView_QFlags_SelectionBehavior", +static gsi::QFlagsClass decl_QAbstractItemView_SelectionBehavior_Enums ("QtGui", "QAbstractItemView_QFlags_SelectionBehavior", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAbstractItemView_SelectionBehavior_Enum_in_parent (decl_QAbstractItemView_SelectionBehavior_Enum.defs ()); -static gsi::ClassExt decl_QAbstractItemView_SelectionBehavior_Enum_as_child (decl_QAbstractItemView_SelectionBehavior_Enum, "SelectionBehavior"); -static gsi::ClassExt decl_QAbstractItemView_SelectionBehavior_Enums_as_child (decl_QAbstractItemView_SelectionBehavior_Enums, "QFlags_SelectionBehavior"); +static gsi::ClassExt decl_QAbstractItemView_SelectionBehavior_Enum_as_child (decl_QAbstractItemView_SelectionBehavior_Enum, "QtGui", "SelectionBehavior"); +static gsi::ClassExt decl_QAbstractItemView_SelectionBehavior_Enums_as_child (decl_QAbstractItemView_SelectionBehavior_Enums, "QtGui", "QFlags_SelectionBehavior"); } @@ -6118,7 +6118,7 @@ static gsi::ClassExt decl_QAbstractItemView_SelectionBehavior namespace qt_gsi { -static gsi::Enum decl_QAbstractItemView_SelectionMode_Enum ("QAbstractItemView_SelectionMode", +static gsi::Enum decl_QAbstractItemView_SelectionMode_Enum ("QtGui", "QAbstractItemView_SelectionMode", gsi::enum_const ("NoSelection", QAbstractItemView::NoSelection, "@brief Enum constant QAbstractItemView::NoSelection") + gsi::enum_const ("SingleSelection", QAbstractItemView::SingleSelection, "@brief Enum constant QAbstractItemView::SingleSelection") + gsi::enum_const ("MultiSelection", QAbstractItemView::MultiSelection, "@brief Enum constant QAbstractItemView::MultiSelection") + @@ -6126,13 +6126,13 @@ static gsi::Enum decl_QAbstractItemView_Select gsi::enum_const ("ContiguousSelection", QAbstractItemView::ContiguousSelection, "@brief Enum constant QAbstractItemView::ContiguousSelection"), "@qt\n@brief This class represents the QAbstractItemView::SelectionMode enum"); -static gsi::QFlagsClass decl_QAbstractItemView_SelectionMode_Enums ("QAbstractItemView_QFlags_SelectionMode", +static gsi::QFlagsClass decl_QAbstractItemView_SelectionMode_Enums ("QtGui", "QAbstractItemView_QFlags_SelectionMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAbstractItemView_SelectionMode_Enum_in_parent (decl_QAbstractItemView_SelectionMode_Enum.defs ()); -static gsi::ClassExt decl_QAbstractItemView_SelectionMode_Enum_as_child (decl_QAbstractItemView_SelectionMode_Enum, "SelectionMode"); -static gsi::ClassExt decl_QAbstractItemView_SelectionMode_Enums_as_child (decl_QAbstractItemView_SelectionMode_Enums, "QFlags_SelectionMode"); +static gsi::ClassExt decl_QAbstractItemView_SelectionMode_Enum_as_child (decl_QAbstractItemView_SelectionMode_Enum, "QtGui", "SelectionMode"); +static gsi::ClassExt decl_QAbstractItemView_SelectionMode_Enums_as_child (decl_QAbstractItemView_SelectionMode_Enums, "QtGui", "QFlags_SelectionMode"); } diff --git a/src/gsiqt4/gsiDeclQAbstractPageSetupDialog.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractPageSetupDialog.cc similarity index 99% rename from src/gsiqt4/gsiDeclQAbstractPageSetupDialog.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQAbstractPageSetupDialog.cc index 3a3731b48..36f3a84ec 100644 --- a/src/gsiqt4/gsiDeclQAbstractPageSetupDialog.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractPageSetupDialog.cc @@ -78,8 +78,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -260,11 +260,11 @@ static gsi::Methods methods_QAbstractPageSetupDialog () { gsi::Class &qtdecl_QDialog (); -qt_gsi::QtNativeClass decl_QAbstractPageSetupDialog (qtdecl_QDialog (), "QAbstractPageSetupDialog_Native", +qt_gsi::QtNativeClass decl_QAbstractPageSetupDialog (qtdecl_QDialog (), "QtGui", "QAbstractPageSetupDialog_Native", methods_QAbstractPageSetupDialog (), "@hide\n@alias QAbstractPageSetupDialog"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractPageSetupDialog () { return decl_QAbstractPageSetupDialog; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAbstractPageSetupDialog () { return decl_QAbstractPageSetupDialog; } } @@ -2715,7 +2715,7 @@ static gsi::Methods methods_QAbstractPageSetupDialog_Adaptor () { return methods; } -gsi::Class decl_QAbstractPageSetupDialog_Adaptor (qtdecl_QAbstractPageSetupDialog (), "QAbstractPageSetupDialog", +gsi::Class decl_QAbstractPageSetupDialog_Adaptor (qtdecl_QAbstractPageSetupDialog (), "QtGui", "QAbstractPageSetupDialog", methods_QAbstractPageSetupDialog_Adaptor (), "@qt\n@brief Binding of QAbstractPageSetupDialog"); diff --git a/src/gsiqt4/gsiDeclQAbstractPrintDialog.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractPrintDialog.cc similarity index 99% rename from src/gsiqt4/gsiDeclQAbstractPrintDialog.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQAbstractPrintDialog.cc index 647cec313..d19759f92 100644 --- a/src/gsiqt4/gsiDeclQAbstractPrintDialog.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractPrintDialog.cc @@ -78,8 +78,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -492,11 +492,11 @@ static gsi::Methods methods_QAbstractPrintDialog () { gsi::Class &qtdecl_QDialog (); -qt_gsi::QtNativeClass decl_QAbstractPrintDialog (qtdecl_QDialog (), "QAbstractPrintDialog_Native", +qt_gsi::QtNativeClass decl_QAbstractPrintDialog (qtdecl_QDialog (), "QtGui", "QAbstractPrintDialog_Native", methods_QAbstractPrintDialog (), "@hide\n@alias QAbstractPrintDialog"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractPrintDialog () { return decl_QAbstractPrintDialog; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAbstractPrintDialog () { return decl_QAbstractPrintDialog; } } @@ -2947,7 +2947,7 @@ static gsi::Methods methods_QAbstractPrintDialog_Adaptor () { return methods; } -gsi::Class decl_QAbstractPrintDialog_Adaptor (qtdecl_QAbstractPrintDialog (), "QAbstractPrintDialog", +gsi::Class decl_QAbstractPrintDialog_Adaptor (qtdecl_QAbstractPrintDialog (), "QtGui", "QAbstractPrintDialog", methods_QAbstractPrintDialog_Adaptor (), "@qt\n@brief Binding of QAbstractPrintDialog"); @@ -2958,7 +2958,7 @@ gsi::Class decl_QAbstractPrintDialog_Adaptor (qtde namespace qt_gsi { -static gsi::Enum decl_QAbstractPrintDialog_PrintDialogOption_Enum ("QAbstractPrintDialog_PrintDialogOption", +static gsi::Enum decl_QAbstractPrintDialog_PrintDialogOption_Enum ("QtGui", "QAbstractPrintDialog_PrintDialogOption", gsi::enum_const ("None", QAbstractPrintDialog::None, "@brief Enum constant QAbstractPrintDialog::None") + gsi::enum_const ("PrintToFile", QAbstractPrintDialog::PrintToFile, "@brief Enum constant QAbstractPrintDialog::PrintToFile") + gsi::enum_const ("PrintSelection", QAbstractPrintDialog::PrintSelection, "@brief Enum constant QAbstractPrintDialog::PrintSelection") + @@ -2968,13 +2968,13 @@ static gsi::Enum decl_QAbstractPrintDia gsi::enum_const ("DontUseSheet", QAbstractPrintDialog::DontUseSheet, "@brief Enum constant QAbstractPrintDialog::DontUseSheet"), "@qt\n@brief This class represents the QAbstractPrintDialog::PrintDialogOption enum"); -static gsi::QFlagsClass decl_QAbstractPrintDialog_PrintDialogOption_Enums ("QAbstractPrintDialog_QFlags_PrintDialogOption", +static gsi::QFlagsClass decl_QAbstractPrintDialog_PrintDialogOption_Enums ("QtGui", "QAbstractPrintDialog_QFlags_PrintDialogOption", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAbstractPrintDialog_PrintDialogOption_Enum_in_parent (decl_QAbstractPrintDialog_PrintDialogOption_Enum.defs ()); -static gsi::ClassExt decl_QAbstractPrintDialog_PrintDialogOption_Enum_as_child (decl_QAbstractPrintDialog_PrintDialogOption_Enum, "PrintDialogOption"); -static gsi::ClassExt decl_QAbstractPrintDialog_PrintDialogOption_Enums_as_child (decl_QAbstractPrintDialog_PrintDialogOption_Enums, "QFlags_PrintDialogOption"); +static gsi::ClassExt decl_QAbstractPrintDialog_PrintDialogOption_Enum_as_child (decl_QAbstractPrintDialog_PrintDialogOption_Enum, "QtGui", "PrintDialogOption"); +static gsi::ClassExt decl_QAbstractPrintDialog_PrintDialogOption_Enums_as_child (decl_QAbstractPrintDialog_PrintDialogOption_Enums, "QtGui", "QFlags_PrintDialogOption"); } @@ -2983,19 +2983,19 @@ static gsi::ClassExt decl_QAbstractPrintDialog_PrintDialog namespace qt_gsi { -static gsi::Enum decl_QAbstractPrintDialog_PrintRange_Enum ("QAbstractPrintDialog_PrintRange", +static gsi::Enum decl_QAbstractPrintDialog_PrintRange_Enum ("QtGui", "QAbstractPrintDialog_PrintRange", gsi::enum_const ("AllPages", QAbstractPrintDialog::AllPages, "@brief Enum constant QAbstractPrintDialog::AllPages") + gsi::enum_const ("Selection", QAbstractPrintDialog::Selection, "@brief Enum constant QAbstractPrintDialog::Selection") + gsi::enum_const ("PageRange", QAbstractPrintDialog::PageRange, "@brief Enum constant QAbstractPrintDialog::PageRange"), "@qt\n@brief This class represents the QAbstractPrintDialog::PrintRange enum"); -static gsi::QFlagsClass decl_QAbstractPrintDialog_PrintRange_Enums ("QAbstractPrintDialog_QFlags_PrintRange", +static gsi::QFlagsClass decl_QAbstractPrintDialog_PrintRange_Enums ("QtGui", "QAbstractPrintDialog_QFlags_PrintRange", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAbstractPrintDialog_PrintRange_Enum_in_parent (decl_QAbstractPrintDialog_PrintRange_Enum.defs ()); -static gsi::ClassExt decl_QAbstractPrintDialog_PrintRange_Enum_as_child (decl_QAbstractPrintDialog_PrintRange_Enum, "PrintRange"); -static gsi::ClassExt decl_QAbstractPrintDialog_PrintRange_Enums_as_child (decl_QAbstractPrintDialog_PrintRange_Enums, "QFlags_PrintRange"); +static gsi::ClassExt decl_QAbstractPrintDialog_PrintRange_Enum_as_child (decl_QAbstractPrintDialog_PrintRange_Enum, "QtGui", "PrintRange"); +static gsi::ClassExt decl_QAbstractPrintDialog_PrintRange_Enums_as_child (decl_QAbstractPrintDialog_PrintRange_Enums, "QtGui", "QFlags_PrintRange"); } diff --git a/src/gsiqt4/gsiDeclQAbstractProxyModel.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractProxyModel.cc similarity index 99% rename from src/gsiqt4/gsiDeclQAbstractProxyModel.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQAbstractProxyModel.cc index a815b1933..a3db78caf 100644 --- a/src/gsiqt4/gsiDeclQAbstractProxyModel.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractProxyModel.cc @@ -40,8 +40,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -468,11 +468,11 @@ static gsi::Methods methods_QAbstractProxyModel () { gsi::Class &qtdecl_QAbstractItemModel (); -qt_gsi::QtNativeClass decl_QAbstractProxyModel (qtdecl_QAbstractItemModel (), "QAbstractProxyModel_Native", +qt_gsi::QtNativeClass decl_QAbstractProxyModel (qtdecl_QAbstractItemModel (), "QtGui", "QAbstractProxyModel_Native", methods_QAbstractProxyModel (), "@hide\n@alias QAbstractProxyModel"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractProxyModel () { return decl_QAbstractProxyModel; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAbstractProxyModel () { return decl_QAbstractProxyModel; } } @@ -3021,7 +3021,7 @@ static gsi::Methods methods_QAbstractProxyModel_Adaptor () { return methods; } -gsi::Class decl_QAbstractProxyModel_Adaptor (qtdecl_QAbstractProxyModel (), "QAbstractProxyModel", +gsi::Class decl_QAbstractProxyModel_Adaptor (qtdecl_QAbstractProxyModel (), "QtGui", "QAbstractProxyModel", methods_QAbstractProxyModel_Adaptor (), "@qt\n@brief Binding of QAbstractProxyModel"); diff --git a/src/gsiqt4/gsiDeclQAbstractScrollArea.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractScrollArea.cc similarity index 99% rename from src/gsiqt4/gsiDeclQAbstractScrollArea.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQAbstractScrollArea.cc index e13ef690c..4068b1e69 100644 --- a/src/gsiqt4/gsiDeclQAbstractScrollArea.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractScrollArea.cc @@ -78,8 +78,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -523,11 +523,11 @@ static gsi::Methods methods_QAbstractScrollArea () { gsi::Class &qtdecl_QFrame (); -qt_gsi::QtNativeClass decl_QAbstractScrollArea (qtdecl_QFrame (), "QAbstractScrollArea_Native", +qt_gsi::QtNativeClass decl_QAbstractScrollArea (qtdecl_QFrame (), "QtGui", "QAbstractScrollArea_Native", methods_QAbstractScrollArea (), "@hide\n@alias QAbstractScrollArea"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractScrollArea () { return decl_QAbstractScrollArea; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAbstractScrollArea () { return decl_QAbstractScrollArea; } } @@ -2923,7 +2923,7 @@ static gsi::Methods methods_QAbstractScrollArea_Adaptor () { return methods; } -gsi::Class decl_QAbstractScrollArea_Adaptor (qtdecl_QAbstractScrollArea (), "QAbstractScrollArea", +gsi::Class decl_QAbstractScrollArea_Adaptor (qtdecl_QAbstractScrollArea (), "QtGui", "QAbstractScrollArea", methods_QAbstractScrollArea_Adaptor (), "@qt\n@brief Binding of QAbstractScrollArea"); diff --git a/src/gsiqt4/gsiDeclQAbstractSlider.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractSlider.cc similarity index 99% rename from src/gsiqt4/gsiDeclQAbstractSlider.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQAbstractSlider.cc index 85d09a128..97549f22c 100644 --- a/src/gsiqt4/gsiDeclQAbstractSlider.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractSlider.cc @@ -77,8 +77,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -666,11 +666,11 @@ static gsi::Methods methods_QAbstractSlider () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QAbstractSlider (qtdecl_QWidget (), "QAbstractSlider_Native", +qt_gsi::QtNativeClass decl_QAbstractSlider (qtdecl_QWidget (), "QtGui", "QAbstractSlider_Native", methods_QAbstractSlider (), "@hide\n@alias QAbstractSlider"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractSlider () { return decl_QAbstractSlider; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAbstractSlider () { return decl_QAbstractSlider; } } @@ -3109,7 +3109,7 @@ static gsi::Methods methods_QAbstractSlider_Adaptor () { return methods; } -gsi::Class decl_QAbstractSlider_Adaptor (qtdecl_QAbstractSlider (), "QAbstractSlider", +gsi::Class decl_QAbstractSlider_Adaptor (qtdecl_QAbstractSlider (), "QtGui", "QAbstractSlider", methods_QAbstractSlider_Adaptor (), "@qt\n@brief Binding of QAbstractSlider"); @@ -3120,7 +3120,7 @@ gsi::Class decl_QAbstractSlider_Adaptor (qtdecl_QAbstra namespace qt_gsi { -static gsi::Enum decl_QAbstractSlider_SliderAction_Enum ("QAbstractSlider_SliderAction", +static gsi::Enum decl_QAbstractSlider_SliderAction_Enum ("QtGui", "QAbstractSlider_SliderAction", gsi::enum_const ("SliderNoAction", QAbstractSlider::SliderNoAction, "@brief Enum constant QAbstractSlider::SliderNoAction") + gsi::enum_const ("SliderSingleStepAdd", QAbstractSlider::SliderSingleStepAdd, "@brief Enum constant QAbstractSlider::SliderSingleStepAdd") + gsi::enum_const ("SliderSingleStepSub", QAbstractSlider::SliderSingleStepSub, "@brief Enum constant QAbstractSlider::SliderSingleStepSub") + @@ -3131,13 +3131,13 @@ static gsi::Enum decl_QAbstractSlider_SliderActio gsi::enum_const ("SliderMove", QAbstractSlider::SliderMove, "@brief Enum constant QAbstractSlider::SliderMove"), "@qt\n@brief This class represents the QAbstractSlider::SliderAction enum"); -static gsi::QFlagsClass decl_QAbstractSlider_SliderAction_Enums ("QAbstractSlider_QFlags_SliderAction", +static gsi::QFlagsClass decl_QAbstractSlider_SliderAction_Enums ("QtGui", "QAbstractSlider_QFlags_SliderAction", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAbstractSlider_SliderAction_Enum_in_parent (decl_QAbstractSlider_SliderAction_Enum.defs ()); -static gsi::ClassExt decl_QAbstractSlider_SliderAction_Enum_as_child (decl_QAbstractSlider_SliderAction_Enum, "SliderAction"); -static gsi::ClassExt decl_QAbstractSlider_SliderAction_Enums_as_child (decl_QAbstractSlider_SliderAction_Enums, "QFlags_SliderAction"); +static gsi::ClassExt decl_QAbstractSlider_SliderAction_Enum_as_child (decl_QAbstractSlider_SliderAction_Enum, "QtGui", "SliderAction"); +static gsi::ClassExt decl_QAbstractSlider_SliderAction_Enums_as_child (decl_QAbstractSlider_SliderAction_Enums, "QtGui", "QFlags_SliderAction"); } diff --git a/src/gsiqt4/gsiDeclQAbstractSpinBox.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractSpinBox.cc similarity index 99% rename from src/gsiqt4/gsiDeclQAbstractSpinBox.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQAbstractSpinBox.cc index 961a4bd86..8662518c7 100644 --- a/src/gsiqt4/gsiDeclQAbstractSpinBox.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractSpinBox.cc @@ -79,8 +79,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -798,11 +798,11 @@ static gsi::Methods methods_QAbstractSpinBox () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QAbstractSpinBox (qtdecl_QWidget (), "QAbstractSpinBox_Native", +qt_gsi::QtNativeClass decl_QAbstractSpinBox (qtdecl_QWidget (), "QtGui", "QAbstractSpinBox_Native", methods_QAbstractSpinBox (), "@hide\n@alias QAbstractSpinBox"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractSpinBox () { return decl_QAbstractSpinBox; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAbstractSpinBox () { return decl_QAbstractSpinBox; } } @@ -3297,7 +3297,7 @@ static gsi::Methods methods_QAbstractSpinBox_Adaptor () { return methods; } -gsi::Class decl_QAbstractSpinBox_Adaptor (qtdecl_QAbstractSpinBox (), "QAbstractSpinBox", +gsi::Class decl_QAbstractSpinBox_Adaptor (qtdecl_QAbstractSpinBox (), "QtGui", "QAbstractSpinBox", methods_QAbstractSpinBox_Adaptor (), "@qt\n@brief Binding of QAbstractSpinBox"); @@ -3308,19 +3308,19 @@ gsi::Class decl_QAbstractSpinBox_Adaptor (qtdecl_QAbst namespace qt_gsi { -static gsi::Enum decl_QAbstractSpinBox_ButtonSymbols_Enum ("QAbstractSpinBox_ButtonSymbols", +static gsi::Enum decl_QAbstractSpinBox_ButtonSymbols_Enum ("QtGui", "QAbstractSpinBox_ButtonSymbols", gsi::enum_const ("UpDownArrows", QAbstractSpinBox::UpDownArrows, "@brief Enum constant QAbstractSpinBox::UpDownArrows") + gsi::enum_const ("PlusMinus", QAbstractSpinBox::PlusMinus, "@brief Enum constant QAbstractSpinBox::PlusMinus") + gsi::enum_const ("NoButtons", QAbstractSpinBox::NoButtons, "@brief Enum constant QAbstractSpinBox::NoButtons"), "@qt\n@brief This class represents the QAbstractSpinBox::ButtonSymbols enum"); -static gsi::QFlagsClass decl_QAbstractSpinBox_ButtonSymbols_Enums ("QAbstractSpinBox_QFlags_ButtonSymbols", +static gsi::QFlagsClass decl_QAbstractSpinBox_ButtonSymbols_Enums ("QtGui", "QAbstractSpinBox_QFlags_ButtonSymbols", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAbstractSpinBox_ButtonSymbols_Enum_in_parent (decl_QAbstractSpinBox_ButtonSymbols_Enum.defs ()); -static gsi::ClassExt decl_QAbstractSpinBox_ButtonSymbols_Enum_as_child (decl_QAbstractSpinBox_ButtonSymbols_Enum, "ButtonSymbols"); -static gsi::ClassExt decl_QAbstractSpinBox_ButtonSymbols_Enums_as_child (decl_QAbstractSpinBox_ButtonSymbols_Enums, "QFlags_ButtonSymbols"); +static gsi::ClassExt decl_QAbstractSpinBox_ButtonSymbols_Enum_as_child (decl_QAbstractSpinBox_ButtonSymbols_Enum, "QtGui", "ButtonSymbols"); +static gsi::ClassExt decl_QAbstractSpinBox_ButtonSymbols_Enums_as_child (decl_QAbstractSpinBox_ButtonSymbols_Enums, "QtGui", "QFlags_ButtonSymbols"); } @@ -3329,18 +3329,18 @@ static gsi::ClassExt decl_QAbstractSpinBox_ButtonSymbols_Enums namespace qt_gsi { -static gsi::Enum decl_QAbstractSpinBox_CorrectionMode_Enum ("QAbstractSpinBox_CorrectionMode", +static gsi::Enum decl_QAbstractSpinBox_CorrectionMode_Enum ("QtGui", "QAbstractSpinBox_CorrectionMode", gsi::enum_const ("CorrectToPreviousValue", QAbstractSpinBox::CorrectToPreviousValue, "@brief Enum constant QAbstractSpinBox::CorrectToPreviousValue") + gsi::enum_const ("CorrectToNearestValue", QAbstractSpinBox::CorrectToNearestValue, "@brief Enum constant QAbstractSpinBox::CorrectToNearestValue"), "@qt\n@brief This class represents the QAbstractSpinBox::CorrectionMode enum"); -static gsi::QFlagsClass decl_QAbstractSpinBox_CorrectionMode_Enums ("QAbstractSpinBox_QFlags_CorrectionMode", +static gsi::QFlagsClass decl_QAbstractSpinBox_CorrectionMode_Enums ("QtGui", "QAbstractSpinBox_QFlags_CorrectionMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAbstractSpinBox_CorrectionMode_Enum_in_parent (decl_QAbstractSpinBox_CorrectionMode_Enum.defs ()); -static gsi::ClassExt decl_QAbstractSpinBox_CorrectionMode_Enum_as_child (decl_QAbstractSpinBox_CorrectionMode_Enum, "CorrectionMode"); -static gsi::ClassExt decl_QAbstractSpinBox_CorrectionMode_Enums_as_child (decl_QAbstractSpinBox_CorrectionMode_Enums, "QFlags_CorrectionMode"); +static gsi::ClassExt decl_QAbstractSpinBox_CorrectionMode_Enum_as_child (decl_QAbstractSpinBox_CorrectionMode_Enum, "QtGui", "CorrectionMode"); +static gsi::ClassExt decl_QAbstractSpinBox_CorrectionMode_Enums_as_child (decl_QAbstractSpinBox_CorrectionMode_Enums, "QtGui", "QFlags_CorrectionMode"); } @@ -3349,19 +3349,19 @@ static gsi::ClassExt decl_QAbstractSpinBox_CorrectionMode_Enum namespace qt_gsi { -static gsi::Enum decl_QAbstractSpinBox_StepEnabledFlag_Enum ("QAbstractSpinBox_StepEnabledFlag", +static gsi::Enum decl_QAbstractSpinBox_StepEnabledFlag_Enum ("QtGui", "QAbstractSpinBox_StepEnabledFlag", gsi::enum_const ("StepNone", QAbstractSpinBox::StepNone, "@brief Enum constant QAbstractSpinBox::StepNone") + gsi::enum_const ("StepUpEnabled", QAbstractSpinBox::StepUpEnabled, "@brief Enum constant QAbstractSpinBox::StepUpEnabled") + gsi::enum_const ("StepDownEnabled", QAbstractSpinBox::StepDownEnabled, "@brief Enum constant QAbstractSpinBox::StepDownEnabled"), "@qt\n@brief This class represents the QAbstractSpinBox::StepEnabledFlag enum"); -static gsi::QFlagsClass decl_QAbstractSpinBox_StepEnabledFlag_Enums ("QAbstractSpinBox_QFlags_StepEnabledFlag", +static gsi::QFlagsClass decl_QAbstractSpinBox_StepEnabledFlag_Enums ("QtGui", "QAbstractSpinBox_QFlags_StepEnabledFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAbstractSpinBox_StepEnabledFlag_Enum_in_parent (decl_QAbstractSpinBox_StepEnabledFlag_Enum.defs ()); -static gsi::ClassExt decl_QAbstractSpinBox_StepEnabledFlag_Enum_as_child (decl_QAbstractSpinBox_StepEnabledFlag_Enum, "StepEnabledFlag"); -static gsi::ClassExt decl_QAbstractSpinBox_StepEnabledFlag_Enums_as_child (decl_QAbstractSpinBox_StepEnabledFlag_Enums, "QFlags_StepEnabledFlag"); +static gsi::ClassExt decl_QAbstractSpinBox_StepEnabledFlag_Enum_as_child (decl_QAbstractSpinBox_StepEnabledFlag_Enum, "QtGui", "StepEnabledFlag"); +static gsi::ClassExt decl_QAbstractSpinBox_StepEnabledFlag_Enums_as_child (decl_QAbstractSpinBox_StepEnabledFlag_Enums, "QtGui", "QFlags_StepEnabledFlag"); } diff --git a/src/gsiqt4/gsiDeclQAbstractTextDocumentLayout.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractTextDocumentLayout.cc similarity index 99% rename from src/gsiqt4/gsiDeclQAbstractTextDocumentLayout.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQAbstractTextDocumentLayout.cc index 54ad324e6..5231fe915 100644 --- a/src/gsiqt4/gsiDeclQAbstractTextDocumentLayout.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractTextDocumentLayout.cc @@ -46,8 +46,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -416,11 +416,11 @@ static gsi::Methods methods_QAbstractTextDocumentLayout () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QAbstractTextDocumentLayout (qtdecl_QObject (), "QAbstractTextDocumentLayout_Native", +qt_gsi::QtNativeClass decl_QAbstractTextDocumentLayout (qtdecl_QObject (), "QtGui", "QAbstractTextDocumentLayout_Native", methods_QAbstractTextDocumentLayout (), "@hide\n@alias QAbstractTextDocumentLayout"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractTextDocumentLayout () { return decl_QAbstractTextDocumentLayout; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAbstractTextDocumentLayout () { return decl_QAbstractTextDocumentLayout; } } @@ -1392,7 +1392,7 @@ static gsi::Methods methods_QAbstractTextDocumentLayout_Adaptor () { return methods; } -gsi::Class decl_QAbstractTextDocumentLayout_Adaptor (qtdecl_QAbstractTextDocumentLayout (), "QAbstractTextDocumentLayout", +gsi::Class decl_QAbstractTextDocumentLayout_Adaptor (qtdecl_QAbstractTextDocumentLayout (), "QtGui", "QAbstractTextDocumentLayout", methods_QAbstractTextDocumentLayout_Adaptor (), "@qt\n@brief Binding of QAbstractTextDocumentLayout"); diff --git a/src/gsiqt4/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc similarity index 86% rename from src/gsiqt4/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc index 077d4dbe0..e796c9d46 100644 --- a/src/gsiqt4/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractTextDocumentLayout_PaintContext.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -61,13 +61,13 @@ static gsi::Methods methods_QAbstractTextDocumentLayout_PaintContext () { return methods; } -gsi::Class decl_QAbstractTextDocumentLayout_PaintContext ("QAbstractTextDocumentLayout_PaintContext", +gsi::Class decl_QAbstractTextDocumentLayout_PaintContext ("QtGui", "QAbstractTextDocumentLayout_PaintContext", methods_QAbstractTextDocumentLayout_PaintContext (), "@qt\n@brief Binding of QAbstractTextDocumentLayout::PaintContext"); -gsi::ClassExt decl_QAbstractTextDocumentLayout_PaintContext_as_child (decl_QAbstractTextDocumentLayout_PaintContext, "PaintContext"); +gsi::ClassExt decl_QAbstractTextDocumentLayout_PaintContext_as_child (decl_QAbstractTextDocumentLayout_PaintContext, "QtGui", "PaintContext"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractTextDocumentLayout_PaintContext () { return decl_QAbstractTextDocumentLayout_PaintContext; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAbstractTextDocumentLayout_PaintContext () { return decl_QAbstractTextDocumentLayout_PaintContext; } } diff --git a/src/gsiqt4/gsiDeclQAbstractTextDocumentLayout_Selection.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractTextDocumentLayout_Selection.cc similarity index 87% rename from src/gsiqt4/gsiDeclQAbstractTextDocumentLayout_Selection.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQAbstractTextDocumentLayout_Selection.cc index 71deb8abc..0ec2ec0e6 100644 --- a/src/gsiqt4/gsiDeclQAbstractTextDocumentLayout_Selection.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractTextDocumentLayout_Selection.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -61,13 +61,13 @@ static gsi::Methods methods_QAbstractTextDocumentLayout_Selection () { return methods; } -gsi::Class decl_QAbstractTextDocumentLayout_Selection ("QAbstractTextDocumentLayout_Selection", +gsi::Class decl_QAbstractTextDocumentLayout_Selection ("QtGui", "QAbstractTextDocumentLayout_Selection", methods_QAbstractTextDocumentLayout_Selection (), "@qt\n@brief Binding of QAbstractTextDocumentLayout::Selection"); -gsi::ClassExt decl_QAbstractTextDocumentLayout_Selection_as_child (decl_QAbstractTextDocumentLayout_Selection, "Selection"); +gsi::ClassExt decl_QAbstractTextDocumentLayout_Selection_as_child (decl_QAbstractTextDocumentLayout_Selection, "QtGui", "Selection"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractTextDocumentLayout_Selection () { return decl_QAbstractTextDocumentLayout_Selection; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAbstractTextDocumentLayout_Selection () { return decl_QAbstractTextDocumentLayout_Selection; } } diff --git a/src/gsiqt4/gsiDeclQAbstractUndoItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractUndoItem.cc similarity index 94% rename from src/gsiqt4/gsiDeclQAbstractUndoItem.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQAbstractUndoItem.cc index acc957ea4..50b2ffa55 100644 --- a/src/gsiqt4/gsiDeclQAbstractUndoItem.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQAbstractUndoItem.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -78,11 +78,11 @@ static gsi::Methods methods_QAbstractUndoItem () { return methods; } -gsi::Class decl_QAbstractUndoItem ("QAbstractUndoItem_Native", +gsi::Class decl_QAbstractUndoItem ("QtGui", "QAbstractUndoItem_Native", methods_QAbstractUndoItem (), "@hide\n@alias QAbstractUndoItem"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractUndoItem () { return decl_QAbstractUndoItem; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAbstractUndoItem () { return decl_QAbstractUndoItem; } } @@ -204,7 +204,7 @@ static gsi::Methods methods_QAbstractUndoItem_Adaptor () { return methods; } -gsi::Class decl_QAbstractUndoItem_Adaptor (qtdecl_QAbstractUndoItem (), "QAbstractUndoItem", +gsi::Class decl_QAbstractUndoItem_Adaptor (qtdecl_QAbstractUndoItem (), "QtGui", "QAbstractUndoItem", methods_QAbstractUndoItem_Adaptor (), "@qt\n@brief Binding of QAbstractUndoItem"); diff --git a/src/gsiqt4/gsiDeclQAccessible.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAccessible.cc similarity index 94% rename from src/gsiqt4/gsiDeclQAccessible.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQAccessible.cc index e5b1a2ac4..650ea97f6 100644 --- a/src/gsiqt4/gsiDeclQAccessible.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQAccessible.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -164,12 +164,12 @@ static gsi::Methods methods_QAccessible () { return methods; } -gsi::Class decl_QAccessible ("QAccessible", +gsi::Class decl_QAccessible ("QtGui", "QAccessible", methods_QAccessible (), "@qt\n@brief Binding of QAccessible"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAccessible () { return decl_QAccessible; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAccessible () { return decl_QAccessible; } } @@ -178,7 +178,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QAccessible () { return decl_QAcces namespace qt_gsi { -static gsi::Enum decl_QAccessible_Event_Enum ("QAccessible_Event", +static gsi::Enum decl_QAccessible_Event_Enum ("QtGui", "QAccessible_Event", gsi::enum_const ("SoundPlayed", QAccessible::SoundPlayed, "@brief Enum constant QAccessible::SoundPlayed") + gsi::enum_const ("Alert", QAccessible::Alert, "@brief Enum constant QAccessible::Alert") + gsi::enum_const ("ForegroundChanged", QAccessible::ForegroundChanged, "@brief Enum constant QAccessible::ForegroundChanged") + @@ -216,13 +216,13 @@ static gsi::Enum decl_QAccessible_Event_Enum ("QAccessible_E gsi::enum_const ("AcceleratorChanged", QAccessible::AcceleratorChanged, "@brief Enum constant QAccessible::AcceleratorChanged"), "@qt\n@brief This class represents the QAccessible::Event enum"); -static gsi::QFlagsClass decl_QAccessible_Event_Enums ("QAccessible_QFlags_Event", +static gsi::QFlagsClass decl_QAccessible_Event_Enums ("QtGui", "QAccessible_QFlags_Event", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAccessible_Event_Enum_in_parent (decl_QAccessible_Event_Enum.defs ()); -static gsi::ClassExt decl_QAccessible_Event_Enum_as_child (decl_QAccessible_Event_Enum, "Event"); -static gsi::ClassExt decl_QAccessible_Event_Enums_as_child (decl_QAccessible_Event_Enums, "QFlags_Event"); +static gsi::ClassExt decl_QAccessible_Event_Enum_as_child (decl_QAccessible_Event_Enum, "QtGui", "Event"); +static gsi::ClassExt decl_QAccessible_Event_Enums_as_child (decl_QAccessible_Event_Enums, "QtGui", "QFlags_Event"); } @@ -231,7 +231,7 @@ static gsi::ClassExt decl_QAccessible_Event_Enums_as_child (decl_QA namespace qt_gsi { -static gsi::Enum decl_QAccessible_Method_Enum ("QAccessible_Method", +static gsi::Enum decl_QAccessible_Method_Enum ("QtGui", "QAccessible_Method", gsi::enum_const ("ListSupportedMethods", QAccessible::ListSupportedMethods, "@brief Enum constant QAccessible::ListSupportedMethods") + gsi::enum_const ("SetCursorPosition", QAccessible::SetCursorPosition, "@brief Enum constant QAccessible::SetCursorPosition") + gsi::enum_const ("GetCursorPosition", QAccessible::GetCursorPosition, "@brief Enum constant QAccessible::GetCursorPosition") + @@ -239,13 +239,13 @@ static gsi::Enum decl_QAccessible_Method_Enum ("QAccessible gsi::enum_const ("BackgroundColor", QAccessible::BackgroundColor, "@brief Enum constant QAccessible::BackgroundColor"), "@qt\n@brief This class represents the QAccessible::Method enum"); -static gsi::QFlagsClass decl_QAccessible_Method_Enums ("QAccessible_QFlags_Method", +static gsi::QFlagsClass decl_QAccessible_Method_Enums ("QtGui", "QAccessible_QFlags_Method", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAccessible_Method_Enum_in_parent (decl_QAccessible_Method_Enum.defs ()); -static gsi::ClassExt decl_QAccessible_Method_Enum_as_child (decl_QAccessible_Method_Enum, "Method"); -static gsi::ClassExt decl_QAccessible_Method_Enums_as_child (decl_QAccessible_Method_Enums, "QFlags_Method"); +static gsi::ClassExt decl_QAccessible_Method_Enum_as_child (decl_QAccessible_Method_Enum, "QtGui", "Method"); +static gsi::ClassExt decl_QAccessible_Method_Enums_as_child (decl_QAccessible_Method_Enums, "QtGui", "QFlags_Method"); } @@ -254,7 +254,7 @@ static gsi::ClassExt decl_QAccessible_Method_Enums_as_child (decl_Q namespace qt_gsi { -static gsi::Enum decl_QAccessible_RelationFlag_Enum ("QAccessible_RelationFlag", +static gsi::Enum decl_QAccessible_RelationFlag_Enum ("QtGui", "QAccessible_RelationFlag", gsi::enum_const ("Unrelated", QAccessible::Unrelated, "@brief Enum constant QAccessible::Unrelated") + gsi::enum_const ("Self", QAccessible::Self, "@brief Enum constant QAccessible::Self") + gsi::enum_const ("Ancestor", QAccessible::Ancestor, "@brief Enum constant QAccessible::Ancestor") + @@ -277,13 +277,13 @@ static gsi::Enum decl_QAccessible_RelationFlag_Enum ( gsi::enum_const ("LogicalMask", QAccessible::LogicalMask, "@brief Enum constant QAccessible::LogicalMask"), "@qt\n@brief This class represents the QAccessible::RelationFlag enum"); -static gsi::QFlagsClass decl_QAccessible_RelationFlag_Enums ("QAccessible_QFlags_RelationFlag", +static gsi::QFlagsClass decl_QAccessible_RelationFlag_Enums ("QtGui", "QAccessible_QFlags_RelationFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAccessible_RelationFlag_Enum_in_parent (decl_QAccessible_RelationFlag_Enum.defs ()); -static gsi::ClassExt decl_QAccessible_RelationFlag_Enum_as_child (decl_QAccessible_RelationFlag_Enum, "RelationFlag"); -static gsi::ClassExt decl_QAccessible_RelationFlag_Enums_as_child (decl_QAccessible_RelationFlag_Enums, "QFlags_RelationFlag"); +static gsi::ClassExt decl_QAccessible_RelationFlag_Enum_as_child (decl_QAccessible_RelationFlag_Enum, "QtGui", "RelationFlag"); +static gsi::ClassExt decl_QAccessible_RelationFlag_Enums_as_child (decl_QAccessible_RelationFlag_Enums, "QtGui", "QFlags_RelationFlag"); } @@ -292,7 +292,7 @@ static gsi::ClassExt decl_QAccessible_RelationFlag_Enums_as_child ( namespace qt_gsi { -static gsi::Enum decl_QAccessible_Role_Enum ("QAccessible_Role", +static gsi::Enum decl_QAccessible_Role_Enum ("QtGui", "QAccessible_Role", gsi::enum_const ("NoRole", QAccessible::NoRole, "@brief Enum constant QAccessible::NoRole") + gsi::enum_const ("TitleBar", QAccessible::TitleBar, "@brief Enum constant QAccessible::TitleBar") + gsi::enum_const ("MenuBar", QAccessible::MenuBar, "@brief Enum constant QAccessible::MenuBar") + @@ -359,13 +359,13 @@ static gsi::Enum decl_QAccessible_Role_Enum ("QAccessible_Rol gsi::enum_const ("UserRole", QAccessible::UserRole, "@brief Enum constant QAccessible::UserRole"), "@qt\n@brief This class represents the QAccessible::Role enum"); -static gsi::QFlagsClass decl_QAccessible_Role_Enums ("QAccessible_QFlags_Role", +static gsi::QFlagsClass decl_QAccessible_Role_Enums ("QtGui", "QAccessible_QFlags_Role", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAccessible_Role_Enum_in_parent (decl_QAccessible_Role_Enum.defs ()); -static gsi::ClassExt decl_QAccessible_Role_Enum_as_child (decl_QAccessible_Role_Enum, "Role"); -static gsi::ClassExt decl_QAccessible_Role_Enums_as_child (decl_QAccessible_Role_Enums, "QFlags_Role"); +static gsi::ClassExt decl_QAccessible_Role_Enum_as_child (decl_QAccessible_Role_Enum, "QtGui", "Role"); +static gsi::ClassExt decl_QAccessible_Role_Enums_as_child (decl_QAccessible_Role_Enums, "QtGui", "QFlags_Role"); } @@ -374,7 +374,7 @@ static gsi::ClassExt decl_QAccessible_Role_Enums_as_child (decl_QAc namespace qt_gsi { -static gsi::Enum decl_QAccessible_StateFlag_Enum ("QAccessible_StateFlag", +static gsi::Enum decl_QAccessible_StateFlag_Enum ("QtGui", "QAccessible_StateFlag", gsi::enum_const ("Normal", QAccessible::Normal, "@brief Enum constant QAccessible::Normal") + gsi::enum_const ("Unavailable", QAccessible::Unavailable, "@brief Enum constant QAccessible::Unavailable") + gsi::enum_const ("Selected", QAccessible::Selected, "@brief Enum constant QAccessible::Selected") + @@ -407,13 +407,13 @@ static gsi::Enum decl_QAccessible_StateFlag_Enum ("QAcce gsi::enum_const ("HasInvokeExtension", QAccessible::HasInvokeExtension, "@brief Enum constant QAccessible::HasInvokeExtension"), "@qt\n@brief This class represents the QAccessible::StateFlag enum"); -static gsi::QFlagsClass decl_QAccessible_StateFlag_Enums ("QAccessible_QFlags_StateFlag", +static gsi::QFlagsClass decl_QAccessible_StateFlag_Enums ("QtGui", "QAccessible_QFlags_StateFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAccessible_StateFlag_Enum_in_parent (decl_QAccessible_StateFlag_Enum.defs ()); -static gsi::ClassExt decl_QAccessible_StateFlag_Enum_as_child (decl_QAccessible_StateFlag_Enum, "StateFlag"); -static gsi::ClassExt decl_QAccessible_StateFlag_Enums_as_child (decl_QAccessible_StateFlag_Enums, "QFlags_StateFlag"); +static gsi::ClassExt decl_QAccessible_StateFlag_Enum_as_child (decl_QAccessible_StateFlag_Enum, "QtGui", "StateFlag"); +static gsi::ClassExt decl_QAccessible_StateFlag_Enums_as_child (decl_QAccessible_StateFlag_Enums, "QtGui", "QFlags_StateFlag"); } @@ -422,7 +422,7 @@ static gsi::ClassExt decl_QAccessible_StateFlag_Enums_as_child (dec namespace qt_gsi { -static gsi::Enum decl_QAccessible_Text_Enum ("QAccessible_Text", +static gsi::Enum decl_QAccessible_Text_Enum ("QtGui", "QAccessible_Text", gsi::enum_const ("Name", QAccessible::Name, "@brief Enum constant QAccessible::Name") + gsi::enum_const ("Description", QAccessible::Description, "@brief Enum constant QAccessible::Description") + gsi::enum_const ("Value", QAccessible::Value, "@brief Enum constant QAccessible::Value") + @@ -431,13 +431,13 @@ static gsi::Enum decl_QAccessible_Text_Enum ("QAccessible_Tex gsi::enum_const ("UserText", QAccessible::UserText, "@brief Enum constant QAccessible::UserText"), "@qt\n@brief This class represents the QAccessible::Text enum"); -static gsi::QFlagsClass decl_QAccessible_Text_Enums ("QAccessible_QFlags_Text", +static gsi::QFlagsClass decl_QAccessible_Text_Enums ("QtGui", "QAccessible_QFlags_Text", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAccessible_Text_Enum_in_parent (decl_QAccessible_Text_Enum.defs ()); -static gsi::ClassExt decl_QAccessible_Text_Enum_as_child (decl_QAccessible_Text_Enum, "Text"); -static gsi::ClassExt decl_QAccessible_Text_Enums_as_child (decl_QAccessible_Text_Enums, "QFlags_Text"); +static gsi::ClassExt decl_QAccessible_Text_Enum_as_child (decl_QAccessible_Text_Enum, "QtGui", "Text"); +static gsi::ClassExt decl_QAccessible_Text_Enums_as_child (decl_QAccessible_Text_Enums, "QtGui", "QFlags_Text"); } diff --git a/src/gsiqt4/gsiDeclQAccessibleApplication.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAccessibleApplication.cc similarity index 99% rename from src/gsiqt4/gsiDeclQAccessibleApplication.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQAccessibleApplication.cc index 1ef759c68..91cf8a50b 100644 --- a/src/gsiqt4/gsiDeclQAccessibleApplication.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQAccessibleApplication.cc @@ -33,8 +33,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -270,11 +270,11 @@ static gsi::Methods methods_QAccessibleApplication () { gsi::Class &qtdecl_QAccessibleObject (); -gsi::Class decl_QAccessibleApplication (qtdecl_QAccessibleObject (), "QAccessibleApplication_Native", +gsi::Class decl_QAccessibleApplication (qtdecl_QAccessibleObject (), "QtGui", "QAccessibleApplication_Native", methods_QAccessibleApplication (), "@hide\n@alias QAccessibleApplication"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAccessibleApplication () { return decl_QAccessibleApplication; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAccessibleApplication () { return decl_QAccessibleApplication; } } @@ -913,7 +913,7 @@ static gsi::Methods methods_QAccessibleApplication_Adaptor () { return methods; } -gsi::Class decl_QAccessibleApplication_Adaptor (qtdecl_QAccessibleApplication (), "QAccessibleApplication", +gsi::Class decl_QAccessibleApplication_Adaptor (qtdecl_QAccessibleApplication (), "QtGui", "QAccessibleApplication", methods_QAccessibleApplication_Adaptor (), "@qt\n@brief Binding of QAccessibleApplication"); diff --git a/src/gsiqt4/gsiDeclQAccessibleEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAccessibleEvent.cc similarity index 95% rename from src/gsiqt4/gsiDeclQAccessibleEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQAccessibleEvent.cc index d1168947d..48babe0cb 100644 --- a/src/gsiqt4/gsiDeclQAccessibleEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQAccessibleEvent.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -123,12 +123,12 @@ static gsi::Methods methods_QAccessibleEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QAccessibleEvent (qtdecl_QEvent (), "QAccessibleEvent", +gsi::Class decl_QAccessibleEvent (qtdecl_QEvent (), "QtGui", "QAccessibleEvent", methods_QAccessibleEvent (), "@qt\n@brief Binding of QAccessibleEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAccessibleEvent () { return decl_QAccessibleEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAccessibleEvent () { return decl_QAccessibleEvent; } } diff --git a/src/gsiqt4/gsiDeclQAccessibleInterface.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAccessibleInterface.cc similarity index 98% rename from src/gsiqt4/gsiDeclQAccessibleInterface.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQAccessibleInterface.cc index 3825aa4d8..afba8eb37 100644 --- a/src/gsiqt4/gsiDeclQAccessibleInterface.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQAccessibleInterface.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -423,12 +423,12 @@ static gsi::Methods methods_QAccessibleInterface () { gsi::Class &qtdecl_QAccessible (); -gsi::Class decl_QAccessibleInterface (qtdecl_QAccessible (), "QAccessibleInterface", +gsi::Class decl_QAccessibleInterface (qtdecl_QAccessible (), "QtGui", "QAccessibleInterface", methods_QAccessibleInterface (), "@qt\n@brief Binding of QAccessibleInterface"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAccessibleInterface () { return decl_QAccessibleInterface; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAccessibleInterface () { return decl_QAccessibleInterface; } } diff --git a/src/gsiqt4/gsiDeclQAccessibleObject.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAccessibleObject.cc similarity index 97% rename from src/gsiqt4/gsiDeclQAccessibleObject.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQAccessibleObject.cc index acbe12810..7ac19746e 100644 --- a/src/gsiqt4/gsiDeclQAccessibleObject.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQAccessibleObject.cc @@ -33,8 +33,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -202,12 +202,12 @@ static gsi::Methods methods_QAccessibleObject () { gsi::Class &qtdecl_QAccessibleInterface (); -gsi::Class decl_QAccessibleObject (qtdecl_QAccessibleInterface (), "QAccessibleObject", +gsi::Class decl_QAccessibleObject (qtdecl_QAccessibleInterface (), "QtGui", "QAccessibleObject", methods_QAccessibleObject (), "@qt\n@brief Binding of QAccessibleObject"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAccessibleObject () { return decl_QAccessibleObject; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAccessibleObject () { return decl_QAccessibleObject; } } diff --git a/src/gsiqt4/gsiDeclQAccessibleWidget.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAccessibleWidget.cc similarity index 98% rename from src/gsiqt4/gsiDeclQAccessibleWidget.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQAccessibleWidget.cc index dfbc154be..85752b541 100644 --- a/src/gsiqt4/gsiDeclQAccessibleWidget.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQAccessibleWidget.cc @@ -34,8 +34,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -318,12 +318,12 @@ static gsi::Methods methods_QAccessibleWidget () { gsi::Class &qtdecl_QAccessibleObject (); -gsi::Class decl_QAccessibleWidget (qtdecl_QAccessibleObject (), "QAccessibleWidget", +gsi::Class decl_QAccessibleWidget (qtdecl_QAccessibleObject (), "QtGui", "QAccessibleWidget", methods_QAccessibleWidget (), "@qt\n@brief Binding of QAccessibleWidget"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAccessibleWidget () { return decl_QAccessibleWidget; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAccessibleWidget () { return decl_QAccessibleWidget; } } diff --git a/src/gsiqt4/gsiDeclQAction.cc b/src/gsiqt/qt4/QtGui/gsiDeclQAction.cc similarity index 98% rename from src/gsiqt4/gsiDeclQAction.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQAction.cc index 686d18b43..73b923b03 100644 --- a/src/gsiqt4/gsiDeclQAction.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQAction.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1198,11 +1198,11 @@ static gsi::Methods methods_QAction () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QAction (qtdecl_QObject (), "QAction_Native", +qt_gsi::QtNativeClass decl_QAction (qtdecl_QObject (), "QtGui", "QAction_Native", methods_QAction (), "@hide\n@alias QAction"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAction () { return decl_QAction; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAction () { return decl_QAction; } } @@ -1725,7 +1725,7 @@ static gsi::Methods methods_QAction_Adaptor () { return methods; } -gsi::Class decl_QAction_Adaptor (qtdecl_QAction (), "QAction", +gsi::Class decl_QAction_Adaptor (qtdecl_QAction (), "QtGui", "QAction", methods_QAction_Adaptor (), "@qt\n@brief Binding of QAction"); @@ -1736,18 +1736,18 @@ gsi::Class decl_QAction_Adaptor (qtdecl_QAction (), "QAction", namespace qt_gsi { -static gsi::Enum decl_QAction_ActionEvent_Enum ("QAction_ActionEvent", +static gsi::Enum decl_QAction_ActionEvent_Enum ("QtGui", "QAction_ActionEvent", gsi::enum_const ("Trigger", QAction::Trigger, "@brief Enum constant QAction::Trigger") + gsi::enum_const ("Hover", QAction::Hover, "@brief Enum constant QAction::Hover"), "@qt\n@brief This class represents the QAction::ActionEvent enum"); -static gsi::QFlagsClass decl_QAction_ActionEvent_Enums ("QAction_QFlags_ActionEvent", +static gsi::QFlagsClass decl_QAction_ActionEvent_Enums ("QtGui", "QAction_QFlags_ActionEvent", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAction_ActionEvent_Enum_in_parent (decl_QAction_ActionEvent_Enum.defs ()); -static gsi::ClassExt decl_QAction_ActionEvent_Enum_as_child (decl_QAction_ActionEvent_Enum, "ActionEvent"); -static gsi::ClassExt decl_QAction_ActionEvent_Enums_as_child (decl_QAction_ActionEvent_Enums, "QFlags_ActionEvent"); +static gsi::ClassExt decl_QAction_ActionEvent_Enum_as_child (decl_QAction_ActionEvent_Enum, "QtGui", "ActionEvent"); +static gsi::ClassExt decl_QAction_ActionEvent_Enums_as_child (decl_QAction_ActionEvent_Enums, "QtGui", "QFlags_ActionEvent"); } @@ -1756,7 +1756,7 @@ static gsi::ClassExt decl_QAction_ActionEvent_Enums_as_child (decl_QAct namespace qt_gsi { -static gsi::Enum decl_QAction_MenuRole_Enum ("QAction_MenuRole", +static gsi::Enum decl_QAction_MenuRole_Enum ("QtGui", "QAction_MenuRole", gsi::enum_const ("NoRole", QAction::NoRole, "@brief Enum constant QAction::NoRole") + gsi::enum_const ("TextHeuristicRole", QAction::TextHeuristicRole, "@brief Enum constant QAction::TextHeuristicRole") + gsi::enum_const ("ApplicationSpecificRole", QAction::ApplicationSpecificRole, "@brief Enum constant QAction::ApplicationSpecificRole") + @@ -1766,13 +1766,13 @@ static gsi::Enum decl_QAction_MenuRole_Enum ("QAction_MenuRol gsi::enum_const ("QuitRole", QAction::QuitRole, "@brief Enum constant QAction::QuitRole"), "@qt\n@brief This class represents the QAction::MenuRole enum"); -static gsi::QFlagsClass decl_QAction_MenuRole_Enums ("QAction_QFlags_MenuRole", +static gsi::QFlagsClass decl_QAction_MenuRole_Enums ("QtGui", "QAction_QFlags_MenuRole", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAction_MenuRole_Enum_in_parent (decl_QAction_MenuRole_Enum.defs ()); -static gsi::ClassExt decl_QAction_MenuRole_Enum_as_child (decl_QAction_MenuRole_Enum, "MenuRole"); -static gsi::ClassExt decl_QAction_MenuRole_Enums_as_child (decl_QAction_MenuRole_Enums, "QFlags_MenuRole"); +static gsi::ClassExt decl_QAction_MenuRole_Enum_as_child (decl_QAction_MenuRole_Enum, "QtGui", "MenuRole"); +static gsi::ClassExt decl_QAction_MenuRole_Enums_as_child (decl_QAction_MenuRole_Enums, "QtGui", "QFlags_MenuRole"); } @@ -1781,19 +1781,19 @@ static gsi::ClassExt decl_QAction_MenuRole_Enums_as_child (decl_QAction namespace qt_gsi { -static gsi::Enum decl_QAction_Priority_Enum ("QAction_Priority", +static gsi::Enum decl_QAction_Priority_Enum ("QtGui", "QAction_Priority", gsi::enum_const ("LowPriority", QAction::LowPriority, "@brief Enum constant QAction::LowPriority") + gsi::enum_const ("NormalPriority", QAction::NormalPriority, "@brief Enum constant QAction::NormalPriority") + gsi::enum_const ("HighPriority", QAction::HighPriority, "@brief Enum constant QAction::HighPriority"), "@qt\n@brief This class represents the QAction::Priority enum"); -static gsi::QFlagsClass decl_QAction_Priority_Enums ("QAction_QFlags_Priority", +static gsi::QFlagsClass decl_QAction_Priority_Enums ("QtGui", "QAction_QFlags_Priority", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAction_Priority_Enum_in_parent (decl_QAction_Priority_Enum.defs ()); -static gsi::ClassExt decl_QAction_Priority_Enum_as_child (decl_QAction_Priority_Enum, "Priority"); -static gsi::ClassExt decl_QAction_Priority_Enums_as_child (decl_QAction_Priority_Enums, "QFlags_Priority"); +static gsi::ClassExt decl_QAction_Priority_Enum_as_child (decl_QAction_Priority_Enum, "QtGui", "Priority"); +static gsi::ClassExt decl_QAction_Priority_Enums_as_child (decl_QAction_Priority_Enums, "QtGui", "QFlags_Priority"); } @@ -1802,20 +1802,20 @@ static gsi::ClassExt decl_QAction_Priority_Enums_as_child (decl_QAction namespace qt_gsi { -static gsi::Enum decl_QAction_SoftKeyRole_Enum ("QAction_SoftKeyRole", +static gsi::Enum decl_QAction_SoftKeyRole_Enum ("QtGui", "QAction_SoftKeyRole", gsi::enum_const ("NoSoftKey", QAction::NoSoftKey, "@brief Enum constant QAction::NoSoftKey") + gsi::enum_const ("PositiveSoftKey", QAction::PositiveSoftKey, "@brief Enum constant QAction::PositiveSoftKey") + gsi::enum_const ("NegativeSoftKey", QAction::NegativeSoftKey, "@brief Enum constant QAction::NegativeSoftKey") + gsi::enum_const ("SelectSoftKey", QAction::SelectSoftKey, "@brief Enum constant QAction::SelectSoftKey"), "@qt\n@brief This class represents the QAction::SoftKeyRole enum"); -static gsi::QFlagsClass decl_QAction_SoftKeyRole_Enums ("QAction_QFlags_SoftKeyRole", +static gsi::QFlagsClass decl_QAction_SoftKeyRole_Enums ("QtGui", "QAction_QFlags_SoftKeyRole", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAction_SoftKeyRole_Enum_in_parent (decl_QAction_SoftKeyRole_Enum.defs ()); -static gsi::ClassExt decl_QAction_SoftKeyRole_Enum_as_child (decl_QAction_SoftKeyRole_Enum, "SoftKeyRole"); -static gsi::ClassExt decl_QAction_SoftKeyRole_Enums_as_child (decl_QAction_SoftKeyRole_Enums, "QFlags_SoftKeyRole"); +static gsi::ClassExt decl_QAction_SoftKeyRole_Enum_as_child (decl_QAction_SoftKeyRole_Enum, "QtGui", "SoftKeyRole"); +static gsi::ClassExt decl_QAction_SoftKeyRole_Enums_as_child (decl_QAction_SoftKeyRole_Enums, "QtGui", "QFlags_SoftKeyRole"); } diff --git a/src/gsiqt4/gsiDeclQActionEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQActionEvent.cc similarity index 95% rename from src/gsiqt4/gsiDeclQActionEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQActionEvent.cc index 754d08f46..e666dd449 100644 --- a/src/gsiqt4/gsiDeclQActionEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQActionEvent.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -79,11 +79,11 @@ static gsi::Methods methods_QActionEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QActionEvent (qtdecl_QEvent (), "QActionEvent_Native", +gsi::Class decl_QActionEvent (qtdecl_QEvent (), "QtGui", "QActionEvent_Native", methods_QActionEvent (), "@hide\n@alias QActionEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QActionEvent () { return decl_QActionEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QActionEvent () { return decl_QActionEvent; } } @@ -146,7 +146,7 @@ static gsi::Methods methods_QActionEvent_Adaptor () { return methods; } -gsi::Class decl_QActionEvent_Adaptor (qtdecl_QActionEvent (), "QActionEvent", +gsi::Class decl_QActionEvent_Adaptor (qtdecl_QActionEvent (), "QtGui", "QActionEvent", methods_QActionEvent_Adaptor (), "@qt\n@brief Binding of QActionEvent"); diff --git a/src/gsiqt4/gsiDeclQActionGroup.cc b/src/gsiqt/qt4/QtGui/gsiDeclQActionGroup.cc similarity index 99% rename from src/gsiqt4/gsiDeclQActionGroup.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQActionGroup.cc index d31fdcaab..5dbceafb8 100644 --- a/src/gsiqt4/gsiDeclQActionGroup.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQActionGroup.cc @@ -36,8 +36,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -417,11 +417,11 @@ static gsi::Methods methods_QActionGroup () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QActionGroup (qtdecl_QObject (), "QActionGroup_Native", +qt_gsi::QtNativeClass decl_QActionGroup (qtdecl_QObject (), "QtGui", "QActionGroup_Native", methods_QActionGroup (), "@hide\n@alias QActionGroup"); -GSIQT_PUBLIC gsi::Class &qtdecl_QActionGroup () { return decl_QActionGroup; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QActionGroup () { return decl_QActionGroup; } } @@ -868,7 +868,7 @@ static gsi::Methods methods_QActionGroup_Adaptor () { return methods; } -gsi::Class decl_QActionGroup_Adaptor (qtdecl_QActionGroup (), "QActionGroup", +gsi::Class decl_QActionGroup_Adaptor (qtdecl_QActionGroup (), "QtGui", "QActionGroup", methods_QActionGroup_Adaptor (), "@qt\n@brief Binding of QActionGroup"); diff --git a/src/gsiqt4/gsiDeclQApplication.cc b/src/gsiqt/qt4/QtGui/gsiDeclQApplication.cc similarity index 99% rename from src/gsiqt4/gsiDeclQApplication.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQApplication.cc index a8f619fe5..3978a6207 100644 --- a/src/gsiqt4/gsiDeclQApplication.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQApplication.cc @@ -36,8 +36,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1583,13 +1583,13 @@ static gsi::Methods methods_QApplication () { gsi::Class &qtdecl_QCoreApplication (); -qt_gsi::QtNativeClass decl_QApplication (qtdecl_QCoreApplication (), "QApplication_Native", +qt_gsi::QtNativeClass decl_QApplication (qtdecl_QCoreApplication (), "QtGui", "QApplication_Native", gsi::constructor("new_app", &ctor_QApplication, "@brief Creates a new QApplication object\n\nThis implementation is provided for test purposes only. It is not required usually to create a QApplication object. Use the object provided by QApplication::instance instead.") + methods_QApplication (), "@hide\n@alias QApplication"); -GSIQT_PUBLIC gsi::Class &qtdecl_QApplication () { return decl_QApplication; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QApplication () { return decl_QApplication; } } @@ -2096,7 +2096,7 @@ static gsi::Methods methods_QApplication_Adaptor () { return methods; } -gsi::Class decl_QApplication_Adaptor (qtdecl_QApplication (), "QApplication", +gsi::Class decl_QApplication_Adaptor (qtdecl_QApplication (), "QtGui", "QApplication", methods_QApplication_Adaptor (), "@qt\n@brief Binding of QApplication"); @@ -2107,19 +2107,19 @@ gsi::Class decl_QApplication_Adaptor (qtdecl_QApplication namespace qt_gsi { -static gsi::Enum decl_QApplication_Type_Enum ("QApplication_Type", +static gsi::Enum decl_QApplication_Type_Enum ("QtGui", "QApplication_Type", gsi::enum_const ("Tty", QApplication::Tty, "@brief Enum constant QApplication::Tty") + gsi::enum_const ("GuiClient", QApplication::GuiClient, "@brief Enum constant QApplication::GuiClient") + gsi::enum_const ("GuiServer", QApplication::GuiServer, "@brief Enum constant QApplication::GuiServer"), "@qt\n@brief This class represents the QApplication::Type enum"); -static gsi::QFlagsClass decl_QApplication_Type_Enums ("QApplication_QFlags_Type", +static gsi::QFlagsClass decl_QApplication_Type_Enums ("QtGui", "QApplication_QFlags_Type", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QApplication_Type_Enum_in_parent (decl_QApplication_Type_Enum.defs ()); -static gsi::ClassExt decl_QApplication_Type_Enum_as_child (decl_QApplication_Type_Enum, "Type"); -static gsi::ClassExt decl_QApplication_Type_Enums_as_child (decl_QApplication_Type_Enums, "QFlags_Type"); +static gsi::ClassExt decl_QApplication_Type_Enum_as_child (decl_QApplication_Type_Enum, "QtGui", "Type"); +static gsi::ClassExt decl_QApplication_Type_Enums_as_child (decl_QApplication_Type_Enums, "QtGui", "QFlags_Type"); } diff --git a/src/gsiqt4/gsiDeclQBitmap.cc b/src/gsiqt/qt4/QtGui/gsiDeclQBitmap.cc similarity index 98% rename from src/gsiqt4/gsiDeclQBitmap.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQBitmap.cc index c5776e327..be0f717db 100644 --- a/src/gsiqt4/gsiDeclQBitmap.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQBitmap.cc @@ -41,8 +41,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -184,11 +184,11 @@ static gsi::Methods methods_QBitmap () { gsi::Class &qtdecl_QPixmap (); -gsi::Class decl_QBitmap (qtdecl_QPixmap (), "QBitmap_Native", +gsi::Class decl_QBitmap (qtdecl_QPixmap (), "QtGui", "QBitmap_Native", methods_QBitmap (), "@hide\n@alias QBitmap"); -GSIQT_PUBLIC gsi::Class &qtdecl_QBitmap () { return decl_QBitmap; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QBitmap () { return decl_QBitmap; } } @@ -424,7 +424,7 @@ static gsi::Methods methods_QBitmap_Adaptor () { return methods; } -gsi::Class decl_QBitmap_Adaptor (qtdecl_QBitmap (), "QBitmap", +gsi::Class decl_QBitmap_Adaptor (qtdecl_QBitmap (), "QtGui", "QBitmap", methods_QBitmap_Adaptor (), "@qt\n@brief Binding of QBitmap"); diff --git a/src/gsiqt4/gsiDeclQBoxLayout.cc b/src/gsiqt/qt4/QtGui/gsiDeclQBoxLayout.cc similarity index 99% rename from src/gsiqt4/gsiDeclQBoxLayout.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQBoxLayout.cc index d33c98e80..1f51b60b5 100644 --- a/src/gsiqt4/gsiDeclQBoxLayout.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQBoxLayout.cc @@ -41,8 +41,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -835,11 +835,11 @@ static gsi::Methods methods_QBoxLayout () { gsi::Class &qtdecl_QLayout (); -qt_gsi::QtNativeClass decl_QBoxLayout (qtdecl_QLayout (), "QBoxLayout_Native", +qt_gsi::QtNativeClass decl_QBoxLayout (qtdecl_QLayout (), "QtGui", "QBoxLayout_Native", methods_QBoxLayout (), "@hide\n@alias QBoxLayout"); -GSIQT_PUBLIC gsi::Class &qtdecl_QBoxLayout () { return decl_QBoxLayout; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QBoxLayout () { return decl_QBoxLayout; } } @@ -2082,7 +2082,7 @@ static gsi::Methods methods_QBoxLayout_Adaptor () { return methods; } -gsi::Class decl_QBoxLayout_Adaptor (qtdecl_QBoxLayout (), "QBoxLayout", +gsi::Class decl_QBoxLayout_Adaptor (qtdecl_QBoxLayout (), "QtGui", "QBoxLayout", methods_QBoxLayout_Adaptor (), "@qt\n@brief Binding of QBoxLayout"); @@ -2093,7 +2093,7 @@ gsi::Class decl_QBoxLayout_Adaptor (qtdecl_QBoxLayout (), "Q namespace qt_gsi { -static gsi::Enum decl_QBoxLayout_Direction_Enum ("QBoxLayout_Direction", +static gsi::Enum decl_QBoxLayout_Direction_Enum ("QtGui", "QBoxLayout_Direction", gsi::enum_const ("LeftToRight", QBoxLayout::LeftToRight, "@brief Enum constant QBoxLayout::LeftToRight") + gsi::enum_const ("RightToLeft", QBoxLayout::RightToLeft, "@brief Enum constant QBoxLayout::RightToLeft") + gsi::enum_const ("TopToBottom", QBoxLayout::TopToBottom, "@brief Enum constant QBoxLayout::TopToBottom") + @@ -2102,13 +2102,13 @@ static gsi::Enum decl_QBoxLayout_Direction_Enum ("QBoxLay gsi::enum_const ("Up", QBoxLayout::Up, "@brief Enum constant QBoxLayout::Up"), "@qt\n@brief This class represents the QBoxLayout::Direction enum"); -static gsi::QFlagsClass decl_QBoxLayout_Direction_Enums ("QBoxLayout_QFlags_Direction", +static gsi::QFlagsClass decl_QBoxLayout_Direction_Enums ("QtGui", "QBoxLayout_QFlags_Direction", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QBoxLayout_Direction_Enum_in_parent (decl_QBoxLayout_Direction_Enum.defs ()); -static gsi::ClassExt decl_QBoxLayout_Direction_Enum_as_child (decl_QBoxLayout_Direction_Enum, "Direction"); -static gsi::ClassExt decl_QBoxLayout_Direction_Enums_as_child (decl_QBoxLayout_Direction_Enums, "QFlags_Direction"); +static gsi::ClassExt decl_QBoxLayout_Direction_Enum_as_child (decl_QBoxLayout_Direction_Enum, "QtGui", "Direction"); +static gsi::ClassExt decl_QBoxLayout_Direction_Enums_as_child (decl_QBoxLayout_Direction_Enums, "QtGui", "QFlags_Direction"); } diff --git a/src/gsiqt4/gsiDeclQBrush.cc b/src/gsiqt/qt4/QtGui/gsiDeclQBrush.cc similarity index 99% rename from src/gsiqt4/gsiDeclQBrush.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQBrush.cc index 6c13b3e7e..50e95e4d2 100644 --- a/src/gsiqt4/gsiDeclQBrush.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQBrush.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -610,12 +610,12 @@ static gsi::Methods methods_QBrush () { return methods; } -gsi::Class decl_QBrush ("QBrush", +gsi::Class decl_QBrush ("QtGui", "QBrush", methods_QBrush (), "@qt\n@brief Binding of QBrush"); -GSIQT_PUBLIC gsi::Class &qtdecl_QBrush () { return decl_QBrush; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QBrush () { return decl_QBrush; } } diff --git a/src/gsiqt4/gsiDeclQButtonGroup.cc b/src/gsiqt/qt4/QtGui/gsiDeclQButtonGroup.cc similarity index 99% rename from src/gsiqt4/gsiDeclQButtonGroup.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQButtonGroup.cc index 3680d9675..b20d92ce5 100644 --- a/src/gsiqt4/gsiDeclQButtonGroup.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQButtonGroup.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -386,11 +386,11 @@ static gsi::Methods methods_QButtonGroup () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QButtonGroup (qtdecl_QObject (), "QButtonGroup_Native", +qt_gsi::QtNativeClass decl_QButtonGroup (qtdecl_QObject (), "QtGui", "QButtonGroup_Native", methods_QButtonGroup (), "@hide\n@alias QButtonGroup"); -GSIQT_PUBLIC gsi::Class &qtdecl_QButtonGroup () { return decl_QButtonGroup; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QButtonGroup () { return decl_QButtonGroup; } } @@ -918,7 +918,7 @@ static gsi::Methods methods_QButtonGroup_Adaptor () { return methods; } -gsi::Class decl_QButtonGroup_Adaptor (qtdecl_QButtonGroup (), "QButtonGroup", +gsi::Class decl_QButtonGroup_Adaptor (qtdecl_QButtonGroup (), "QtGui", "QButtonGroup", methods_QButtonGroup_Adaptor (), "@qt\n@brief Binding of QButtonGroup"); diff --git a/src/gsiqt4/gsiDeclQCDEStyle.cc b/src/gsiqt/qt4/QtGui/gsiDeclQCDEStyle.cc similarity index 99% rename from src/gsiqt4/gsiDeclQCDEStyle.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQCDEStyle.cc index 89483e3df..4c958d320 100644 --- a/src/gsiqt4/gsiDeclQCDEStyle.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQCDEStyle.cc @@ -48,8 +48,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -280,11 +280,11 @@ static gsi::Methods methods_QCDEStyle () { gsi::Class &qtdecl_QMotifStyle (); -qt_gsi::QtNativeClass decl_QCDEStyle (qtdecl_QMotifStyle (), "QCDEStyle_Native", +qt_gsi::QtNativeClass decl_QCDEStyle (qtdecl_QMotifStyle (), "QtGui", "QCDEStyle_Native", methods_QCDEStyle (), "@hide\n@alias QCDEStyle"); -GSIQT_PUBLIC gsi::Class &qtdecl_QCDEStyle () { return decl_QCDEStyle; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QCDEStyle () { return decl_QCDEStyle; } } @@ -1727,7 +1727,7 @@ static gsi::Methods methods_QCDEStyle_Adaptor () { return methods; } -gsi::Class decl_QCDEStyle_Adaptor (qtdecl_QCDEStyle (), "QCDEStyle", +gsi::Class decl_QCDEStyle_Adaptor (qtdecl_QCDEStyle (), "QtGui", "QCDEStyle", methods_QCDEStyle_Adaptor (), "@qt\n@brief Binding of QCDEStyle"); diff --git a/src/gsiqt4/gsiDeclQCalendarWidget.cc b/src/gsiqt/qt4/QtGui/gsiDeclQCalendarWidget.cc similarity index 99% rename from src/gsiqt4/gsiDeclQCalendarWidget.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQCalendarWidget.cc index 7c0f03b26..117ad93c3 100644 --- a/src/gsiqt4/gsiDeclQCalendarWidget.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQCalendarWidget.cc @@ -79,8 +79,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1013,11 +1013,11 @@ static gsi::Methods methods_QCalendarWidget () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QCalendarWidget (qtdecl_QWidget (), "QCalendarWidget_Native", +qt_gsi::QtNativeClass decl_QCalendarWidget (qtdecl_QWidget (), "QtGui", "QCalendarWidget_Native", methods_QCalendarWidget (), "@hide\n@alias QCalendarWidget"); -GSIQT_PUBLIC gsi::Class &qtdecl_QCalendarWidget () { return decl_QCalendarWidget; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QCalendarWidget () { return decl_QCalendarWidget; } } @@ -3411,7 +3411,7 @@ static gsi::Methods methods_QCalendarWidget_Adaptor () { return methods; } -gsi::Class decl_QCalendarWidget_Adaptor (qtdecl_QCalendarWidget (), "QCalendarWidget", +gsi::Class decl_QCalendarWidget_Adaptor (qtdecl_QCalendarWidget (), "QtGui", "QCalendarWidget", methods_QCalendarWidget_Adaptor (), "@qt\n@brief Binding of QCalendarWidget"); @@ -3422,20 +3422,20 @@ gsi::Class decl_QCalendarWidget_Adaptor (qtdecl_QCalend namespace qt_gsi { -static gsi::Enum decl_QCalendarWidget_HorizontalHeaderFormat_Enum ("QCalendarWidget_HorizontalHeaderFormat", +static gsi::Enum decl_QCalendarWidget_HorizontalHeaderFormat_Enum ("QtGui", "QCalendarWidget_HorizontalHeaderFormat", gsi::enum_const ("NoHorizontalHeader", QCalendarWidget::NoHorizontalHeader, "@brief Enum constant QCalendarWidget::NoHorizontalHeader") + gsi::enum_const ("SingleLetterDayNames", QCalendarWidget::SingleLetterDayNames, "@brief Enum constant QCalendarWidget::SingleLetterDayNames") + gsi::enum_const ("ShortDayNames", QCalendarWidget::ShortDayNames, "@brief Enum constant QCalendarWidget::ShortDayNames") + gsi::enum_const ("LongDayNames", QCalendarWidget::LongDayNames, "@brief Enum constant QCalendarWidget::LongDayNames"), "@qt\n@brief This class represents the QCalendarWidget::HorizontalHeaderFormat enum"); -static gsi::QFlagsClass decl_QCalendarWidget_HorizontalHeaderFormat_Enums ("QCalendarWidget_QFlags_HorizontalHeaderFormat", +static gsi::QFlagsClass decl_QCalendarWidget_HorizontalHeaderFormat_Enums ("QtGui", "QCalendarWidget_QFlags_HorizontalHeaderFormat", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QCalendarWidget_HorizontalHeaderFormat_Enum_in_parent (decl_QCalendarWidget_HorizontalHeaderFormat_Enum.defs ()); -static gsi::ClassExt decl_QCalendarWidget_HorizontalHeaderFormat_Enum_as_child (decl_QCalendarWidget_HorizontalHeaderFormat_Enum, "HorizontalHeaderFormat"); -static gsi::ClassExt decl_QCalendarWidget_HorizontalHeaderFormat_Enums_as_child (decl_QCalendarWidget_HorizontalHeaderFormat_Enums, "QFlags_HorizontalHeaderFormat"); +static gsi::ClassExt decl_QCalendarWidget_HorizontalHeaderFormat_Enum_as_child (decl_QCalendarWidget_HorizontalHeaderFormat_Enum, "QtGui", "HorizontalHeaderFormat"); +static gsi::ClassExt decl_QCalendarWidget_HorizontalHeaderFormat_Enums_as_child (decl_QCalendarWidget_HorizontalHeaderFormat_Enums, "QtGui", "QFlags_HorizontalHeaderFormat"); } @@ -3444,18 +3444,18 @@ static gsi::ClassExt decl_QCalendarWidget_HorizontalHeaderForma namespace qt_gsi { -static gsi::Enum decl_QCalendarWidget_SelectionMode_Enum ("QCalendarWidget_SelectionMode", +static gsi::Enum decl_QCalendarWidget_SelectionMode_Enum ("QtGui", "QCalendarWidget_SelectionMode", gsi::enum_const ("NoSelection", QCalendarWidget::NoSelection, "@brief Enum constant QCalendarWidget::NoSelection") + gsi::enum_const ("SingleSelection", QCalendarWidget::SingleSelection, "@brief Enum constant QCalendarWidget::SingleSelection"), "@qt\n@brief This class represents the QCalendarWidget::SelectionMode enum"); -static gsi::QFlagsClass decl_QCalendarWidget_SelectionMode_Enums ("QCalendarWidget_QFlags_SelectionMode", +static gsi::QFlagsClass decl_QCalendarWidget_SelectionMode_Enums ("QtGui", "QCalendarWidget_QFlags_SelectionMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QCalendarWidget_SelectionMode_Enum_in_parent (decl_QCalendarWidget_SelectionMode_Enum.defs ()); -static gsi::ClassExt decl_QCalendarWidget_SelectionMode_Enum_as_child (decl_QCalendarWidget_SelectionMode_Enum, "SelectionMode"); -static gsi::ClassExt decl_QCalendarWidget_SelectionMode_Enums_as_child (decl_QCalendarWidget_SelectionMode_Enums, "QFlags_SelectionMode"); +static gsi::ClassExt decl_QCalendarWidget_SelectionMode_Enum_as_child (decl_QCalendarWidget_SelectionMode_Enum, "QtGui", "SelectionMode"); +static gsi::ClassExt decl_QCalendarWidget_SelectionMode_Enums_as_child (decl_QCalendarWidget_SelectionMode_Enums, "QtGui", "QFlags_SelectionMode"); } @@ -3464,18 +3464,18 @@ static gsi::ClassExt decl_QCalendarWidget_SelectionMode_Enums_a namespace qt_gsi { -static gsi::Enum decl_QCalendarWidget_VerticalHeaderFormat_Enum ("QCalendarWidget_VerticalHeaderFormat", +static gsi::Enum decl_QCalendarWidget_VerticalHeaderFormat_Enum ("QtGui", "QCalendarWidget_VerticalHeaderFormat", gsi::enum_const ("NoVerticalHeader", QCalendarWidget::NoVerticalHeader, "@brief Enum constant QCalendarWidget::NoVerticalHeader") + gsi::enum_const ("ISOWeekNumbers", QCalendarWidget::ISOWeekNumbers, "@brief Enum constant QCalendarWidget::ISOWeekNumbers"), "@qt\n@brief This class represents the QCalendarWidget::VerticalHeaderFormat enum"); -static gsi::QFlagsClass decl_QCalendarWidget_VerticalHeaderFormat_Enums ("QCalendarWidget_QFlags_VerticalHeaderFormat", +static gsi::QFlagsClass decl_QCalendarWidget_VerticalHeaderFormat_Enums ("QtGui", "QCalendarWidget_QFlags_VerticalHeaderFormat", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QCalendarWidget_VerticalHeaderFormat_Enum_in_parent (decl_QCalendarWidget_VerticalHeaderFormat_Enum.defs ()); -static gsi::ClassExt decl_QCalendarWidget_VerticalHeaderFormat_Enum_as_child (decl_QCalendarWidget_VerticalHeaderFormat_Enum, "VerticalHeaderFormat"); -static gsi::ClassExt decl_QCalendarWidget_VerticalHeaderFormat_Enums_as_child (decl_QCalendarWidget_VerticalHeaderFormat_Enums, "QFlags_VerticalHeaderFormat"); +static gsi::ClassExt decl_QCalendarWidget_VerticalHeaderFormat_Enum_as_child (decl_QCalendarWidget_VerticalHeaderFormat_Enum, "QtGui", "VerticalHeaderFormat"); +static gsi::ClassExt decl_QCalendarWidget_VerticalHeaderFormat_Enums_as_child (decl_QCalendarWidget_VerticalHeaderFormat_Enums, "QtGui", "QFlags_VerticalHeaderFormat"); } diff --git a/src/gsiqt4/gsiDeclQCheckBox.cc b/src/gsiqt/qt4/QtGui/gsiDeclQCheckBox.cc similarity index 99% rename from src/gsiqt4/gsiDeclQCheckBox.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQCheckBox.cc index c1a3f74d8..48af4a04c 100644 --- a/src/gsiqt4/gsiDeclQCheckBox.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQCheckBox.cc @@ -79,8 +79,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -305,11 +305,11 @@ static gsi::Methods methods_QCheckBox () { gsi::Class &qtdecl_QAbstractButton (); -qt_gsi::QtNativeClass decl_QCheckBox (qtdecl_QAbstractButton (), "QCheckBox_Native", +qt_gsi::QtNativeClass decl_QCheckBox (qtdecl_QAbstractButton (), "QtGui", "QCheckBox_Native", methods_QCheckBox (), "@hide\n@alias QCheckBox"); -GSIQT_PUBLIC gsi::Class &qtdecl_QCheckBox () { return decl_QCheckBox; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QCheckBox () { return decl_QCheckBox; } } @@ -2803,7 +2803,7 @@ static gsi::Methods methods_QCheckBox_Adaptor () { return methods; } -gsi::Class decl_QCheckBox_Adaptor (qtdecl_QCheckBox (), "QCheckBox", +gsi::Class decl_QCheckBox_Adaptor (qtdecl_QCheckBox (), "QtGui", "QCheckBox", methods_QCheckBox_Adaptor (), "@qt\n@brief Binding of QCheckBox"); diff --git a/src/gsiqt4/gsiDeclQCleanlooksStyle.cc b/src/gsiqt/qt4/QtGui/gsiDeclQCleanlooksStyle.cc similarity index 99% rename from src/gsiqt4/gsiDeclQCleanlooksStyle.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQCleanlooksStyle.cc index e8e3999f0..d16d1441b 100644 --- a/src/gsiqt4/gsiDeclQCleanlooksStyle.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQCleanlooksStyle.cc @@ -48,8 +48,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -704,11 +704,11 @@ static gsi::Methods methods_QCleanlooksStyle () { gsi::Class &qtdecl_QWindowsStyle (); -qt_gsi::QtNativeClass decl_QCleanlooksStyle (qtdecl_QWindowsStyle (), "QCleanlooksStyle_Native", +qt_gsi::QtNativeClass decl_QCleanlooksStyle (qtdecl_QWindowsStyle (), "QtGui", "QCleanlooksStyle_Native", methods_QCleanlooksStyle (), "@hide\n@alias QCleanlooksStyle"); -GSIQT_PUBLIC gsi::Class &qtdecl_QCleanlooksStyle () { return decl_QCleanlooksStyle; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QCleanlooksStyle () { return decl_QCleanlooksStyle; } } @@ -2141,7 +2141,7 @@ static gsi::Methods methods_QCleanlooksStyle_Adaptor () { return methods; } -gsi::Class decl_QCleanlooksStyle_Adaptor (qtdecl_QCleanlooksStyle (), "QCleanlooksStyle", +gsi::Class decl_QCleanlooksStyle_Adaptor (qtdecl_QCleanlooksStyle (), "QtGui", "QCleanlooksStyle", methods_QCleanlooksStyle_Adaptor (), "@qt\n@brief Binding of QCleanlooksStyle"); diff --git a/src/gsiqt4/gsiDeclQClipboard.cc b/src/gsiqt/qt4/QtGui/gsiDeclQClipboard.cc similarity index 98% rename from src/gsiqt4/gsiDeclQClipboard.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQClipboard.cc index e49c4b070..0d5a6d7fb 100644 --- a/src/gsiqt4/gsiDeclQClipboard.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQClipboard.cc @@ -37,8 +37,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -472,12 +472,12 @@ static gsi::Methods methods_QClipboard () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QClipboard (qtdecl_QObject (), "QClipboard", +qt_gsi::QtNativeClass decl_QClipboard (qtdecl_QObject (), "QtGui", "QClipboard", methods_QClipboard (), "@qt\n@brief Binding of QClipboard"); -GSIQT_PUBLIC gsi::Class &qtdecl_QClipboard () { return decl_QClipboard; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QClipboard () { return decl_QClipboard; } } @@ -486,20 +486,20 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QClipboard () { return decl_QClipboa namespace qt_gsi { -static gsi::Enum decl_QClipboard_Mode_Enum ("QClipboard_Mode", +static gsi::Enum decl_QClipboard_Mode_Enum ("QtGui", "QClipboard_Mode", gsi::enum_const ("Clipboard", QClipboard::Clipboard, "@brief Enum constant QClipboard::Clipboard") + gsi::enum_const ("Selection", QClipboard::Selection, "@brief Enum constant QClipboard::Selection") + gsi::enum_const ("FindBuffer", QClipboard::FindBuffer, "@brief Enum constant QClipboard::FindBuffer") + gsi::enum_const ("LastMode", QClipboard::LastMode, "@brief Enum constant QClipboard::LastMode"), "@qt\n@brief This class represents the QClipboard::Mode enum"); -static gsi::QFlagsClass decl_QClipboard_Mode_Enums ("QClipboard_QFlags_Mode", +static gsi::QFlagsClass decl_QClipboard_Mode_Enums ("QtGui", "QClipboard_QFlags_Mode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QClipboard_Mode_Enum_in_parent (decl_QClipboard_Mode_Enum.defs ()); -static gsi::ClassExt decl_QClipboard_Mode_Enum_as_child (decl_QClipboard_Mode_Enum, "Mode"); -static gsi::ClassExt decl_QClipboard_Mode_Enums_as_child (decl_QClipboard_Mode_Enums, "QFlags_Mode"); +static gsi::ClassExt decl_QClipboard_Mode_Enum_as_child (decl_QClipboard_Mode_Enum, "QtGui", "Mode"); +static gsi::ClassExt decl_QClipboard_Mode_Enums_as_child (decl_QClipboard_Mode_Enums, "QtGui", "QFlags_Mode"); } diff --git a/src/gsiqt4/gsiDeclQClipboardEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQClipboardEvent.cc similarity index 87% rename from src/gsiqt4/gsiDeclQClipboardEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQClipboardEvent.cc index 7866e9170..c26457ac0 100644 --- a/src/gsiqt4/gsiDeclQClipboardEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQClipboardEvent.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -46,11 +46,11 @@ static gsi::Methods methods_QClipboardEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QClipboardEvent (qtdecl_QEvent (), "QClipboardEvent_Native", +gsi::Class decl_QClipboardEvent (qtdecl_QEvent (), "QtGui", "QClipboardEvent_Native", methods_QClipboardEvent (), "@hide\n@alias QClipboardEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QClipboardEvent () { return decl_QClipboardEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QClipboardEvent () { return decl_QClipboardEvent; } } @@ -76,7 +76,7 @@ static gsi::Methods methods_QClipboardEvent_Adaptor () { return methods; } -gsi::Class decl_QClipboardEvent_Adaptor (qtdecl_QClipboardEvent (), "QClipboardEvent", +gsi::Class decl_QClipboardEvent_Adaptor (qtdecl_QClipboardEvent (), "QtGui", "QClipboardEvent", methods_QClipboardEvent_Adaptor (), "@qt\n@brief Binding of QClipboardEvent"); diff --git a/src/gsiqt4/gsiDeclQCloseEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQCloseEvent.cc similarity index 89% rename from src/gsiqt4/gsiDeclQCloseEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQCloseEvent.cc index ed9e86bf1..57410a6aa 100644 --- a/src/gsiqt4/gsiDeclQCloseEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQCloseEvent.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -46,11 +46,11 @@ static gsi::Methods methods_QCloseEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QCloseEvent (qtdecl_QEvent (), "QCloseEvent_Native", +gsi::Class decl_QCloseEvent (qtdecl_QEvent (), "QtGui", "QCloseEvent_Native", methods_QCloseEvent (), "@hide\n@alias QCloseEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QCloseEvent () { return decl_QCloseEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QCloseEvent () { return decl_QCloseEvent; } } @@ -97,7 +97,7 @@ static gsi::Methods methods_QCloseEvent_Adaptor () { return methods; } -gsi::Class decl_QCloseEvent_Adaptor (qtdecl_QCloseEvent (), "QCloseEvent", +gsi::Class decl_QCloseEvent_Adaptor (qtdecl_QCloseEvent (), "QtGui", "QCloseEvent", methods_QCloseEvent_Adaptor (), "@qt\n@brief Binding of QCloseEvent"); diff --git a/src/gsiqt4/gsiDeclQColor.cc b/src/gsiqt/qt4/QtGui/gsiDeclQColor.cc similarity index 99% rename from src/gsiqt4/gsiDeclQColor.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQColor.cc index 0d42fae0a..9deb140f8 100644 --- a/src/gsiqt4/gsiDeclQColor.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQColor.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -2043,12 +2043,12 @@ static gsi::Methods methods_QColor () { return methods; } -gsi::Class decl_QColor ("QColor", +gsi::Class decl_QColor ("QtGui", "QColor", methods_QColor (), "@qt\n@brief Binding of QColor"); -GSIQT_PUBLIC gsi::Class &qtdecl_QColor () { return decl_QColor; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QColor () { return decl_QColor; } } @@ -2057,7 +2057,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QColor () { return decl_QColor; } namespace qt_gsi { -static gsi::Enum decl_QColor_Spec_Enum ("QColor_Spec", +static gsi::Enum decl_QColor_Spec_Enum ("QtGui", "QColor_Spec", gsi::enum_const ("Invalid", QColor::Invalid, "@brief Enum constant QColor::Invalid") + gsi::enum_const ("Rgb", QColor::Rgb, "@brief Enum constant QColor::Rgb") + gsi::enum_const ("Hsv", QColor::Hsv, "@brief Enum constant QColor::Hsv") + @@ -2065,13 +2065,13 @@ static gsi::Enum decl_QColor_Spec_Enum ("QColor_Spec", gsi::enum_const ("Hsl", QColor::Hsl, "@brief Enum constant QColor::Hsl"), "@qt\n@brief This class represents the QColor::Spec enum"); -static gsi::QFlagsClass decl_QColor_Spec_Enums ("QColor_QFlags_Spec", +static gsi::QFlagsClass decl_QColor_Spec_Enums ("QtGui", "QColor_QFlags_Spec", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QColor_Spec_Enum_in_parent (decl_QColor_Spec_Enum.defs ()); -static gsi::ClassExt decl_QColor_Spec_Enum_as_child (decl_QColor_Spec_Enum, "Spec"); -static gsi::ClassExt decl_QColor_Spec_Enums_as_child (decl_QColor_Spec_Enums, "QFlags_Spec"); +static gsi::ClassExt decl_QColor_Spec_Enum_as_child (decl_QColor_Spec_Enum, "QtGui", "Spec"); +static gsi::ClassExt decl_QColor_Spec_Enums_as_child (decl_QColor_Spec_Enums, "QtGui", "QFlags_Spec"); } diff --git a/src/gsiqt4/gsiDeclQColorDialog.cc b/src/gsiqt/qt4/QtGui/gsiDeclQColorDialog.cc similarity index 99% rename from src/gsiqt4/gsiDeclQColorDialog.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQColorDialog.cc index 87056cf99..a80ebeaad 100644 --- a/src/gsiqt4/gsiDeclQColorDialog.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQColorDialog.cc @@ -78,8 +78,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -572,11 +572,11 @@ static gsi::Methods methods_QColorDialog () { gsi::Class &qtdecl_QDialog (); -qt_gsi::QtNativeClass decl_QColorDialog (qtdecl_QDialog (), "QColorDialog_Native", +qt_gsi::QtNativeClass decl_QColorDialog (qtdecl_QDialog (), "QtGui", "QColorDialog_Native", methods_QColorDialog (), "@hide\n@alias QColorDialog"); -GSIQT_PUBLIC gsi::Class &qtdecl_QColorDialog () { return decl_QColorDialog; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QColorDialog () { return decl_QColorDialog; } } @@ -3071,7 +3071,7 @@ static gsi::Methods methods_QColorDialog_Adaptor () { return methods; } -gsi::Class decl_QColorDialog_Adaptor (qtdecl_QColorDialog (), "QColorDialog", +gsi::Class decl_QColorDialog_Adaptor (qtdecl_QColorDialog (), "QtGui", "QColorDialog", methods_QColorDialog_Adaptor (), "@qt\n@brief Binding of QColorDialog"); @@ -3082,19 +3082,19 @@ gsi::Class decl_QColorDialog_Adaptor (qtdecl_QColorDialog namespace qt_gsi { -static gsi::Enum decl_QColorDialog_ColorDialogOption_Enum ("QColorDialog_ColorDialogOption", +static gsi::Enum decl_QColorDialog_ColorDialogOption_Enum ("QtGui", "QColorDialog_ColorDialogOption", gsi::enum_const ("ShowAlphaChannel", QColorDialog::ShowAlphaChannel, "@brief Enum constant QColorDialog::ShowAlphaChannel") + gsi::enum_const ("NoButtons", QColorDialog::NoButtons, "@brief Enum constant QColorDialog::NoButtons") + gsi::enum_const ("DontUseNativeDialog", QColorDialog::DontUseNativeDialog, "@brief Enum constant QColorDialog::DontUseNativeDialog"), "@qt\n@brief This class represents the QColorDialog::ColorDialogOption enum"); -static gsi::QFlagsClass decl_QColorDialog_ColorDialogOption_Enums ("QColorDialog_QFlags_ColorDialogOption", +static gsi::QFlagsClass decl_QColorDialog_ColorDialogOption_Enums ("QtGui", "QColorDialog_QFlags_ColorDialogOption", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QColorDialog_ColorDialogOption_Enum_in_parent (decl_QColorDialog_ColorDialogOption_Enum.defs ()); -static gsi::ClassExt decl_QColorDialog_ColorDialogOption_Enum_as_child (decl_QColorDialog_ColorDialogOption_Enum, "ColorDialogOption"); -static gsi::ClassExt decl_QColorDialog_ColorDialogOption_Enums_as_child (decl_QColorDialog_ColorDialogOption_Enums, "QFlags_ColorDialogOption"); +static gsi::ClassExt decl_QColorDialog_ColorDialogOption_Enum_as_child (decl_QColorDialog_ColorDialogOption_Enum, "QtGui", "ColorDialogOption"); +static gsi::ClassExt decl_QColorDialog_ColorDialogOption_Enums_as_child (decl_QColorDialog_ColorDialogOption_Enums, "QtGui", "QFlags_ColorDialogOption"); } diff --git a/src/gsiqt4/gsiDeclQColormap.cc b/src/gsiqt/qt4/QtGui/gsiDeclQColormap.cc similarity index 95% rename from src/gsiqt4/gsiDeclQColormap.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQColormap.cc index 7893fb84c..daf9225bb 100644 --- a/src/gsiqt4/gsiDeclQColormap.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQColormap.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -227,12 +227,12 @@ static gsi::Methods methods_QColormap () { return methods; } -gsi::Class decl_QColormap ("QColormap", +gsi::Class decl_QColormap ("QtGui", "QColormap", methods_QColormap (), "@qt\n@brief Binding of QColormap"); -GSIQT_PUBLIC gsi::Class &qtdecl_QColormap () { return decl_QColormap; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QColormap () { return decl_QColormap; } } @@ -241,19 +241,19 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QColormap () { return decl_QColormap; namespace qt_gsi { -static gsi::Enum decl_QColormap_Mode_Enum ("QColormap_Mode", +static gsi::Enum decl_QColormap_Mode_Enum ("QtGui", "QColormap_Mode", gsi::enum_const ("Direct", QColormap::Direct, "@brief Enum constant QColormap::Direct") + gsi::enum_const ("Indexed", QColormap::Indexed, "@brief Enum constant QColormap::Indexed") + gsi::enum_const ("Gray", QColormap::Gray, "@brief Enum constant QColormap::Gray"), "@qt\n@brief This class represents the QColormap::Mode enum"); -static gsi::QFlagsClass decl_QColormap_Mode_Enums ("QColormap_QFlags_Mode", +static gsi::QFlagsClass decl_QColormap_Mode_Enums ("QtGui", "QColormap_QFlags_Mode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QColormap_Mode_Enum_in_parent (decl_QColormap_Mode_Enum.defs ()); -static gsi::ClassExt decl_QColormap_Mode_Enum_as_child (decl_QColormap_Mode_Enum, "Mode"); -static gsi::ClassExt decl_QColormap_Mode_Enums_as_child (decl_QColormap_Mode_Enums, "QFlags_Mode"); +static gsi::ClassExt decl_QColormap_Mode_Enum_as_child (decl_QColormap_Mode_Enum, "QtGui", "Mode"); +static gsi::ClassExt decl_QColormap_Mode_Enums_as_child (decl_QColormap_Mode_Enums, "QtGui", "QFlags_Mode"); } diff --git a/src/gsiqt4/gsiDeclQColumnView.cc b/src/gsiqt/qt4/QtGui/gsiDeclQColumnView.cc similarity index 99% rename from src/gsiqt4/gsiDeclQColumnView.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQColumnView.cc index 4877fe53d..b6b10e005 100644 --- a/src/gsiqt4/gsiDeclQColumnView.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQColumnView.cc @@ -85,8 +85,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -494,11 +494,11 @@ static gsi::Methods methods_QColumnView () { gsi::Class &qtdecl_QAbstractItemView (); -qt_gsi::QtNativeClass decl_QColumnView (qtdecl_QAbstractItemView (), "QColumnView_Native", +qt_gsi::QtNativeClass decl_QColumnView (qtdecl_QAbstractItemView (), "QtGui", "QColumnView_Native", methods_QColumnView (), "@hide\n@alias QColumnView"); -GSIQT_PUBLIC gsi::Class &qtdecl_QColumnView () { return decl_QColumnView; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QColumnView () { return decl_QColumnView; } } @@ -5049,7 +5049,7 @@ static gsi::Methods methods_QColumnView_Adaptor () { return methods; } -gsi::Class decl_QColumnView_Adaptor (qtdecl_QColumnView (), "QColumnView", +gsi::Class decl_QColumnView_Adaptor (qtdecl_QColumnView (), "QtGui", "QColumnView", methods_QColumnView_Adaptor (), "@qt\n@brief Binding of QColumnView"); diff --git a/src/gsiqt4/gsiDeclQComboBox.cc b/src/gsiqt/qt4/QtGui/gsiDeclQComboBox.cc similarity index 99% rename from src/gsiqt4/gsiDeclQComboBox.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQComboBox.cc index 3e8919a0e..e544507a6 100644 --- a/src/gsiqt4/gsiDeclQComboBox.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQComboBox.cc @@ -85,8 +85,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1518,11 +1518,11 @@ static gsi::Methods methods_QComboBox () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QComboBox (qtdecl_QWidget (), "QComboBox_Native", +qt_gsi::QtNativeClass decl_QComboBox (qtdecl_QWidget (), "QtGui", "QComboBox_Native", methods_QComboBox (), "@hide\n@alias QComboBox"); -GSIQT_PUBLIC gsi::Class &qtdecl_QComboBox () { return decl_QComboBox; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QComboBox () { return decl_QComboBox; } } @@ -3999,7 +3999,7 @@ static gsi::Methods methods_QComboBox_Adaptor () { return methods; } -gsi::Class decl_QComboBox_Adaptor (qtdecl_QComboBox (), "QComboBox", +gsi::Class decl_QComboBox_Adaptor (qtdecl_QComboBox (), "QtGui", "QComboBox", methods_QComboBox_Adaptor (), "@qt\n@brief Binding of QComboBox"); @@ -4010,7 +4010,7 @@ gsi::Class decl_QComboBox_Adaptor (qtdecl_QComboBox (), "QCom namespace qt_gsi { -static gsi::Enum decl_QComboBox_InsertPolicy_Enum ("QComboBox_InsertPolicy", +static gsi::Enum decl_QComboBox_InsertPolicy_Enum ("QtGui", "QComboBox_InsertPolicy", gsi::enum_const ("NoInsert", QComboBox::NoInsert, "@brief Enum constant QComboBox::NoInsert") + gsi::enum_const ("InsertAtTop", QComboBox::InsertAtTop, "@brief Enum constant QComboBox::InsertAtTop") + gsi::enum_const ("InsertAtCurrent", QComboBox::InsertAtCurrent, "@brief Enum constant QComboBox::InsertAtCurrent") + @@ -4020,13 +4020,13 @@ static gsi::Enum decl_QComboBox_InsertPolicy_Enum ("QCo gsi::enum_const ("InsertAlphabetically", QComboBox::InsertAlphabetically, "@brief Enum constant QComboBox::InsertAlphabetically"), "@qt\n@brief This class represents the QComboBox::InsertPolicy enum"); -static gsi::QFlagsClass decl_QComboBox_InsertPolicy_Enums ("QComboBox_QFlags_InsertPolicy", +static gsi::QFlagsClass decl_QComboBox_InsertPolicy_Enums ("QtGui", "QComboBox_QFlags_InsertPolicy", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QComboBox_InsertPolicy_Enum_in_parent (decl_QComboBox_InsertPolicy_Enum.defs ()); -static gsi::ClassExt decl_QComboBox_InsertPolicy_Enum_as_child (decl_QComboBox_InsertPolicy_Enum, "InsertPolicy"); -static gsi::ClassExt decl_QComboBox_InsertPolicy_Enums_as_child (decl_QComboBox_InsertPolicy_Enums, "QFlags_InsertPolicy"); +static gsi::ClassExt decl_QComboBox_InsertPolicy_Enum_as_child (decl_QComboBox_InsertPolicy_Enum, "QtGui", "InsertPolicy"); +static gsi::ClassExt decl_QComboBox_InsertPolicy_Enums_as_child (decl_QComboBox_InsertPolicy_Enums, "QtGui", "QFlags_InsertPolicy"); } @@ -4035,20 +4035,20 @@ static gsi::ClassExt decl_QComboBox_InsertPolicy_Enums_as_child (decl namespace qt_gsi { -static gsi::Enum decl_QComboBox_SizeAdjustPolicy_Enum ("QComboBox_SizeAdjustPolicy", +static gsi::Enum decl_QComboBox_SizeAdjustPolicy_Enum ("QtGui", "QComboBox_SizeAdjustPolicy", gsi::enum_const ("AdjustToContents", QComboBox::AdjustToContents, "@brief Enum constant QComboBox::AdjustToContents") + gsi::enum_const ("AdjustToContentsOnFirstShow", QComboBox::AdjustToContentsOnFirstShow, "@brief Enum constant QComboBox::AdjustToContentsOnFirstShow") + gsi::enum_const ("AdjustToMinimumContentsLength", QComboBox::AdjustToMinimumContentsLength, "@brief Enum constant QComboBox::AdjustToMinimumContentsLength") + gsi::enum_const ("AdjustToMinimumContentsLengthWithIcon", QComboBox::AdjustToMinimumContentsLengthWithIcon, "@brief Enum constant QComboBox::AdjustToMinimumContentsLengthWithIcon"), "@qt\n@brief This class represents the QComboBox::SizeAdjustPolicy enum"); -static gsi::QFlagsClass decl_QComboBox_SizeAdjustPolicy_Enums ("QComboBox_QFlags_SizeAdjustPolicy", +static gsi::QFlagsClass decl_QComboBox_SizeAdjustPolicy_Enums ("QtGui", "QComboBox_QFlags_SizeAdjustPolicy", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QComboBox_SizeAdjustPolicy_Enum_in_parent (decl_QComboBox_SizeAdjustPolicy_Enum.defs ()); -static gsi::ClassExt decl_QComboBox_SizeAdjustPolicy_Enum_as_child (decl_QComboBox_SizeAdjustPolicy_Enum, "SizeAdjustPolicy"); -static gsi::ClassExt decl_QComboBox_SizeAdjustPolicy_Enums_as_child (decl_QComboBox_SizeAdjustPolicy_Enums, "QFlags_SizeAdjustPolicy"); +static gsi::ClassExt decl_QComboBox_SizeAdjustPolicy_Enum_as_child (decl_QComboBox_SizeAdjustPolicy_Enum, "QtGui", "SizeAdjustPolicy"); +static gsi::ClassExt decl_QComboBox_SizeAdjustPolicy_Enums_as_child (decl_QComboBox_SizeAdjustPolicy_Enums, "QtGui", "QFlags_SizeAdjustPolicy"); } diff --git a/src/gsiqt4/gsiDeclQCommandLinkButton.cc b/src/gsiqt/qt4/QtGui/gsiDeclQCommandLinkButton.cc similarity index 99% rename from src/gsiqt4/gsiDeclQCommandLinkButton.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQCommandLinkButton.cc index 17266af85..f812da124 100644 --- a/src/gsiqt4/gsiDeclQCommandLinkButton.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQCommandLinkButton.cc @@ -80,8 +80,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -252,11 +252,11 @@ static gsi::Methods methods_QCommandLinkButton () { gsi::Class &qtdecl_QPushButton (); -qt_gsi::QtNativeClass decl_QCommandLinkButton (qtdecl_QPushButton (), "QCommandLinkButton_Native", +qt_gsi::QtNativeClass decl_QCommandLinkButton (qtdecl_QPushButton (), "QtGui", "QCommandLinkButton_Native", methods_QCommandLinkButton (), "@hide\n@alias QCommandLinkButton"); -GSIQT_PUBLIC gsi::Class &qtdecl_QCommandLinkButton () { return decl_QCommandLinkButton; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QCommandLinkButton () { return decl_QCommandLinkButton; } } @@ -2762,7 +2762,7 @@ static gsi::Methods methods_QCommandLinkButton_Adaptor () { return methods; } -gsi::Class decl_QCommandLinkButton_Adaptor (qtdecl_QCommandLinkButton (), "QCommandLinkButton", +gsi::Class decl_QCommandLinkButton_Adaptor (qtdecl_QCommandLinkButton (), "QtGui", "QCommandLinkButton", methods_QCommandLinkButton_Adaptor (), "@qt\n@brief Binding of QCommandLinkButton"); diff --git a/src/gsiqt4/gsiDeclQCommonStyle.cc b/src/gsiqt/qt4/QtGui/gsiDeclQCommonStyle.cc similarity index 99% rename from src/gsiqt4/gsiDeclQCommonStyle.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQCommonStyle.cc index 689e9c00a..9b218b7a5 100644 --- a/src/gsiqt4/gsiDeclQCommonStyle.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQCommonStyle.cc @@ -48,8 +48,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -593,11 +593,11 @@ static gsi::Methods methods_QCommonStyle () { gsi::Class &qtdecl_QStyle (); -qt_gsi::QtNativeClass decl_QCommonStyle (qtdecl_QStyle (), "QCommonStyle_Native", +qt_gsi::QtNativeClass decl_QCommonStyle (qtdecl_QStyle (), "QtGui", "QCommonStyle_Native", methods_QCommonStyle (), "@hide\n@alias QCommonStyle"); -GSIQT_PUBLIC gsi::Class &qtdecl_QCommonStyle () { return decl_QCommonStyle; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QCommonStyle () { return decl_QCommonStyle; } } @@ -2030,7 +2030,7 @@ static gsi::Methods methods_QCommonStyle_Adaptor () { return methods; } -gsi::Class decl_QCommonStyle_Adaptor (qtdecl_QCommonStyle (), "QCommonStyle", +gsi::Class decl_QCommonStyle_Adaptor (qtdecl_QCommonStyle (), "QtGui", "QCommonStyle", methods_QCommonStyle_Adaptor (), "@qt\n@brief Binding of QCommonStyle"); diff --git a/src/gsiqt4/gsiDeclQCompleter.cc b/src/gsiqt/qt4/QtGui/gsiDeclQCompleter.cc similarity index 98% rename from src/gsiqt4/gsiDeclQCompleter.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQCompleter.cc index f8c98d476..7a6ff5b63 100644 --- a/src/gsiqt4/gsiDeclQCompleter.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQCompleter.cc @@ -39,8 +39,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -741,11 +741,11 @@ static gsi::Methods methods_QCompleter () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QCompleter (qtdecl_QObject (), "QCompleter_Native", +qt_gsi::QtNativeClass decl_QCompleter (qtdecl_QObject (), "QtGui", "QCompleter_Native", methods_QCompleter (), "@hide\n@alias QCompleter"); -GSIQT_PUBLIC gsi::Class &qtdecl_QCompleter () { return decl_QCompleter; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QCompleter () { return decl_QCompleter; } } @@ -1373,7 +1373,7 @@ static gsi::Methods methods_QCompleter_Adaptor () { return methods; } -gsi::Class decl_QCompleter_Adaptor (qtdecl_QCompleter (), "QCompleter", +gsi::Class decl_QCompleter_Adaptor (qtdecl_QCompleter (), "QtGui", "QCompleter", methods_QCompleter_Adaptor (), "@qt\n@brief Binding of QCompleter"); @@ -1384,19 +1384,19 @@ gsi::Class decl_QCompleter_Adaptor (qtdecl_QCompleter (), "Q namespace qt_gsi { -static gsi::Enum decl_QCompleter_CompletionMode_Enum ("QCompleter_CompletionMode", +static gsi::Enum decl_QCompleter_CompletionMode_Enum ("QtGui", "QCompleter_CompletionMode", gsi::enum_const ("PopupCompletion", QCompleter::PopupCompletion, "@brief Enum constant QCompleter::PopupCompletion") + gsi::enum_const ("UnfilteredPopupCompletion", QCompleter::UnfilteredPopupCompletion, "@brief Enum constant QCompleter::UnfilteredPopupCompletion") + gsi::enum_const ("InlineCompletion", QCompleter::InlineCompletion, "@brief Enum constant QCompleter::InlineCompletion"), "@qt\n@brief This class represents the QCompleter::CompletionMode enum"); -static gsi::QFlagsClass decl_QCompleter_CompletionMode_Enums ("QCompleter_QFlags_CompletionMode", +static gsi::QFlagsClass decl_QCompleter_CompletionMode_Enums ("QtGui", "QCompleter_QFlags_CompletionMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QCompleter_CompletionMode_Enum_in_parent (decl_QCompleter_CompletionMode_Enum.defs ()); -static gsi::ClassExt decl_QCompleter_CompletionMode_Enum_as_child (decl_QCompleter_CompletionMode_Enum, "CompletionMode"); -static gsi::ClassExt decl_QCompleter_CompletionMode_Enums_as_child (decl_QCompleter_CompletionMode_Enums, "QFlags_CompletionMode"); +static gsi::ClassExt decl_QCompleter_CompletionMode_Enum_as_child (decl_QCompleter_CompletionMode_Enum, "QtGui", "CompletionMode"); +static gsi::ClassExt decl_QCompleter_CompletionMode_Enums_as_child (decl_QCompleter_CompletionMode_Enums, "QtGui", "QFlags_CompletionMode"); } @@ -1405,19 +1405,19 @@ static gsi::ClassExt decl_QCompleter_CompletionMode_Enums_as_child ( namespace qt_gsi { -static gsi::Enum decl_QCompleter_ModelSorting_Enum ("QCompleter_ModelSorting", +static gsi::Enum decl_QCompleter_ModelSorting_Enum ("QtGui", "QCompleter_ModelSorting", gsi::enum_const ("UnsortedModel", QCompleter::UnsortedModel, "@brief Enum constant QCompleter::UnsortedModel") + gsi::enum_const ("CaseSensitivelySortedModel", QCompleter::CaseSensitivelySortedModel, "@brief Enum constant QCompleter::CaseSensitivelySortedModel") + gsi::enum_const ("CaseInsensitivelySortedModel", QCompleter::CaseInsensitivelySortedModel, "@brief Enum constant QCompleter::CaseInsensitivelySortedModel"), "@qt\n@brief This class represents the QCompleter::ModelSorting enum"); -static gsi::QFlagsClass decl_QCompleter_ModelSorting_Enums ("QCompleter_QFlags_ModelSorting", +static gsi::QFlagsClass decl_QCompleter_ModelSorting_Enums ("QtGui", "QCompleter_QFlags_ModelSorting", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QCompleter_ModelSorting_Enum_in_parent (decl_QCompleter_ModelSorting_Enum.defs ()); -static gsi::ClassExt decl_QCompleter_ModelSorting_Enum_as_child (decl_QCompleter_ModelSorting_Enum, "ModelSorting"); -static gsi::ClassExt decl_QCompleter_ModelSorting_Enums_as_child (decl_QCompleter_ModelSorting_Enums, "QFlags_ModelSorting"); +static gsi::ClassExt decl_QCompleter_ModelSorting_Enum_as_child (decl_QCompleter_ModelSorting_Enum, "QtGui", "ModelSorting"); +static gsi::ClassExt decl_QCompleter_ModelSorting_Enums_as_child (decl_QCompleter_ModelSorting_Enums, "QtGui", "QFlags_ModelSorting"); } diff --git a/src/gsiqt4/gsiDeclQConicalGradient.cc b/src/gsiqt/qt4/QtGui/gsiDeclQConicalGradient.cc similarity index 97% rename from src/gsiqt4/gsiDeclQConicalGradient.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQConicalGradient.cc index 035506511..c1e320a2d 100644 --- a/src/gsiqt4/gsiDeclQConicalGradient.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQConicalGradient.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -213,12 +213,12 @@ static gsi::Methods methods_QConicalGradient () { gsi::Class &qtdecl_QGradient (); -gsi::Class decl_QConicalGradient (qtdecl_QGradient (), "QConicalGradient", +gsi::Class decl_QConicalGradient (qtdecl_QGradient (), "QtGui", "QConicalGradient", methods_QConicalGradient (), "@qt\n@brief Binding of QConicalGradient"); -GSIQT_PUBLIC gsi::Class &qtdecl_QConicalGradient () { return decl_QConicalGradient; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QConicalGradient () { return decl_QConicalGradient; } } diff --git a/src/gsiqt4/gsiDeclQContextMenuEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQContextMenuEvent.cc similarity index 95% rename from src/gsiqt4/gsiDeclQContextMenuEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQContextMenuEvent.cc index 9cca81076..49eb514de 100644 --- a/src/gsiqt4/gsiDeclQContextMenuEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQContextMenuEvent.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -159,11 +159,11 @@ static gsi::Methods methods_QContextMenuEvent () { gsi::Class &qtdecl_QInputEvent (); -gsi::Class decl_QContextMenuEvent (qtdecl_QInputEvent (), "QContextMenuEvent_Native", +gsi::Class decl_QContextMenuEvent (qtdecl_QInputEvent (), "QtGui", "QContextMenuEvent_Native", methods_QContextMenuEvent (), "@hide\n@alias QContextMenuEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QContextMenuEvent () { return decl_QContextMenuEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QContextMenuEvent () { return decl_QContextMenuEvent; } } @@ -282,7 +282,7 @@ static gsi::Methods methods_QContextMenuEvent_Adaptor () { return methods; } -gsi::Class decl_QContextMenuEvent_Adaptor (qtdecl_QContextMenuEvent (), "QContextMenuEvent", +gsi::Class decl_QContextMenuEvent_Adaptor (qtdecl_QContextMenuEvent (), "QtGui", "QContextMenuEvent", methods_QContextMenuEvent_Adaptor (), "@qt\n@brief Binding of QContextMenuEvent"); @@ -293,19 +293,19 @@ gsi::Class decl_QContextMenuEvent_Adaptor (qtdecl_QCo namespace qt_gsi { -static gsi::Enum decl_QContextMenuEvent_Reason_Enum ("QContextMenuEvent_Reason", +static gsi::Enum decl_QContextMenuEvent_Reason_Enum ("QtGui", "QContextMenuEvent_Reason", gsi::enum_const ("Mouse", QContextMenuEvent::Mouse, "@brief Enum constant QContextMenuEvent::Mouse") + gsi::enum_const ("Keyboard", QContextMenuEvent::Keyboard, "@brief Enum constant QContextMenuEvent::Keyboard") + gsi::enum_const ("Other", QContextMenuEvent::Other, "@brief Enum constant QContextMenuEvent::Other"), "@qt\n@brief This class represents the QContextMenuEvent::Reason enum"); -static gsi::QFlagsClass decl_QContextMenuEvent_Reason_Enums ("QContextMenuEvent_QFlags_Reason", +static gsi::QFlagsClass decl_QContextMenuEvent_Reason_Enums ("QtGui", "QContextMenuEvent_QFlags_Reason", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QContextMenuEvent_Reason_Enum_in_parent (decl_QContextMenuEvent_Reason_Enum.defs ()); -static gsi::ClassExt decl_QContextMenuEvent_Reason_Enum_as_child (decl_QContextMenuEvent_Reason_Enum, "Reason"); -static gsi::ClassExt decl_QContextMenuEvent_Reason_Enums_as_child (decl_QContextMenuEvent_Reason_Enums, "QFlags_Reason"); +static gsi::ClassExt decl_QContextMenuEvent_Reason_Enum_as_child (decl_QContextMenuEvent_Reason_Enum, "QtGui", "Reason"); +static gsi::ClassExt decl_QContextMenuEvent_Reason_Enums_as_child (decl_QContextMenuEvent_Reason_Enums, "QtGui", "QFlags_Reason"); } diff --git a/src/gsiqt4/gsiDeclQCursor.cc b/src/gsiqt/qt4/QtGui/gsiDeclQCursor.cc similarity index 98% rename from src/gsiqt4/gsiDeclQCursor.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQCursor.cc index 887256ade..225573e15 100644 --- a/src/gsiqt4/gsiDeclQCursor.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQCursor.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -356,12 +356,12 @@ static gsi::Methods methods_QCursor () { return methods; } -gsi::Class decl_QCursor ("QCursor", +gsi::Class decl_QCursor ("QtGui", "QCursor", methods_QCursor (), "@qt\n@brief Binding of QCursor"); -GSIQT_PUBLIC gsi::Class &qtdecl_QCursor () { return decl_QCursor; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QCursor () { return decl_QCursor; } } diff --git a/src/gsiqt4/gsiDeclQDataWidgetMapper.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDataWidgetMapper.cc similarity index 98% rename from src/gsiqt4/gsiDeclQDataWidgetMapper.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQDataWidgetMapper.cc index f6109fed1..c8ea7082e 100644 --- a/src/gsiqt4/gsiDeclQDataWidgetMapper.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQDataWidgetMapper.cc @@ -38,8 +38,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -662,11 +662,11 @@ static gsi::Methods methods_QDataWidgetMapper () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QDataWidgetMapper (qtdecl_QObject (), "QDataWidgetMapper_Native", +qt_gsi::QtNativeClass decl_QDataWidgetMapper (qtdecl_QObject (), "QtGui", "QDataWidgetMapper_Native", methods_QDataWidgetMapper (), "@hide\n@alias QDataWidgetMapper"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDataWidgetMapper () { return decl_QDataWidgetMapper; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDataWidgetMapper () { return decl_QDataWidgetMapper; } } @@ -1111,7 +1111,7 @@ static gsi::Methods methods_QDataWidgetMapper_Adaptor () { return methods; } -gsi::Class decl_QDataWidgetMapper_Adaptor (qtdecl_QDataWidgetMapper (), "QDataWidgetMapper", +gsi::Class decl_QDataWidgetMapper_Adaptor (qtdecl_QDataWidgetMapper (), "QtGui", "QDataWidgetMapper", methods_QDataWidgetMapper_Adaptor (), "@qt\n@brief Binding of QDataWidgetMapper"); @@ -1122,18 +1122,18 @@ gsi::Class decl_QDataWidgetMapper_Adaptor (qtdecl_QDa namespace qt_gsi { -static gsi::Enum decl_QDataWidgetMapper_SubmitPolicy_Enum ("QDataWidgetMapper_SubmitPolicy", +static gsi::Enum decl_QDataWidgetMapper_SubmitPolicy_Enum ("QtGui", "QDataWidgetMapper_SubmitPolicy", gsi::enum_const ("AutoSubmit", QDataWidgetMapper::AutoSubmit, "@brief Enum constant QDataWidgetMapper::AutoSubmit") + gsi::enum_const ("ManualSubmit", QDataWidgetMapper::ManualSubmit, "@brief Enum constant QDataWidgetMapper::ManualSubmit"), "@qt\n@brief This class represents the QDataWidgetMapper::SubmitPolicy enum"); -static gsi::QFlagsClass decl_QDataWidgetMapper_SubmitPolicy_Enums ("QDataWidgetMapper_QFlags_SubmitPolicy", +static gsi::QFlagsClass decl_QDataWidgetMapper_SubmitPolicy_Enums ("QtGui", "QDataWidgetMapper_QFlags_SubmitPolicy", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QDataWidgetMapper_SubmitPolicy_Enum_in_parent (decl_QDataWidgetMapper_SubmitPolicy_Enum.defs ()); -static gsi::ClassExt decl_QDataWidgetMapper_SubmitPolicy_Enum_as_child (decl_QDataWidgetMapper_SubmitPolicy_Enum, "SubmitPolicy"); -static gsi::ClassExt decl_QDataWidgetMapper_SubmitPolicy_Enums_as_child (decl_QDataWidgetMapper_SubmitPolicy_Enums, "QFlags_SubmitPolicy"); +static gsi::ClassExt decl_QDataWidgetMapper_SubmitPolicy_Enum_as_child (decl_QDataWidgetMapper_SubmitPolicy_Enum, "QtGui", "SubmitPolicy"); +static gsi::ClassExt decl_QDataWidgetMapper_SubmitPolicy_Enums_as_child (decl_QDataWidgetMapper_SubmitPolicy_Enums, "QtGui", "QFlags_SubmitPolicy"); } diff --git a/src/gsiqt4/gsiDeclQDateEdit.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDateEdit.cc similarity index 99% rename from src/gsiqt4/gsiDeclQDateEdit.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQDateEdit.cc index 56b0e9431..a9f6de355 100644 --- a/src/gsiqt4/gsiDeclQDateEdit.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQDateEdit.cc @@ -83,8 +83,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -218,11 +218,11 @@ static gsi::Methods methods_QDateEdit () { gsi::Class &qtdecl_QDateTimeEdit (); -qt_gsi::QtNativeClass decl_QDateEdit (qtdecl_QDateTimeEdit (), "QDateEdit_Native", +qt_gsi::QtNativeClass decl_QDateEdit (qtdecl_QDateTimeEdit (), "QtGui", "QDateEdit_Native", methods_QDateEdit (), "@hide\n@alias QDateEdit"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDateEdit () { return decl_QDateEdit; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDateEdit () { return decl_QDateEdit; } } @@ -2908,7 +2908,7 @@ static gsi::Methods methods_QDateEdit_Adaptor () { return methods; } -gsi::Class decl_QDateEdit_Adaptor (qtdecl_QDateEdit (), "QDateEdit", +gsi::Class decl_QDateEdit_Adaptor (qtdecl_QDateEdit (), "QtGui", "QDateEdit", methods_QDateEdit_Adaptor (), "@qt\n@brief Binding of QDateEdit"); diff --git a/src/gsiqt4/gsiDeclQDateTimeEdit.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDateTimeEdit.cc similarity index 99% rename from src/gsiqt4/gsiDeclQDateTimeEdit.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQDateTimeEdit.cc index 0b4e08f9f..332d3b894 100644 --- a/src/gsiqt4/gsiDeclQDateTimeEdit.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQDateTimeEdit.cc @@ -83,8 +83,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1114,11 +1114,11 @@ static gsi::Methods methods_QDateTimeEdit () { gsi::Class &qtdecl_QAbstractSpinBox (); -qt_gsi::QtNativeClass decl_QDateTimeEdit (qtdecl_QAbstractSpinBox (), "QDateTimeEdit_Native", +qt_gsi::QtNativeClass decl_QDateTimeEdit (qtdecl_QAbstractSpinBox (), "QtGui", "QDateTimeEdit_Native", methods_QDateTimeEdit (), "@hide\n@alias QDateTimeEdit"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDateTimeEdit () { return decl_QDateTimeEdit; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDateTimeEdit () { return decl_QDateTimeEdit; } } @@ -3872,7 +3872,7 @@ static gsi::Methods methods_QDateTimeEdit_Adaptor () { return methods; } -gsi::Class decl_QDateTimeEdit_Adaptor (qtdecl_QDateTimeEdit (), "QDateTimeEdit", +gsi::Class decl_QDateTimeEdit_Adaptor (qtdecl_QDateTimeEdit (), "QtGui", "QDateTimeEdit", methods_QDateTimeEdit_Adaptor (), "@qt\n@brief Binding of QDateTimeEdit"); @@ -3883,7 +3883,7 @@ gsi::Class decl_QDateTimeEdit_Adaptor (qtdecl_QDateTimeEd namespace qt_gsi { -static gsi::Enum decl_QDateTimeEdit_Section_Enum ("QDateTimeEdit_Section", +static gsi::Enum decl_QDateTimeEdit_Section_Enum ("QtGui", "QDateTimeEdit_Section", gsi::enum_const ("NoSection", QDateTimeEdit::NoSection, "@brief Enum constant QDateTimeEdit::NoSection") + gsi::enum_const ("AmPmSection", QDateTimeEdit::AmPmSection, "@brief Enum constant QDateTimeEdit::AmPmSection") + gsi::enum_const ("MSecSection", QDateTimeEdit::MSecSection, "@brief Enum constant QDateTimeEdit::MSecSection") + @@ -3897,13 +3897,13 @@ static gsi::Enum decl_QDateTimeEdit_Section_Enum ("QDate gsi::enum_const ("DateSections_Mask", QDateTimeEdit::DateSections_Mask, "@brief Enum constant QDateTimeEdit::DateSections_Mask"), "@qt\n@brief This class represents the QDateTimeEdit::Section enum"); -static gsi::QFlagsClass decl_QDateTimeEdit_Section_Enums ("QDateTimeEdit_QFlags_Section", +static gsi::QFlagsClass decl_QDateTimeEdit_Section_Enums ("QtGui", "QDateTimeEdit_QFlags_Section", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QDateTimeEdit_Section_Enum_in_parent (decl_QDateTimeEdit_Section_Enum.defs ()); -static gsi::ClassExt decl_QDateTimeEdit_Section_Enum_as_child (decl_QDateTimeEdit_Section_Enum, "Section"); -static gsi::ClassExt decl_QDateTimeEdit_Section_Enums_as_child (decl_QDateTimeEdit_Section_Enums, "QFlags_Section"); +static gsi::ClassExt decl_QDateTimeEdit_Section_Enum_as_child (decl_QDateTimeEdit_Section_Enum, "QtGui", "Section"); +static gsi::ClassExt decl_QDateTimeEdit_Section_Enums_as_child (decl_QDateTimeEdit_Section_Enums, "QtGui", "QFlags_Section"); } diff --git a/src/gsiqt4/gsiDeclQDesktopServices.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDesktopServices.cc similarity index 94% rename from src/gsiqt4/gsiDeclQDesktopServices.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQDesktopServices.cc index a64c959bf..fc8a102b7 100644 --- a/src/gsiqt4/gsiDeclQDesktopServices.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQDesktopServices.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -171,12 +171,12 @@ static gsi::Methods methods_QDesktopServices () { return methods; } -gsi::Class decl_QDesktopServices ("QDesktopServices", +gsi::Class decl_QDesktopServices ("QtGui", "QDesktopServices", methods_QDesktopServices (), "@qt\n@brief Binding of QDesktopServices"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDesktopServices () { return decl_QDesktopServices; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDesktopServices () { return decl_QDesktopServices; } } @@ -185,7 +185,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QDesktopServices () { return d namespace qt_gsi { -static gsi::Enum decl_QDesktopServices_StandardLocation_Enum ("QDesktopServices_StandardLocation", +static gsi::Enum decl_QDesktopServices_StandardLocation_Enum ("QtGui", "QDesktopServices_StandardLocation", gsi::enum_const ("DesktopLocation", QDesktopServices::DesktopLocation, "@brief Enum constant QDesktopServices::DesktopLocation") + gsi::enum_const ("DocumentsLocation", QDesktopServices::DocumentsLocation, "@brief Enum constant QDesktopServices::DocumentsLocation") + gsi::enum_const ("FontsLocation", QDesktopServices::FontsLocation, "@brief Enum constant QDesktopServices::FontsLocation") + @@ -199,13 +199,13 @@ static gsi::Enum decl_QDesktopServices_Stand gsi::enum_const ("CacheLocation", QDesktopServices::CacheLocation, "@brief Enum constant QDesktopServices::CacheLocation"), "@qt\n@brief This class represents the QDesktopServices::StandardLocation enum"); -static gsi::QFlagsClass decl_QDesktopServices_StandardLocation_Enums ("QDesktopServices_QFlags_StandardLocation", +static gsi::QFlagsClass decl_QDesktopServices_StandardLocation_Enums ("QtGui", "QDesktopServices_QFlags_StandardLocation", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QDesktopServices_StandardLocation_Enum_in_parent (decl_QDesktopServices_StandardLocation_Enum.defs ()); -static gsi::ClassExt decl_QDesktopServices_StandardLocation_Enum_as_child (decl_QDesktopServices_StandardLocation_Enum, "StandardLocation"); -static gsi::ClassExt decl_QDesktopServices_StandardLocation_Enums_as_child (decl_QDesktopServices_StandardLocation_Enums, "QFlags_StandardLocation"); +static gsi::ClassExt decl_QDesktopServices_StandardLocation_Enum_as_child (decl_QDesktopServices_StandardLocation_Enum, "QtGui", "StandardLocation"); +static gsi::ClassExt decl_QDesktopServices_StandardLocation_Enums_as_child (decl_QDesktopServices_StandardLocation_Enums, "QtGui", "QFlags_StandardLocation"); } diff --git a/src/gsiqt4/gsiDeclQDesktopWidget.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDesktopWidget.cc similarity index 99% rename from src/gsiqt4/gsiDeclQDesktopWidget.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQDesktopWidget.cc index 39c6cd35a..e2d86f057 100644 --- a/src/gsiqt4/gsiDeclQDesktopWidget.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQDesktopWidget.cc @@ -77,8 +77,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -455,11 +455,11 @@ static gsi::Methods methods_QDesktopWidget () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QDesktopWidget (qtdecl_QWidget (), "QDesktopWidget_Native", +qt_gsi::QtNativeClass decl_QDesktopWidget (qtdecl_QWidget (), "QtGui", "QDesktopWidget_Native", methods_QDesktopWidget (), "@hide\n@alias QDesktopWidget"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDesktopWidget () { return decl_QDesktopWidget; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDesktopWidget () { return decl_QDesktopWidget; } } @@ -2725,7 +2725,7 @@ static gsi::Methods methods_QDesktopWidget_Adaptor () { return methods; } -gsi::Class decl_QDesktopWidget_Adaptor (qtdecl_QDesktopWidget (), "QDesktopWidget", +gsi::Class decl_QDesktopWidget_Adaptor (qtdecl_QDesktopWidget (), "QtGui", "QDesktopWidget", methods_QDesktopWidget_Adaptor (), "@qt\n@brief Binding of QDesktopWidget"); diff --git a/src/gsiqt4/gsiDeclQDial.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDial.cc similarity index 99% rename from src/gsiqt4/gsiDeclQDial.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQDial.cc index 178feb7af..066db1dc7 100644 --- a/src/gsiqt4/gsiDeclQDial.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQDial.cc @@ -78,8 +78,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -374,11 +374,11 @@ static gsi::Methods methods_QDial () { gsi::Class &qtdecl_QAbstractSlider (); -qt_gsi::QtNativeClass decl_QDial (qtdecl_QAbstractSlider (), "QDial_Native", +qt_gsi::QtNativeClass decl_QDial (qtdecl_QAbstractSlider (), "QtGui", "QDial_Native", methods_QDial (), "@hide\n@alias QDial"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDial () { return decl_QDial; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDial () { return decl_QDial; } } @@ -2842,7 +2842,7 @@ static gsi::Methods methods_QDial_Adaptor () { return methods; } -gsi::Class decl_QDial_Adaptor (qtdecl_QDial (), "QDial", +gsi::Class decl_QDial_Adaptor (qtdecl_QDial (), "QtGui", "QDial", methods_QDial_Adaptor (), "@qt\n@brief Binding of QDial"); diff --git a/src/gsiqt4/gsiDeclQDialog.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDialog.cc similarity index 99% rename from src/gsiqt4/gsiDeclQDialog.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQDialog.cc index 49ae43fe0..88b60e4e3 100644 --- a/src/gsiqt4/gsiDeclQDialog.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQDialog.cc @@ -77,8 +77,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -542,11 +542,11 @@ static gsi::Methods methods_QDialog () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QDialog (qtdecl_QWidget (), "QDialog_Native", +qt_gsi::QtNativeClass decl_QDialog (qtdecl_QWidget (), "QtGui", "QDialog_Native", methods_QDialog (), "@hide\n@alias QDialog"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDialog () { return decl_QDialog; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDialog () { return decl_QDialog; } } @@ -2966,7 +2966,7 @@ static gsi::Methods methods_QDialog_Adaptor () { return methods; } -gsi::Class decl_QDialog_Adaptor (qtdecl_QDialog (), "QDialog", +gsi::Class decl_QDialog_Adaptor (qtdecl_QDialog (), "QtGui", "QDialog", methods_QDialog_Adaptor (), "@qt\n@brief Binding of QDialog"); diff --git a/src/gsiqt4/gsiDeclQDialogButtonBox.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDialogButtonBox.cc similarity index 99% rename from src/gsiqt4/gsiDeclQDialogButtonBox.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQDialogButtonBox.cc index 46cd68d52..781a426bb 100644 --- a/src/gsiqt4/gsiDeclQDialogButtonBox.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQDialogButtonBox.cc @@ -79,8 +79,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -506,11 +506,11 @@ static gsi::Methods methods_QDialogButtonBox () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QDialogButtonBox (qtdecl_QWidget (), "QDialogButtonBox_Native", +qt_gsi::QtNativeClass decl_QDialogButtonBox (qtdecl_QWidget (), "QtGui", "QDialogButtonBox_Native", methods_QDialogButtonBox (), "@hide\n@alias QDialogButtonBox"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDialogButtonBox () { return decl_QDialogButtonBox; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDialogButtonBox () { return decl_QDialogButtonBox; } } @@ -2876,7 +2876,7 @@ static gsi::Methods methods_QDialogButtonBox_Adaptor () { return methods; } -gsi::Class decl_QDialogButtonBox_Adaptor (qtdecl_QDialogButtonBox (), "QDialogButtonBox", +gsi::Class decl_QDialogButtonBox_Adaptor (qtdecl_QDialogButtonBox (), "QtGui", "QDialogButtonBox", methods_QDialogButtonBox_Adaptor (), "@qt\n@brief Binding of QDialogButtonBox"); @@ -2887,7 +2887,7 @@ gsi::Class decl_QDialogButtonBox_Adaptor (qtdecl_QDial namespace qt_gsi { -static gsi::Enum decl_QDialogButtonBox_ButtonRole_Enum ("QDialogButtonBox_ButtonRole", +static gsi::Enum decl_QDialogButtonBox_ButtonRole_Enum ("QtGui", "QDialogButtonBox_ButtonRole", gsi::enum_const ("InvalidRole", QDialogButtonBox::InvalidRole, "@brief Enum constant QDialogButtonBox::InvalidRole") + gsi::enum_const ("AcceptRole", QDialogButtonBox::AcceptRole, "@brief Enum constant QDialogButtonBox::AcceptRole") + gsi::enum_const ("RejectRole", QDialogButtonBox::RejectRole, "@brief Enum constant QDialogButtonBox::RejectRole") + @@ -2901,13 +2901,13 @@ static gsi::Enum decl_QDialogButtonBox_ButtonRole_ gsi::enum_const ("NRoles", QDialogButtonBox::NRoles, "@brief Enum constant QDialogButtonBox::NRoles"), "@qt\n@brief This class represents the QDialogButtonBox::ButtonRole enum"); -static gsi::QFlagsClass decl_QDialogButtonBox_ButtonRole_Enums ("QDialogButtonBox_QFlags_ButtonRole", +static gsi::QFlagsClass decl_QDialogButtonBox_ButtonRole_Enums ("QtGui", "QDialogButtonBox_QFlags_ButtonRole", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QDialogButtonBox_ButtonRole_Enum_in_parent (decl_QDialogButtonBox_ButtonRole_Enum.defs ()); -static gsi::ClassExt decl_QDialogButtonBox_ButtonRole_Enum_as_child (decl_QDialogButtonBox_ButtonRole_Enum, "ButtonRole"); -static gsi::ClassExt decl_QDialogButtonBox_ButtonRole_Enums_as_child (decl_QDialogButtonBox_ButtonRole_Enums, "QFlags_ButtonRole"); +static gsi::ClassExt decl_QDialogButtonBox_ButtonRole_Enum_as_child (decl_QDialogButtonBox_ButtonRole_Enum, "QtGui", "ButtonRole"); +static gsi::ClassExt decl_QDialogButtonBox_ButtonRole_Enums_as_child (decl_QDialogButtonBox_ButtonRole_Enums, "QtGui", "QFlags_ButtonRole"); } @@ -2916,7 +2916,7 @@ static gsi::ClassExt decl_QDialogButtonBox_ButtonRole_Enums_as namespace qt_gsi { -static gsi::Enum decl_QDialogButtonBox_StandardButton_Enum ("QDialogButtonBox_StandardButton", +static gsi::Enum decl_QDialogButtonBox_StandardButton_Enum ("QtGui", "QDialogButtonBox_StandardButton", gsi::enum_const ("NoButton", QDialogButtonBox::NoButton, "@brief Enum constant QDialogButtonBox::NoButton") + gsi::enum_const ("Ok", QDialogButtonBox::Ok, "@brief Enum constant QDialogButtonBox::Ok") + gsi::enum_const ("Save", QDialogButtonBox::Save, "@brief Enum constant QDialogButtonBox::Save") + @@ -2940,13 +2940,13 @@ static gsi::Enum decl_QDialogButtonBox_Standar gsi::enum_const ("LastButton", QDialogButtonBox::LastButton, "@brief Enum constant QDialogButtonBox::LastButton"), "@qt\n@brief This class represents the QDialogButtonBox::StandardButton enum"); -static gsi::QFlagsClass decl_QDialogButtonBox_StandardButton_Enums ("QDialogButtonBox_QFlags_StandardButton", +static gsi::QFlagsClass decl_QDialogButtonBox_StandardButton_Enums ("QtGui", "QDialogButtonBox_QFlags_StandardButton", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QDialogButtonBox_StandardButton_Enum_in_parent (decl_QDialogButtonBox_StandardButton_Enum.defs ()); -static gsi::ClassExt decl_QDialogButtonBox_StandardButton_Enum_as_child (decl_QDialogButtonBox_StandardButton_Enum, "StandardButton"); -static gsi::ClassExt decl_QDialogButtonBox_StandardButton_Enums_as_child (decl_QDialogButtonBox_StandardButton_Enums, "QFlags_StandardButton"); +static gsi::ClassExt decl_QDialogButtonBox_StandardButton_Enum_as_child (decl_QDialogButtonBox_StandardButton_Enum, "QtGui", "StandardButton"); +static gsi::ClassExt decl_QDialogButtonBox_StandardButton_Enums_as_child (decl_QDialogButtonBox_StandardButton_Enums, "QtGui", "QFlags_StandardButton"); } diff --git a/src/gsiqt4/gsiDeclQDirIterator.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDirIterator.cc similarity index 96% rename from src/gsiqt4/gsiDeclQDirIterator.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQDirIterator.cc index 0b9d80b1e..3f5dc3396 100644 --- a/src/gsiqt4/gsiDeclQDirIterator.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQDirIterator.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -142,11 +142,11 @@ static gsi::Methods methods_QDirIterator () { return methods; } -gsi::Class decl_QDirIterator ("QDirIterator_Native", +gsi::Class decl_QDirIterator ("QtGui", "QDirIterator_Native", methods_QDirIterator (), "@hide\n@alias QDirIterator"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDirIterator () { return decl_QDirIterator; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDirIterator () { return decl_QDirIterator; } } @@ -323,7 +323,7 @@ static gsi::Methods methods_QDirIterator_Adaptor () { return methods; } -gsi::Class decl_QDirIterator_Adaptor (qtdecl_QDirIterator (), "QDirIterator", +gsi::Class decl_QDirIterator_Adaptor (qtdecl_QDirIterator (), "QtGui", "QDirIterator", methods_QDirIterator_Adaptor (), "@qt\n@brief Binding of QDirIterator"); @@ -334,19 +334,19 @@ gsi::Class decl_QDirIterator_Adaptor (qtdecl_QDirIterator namespace qt_gsi { -static gsi::Enum decl_QDirIterator_IteratorFlag_Enum ("QDirIterator_IteratorFlag", +static gsi::Enum decl_QDirIterator_IteratorFlag_Enum ("QtGui", "QDirIterator_IteratorFlag", gsi::enum_const ("NoIteratorFlags", QDirIterator::NoIteratorFlags, "@brief Enum constant QDirIterator::NoIteratorFlags") + gsi::enum_const ("FollowSymlinks", QDirIterator::FollowSymlinks, "@brief Enum constant QDirIterator::FollowSymlinks") + gsi::enum_const ("Subdirectories", QDirIterator::Subdirectories, "@brief Enum constant QDirIterator::Subdirectories"), "@qt\n@brief This class represents the QDirIterator::IteratorFlag enum"); -static gsi::QFlagsClass decl_QDirIterator_IteratorFlag_Enums ("QDirIterator_QFlags_IteratorFlag", +static gsi::QFlagsClass decl_QDirIterator_IteratorFlag_Enums ("QtGui", "QDirIterator_QFlags_IteratorFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QDirIterator_IteratorFlag_Enum_in_parent (decl_QDirIterator_IteratorFlag_Enum.defs ()); -static gsi::ClassExt decl_QDirIterator_IteratorFlag_Enum_as_child (decl_QDirIterator_IteratorFlag_Enum, "IteratorFlag"); -static gsi::ClassExt decl_QDirIterator_IteratorFlag_Enums_as_child (decl_QDirIterator_IteratorFlag_Enums, "QFlags_IteratorFlag"); +static gsi::ClassExt decl_QDirIterator_IteratorFlag_Enum_as_child (decl_QDirIterator_IteratorFlag_Enum, "QtGui", "IteratorFlag"); +static gsi::ClassExt decl_QDirIterator_IteratorFlag_Enums_as_child (decl_QDirIterator_IteratorFlag_Enums, "QtGui", "QFlags_IteratorFlag"); } diff --git a/src/gsiqt4/gsiDeclQDirModel.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDirModel.cc similarity index 99% rename from src/gsiqt4/gsiDeclQDirModel.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQDirModel.cc index 0a538ba7d..6e8141a76 100644 --- a/src/gsiqt4/gsiDeclQDirModel.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQDirModel.cc @@ -41,8 +41,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -966,11 +966,11 @@ static gsi::Methods methods_QDirModel () { gsi::Class &qtdecl_QAbstractItemModel (); -qt_gsi::QtNativeClass decl_QDirModel (qtdecl_QAbstractItemModel (), "QDirModel_Native", +qt_gsi::QtNativeClass decl_QDirModel (qtdecl_QAbstractItemModel (), "QtGui", "QDirModel_Native", methods_QDirModel (), "@hide\n@alias QDirModel"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDirModel () { return decl_QDirModel; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDirModel () { return decl_QDirModel; } } @@ -3345,7 +3345,7 @@ static gsi::Methods methods_QDirModel_Adaptor () { return methods; } -gsi::Class decl_QDirModel_Adaptor (qtdecl_QDirModel (), "QDirModel", +gsi::Class decl_QDirModel_Adaptor (qtdecl_QDirModel (), "QtGui", "QDirModel", methods_QDirModel_Adaptor (), "@qt\n@brief Binding of QDirModel"); diff --git a/src/gsiqt4/gsiDeclQDockWidget.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDockWidget.cc similarity index 99% rename from src/gsiqt4/gsiDeclQDockWidget.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQDockWidget.cc index 15b4a63d8..393d201b9 100644 --- a/src/gsiqt4/gsiDeclQDockWidget.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQDockWidget.cc @@ -78,8 +78,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -435,11 +435,11 @@ static gsi::Methods methods_QDockWidget () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QDockWidget (qtdecl_QWidget (), "QDockWidget_Native", +qt_gsi::QtNativeClass decl_QDockWidget (qtdecl_QWidget (), "QtGui", "QDockWidget_Native", methods_QDockWidget (), "@hide\n@alias QDockWidget"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDockWidget () { return decl_QDockWidget; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDockWidget () { return decl_QDockWidget; } } @@ -2842,7 +2842,7 @@ static gsi::Methods methods_QDockWidget_Adaptor () { return methods; } -gsi::Class decl_QDockWidget_Adaptor (qtdecl_QDockWidget (), "QDockWidget", +gsi::Class decl_QDockWidget_Adaptor (qtdecl_QDockWidget (), "QtGui", "QDockWidget", methods_QDockWidget_Adaptor (), "@qt\n@brief Binding of QDockWidget"); @@ -2853,7 +2853,7 @@ gsi::Class decl_QDockWidget_Adaptor (qtdecl_QDockWidget (), namespace qt_gsi { -static gsi::Enum decl_QDockWidget_DockWidgetFeature_Enum ("QDockWidget_DockWidgetFeature", +static gsi::Enum decl_QDockWidget_DockWidgetFeature_Enum ("QtGui", "QDockWidget_DockWidgetFeature", gsi::enum_const ("DockWidgetClosable", QDockWidget::DockWidgetClosable, "@brief Enum constant QDockWidget::DockWidgetClosable") + gsi::enum_const ("DockWidgetMovable", QDockWidget::DockWidgetMovable, "@brief Enum constant QDockWidget::DockWidgetMovable") + gsi::enum_const ("DockWidgetFloatable", QDockWidget::DockWidgetFloatable, "@brief Enum constant QDockWidget::DockWidgetFloatable") + @@ -2864,13 +2864,13 @@ static gsi::Enum decl_QDockWidget_DockWidgetFeat gsi::enum_const ("Reserved", QDockWidget::Reserved, "@brief Enum constant QDockWidget::Reserved"), "@qt\n@brief This class represents the QDockWidget::DockWidgetFeature enum"); -static gsi::QFlagsClass decl_QDockWidget_DockWidgetFeature_Enums ("QDockWidget_QFlags_DockWidgetFeature", +static gsi::QFlagsClass decl_QDockWidget_DockWidgetFeature_Enums ("QtGui", "QDockWidget_QFlags_DockWidgetFeature", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QDockWidget_DockWidgetFeature_Enum_in_parent (decl_QDockWidget_DockWidgetFeature_Enum.defs ()); -static gsi::ClassExt decl_QDockWidget_DockWidgetFeature_Enum_as_child (decl_QDockWidget_DockWidgetFeature_Enum, "DockWidgetFeature"); -static gsi::ClassExt decl_QDockWidget_DockWidgetFeature_Enums_as_child (decl_QDockWidget_DockWidgetFeature_Enums, "QFlags_DockWidgetFeature"); +static gsi::ClassExt decl_QDockWidget_DockWidgetFeature_Enum_as_child (decl_QDockWidget_DockWidgetFeature_Enum, "QtGui", "DockWidgetFeature"); +static gsi::ClassExt decl_QDockWidget_DockWidgetFeature_Enums_as_child (decl_QDockWidget_DockWidgetFeature_Enums, "QtGui", "QFlags_DockWidgetFeature"); } diff --git a/src/gsiqt4/gsiDeclQDoubleSpinBox.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDoubleSpinBox.cc similarity index 99% rename from src/gsiqt4/gsiDeclQDoubleSpinBox.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQDoubleSpinBox.cc index 74169eb26..72b6aa5cf 100644 --- a/src/gsiqt4/gsiDeclQDoubleSpinBox.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQDoubleSpinBox.cc @@ -79,8 +79,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -596,11 +596,11 @@ static gsi::Methods methods_QDoubleSpinBox () { gsi::Class &qtdecl_QAbstractSpinBox (); -qt_gsi::QtNativeClass decl_QDoubleSpinBox (qtdecl_QAbstractSpinBox (), "QDoubleSpinBox_Native", +qt_gsi::QtNativeClass decl_QDoubleSpinBox (qtdecl_QAbstractSpinBox (), "QtGui", "QDoubleSpinBox_Native", methods_QDoubleSpinBox (), "@hide\n@alias QDoubleSpinBox"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDoubleSpinBox () { return decl_QDoubleSpinBox; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDoubleSpinBox () { return decl_QDoubleSpinBox; } } @@ -3227,7 +3227,7 @@ static gsi::Methods methods_QDoubleSpinBox_Adaptor () { return methods; } -gsi::Class decl_QDoubleSpinBox_Adaptor (qtdecl_QDoubleSpinBox (), "QDoubleSpinBox", +gsi::Class decl_QDoubleSpinBox_Adaptor (qtdecl_QDoubleSpinBox (), "QtGui", "QDoubleSpinBox", methods_QDoubleSpinBox_Adaptor (), "@qt\n@brief Binding of QDoubleSpinBox"); diff --git a/src/gsiqt4/gsiDeclQDoubleValidator.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDoubleValidator.cc similarity index 98% rename from src/gsiqt4/gsiDeclQDoubleValidator.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQDoubleValidator.cc index 881024e10..1003affe6 100644 --- a/src/gsiqt4/gsiDeclQDoubleValidator.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQDoubleValidator.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -363,11 +363,11 @@ static gsi::Methods methods_QDoubleValidator () { gsi::Class &qtdecl_QValidator (); -qt_gsi::QtNativeClass decl_QDoubleValidator (qtdecl_QValidator (), "QDoubleValidator_Native", +qt_gsi::QtNativeClass decl_QDoubleValidator (qtdecl_QValidator (), "QtGui", "QDoubleValidator_Native", methods_QDoubleValidator (), "@hide\n@alias QDoubleValidator"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDoubleValidator () { return decl_QDoubleValidator; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDoubleValidator () { return decl_QDoubleValidator; } } @@ -907,7 +907,7 @@ static gsi::Methods methods_QDoubleValidator_Adaptor () { return methods; } -gsi::Class decl_QDoubleValidator_Adaptor (qtdecl_QDoubleValidator (), "QDoubleValidator", +gsi::Class decl_QDoubleValidator_Adaptor (qtdecl_QDoubleValidator (), "QtGui", "QDoubleValidator", methods_QDoubleValidator_Adaptor (), "@qt\n@brief Binding of QDoubleValidator"); @@ -918,18 +918,18 @@ gsi::Class decl_QDoubleValidator_Adaptor (qtdecl_QDoub namespace qt_gsi { -static gsi::Enum decl_QDoubleValidator_Notation_Enum ("QDoubleValidator_Notation", +static gsi::Enum decl_QDoubleValidator_Notation_Enum ("QtGui", "QDoubleValidator_Notation", gsi::enum_const ("StandardNotation", QDoubleValidator::StandardNotation, "@brief Enum constant QDoubleValidator::StandardNotation") + gsi::enum_const ("ScientificNotation", QDoubleValidator::ScientificNotation, "@brief Enum constant QDoubleValidator::ScientificNotation"), "@qt\n@brief This class represents the QDoubleValidator::Notation enum"); -static gsi::QFlagsClass decl_QDoubleValidator_Notation_Enums ("QDoubleValidator_QFlags_Notation", +static gsi::QFlagsClass decl_QDoubleValidator_Notation_Enums ("QtGui", "QDoubleValidator_QFlags_Notation", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QDoubleValidator_Notation_Enum_in_parent (decl_QDoubleValidator_Notation_Enum.defs ()); -static gsi::ClassExt decl_QDoubleValidator_Notation_Enum_as_child (decl_QDoubleValidator_Notation_Enum, "Notation"); -static gsi::ClassExt decl_QDoubleValidator_Notation_Enums_as_child (decl_QDoubleValidator_Notation_Enums, "QFlags_Notation"); +static gsi::ClassExt decl_QDoubleValidator_Notation_Enum_as_child (decl_QDoubleValidator_Notation_Enum, "QtGui", "Notation"); +static gsi::ClassExt decl_QDoubleValidator_Notation_Enums_as_child (decl_QDoubleValidator_Notation_Enums, "QtGui", "QFlags_Notation"); } diff --git a/src/gsiqt4/gsiDeclQDrag.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDrag.cc similarity index 99% rename from src/gsiqt4/gsiDeclQDrag.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQDrag.cc index b817ad566..f34bc5cf2 100644 --- a/src/gsiqt4/gsiDeclQDrag.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQDrag.cc @@ -38,8 +38,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -400,11 +400,11 @@ static gsi::Methods methods_QDrag () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QDrag (qtdecl_QObject (), "QDrag_Native", +qt_gsi::QtNativeClass decl_QDrag (qtdecl_QObject (), "QtGui", "QDrag_Native", methods_QDrag (), "@hide\n@alias QDrag"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDrag () { return decl_QDrag; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDrag () { return decl_QDrag; } } @@ -826,7 +826,7 @@ static gsi::Methods methods_QDrag_Adaptor () { return methods; } -gsi::Class decl_QDrag_Adaptor (qtdecl_QDrag (), "QDrag", +gsi::Class decl_QDrag_Adaptor (qtdecl_QDrag (), "QtGui", "QDrag", methods_QDrag_Adaptor (), "@qt\n@brief Binding of QDrag"); diff --git a/src/gsiqt4/gsiDeclQDragEnterEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDragEnterEvent.cc similarity index 97% rename from src/gsiqt4/gsiDeclQDragEnterEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQDragEnterEvent.cc index e602475f8..3636a9b34 100644 --- a/src/gsiqt4/gsiDeclQDragEnterEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQDragEnterEvent.cc @@ -33,8 +33,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -50,11 +50,11 @@ static gsi::Methods methods_QDragEnterEvent () { gsi::Class &qtdecl_QDragMoveEvent (); -gsi::Class decl_QDragEnterEvent (qtdecl_QDragMoveEvent (), "QDragEnterEvent_Native", +gsi::Class decl_QDragEnterEvent (qtdecl_QDragMoveEvent (), "QtGui", "QDragEnterEvent_Native", methods_QDragEnterEvent (), "@hide\n@alias QDragEnterEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDragEnterEvent () { return decl_QDragEnterEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDragEnterEvent () { return decl_QDragEnterEvent; } } @@ -239,7 +239,7 @@ static gsi::Methods methods_QDragEnterEvent_Adaptor () { return methods; } -gsi::Class decl_QDragEnterEvent_Adaptor (qtdecl_QDragEnterEvent (), "QDragEnterEvent", +gsi::Class decl_QDragEnterEvent_Adaptor (qtdecl_QDragEnterEvent (), "QtGui", "QDragEnterEvent", methods_QDragEnterEvent_Adaptor (), "@qt\n@brief Binding of QDragEnterEvent"); diff --git a/src/gsiqt4/gsiDeclQDragLeaveEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDragLeaveEvent.cc similarity index 91% rename from src/gsiqt4/gsiDeclQDragLeaveEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQDragLeaveEvent.cc index a333862ae..b87c6aec0 100644 --- a/src/gsiqt4/gsiDeclQDragLeaveEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQDragLeaveEvent.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -46,11 +46,11 @@ static gsi::Methods methods_QDragLeaveEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QDragLeaveEvent (qtdecl_QEvent (), "QDragLeaveEvent_Native", +gsi::Class decl_QDragLeaveEvent (qtdecl_QEvent (), "QtGui", "QDragLeaveEvent_Native", methods_QDragLeaveEvent (), "@hide\n@alias QDragLeaveEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDragLeaveEvent () { return decl_QDragLeaveEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDragLeaveEvent () { return decl_QDragLeaveEvent; } } @@ -97,7 +97,7 @@ static gsi::Methods methods_QDragLeaveEvent_Adaptor () { return methods; } -gsi::Class decl_QDragLeaveEvent_Adaptor (qtdecl_QDragLeaveEvent (), "QDragLeaveEvent", +gsi::Class decl_QDragLeaveEvent_Adaptor (qtdecl_QDragLeaveEvent (), "QtGui", "QDragLeaveEvent", methods_QDragLeaveEvent_Adaptor (), "@qt\n@brief Binding of QDragLeaveEvent"); diff --git a/src/gsiqt4/gsiDeclQDragMoveEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDragMoveEvent.cc similarity index 98% rename from src/gsiqt4/gsiDeclQDragMoveEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQDragMoveEvent.cc index 813db097f..ed00b11c8 100644 --- a/src/gsiqt4/gsiDeclQDragMoveEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQDragMoveEvent.cc @@ -33,8 +33,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -142,11 +142,11 @@ static gsi::Methods methods_QDragMoveEvent () { gsi::Class &qtdecl_QDropEvent (); -gsi::Class decl_QDragMoveEvent (qtdecl_QDropEvent (), "QDragMoveEvent_Native", +gsi::Class decl_QDragMoveEvent (qtdecl_QDropEvent (), "QtGui", "QDragMoveEvent_Native", methods_QDragMoveEvent (), "@hide\n@alias QDragMoveEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDragMoveEvent () { return decl_QDragMoveEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDragMoveEvent () { return decl_QDragMoveEvent; } } @@ -340,7 +340,7 @@ static gsi::Methods methods_QDragMoveEvent_Adaptor () { return methods; } -gsi::Class decl_QDragMoveEvent_Adaptor (qtdecl_QDragMoveEvent (), "QDragMoveEvent", +gsi::Class decl_QDragMoveEvent_Adaptor (qtdecl_QDragMoveEvent (), "QtGui", "QDragMoveEvent", methods_QDragMoveEvent_Adaptor (), "@qt\n@brief Binding of QDragMoveEvent"); diff --git a/src/gsiqt4/gsiDeclQDragResponseEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDragResponseEvent.cc similarity index 92% rename from src/gsiqt4/gsiDeclQDragResponseEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQDragResponseEvent.cc index 8521cc6b1..4d724c740 100644 --- a/src/gsiqt4/gsiDeclQDragResponseEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQDragResponseEvent.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -62,11 +62,11 @@ static gsi::Methods methods_QDragResponseEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QDragResponseEvent (qtdecl_QEvent (), "QDragResponseEvent_Native", +gsi::Class decl_QDragResponseEvent (qtdecl_QEvent (), "QtGui", "QDragResponseEvent_Native", methods_QDragResponseEvent (), "@hide\n@alias QDragResponseEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDragResponseEvent () { return decl_QDragResponseEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDragResponseEvent () { return decl_QDragResponseEvent; } } @@ -117,7 +117,7 @@ static gsi::Methods methods_QDragResponseEvent_Adaptor () { return methods; } -gsi::Class decl_QDragResponseEvent_Adaptor (qtdecl_QDragResponseEvent (), "QDragResponseEvent", +gsi::Class decl_QDragResponseEvent_Adaptor (qtdecl_QDragResponseEvent (), "QtGui", "QDragResponseEvent", methods_QDragResponseEvent_Adaptor (), "@qt\n@brief Binding of QDragResponseEvent"); diff --git a/src/gsiqt4/gsiDeclQDropEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQDropEvent.cc similarity index 98% rename from src/gsiqt4/gsiDeclQDropEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQDropEvent.cc index a0a767610..b75d3b65e 100644 --- a/src/gsiqt4/gsiDeclQDropEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQDropEvent.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -324,11 +324,11 @@ static gsi::Methods methods_QDropEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QDropEvent (qtdecl_QEvent (), "QDropEvent_Native", +gsi::Class decl_QDropEvent (qtdecl_QEvent (), "QtGui", "QDropEvent_Native", methods_QDropEvent (), "@hide\n@alias QDropEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDropEvent () { return decl_QDropEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDropEvent () { return decl_QDropEvent; } } @@ -522,7 +522,7 @@ static gsi::Methods methods_QDropEvent_Adaptor () { return methods; } -gsi::Class decl_QDropEvent_Adaptor (qtdecl_QDropEvent (), "QDropEvent", +gsi::Class decl_QDropEvent_Adaptor (qtdecl_QDropEvent (), "QtGui", "QDropEvent", methods_QDropEvent_Adaptor (), "@qt\n@brief Binding of QDropEvent"); diff --git a/src/gsiqt4/gsiDeclQErrorMessage.cc b/src/gsiqt/qt4/QtGui/gsiDeclQErrorMessage.cc similarity index 99% rename from src/gsiqt4/gsiDeclQErrorMessage.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQErrorMessage.cc index 1d590660d..6be0a930d 100644 --- a/src/gsiqt4/gsiDeclQErrorMessage.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQErrorMessage.cc @@ -77,8 +77,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -272,11 +272,11 @@ static gsi::Methods methods_QErrorMessage () { gsi::Class &qtdecl_QDialog (); -qt_gsi::QtNativeClass decl_QErrorMessage (qtdecl_QDialog (), "QErrorMessage_Native", +qt_gsi::QtNativeClass decl_QErrorMessage (qtdecl_QDialog (), "QtGui", "QErrorMessage_Native", methods_QErrorMessage (), "@hide\n@alias QErrorMessage"); -GSIQT_PUBLIC gsi::Class &qtdecl_QErrorMessage () { return decl_QErrorMessage; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QErrorMessage () { return decl_QErrorMessage; } } @@ -2687,7 +2687,7 @@ static gsi::Methods methods_QErrorMessage_Adaptor () { return methods; } -gsi::Class decl_QErrorMessage_Adaptor (qtdecl_QErrorMessage (), "QErrorMessage", +gsi::Class decl_QErrorMessage_Adaptor (qtdecl_QErrorMessage (), "QtGui", "QErrorMessage", methods_QErrorMessage_Adaptor (), "@qt\n@brief Binding of QErrorMessage"); diff --git a/src/gsiqt4/gsiDeclQFileDialog.cc b/src/gsiqt/qt4/QtGui/gsiDeclQFileDialog.cc similarity index 99% rename from src/gsiqt4/gsiDeclQFileDialog.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQFileDialog.cc index 233512c5d..0758522c2 100644 --- a/src/gsiqt4/gsiDeclQFileDialog.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQFileDialog.cc @@ -82,8 +82,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1381,11 +1381,11 @@ static gsi::Methods methods_QFileDialog () { gsi::Class &qtdecl_QDialog (); -qt_gsi::QtNativeClass decl_QFileDialog (qtdecl_QDialog (), "QFileDialog_Native", +qt_gsi::QtNativeClass decl_QFileDialog (qtdecl_QDialog (), "QtGui", "QFileDialog_Native", methods_QFileDialog (), "@hide\n@alias QFileDialog"); -GSIQT_PUBLIC gsi::Class &qtdecl_QFileDialog () { return decl_QFileDialog; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFileDialog () { return decl_QFileDialog; } } @@ -3976,7 +3976,7 @@ static gsi::Methods methods_QFileDialog_Adaptor () { return methods; } -gsi::Class decl_QFileDialog_Adaptor (qtdecl_QFileDialog (), "QFileDialog", +gsi::Class decl_QFileDialog_Adaptor (qtdecl_QFileDialog (), "QtGui", "QFileDialog", methods_QFileDialog_Adaptor (), "@qt\n@brief Binding of QFileDialog"); @@ -3987,18 +3987,18 @@ gsi::Class decl_QFileDialog_Adaptor (qtdecl_QFileDialog (), namespace qt_gsi { -static gsi::Enum decl_QFileDialog_AcceptMode_Enum ("QFileDialog_AcceptMode", +static gsi::Enum decl_QFileDialog_AcceptMode_Enum ("QtGui", "QFileDialog_AcceptMode", gsi::enum_const ("AcceptOpen", QFileDialog::AcceptOpen, "@brief Enum constant QFileDialog::AcceptOpen") + gsi::enum_const ("AcceptSave", QFileDialog::AcceptSave, "@brief Enum constant QFileDialog::AcceptSave"), "@qt\n@brief This class represents the QFileDialog::AcceptMode enum"); -static gsi::QFlagsClass decl_QFileDialog_AcceptMode_Enums ("QFileDialog_QFlags_AcceptMode", +static gsi::QFlagsClass decl_QFileDialog_AcceptMode_Enums ("QtGui", "QFileDialog_QFlags_AcceptMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QFileDialog_AcceptMode_Enum_in_parent (decl_QFileDialog_AcceptMode_Enum.defs ()); -static gsi::ClassExt decl_QFileDialog_AcceptMode_Enum_as_child (decl_QFileDialog_AcceptMode_Enum, "AcceptMode"); -static gsi::ClassExt decl_QFileDialog_AcceptMode_Enums_as_child (decl_QFileDialog_AcceptMode_Enums, "QFlags_AcceptMode"); +static gsi::ClassExt decl_QFileDialog_AcceptMode_Enum_as_child (decl_QFileDialog_AcceptMode_Enum, "QtGui", "AcceptMode"); +static gsi::ClassExt decl_QFileDialog_AcceptMode_Enums_as_child (decl_QFileDialog_AcceptMode_Enums, "QtGui", "QFlags_AcceptMode"); } @@ -4007,7 +4007,7 @@ static gsi::ClassExt decl_QFileDialog_AcceptMode_Enums_as_child (de namespace qt_gsi { -static gsi::Enum decl_QFileDialog_DialogLabel_Enum ("QFileDialog_DialogLabel", +static gsi::Enum decl_QFileDialog_DialogLabel_Enum ("QtGui", "QFileDialog_DialogLabel", gsi::enum_const ("LookIn", QFileDialog::LookIn, "@brief Enum constant QFileDialog::LookIn") + gsi::enum_const ("FileName", QFileDialog::FileName, "@brief Enum constant QFileDialog::FileName") + gsi::enum_const ("FileType", QFileDialog::FileType, "@brief Enum constant QFileDialog::FileType") + @@ -4015,13 +4015,13 @@ static gsi::Enum decl_QFileDialog_DialogLabel_Enum ("Q gsi::enum_const ("Reject", QFileDialog::Reject, "@brief Enum constant QFileDialog::Reject"), "@qt\n@brief This class represents the QFileDialog::DialogLabel enum"); -static gsi::QFlagsClass decl_QFileDialog_DialogLabel_Enums ("QFileDialog_QFlags_DialogLabel", +static gsi::QFlagsClass decl_QFileDialog_DialogLabel_Enums ("QtGui", "QFileDialog_QFlags_DialogLabel", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QFileDialog_DialogLabel_Enum_in_parent (decl_QFileDialog_DialogLabel_Enum.defs ()); -static gsi::ClassExt decl_QFileDialog_DialogLabel_Enum_as_child (decl_QFileDialog_DialogLabel_Enum, "DialogLabel"); -static gsi::ClassExt decl_QFileDialog_DialogLabel_Enums_as_child (decl_QFileDialog_DialogLabel_Enums, "QFlags_DialogLabel"); +static gsi::ClassExt decl_QFileDialog_DialogLabel_Enum_as_child (decl_QFileDialog_DialogLabel_Enum, "QtGui", "DialogLabel"); +static gsi::ClassExt decl_QFileDialog_DialogLabel_Enums_as_child (decl_QFileDialog_DialogLabel_Enums, "QtGui", "QFlags_DialogLabel"); } @@ -4030,7 +4030,7 @@ static gsi::ClassExt decl_QFileDialog_DialogLabel_Enums_as_child (d namespace qt_gsi { -static gsi::Enum decl_QFileDialog_FileMode_Enum ("QFileDialog_FileMode", +static gsi::Enum decl_QFileDialog_FileMode_Enum ("QtGui", "QFileDialog_FileMode", gsi::enum_const ("AnyFile", QFileDialog::AnyFile, "@brief Enum constant QFileDialog::AnyFile") + gsi::enum_const ("ExistingFile", QFileDialog::ExistingFile, "@brief Enum constant QFileDialog::ExistingFile") + gsi::enum_const ("Directory", QFileDialog::Directory, "@brief Enum constant QFileDialog::Directory") + @@ -4038,13 +4038,13 @@ static gsi::Enum decl_QFileDialog_FileMode_Enum ("QFileDi gsi::enum_const ("DirectoryOnly", QFileDialog::DirectoryOnly, "@brief Enum constant QFileDialog::DirectoryOnly"), "@qt\n@brief This class represents the QFileDialog::FileMode enum"); -static gsi::QFlagsClass decl_QFileDialog_FileMode_Enums ("QFileDialog_QFlags_FileMode", +static gsi::QFlagsClass decl_QFileDialog_FileMode_Enums ("QtGui", "QFileDialog_QFlags_FileMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QFileDialog_FileMode_Enum_in_parent (decl_QFileDialog_FileMode_Enum.defs ()); -static gsi::ClassExt decl_QFileDialog_FileMode_Enum_as_child (decl_QFileDialog_FileMode_Enum, "FileMode"); -static gsi::ClassExt decl_QFileDialog_FileMode_Enums_as_child (decl_QFileDialog_FileMode_Enums, "QFlags_FileMode"); +static gsi::ClassExt decl_QFileDialog_FileMode_Enum_as_child (decl_QFileDialog_FileMode_Enum, "QtGui", "FileMode"); +static gsi::ClassExt decl_QFileDialog_FileMode_Enums_as_child (decl_QFileDialog_FileMode_Enums, "QtGui", "QFlags_FileMode"); } @@ -4053,7 +4053,7 @@ static gsi::ClassExt decl_QFileDialog_FileMode_Enums_as_child (decl namespace qt_gsi { -static gsi::Enum decl_QFileDialog_Option_Enum ("QFileDialog_Option", +static gsi::Enum decl_QFileDialog_Option_Enum ("QtGui", "QFileDialog_Option", gsi::enum_const ("ShowDirsOnly", QFileDialog::ShowDirsOnly, "@brief Enum constant QFileDialog::ShowDirsOnly") + gsi::enum_const ("DontResolveSymlinks", QFileDialog::DontResolveSymlinks, "@brief Enum constant QFileDialog::DontResolveSymlinks") + gsi::enum_const ("DontConfirmOverwrite", QFileDialog::DontConfirmOverwrite, "@brief Enum constant QFileDialog::DontConfirmOverwrite") + @@ -4063,13 +4063,13 @@ static gsi::Enum decl_QFileDialog_Option_Enum ("QFileDialog gsi::enum_const ("HideNameFilterDetails", QFileDialog::HideNameFilterDetails, "@brief Enum constant QFileDialog::HideNameFilterDetails"), "@qt\n@brief This class represents the QFileDialog::Option enum"); -static gsi::QFlagsClass decl_QFileDialog_Option_Enums ("QFileDialog_QFlags_Option", +static gsi::QFlagsClass decl_QFileDialog_Option_Enums ("QtGui", "QFileDialog_QFlags_Option", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QFileDialog_Option_Enum_in_parent (decl_QFileDialog_Option_Enum.defs ()); -static gsi::ClassExt decl_QFileDialog_Option_Enum_as_child (decl_QFileDialog_Option_Enum, "Option"); -static gsi::ClassExt decl_QFileDialog_Option_Enums_as_child (decl_QFileDialog_Option_Enums, "QFlags_Option"); +static gsi::ClassExt decl_QFileDialog_Option_Enum_as_child (decl_QFileDialog_Option_Enum, "QtGui", "Option"); +static gsi::ClassExt decl_QFileDialog_Option_Enums_as_child (decl_QFileDialog_Option_Enums, "QtGui", "QFlags_Option"); } @@ -4078,18 +4078,18 @@ static gsi::ClassExt decl_QFileDialog_Option_Enums_as_child (decl_Q namespace qt_gsi { -static gsi::Enum decl_QFileDialog_ViewMode_Enum ("QFileDialog_ViewMode", +static gsi::Enum decl_QFileDialog_ViewMode_Enum ("QtGui", "QFileDialog_ViewMode", gsi::enum_const ("Detail", QFileDialog::Detail, "@brief Enum constant QFileDialog::Detail") + gsi::enum_const ("List", QFileDialog::List, "@brief Enum constant QFileDialog::List"), "@qt\n@brief This class represents the QFileDialog::ViewMode enum"); -static gsi::QFlagsClass decl_QFileDialog_ViewMode_Enums ("QFileDialog_QFlags_ViewMode", +static gsi::QFlagsClass decl_QFileDialog_ViewMode_Enums ("QtGui", "QFileDialog_QFlags_ViewMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QFileDialog_ViewMode_Enum_in_parent (decl_QFileDialog_ViewMode_Enum.defs ()); -static gsi::ClassExt decl_QFileDialog_ViewMode_Enum_as_child (decl_QFileDialog_ViewMode_Enum, "ViewMode"); -static gsi::ClassExt decl_QFileDialog_ViewMode_Enums_as_child (decl_QFileDialog_ViewMode_Enums, "QFlags_ViewMode"); +static gsi::ClassExt decl_QFileDialog_ViewMode_Enum_as_child (decl_QFileDialog_ViewMode_Enum, "QtGui", "ViewMode"); +static gsi::ClassExt decl_QFileDialog_ViewMode_Enums_as_child (decl_QFileDialog_ViewMode_Enums, "QtGui", "QFlags_ViewMode"); } diff --git a/src/gsiqt4/gsiDeclQFileIconProvider.cc b/src/gsiqt/qt4/QtGui/gsiDeclQFileIconProvider.cc similarity index 95% rename from src/gsiqt4/gsiDeclQFileIconProvider.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQFileIconProvider.cc index 204f25cc4..977e793ff 100644 --- a/src/gsiqt4/gsiDeclQFileIconProvider.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQFileIconProvider.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -106,11 +106,11 @@ static gsi::Methods methods_QFileIconProvider () { return methods; } -gsi::Class decl_QFileIconProvider ("QFileIconProvider_Native", +gsi::Class decl_QFileIconProvider ("QtGui", "QFileIconProvider_Native", methods_QFileIconProvider (), "@hide\n@alias QFileIconProvider"); -GSIQT_PUBLIC gsi::Class &qtdecl_QFileIconProvider () { return decl_QFileIconProvider; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFileIconProvider () { return decl_QFileIconProvider; } } @@ -279,7 +279,7 @@ static gsi::Methods methods_QFileIconProvider_Adaptor () { return methods; } -gsi::Class decl_QFileIconProvider_Adaptor (qtdecl_QFileIconProvider (), "QFileIconProvider", +gsi::Class decl_QFileIconProvider_Adaptor (qtdecl_QFileIconProvider (), "QtGui", "QFileIconProvider", methods_QFileIconProvider_Adaptor (), "@qt\n@brief Binding of QFileIconProvider"); @@ -290,7 +290,7 @@ gsi::Class decl_QFileIconProvider_Adaptor (qtdecl_QFi namespace qt_gsi { -static gsi::Enum decl_QFileIconProvider_IconType_Enum ("QFileIconProvider_IconType", +static gsi::Enum decl_QFileIconProvider_IconType_Enum ("QtGui", "QFileIconProvider_IconType", gsi::enum_const ("Computer", QFileIconProvider::Computer, "@brief Enum constant QFileIconProvider::Computer") + gsi::enum_const ("Desktop", QFileIconProvider::Desktop, "@brief Enum constant QFileIconProvider::Desktop") + gsi::enum_const ("Trashcan", QFileIconProvider::Trashcan, "@brief Enum constant QFileIconProvider::Trashcan") + @@ -300,13 +300,13 @@ static gsi::Enum decl_QFileIconProvider_IconType_En gsi::enum_const ("File", QFileIconProvider::File, "@brief Enum constant QFileIconProvider::File"), "@qt\n@brief This class represents the QFileIconProvider::IconType enum"); -static gsi::QFlagsClass decl_QFileIconProvider_IconType_Enums ("QFileIconProvider_QFlags_IconType", +static gsi::QFlagsClass decl_QFileIconProvider_IconType_Enums ("QtGui", "QFileIconProvider_QFlags_IconType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QFileIconProvider_IconType_Enum_in_parent (decl_QFileIconProvider_IconType_Enum.defs ()); -static gsi::ClassExt decl_QFileIconProvider_IconType_Enum_as_child (decl_QFileIconProvider_IconType_Enum, "IconType"); -static gsi::ClassExt decl_QFileIconProvider_IconType_Enums_as_child (decl_QFileIconProvider_IconType_Enums, "QFlags_IconType"); +static gsi::ClassExt decl_QFileIconProvider_IconType_Enum_as_child (decl_QFileIconProvider_IconType_Enum, "QtGui", "IconType"); +static gsi::ClassExt decl_QFileIconProvider_IconType_Enums_as_child (decl_QFileIconProvider_IconType_Enums, "QtGui", "QFlags_IconType"); } diff --git a/src/gsiqt4/gsiDeclQFileOpenEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQFileOpenEvent.cc similarity index 95% rename from src/gsiqt4/gsiDeclQFileOpenEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQFileOpenEvent.cc index baf150df5..461ee5b44 100644 --- a/src/gsiqt4/gsiDeclQFileOpenEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQFileOpenEvent.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -79,11 +79,11 @@ static gsi::Methods methods_QFileOpenEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QFileOpenEvent (qtdecl_QEvent (), "QFileOpenEvent_Native", +gsi::Class decl_QFileOpenEvent (qtdecl_QEvent (), "QtGui", "QFileOpenEvent_Native", methods_QFileOpenEvent (), "@hide\n@alias QFileOpenEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QFileOpenEvent () { return decl_QFileOpenEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFileOpenEvent () { return decl_QFileOpenEvent; } } @@ -159,7 +159,7 @@ static gsi::Methods methods_QFileOpenEvent_Adaptor () { return methods; } -gsi::Class decl_QFileOpenEvent_Adaptor (qtdecl_QFileOpenEvent (), "QFileOpenEvent", +gsi::Class decl_QFileOpenEvent_Adaptor (qtdecl_QFileOpenEvent (), "QtGui", "QFileOpenEvent", methods_QFileOpenEvent_Adaptor (), "@qt\n@brief Binding of QFileOpenEvent"); diff --git a/src/gsiqt4/gsiDeclQFileSystemModel.cc b/src/gsiqt/qt4/QtGui/gsiDeclQFileSystemModel.cc similarity index 99% rename from src/gsiqt4/gsiDeclQFileSystemModel.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQFileSystemModel.cc index ae07cf0ed..1f450f25e 100644 --- a/src/gsiqt4/gsiDeclQFileSystemModel.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQFileSystemModel.cc @@ -43,8 +43,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1089,11 +1089,11 @@ static gsi::Methods methods_QFileSystemModel () { gsi::Class &qtdecl_QAbstractItemModel (); -qt_gsi::QtNativeClass decl_QFileSystemModel (qtdecl_QAbstractItemModel (), "QFileSystemModel_Native", +qt_gsi::QtNativeClass decl_QFileSystemModel (qtdecl_QAbstractItemModel (), "QtGui", "QFileSystemModel_Native", methods_QFileSystemModel (), "@hide\n@alias QFileSystemModel"); -GSIQT_PUBLIC gsi::Class &qtdecl_QFileSystemModel () { return decl_QFileSystemModel; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFileSystemModel () { return decl_QFileSystemModel; } } @@ -3484,7 +3484,7 @@ static gsi::Methods methods_QFileSystemModel_Adaptor () { return methods; } -gsi::Class decl_QFileSystemModel_Adaptor (qtdecl_QFileSystemModel (), "QFileSystemModel", +gsi::Class decl_QFileSystemModel_Adaptor (qtdecl_QFileSystemModel (), "QtGui", "QFileSystemModel", methods_QFileSystemModel_Adaptor (), "@qt\n@brief Binding of QFileSystemModel"); diff --git a/src/gsiqt4/gsiDeclQFocusEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQFocusEvent.cc similarity index 95% rename from src/gsiqt4/gsiDeclQFocusEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQFocusEvent.cc index 26b488ad8..6c533c0c5 100644 --- a/src/gsiqt4/gsiDeclQFocusEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQFocusEvent.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -110,11 +110,11 @@ static gsi::Methods methods_QFocusEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QFocusEvent (qtdecl_QEvent (), "QFocusEvent_Native", +gsi::Class decl_QFocusEvent (qtdecl_QEvent (), "QtGui", "QFocusEvent_Native", methods_QFocusEvent (), "@hide\n@alias QFocusEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QFocusEvent () { return decl_QFocusEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFocusEvent () { return decl_QFocusEvent; } } @@ -174,7 +174,7 @@ static gsi::Methods methods_QFocusEvent_Adaptor () { return methods; } -gsi::Class decl_QFocusEvent_Adaptor (qtdecl_QFocusEvent (), "QFocusEvent", +gsi::Class decl_QFocusEvent_Adaptor (qtdecl_QFocusEvent (), "QtGui", "QFocusEvent", methods_QFocusEvent_Adaptor (), "@qt\n@brief Binding of QFocusEvent"); diff --git a/src/gsiqt4/gsiDeclQFocusFrame.cc b/src/gsiqt/qt4/QtGui/gsiDeclQFocusFrame.cc similarity index 99% rename from src/gsiqt4/gsiDeclQFocusFrame.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQFocusFrame.cc index b53152c6e..71a262369 100644 --- a/src/gsiqt4/gsiDeclQFocusFrame.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQFocusFrame.cc @@ -78,8 +78,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -246,11 +246,11 @@ static gsi::Methods methods_QFocusFrame () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QFocusFrame (qtdecl_QWidget (), "QFocusFrame_Native", +qt_gsi::QtNativeClass decl_QFocusFrame (qtdecl_QWidget (), "QtGui", "QFocusFrame_Native", methods_QFocusFrame (), "@hide\n@alias QFocusFrame"); -GSIQT_PUBLIC gsi::Class &qtdecl_QFocusFrame () { return decl_QFocusFrame; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFocusFrame () { return decl_QFocusFrame; } } @@ -2476,7 +2476,7 @@ static gsi::Methods methods_QFocusFrame_Adaptor () { return methods; } -gsi::Class decl_QFocusFrame_Adaptor (qtdecl_QFocusFrame (), "QFocusFrame", +gsi::Class decl_QFocusFrame_Adaptor (qtdecl_QFocusFrame (), "QtGui", "QFocusFrame", methods_QFocusFrame_Adaptor (), "@qt\n@brief Binding of QFocusFrame"); diff --git a/src/gsiqt4/gsiDeclQFont.cc b/src/gsiqt/qt4/QtGui/gsiDeclQFont.cc similarity index 97% rename from src/gsiqt4/gsiDeclQFont.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQFont.cc index 5e2ec74ab..5228c6e2e 100644 --- a/src/gsiqt4/gsiDeclQFont.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQFont.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1349,7 +1349,7 @@ static gsi::Methods methods_QFont () { return methods; } -gsi::Class decl_QFont ("QFont", +gsi::Class decl_QFont ("QtGui", "QFont", gsi::method("Light", &font_const_light, "@brief Font weight constant 'QFont::Light'.") + gsi::method("Normal", &font_const_normal, "@brief Font weight constant 'QFont::Normal'.") + gsi::method("DemiBold", &font_const_demibold, "@brief Font weight constant 'QFont::DemiBold'.") + @@ -1360,7 +1360,7 @@ gsi::Class decl_QFont ("QFont", "@qt\n@brief Binding of QFont"); -GSIQT_PUBLIC gsi::Class &qtdecl_QFont () { return decl_QFont; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFont () { return decl_QFont; } } @@ -1369,7 +1369,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QFont () { return decl_QFont; } namespace qt_gsi { -static gsi::Enum decl_QFont_Capitalization_Enum ("QFont_Capitalization", +static gsi::Enum decl_QFont_Capitalization_Enum ("QtGui", "QFont_Capitalization", gsi::enum_const ("MixedCase", QFont::MixedCase, "@brief Enum constant QFont::MixedCase") + gsi::enum_const ("AllUppercase", QFont::AllUppercase, "@brief Enum constant QFont::AllUppercase") + gsi::enum_const ("AllLowercase", QFont::AllLowercase, "@brief Enum constant QFont::AllLowercase") + @@ -1377,13 +1377,13 @@ static gsi::Enum decl_QFont_Capitalization_Enum ("QFont_C gsi::enum_const ("Capitalize", QFont::Capitalize, "@brief Enum constant QFont::Capitalize"), "@qt\n@brief This class represents the QFont::Capitalization enum"); -static gsi::QFlagsClass decl_QFont_Capitalization_Enums ("QFont_QFlags_Capitalization", +static gsi::QFlagsClass decl_QFont_Capitalization_Enums ("QtGui", "QFont_QFlags_Capitalization", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QFont_Capitalization_Enum_in_parent (decl_QFont_Capitalization_Enum.defs ()); -static gsi::ClassExt decl_QFont_Capitalization_Enum_as_child (decl_QFont_Capitalization_Enum, "Capitalization"); -static gsi::ClassExt decl_QFont_Capitalization_Enums_as_child (decl_QFont_Capitalization_Enums, "QFlags_Capitalization"); +static gsi::ClassExt decl_QFont_Capitalization_Enum_as_child (decl_QFont_Capitalization_Enum, "QtGui", "Capitalization"); +static gsi::ClassExt decl_QFont_Capitalization_Enums_as_child (decl_QFont_Capitalization_Enums, "QtGui", "QFlags_Capitalization"); } @@ -1392,18 +1392,18 @@ static gsi::ClassExt decl_QFont_Capitalization_Enums_as_child (decl_QFont namespace qt_gsi { -static gsi::Enum decl_QFont_SpacingType_Enum ("QFont_SpacingType", +static gsi::Enum decl_QFont_SpacingType_Enum ("QtGui", "QFont_SpacingType", gsi::enum_const ("PercentageSpacing", QFont::PercentageSpacing, "@brief Enum constant QFont::PercentageSpacing") + gsi::enum_const ("AbsoluteSpacing", QFont::AbsoluteSpacing, "@brief Enum constant QFont::AbsoluteSpacing"), "@qt\n@brief This class represents the QFont::SpacingType enum"); -static gsi::QFlagsClass decl_QFont_SpacingType_Enums ("QFont_QFlags_SpacingType", +static gsi::QFlagsClass decl_QFont_SpacingType_Enums ("QtGui", "QFont_QFlags_SpacingType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QFont_SpacingType_Enum_in_parent (decl_QFont_SpacingType_Enum.defs ()); -static gsi::ClassExt decl_QFont_SpacingType_Enum_as_child (decl_QFont_SpacingType_Enum, "SpacingType"); -static gsi::ClassExt decl_QFont_SpacingType_Enums_as_child (decl_QFont_SpacingType_Enums, "QFlags_SpacingType"); +static gsi::ClassExt decl_QFont_SpacingType_Enum_as_child (decl_QFont_SpacingType_Enum, "QtGui", "SpacingType"); +static gsi::ClassExt decl_QFont_SpacingType_Enums_as_child (decl_QFont_SpacingType_Enums, "QtGui", "QFlags_SpacingType"); } @@ -1412,19 +1412,19 @@ static gsi::ClassExt decl_QFont_SpacingType_Enums_as_child (decl_QFont_Sp namespace qt_gsi { -static gsi::Enum decl_QFont_Style_Enum ("QFont_Style", +static gsi::Enum decl_QFont_Style_Enum ("QtGui", "QFont_Style", gsi::enum_const ("StyleNormal", QFont::StyleNormal, "@brief Enum constant QFont::StyleNormal") + gsi::enum_const ("StyleItalic", QFont::StyleItalic, "@brief Enum constant QFont::StyleItalic") + gsi::enum_const ("StyleOblique", QFont::StyleOblique, "@brief Enum constant QFont::StyleOblique"), "@qt\n@brief This class represents the QFont::Style enum"); -static gsi::QFlagsClass decl_QFont_Style_Enums ("QFont_QFlags_Style", +static gsi::QFlagsClass decl_QFont_Style_Enums ("QtGui", "QFont_QFlags_Style", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QFont_Style_Enum_in_parent (decl_QFont_Style_Enum.defs ()); -static gsi::ClassExt decl_QFont_Style_Enum_as_child (decl_QFont_Style_Enum, "Style"); -static gsi::ClassExt decl_QFont_Style_Enums_as_child (decl_QFont_Style_Enums, "QFlags_Style"); +static gsi::ClassExt decl_QFont_Style_Enum_as_child (decl_QFont_Style_Enum, "QtGui", "Style"); +static gsi::ClassExt decl_QFont_Style_Enums_as_child (decl_QFont_Style_Enums, "QtGui", "QFlags_Style"); } @@ -1433,7 +1433,7 @@ static gsi::ClassExt decl_QFont_Style_Enums_as_child (decl_QFont_Style_En namespace qt_gsi { -static gsi::Enum decl_QFont_StyleHint_Enum ("QFont_StyleHint", +static gsi::Enum decl_QFont_StyleHint_Enum ("QtGui", "QFont_StyleHint", gsi::enum_const ("Helvetica", QFont::Helvetica, "@brief Enum constant QFont::Helvetica") + gsi::enum_const ("SansSerif", QFont::SansSerif, "@brief Enum constant QFont::SansSerif") + gsi::enum_const ("Times", QFont::Times, "@brief Enum constant QFont::Times") + @@ -1446,13 +1446,13 @@ static gsi::Enum decl_QFont_StyleHint_Enum ("QFont_StyleHint", gsi::enum_const ("AnyStyle", QFont::AnyStyle, "@brief Enum constant QFont::AnyStyle"), "@qt\n@brief This class represents the QFont::StyleHint enum"); -static gsi::QFlagsClass decl_QFont_StyleHint_Enums ("QFont_QFlags_StyleHint", +static gsi::QFlagsClass decl_QFont_StyleHint_Enums ("QtGui", "QFont_QFlags_StyleHint", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QFont_StyleHint_Enum_in_parent (decl_QFont_StyleHint_Enum.defs ()); -static gsi::ClassExt decl_QFont_StyleHint_Enum_as_child (decl_QFont_StyleHint_Enum, "StyleHint"); -static gsi::ClassExt decl_QFont_StyleHint_Enums_as_child (decl_QFont_StyleHint_Enums, "QFlags_StyleHint"); +static gsi::ClassExt decl_QFont_StyleHint_Enum_as_child (decl_QFont_StyleHint_Enum, "QtGui", "StyleHint"); +static gsi::ClassExt decl_QFont_StyleHint_Enums_as_child (decl_QFont_StyleHint_Enums, "QtGui", "QFlags_StyleHint"); } @@ -1461,7 +1461,7 @@ static gsi::ClassExt decl_QFont_StyleHint_Enums_as_child (decl_QFont_Styl namespace qt_gsi { -static gsi::Enum decl_QFont_StyleStrategy_Enum ("QFont_StyleStrategy", +static gsi::Enum decl_QFont_StyleStrategy_Enum ("QtGui", "QFont_StyleStrategy", gsi::enum_const ("PreferDefault", QFont::PreferDefault, "@brief Enum constant QFont::PreferDefault") + gsi::enum_const ("PreferBitmap", QFont::PreferBitmap, "@brief Enum constant QFont::PreferBitmap") + gsi::enum_const ("PreferDevice", QFont::PreferDevice, "@brief Enum constant QFont::PreferDevice") + @@ -1475,13 +1475,13 @@ static gsi::Enum decl_QFont_StyleStrategy_Enum ("QFont_Sty gsi::enum_const ("NoFontMerging", QFont::NoFontMerging, "@brief Enum constant QFont::NoFontMerging"), "@qt\n@brief This class represents the QFont::StyleStrategy enum"); -static gsi::QFlagsClass decl_QFont_StyleStrategy_Enums ("QFont_QFlags_StyleStrategy", +static gsi::QFlagsClass decl_QFont_StyleStrategy_Enums ("QtGui", "QFont_QFlags_StyleStrategy", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QFont_StyleStrategy_Enum_in_parent (decl_QFont_StyleStrategy_Enum.defs ()); -static gsi::ClassExt decl_QFont_StyleStrategy_Enum_as_child (decl_QFont_StyleStrategy_Enum, "StyleStrategy"); -static gsi::ClassExt decl_QFont_StyleStrategy_Enums_as_child (decl_QFont_StyleStrategy_Enums, "QFlags_StyleStrategy"); +static gsi::ClassExt decl_QFont_StyleStrategy_Enum_as_child (decl_QFont_StyleStrategy_Enum, "QtGui", "StyleStrategy"); +static gsi::ClassExt decl_QFont_StyleStrategy_Enums_as_child (decl_QFont_StyleStrategy_Enums, "QtGui", "QFlags_StyleStrategy"); } diff --git a/src/gsiqt4/gsiDeclQFontComboBox.cc b/src/gsiqt/qt4/QtGui/gsiDeclQFontComboBox.cc similarity index 99% rename from src/gsiqt4/gsiDeclQFontComboBox.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQFontComboBox.cc index a5e574cca..a62b21a68 100644 --- a/src/gsiqt4/gsiDeclQFontComboBox.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQFontComboBox.cc @@ -85,8 +85,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -351,11 +351,11 @@ static gsi::Methods methods_QFontComboBox () { gsi::Class &qtdecl_QComboBox (); -qt_gsi::QtNativeClass decl_QFontComboBox (qtdecl_QComboBox (), "QFontComboBox_Native", +qt_gsi::QtNativeClass decl_QFontComboBox (qtdecl_QComboBox (), "QtGui", "QFontComboBox_Native", methods_QFontComboBox (), "@hide\n@alias QFontComboBox"); -GSIQT_PUBLIC gsi::Class &qtdecl_QFontComboBox () { return decl_QFontComboBox; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFontComboBox () { return decl_QFontComboBox; } } @@ -2857,7 +2857,7 @@ static gsi::Methods methods_QFontComboBox_Adaptor () { return methods; } -gsi::Class decl_QFontComboBox_Adaptor (qtdecl_QFontComboBox (), "QFontComboBox", +gsi::Class decl_QFontComboBox_Adaptor (qtdecl_QFontComboBox (), "QtGui", "QFontComboBox", methods_QFontComboBox_Adaptor (), "@qt\n@brief Binding of QFontComboBox"); @@ -2868,7 +2868,7 @@ gsi::Class decl_QFontComboBox_Adaptor (qtdecl_QFontComboB namespace qt_gsi { -static gsi::Enum decl_QFontComboBox_FontFilter_Enum ("QFontComboBox_FontFilter", +static gsi::Enum decl_QFontComboBox_FontFilter_Enum ("QtGui", "QFontComboBox_FontFilter", gsi::enum_const ("AllFonts", QFontComboBox::AllFonts, "@brief Enum constant QFontComboBox::AllFonts") + gsi::enum_const ("ScalableFonts", QFontComboBox::ScalableFonts, "@brief Enum constant QFontComboBox::ScalableFonts") + gsi::enum_const ("NonScalableFonts", QFontComboBox::NonScalableFonts, "@brief Enum constant QFontComboBox::NonScalableFonts") + @@ -2876,13 +2876,13 @@ static gsi::Enum decl_QFontComboBox_FontFilter_Enum ( gsi::enum_const ("ProportionalFonts", QFontComboBox::ProportionalFonts, "@brief Enum constant QFontComboBox::ProportionalFonts"), "@qt\n@brief This class represents the QFontComboBox::FontFilter enum"); -static gsi::QFlagsClass decl_QFontComboBox_FontFilter_Enums ("QFontComboBox_QFlags_FontFilter", +static gsi::QFlagsClass decl_QFontComboBox_FontFilter_Enums ("QtGui", "QFontComboBox_QFlags_FontFilter", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QFontComboBox_FontFilter_Enum_in_parent (decl_QFontComboBox_FontFilter_Enum.defs ()); -static gsi::ClassExt decl_QFontComboBox_FontFilter_Enum_as_child (decl_QFontComboBox_FontFilter_Enum, "FontFilter"); -static gsi::ClassExt decl_QFontComboBox_FontFilter_Enums_as_child (decl_QFontComboBox_FontFilter_Enums, "QFlags_FontFilter"); +static gsi::ClassExt decl_QFontComboBox_FontFilter_Enum_as_child (decl_QFontComboBox_FontFilter_Enum, "QtGui", "FontFilter"); +static gsi::ClassExt decl_QFontComboBox_FontFilter_Enums_as_child (decl_QFontComboBox_FontFilter_Enums, "QtGui", "QFlags_FontFilter"); } diff --git a/src/gsiqt4/gsiDeclQFontDatabase.cc b/src/gsiqt/qt4/QtGui/gsiDeclQFontDatabase.cc similarity index 98% rename from src/gsiqt4/gsiDeclQFontDatabase.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQFontDatabase.cc index e0d77bfce..257768b08 100644 --- a/src/gsiqt4/gsiDeclQFontDatabase.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQFontDatabase.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -580,12 +580,12 @@ static gsi::Methods methods_QFontDatabase () { return methods; } -gsi::Class decl_QFontDatabase ("QFontDatabase", +gsi::Class decl_QFontDatabase ("QtGui", "QFontDatabase", methods_QFontDatabase (), "@qt\n@brief Binding of QFontDatabase"); -GSIQT_PUBLIC gsi::Class &qtdecl_QFontDatabase () { return decl_QFontDatabase; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFontDatabase () { return decl_QFontDatabase; } } @@ -594,7 +594,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QFontDatabase () { return decl_QF namespace qt_gsi { -static gsi::Enum decl_QFontDatabase_WritingSystem_Enum ("QFontDatabase_WritingSystem", +static gsi::Enum decl_QFontDatabase_WritingSystem_Enum ("QtGui", "QFontDatabase_WritingSystem", gsi::enum_const ("Any", QFontDatabase::Any, "@brief Enum constant QFontDatabase::Any") + gsi::enum_const ("Latin", QFontDatabase::Latin, "@brief Enum constant QFontDatabase::Latin") + gsi::enum_const ("Greek", QFontDatabase::Greek, "@brief Enum constant QFontDatabase::Greek") + @@ -633,13 +633,13 @@ static gsi::Enum decl_QFontDatabase_WritingSystem_ gsi::enum_const ("WritingSystemsCount", QFontDatabase::WritingSystemsCount, "@brief Enum constant QFontDatabase::WritingSystemsCount"), "@qt\n@brief This class represents the QFontDatabase::WritingSystem enum"); -static gsi::QFlagsClass decl_QFontDatabase_WritingSystem_Enums ("QFontDatabase_QFlags_WritingSystem", +static gsi::QFlagsClass decl_QFontDatabase_WritingSystem_Enums ("QtGui", "QFontDatabase_QFlags_WritingSystem", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QFontDatabase_WritingSystem_Enum_in_parent (decl_QFontDatabase_WritingSystem_Enum.defs ()); -static gsi::ClassExt decl_QFontDatabase_WritingSystem_Enum_as_child (decl_QFontDatabase_WritingSystem_Enum, "WritingSystem"); -static gsi::ClassExt decl_QFontDatabase_WritingSystem_Enums_as_child (decl_QFontDatabase_WritingSystem_Enums, "QFlags_WritingSystem"); +static gsi::ClassExt decl_QFontDatabase_WritingSystem_Enum_as_child (decl_QFontDatabase_WritingSystem_Enum, "QtGui", "WritingSystem"); +static gsi::ClassExt decl_QFontDatabase_WritingSystem_Enums_as_child (decl_QFontDatabase_WritingSystem_Enums, "QtGui", "QFlags_WritingSystem"); } diff --git a/src/gsiqt4/gsiDeclQFontDialog.cc b/src/gsiqt/qt4/QtGui/gsiDeclQFontDialog.cc similarity index 99% rename from src/gsiqt4/gsiDeclQFontDialog.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQFontDialog.cc index bca4c20d3..7284d1cd4 100644 --- a/src/gsiqt4/gsiDeclQFontDialog.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQFontDialog.cc @@ -77,8 +77,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -519,11 +519,11 @@ static gsi::Methods methods_QFontDialog () { gsi::Class &qtdecl_QDialog (); -qt_gsi::QtNativeClass decl_QFontDialog (qtdecl_QDialog (), "QFontDialog_Native", +qt_gsi::QtNativeClass decl_QFontDialog (qtdecl_QDialog (), "QtGui", "QFontDialog_Native", methods_QFontDialog (), "@hide\n@alias QFontDialog"); -GSIQT_PUBLIC gsi::Class &qtdecl_QFontDialog () { return decl_QFontDialog; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFontDialog () { return decl_QFontDialog; } } @@ -2974,7 +2974,7 @@ static gsi::Methods methods_QFontDialog_Adaptor () { return methods; } -gsi::Class decl_QFontDialog_Adaptor (qtdecl_QFontDialog (), "QFontDialog", +gsi::Class decl_QFontDialog_Adaptor (qtdecl_QFontDialog (), "QtGui", "QFontDialog", methods_QFontDialog_Adaptor (), "@qt\n@brief Binding of QFontDialog"); @@ -2985,18 +2985,18 @@ gsi::Class decl_QFontDialog_Adaptor (qtdecl_QFontDialog (), namespace qt_gsi { -static gsi::Enum decl_QFontDialog_FontDialogOption_Enum ("QFontDialog_FontDialogOption", +static gsi::Enum decl_QFontDialog_FontDialogOption_Enum ("QtGui", "QFontDialog_FontDialogOption", gsi::enum_const ("NoButtons", QFontDialog::NoButtons, "@brief Enum constant QFontDialog::NoButtons") + gsi::enum_const ("DontUseNativeDialog", QFontDialog::DontUseNativeDialog, "@brief Enum constant QFontDialog::DontUseNativeDialog"), "@qt\n@brief This class represents the QFontDialog::FontDialogOption enum"); -static gsi::QFlagsClass decl_QFontDialog_FontDialogOption_Enums ("QFontDialog_QFlags_FontDialogOption", +static gsi::QFlagsClass decl_QFontDialog_FontDialogOption_Enums ("QtGui", "QFontDialog_QFlags_FontDialogOption", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QFontDialog_FontDialogOption_Enum_in_parent (decl_QFontDialog_FontDialogOption_Enum.defs ()); -static gsi::ClassExt decl_QFontDialog_FontDialogOption_Enum_as_child (decl_QFontDialog_FontDialogOption_Enum, "FontDialogOption"); -static gsi::ClassExt decl_QFontDialog_FontDialogOption_Enums_as_child (decl_QFontDialog_FontDialogOption_Enums, "QFlags_FontDialogOption"); +static gsi::ClassExt decl_QFontDialog_FontDialogOption_Enum_as_child (decl_QFontDialog_FontDialogOption_Enum, "QtGui", "FontDialogOption"); +static gsi::ClassExt decl_QFontDialog_FontDialogOption_Enums_as_child (decl_QFontDialog_FontDialogOption_Enums, "QtGui", "QFlags_FontDialogOption"); } diff --git a/src/gsiqt4/gsiDeclQFontInfo.cc b/src/gsiqt/qt4/QtGui/gsiDeclQFontInfo.cc similarity index 98% rename from src/gsiqt4/gsiDeclQFontInfo.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQFontInfo.cc index 7cec8ab9d..6d4144a18 100644 --- a/src/gsiqt4/gsiDeclQFontInfo.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQFontInfo.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -346,12 +346,12 @@ static gsi::Methods methods_QFontInfo () { return methods; } -gsi::Class decl_QFontInfo ("QFontInfo", +gsi::Class decl_QFontInfo ("QtGui", "QFontInfo", methods_QFontInfo (), "@qt\n@brief Binding of QFontInfo"); -GSIQT_PUBLIC gsi::Class &qtdecl_QFontInfo () { return decl_QFontInfo; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFontInfo () { return decl_QFontInfo; } } diff --git a/src/gsiqt4/gsiDeclQFontMetrics.cc b/src/gsiqt/qt4/QtGui/gsiDeclQFontMetrics.cc similarity index 99% rename from src/gsiqt4/gsiDeclQFontMetrics.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQFontMetrics.cc index 25b4cd67e..86ac933f0 100644 --- a/src/gsiqt4/gsiDeclQFontMetrics.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQFontMetrics.cc @@ -33,8 +33,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -753,12 +753,12 @@ static gsi::Methods methods_QFontMetrics () { return methods; } -gsi::Class decl_QFontMetrics ("QFontMetrics", +gsi::Class decl_QFontMetrics ("QtGui", "QFontMetrics", methods_QFontMetrics (), "@qt\n@brief Binding of QFontMetrics"); -GSIQT_PUBLIC gsi::Class &qtdecl_QFontMetrics () { return decl_QFontMetrics; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFontMetrics () { return decl_QFontMetrics; } } diff --git a/src/gsiqt4/gsiDeclQFontMetricsF.cc b/src/gsiqt/qt4/QtGui/gsiDeclQFontMetricsF.cc similarity index 99% rename from src/gsiqt4/gsiDeclQFontMetricsF.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQFontMetricsF.cc index 0c6d0974f..4c1d09cb1 100644 --- a/src/gsiqt4/gsiDeclQFontMetricsF.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQFontMetricsF.cc @@ -34,8 +34,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -727,12 +727,12 @@ static gsi::Methods methods_QFontMetricsF () { return methods; } -gsi::Class decl_QFontMetricsF ("QFontMetricsF", +gsi::Class decl_QFontMetricsF ("QtGui", "QFontMetricsF", methods_QFontMetricsF (), "@qt\n@brief Binding of QFontMetricsF"); -GSIQT_PUBLIC gsi::Class &qtdecl_QFontMetricsF () { return decl_QFontMetricsF; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFontMetricsF () { return decl_QFontMetricsF; } } diff --git a/src/gsiqt4/gsiDeclQFormLayout.cc b/src/gsiqt/qt4/QtGui/gsiDeclQFormLayout.cc similarity index 98% rename from src/gsiqt4/gsiDeclQFormLayout.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQFormLayout.cc index d67b92b20..8ee21650b 100644 --- a/src/gsiqt4/gsiDeclQFormLayout.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQFormLayout.cc @@ -41,8 +41,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1164,11 +1164,11 @@ static gsi::Methods methods_QFormLayout () { gsi::Class &qtdecl_QLayout (); -qt_gsi::QtNativeClass decl_QFormLayout (qtdecl_QLayout (), "QFormLayout_Native", +qt_gsi::QtNativeClass decl_QFormLayout (qtdecl_QLayout (), "QtGui", "QFormLayout_Native", methods_QFormLayout (), "@hide\n@alias QFormLayout"); -GSIQT_PUBLIC gsi::Class &qtdecl_QFormLayout () { return decl_QFormLayout; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFormLayout () { return decl_QFormLayout; } } @@ -2380,7 +2380,7 @@ static gsi::Methods methods_QFormLayout_Adaptor () { return methods; } -gsi::Class decl_QFormLayout_Adaptor (qtdecl_QFormLayout (), "QFormLayout", +gsi::Class decl_QFormLayout_Adaptor (qtdecl_QFormLayout (), "QtGui", "QFormLayout", methods_QFormLayout_Adaptor (), "@qt\n@brief Binding of QFormLayout"); @@ -2391,19 +2391,19 @@ gsi::Class decl_QFormLayout_Adaptor (qtdecl_QFormLayout (), namespace qt_gsi { -static gsi::Enum decl_QFormLayout_FieldGrowthPolicy_Enum ("QFormLayout_FieldGrowthPolicy", +static gsi::Enum decl_QFormLayout_FieldGrowthPolicy_Enum ("QtGui", "QFormLayout_FieldGrowthPolicy", gsi::enum_const ("FieldsStayAtSizeHint", QFormLayout::FieldsStayAtSizeHint, "@brief Enum constant QFormLayout::FieldsStayAtSizeHint") + gsi::enum_const ("ExpandingFieldsGrow", QFormLayout::ExpandingFieldsGrow, "@brief Enum constant QFormLayout::ExpandingFieldsGrow") + gsi::enum_const ("AllNonFixedFieldsGrow", QFormLayout::AllNonFixedFieldsGrow, "@brief Enum constant QFormLayout::AllNonFixedFieldsGrow"), "@qt\n@brief This class represents the QFormLayout::FieldGrowthPolicy enum"); -static gsi::QFlagsClass decl_QFormLayout_FieldGrowthPolicy_Enums ("QFormLayout_QFlags_FieldGrowthPolicy", +static gsi::QFlagsClass decl_QFormLayout_FieldGrowthPolicy_Enums ("QtGui", "QFormLayout_QFlags_FieldGrowthPolicy", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QFormLayout_FieldGrowthPolicy_Enum_in_parent (decl_QFormLayout_FieldGrowthPolicy_Enum.defs ()); -static gsi::ClassExt decl_QFormLayout_FieldGrowthPolicy_Enum_as_child (decl_QFormLayout_FieldGrowthPolicy_Enum, "FieldGrowthPolicy"); -static gsi::ClassExt decl_QFormLayout_FieldGrowthPolicy_Enums_as_child (decl_QFormLayout_FieldGrowthPolicy_Enums, "QFlags_FieldGrowthPolicy"); +static gsi::ClassExt decl_QFormLayout_FieldGrowthPolicy_Enum_as_child (decl_QFormLayout_FieldGrowthPolicy_Enum, "QtGui", "FieldGrowthPolicy"); +static gsi::ClassExt decl_QFormLayout_FieldGrowthPolicy_Enums_as_child (decl_QFormLayout_FieldGrowthPolicy_Enums, "QtGui", "QFlags_FieldGrowthPolicy"); } @@ -2412,19 +2412,19 @@ static gsi::ClassExt decl_QFormLayout_FieldGrowthPolicy_Enums_as_ch namespace qt_gsi { -static gsi::Enum decl_QFormLayout_ItemRole_Enum ("QFormLayout_ItemRole", +static gsi::Enum decl_QFormLayout_ItemRole_Enum ("QtGui", "QFormLayout_ItemRole", gsi::enum_const ("LabelRole", QFormLayout::LabelRole, "@brief Enum constant QFormLayout::LabelRole") + gsi::enum_const ("FieldRole", QFormLayout::FieldRole, "@brief Enum constant QFormLayout::FieldRole") + gsi::enum_const ("SpanningRole", QFormLayout::SpanningRole, "@brief Enum constant QFormLayout::SpanningRole"), "@qt\n@brief This class represents the QFormLayout::ItemRole enum"); -static gsi::QFlagsClass decl_QFormLayout_ItemRole_Enums ("QFormLayout_QFlags_ItemRole", +static gsi::QFlagsClass decl_QFormLayout_ItemRole_Enums ("QtGui", "QFormLayout_QFlags_ItemRole", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QFormLayout_ItemRole_Enum_in_parent (decl_QFormLayout_ItemRole_Enum.defs ()); -static gsi::ClassExt decl_QFormLayout_ItemRole_Enum_as_child (decl_QFormLayout_ItemRole_Enum, "ItemRole"); -static gsi::ClassExt decl_QFormLayout_ItemRole_Enums_as_child (decl_QFormLayout_ItemRole_Enums, "QFlags_ItemRole"); +static gsi::ClassExt decl_QFormLayout_ItemRole_Enum_as_child (decl_QFormLayout_ItemRole_Enum, "QtGui", "ItemRole"); +static gsi::ClassExt decl_QFormLayout_ItemRole_Enums_as_child (decl_QFormLayout_ItemRole_Enums, "QtGui", "QFlags_ItemRole"); } @@ -2433,19 +2433,19 @@ static gsi::ClassExt decl_QFormLayout_ItemRole_Enums_as_child (decl namespace qt_gsi { -static gsi::Enum decl_QFormLayout_RowWrapPolicy_Enum ("QFormLayout_RowWrapPolicy", +static gsi::Enum decl_QFormLayout_RowWrapPolicy_Enum ("QtGui", "QFormLayout_RowWrapPolicy", gsi::enum_const ("DontWrapRows", QFormLayout::DontWrapRows, "@brief Enum constant QFormLayout::DontWrapRows") + gsi::enum_const ("WrapLongRows", QFormLayout::WrapLongRows, "@brief Enum constant QFormLayout::WrapLongRows") + gsi::enum_const ("WrapAllRows", QFormLayout::WrapAllRows, "@brief Enum constant QFormLayout::WrapAllRows"), "@qt\n@brief This class represents the QFormLayout::RowWrapPolicy enum"); -static gsi::QFlagsClass decl_QFormLayout_RowWrapPolicy_Enums ("QFormLayout_QFlags_RowWrapPolicy", +static gsi::QFlagsClass decl_QFormLayout_RowWrapPolicy_Enums ("QtGui", "QFormLayout_QFlags_RowWrapPolicy", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QFormLayout_RowWrapPolicy_Enum_in_parent (decl_QFormLayout_RowWrapPolicy_Enum.defs ()); -static gsi::ClassExt decl_QFormLayout_RowWrapPolicy_Enum_as_child (decl_QFormLayout_RowWrapPolicy_Enum, "RowWrapPolicy"); -static gsi::ClassExt decl_QFormLayout_RowWrapPolicy_Enums_as_child (decl_QFormLayout_RowWrapPolicy_Enums, "QFlags_RowWrapPolicy"); +static gsi::ClassExt decl_QFormLayout_RowWrapPolicy_Enum_as_child (decl_QFormLayout_RowWrapPolicy_Enum, "QtGui", "RowWrapPolicy"); +static gsi::ClassExt decl_QFormLayout_RowWrapPolicy_Enums_as_child (decl_QFormLayout_RowWrapPolicy_Enums, "QtGui", "QFlags_RowWrapPolicy"); } diff --git a/src/gsiqt4/gsiDeclQFrame.cc b/src/gsiqt/qt4/QtGui/gsiDeclQFrame.cc similarity index 99% rename from src/gsiqt4/gsiDeclQFrame.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQFrame.cc index bb1327917..67b79a1aa 100644 --- a/src/gsiqt4/gsiDeclQFrame.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQFrame.cc @@ -77,8 +77,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -462,11 +462,11 @@ static gsi::Methods methods_QFrame () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QFrame (qtdecl_QWidget (), "QFrame_Native", +qt_gsi::QtNativeClass decl_QFrame (qtdecl_QWidget (), "QtGui", "QFrame_Native", methods_QFrame (), "@hide\n@alias QFrame"); -GSIQT_PUBLIC gsi::Class &qtdecl_QFrame () { return decl_QFrame; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFrame () { return decl_QFrame; } } @@ -2701,7 +2701,7 @@ static gsi::Methods methods_QFrame_Adaptor () { return methods; } -gsi::Class decl_QFrame_Adaptor (qtdecl_QFrame (), "QFrame", +gsi::Class decl_QFrame_Adaptor (qtdecl_QFrame (), "QtGui", "QFrame", methods_QFrame_Adaptor (), "@qt\n@brief Binding of QFrame"); @@ -2712,19 +2712,19 @@ gsi::Class decl_QFrame_Adaptor (qtdecl_QFrame (), "QFrame", namespace qt_gsi { -static gsi::Enum decl_QFrame_Shadow_Enum ("QFrame_Shadow", +static gsi::Enum decl_QFrame_Shadow_Enum ("QtGui", "QFrame_Shadow", gsi::enum_const ("Plain", QFrame::Plain, "@brief Enum constant QFrame::Plain") + gsi::enum_const ("Raised", QFrame::Raised, "@brief Enum constant QFrame::Raised") + gsi::enum_const ("Sunken", QFrame::Sunken, "@brief Enum constant QFrame::Sunken"), "@qt\n@brief This class represents the QFrame::Shadow enum"); -static gsi::QFlagsClass decl_QFrame_Shadow_Enums ("QFrame_QFlags_Shadow", +static gsi::QFlagsClass decl_QFrame_Shadow_Enums ("QtGui", "QFrame_QFlags_Shadow", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QFrame_Shadow_Enum_in_parent (decl_QFrame_Shadow_Enum.defs ()); -static gsi::ClassExt decl_QFrame_Shadow_Enum_as_child (decl_QFrame_Shadow_Enum, "Shadow"); -static gsi::ClassExt decl_QFrame_Shadow_Enums_as_child (decl_QFrame_Shadow_Enums, "QFlags_Shadow"); +static gsi::ClassExt decl_QFrame_Shadow_Enum_as_child (decl_QFrame_Shadow_Enum, "QtGui", "Shadow"); +static gsi::ClassExt decl_QFrame_Shadow_Enums_as_child (decl_QFrame_Shadow_Enums, "QtGui", "QFlags_Shadow"); } @@ -2733,7 +2733,7 @@ static gsi::ClassExt decl_QFrame_Shadow_Enums_as_child (decl_QFrame_Shad namespace qt_gsi { -static gsi::Enum decl_QFrame_Shape_Enum ("QFrame_Shape", +static gsi::Enum decl_QFrame_Shape_Enum ("QtGui", "QFrame_Shape", gsi::enum_const ("NoFrame", QFrame::NoFrame, "@brief Enum constant QFrame::NoFrame") + gsi::enum_const ("Box", QFrame::Box, "@brief Enum constant QFrame::Box") + gsi::enum_const ("Panel", QFrame::Panel, "@brief Enum constant QFrame::Panel") + @@ -2743,13 +2743,13 @@ static gsi::Enum decl_QFrame_Shape_Enum ("QFrame_Shape", gsi::enum_const ("StyledPanel", QFrame::StyledPanel, "@brief Enum constant QFrame::StyledPanel"), "@qt\n@brief This class represents the QFrame::Shape enum"); -static gsi::QFlagsClass decl_QFrame_Shape_Enums ("QFrame_QFlags_Shape", +static gsi::QFlagsClass decl_QFrame_Shape_Enums ("QtGui", "QFrame_QFlags_Shape", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QFrame_Shape_Enum_in_parent (decl_QFrame_Shape_Enum.defs ()); -static gsi::ClassExt decl_QFrame_Shape_Enum_as_child (decl_QFrame_Shape_Enum, "Shape"); -static gsi::ClassExt decl_QFrame_Shape_Enums_as_child (decl_QFrame_Shape_Enums, "QFlags_Shape"); +static gsi::ClassExt decl_QFrame_Shape_Enum_as_child (decl_QFrame_Shape_Enum, "QtGui", "Shape"); +static gsi::ClassExt decl_QFrame_Shape_Enums_as_child (decl_QFrame_Shape_Enums, "QtGui", "QFlags_Shape"); } diff --git a/src/gsiqt4/gsiDeclQGesture.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGesture.cc similarity index 98% rename from src/gsiqt4/gsiDeclQGesture.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGesture.cc index b0d30a586..7b206c2fd 100644 --- a/src/gsiqt4/gsiDeclQGesture.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGesture.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -304,11 +304,11 @@ static gsi::Methods methods_QGesture () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QGesture (qtdecl_QObject (), "QGesture_Native", +qt_gsi::QtNativeClass decl_QGesture (qtdecl_QObject (), "QtGui", "QGesture_Native", methods_QGesture (), "@hide\n@alias QGesture"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGesture () { return decl_QGesture; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGesture () { return decl_QGesture; } } @@ -686,7 +686,7 @@ static gsi::Methods methods_QGesture_Adaptor () { return methods; } -gsi::Class decl_QGesture_Adaptor (qtdecl_QGesture (), "QGesture", +gsi::Class decl_QGesture_Adaptor (qtdecl_QGesture (), "QtGui", "QGesture", methods_QGesture_Adaptor (), "@qt\n@brief Binding of QGesture"); @@ -697,18 +697,18 @@ gsi::Class decl_QGesture_Adaptor (qtdecl_QGesture (), "QGestur namespace qt_gsi { -static gsi::Enum decl_QGesture_GestureCancelPolicy_Enum ("QGesture_GestureCancelPolicy", +static gsi::Enum decl_QGesture_GestureCancelPolicy_Enum ("QtGui", "QGesture_GestureCancelPolicy", gsi::enum_const ("CancelNone", QGesture::CancelNone, "@brief Enum constant QGesture::CancelNone") + gsi::enum_const ("CancelAllInContext", QGesture::CancelAllInContext, "@brief Enum constant QGesture::CancelAllInContext"), "@qt\n@brief This class represents the QGesture::GestureCancelPolicy enum"); -static gsi::QFlagsClass decl_QGesture_GestureCancelPolicy_Enums ("QGesture_QFlags_GestureCancelPolicy", +static gsi::QFlagsClass decl_QGesture_GestureCancelPolicy_Enums ("QtGui", "QGesture_QFlags_GestureCancelPolicy", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QGesture_GestureCancelPolicy_Enum_in_parent (decl_QGesture_GestureCancelPolicy_Enum.defs ()); -static gsi::ClassExt decl_QGesture_GestureCancelPolicy_Enum_as_child (decl_QGesture_GestureCancelPolicy_Enum, "GestureCancelPolicy"); -static gsi::ClassExt decl_QGesture_GestureCancelPolicy_Enums_as_child (decl_QGesture_GestureCancelPolicy_Enums, "QFlags_GestureCancelPolicy"); +static gsi::ClassExt decl_QGesture_GestureCancelPolicy_Enum_as_child (decl_QGesture_GestureCancelPolicy_Enum, "QtGui", "GestureCancelPolicy"); +static gsi::ClassExt decl_QGesture_GestureCancelPolicy_Enums_as_child (decl_QGesture_GestureCancelPolicy_Enums, "QtGui", "QFlags_GestureCancelPolicy"); } diff --git a/src/gsiqt4/gsiDeclQGestureEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGestureEvent.cc similarity index 98% rename from src/gsiqt4/gsiDeclQGestureEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGestureEvent.cc index 41ac2cf42..04eae0ff6 100644 --- a/src/gsiqt4/gsiDeclQGestureEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGestureEvent.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -417,11 +417,11 @@ static gsi::Methods methods_QGestureEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QGestureEvent (qtdecl_QEvent (), "QGestureEvent_Native", +gsi::Class decl_QGestureEvent (qtdecl_QEvent (), "QtGui", "QGestureEvent_Native", methods_QGestureEvent (), "@hide\n@alias QGestureEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGestureEvent () { return decl_QGestureEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGestureEvent () { return decl_QGestureEvent; } } @@ -472,7 +472,7 @@ static gsi::Methods methods_QGestureEvent_Adaptor () { return methods; } -gsi::Class decl_QGestureEvent_Adaptor (qtdecl_QGestureEvent (), "QGestureEvent", +gsi::Class decl_QGestureEvent_Adaptor (qtdecl_QGestureEvent (), "QtGui", "QGestureEvent", methods_QGestureEvent_Adaptor (), "@qt\n@brief Binding of QGestureEvent"); diff --git a/src/gsiqt4/gsiDeclQGestureRecognizer.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGestureRecognizer.cc similarity index 96% rename from src/gsiqt4/gsiDeclQGestureRecognizer.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGestureRecognizer.cc index a98a5ae4e..fb7dedcd3 100644 --- a/src/gsiqt4/gsiDeclQGestureRecognizer.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGestureRecognizer.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -155,11 +155,11 @@ static gsi::Methods methods_QGestureRecognizer () { return methods; } -gsi::Class decl_QGestureRecognizer ("QGestureRecognizer_Native", +gsi::Class decl_QGestureRecognizer ("QtGui", "QGestureRecognizer_Native", methods_QGestureRecognizer (), "@hide\n@alias QGestureRecognizer"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGestureRecognizer () { return decl_QGestureRecognizer; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGestureRecognizer () { return decl_QGestureRecognizer; } } @@ -338,7 +338,7 @@ static gsi::Methods methods_QGestureRecognizer_Adaptor () { return methods; } -gsi::Class decl_QGestureRecognizer_Adaptor (qtdecl_QGestureRecognizer (), "QGestureRecognizer", +gsi::Class decl_QGestureRecognizer_Adaptor (qtdecl_QGestureRecognizer (), "QtGui", "QGestureRecognizer", methods_QGestureRecognizer_Adaptor (), "@qt\n@brief Binding of QGestureRecognizer"); @@ -349,7 +349,7 @@ gsi::Class decl_QGestureRecognizer_Adaptor (qtdecl_Q namespace qt_gsi { -static gsi::Enum decl_QGestureRecognizer_ResultFlag_Enum ("QGestureRecognizer_ResultFlag", +static gsi::Enum decl_QGestureRecognizer_ResultFlag_Enum ("QtGui", "QGestureRecognizer_ResultFlag", gsi::enum_const ("Ignore", QGestureRecognizer::Ignore, "@brief Enum constant QGestureRecognizer::Ignore") + gsi::enum_const ("MayBeGesture", QGestureRecognizer::MayBeGesture, "@brief Enum constant QGestureRecognizer::MayBeGesture") + gsi::enum_const ("TriggerGesture", QGestureRecognizer::TriggerGesture, "@brief Enum constant QGestureRecognizer::TriggerGesture") + @@ -360,13 +360,13 @@ static gsi::Enum decl_QGestureRecognizer_ResultF gsi::enum_const ("ResultHint_Mask", QGestureRecognizer::ResultHint_Mask, "@brief Enum constant QGestureRecognizer::ResultHint_Mask"), "@qt\n@brief This class represents the QGestureRecognizer::ResultFlag enum"); -static gsi::QFlagsClass decl_QGestureRecognizer_ResultFlag_Enums ("QGestureRecognizer_QFlags_ResultFlag", +static gsi::QFlagsClass decl_QGestureRecognizer_ResultFlag_Enums ("QtGui", "QGestureRecognizer_QFlags_ResultFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QGestureRecognizer_ResultFlag_Enum_in_parent (decl_QGestureRecognizer_ResultFlag_Enum.defs ()); -static gsi::ClassExt decl_QGestureRecognizer_ResultFlag_Enum_as_child (decl_QGestureRecognizer_ResultFlag_Enum, "ResultFlag"); -static gsi::ClassExt decl_QGestureRecognizer_ResultFlag_Enums_as_child (decl_QGestureRecognizer_ResultFlag_Enums, "QFlags_ResultFlag"); +static gsi::ClassExt decl_QGestureRecognizer_ResultFlag_Enum_as_child (decl_QGestureRecognizer_ResultFlag_Enum, "QtGui", "ResultFlag"); +static gsi::ClassExt decl_QGestureRecognizer_ResultFlag_Enums_as_child (decl_QGestureRecognizer_ResultFlag_Enums, "QtGui", "QFlags_ResultFlag"); } diff --git a/src/gsiqt4/gsiDeclQGradient.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGradient.cc similarity index 93% rename from src/gsiqt4/gsiDeclQGradient.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGradient.cc index 927134e9f..470fe3c28 100644 --- a/src/gsiqt4/gsiDeclQGradient.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGradient.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -310,12 +310,12 @@ static gsi::Methods methods_QGradient () { return methods; } -gsi::Class decl_QGradient ("QGradient", +gsi::Class decl_QGradient ("QtGui", "QGradient", methods_QGradient (), "@qt\n@brief Binding of QGradient"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGradient () { return decl_QGradient; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGradient () { return decl_QGradient; } } @@ -324,19 +324,19 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QGradient () { return decl_QGradient; namespace qt_gsi { -static gsi::Enum decl_QGradient_CoordinateMode_Enum ("QGradient_CoordinateMode", +static gsi::Enum decl_QGradient_CoordinateMode_Enum ("QtGui", "QGradient_CoordinateMode", gsi::enum_const ("LogicalMode", QGradient::LogicalMode, "@brief Enum constant QGradient::LogicalMode") + gsi::enum_const ("StretchToDeviceMode", QGradient::StretchToDeviceMode, "@brief Enum constant QGradient::StretchToDeviceMode") + gsi::enum_const ("ObjectBoundingMode", QGradient::ObjectBoundingMode, "@brief Enum constant QGradient::ObjectBoundingMode"), "@qt\n@brief This class represents the QGradient::CoordinateMode enum"); -static gsi::QFlagsClass decl_QGradient_CoordinateMode_Enums ("QGradient_QFlags_CoordinateMode", +static gsi::QFlagsClass decl_QGradient_CoordinateMode_Enums ("QtGui", "QGradient_QFlags_CoordinateMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QGradient_CoordinateMode_Enum_in_parent (decl_QGradient_CoordinateMode_Enum.defs ()); -static gsi::ClassExt decl_QGradient_CoordinateMode_Enum_as_child (decl_QGradient_CoordinateMode_Enum, "CoordinateMode"); -static gsi::ClassExt decl_QGradient_CoordinateMode_Enums_as_child (decl_QGradient_CoordinateMode_Enums, "QFlags_CoordinateMode"); +static gsi::ClassExt decl_QGradient_CoordinateMode_Enum_as_child (decl_QGradient_CoordinateMode_Enum, "QtGui", "CoordinateMode"); +static gsi::ClassExt decl_QGradient_CoordinateMode_Enums_as_child (decl_QGradient_CoordinateMode_Enums, "QtGui", "QFlags_CoordinateMode"); } @@ -345,18 +345,18 @@ static gsi::ClassExt decl_QGradient_CoordinateMode_Enums_as_child (de namespace qt_gsi { -static gsi::Enum decl_QGradient_InterpolationMode_Enum ("QGradient_InterpolationMode", +static gsi::Enum decl_QGradient_InterpolationMode_Enum ("QtGui", "QGradient_InterpolationMode", gsi::enum_const ("ColorInterpolation", QGradient::ColorInterpolation, "@brief Enum constant QGradient::ColorInterpolation") + gsi::enum_const ("ComponentInterpolation", QGradient::ComponentInterpolation, "@brief Enum constant QGradient::ComponentInterpolation"), "@qt\n@brief This class represents the QGradient::InterpolationMode enum"); -static gsi::QFlagsClass decl_QGradient_InterpolationMode_Enums ("QGradient_QFlags_InterpolationMode", +static gsi::QFlagsClass decl_QGradient_InterpolationMode_Enums ("QtGui", "QGradient_QFlags_InterpolationMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QGradient_InterpolationMode_Enum_in_parent (decl_QGradient_InterpolationMode_Enum.defs ()); -static gsi::ClassExt decl_QGradient_InterpolationMode_Enum_as_child (decl_QGradient_InterpolationMode_Enum, "InterpolationMode"); -static gsi::ClassExt decl_QGradient_InterpolationMode_Enums_as_child (decl_QGradient_InterpolationMode_Enums, "QFlags_InterpolationMode"); +static gsi::ClassExt decl_QGradient_InterpolationMode_Enum_as_child (decl_QGradient_InterpolationMode_Enum, "QtGui", "InterpolationMode"); +static gsi::ClassExt decl_QGradient_InterpolationMode_Enums_as_child (decl_QGradient_InterpolationMode_Enums, "QtGui", "QFlags_InterpolationMode"); } @@ -365,19 +365,19 @@ static gsi::ClassExt decl_QGradient_InterpolationMode_Enums_as_child namespace qt_gsi { -static gsi::Enum decl_QGradient_Spread_Enum ("QGradient_Spread", +static gsi::Enum decl_QGradient_Spread_Enum ("QtGui", "QGradient_Spread", gsi::enum_const ("PadSpread", QGradient::PadSpread, "@brief Enum constant QGradient::PadSpread") + gsi::enum_const ("ReflectSpread", QGradient::ReflectSpread, "@brief Enum constant QGradient::ReflectSpread") + gsi::enum_const ("RepeatSpread", QGradient::RepeatSpread, "@brief Enum constant QGradient::RepeatSpread"), "@qt\n@brief This class represents the QGradient::Spread enum"); -static gsi::QFlagsClass decl_QGradient_Spread_Enums ("QGradient_QFlags_Spread", +static gsi::QFlagsClass decl_QGradient_Spread_Enums ("QtGui", "QGradient_QFlags_Spread", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QGradient_Spread_Enum_in_parent (decl_QGradient_Spread_Enum.defs ()); -static gsi::ClassExt decl_QGradient_Spread_Enum_as_child (decl_QGradient_Spread_Enum, "Spread"); -static gsi::ClassExt decl_QGradient_Spread_Enums_as_child (decl_QGradient_Spread_Enums, "QFlags_Spread"); +static gsi::ClassExt decl_QGradient_Spread_Enum_as_child (decl_QGradient_Spread_Enum, "QtGui", "Spread"); +static gsi::ClassExt decl_QGradient_Spread_Enums_as_child (decl_QGradient_Spread_Enums, "QtGui", "QFlags_Spread"); } @@ -386,20 +386,20 @@ static gsi::ClassExt decl_QGradient_Spread_Enums_as_child (decl_QGrad namespace qt_gsi { -static gsi::Enum decl_QGradient_Type_Enum ("QGradient_Type", +static gsi::Enum decl_QGradient_Type_Enum ("QtGui", "QGradient_Type", gsi::enum_const ("LinearGradient", QGradient::LinearGradient, "@brief Enum constant QGradient::LinearGradient") + gsi::enum_const ("RadialGradient", QGradient::RadialGradient, "@brief Enum constant QGradient::RadialGradient") + gsi::enum_const ("ConicalGradient", QGradient::ConicalGradient, "@brief Enum constant QGradient::ConicalGradient") + gsi::enum_const ("NoGradient", QGradient::NoGradient, "@brief Enum constant QGradient::NoGradient"), "@qt\n@brief This class represents the QGradient::Type enum"); -static gsi::QFlagsClass decl_QGradient_Type_Enums ("QGradient_QFlags_Type", +static gsi::QFlagsClass decl_QGradient_Type_Enums ("QtGui", "QGradient_QFlags_Type", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QGradient_Type_Enum_in_parent (decl_QGradient_Type_Enum.defs ()); -static gsi::ClassExt decl_QGradient_Type_Enum_as_child (decl_QGradient_Type_Enum, "Type"); -static gsi::ClassExt decl_QGradient_Type_Enums_as_child (decl_QGradient_Type_Enums, "QFlags_Type"); +static gsi::ClassExt decl_QGradient_Type_Enum_as_child (decl_QGradient_Type_Enum, "QtGui", "Type"); +static gsi::ClassExt decl_QGradient_Type_Enums_as_child (decl_QGradient_Type_Enums, "QtGui", "QFlags_Type"); } diff --git a/src/gsiqt4/gsiDeclQGraphicsAnchor.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsAnchor.cc similarity index 98% rename from src/gsiqt4/gsiDeclQGraphicsAnchor.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsAnchor.cc index de5709297..8368a5ab9 100644 --- a/src/gsiqt4/gsiDeclQGraphicsAnchor.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsAnchor.cc @@ -34,8 +34,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -255,11 +255,11 @@ static gsi::Methods methods_QGraphicsAnchor () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QGraphicsAnchor (qtdecl_QObject (), "QGraphicsAnchor_Native", +qt_gsi::QtNativeClass decl_QGraphicsAnchor (qtdecl_QObject (), "QtGui", "QGraphicsAnchor_Native", methods_QGraphicsAnchor (), "@hide\n@alias QGraphicsAnchor"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsAnchor () { return decl_QGraphicsAnchor; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsAnchor () { return decl_QGraphicsAnchor; } } @@ -606,7 +606,7 @@ static gsi::Methods methods_QGraphicsAnchor_Adaptor () { return methods; } -gsi::Class decl_QGraphicsAnchor_Adaptor (qtdecl_QGraphicsAnchor (), "QGraphicsAnchor", +gsi::Class decl_QGraphicsAnchor_Adaptor (qtdecl_QGraphicsAnchor (), "QtGui", "QGraphicsAnchor", methods_QGraphicsAnchor_Adaptor (), "@qt\n@brief Binding of QGraphicsAnchor"); diff --git a/src/gsiqt4/gsiDeclQGraphicsAnchorLayout.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsAnchorLayout.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGraphicsAnchorLayout.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsAnchorLayout.cc index 6cc2b696b..0b185ab1c 100644 --- a/src/gsiqt4/gsiDeclQGraphicsAnchorLayout.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsAnchorLayout.cc @@ -36,8 +36,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -358,11 +358,11 @@ static gsi::Methods methods_QGraphicsAnchorLayout () { gsi::Class &qtdecl_QGraphicsLayout (); -gsi::Class decl_QGraphicsAnchorLayout (qtdecl_QGraphicsLayout (), "QGraphicsAnchorLayout_Native", +gsi::Class decl_QGraphicsAnchorLayout (qtdecl_QGraphicsLayout (), "QtGui", "QGraphicsAnchorLayout_Native", methods_QGraphicsAnchorLayout (), "@hide\n@alias QGraphicsAnchorLayout"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsAnchorLayout () { return decl_QGraphicsAnchorLayout; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsAnchorLayout () { return decl_QGraphicsAnchorLayout; } } @@ -868,7 +868,7 @@ static gsi::Methods methods_QGraphicsAnchorLayout_Adaptor () { return methods; } -gsi::Class decl_QGraphicsAnchorLayout_Adaptor (qtdecl_QGraphicsAnchorLayout (), "QGraphicsAnchorLayout", +gsi::Class decl_QGraphicsAnchorLayout_Adaptor (qtdecl_QGraphicsAnchorLayout (), "QtGui", "QGraphicsAnchorLayout", methods_QGraphicsAnchorLayout_Adaptor (), "@qt\n@brief Binding of QGraphicsAnchorLayout"); diff --git a/src/gsiqt4/gsiDeclQGraphicsBlurEffect.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsBlurEffect.cc similarity index 98% rename from src/gsiqt4/gsiDeclQGraphicsBlurEffect.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsBlurEffect.cc index 1d66fa89f..c44ea6687 100644 --- a/src/gsiqt4/gsiDeclQGraphicsBlurEffect.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsBlurEffect.cc @@ -38,8 +38,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -265,11 +265,11 @@ static gsi::Methods methods_QGraphicsBlurEffect () { gsi::Class &qtdecl_QGraphicsEffect (); -qt_gsi::QtNativeClass decl_QGraphicsBlurEffect (qtdecl_QGraphicsEffect (), "QGraphicsBlurEffect_Native", +qt_gsi::QtNativeClass decl_QGraphicsBlurEffect (qtdecl_QGraphicsEffect (), "QtGui", "QGraphicsBlurEffect_Native", methods_QGraphicsBlurEffect (), "@hide\n@alias QGraphicsBlurEffect"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsBlurEffect () { return decl_QGraphicsBlurEffect; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsBlurEffect () { return decl_QGraphicsBlurEffect; } } @@ -967,7 +967,7 @@ static gsi::Methods methods_QGraphicsBlurEffect_Adaptor () { return methods; } -gsi::Class decl_QGraphicsBlurEffect_Adaptor (qtdecl_QGraphicsBlurEffect (), "QGraphicsBlurEffect", +gsi::Class decl_QGraphicsBlurEffect_Adaptor (qtdecl_QGraphicsBlurEffect (), "QtGui", "QGraphicsBlurEffect", methods_QGraphicsBlurEffect_Adaptor (), "@qt\n@brief Binding of QGraphicsBlurEffect"); @@ -978,19 +978,19 @@ gsi::Class decl_QGraphicsBlurEffect_Adaptor (qtdecl namespace qt_gsi { -static gsi::Enum decl_QGraphicsBlurEffect_BlurHint_Enum ("QGraphicsBlurEffect_BlurHint", +static gsi::Enum decl_QGraphicsBlurEffect_BlurHint_Enum ("QtGui", "QGraphicsBlurEffect_BlurHint", gsi::enum_const ("PerformanceHint", QGraphicsBlurEffect::PerformanceHint, "@brief Enum constant QGraphicsBlurEffect::PerformanceHint") + gsi::enum_const ("QualityHint", QGraphicsBlurEffect::QualityHint, "@brief Enum constant QGraphicsBlurEffect::QualityHint") + gsi::enum_const ("AnimationHint", QGraphicsBlurEffect::AnimationHint, "@brief Enum constant QGraphicsBlurEffect::AnimationHint"), "@qt\n@brief This class represents the QGraphicsBlurEffect::BlurHint enum"); -static gsi::QFlagsClass decl_QGraphicsBlurEffect_BlurHint_Enums ("QGraphicsBlurEffect_QFlags_BlurHint", +static gsi::QFlagsClass decl_QGraphicsBlurEffect_BlurHint_Enums ("QtGui", "QGraphicsBlurEffect_QFlags_BlurHint", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QGraphicsBlurEffect_BlurHint_Enum_in_parent (decl_QGraphicsBlurEffect_BlurHint_Enum.defs ()); -static gsi::ClassExt decl_QGraphicsBlurEffect_BlurHint_Enum_as_child (decl_QGraphicsBlurEffect_BlurHint_Enum, "BlurHint"); -static gsi::ClassExt decl_QGraphicsBlurEffect_BlurHint_Enums_as_child (decl_QGraphicsBlurEffect_BlurHint_Enums, "QFlags_BlurHint"); +static gsi::ClassExt decl_QGraphicsBlurEffect_BlurHint_Enum_as_child (decl_QGraphicsBlurEffect_BlurHint_Enum, "QtGui", "BlurHint"); +static gsi::ClassExt decl_QGraphicsBlurEffect_BlurHint_Enums_as_child (decl_QGraphicsBlurEffect_BlurHint_Enums, "QtGui", "QFlags_BlurHint"); } diff --git a/src/gsiqt4/gsiDeclQGraphicsColorizeEffect.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsColorizeEffect.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGraphicsColorizeEffect.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsColorizeEffect.cc index b4cb03947..0c35e854c 100644 --- a/src/gsiqt4/gsiDeclQGraphicsColorizeEffect.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsColorizeEffect.cc @@ -39,8 +39,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -246,11 +246,11 @@ static gsi::Methods methods_QGraphicsColorizeEffect () { gsi::Class &qtdecl_QGraphicsEffect (); -qt_gsi::QtNativeClass decl_QGraphicsColorizeEffect (qtdecl_QGraphicsEffect (), "QGraphicsColorizeEffect_Native", +qt_gsi::QtNativeClass decl_QGraphicsColorizeEffect (qtdecl_QGraphicsEffect (), "QtGui", "QGraphicsColorizeEffect_Native", methods_QGraphicsColorizeEffect (), "@hide\n@alias QGraphicsColorizeEffect"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsColorizeEffect () { return decl_QGraphicsColorizeEffect; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsColorizeEffect () { return decl_QGraphicsColorizeEffect; } } @@ -948,7 +948,7 @@ static gsi::Methods methods_QGraphicsColorizeEffect_Adaptor () { return methods; } -gsi::Class decl_QGraphicsColorizeEffect_Adaptor (qtdecl_QGraphicsColorizeEffect (), "QGraphicsColorizeEffect", +gsi::Class decl_QGraphicsColorizeEffect_Adaptor (qtdecl_QGraphicsColorizeEffect (), "QtGui", "QGraphicsColorizeEffect", methods_QGraphicsColorizeEffect_Adaptor (), "@qt\n@brief Binding of QGraphicsColorizeEffect"); diff --git a/src/gsiqt4/gsiDeclQGraphicsDropShadowEffect.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsDropShadowEffect.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGraphicsDropShadowEffect.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsDropShadowEffect.cc index 45ad8cb7c..f90141dc9 100644 --- a/src/gsiqt4/gsiDeclQGraphicsDropShadowEffect.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsDropShadowEffect.cc @@ -40,8 +40,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -424,11 +424,11 @@ static gsi::Methods methods_QGraphicsDropShadowEffect () { gsi::Class &qtdecl_QGraphicsEffect (); -qt_gsi::QtNativeClass decl_QGraphicsDropShadowEffect (qtdecl_QGraphicsEffect (), "QGraphicsDropShadowEffect_Native", +qt_gsi::QtNativeClass decl_QGraphicsDropShadowEffect (qtdecl_QGraphicsEffect (), "QtGui", "QGraphicsDropShadowEffect_Native", methods_QGraphicsDropShadowEffect (), "@hide\n@alias QGraphicsDropShadowEffect"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsDropShadowEffect () { return decl_QGraphicsDropShadowEffect; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsDropShadowEffect () { return decl_QGraphicsDropShadowEffect; } } @@ -1151,7 +1151,7 @@ static gsi::Methods methods_QGraphicsDropShadowEffect_Adaptor () { return methods; } -gsi::Class decl_QGraphicsDropShadowEffect_Adaptor (qtdecl_QGraphicsDropShadowEffect (), "QGraphicsDropShadowEffect", +gsi::Class decl_QGraphicsDropShadowEffect_Adaptor (qtdecl_QGraphicsDropShadowEffect (), "QtGui", "QGraphicsDropShadowEffect", methods_QGraphicsDropShadowEffect_Adaptor (), "@qt\n@brief Binding of QGraphicsDropShadowEffect"); diff --git a/src/gsiqt4/gsiDeclQGraphicsEffect.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsEffect.cc similarity index 98% rename from src/gsiqt4/gsiDeclQGraphicsEffect.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsEffect.cc index c9a1539b8..98df2fa09 100644 --- a/src/gsiqt4/gsiDeclQGraphicsEffect.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsEffect.cc @@ -38,8 +38,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -259,11 +259,11 @@ static gsi::Methods methods_QGraphicsEffect () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QGraphicsEffect (qtdecl_QObject (), "QGraphicsEffect_Native", +qt_gsi::QtNativeClass decl_QGraphicsEffect (qtdecl_QObject (), "QtGui", "QGraphicsEffect_Native", methods_QGraphicsEffect (), "@hide\n@alias QGraphicsEffect"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsEffect () { return decl_QGraphicsEffect; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsEffect () { return decl_QGraphicsEffect; } } @@ -912,7 +912,7 @@ static gsi::Methods methods_QGraphicsEffect_Adaptor () { return methods; } -gsi::Class decl_QGraphicsEffect_Adaptor (qtdecl_QGraphicsEffect (), "QGraphicsEffect", +gsi::Class decl_QGraphicsEffect_Adaptor (qtdecl_QGraphicsEffect (), "QtGui", "QGraphicsEffect", methods_QGraphicsEffect_Adaptor (), "@qt\n@brief Binding of QGraphicsEffect"); @@ -923,20 +923,20 @@ gsi::Class decl_QGraphicsEffect_Adaptor (qtdecl_QGraphi namespace qt_gsi { -static gsi::Enum decl_QGraphicsEffect_ChangeFlag_Enum ("QGraphicsEffect_ChangeFlag", +static gsi::Enum decl_QGraphicsEffect_ChangeFlag_Enum ("QtGui", "QGraphicsEffect_ChangeFlag", gsi::enum_const ("SourceAttached", QGraphicsEffect::SourceAttached, "@brief Enum constant QGraphicsEffect::SourceAttached") + gsi::enum_const ("SourceDetached", QGraphicsEffect::SourceDetached, "@brief Enum constant QGraphicsEffect::SourceDetached") + gsi::enum_const ("SourceBoundingRectChanged", QGraphicsEffect::SourceBoundingRectChanged, "@brief Enum constant QGraphicsEffect::SourceBoundingRectChanged") + gsi::enum_const ("SourceInvalidated", QGraphicsEffect::SourceInvalidated, "@brief Enum constant QGraphicsEffect::SourceInvalidated"), "@qt\n@brief This class represents the QGraphicsEffect::ChangeFlag enum"); -static gsi::QFlagsClass decl_QGraphicsEffect_ChangeFlag_Enums ("QGraphicsEffect_QFlags_ChangeFlag", +static gsi::QFlagsClass decl_QGraphicsEffect_ChangeFlag_Enums ("QtGui", "QGraphicsEffect_QFlags_ChangeFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QGraphicsEffect_ChangeFlag_Enum_in_parent (decl_QGraphicsEffect_ChangeFlag_Enum.defs ()); -static gsi::ClassExt decl_QGraphicsEffect_ChangeFlag_Enum_as_child (decl_QGraphicsEffect_ChangeFlag_Enum, "ChangeFlag"); -static gsi::ClassExt decl_QGraphicsEffect_ChangeFlag_Enums_as_child (decl_QGraphicsEffect_ChangeFlag_Enums, "QFlags_ChangeFlag"); +static gsi::ClassExt decl_QGraphicsEffect_ChangeFlag_Enum_as_child (decl_QGraphicsEffect_ChangeFlag_Enum, "QtGui", "ChangeFlag"); +static gsi::ClassExt decl_QGraphicsEffect_ChangeFlag_Enums_as_child (decl_QGraphicsEffect_ChangeFlag_Enums, "QtGui", "QFlags_ChangeFlag"); } @@ -945,19 +945,19 @@ static gsi::ClassExt decl_QGraphicsEffect_ChangeFlag_Enums_as_c namespace qt_gsi { -static gsi::Enum decl_QGraphicsEffect_PixmapPadMode_Enum ("QGraphicsEffect_PixmapPadMode", +static gsi::Enum decl_QGraphicsEffect_PixmapPadMode_Enum ("QtGui", "QGraphicsEffect_PixmapPadMode", gsi::enum_const ("NoPad", QGraphicsEffect::NoPad, "@brief Enum constant QGraphicsEffect::NoPad") + gsi::enum_const ("PadToTransparentBorder", QGraphicsEffect::PadToTransparentBorder, "@brief Enum constant QGraphicsEffect::PadToTransparentBorder") + gsi::enum_const ("PadToEffectiveBoundingRect", QGraphicsEffect::PadToEffectiveBoundingRect, "@brief Enum constant QGraphicsEffect::PadToEffectiveBoundingRect"), "@qt\n@brief This class represents the QGraphicsEffect::PixmapPadMode enum"); -static gsi::QFlagsClass decl_QGraphicsEffect_PixmapPadMode_Enums ("QGraphicsEffect_QFlags_PixmapPadMode", +static gsi::QFlagsClass decl_QGraphicsEffect_PixmapPadMode_Enums ("QtGui", "QGraphicsEffect_QFlags_PixmapPadMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QGraphicsEffect_PixmapPadMode_Enum_in_parent (decl_QGraphicsEffect_PixmapPadMode_Enum.defs ()); -static gsi::ClassExt decl_QGraphicsEffect_PixmapPadMode_Enum_as_child (decl_QGraphicsEffect_PixmapPadMode_Enum, "PixmapPadMode"); -static gsi::ClassExt decl_QGraphicsEffect_PixmapPadMode_Enums_as_child (decl_QGraphicsEffect_PixmapPadMode_Enums, "QFlags_PixmapPadMode"); +static gsi::ClassExt decl_QGraphicsEffect_PixmapPadMode_Enum_as_child (decl_QGraphicsEffect_PixmapPadMode_Enum, "QtGui", "PixmapPadMode"); +static gsi::ClassExt decl_QGraphicsEffect_PixmapPadMode_Enums_as_child (decl_QGraphicsEffect_PixmapPadMode_Enums, "QtGui", "QFlags_PixmapPadMode"); } diff --git a/src/gsiqt4/gsiDeclQGraphicsEllipseItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsEllipseItem.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGraphicsEllipseItem.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsEllipseItem.cc index 9bc3acc62..827560e9e 100644 --- a/src/gsiqt4/gsiDeclQGraphicsEllipseItem.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsEllipseItem.cc @@ -58,8 +58,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -347,11 +347,11 @@ static gsi::Methods methods_QGraphicsEllipseItem () { gsi::Class &qtdecl_QAbstractGraphicsShapeItem (); -gsi::Class decl_QGraphicsEllipseItem (qtdecl_QAbstractGraphicsShapeItem (), "QGraphicsEllipseItem_Native", +gsi::Class decl_QGraphicsEllipseItem (qtdecl_QAbstractGraphicsShapeItem (), "QtGui", "QGraphicsEllipseItem_Native", methods_QGraphicsEllipseItem (), "@hide\n@alias QGraphicsEllipseItem"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsEllipseItem () { return decl_QGraphicsEllipseItem; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsEllipseItem () { return decl_QGraphicsEllipseItem; } } @@ -2035,7 +2035,7 @@ static gsi::Methods methods_QGraphicsEllipseItem_Adaptor () { return methods; } -gsi::Class decl_QGraphicsEllipseItem_Adaptor (qtdecl_QGraphicsEllipseItem (), "QGraphicsEllipseItem", +gsi::Class decl_QGraphicsEllipseItem_Adaptor (qtdecl_QGraphicsEllipseItem (), "QtGui", "QGraphicsEllipseItem", methods_QGraphicsEllipseItem_Adaptor (), "@qt\n@brief Binding of QGraphicsEllipseItem"); diff --git a/src/gsiqt4/gsiDeclQGraphicsGridLayout.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsGridLayout.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGraphicsGridLayout.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsGridLayout.cc index 4e1eb96b3..70271c87c 100644 --- a/src/gsiqt4/gsiDeclQGraphicsGridLayout.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsGridLayout.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1006,11 +1006,11 @@ static gsi::Methods methods_QGraphicsGridLayout () { gsi::Class &qtdecl_QGraphicsLayout (); -gsi::Class decl_QGraphicsGridLayout (qtdecl_QGraphicsLayout (), "QGraphicsGridLayout_Native", +gsi::Class decl_QGraphicsGridLayout (qtdecl_QGraphicsLayout (), "QtGui", "QGraphicsGridLayout_Native", methods_QGraphicsGridLayout (), "@hide\n@alias QGraphicsGridLayout"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsGridLayout () { return decl_QGraphicsGridLayout; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsGridLayout () { return decl_QGraphicsGridLayout; } } @@ -1516,7 +1516,7 @@ static gsi::Methods methods_QGraphicsGridLayout_Adaptor () { return methods; } -gsi::Class decl_QGraphicsGridLayout_Adaptor (qtdecl_QGraphicsGridLayout (), "QGraphicsGridLayout", +gsi::Class decl_QGraphicsGridLayout_Adaptor (qtdecl_QGraphicsGridLayout (), "QtGui", "QGraphicsGridLayout", methods_QGraphicsGridLayout_Adaptor (), "@qt\n@brief Binding of QGraphicsGridLayout"); diff --git a/src/gsiqt4/gsiDeclQGraphicsItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsItem.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGraphicsItem.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsItem.cc index d228029c2..94d1341fd 100644 --- a/src/gsiqt4/gsiDeclQGraphicsItem.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsItem.cc @@ -40,8 +40,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -3885,11 +3885,11 @@ static gsi::Methods methods_QGraphicsItem () { return methods; } -gsi::Class decl_QGraphicsItem ("QGraphicsItem_Native", +gsi::Class decl_QGraphicsItem ("QtGui", "QGraphicsItem_Native", methods_QGraphicsItem (), "@hide\n@alias QGraphicsItem"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsItem () { return decl_QGraphicsItem; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsItem () { return decl_QGraphicsItem; } } @@ -5481,7 +5481,7 @@ static gsi::Methods methods_QGraphicsItem_Adaptor () { return methods; } -gsi::Class decl_QGraphicsItem_Adaptor (qtdecl_QGraphicsItem (), "QGraphicsItem", +gsi::Class decl_QGraphicsItem_Adaptor (qtdecl_QGraphicsItem (), "QtGui", "QGraphicsItem", methods_QGraphicsItem_Adaptor (), "@qt\n@brief Binding of QGraphicsItem"); @@ -5492,19 +5492,19 @@ gsi::Class decl_QGraphicsItem_Adaptor (qtdecl_QGraphicsIt namespace qt_gsi { -static gsi::Enum decl_QGraphicsItem_CacheMode_Enum ("QGraphicsItem_CacheMode", +static gsi::Enum decl_QGraphicsItem_CacheMode_Enum ("QtGui", "QGraphicsItem_CacheMode", gsi::enum_const ("NoCache", QGraphicsItem::NoCache, "@brief Enum constant QGraphicsItem::NoCache") + gsi::enum_const ("ItemCoordinateCache", QGraphicsItem::ItemCoordinateCache, "@brief Enum constant QGraphicsItem::ItemCoordinateCache") + gsi::enum_const ("DeviceCoordinateCache", QGraphicsItem::DeviceCoordinateCache, "@brief Enum constant QGraphicsItem::DeviceCoordinateCache"), "@qt\n@brief This class represents the QGraphicsItem::CacheMode enum"); -static gsi::QFlagsClass decl_QGraphicsItem_CacheMode_Enums ("QGraphicsItem_QFlags_CacheMode", +static gsi::QFlagsClass decl_QGraphicsItem_CacheMode_Enums ("QtGui", "QGraphicsItem_QFlags_CacheMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QGraphicsItem_CacheMode_Enum_in_parent (decl_QGraphicsItem_CacheMode_Enum.defs ()); -static gsi::ClassExt decl_QGraphicsItem_CacheMode_Enum_as_child (decl_QGraphicsItem_CacheMode_Enum, "CacheMode"); -static gsi::ClassExt decl_QGraphicsItem_CacheMode_Enums_as_child (decl_QGraphicsItem_CacheMode_Enums, "QFlags_CacheMode"); +static gsi::ClassExt decl_QGraphicsItem_CacheMode_Enum_as_child (decl_QGraphicsItem_CacheMode_Enum, "QtGui", "CacheMode"); +static gsi::ClassExt decl_QGraphicsItem_CacheMode_Enums_as_child (decl_QGraphicsItem_CacheMode_Enums, "QtGui", "QFlags_CacheMode"); } @@ -5513,7 +5513,7 @@ static gsi::ClassExt decl_QGraphicsItem_CacheMode_Enums_as_child namespace qt_gsi { -static gsi::Enum decl_QGraphicsItem_GraphicsItemChange_Enum ("QGraphicsItem_GraphicsItemChange", +static gsi::Enum decl_QGraphicsItem_GraphicsItemChange_Enum ("QtGui", "QGraphicsItem_GraphicsItemChange", gsi::enum_const ("ItemPositionChange", QGraphicsItem::ItemPositionChange, "@brief Enum constant QGraphicsItem::ItemPositionChange") + gsi::enum_const ("ItemMatrixChange", QGraphicsItem::ItemMatrixChange, "@brief Enum constant QGraphicsItem::ItemMatrixChange") + gsi::enum_const ("ItemVisibleChange", QGraphicsItem::ItemVisibleChange, "@brief Enum constant QGraphicsItem::ItemVisibleChange") + @@ -5544,13 +5544,13 @@ static gsi::Enum decl_QGraphicsItem_GraphicsI gsi::enum_const ("ItemScenePositionHasChanged", QGraphicsItem::ItemScenePositionHasChanged, "@brief Enum constant QGraphicsItem::ItemScenePositionHasChanged"), "@qt\n@brief This class represents the QGraphicsItem::GraphicsItemChange enum"); -static gsi::QFlagsClass decl_QGraphicsItem_GraphicsItemChange_Enums ("QGraphicsItem_QFlags_GraphicsItemChange", +static gsi::QFlagsClass decl_QGraphicsItem_GraphicsItemChange_Enums ("QtGui", "QGraphicsItem_QFlags_GraphicsItemChange", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QGraphicsItem_GraphicsItemChange_Enum_in_parent (decl_QGraphicsItem_GraphicsItemChange_Enum.defs ()); -static gsi::ClassExt decl_QGraphicsItem_GraphicsItemChange_Enum_as_child (decl_QGraphicsItem_GraphicsItemChange_Enum, "GraphicsItemChange"); -static gsi::ClassExt decl_QGraphicsItem_GraphicsItemChange_Enums_as_child (decl_QGraphicsItem_GraphicsItemChange_Enums, "QFlags_GraphicsItemChange"); +static gsi::ClassExt decl_QGraphicsItem_GraphicsItemChange_Enum_as_child (decl_QGraphicsItem_GraphicsItemChange_Enum, "QtGui", "GraphicsItemChange"); +static gsi::ClassExt decl_QGraphicsItem_GraphicsItemChange_Enums_as_child (decl_QGraphicsItem_GraphicsItemChange_Enums, "QtGui", "QFlags_GraphicsItemChange"); } @@ -5559,7 +5559,7 @@ static gsi::ClassExt decl_QGraphicsItem_GraphicsItemChange_Enums_ namespace qt_gsi { -static gsi::Enum decl_QGraphicsItem_GraphicsItemFlag_Enum ("QGraphicsItem_GraphicsItemFlag", +static gsi::Enum decl_QGraphicsItem_GraphicsItemFlag_Enum ("QtGui", "QGraphicsItem_GraphicsItemFlag", gsi::enum_const ("ItemIsMovable", QGraphicsItem::ItemIsMovable, "@brief Enum constant QGraphicsItem::ItemIsMovable") + gsi::enum_const ("ItemIsSelectable", QGraphicsItem::ItemIsSelectable, "@brief Enum constant QGraphicsItem::ItemIsSelectable") + gsi::enum_const ("ItemIsFocusable", QGraphicsItem::ItemIsFocusable, "@brief Enum constant QGraphicsItem::ItemIsFocusable") + @@ -5579,13 +5579,13 @@ static gsi::Enum decl_QGraphicsItem_GraphicsIte gsi::enum_const ("ItemSendsScenePositionChanges", QGraphicsItem::ItemSendsScenePositionChanges, "@brief Enum constant QGraphicsItem::ItemSendsScenePositionChanges"), "@qt\n@brief This class represents the QGraphicsItem::GraphicsItemFlag enum"); -static gsi::QFlagsClass decl_QGraphicsItem_GraphicsItemFlag_Enums ("QGraphicsItem_QFlags_GraphicsItemFlag", +static gsi::QFlagsClass decl_QGraphicsItem_GraphicsItemFlag_Enums ("QtGui", "QGraphicsItem_QFlags_GraphicsItemFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QGraphicsItem_GraphicsItemFlag_Enum_in_parent (decl_QGraphicsItem_GraphicsItemFlag_Enum.defs ()); -static gsi::ClassExt decl_QGraphicsItem_GraphicsItemFlag_Enum_as_child (decl_QGraphicsItem_GraphicsItemFlag_Enum, "GraphicsItemFlag"); -static gsi::ClassExt decl_QGraphicsItem_GraphicsItemFlag_Enums_as_child (decl_QGraphicsItem_GraphicsItemFlag_Enums, "QFlags_GraphicsItemFlag"); +static gsi::ClassExt decl_QGraphicsItem_GraphicsItemFlag_Enum_as_child (decl_QGraphicsItem_GraphicsItemFlag_Enum, "QtGui", "GraphicsItemFlag"); +static gsi::ClassExt decl_QGraphicsItem_GraphicsItemFlag_Enums_as_child (decl_QGraphicsItem_GraphicsItemFlag_Enums, "QtGui", "QFlags_GraphicsItemFlag"); } @@ -5594,19 +5594,19 @@ static gsi::ClassExt decl_QGraphicsItem_GraphicsItemFlag_Enums_as namespace qt_gsi { -static gsi::Enum decl_QGraphicsItem_PanelModality_Enum ("QGraphicsItem_PanelModality", +static gsi::Enum decl_QGraphicsItem_PanelModality_Enum ("QtGui", "QGraphicsItem_PanelModality", gsi::enum_const ("NonModal", QGraphicsItem::NonModal, "@brief Enum constant QGraphicsItem::NonModal") + gsi::enum_const ("PanelModal", QGraphicsItem::PanelModal, "@brief Enum constant QGraphicsItem::PanelModal") + gsi::enum_const ("SceneModal", QGraphicsItem::SceneModal, "@brief Enum constant QGraphicsItem::SceneModal"), "@qt\n@brief This class represents the QGraphicsItem::PanelModality enum"); -static gsi::QFlagsClass decl_QGraphicsItem_PanelModality_Enums ("QGraphicsItem_QFlags_PanelModality", +static gsi::QFlagsClass decl_QGraphicsItem_PanelModality_Enums ("QtGui", "QGraphicsItem_QFlags_PanelModality", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QGraphicsItem_PanelModality_Enum_in_parent (decl_QGraphicsItem_PanelModality_Enum.defs ()); -static gsi::ClassExt decl_QGraphicsItem_PanelModality_Enum_as_child (decl_QGraphicsItem_PanelModality_Enum, "PanelModality"); -static gsi::ClassExt decl_QGraphicsItem_PanelModality_Enums_as_child (decl_QGraphicsItem_PanelModality_Enums, "QFlags_PanelModality"); +static gsi::ClassExt decl_QGraphicsItem_PanelModality_Enum_as_child (decl_QGraphicsItem_PanelModality_Enum, "QtGui", "PanelModality"); +static gsi::ClassExt decl_QGraphicsItem_PanelModality_Enums_as_child (decl_QGraphicsItem_PanelModality_Enums, "QtGui", "QFlags_PanelModality"); } diff --git a/src/gsiqt4/gsiDeclQGraphicsItemAnimation.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsItemAnimation.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGraphicsItemAnimation.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsItemAnimation.cc index cf0e196a0..777ed985a 100644 --- a/src/gsiqt4/gsiDeclQGraphicsItemAnimation.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsItemAnimation.cc @@ -38,8 +38,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -686,11 +686,11 @@ static gsi::Methods methods_QGraphicsItemAnimation () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QGraphicsItemAnimation (qtdecl_QObject (), "QGraphicsItemAnimation_Native", +qt_gsi::QtNativeClass decl_QGraphicsItemAnimation (qtdecl_QObject (), "QtGui", "QGraphicsItemAnimation_Native", methods_QGraphicsItemAnimation (), "@hide\n@alias QGraphicsItemAnimation"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsItemAnimation () { return decl_QGraphicsItemAnimation; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsItemAnimation () { return decl_QGraphicsItemAnimation; } } @@ -1152,7 +1152,7 @@ static gsi::Methods methods_QGraphicsItemAnimation_Adaptor () { return methods; } -gsi::Class decl_QGraphicsItemAnimation_Adaptor (qtdecl_QGraphicsItemAnimation (), "QGraphicsItemAnimation", +gsi::Class decl_QGraphicsItemAnimation_Adaptor (qtdecl_QGraphicsItemAnimation (), "QtGui", "QGraphicsItemAnimation", methods_QGraphicsItemAnimation_Adaptor (), "@qt\n@brief Binding of QGraphicsItemAnimation"); diff --git a/src/gsiqt4/gsiDeclQGraphicsItemGroup.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsItemGroup.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGraphicsItemGroup.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsItemGroup.cc index 5a35956df..3fa2b8a0f 100644 --- a/src/gsiqt4/gsiDeclQGraphicsItemGroup.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsItemGroup.cc @@ -55,8 +55,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -210,11 +210,11 @@ static gsi::Methods methods_QGraphicsItemGroup () { gsi::Class &qtdecl_QGraphicsItem (); -gsi::Class decl_QGraphicsItemGroup (qtdecl_QGraphicsItem (), "QGraphicsItemGroup_Native", +gsi::Class decl_QGraphicsItemGroup (qtdecl_QGraphicsItem (), "QtGui", "QGraphicsItemGroup_Native", methods_QGraphicsItemGroup (), "@hide\n@alias QGraphicsItemGroup"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsItemGroup () { return decl_QGraphicsItemGroup; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsItemGroup () { return decl_QGraphicsItemGroup; } } @@ -1803,7 +1803,7 @@ static gsi::Methods methods_QGraphicsItemGroup_Adaptor () { return methods; } -gsi::Class decl_QGraphicsItemGroup_Adaptor (qtdecl_QGraphicsItemGroup (), "QGraphicsItemGroup", +gsi::Class decl_QGraphicsItemGroup_Adaptor (qtdecl_QGraphicsItemGroup (), "QtGui", "QGraphicsItemGroup", methods_QGraphicsItemGroup_Adaptor (), "@qt\n@brief Binding of QGraphicsItemGroup"); diff --git a/src/gsiqt4/gsiDeclQGraphicsLayout.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsLayout.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGraphicsLayout.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsLayout.cc index 27cc669e9..553c26620 100644 --- a/src/gsiqt4/gsiDeclQGraphicsLayout.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsLayout.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -257,11 +257,11 @@ static gsi::Methods methods_QGraphicsLayout () { gsi::Class &qtdecl_QGraphicsLayoutItem (); -gsi::Class decl_QGraphicsLayout (qtdecl_QGraphicsLayoutItem (), "QGraphicsLayout_Native", +gsi::Class decl_QGraphicsLayout (qtdecl_QGraphicsLayoutItem (), "QtGui", "QGraphicsLayout_Native", methods_QGraphicsLayout (), "@hide\n@alias QGraphicsLayout"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsLayout () { return decl_QGraphicsLayout; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsLayout () { return decl_QGraphicsLayout; } } @@ -771,7 +771,7 @@ static gsi::Methods methods_QGraphicsLayout_Adaptor () { return methods; } -gsi::Class decl_QGraphicsLayout_Adaptor (qtdecl_QGraphicsLayout (), "QGraphicsLayout", +gsi::Class decl_QGraphicsLayout_Adaptor (qtdecl_QGraphicsLayout (), "QtGui", "QGraphicsLayout", methods_QGraphicsLayout_Adaptor (), "@qt\n@brief Binding of QGraphicsLayout"); diff --git a/src/gsiqt4/gsiDeclQGraphicsLayoutItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsLayoutItem.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGraphicsLayoutItem.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsLayoutItem.cc index d1197d168..e995b7aa2 100644 --- a/src/gsiqt4/gsiDeclQGraphicsLayoutItem.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsLayoutItem.cc @@ -33,8 +33,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -725,11 +725,11 @@ static gsi::Methods methods_QGraphicsLayoutItem () { return methods; } -gsi::Class decl_QGraphicsLayoutItem ("QGraphicsLayoutItem_Native", +gsi::Class decl_QGraphicsLayoutItem ("QtGui", "QGraphicsLayoutItem_Native", methods_QGraphicsLayoutItem (), "@hide\n@alias QGraphicsLayoutItem"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsLayoutItem () { return decl_QGraphicsLayoutItem; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsLayoutItem () { return decl_QGraphicsLayoutItem; } } @@ -1021,7 +1021,7 @@ static gsi::Methods methods_QGraphicsLayoutItem_Adaptor () { return methods; } -gsi::Class decl_QGraphicsLayoutItem_Adaptor (qtdecl_QGraphicsLayoutItem (), "QGraphicsLayoutItem", +gsi::Class decl_QGraphicsLayoutItem_Adaptor (qtdecl_QGraphicsLayoutItem (), "QtGui", "QGraphicsLayoutItem", methods_QGraphicsLayoutItem_Adaptor (), "@qt\n@brief Binding of QGraphicsLayoutItem"); diff --git a/src/gsiqt4/gsiDeclQGraphicsLineItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsLineItem.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGraphicsLineItem.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsLineItem.cc index dd9aefa14..195f59272 100644 --- a/src/gsiqt4/gsiDeclQGraphicsLineItem.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsLineItem.cc @@ -58,8 +58,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -310,11 +310,11 @@ static gsi::Methods methods_QGraphicsLineItem () { gsi::Class &qtdecl_QGraphicsItem (); -gsi::Class decl_QGraphicsLineItem (qtdecl_QGraphicsItem (), "QGraphicsLineItem_Native", +gsi::Class decl_QGraphicsLineItem (qtdecl_QGraphicsItem (), "QtGui", "QGraphicsLineItem_Native", methods_QGraphicsLineItem (), "@hide\n@alias QGraphicsLineItem"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsLineItem () { return decl_QGraphicsLineItem; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsLineItem () { return decl_QGraphicsLineItem; } } @@ -1998,7 +1998,7 @@ static gsi::Methods methods_QGraphicsLineItem_Adaptor () { return methods; } -gsi::Class decl_QGraphicsLineItem_Adaptor (qtdecl_QGraphicsLineItem (), "QGraphicsLineItem", +gsi::Class decl_QGraphicsLineItem_Adaptor (qtdecl_QGraphicsLineItem (), "QtGui", "QGraphicsLineItem", methods_QGraphicsLineItem_Adaptor (), "@qt\n@brief Binding of QGraphicsLineItem"); diff --git a/src/gsiqt4/gsiDeclQGraphicsLinearLayout.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsLinearLayout.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGraphicsLinearLayout.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsLinearLayout.cc index bfc221951..62a5be438 100644 --- a/src/gsiqt4/gsiDeclQGraphicsLinearLayout.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsLinearLayout.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -508,11 +508,11 @@ static gsi::Methods methods_QGraphicsLinearLayout () { gsi::Class &qtdecl_QGraphicsLayout (); -gsi::Class decl_QGraphicsLinearLayout (qtdecl_QGraphicsLayout (), "QGraphicsLinearLayout_Native", +gsi::Class decl_QGraphicsLinearLayout (qtdecl_QGraphicsLayout (), "QtGui", "QGraphicsLinearLayout_Native", methods_QGraphicsLinearLayout (), "@hide\n@alias QGraphicsLinearLayout"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsLinearLayout () { return decl_QGraphicsLinearLayout; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsLinearLayout () { return decl_QGraphicsLinearLayout; } } @@ -1052,7 +1052,7 @@ static gsi::Methods methods_QGraphicsLinearLayout_Adaptor () { return methods; } -gsi::Class decl_QGraphicsLinearLayout_Adaptor (qtdecl_QGraphicsLinearLayout (), "QGraphicsLinearLayout", +gsi::Class decl_QGraphicsLinearLayout_Adaptor (qtdecl_QGraphicsLinearLayout (), "QtGui", "QGraphicsLinearLayout", methods_QGraphicsLinearLayout_Adaptor (), "@qt\n@brief Binding of QGraphicsLinearLayout"); diff --git a/src/gsiqt4/gsiDeclQGraphicsObject.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsObject.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGraphicsObject.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsObject.cc index 210e9ba65..8d1b86a06 100644 --- a/src/gsiqt4/gsiDeclQGraphicsObject.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsObject.cc @@ -59,8 +59,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -308,11 +308,11 @@ static gsi::Methods methods_QGraphicsObject () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QGraphicsObject (qtdecl_QObject (), "QGraphicsObject_Native", +qt_gsi::QtNativeClass decl_QGraphicsObject (qtdecl_QObject (), "QtGui", "QGraphicsObject_Native", methods_QGraphicsObject (), "@hide\n@alias QGraphicsObject"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsObject () { return decl_QGraphicsObject; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsObject () { return decl_QGraphicsObject; } } @@ -2406,7 +2406,7 @@ static gsi::Methods methods_QGraphicsObject_Adaptor () { return methods; } -gsi::Class decl_QGraphicsObject_Adaptor (qtdecl_QGraphicsObject (), "QGraphicsObject", +gsi::Class decl_QGraphicsObject_Adaptor (qtdecl_QGraphicsObject (), "QtGui", "QGraphicsObject", methods_QGraphicsObject_Adaptor (), "@qt\n@brief Binding of QGraphicsObject"); diff --git a/src/gsiqt4/gsiDeclQGraphicsOpacityEffect.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsOpacityEffect.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGraphicsOpacityEffect.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsOpacityEffect.cc index 7e9f85100..8c9f92664 100644 --- a/src/gsiqt4/gsiDeclQGraphicsOpacityEffect.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsOpacityEffect.cc @@ -39,8 +39,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -246,11 +246,11 @@ static gsi::Methods methods_QGraphicsOpacityEffect () { gsi::Class &qtdecl_QGraphicsEffect (); -qt_gsi::QtNativeClass decl_QGraphicsOpacityEffect (qtdecl_QGraphicsEffect (), "QGraphicsOpacityEffect_Native", +qt_gsi::QtNativeClass decl_QGraphicsOpacityEffect (qtdecl_QGraphicsEffect (), "QtGui", "QGraphicsOpacityEffect_Native", methods_QGraphicsOpacityEffect (), "@hide\n@alias QGraphicsOpacityEffect"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsOpacityEffect () { return decl_QGraphicsOpacityEffect; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsOpacityEffect () { return decl_QGraphicsOpacityEffect; } } @@ -948,7 +948,7 @@ static gsi::Methods methods_QGraphicsOpacityEffect_Adaptor () { return methods; } -gsi::Class decl_QGraphicsOpacityEffect_Adaptor (qtdecl_QGraphicsOpacityEffect (), "QGraphicsOpacityEffect", +gsi::Class decl_QGraphicsOpacityEffect_Adaptor (qtdecl_QGraphicsOpacityEffect (), "QtGui", "QGraphicsOpacityEffect", methods_QGraphicsOpacityEffect_Adaptor (), "@qt\n@brief Binding of QGraphicsOpacityEffect"); diff --git a/src/gsiqt4/gsiDeclQGraphicsPathItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsPathItem.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGraphicsPathItem.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsPathItem.cc index 820e640ad..3cc4d8d48 100644 --- a/src/gsiqt4/gsiDeclQGraphicsPathItem.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsPathItem.cc @@ -58,8 +58,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -243,11 +243,11 @@ static gsi::Methods methods_QGraphicsPathItem () { gsi::Class &qtdecl_QAbstractGraphicsShapeItem (); -gsi::Class decl_QGraphicsPathItem (qtdecl_QAbstractGraphicsShapeItem (), "QGraphicsPathItem_Native", +gsi::Class decl_QGraphicsPathItem (qtdecl_QAbstractGraphicsShapeItem (), "QtGui", "QGraphicsPathItem_Native", methods_QGraphicsPathItem (), "@hide\n@alias QGraphicsPathItem"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsPathItem () { return decl_QGraphicsPathItem; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsPathItem () { return decl_QGraphicsPathItem; } } @@ -1879,7 +1879,7 @@ static gsi::Methods methods_QGraphicsPathItem_Adaptor () { return methods; } -gsi::Class decl_QGraphicsPathItem_Adaptor (qtdecl_QGraphicsPathItem (), "QGraphicsPathItem", +gsi::Class decl_QGraphicsPathItem_Adaptor (qtdecl_QGraphicsPathItem (), "QtGui", "QGraphicsPathItem", methods_QGraphicsPathItem_Adaptor (), "@qt\n@brief Binding of QGraphicsPathItem"); diff --git a/src/gsiqt4/gsiDeclQGraphicsPixmapItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsPixmapItem.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGraphicsPixmapItem.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsPixmapItem.cc index e022e2808..081773538 100644 --- a/src/gsiqt4/gsiDeclQGraphicsPixmapItem.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsPixmapItem.cc @@ -57,8 +57,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -377,11 +377,11 @@ static gsi::Methods methods_QGraphicsPixmapItem () { gsi::Class &qtdecl_QGraphicsItem (); -gsi::Class decl_QGraphicsPixmapItem (qtdecl_QGraphicsItem (), "QGraphicsPixmapItem_Native", +gsi::Class decl_QGraphicsPixmapItem (qtdecl_QGraphicsItem (), "QtGui", "QGraphicsPixmapItem_Native", methods_QGraphicsPixmapItem (), "@hide\n@alias QGraphicsPixmapItem"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsPixmapItem () { return decl_QGraphicsPixmapItem; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsPixmapItem () { return decl_QGraphicsPixmapItem; } } @@ -2013,7 +2013,7 @@ static gsi::Methods methods_QGraphicsPixmapItem_Adaptor () { return methods; } -gsi::Class decl_QGraphicsPixmapItem_Adaptor (qtdecl_QGraphicsPixmapItem (), "QGraphicsPixmapItem", +gsi::Class decl_QGraphicsPixmapItem_Adaptor (qtdecl_QGraphicsPixmapItem (), "QtGui", "QGraphicsPixmapItem", methods_QGraphicsPixmapItem_Adaptor (), "@qt\n@brief Binding of QGraphicsPixmapItem"); @@ -2024,19 +2024,19 @@ gsi::Class decl_QGraphicsPixmapItem_Adaptor (qtdecl namespace qt_gsi { -static gsi::Enum decl_QGraphicsPixmapItem_ShapeMode_Enum ("QGraphicsPixmapItem_ShapeMode", +static gsi::Enum decl_QGraphicsPixmapItem_ShapeMode_Enum ("QtGui", "QGraphicsPixmapItem_ShapeMode", gsi::enum_const ("MaskShape", QGraphicsPixmapItem::MaskShape, "@brief Enum constant QGraphicsPixmapItem::MaskShape") + gsi::enum_const ("BoundingRectShape", QGraphicsPixmapItem::BoundingRectShape, "@brief Enum constant QGraphicsPixmapItem::BoundingRectShape") + gsi::enum_const ("HeuristicMaskShape", QGraphicsPixmapItem::HeuristicMaskShape, "@brief Enum constant QGraphicsPixmapItem::HeuristicMaskShape"), "@qt\n@brief This class represents the QGraphicsPixmapItem::ShapeMode enum"); -static gsi::QFlagsClass decl_QGraphicsPixmapItem_ShapeMode_Enums ("QGraphicsPixmapItem_QFlags_ShapeMode", +static gsi::QFlagsClass decl_QGraphicsPixmapItem_ShapeMode_Enums ("QtGui", "QGraphicsPixmapItem_QFlags_ShapeMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QGraphicsPixmapItem_ShapeMode_Enum_in_parent (decl_QGraphicsPixmapItem_ShapeMode_Enum.defs ()); -static gsi::ClassExt decl_QGraphicsPixmapItem_ShapeMode_Enum_as_child (decl_QGraphicsPixmapItem_ShapeMode_Enum, "ShapeMode"); -static gsi::ClassExt decl_QGraphicsPixmapItem_ShapeMode_Enums_as_child (decl_QGraphicsPixmapItem_ShapeMode_Enums, "QFlags_ShapeMode"); +static gsi::ClassExt decl_QGraphicsPixmapItem_ShapeMode_Enum_as_child (decl_QGraphicsPixmapItem_ShapeMode_Enum, "QtGui", "ShapeMode"); +static gsi::ClassExt decl_QGraphicsPixmapItem_ShapeMode_Enums_as_child (decl_QGraphicsPixmapItem_ShapeMode_Enums, "QtGui", "QFlags_ShapeMode"); } diff --git a/src/gsiqt4/gsiDeclQGraphicsPolygonItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsPolygonItem.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGraphicsPolygonItem.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsPolygonItem.cc index 0a0f4343f..0990973ce 100644 --- a/src/gsiqt4/gsiDeclQGraphicsPolygonItem.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsPolygonItem.cc @@ -58,8 +58,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -280,11 +280,11 @@ static gsi::Methods methods_QGraphicsPolygonItem () { gsi::Class &qtdecl_QAbstractGraphicsShapeItem (); -gsi::Class decl_QGraphicsPolygonItem (qtdecl_QAbstractGraphicsShapeItem (), "QGraphicsPolygonItem_Native", +gsi::Class decl_QGraphicsPolygonItem (qtdecl_QAbstractGraphicsShapeItem (), "QtGui", "QGraphicsPolygonItem_Native", methods_QGraphicsPolygonItem (), "@hide\n@alias QGraphicsPolygonItem"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsPolygonItem () { return decl_QGraphicsPolygonItem; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsPolygonItem () { return decl_QGraphicsPolygonItem; } } @@ -1916,7 +1916,7 @@ static gsi::Methods methods_QGraphicsPolygonItem_Adaptor () { return methods; } -gsi::Class decl_QGraphicsPolygonItem_Adaptor (qtdecl_QGraphicsPolygonItem (), "QGraphicsPolygonItem", +gsi::Class decl_QGraphicsPolygonItem_Adaptor (qtdecl_QGraphicsPolygonItem (), "QtGui", "QGraphicsPolygonItem", methods_QGraphicsPolygonItem_Adaptor (), "@qt\n@brief Binding of QGraphicsPolygonItem"); diff --git a/src/gsiqt4/gsiDeclQGraphicsProxyWidget.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsProxyWidget.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGraphicsProxyWidget.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsProxyWidget.cc index fac607dc5..3aa30f06b 100644 --- a/src/gsiqt4/gsiDeclQGraphicsProxyWidget.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsProxyWidget.cc @@ -75,8 +75,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -355,11 +355,11 @@ static gsi::Methods methods_QGraphicsProxyWidget () { gsi::Class &qtdecl_QGraphicsWidget (); -qt_gsi::QtNativeClass decl_QGraphicsProxyWidget (qtdecl_QGraphicsWidget (), "QGraphicsProxyWidget_Native", +qt_gsi::QtNativeClass decl_QGraphicsProxyWidget (qtdecl_QGraphicsWidget (), "QtGui", "QGraphicsProxyWidget_Native", methods_QGraphicsProxyWidget (), "@hide\n@alias QGraphicsProxyWidget"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsProxyWidget () { return decl_QGraphicsProxyWidget; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsProxyWidget () { return decl_QGraphicsProxyWidget; } } @@ -3423,7 +3423,7 @@ static gsi::Methods methods_QGraphicsProxyWidget_Adaptor () { return methods; } -gsi::Class decl_QGraphicsProxyWidget_Adaptor (qtdecl_QGraphicsProxyWidget (), "QGraphicsProxyWidget", +gsi::Class decl_QGraphicsProxyWidget_Adaptor (qtdecl_QGraphicsProxyWidget (), "QtGui", "QGraphicsProxyWidget", methods_QGraphicsProxyWidget_Adaptor (), "@qt\n@brief Binding of QGraphicsProxyWidget"); diff --git a/src/gsiqt4/gsiDeclQGraphicsRectItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsRectItem.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGraphicsRectItem.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsRectItem.cc index ed890d5c8..795d08d50 100644 --- a/src/gsiqt4/gsiDeclQGraphicsRectItem.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsRectItem.cc @@ -58,8 +58,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -273,11 +273,11 @@ static gsi::Methods methods_QGraphicsRectItem () { gsi::Class &qtdecl_QAbstractGraphicsShapeItem (); -gsi::Class decl_QGraphicsRectItem (qtdecl_QAbstractGraphicsShapeItem (), "QGraphicsRectItem_Native", +gsi::Class decl_QGraphicsRectItem (qtdecl_QAbstractGraphicsShapeItem (), "QtGui", "QGraphicsRectItem_Native", methods_QGraphicsRectItem (), "@hide\n@alias QGraphicsRectItem"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsRectItem () { return decl_QGraphicsRectItem; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsRectItem () { return decl_QGraphicsRectItem; } } @@ -1961,7 +1961,7 @@ static gsi::Methods methods_QGraphicsRectItem_Adaptor () { return methods; } -gsi::Class decl_QGraphicsRectItem_Adaptor (qtdecl_QGraphicsRectItem (), "QGraphicsRectItem", +gsi::Class decl_QGraphicsRectItem_Adaptor (qtdecl_QGraphicsRectItem (), "QtGui", "QGraphicsRectItem", methods_QGraphicsRectItem_Adaptor (), "@qt\n@brief Binding of QGraphicsRectItem"); diff --git a/src/gsiqt4/gsiDeclQGraphicsRotation.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsRotation.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGraphicsRotation.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsRotation.cc index 9d4a2a3e6..90b7c4dea 100644 --- a/src/gsiqt4/gsiDeclQGraphicsRotation.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsRotation.cc @@ -36,8 +36,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -322,11 +322,11 @@ static gsi::Methods methods_QGraphicsRotation () { gsi::Class &qtdecl_QGraphicsTransform (); -qt_gsi::QtNativeClass decl_QGraphicsRotation (qtdecl_QGraphicsTransform (), "QGraphicsRotation_Native", +qt_gsi::QtNativeClass decl_QGraphicsRotation (qtdecl_QGraphicsTransform (), "QtGui", "QGraphicsRotation_Native", methods_QGraphicsRotation (), "@hide\n@alias QGraphicsRotation"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsRotation () { return decl_QGraphicsRotation; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsRotation () { return decl_QGraphicsRotation; } } @@ -830,7 +830,7 @@ static gsi::Methods methods_QGraphicsRotation_Adaptor () { return methods; } -gsi::Class decl_QGraphicsRotation_Adaptor (qtdecl_QGraphicsRotation (), "QGraphicsRotation", +gsi::Class decl_QGraphicsRotation_Adaptor (qtdecl_QGraphicsRotation (), "QtGui", "QGraphicsRotation", methods_QGraphicsRotation_Adaptor (), "@qt\n@brief Binding of QGraphicsRotation"); diff --git a/src/gsiqt4/gsiDeclQGraphicsScale.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsScale.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGraphicsScale.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsScale.cc index 7c50d0a86..81f21ff3e 100644 --- a/src/gsiqt4/gsiDeclQGraphicsScale.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsScale.cc @@ -36,8 +36,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -337,11 +337,11 @@ static gsi::Methods methods_QGraphicsScale () { gsi::Class &qtdecl_QGraphicsTransform (); -qt_gsi::QtNativeClass decl_QGraphicsScale (qtdecl_QGraphicsTransform (), "QGraphicsScale_Native", +qt_gsi::QtNativeClass decl_QGraphicsScale (qtdecl_QGraphicsTransform (), "QtGui", "QGraphicsScale_Native", methods_QGraphicsScale (), "@hide\n@alias QGraphicsScale"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsScale () { return decl_QGraphicsScale; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsScale () { return decl_QGraphicsScale; } } @@ -824,7 +824,7 @@ static gsi::Methods methods_QGraphicsScale_Adaptor () { return methods; } -gsi::Class decl_QGraphicsScale_Adaptor (qtdecl_QGraphicsScale (), "QGraphicsScale", +gsi::Class decl_QGraphicsScale_Adaptor (qtdecl_QGraphicsScale (), "QtGui", "QGraphicsScale", methods_QGraphicsScale_Adaptor (), "@qt\n@brief Binding of QGraphicsScale"); diff --git a/src/gsiqt4/gsiDeclQGraphicsScene.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsScene.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGraphicsScene.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsScene.cc index fe49a21e2..4a469f13e 100644 --- a/src/gsiqt4/gsiDeclQGraphicsScene.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsScene.cc @@ -48,8 +48,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -2033,11 +2033,11 @@ static gsi::Methods methods_QGraphicsScene () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QGraphicsScene (qtdecl_QObject (), "QGraphicsScene_Native", +qt_gsi::QtNativeClass decl_QGraphicsScene (qtdecl_QObject (), "QtGui", "QGraphicsScene_Native", methods_QGraphicsScene (), "@hide\n@alias QGraphicsScene"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsScene () { return decl_QGraphicsScene; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsScene () { return decl_QGraphicsScene; } } @@ -3390,7 +3390,7 @@ static gsi::Methods methods_QGraphicsScene_Adaptor () { return methods; } -gsi::Class decl_QGraphicsScene_Adaptor (qtdecl_QGraphicsScene (), "QGraphicsScene", +gsi::Class decl_QGraphicsScene_Adaptor (qtdecl_QGraphicsScene (), "QtGui", "QGraphicsScene", methods_QGraphicsScene_Adaptor (), "@qt\n@brief Binding of QGraphicsScene"); @@ -3401,18 +3401,18 @@ gsi::Class decl_QGraphicsScene_Adaptor (qtdecl_QGraphics namespace qt_gsi { -static gsi::Enum decl_QGraphicsScene_ItemIndexMethod_Enum ("QGraphicsScene_ItemIndexMethod", +static gsi::Enum decl_QGraphicsScene_ItemIndexMethod_Enum ("QtGui", "QGraphicsScene_ItemIndexMethod", gsi::enum_const ("BspTreeIndex", QGraphicsScene::BspTreeIndex, "@brief Enum constant QGraphicsScene::BspTreeIndex") + gsi::enum_const ("NoIndex", QGraphicsScene::NoIndex, "@brief Enum constant QGraphicsScene::NoIndex"), "@qt\n@brief This class represents the QGraphicsScene::ItemIndexMethod enum"); -static gsi::QFlagsClass decl_QGraphicsScene_ItemIndexMethod_Enums ("QGraphicsScene_QFlags_ItemIndexMethod", +static gsi::QFlagsClass decl_QGraphicsScene_ItemIndexMethod_Enums ("QtGui", "QGraphicsScene_QFlags_ItemIndexMethod", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QGraphicsScene_ItemIndexMethod_Enum_in_parent (decl_QGraphicsScene_ItemIndexMethod_Enum.defs ()); -static gsi::ClassExt decl_QGraphicsScene_ItemIndexMethod_Enum_as_child (decl_QGraphicsScene_ItemIndexMethod_Enum, "ItemIndexMethod"); -static gsi::ClassExt decl_QGraphicsScene_ItemIndexMethod_Enums_as_child (decl_QGraphicsScene_ItemIndexMethod_Enums, "QFlags_ItemIndexMethod"); +static gsi::ClassExt decl_QGraphicsScene_ItemIndexMethod_Enum_as_child (decl_QGraphicsScene_ItemIndexMethod_Enum, "QtGui", "ItemIndexMethod"); +static gsi::ClassExt decl_QGraphicsScene_ItemIndexMethod_Enums_as_child (decl_QGraphicsScene_ItemIndexMethod_Enums, "QtGui", "QFlags_ItemIndexMethod"); } @@ -3421,20 +3421,20 @@ static gsi::ClassExt decl_QGraphicsScene_ItemIndexMethod_Enums_a namespace qt_gsi { -static gsi::Enum decl_QGraphicsScene_SceneLayer_Enum ("QGraphicsScene_SceneLayer", +static gsi::Enum decl_QGraphicsScene_SceneLayer_Enum ("QtGui", "QGraphicsScene_SceneLayer", gsi::enum_const ("ItemLayer", QGraphicsScene::ItemLayer, "@brief Enum constant QGraphicsScene::ItemLayer") + gsi::enum_const ("BackgroundLayer", QGraphicsScene::BackgroundLayer, "@brief Enum constant QGraphicsScene::BackgroundLayer") + gsi::enum_const ("ForegroundLayer", QGraphicsScene::ForegroundLayer, "@brief Enum constant QGraphicsScene::ForegroundLayer") + gsi::enum_const ("AllLayers", QGraphicsScene::AllLayers, "@brief Enum constant QGraphicsScene::AllLayers"), "@qt\n@brief This class represents the QGraphicsScene::SceneLayer enum"); -static gsi::QFlagsClass decl_QGraphicsScene_SceneLayer_Enums ("QGraphicsScene_QFlags_SceneLayer", +static gsi::QFlagsClass decl_QGraphicsScene_SceneLayer_Enums ("QtGui", "QGraphicsScene_QFlags_SceneLayer", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QGraphicsScene_SceneLayer_Enum_in_parent (decl_QGraphicsScene_SceneLayer_Enum.defs ()); -static gsi::ClassExt decl_QGraphicsScene_SceneLayer_Enum_as_child (decl_QGraphicsScene_SceneLayer_Enum, "SceneLayer"); -static gsi::ClassExt decl_QGraphicsScene_SceneLayer_Enums_as_child (decl_QGraphicsScene_SceneLayer_Enums, "QFlags_SceneLayer"); +static gsi::ClassExt decl_QGraphicsScene_SceneLayer_Enum_as_child (decl_QGraphicsScene_SceneLayer_Enum, "QtGui", "SceneLayer"); +static gsi::ClassExt decl_QGraphicsScene_SceneLayer_Enums_as_child (decl_QGraphicsScene_SceneLayer_Enums, "QtGui", "QFlags_SceneLayer"); } diff --git a/src/gsiqt4/gsiDeclQGraphicsSceneContextMenuEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneContextMenuEvent.cc similarity index 95% rename from src/gsiqt4/gsiDeclQGraphicsSceneContextMenuEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneContextMenuEvent.cc index 2a14053e7..0bf945924 100644 --- a/src/gsiqt4/gsiDeclQGraphicsSceneContextMenuEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneContextMenuEvent.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -234,11 +234,11 @@ static gsi::Methods methods_QGraphicsSceneContextMenuEvent () { gsi::Class &qtdecl_QGraphicsSceneEvent (); -gsi::Class decl_QGraphicsSceneContextMenuEvent (qtdecl_QGraphicsSceneEvent (), "QGraphicsSceneContextMenuEvent_Native", +gsi::Class decl_QGraphicsSceneContextMenuEvent (qtdecl_QGraphicsSceneEvent (), "QtGui", "QGraphicsSceneContextMenuEvent_Native", methods_QGraphicsSceneContextMenuEvent (), "@hide\n@alias QGraphicsSceneContextMenuEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsSceneContextMenuEvent () { return decl_QGraphicsSceneContextMenuEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsSceneContextMenuEvent () { return decl_QGraphicsSceneContextMenuEvent; } } @@ -295,7 +295,7 @@ static gsi::Methods methods_QGraphicsSceneContextMenuEvent_Adaptor () { return methods; } -gsi::Class decl_QGraphicsSceneContextMenuEvent_Adaptor (qtdecl_QGraphicsSceneContextMenuEvent (), "QGraphicsSceneContextMenuEvent", +gsi::Class decl_QGraphicsSceneContextMenuEvent_Adaptor (qtdecl_QGraphicsSceneContextMenuEvent (), "QtGui", "QGraphicsSceneContextMenuEvent", methods_QGraphicsSceneContextMenuEvent_Adaptor (), "@qt\n@brief Binding of QGraphicsSceneContextMenuEvent"); @@ -306,19 +306,19 @@ gsi::Class decl_QGraphicsSceneContextMen namespace qt_gsi { -static gsi::Enum decl_QGraphicsSceneContextMenuEvent_Reason_Enum ("QGraphicsSceneContextMenuEvent_Reason", +static gsi::Enum decl_QGraphicsSceneContextMenuEvent_Reason_Enum ("QtGui", "QGraphicsSceneContextMenuEvent_Reason", gsi::enum_const ("Mouse", QGraphicsSceneContextMenuEvent::Mouse, "@brief Enum constant QGraphicsSceneContextMenuEvent::Mouse") + gsi::enum_const ("Keyboard", QGraphicsSceneContextMenuEvent::Keyboard, "@brief Enum constant QGraphicsSceneContextMenuEvent::Keyboard") + gsi::enum_const ("Other", QGraphicsSceneContextMenuEvent::Other, "@brief Enum constant QGraphicsSceneContextMenuEvent::Other"), "@qt\n@brief This class represents the QGraphicsSceneContextMenuEvent::Reason enum"); -static gsi::QFlagsClass decl_QGraphicsSceneContextMenuEvent_Reason_Enums ("QGraphicsSceneContextMenuEvent_QFlags_Reason", +static gsi::QFlagsClass decl_QGraphicsSceneContextMenuEvent_Reason_Enums ("QtGui", "QGraphicsSceneContextMenuEvent_QFlags_Reason", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QGraphicsSceneContextMenuEvent_Reason_Enum_in_parent (decl_QGraphicsSceneContextMenuEvent_Reason_Enum.defs ()); -static gsi::ClassExt decl_QGraphicsSceneContextMenuEvent_Reason_Enum_as_child (decl_QGraphicsSceneContextMenuEvent_Reason_Enum, "Reason"); -static gsi::ClassExt decl_QGraphicsSceneContextMenuEvent_Reason_Enums_as_child (decl_QGraphicsSceneContextMenuEvent_Reason_Enums, "QFlags_Reason"); +static gsi::ClassExt decl_QGraphicsSceneContextMenuEvent_Reason_Enum_as_child (decl_QGraphicsSceneContextMenuEvent_Reason_Enum, "QtGui", "Reason"); +static gsi::ClassExt decl_QGraphicsSceneContextMenuEvent_Reason_Enums_as_child (decl_QGraphicsSceneContextMenuEvent_Reason_Enums, "QtGui", "QFlags_Reason"); } diff --git a/src/gsiqt4/gsiDeclQGraphicsSceneDragDropEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneDragDropEvent.cc similarity index 98% rename from src/gsiqt4/gsiDeclQGraphicsSceneDragDropEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneDragDropEvent.cc index 21f5036db..01b8c7f37 100644 --- a/src/gsiqt4/gsiDeclQGraphicsSceneDragDropEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneDragDropEvent.cc @@ -33,8 +33,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -437,11 +437,11 @@ static gsi::Methods methods_QGraphicsSceneDragDropEvent () { gsi::Class &qtdecl_QGraphicsSceneEvent (); -gsi::Class decl_QGraphicsSceneDragDropEvent (qtdecl_QGraphicsSceneEvent (), "QGraphicsSceneDragDropEvent_Native", +gsi::Class decl_QGraphicsSceneDragDropEvent (qtdecl_QGraphicsSceneEvent (), "QtGui", "QGraphicsSceneDragDropEvent_Native", methods_QGraphicsSceneDragDropEvent (), "@hide\n@alias QGraphicsSceneDragDropEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsSceneDragDropEvent () { return decl_QGraphicsSceneDragDropEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsSceneDragDropEvent () { return decl_QGraphicsSceneDragDropEvent; } } @@ -498,7 +498,7 @@ static gsi::Methods methods_QGraphicsSceneDragDropEvent_Adaptor () { return methods; } -gsi::Class decl_QGraphicsSceneDragDropEvent_Adaptor (qtdecl_QGraphicsSceneDragDropEvent (), "QGraphicsSceneDragDropEvent", +gsi::Class decl_QGraphicsSceneDragDropEvent_Adaptor (qtdecl_QGraphicsSceneDragDropEvent (), "QtGui", "QGraphicsSceneDragDropEvent", methods_QGraphicsSceneDragDropEvent_Adaptor (), "@qt\n@brief Binding of QGraphicsSceneDragDropEvent"); diff --git a/src/gsiqt4/gsiDeclQGraphicsSceneEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneEvent.cc similarity index 93% rename from src/gsiqt4/gsiDeclQGraphicsSceneEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneEvent.cc index c67b03994..07ea1c8a0 100644 --- a/src/gsiqt4/gsiDeclQGraphicsSceneEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneEvent.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -84,11 +84,11 @@ static gsi::Methods methods_QGraphicsSceneEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QGraphicsSceneEvent (qtdecl_QEvent (), "QGraphicsSceneEvent_Native", +gsi::Class decl_QGraphicsSceneEvent (qtdecl_QEvent (), "QtGui", "QGraphicsSceneEvent_Native", methods_QGraphicsSceneEvent (), "@hide\n@alias QGraphicsSceneEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsSceneEvent () { return decl_QGraphicsSceneEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsSceneEvent () { return decl_QGraphicsSceneEvent; } } @@ -139,7 +139,7 @@ static gsi::Methods methods_QGraphicsSceneEvent_Adaptor () { return methods; } -gsi::Class decl_QGraphicsSceneEvent_Adaptor (qtdecl_QGraphicsSceneEvent (), "QGraphicsSceneEvent", +gsi::Class decl_QGraphicsSceneEvent_Adaptor (qtdecl_QGraphicsSceneEvent (), "QtGui", "QGraphicsSceneEvent", methods_QGraphicsSceneEvent_Adaptor (), "@qt\n@brief Binding of QGraphicsSceneEvent"); diff --git a/src/gsiqt4/gsiDeclQGraphicsSceneHelpEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneHelpEvent.cc similarity index 94% rename from src/gsiqt4/gsiDeclQGraphicsSceneHelpEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneHelpEvent.cc index 512875629..a866bbcf9 100644 --- a/src/gsiqt4/gsiDeclQGraphicsSceneHelpEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneHelpEvent.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -123,11 +123,11 @@ static gsi::Methods methods_QGraphicsSceneHelpEvent () { gsi::Class &qtdecl_QGraphicsSceneEvent (); -gsi::Class decl_QGraphicsSceneHelpEvent (qtdecl_QGraphicsSceneEvent (), "QGraphicsSceneHelpEvent_Native", +gsi::Class decl_QGraphicsSceneHelpEvent (qtdecl_QGraphicsSceneEvent (), "QtGui", "QGraphicsSceneHelpEvent_Native", methods_QGraphicsSceneHelpEvent (), "@hide\n@alias QGraphicsSceneHelpEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsSceneHelpEvent () { return decl_QGraphicsSceneHelpEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsSceneHelpEvent () { return decl_QGraphicsSceneHelpEvent; } } @@ -184,7 +184,7 @@ static gsi::Methods methods_QGraphicsSceneHelpEvent_Adaptor () { return methods; } -gsi::Class decl_QGraphicsSceneHelpEvent_Adaptor (qtdecl_QGraphicsSceneHelpEvent (), "QGraphicsSceneHelpEvent", +gsi::Class decl_QGraphicsSceneHelpEvent_Adaptor (qtdecl_QGraphicsSceneHelpEvent (), "QtGui", "QGraphicsSceneHelpEvent", methods_QGraphicsSceneHelpEvent_Adaptor (), "@qt\n@brief Binding of QGraphicsSceneHelpEvent"); diff --git a/src/gsiqt4/gsiDeclQGraphicsSceneHoverEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneHoverEvent.cc similarity index 97% rename from src/gsiqt4/gsiDeclQGraphicsSceneHoverEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneHoverEvent.cc index be2de1de3..98405f63e 100644 --- a/src/gsiqt4/gsiDeclQGraphicsSceneHoverEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneHoverEvent.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -308,11 +308,11 @@ static gsi::Methods methods_QGraphicsSceneHoverEvent () { gsi::Class &qtdecl_QGraphicsSceneEvent (); -gsi::Class decl_QGraphicsSceneHoverEvent (qtdecl_QGraphicsSceneEvent (), "QGraphicsSceneHoverEvent_Native", +gsi::Class decl_QGraphicsSceneHoverEvent (qtdecl_QGraphicsSceneEvent (), "QtGui", "QGraphicsSceneHoverEvent_Native", methods_QGraphicsSceneHoverEvent (), "@hide\n@alias QGraphicsSceneHoverEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsSceneHoverEvent () { return decl_QGraphicsSceneHoverEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsSceneHoverEvent () { return decl_QGraphicsSceneHoverEvent; } } @@ -369,7 +369,7 @@ static gsi::Methods methods_QGraphicsSceneHoverEvent_Adaptor () { return methods; } -gsi::Class decl_QGraphicsSceneHoverEvent_Adaptor (qtdecl_QGraphicsSceneHoverEvent (), "QGraphicsSceneHoverEvent", +gsi::Class decl_QGraphicsSceneHoverEvent_Adaptor (qtdecl_QGraphicsSceneHoverEvent (), "QtGui", "QGraphicsSceneHoverEvent", methods_QGraphicsSceneHoverEvent_Adaptor (), "@qt\n@brief Binding of QGraphicsSceneHoverEvent"); diff --git a/src/gsiqt4/gsiDeclQGraphicsSceneMouseEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneMouseEvent.cc similarity index 98% rename from src/gsiqt4/gsiDeclQGraphicsSceneMouseEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneMouseEvent.cc index 780ebceac..3121ae1e6 100644 --- a/src/gsiqt4/gsiDeclQGraphicsSceneMouseEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneMouseEvent.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -514,11 +514,11 @@ static gsi::Methods methods_QGraphicsSceneMouseEvent () { gsi::Class &qtdecl_QGraphicsSceneEvent (); -gsi::Class decl_QGraphicsSceneMouseEvent (qtdecl_QGraphicsSceneEvent (), "QGraphicsSceneMouseEvent_Native", +gsi::Class decl_QGraphicsSceneMouseEvent (qtdecl_QGraphicsSceneEvent (), "QtGui", "QGraphicsSceneMouseEvent_Native", methods_QGraphicsSceneMouseEvent (), "@hide\n@alias QGraphicsSceneMouseEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsSceneMouseEvent () { return decl_QGraphicsSceneMouseEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsSceneMouseEvent () { return decl_QGraphicsSceneMouseEvent; } } @@ -575,7 +575,7 @@ static gsi::Methods methods_QGraphicsSceneMouseEvent_Adaptor () { return methods; } -gsi::Class decl_QGraphicsSceneMouseEvent_Adaptor (qtdecl_QGraphicsSceneMouseEvent (), "QGraphicsSceneMouseEvent", +gsi::Class decl_QGraphicsSceneMouseEvent_Adaptor (qtdecl_QGraphicsSceneMouseEvent (), "QtGui", "QGraphicsSceneMouseEvent", methods_QGraphicsSceneMouseEvent_Adaptor (), "@qt\n@brief Binding of QGraphicsSceneMouseEvent"); diff --git a/src/gsiqt4/gsiDeclQGraphicsSceneMoveEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneMoveEvent.cc similarity index 94% rename from src/gsiqt4/gsiDeclQGraphicsSceneMoveEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneMoveEvent.cc index c136813d9..e649ef59b 100644 --- a/src/gsiqt4/gsiDeclQGraphicsSceneMoveEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneMoveEvent.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -122,11 +122,11 @@ static gsi::Methods methods_QGraphicsSceneMoveEvent () { gsi::Class &qtdecl_QGraphicsSceneEvent (); -gsi::Class decl_QGraphicsSceneMoveEvent (qtdecl_QGraphicsSceneEvent (), "QGraphicsSceneMoveEvent_Native", +gsi::Class decl_QGraphicsSceneMoveEvent (qtdecl_QGraphicsSceneEvent (), "QtGui", "QGraphicsSceneMoveEvent_Native", methods_QGraphicsSceneMoveEvent (), "@hide\n@alias QGraphicsSceneMoveEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsSceneMoveEvent () { return decl_QGraphicsSceneMoveEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsSceneMoveEvent () { return decl_QGraphicsSceneMoveEvent; } } @@ -173,7 +173,7 @@ static gsi::Methods methods_QGraphicsSceneMoveEvent_Adaptor () { return methods; } -gsi::Class decl_QGraphicsSceneMoveEvent_Adaptor (qtdecl_QGraphicsSceneMoveEvent (), "QGraphicsSceneMoveEvent", +gsi::Class decl_QGraphicsSceneMoveEvent_Adaptor (qtdecl_QGraphicsSceneMoveEvent (), "QtGui", "QGraphicsSceneMoveEvent", methods_QGraphicsSceneMoveEvent_Adaptor (), "@qt\n@brief Binding of QGraphicsSceneMoveEvent"); diff --git a/src/gsiqt4/gsiDeclQGraphicsSceneResizeEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneResizeEvent.cc similarity index 93% rename from src/gsiqt4/gsiDeclQGraphicsSceneResizeEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneResizeEvent.cc index a0d674c4b..b5569d9bb 100644 --- a/src/gsiqt4/gsiDeclQGraphicsSceneResizeEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneResizeEvent.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -122,11 +122,11 @@ static gsi::Methods methods_QGraphicsSceneResizeEvent () { gsi::Class &qtdecl_QGraphicsSceneEvent (); -gsi::Class decl_QGraphicsSceneResizeEvent (qtdecl_QGraphicsSceneEvent (), "QGraphicsSceneResizeEvent_Native", +gsi::Class decl_QGraphicsSceneResizeEvent (qtdecl_QGraphicsSceneEvent (), "QtGui", "QGraphicsSceneResizeEvent_Native", methods_QGraphicsSceneResizeEvent (), "@hide\n@alias QGraphicsSceneResizeEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsSceneResizeEvent () { return decl_QGraphicsSceneResizeEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsSceneResizeEvent () { return decl_QGraphicsSceneResizeEvent; } } @@ -173,7 +173,7 @@ static gsi::Methods methods_QGraphicsSceneResizeEvent_Adaptor () { return methods; } -gsi::Class decl_QGraphicsSceneResizeEvent_Adaptor (qtdecl_QGraphicsSceneResizeEvent (), "QGraphicsSceneResizeEvent", +gsi::Class decl_QGraphicsSceneResizeEvent_Adaptor (qtdecl_QGraphicsSceneResizeEvent (), "QtGui", "QGraphicsSceneResizeEvent", methods_QGraphicsSceneResizeEvent_Adaptor (), "@qt\n@brief Binding of QGraphicsSceneResizeEvent"); diff --git a/src/gsiqt4/gsiDeclQGraphicsSceneWheelEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneWheelEvent.cc similarity index 97% rename from src/gsiqt4/gsiDeclQGraphicsSceneWheelEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneWheelEvent.cc index bddd1a113..cddd12c7c 100644 --- a/src/gsiqt4/gsiDeclQGraphicsSceneWheelEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSceneWheelEvent.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -308,11 +308,11 @@ static gsi::Methods methods_QGraphicsSceneWheelEvent () { gsi::Class &qtdecl_QGraphicsSceneEvent (); -gsi::Class decl_QGraphicsSceneWheelEvent (qtdecl_QGraphicsSceneEvent (), "QGraphicsSceneWheelEvent_Native", +gsi::Class decl_QGraphicsSceneWheelEvent (qtdecl_QGraphicsSceneEvent (), "QtGui", "QGraphicsSceneWheelEvent_Native", methods_QGraphicsSceneWheelEvent (), "@hide\n@alias QGraphicsSceneWheelEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsSceneWheelEvent () { return decl_QGraphicsSceneWheelEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsSceneWheelEvent () { return decl_QGraphicsSceneWheelEvent; } } @@ -369,7 +369,7 @@ static gsi::Methods methods_QGraphicsSceneWheelEvent_Adaptor () { return methods; } -gsi::Class decl_QGraphicsSceneWheelEvent_Adaptor (qtdecl_QGraphicsSceneWheelEvent (), "QGraphicsSceneWheelEvent", +gsi::Class decl_QGraphicsSceneWheelEvent_Adaptor (qtdecl_QGraphicsSceneWheelEvent (), "QtGui", "QGraphicsSceneWheelEvent", methods_QGraphicsSceneWheelEvent_Adaptor (), "@qt\n@brief Binding of QGraphicsSceneWheelEvent"); diff --git a/src/gsiqt4/gsiDeclQGraphicsSimpleTextItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSimpleTextItem.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGraphicsSimpleTextItem.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSimpleTextItem.cc index c4e5fc409..be03b1cb4 100644 --- a/src/gsiqt4/gsiDeclQGraphicsSimpleTextItem.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsSimpleTextItem.cc @@ -59,8 +59,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -281,11 +281,11 @@ static gsi::Methods methods_QGraphicsSimpleTextItem () { gsi::Class &qtdecl_QAbstractGraphicsShapeItem (); -gsi::Class decl_QGraphicsSimpleTextItem (qtdecl_QAbstractGraphicsShapeItem (), "QGraphicsSimpleTextItem_Native", +gsi::Class decl_QGraphicsSimpleTextItem (qtdecl_QAbstractGraphicsShapeItem (), "QtGui", "QGraphicsSimpleTextItem_Native", methods_QGraphicsSimpleTextItem (), "@hide\n@alias QGraphicsSimpleTextItem"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsSimpleTextItem () { return decl_QGraphicsSimpleTextItem; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsSimpleTextItem () { return decl_QGraphicsSimpleTextItem; } } @@ -1917,7 +1917,7 @@ static gsi::Methods methods_QGraphicsSimpleTextItem_Adaptor () { return methods; } -gsi::Class decl_QGraphicsSimpleTextItem_Adaptor (qtdecl_QGraphicsSimpleTextItem (), "QGraphicsSimpleTextItem", +gsi::Class decl_QGraphicsSimpleTextItem_Adaptor (qtdecl_QGraphicsSimpleTextItem (), "QtGui", "QGraphicsSimpleTextItem", methods_QGraphicsSimpleTextItem_Adaptor (), "@qt\n@brief Binding of QGraphicsSimpleTextItem"); diff --git a/src/gsiqt4/gsiDeclQGraphicsTextItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsTextItem.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGraphicsTextItem.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsTextItem.cc index e9741ddd7..e45fc8317 100644 --- a/src/gsiqt4/gsiDeclQGraphicsTextItem.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsTextItem.cc @@ -64,8 +64,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -723,11 +723,11 @@ static gsi::Methods methods_QGraphicsTextItem () { gsi::Class &qtdecl_QGraphicsObject (); -qt_gsi::QtNativeClass decl_QGraphicsTextItem (qtdecl_QGraphicsObject (), "QGraphicsTextItem_Native", +qt_gsi::QtNativeClass decl_QGraphicsTextItem (qtdecl_QGraphicsObject (), "QtGui", "QGraphicsTextItem_Native", methods_QGraphicsTextItem (), "@hide\n@alias QGraphicsTextItem"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsTextItem () { return decl_QGraphicsTextItem; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsTextItem () { return decl_QGraphicsTextItem; } } @@ -2920,7 +2920,7 @@ static gsi::Methods methods_QGraphicsTextItem_Adaptor () { return methods; } -gsi::Class decl_QGraphicsTextItem_Adaptor (qtdecl_QGraphicsTextItem (), "QGraphicsTextItem", +gsi::Class decl_QGraphicsTextItem_Adaptor (qtdecl_QGraphicsTextItem (), "QtGui", "QGraphicsTextItem", methods_QGraphicsTextItem_Adaptor (), "@qt\n@brief Binding of QGraphicsTextItem"); diff --git a/src/gsiqt4/gsiDeclQGraphicsTransform.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsTransform.cc similarity index 98% rename from src/gsiqt4/gsiDeclQGraphicsTransform.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsTransform.cc index 8c2f3797b..a2bd29eb3 100644 --- a/src/gsiqt4/gsiDeclQGraphicsTransform.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsTransform.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -186,11 +186,11 @@ static gsi::Methods methods_QGraphicsTransform () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QGraphicsTransform (qtdecl_QObject (), "QGraphicsTransform_Native", +qt_gsi::QtNativeClass decl_QGraphicsTransform (qtdecl_QObject (), "QtGui", "QGraphicsTransform_Native", methods_QGraphicsTransform (), "@hide\n@alias QGraphicsTransform"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsTransform () { return decl_QGraphicsTransform; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsTransform () { return decl_QGraphicsTransform; } } @@ -632,7 +632,7 @@ static gsi::Methods methods_QGraphicsTransform_Adaptor () { return methods; } -gsi::Class decl_QGraphicsTransform_Adaptor (qtdecl_QGraphicsTransform (), "QGraphicsTransform", +gsi::Class decl_QGraphicsTransform_Adaptor (qtdecl_QGraphicsTransform (), "QtGui", "QGraphicsTransform", methods_QGraphicsTransform_Adaptor (), "@qt\n@brief Binding of QGraphicsTransform"); diff --git a/src/gsiqt4/gsiDeclQGraphicsView.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsView.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGraphicsView.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsView.cc index 6ca02c171..74c1ee9df 100644 --- a/src/gsiqt4/gsiDeclQGraphicsView.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsView.cc @@ -87,8 +87,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1906,11 +1906,11 @@ static gsi::Methods methods_QGraphicsView () { gsi::Class &qtdecl_QAbstractScrollArea (); -qt_gsi::QtNativeClass decl_QGraphicsView (qtdecl_QAbstractScrollArea (), "QGraphicsView_Native", +qt_gsi::QtNativeClass decl_QGraphicsView (qtdecl_QAbstractScrollArea (), "QtGui", "QGraphicsView_Native", methods_QGraphicsView (), "@hide\n@alias QGraphicsView"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsView () { return decl_QGraphicsView; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsView () { return decl_QGraphicsView; } } @@ -4430,7 +4430,7 @@ static gsi::Methods methods_QGraphicsView_Adaptor () { return methods; } -gsi::Class decl_QGraphicsView_Adaptor (qtdecl_QGraphicsView (), "QGraphicsView", +gsi::Class decl_QGraphicsView_Adaptor (qtdecl_QGraphicsView (), "QtGui", "QGraphicsView", methods_QGraphicsView_Adaptor (), "@qt\n@brief Binding of QGraphicsView"); @@ -4441,18 +4441,18 @@ gsi::Class decl_QGraphicsView_Adaptor (qtdecl_QGraphicsVi namespace qt_gsi { -static gsi::Enum decl_QGraphicsView_CacheModeFlag_Enum ("QGraphicsView_CacheModeFlag", +static gsi::Enum decl_QGraphicsView_CacheModeFlag_Enum ("QtGui", "QGraphicsView_CacheModeFlag", gsi::enum_const ("CacheNone", QGraphicsView::CacheNone, "@brief Enum constant QGraphicsView::CacheNone") + gsi::enum_const ("CacheBackground", QGraphicsView::CacheBackground, "@brief Enum constant QGraphicsView::CacheBackground"), "@qt\n@brief This class represents the QGraphicsView::CacheModeFlag enum"); -static gsi::QFlagsClass decl_QGraphicsView_CacheModeFlag_Enums ("QGraphicsView_QFlags_CacheModeFlag", +static gsi::QFlagsClass decl_QGraphicsView_CacheModeFlag_Enums ("QtGui", "QGraphicsView_QFlags_CacheModeFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QGraphicsView_CacheModeFlag_Enum_in_parent (decl_QGraphicsView_CacheModeFlag_Enum.defs ()); -static gsi::ClassExt decl_QGraphicsView_CacheModeFlag_Enum_as_child (decl_QGraphicsView_CacheModeFlag_Enum, "CacheModeFlag"); -static gsi::ClassExt decl_QGraphicsView_CacheModeFlag_Enums_as_child (decl_QGraphicsView_CacheModeFlag_Enums, "QFlags_CacheModeFlag"); +static gsi::ClassExt decl_QGraphicsView_CacheModeFlag_Enum_as_child (decl_QGraphicsView_CacheModeFlag_Enum, "QtGui", "CacheModeFlag"); +static gsi::ClassExt decl_QGraphicsView_CacheModeFlag_Enums_as_child (decl_QGraphicsView_CacheModeFlag_Enums, "QtGui", "QFlags_CacheModeFlag"); } @@ -4461,19 +4461,19 @@ static gsi::ClassExt decl_QGraphicsView_CacheModeFlag_Enums_as_ch namespace qt_gsi { -static gsi::Enum decl_QGraphicsView_DragMode_Enum ("QGraphicsView_DragMode", +static gsi::Enum decl_QGraphicsView_DragMode_Enum ("QtGui", "QGraphicsView_DragMode", gsi::enum_const ("NoDrag", QGraphicsView::NoDrag, "@brief Enum constant QGraphicsView::NoDrag") + gsi::enum_const ("ScrollHandDrag", QGraphicsView::ScrollHandDrag, "@brief Enum constant QGraphicsView::ScrollHandDrag") + gsi::enum_const ("RubberBandDrag", QGraphicsView::RubberBandDrag, "@brief Enum constant QGraphicsView::RubberBandDrag"), "@qt\n@brief This class represents the QGraphicsView::DragMode enum"); -static gsi::QFlagsClass decl_QGraphicsView_DragMode_Enums ("QGraphicsView_QFlags_DragMode", +static gsi::QFlagsClass decl_QGraphicsView_DragMode_Enums ("QtGui", "QGraphicsView_QFlags_DragMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QGraphicsView_DragMode_Enum_in_parent (decl_QGraphicsView_DragMode_Enum.defs ()); -static gsi::ClassExt decl_QGraphicsView_DragMode_Enum_as_child (decl_QGraphicsView_DragMode_Enum, "DragMode"); -static gsi::ClassExt decl_QGraphicsView_DragMode_Enums_as_child (decl_QGraphicsView_DragMode_Enums, "QFlags_DragMode"); +static gsi::ClassExt decl_QGraphicsView_DragMode_Enum_as_child (decl_QGraphicsView_DragMode_Enum, "QtGui", "DragMode"); +static gsi::ClassExt decl_QGraphicsView_DragMode_Enums_as_child (decl_QGraphicsView_DragMode_Enums, "QtGui", "QFlags_DragMode"); } @@ -4482,20 +4482,20 @@ static gsi::ClassExt decl_QGraphicsView_DragMode_Enums_as_child ( namespace qt_gsi { -static gsi::Enum decl_QGraphicsView_OptimizationFlag_Enum ("QGraphicsView_OptimizationFlag", +static gsi::Enum decl_QGraphicsView_OptimizationFlag_Enum ("QtGui", "QGraphicsView_OptimizationFlag", gsi::enum_const ("DontClipPainter", QGraphicsView::DontClipPainter, "@brief Enum constant QGraphicsView::DontClipPainter") + gsi::enum_const ("DontSavePainterState", QGraphicsView::DontSavePainterState, "@brief Enum constant QGraphicsView::DontSavePainterState") + gsi::enum_const ("DontAdjustForAntialiasing", QGraphicsView::DontAdjustForAntialiasing, "@brief Enum constant QGraphicsView::DontAdjustForAntialiasing") + gsi::enum_const ("IndirectPainting", QGraphicsView::IndirectPainting, "@brief Enum constant QGraphicsView::IndirectPainting"), "@qt\n@brief This class represents the QGraphicsView::OptimizationFlag enum"); -static gsi::QFlagsClass decl_QGraphicsView_OptimizationFlag_Enums ("QGraphicsView_QFlags_OptimizationFlag", +static gsi::QFlagsClass decl_QGraphicsView_OptimizationFlag_Enums ("QtGui", "QGraphicsView_QFlags_OptimizationFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QGraphicsView_OptimizationFlag_Enum_in_parent (decl_QGraphicsView_OptimizationFlag_Enum.defs ()); -static gsi::ClassExt decl_QGraphicsView_OptimizationFlag_Enum_as_child (decl_QGraphicsView_OptimizationFlag_Enum, "OptimizationFlag"); -static gsi::ClassExt decl_QGraphicsView_OptimizationFlag_Enums_as_child (decl_QGraphicsView_OptimizationFlag_Enums, "QFlags_OptimizationFlag"); +static gsi::ClassExt decl_QGraphicsView_OptimizationFlag_Enum_as_child (decl_QGraphicsView_OptimizationFlag_Enum, "QtGui", "OptimizationFlag"); +static gsi::ClassExt decl_QGraphicsView_OptimizationFlag_Enums_as_child (decl_QGraphicsView_OptimizationFlag_Enums, "QtGui", "QFlags_OptimizationFlag"); } @@ -4504,19 +4504,19 @@ static gsi::ClassExt decl_QGraphicsView_OptimizationFlag_Enums_as namespace qt_gsi { -static gsi::Enum decl_QGraphicsView_ViewportAnchor_Enum ("QGraphicsView_ViewportAnchor", +static gsi::Enum decl_QGraphicsView_ViewportAnchor_Enum ("QtGui", "QGraphicsView_ViewportAnchor", gsi::enum_const ("NoAnchor", QGraphicsView::NoAnchor, "@brief Enum constant QGraphicsView::NoAnchor") + gsi::enum_const ("AnchorViewCenter", QGraphicsView::AnchorViewCenter, "@brief Enum constant QGraphicsView::AnchorViewCenter") + gsi::enum_const ("AnchorUnderMouse", QGraphicsView::AnchorUnderMouse, "@brief Enum constant QGraphicsView::AnchorUnderMouse"), "@qt\n@brief This class represents the QGraphicsView::ViewportAnchor enum"); -static gsi::QFlagsClass decl_QGraphicsView_ViewportAnchor_Enums ("QGraphicsView_QFlags_ViewportAnchor", +static gsi::QFlagsClass decl_QGraphicsView_ViewportAnchor_Enums ("QtGui", "QGraphicsView_QFlags_ViewportAnchor", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QGraphicsView_ViewportAnchor_Enum_in_parent (decl_QGraphicsView_ViewportAnchor_Enum.defs ()); -static gsi::ClassExt decl_QGraphicsView_ViewportAnchor_Enum_as_child (decl_QGraphicsView_ViewportAnchor_Enum, "ViewportAnchor"); -static gsi::ClassExt decl_QGraphicsView_ViewportAnchor_Enums_as_child (decl_QGraphicsView_ViewportAnchor_Enums, "QFlags_ViewportAnchor"); +static gsi::ClassExt decl_QGraphicsView_ViewportAnchor_Enum_as_child (decl_QGraphicsView_ViewportAnchor_Enum, "QtGui", "ViewportAnchor"); +static gsi::ClassExt decl_QGraphicsView_ViewportAnchor_Enums_as_child (decl_QGraphicsView_ViewportAnchor_Enums, "QtGui", "QFlags_ViewportAnchor"); } @@ -4525,7 +4525,7 @@ static gsi::ClassExt decl_QGraphicsView_ViewportAnchor_Enums_as_c namespace qt_gsi { -static gsi::Enum decl_QGraphicsView_ViewportUpdateMode_Enum ("QGraphicsView_ViewportUpdateMode", +static gsi::Enum decl_QGraphicsView_ViewportUpdateMode_Enum ("QtGui", "QGraphicsView_ViewportUpdateMode", gsi::enum_const ("FullViewportUpdate", QGraphicsView::FullViewportUpdate, "@brief Enum constant QGraphicsView::FullViewportUpdate") + gsi::enum_const ("MinimalViewportUpdate", QGraphicsView::MinimalViewportUpdate, "@brief Enum constant QGraphicsView::MinimalViewportUpdate") + gsi::enum_const ("SmartViewportUpdate", QGraphicsView::SmartViewportUpdate, "@brief Enum constant QGraphicsView::SmartViewportUpdate") + @@ -4533,13 +4533,13 @@ static gsi::Enum decl_QGraphicsView_ViewportU gsi::enum_const ("BoundingRectViewportUpdate", QGraphicsView::BoundingRectViewportUpdate, "@brief Enum constant QGraphicsView::BoundingRectViewportUpdate"), "@qt\n@brief This class represents the QGraphicsView::ViewportUpdateMode enum"); -static gsi::QFlagsClass decl_QGraphicsView_ViewportUpdateMode_Enums ("QGraphicsView_QFlags_ViewportUpdateMode", +static gsi::QFlagsClass decl_QGraphicsView_ViewportUpdateMode_Enums ("QtGui", "QGraphicsView_QFlags_ViewportUpdateMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QGraphicsView_ViewportUpdateMode_Enum_in_parent (decl_QGraphicsView_ViewportUpdateMode_Enum.defs ()); -static gsi::ClassExt decl_QGraphicsView_ViewportUpdateMode_Enum_as_child (decl_QGraphicsView_ViewportUpdateMode_Enum, "ViewportUpdateMode"); -static gsi::ClassExt decl_QGraphicsView_ViewportUpdateMode_Enums_as_child (decl_QGraphicsView_ViewportUpdateMode_Enums, "QFlags_ViewportUpdateMode"); +static gsi::ClassExt decl_QGraphicsView_ViewportUpdateMode_Enum_as_child (decl_QGraphicsView_ViewportUpdateMode_Enum, "QtGui", "ViewportUpdateMode"); +static gsi::ClassExt decl_QGraphicsView_ViewportUpdateMode_Enums_as_child (decl_QGraphicsView_ViewportUpdateMode_Enums, "QtGui", "QFlags_ViewportUpdateMode"); } diff --git a/src/gsiqt4/gsiDeclQGraphicsWidget.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsWidget.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGraphicsWidget.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGraphicsWidget.cc index 7b66fbb45..2c02dc39c 100644 --- a/src/gsiqt4/gsiDeclQGraphicsWidget.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGraphicsWidget.cc @@ -74,8 +74,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1358,11 +1358,11 @@ static gsi::Methods methods_QGraphicsWidget () { gsi::Class &qtdecl_QGraphicsObject (); -qt_gsi::QtNativeClass decl_QGraphicsWidget (qtdecl_QGraphicsObject (), "QGraphicsWidget_Native", +qt_gsi::QtNativeClass decl_QGraphicsWidget (qtdecl_QGraphicsObject (), "QtGui", "QGraphicsWidget_Native", methods_QGraphicsWidget (), "@hide\n@alias QGraphicsWidget"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsWidget () { return decl_QGraphicsWidget; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsWidget () { return decl_QGraphicsWidget; } } @@ -4402,7 +4402,7 @@ static gsi::Methods methods_QGraphicsWidget_Adaptor () { return methods; } -gsi::Class decl_QGraphicsWidget_Adaptor (qtdecl_QGraphicsWidget (), "QGraphicsWidget", +gsi::Class decl_QGraphicsWidget_Adaptor (qtdecl_QGraphicsWidget (), "QtGui", "QGraphicsWidget", methods_QGraphicsWidget_Adaptor (), "@qt\n@brief Binding of QGraphicsWidget"); diff --git a/src/gsiqt4/gsiDeclQGridLayout.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGridLayout.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGridLayout.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGridLayout.cc index f5995c7b2..b32f71423 100644 --- a/src/gsiqt4/gsiDeclQGridLayout.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGridLayout.cc @@ -41,8 +41,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1035,11 +1035,11 @@ static gsi::Methods methods_QGridLayout () { gsi::Class &qtdecl_QLayout (); -qt_gsi::QtNativeClass decl_QGridLayout (qtdecl_QLayout (), "QGridLayout_Native", +qt_gsi::QtNativeClass decl_QGridLayout (qtdecl_QLayout (), "QtGui", "QGridLayout_Native", methods_QGridLayout (), "@hide\n@alias QGridLayout"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGridLayout () { return decl_QGridLayout; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGridLayout () { return decl_QGridLayout; } } @@ -2266,7 +2266,7 @@ static gsi::Methods methods_QGridLayout_Adaptor () { return methods; } -gsi::Class decl_QGridLayout_Adaptor (qtdecl_QGridLayout (), "QGridLayout", +gsi::Class decl_QGridLayout_Adaptor (qtdecl_QGridLayout (), "QtGui", "QGridLayout", methods_QGridLayout_Adaptor (), "@qt\n@brief Binding of QGridLayout"); diff --git a/src/gsiqt4/gsiDeclQGroupBox.cc b/src/gsiqt/qt4/QtGui/gsiDeclQGroupBox.cc similarity index 99% rename from src/gsiqt4/gsiDeclQGroupBox.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQGroupBox.cc index dc948d20a..1cc52f155 100644 --- a/src/gsiqt4/gsiDeclQGroupBox.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQGroupBox.cc @@ -78,8 +78,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -412,11 +412,11 @@ static gsi::Methods methods_QGroupBox () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QGroupBox (qtdecl_QWidget (), "QGroupBox_Native", +qt_gsi::QtNativeClass decl_QGroupBox (qtdecl_QWidget (), "QtGui", "QGroupBox_Native", methods_QGroupBox (), "@hide\n@alias QGroupBox"); -GSIQT_PUBLIC gsi::Class &qtdecl_QGroupBox () { return decl_QGroupBox; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGroupBox () { return decl_QGroupBox; } } @@ -2726,7 +2726,7 @@ static gsi::Methods methods_QGroupBox_Adaptor () { return methods; } -gsi::Class decl_QGroupBox_Adaptor (qtdecl_QGroupBox (), "QGroupBox", +gsi::Class decl_QGroupBox_Adaptor (qtdecl_QGroupBox (), "QtGui", "QGroupBox", methods_QGroupBox_Adaptor (), "@qt\n@brief Binding of QGroupBox"); diff --git a/src/gsiqt4/gsiDeclQHBoxLayout.cc b/src/gsiqt/qt4/QtGui/gsiDeclQHBoxLayout.cc similarity index 99% rename from src/gsiqt4/gsiDeclQHBoxLayout.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQHBoxLayout.cc index 8d7985d82..45334060c 100644 --- a/src/gsiqt4/gsiDeclQHBoxLayout.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQHBoxLayout.cc @@ -41,8 +41,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -171,11 +171,11 @@ static gsi::Methods methods_QHBoxLayout () { gsi::Class &qtdecl_QBoxLayout (); -qt_gsi::QtNativeClass decl_QHBoxLayout (qtdecl_QBoxLayout (), "QHBoxLayout_Native", +qt_gsi::QtNativeClass decl_QHBoxLayout (qtdecl_QBoxLayout (), "QtGui", "QHBoxLayout_Native", methods_QHBoxLayout (), "@hide\n@alias QHBoxLayout"); -GSIQT_PUBLIC gsi::Class &qtdecl_QHBoxLayout () { return decl_QHBoxLayout; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QHBoxLayout () { return decl_QHBoxLayout; } } @@ -1430,7 +1430,7 @@ static gsi::Methods methods_QHBoxLayout_Adaptor () { return methods; } -gsi::Class decl_QHBoxLayout_Adaptor (qtdecl_QHBoxLayout (), "QHBoxLayout", +gsi::Class decl_QHBoxLayout_Adaptor (qtdecl_QHBoxLayout (), "QtGui", "QHBoxLayout", methods_QHBoxLayout_Adaptor (), "@qt\n@brief Binding of QHBoxLayout"); diff --git a/src/gsiqt4/gsiDeclQHeaderView.cc b/src/gsiqt/qt4/QtGui/gsiDeclQHeaderView.cc similarity index 99% rename from src/gsiqt4/gsiDeclQHeaderView.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQHeaderView.cc index 290870fd8..1f56293cd 100644 --- a/src/gsiqt4/gsiDeclQHeaderView.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQHeaderView.cc @@ -85,8 +85,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1390,11 +1390,11 @@ static gsi::Methods methods_QHeaderView () { gsi::Class &qtdecl_QAbstractItemView (); -qt_gsi::QtNativeClass decl_QHeaderView (qtdecl_QAbstractItemView (), "QHeaderView_Native", +qt_gsi::QtNativeClass decl_QHeaderView (qtdecl_QAbstractItemView (), "QtGui", "QHeaderView_Native", methods_QHeaderView (), "@hide\n@alias QHeaderView"); -GSIQT_PUBLIC gsi::Class &qtdecl_QHeaderView () { return decl_QHeaderView; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QHeaderView () { return decl_QHeaderView; } } @@ -6441,7 +6441,7 @@ static gsi::Methods methods_QHeaderView_Adaptor () { return methods; } -gsi::Class decl_QHeaderView_Adaptor (qtdecl_QHeaderView (), "QHeaderView", +gsi::Class decl_QHeaderView_Adaptor (qtdecl_QHeaderView (), "QtGui", "QHeaderView", methods_QHeaderView_Adaptor (), "@qt\n@brief Binding of QHeaderView"); @@ -6452,7 +6452,7 @@ gsi::Class decl_QHeaderView_Adaptor (qtdecl_QHeaderView (), namespace qt_gsi { -static gsi::Enum decl_QHeaderView_ResizeMode_Enum ("QHeaderView_ResizeMode", +static gsi::Enum decl_QHeaderView_ResizeMode_Enum ("QtGui", "QHeaderView_ResizeMode", gsi::enum_const ("Interactive", QHeaderView::Interactive, "@brief Enum constant QHeaderView::Interactive") + gsi::enum_const ("Stretch", QHeaderView::Stretch, "@brief Enum constant QHeaderView::Stretch") + gsi::enum_const ("Fixed", QHeaderView::Fixed, "@brief Enum constant QHeaderView::Fixed") + @@ -6460,13 +6460,13 @@ static gsi::Enum decl_QHeaderView_ResizeMode_Enum ("QHe gsi::enum_const ("Custom", QHeaderView::Custom, "@brief Enum constant QHeaderView::Custom"), "@qt\n@brief This class represents the QHeaderView::ResizeMode enum"); -static gsi::QFlagsClass decl_QHeaderView_ResizeMode_Enums ("QHeaderView_QFlags_ResizeMode", +static gsi::QFlagsClass decl_QHeaderView_ResizeMode_Enums ("QtGui", "QHeaderView_QFlags_ResizeMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QHeaderView_ResizeMode_Enum_in_parent (decl_QHeaderView_ResizeMode_Enum.defs ()); -static gsi::ClassExt decl_QHeaderView_ResizeMode_Enum_as_child (decl_QHeaderView_ResizeMode_Enum, "ResizeMode"); -static gsi::ClassExt decl_QHeaderView_ResizeMode_Enums_as_child (decl_QHeaderView_ResizeMode_Enums, "QFlags_ResizeMode"); +static gsi::ClassExt decl_QHeaderView_ResizeMode_Enum_as_child (decl_QHeaderView_ResizeMode_Enum, "QtGui", "ResizeMode"); +static gsi::ClassExt decl_QHeaderView_ResizeMode_Enums_as_child (decl_QHeaderView_ResizeMode_Enums, "QtGui", "QFlags_ResizeMode"); } diff --git a/src/gsiqt4/gsiDeclQHelpEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQHelpEvent.cc similarity index 95% rename from src/gsiqt4/gsiDeclQHelpEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQHelpEvent.cc index 81139b30f..77772171a 100644 --- a/src/gsiqt4/gsiDeclQHelpEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQHelpEvent.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -143,11 +143,11 @@ static gsi::Methods methods_QHelpEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QHelpEvent (qtdecl_QEvent (), "QHelpEvent_Native", +gsi::Class decl_QHelpEvent (qtdecl_QEvent (), "QtGui", "QHelpEvent_Native", methods_QHelpEvent (), "@hide\n@alias QHelpEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QHelpEvent () { return decl_QHelpEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QHelpEvent () { return decl_QHelpEvent; } } @@ -204,7 +204,7 @@ static gsi::Methods methods_QHelpEvent_Adaptor () { return methods; } -gsi::Class decl_QHelpEvent_Adaptor (qtdecl_QHelpEvent (), "QHelpEvent", +gsi::Class decl_QHelpEvent_Adaptor (qtdecl_QHelpEvent (), "QtGui", "QHelpEvent", methods_QHelpEvent_Adaptor (), "@qt\n@brief Binding of QHelpEvent"); diff --git a/src/gsiqt4/gsiDeclQHideEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQHideEvent.cc similarity index 90% rename from src/gsiqt4/gsiDeclQHideEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQHideEvent.cc index 1124590a1..162f2701e 100644 --- a/src/gsiqt4/gsiDeclQHideEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQHideEvent.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -46,11 +46,11 @@ static gsi::Methods methods_QHideEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QHideEvent (qtdecl_QEvent (), "QHideEvent_Native", +gsi::Class decl_QHideEvent (qtdecl_QEvent (), "QtGui", "QHideEvent_Native", methods_QHideEvent (), "@hide\n@alias QHideEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QHideEvent () { return decl_QHideEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QHideEvent () { return decl_QHideEvent; } } @@ -97,7 +97,7 @@ static gsi::Methods methods_QHideEvent_Adaptor () { return methods; } -gsi::Class decl_QHideEvent_Adaptor (qtdecl_QHideEvent (), "QHideEvent", +gsi::Class decl_QHideEvent_Adaptor (qtdecl_QHideEvent (), "QtGui", "QHideEvent", methods_QHideEvent_Adaptor (), "@qt\n@brief Binding of QHideEvent"); diff --git a/src/gsiqt4/gsiDeclQHoverEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQHoverEvent.cc similarity index 94% rename from src/gsiqt4/gsiDeclQHoverEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQHoverEvent.cc index 08bd642cb..9669b591c 100644 --- a/src/gsiqt4/gsiDeclQHoverEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQHoverEvent.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -79,11 +79,11 @@ static gsi::Methods methods_QHoverEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QHoverEvent (qtdecl_QEvent (), "QHoverEvent_Native", +gsi::Class decl_QHoverEvent (qtdecl_QEvent (), "QtGui", "QHoverEvent_Native", methods_QHoverEvent (), "@hide\n@alias QHoverEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QHoverEvent () { return decl_QHoverEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QHoverEvent () { return decl_QHoverEvent; } } @@ -140,7 +140,7 @@ static gsi::Methods methods_QHoverEvent_Adaptor () { return methods; } -gsi::Class decl_QHoverEvent_Adaptor (qtdecl_QHoverEvent (), "QHoverEvent", +gsi::Class decl_QHoverEvent_Adaptor (qtdecl_QHoverEvent (), "QtGui", "QHoverEvent", methods_QHoverEvent_Adaptor (), "@qt\n@brief Binding of QHoverEvent"); diff --git a/src/gsiqt4/gsiDeclQIcon.cc b/src/gsiqt/qt4/QtGui/gsiDeclQIcon.cc similarity index 98% rename from src/gsiqt4/gsiDeclQIcon.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQIcon.cc index 4420a2597..d6a1837e1 100644 --- a/src/gsiqt4/gsiDeclQIcon.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQIcon.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -647,12 +647,12 @@ static gsi::Methods methods_QIcon () { return methods; } -gsi::Class decl_QIcon ("QIcon", +gsi::Class decl_QIcon ("QtGui", "QIcon", methods_QIcon (), "@qt\n@brief Binding of QIcon"); -GSIQT_PUBLIC gsi::Class &qtdecl_QIcon () { return decl_QIcon; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QIcon () { return decl_QIcon; } } @@ -661,20 +661,20 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QIcon () { return decl_QIcon; } namespace qt_gsi { -static gsi::Enum decl_QIcon_Mode_Enum ("QIcon_Mode", +static gsi::Enum decl_QIcon_Mode_Enum ("QtGui", "QIcon_Mode", gsi::enum_const ("Normal", QIcon::Normal, "@brief Enum constant QIcon::Normal") + gsi::enum_const ("Disabled", QIcon::Disabled, "@brief Enum constant QIcon::Disabled") + gsi::enum_const ("Active", QIcon::Active, "@brief Enum constant QIcon::Active") + gsi::enum_const ("Selected", QIcon::Selected, "@brief Enum constant QIcon::Selected"), "@qt\n@brief This class represents the QIcon::Mode enum"); -static gsi::QFlagsClass decl_QIcon_Mode_Enums ("QIcon_QFlags_Mode", +static gsi::QFlagsClass decl_QIcon_Mode_Enums ("QtGui", "QIcon_QFlags_Mode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QIcon_Mode_Enum_in_parent (decl_QIcon_Mode_Enum.defs ()); -static gsi::ClassExt decl_QIcon_Mode_Enum_as_child (decl_QIcon_Mode_Enum, "Mode"); -static gsi::ClassExt decl_QIcon_Mode_Enums_as_child (decl_QIcon_Mode_Enums, "QFlags_Mode"); +static gsi::ClassExt decl_QIcon_Mode_Enum_as_child (decl_QIcon_Mode_Enum, "QtGui", "Mode"); +static gsi::ClassExt decl_QIcon_Mode_Enums_as_child (decl_QIcon_Mode_Enums, "QtGui", "QFlags_Mode"); } @@ -683,18 +683,18 @@ static gsi::ClassExt decl_QIcon_Mode_Enums_as_child (decl_QIcon_Mode_Enum namespace qt_gsi { -static gsi::Enum decl_QIcon_State_Enum ("QIcon_State", +static gsi::Enum decl_QIcon_State_Enum ("QtGui", "QIcon_State", gsi::enum_const ("On", QIcon::On, "@brief Enum constant QIcon::On") + gsi::enum_const ("Off", QIcon::Off, "@brief Enum constant QIcon::Off"), "@qt\n@brief This class represents the QIcon::State enum"); -static gsi::QFlagsClass decl_QIcon_State_Enums ("QIcon_QFlags_State", +static gsi::QFlagsClass decl_QIcon_State_Enums ("QtGui", "QIcon_QFlags_State", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QIcon_State_Enum_in_parent (decl_QIcon_State_Enum.defs ()); -static gsi::ClassExt decl_QIcon_State_Enum_as_child (decl_QIcon_State_Enum, "State"); -static gsi::ClassExt decl_QIcon_State_Enums_as_child (decl_QIcon_State_Enums, "QFlags_State"); +static gsi::ClassExt decl_QIcon_State_Enum_as_child (decl_QIcon_State_Enum, "QtGui", "State"); +static gsi::ClassExt decl_QIcon_State_Enums_as_child (decl_QIcon_State_Enums, "QtGui", "QFlags_State"); } diff --git a/src/gsiqt4/gsiDeclQIconDragEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQIconDragEvent.cc similarity index 91% rename from src/gsiqt4/gsiDeclQIconDragEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQIconDragEvent.cc index 15f6402ac..79ae4acb0 100644 --- a/src/gsiqt4/gsiDeclQIconDragEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQIconDragEvent.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -46,11 +46,11 @@ static gsi::Methods methods_QIconDragEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QIconDragEvent (qtdecl_QEvent (), "QIconDragEvent_Native", +gsi::Class decl_QIconDragEvent (qtdecl_QEvent (), "QtGui", "QIconDragEvent_Native", methods_QIconDragEvent (), "@hide\n@alias QIconDragEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QIconDragEvent () { return decl_QIconDragEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QIconDragEvent () { return decl_QIconDragEvent; } } @@ -97,7 +97,7 @@ static gsi::Methods methods_QIconDragEvent_Adaptor () { return methods; } -gsi::Class decl_QIconDragEvent_Adaptor (qtdecl_QIconDragEvent (), "QIconDragEvent", +gsi::Class decl_QIconDragEvent_Adaptor (qtdecl_QIconDragEvent (), "QtGui", "QIconDragEvent", methods_QIconDragEvent_Adaptor (), "@qt\n@brief Binding of QIconDragEvent"); diff --git a/src/gsiqt4/gsiDeclQIconEngine.cc b/src/gsiqt/qt4/QtGui/gsiDeclQIconEngine.cc similarity index 98% rename from src/gsiqt4/gsiDeclQIconEngine.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQIconEngine.cc index 83701cb99..e2411d5a6 100644 --- a/src/gsiqt4/gsiDeclQIconEngine.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQIconEngine.cc @@ -33,8 +33,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -187,11 +187,11 @@ static gsi::Methods methods_QIconEngine () { return methods; } -gsi::Class decl_QIconEngine ("QIconEngine_Native", +gsi::Class decl_QIconEngine ("QtGui", "QIconEngine_Native", methods_QIconEngine (), "@hide\n@alias QIconEngine"); -GSIQT_PUBLIC gsi::Class &qtdecl_QIconEngine () { return decl_QIconEngine; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QIconEngine () { return decl_QIconEngine; } } @@ -485,7 +485,7 @@ static gsi::Methods methods_QIconEngine_Adaptor () { return methods; } -gsi::Class decl_QIconEngine_Adaptor (qtdecl_QIconEngine (), "QIconEngine", +gsi::Class decl_QIconEngine_Adaptor (qtdecl_QIconEngine (), "QtGui", "QIconEngine", methods_QIconEngine_Adaptor (), "@qt\n@brief Binding of QIconEngine"); diff --git a/src/gsiqt4/gsiDeclQIconEnginePlugin.cc b/src/gsiqt/qt4/QtGui/gsiDeclQIconEnginePlugin.cc similarity index 98% rename from src/gsiqt4/gsiDeclQIconEnginePlugin.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQIconEnginePlugin.cc index b589d5818..b9651d57b 100644 --- a/src/gsiqt4/gsiDeclQIconEnginePlugin.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQIconEnginePlugin.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -201,11 +201,11 @@ static gsi::Methods methods_QIconEnginePlugin () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QIconEnginePlugin (qtdecl_QObject (), "QIconEnginePlugin_Native", +qt_gsi::QtNativeClass decl_QIconEnginePlugin (qtdecl_QObject (), "QtGui", "QIconEnginePlugin_Native", methods_QIconEnginePlugin (), "@hide\n@alias QIconEnginePlugin"); -GSIQT_PUBLIC gsi::Class &qtdecl_QIconEnginePlugin () { return decl_QIconEnginePlugin; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QIconEnginePlugin () { return decl_QIconEnginePlugin; } } @@ -662,7 +662,7 @@ static gsi::Methods methods_QIconEnginePlugin_Adaptor () { return methods; } -gsi::Class decl_QIconEnginePlugin_Adaptor (qtdecl_QIconEnginePlugin (), "QIconEnginePlugin", +gsi::Class decl_QIconEnginePlugin_Adaptor (qtdecl_QIconEnginePlugin (), "QtGui", "QIconEnginePlugin", methods_QIconEnginePlugin_Adaptor (), "@qt\n@brief Binding of QIconEnginePlugin"); diff --git a/src/gsiqt4/gsiDeclQIconEnginePluginV2.cc b/src/gsiqt/qt4/QtGui/gsiDeclQIconEnginePluginV2.cc similarity index 98% rename from src/gsiqt4/gsiDeclQIconEnginePluginV2.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQIconEnginePluginV2.cc index 72240eb74..2cdd0facd 100644 --- a/src/gsiqt4/gsiDeclQIconEnginePluginV2.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQIconEnginePluginV2.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -201,11 +201,11 @@ static gsi::Methods methods_QIconEnginePluginV2 () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QIconEnginePluginV2 (qtdecl_QObject (), "QIconEnginePluginV2_Native", +qt_gsi::QtNativeClass decl_QIconEnginePluginV2 (qtdecl_QObject (), "QtGui", "QIconEnginePluginV2_Native", methods_QIconEnginePluginV2 (), "@hide\n@alias QIconEnginePluginV2"); -GSIQT_PUBLIC gsi::Class &qtdecl_QIconEnginePluginV2 () { return decl_QIconEnginePluginV2; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QIconEnginePluginV2 () { return decl_QIconEnginePluginV2; } } @@ -662,7 +662,7 @@ static gsi::Methods methods_QIconEnginePluginV2_Adaptor () { return methods; } -gsi::Class decl_QIconEnginePluginV2_Adaptor (qtdecl_QIconEnginePluginV2 (), "QIconEnginePluginV2", +gsi::Class decl_QIconEnginePluginV2_Adaptor (qtdecl_QIconEnginePluginV2 (), "QtGui", "QIconEnginePluginV2", methods_QIconEnginePluginV2_Adaptor (), "@qt\n@brief Binding of QIconEnginePluginV2"); diff --git a/src/gsiqt4/gsiDeclQIconEngineV2.cc b/src/gsiqt/qt4/QtGui/gsiDeclQIconEngineV2.cc similarity index 99% rename from src/gsiqt4/gsiDeclQIconEngineV2.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQIconEngineV2.cc index 15f58af98..65ce454ed 100644 --- a/src/gsiqt4/gsiDeclQIconEngineV2.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQIconEngineV2.cc @@ -34,8 +34,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -170,11 +170,11 @@ static gsi::Methods methods_QIconEngineV2 () { gsi::Class &qtdecl_QIconEngine (); -gsi::Class decl_QIconEngineV2 (qtdecl_QIconEngine (), "QIconEngineV2_Native", +gsi::Class decl_QIconEngineV2 (qtdecl_QIconEngine (), "QtGui", "QIconEngineV2_Native", methods_QIconEngineV2 (), "@hide\n@alias QIconEngineV2"); -GSIQT_PUBLIC gsi::Class &qtdecl_QIconEngineV2 () { return decl_QIconEngineV2; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QIconEngineV2 () { return decl_QIconEngineV2; } } @@ -669,7 +669,7 @@ static gsi::Methods methods_QIconEngineV2_Adaptor () { return methods; } -gsi::Class decl_QIconEngineV2_Adaptor (qtdecl_QIconEngineV2 (), "QIconEngineV2", +gsi::Class decl_QIconEngineV2_Adaptor (qtdecl_QIconEngineV2 (), "QtGui", "QIconEngineV2", methods_QIconEngineV2_Adaptor (), "@qt\n@brief Binding of QIconEngineV2"); diff --git a/src/gsiqt4/gsiDeclQImage.cc b/src/gsiqt/qt4/QtGui/gsiDeclQImage.cc similarity index 99% rename from src/gsiqt4/gsiDeclQImage.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQImage.cc index fc49b64d4..c63688fe6 100644 --- a/src/gsiqt4/gsiDeclQImage.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQImage.cc @@ -37,8 +37,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1701,11 +1701,11 @@ static gsi::Methods methods_QImage () { gsi::Class &qtdecl_QPaintDevice (); -gsi::Class decl_QImage (qtdecl_QPaintDevice (), "QImage_Native", +gsi::Class decl_QImage (qtdecl_QPaintDevice (), "QtGui", "QImage_Native", methods_QImage (), "@hide\n@alias QImage"); -GSIQT_PUBLIC gsi::Class &qtdecl_QImage () { return decl_QImage; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QImage () { return decl_QImage; } } @@ -2018,7 +2018,7 @@ static gsi::Methods methods_QImage_Adaptor () { return methods; } -gsi::Class decl_QImage_Adaptor (qtdecl_QImage (), "QImage", +gsi::Class decl_QImage_Adaptor (qtdecl_QImage (), "QtGui", "QImage", methods_QImage_Adaptor (), "@qt\n@brief Binding of QImage"); @@ -2029,7 +2029,7 @@ gsi::Class decl_QImage_Adaptor (qtdecl_QImage (), "QImage", namespace qt_gsi { -static gsi::Enum decl_QImage_Format_Enum ("QImage_Format", +static gsi::Enum decl_QImage_Format_Enum ("QtGui", "QImage_Format", gsi::enum_const ("Format_Invalid", QImage::Format_Invalid, "@brief Enum constant QImage::Format_Invalid") + gsi::enum_const ("Format_Mono", QImage::Format_Mono, "@brief Enum constant QImage::Format_Mono") + gsi::enum_const ("Format_MonoLSB", QImage::Format_MonoLSB, "@brief Enum constant QImage::Format_MonoLSB") + @@ -2049,13 +2049,13 @@ static gsi::Enum decl_QImage_Format_Enum ("QImage_Format", gsi::enum_const ("NImageFormats", QImage::NImageFormats, "@brief Enum constant QImage::NImageFormats"), "@qt\n@brief This class represents the QImage::Format enum"); -static gsi::QFlagsClass decl_QImage_Format_Enums ("QImage_QFlags_Format", +static gsi::QFlagsClass decl_QImage_Format_Enums ("QtGui", "QImage_QFlags_Format", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QImage_Format_Enum_in_parent (decl_QImage_Format_Enum.defs ()); -static gsi::ClassExt decl_QImage_Format_Enum_as_child (decl_QImage_Format_Enum, "Format"); -static gsi::ClassExt decl_QImage_Format_Enums_as_child (decl_QImage_Format_Enums, "QFlags_Format"); +static gsi::ClassExt decl_QImage_Format_Enum_as_child (decl_QImage_Format_Enum, "QtGui", "Format"); +static gsi::ClassExt decl_QImage_Format_Enums_as_child (decl_QImage_Format_Enums, "QtGui", "QFlags_Format"); } @@ -2064,18 +2064,18 @@ static gsi::ClassExt decl_QImage_Format_Enums_as_child (decl_QImage_Form namespace qt_gsi { -static gsi::Enum decl_QImage_InvertMode_Enum ("QImage_InvertMode", +static gsi::Enum decl_QImage_InvertMode_Enum ("QtGui", "QImage_InvertMode", gsi::enum_const ("InvertRgb", QImage::InvertRgb, "@brief Enum constant QImage::InvertRgb") + gsi::enum_const ("InvertRgba", QImage::InvertRgba, "@brief Enum constant QImage::InvertRgba"), "@qt\n@brief This class represents the QImage::InvertMode enum"); -static gsi::QFlagsClass decl_QImage_InvertMode_Enums ("QImage_QFlags_InvertMode", +static gsi::QFlagsClass decl_QImage_InvertMode_Enums ("QtGui", "QImage_QFlags_InvertMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QImage_InvertMode_Enum_in_parent (decl_QImage_InvertMode_Enum.defs ()); -static gsi::ClassExt decl_QImage_InvertMode_Enum_as_child (decl_QImage_InvertMode_Enum, "InvertMode"); -static gsi::ClassExt decl_QImage_InvertMode_Enums_as_child (decl_QImage_InvertMode_Enums, "QFlags_InvertMode"); +static gsi::ClassExt decl_QImage_InvertMode_Enum_as_child (decl_QImage_InvertMode_Enum, "QtGui", "InvertMode"); +static gsi::ClassExt decl_QImage_InvertMode_Enums_as_child (decl_QImage_InvertMode_Enums, "QtGui", "QFlags_InvertMode"); } diff --git a/src/gsiqt4/gsiDeclQImageIOHandler.cc b/src/gsiqt/qt4/QtGui/gsiDeclQImageIOHandler.cc similarity index 98% rename from src/gsiqt4/gsiDeclQImageIOHandler.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQImageIOHandler.cc index e586f8e3b..06951b658 100644 --- a/src/gsiqt4/gsiDeclQImageIOHandler.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQImageIOHandler.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -394,11 +394,11 @@ static gsi::Methods methods_QImageIOHandler () { return methods; } -gsi::Class decl_QImageIOHandler ("QImageIOHandler_Native", +gsi::Class decl_QImageIOHandler ("QtGui", "QImageIOHandler_Native", methods_QImageIOHandler (), "@hide\n@alias QImageIOHandler"); -GSIQT_PUBLIC gsi::Class &qtdecl_QImageIOHandler () { return decl_QImageIOHandler; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QImageIOHandler () { return decl_QImageIOHandler; } } @@ -991,7 +991,7 @@ static gsi::Methods methods_QImageIOHandler_Adaptor () { return methods; } -gsi::Class decl_QImageIOHandler_Adaptor (qtdecl_QImageIOHandler (), "QImageIOHandler", +gsi::Class decl_QImageIOHandler_Adaptor (qtdecl_QImageIOHandler (), "QtGui", "QImageIOHandler", methods_QImageIOHandler_Adaptor (), "@qt\n@brief Binding of QImageIOHandler"); @@ -1002,7 +1002,7 @@ gsi::Class decl_QImageIOHandler_Adaptor (qtdecl_QImageI namespace qt_gsi { -static gsi::Enum decl_QImageIOHandler_ImageOption_Enum ("QImageIOHandler_ImageOption", +static gsi::Enum decl_QImageIOHandler_ImageOption_Enum ("QtGui", "QImageIOHandler_ImageOption", gsi::enum_const ("Size", QImageIOHandler::Size, "@brief Enum constant QImageIOHandler::Size") + gsi::enum_const ("ClipRect", QImageIOHandler::ClipRect, "@brief Enum constant QImageIOHandler::ClipRect") + gsi::enum_const ("Description", QImageIOHandler::Description, "@brief Enum constant QImageIOHandler::Description") + @@ -1020,13 +1020,13 @@ static gsi::Enum decl_QImageIOHandler_ImageOption_ gsi::enum_const ("ImageFormat", QImageIOHandler::ImageFormat, "@brief Enum constant QImageIOHandler::ImageFormat"), "@qt\n@brief This class represents the QImageIOHandler::ImageOption enum"); -static gsi::QFlagsClass decl_QImageIOHandler_ImageOption_Enums ("QImageIOHandler_QFlags_ImageOption", +static gsi::QFlagsClass decl_QImageIOHandler_ImageOption_Enums ("QtGui", "QImageIOHandler_QFlags_ImageOption", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QImageIOHandler_ImageOption_Enum_in_parent (decl_QImageIOHandler_ImageOption_Enum.defs ()); -static gsi::ClassExt decl_QImageIOHandler_ImageOption_Enum_as_child (decl_QImageIOHandler_ImageOption_Enum, "ImageOption"); -static gsi::ClassExt decl_QImageIOHandler_ImageOption_Enums_as_child (decl_QImageIOHandler_ImageOption_Enums, "QFlags_ImageOption"); +static gsi::ClassExt decl_QImageIOHandler_ImageOption_Enum_as_child (decl_QImageIOHandler_ImageOption_Enum, "QtGui", "ImageOption"); +static gsi::ClassExt decl_QImageIOHandler_ImageOption_Enums_as_child (decl_QImageIOHandler_ImageOption_Enums, "QtGui", "QFlags_ImageOption"); } diff --git a/src/gsiqt4/gsiDeclQImageIOPlugin.cc b/src/gsiqt/qt4/QtGui/gsiDeclQImageIOPlugin.cc similarity index 98% rename from src/gsiqt4/gsiDeclQImageIOPlugin.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQImageIOPlugin.cc index 291b41fb8..30f339cc4 100644 --- a/src/gsiqt4/gsiDeclQImageIOPlugin.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQImageIOPlugin.cc @@ -36,8 +36,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -228,11 +228,11 @@ static gsi::Methods methods_QImageIOPlugin () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QImageIOPlugin (qtdecl_QObject (), "QImageIOPlugin_Native", +qt_gsi::QtNativeClass decl_QImageIOPlugin (qtdecl_QObject (), "QtGui", "QImageIOPlugin_Native", methods_QImageIOPlugin (), "@hide\n@alias QImageIOPlugin"); -GSIQT_PUBLIC gsi::Class &qtdecl_QImageIOPlugin () { return decl_QImageIOPlugin; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QImageIOPlugin () { return decl_QImageIOPlugin; } } @@ -739,7 +739,7 @@ static gsi::Methods methods_QImageIOPlugin_Adaptor () { return methods; } -gsi::Class decl_QImageIOPlugin_Adaptor (qtdecl_QImageIOPlugin (), "QImageIOPlugin", +gsi::Class decl_QImageIOPlugin_Adaptor (qtdecl_QImageIOPlugin (), "QtGui", "QImageIOPlugin", methods_QImageIOPlugin_Adaptor (), "@qt\n@brief Binding of QImageIOPlugin"); @@ -750,19 +750,19 @@ gsi::Class decl_QImageIOPlugin_Adaptor (qtdecl_QImageIOP namespace qt_gsi { -static gsi::Enum decl_QImageIOPlugin_Capability_Enum ("QImageIOPlugin_Capability", +static gsi::Enum decl_QImageIOPlugin_Capability_Enum ("QtGui", "QImageIOPlugin_Capability", gsi::enum_const ("CanRead", QImageIOPlugin::CanRead, "@brief Enum constant QImageIOPlugin::CanRead") + gsi::enum_const ("CanWrite", QImageIOPlugin::CanWrite, "@brief Enum constant QImageIOPlugin::CanWrite") + gsi::enum_const ("CanReadIncremental", QImageIOPlugin::CanReadIncremental, "@brief Enum constant QImageIOPlugin::CanReadIncremental"), "@qt\n@brief This class represents the QImageIOPlugin::Capability enum"); -static gsi::QFlagsClass decl_QImageIOPlugin_Capability_Enums ("QImageIOPlugin_QFlags_Capability", +static gsi::QFlagsClass decl_QImageIOPlugin_Capability_Enums ("QtGui", "QImageIOPlugin_QFlags_Capability", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QImageIOPlugin_Capability_Enum_in_parent (decl_QImageIOPlugin_Capability_Enum.defs ()); -static gsi::ClassExt decl_QImageIOPlugin_Capability_Enum_as_child (decl_QImageIOPlugin_Capability_Enum, "Capability"); -static gsi::ClassExt decl_QImageIOPlugin_Capability_Enums_as_child (decl_QImageIOPlugin_Capability_Enums, "QFlags_Capability"); +static gsi::ClassExt decl_QImageIOPlugin_Capability_Enum_as_child (decl_QImageIOPlugin_Capability_Enum, "QtGui", "Capability"); +static gsi::ClassExt decl_QImageIOPlugin_Capability_Enums_as_child (decl_QImageIOPlugin_Capability_Enums, "QtGui", "QFlags_Capability"); } diff --git a/src/gsiqt4/gsiDeclQImageReader.cc b/src/gsiqt/qt4/QtGui/gsiDeclQImageReader.cc similarity index 98% rename from src/gsiqt4/gsiDeclQImageReader.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQImageReader.cc index c0d600d3e..c1eac4b6d 100644 --- a/src/gsiqt4/gsiDeclQImageReader.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQImageReader.cc @@ -34,8 +34,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -842,12 +842,12 @@ static gsi::Methods methods_QImageReader () { return methods; } -gsi::Class decl_QImageReader ("QImageReader", +gsi::Class decl_QImageReader ("QtGui", "QImageReader", methods_QImageReader (), "@qt\n@brief Binding of QImageReader"); -GSIQT_PUBLIC gsi::Class &qtdecl_QImageReader () { return decl_QImageReader; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QImageReader () { return decl_QImageReader; } } @@ -856,7 +856,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QImageReader () { return decl_QIma namespace qt_gsi { -static gsi::Enum decl_QImageReader_ImageReaderError_Enum ("QImageReader_ImageReaderError", +static gsi::Enum decl_QImageReader_ImageReaderError_Enum ("QtGui", "QImageReader_ImageReaderError", gsi::enum_const ("UnknownError", QImageReader::UnknownError, "@brief Enum constant QImageReader::UnknownError") + gsi::enum_const ("FileNotFoundError", QImageReader::FileNotFoundError, "@brief Enum constant QImageReader::FileNotFoundError") + gsi::enum_const ("DeviceError", QImageReader::DeviceError, "@brief Enum constant QImageReader::DeviceError") + @@ -864,13 +864,13 @@ static gsi::Enum decl_QImageReader_ImageReaderEr gsi::enum_const ("InvalidDataError", QImageReader::InvalidDataError, "@brief Enum constant QImageReader::InvalidDataError"), "@qt\n@brief This class represents the QImageReader::ImageReaderError enum"); -static gsi::QFlagsClass decl_QImageReader_ImageReaderError_Enums ("QImageReader_QFlags_ImageReaderError", +static gsi::QFlagsClass decl_QImageReader_ImageReaderError_Enums ("QtGui", "QImageReader_QFlags_ImageReaderError", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QImageReader_ImageReaderError_Enum_in_parent (decl_QImageReader_ImageReaderError_Enum.defs ()); -static gsi::ClassExt decl_QImageReader_ImageReaderError_Enum_as_child (decl_QImageReader_ImageReaderError_Enum, "ImageReaderError"); -static gsi::ClassExt decl_QImageReader_ImageReaderError_Enums_as_child (decl_QImageReader_ImageReaderError_Enums, "QFlags_ImageReaderError"); +static gsi::ClassExt decl_QImageReader_ImageReaderError_Enum_as_child (decl_QImageReader_ImageReaderError_Enum, "QtGui", "ImageReaderError"); +static gsi::ClassExt decl_QImageReader_ImageReaderError_Enums_as_child (decl_QImageReader_ImageReaderError_Enums, "QtGui", "QFlags_ImageReaderError"); } diff --git a/src/gsiqt4/gsiDeclQImageTextKeyLang.cc b/src/gsiqt/qt4/QtGui/gsiDeclQImageTextKeyLang.cc similarity index 95% rename from src/gsiqt4/gsiDeclQImageTextKeyLang.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQImageTextKeyLang.cc index a80c38a3e..7f37269a8 100644 --- a/src/gsiqt4/gsiDeclQImageTextKeyLang.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQImageTextKeyLang.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -144,12 +144,12 @@ static gsi::Methods methods_QImageTextKeyLang () { return methods; } -gsi::Class decl_QImageTextKeyLang ("QImageTextKeyLang", +gsi::Class decl_QImageTextKeyLang ("QtGui", "QImageTextKeyLang", methods_QImageTextKeyLang (), "@qt\n@brief Binding of QImageTextKeyLang"); -GSIQT_PUBLIC gsi::Class &qtdecl_QImageTextKeyLang () { return decl_QImageTextKeyLang; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QImageTextKeyLang () { return decl_QImageTextKeyLang; } } diff --git a/src/gsiqt4/gsiDeclQImageWriter.cc b/src/gsiqt/qt4/QtGui/gsiDeclQImageWriter.cc similarity index 97% rename from src/gsiqt4/gsiDeclQImageWriter.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQImageWriter.cc index 416071bc0..d16df1183 100644 --- a/src/gsiqt4/gsiDeclQImageWriter.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQImageWriter.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -496,12 +496,12 @@ static gsi::Methods methods_QImageWriter () { return methods; } -gsi::Class decl_QImageWriter ("QImageWriter", +gsi::Class decl_QImageWriter ("QtGui", "QImageWriter", methods_QImageWriter (), "@qt\n@brief Binding of QImageWriter"); -GSIQT_PUBLIC gsi::Class &qtdecl_QImageWriter () { return decl_QImageWriter; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QImageWriter () { return decl_QImageWriter; } } @@ -510,19 +510,19 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QImageWriter () { return decl_QIma namespace qt_gsi { -static gsi::Enum decl_QImageWriter_ImageWriterError_Enum ("QImageWriter_ImageWriterError", +static gsi::Enum decl_QImageWriter_ImageWriterError_Enum ("QtGui", "QImageWriter_ImageWriterError", gsi::enum_const ("UnknownError", QImageWriter::UnknownError, "@brief Enum constant QImageWriter::UnknownError") + gsi::enum_const ("DeviceError", QImageWriter::DeviceError, "@brief Enum constant QImageWriter::DeviceError") + gsi::enum_const ("UnsupportedFormatError", QImageWriter::UnsupportedFormatError, "@brief Enum constant QImageWriter::UnsupportedFormatError"), "@qt\n@brief This class represents the QImageWriter::ImageWriterError enum"); -static gsi::QFlagsClass decl_QImageWriter_ImageWriterError_Enums ("QImageWriter_QFlags_ImageWriterError", +static gsi::QFlagsClass decl_QImageWriter_ImageWriterError_Enums ("QtGui", "QImageWriter_QFlags_ImageWriterError", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QImageWriter_ImageWriterError_Enum_in_parent (decl_QImageWriter_ImageWriterError_Enum.defs ()); -static gsi::ClassExt decl_QImageWriter_ImageWriterError_Enum_as_child (decl_QImageWriter_ImageWriterError_Enum, "ImageWriterError"); -static gsi::ClassExt decl_QImageWriter_ImageWriterError_Enums_as_child (decl_QImageWriter_ImageWriterError_Enums, "QFlags_ImageWriterError"); +static gsi::ClassExt decl_QImageWriter_ImageWriterError_Enum_as_child (decl_QImageWriter_ImageWriterError_Enum, "QtGui", "ImageWriterError"); +static gsi::ClassExt decl_QImageWriter_ImageWriterError_Enums_as_child (decl_QImageWriter_ImageWriterError_Enums, "QtGui", "QFlags_ImageWriterError"); } diff --git a/src/gsiqt4/gsiDeclQInputContext.cc b/src/gsiqt/qt4/QtGui/gsiDeclQInputContext.cc similarity index 98% rename from src/gsiqt4/gsiDeclQInputContext.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQInputContext.cc index 616460113..930bd1829 100644 --- a/src/gsiqt4/gsiDeclQInputContext.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQInputContext.cc @@ -39,8 +39,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -426,11 +426,11 @@ static gsi::Methods methods_QInputContext () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QInputContext (qtdecl_QObject (), "QInputContext_Native", +qt_gsi::QtNativeClass decl_QInputContext (qtdecl_QObject (), "QtGui", "QInputContext_Native", methods_QInputContext (), "@hide\n@alias QInputContext"); -GSIQT_PUBLIC gsi::Class &qtdecl_QInputContext () { return decl_QInputContext; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QInputContext () { return decl_QInputContext; } } @@ -1239,7 +1239,7 @@ static gsi::Methods methods_QInputContext_Adaptor () { return methods; } -gsi::Class decl_QInputContext_Adaptor (qtdecl_QInputContext (), "QInputContext", +gsi::Class decl_QInputContext_Adaptor (qtdecl_QInputContext (), "QtGui", "QInputContext", methods_QInputContext_Adaptor (), "@qt\n@brief Binding of QInputContext"); @@ -1250,18 +1250,18 @@ gsi::Class decl_QInputContext_Adaptor (qtdecl_QInputConte namespace qt_gsi { -static gsi::Enum decl_QInputContext_StandardFormat_Enum ("QInputContext_StandardFormat", +static gsi::Enum decl_QInputContext_StandardFormat_Enum ("QtGui", "QInputContext_StandardFormat", gsi::enum_const ("PreeditFormat", QInputContext::PreeditFormat, "@brief Enum constant QInputContext::PreeditFormat") + gsi::enum_const ("SelectionFormat", QInputContext::SelectionFormat, "@brief Enum constant QInputContext::SelectionFormat"), "@qt\n@brief This class represents the QInputContext::StandardFormat enum"); -static gsi::QFlagsClass decl_QInputContext_StandardFormat_Enums ("QInputContext_QFlags_StandardFormat", +static gsi::QFlagsClass decl_QInputContext_StandardFormat_Enums ("QtGui", "QInputContext_QFlags_StandardFormat", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QInputContext_StandardFormat_Enum_in_parent (decl_QInputContext_StandardFormat_Enum.defs ()); -static gsi::ClassExt decl_QInputContext_StandardFormat_Enum_as_child (decl_QInputContext_StandardFormat_Enum, "StandardFormat"); -static gsi::ClassExt decl_QInputContext_StandardFormat_Enums_as_child (decl_QInputContext_StandardFormat_Enums, "QFlags_StandardFormat"); +static gsi::ClassExt decl_QInputContext_StandardFormat_Enum_as_child (decl_QInputContext_StandardFormat_Enum, "QtGui", "StandardFormat"); +static gsi::ClassExt decl_QInputContext_StandardFormat_Enums_as_child (decl_QInputContext_StandardFormat_Enums, "QtGui", "QFlags_StandardFormat"); } diff --git a/src/gsiqt4/gsiDeclQInputContextFactory.cc b/src/gsiqt/qt4/QtGui/gsiDeclQInputContextFactory.cc similarity index 95% rename from src/gsiqt4/gsiDeclQInputContextFactory.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQInputContextFactory.cc index 1ccf09c39..16ea5ce6e 100644 --- a/src/gsiqt4/gsiDeclQInputContextFactory.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQInputContextFactory.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -162,12 +162,12 @@ static gsi::Methods methods_QInputContextFactory () { return methods; } -gsi::Class decl_QInputContextFactory ("QInputContextFactory", +gsi::Class decl_QInputContextFactory ("QtGui", "QInputContextFactory", methods_QInputContextFactory (), "@qt\n@brief Binding of QInputContextFactory"); -GSIQT_PUBLIC gsi::Class &qtdecl_QInputContextFactory () { return decl_QInputContextFactory; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QInputContextFactory () { return decl_QInputContextFactory; } } diff --git a/src/gsiqt4/gsiDeclQInputContextPlugin.cc b/src/gsiqt/qt4/QtGui/gsiDeclQInputContextPlugin.cc similarity index 99% rename from src/gsiqt4/gsiDeclQInputContextPlugin.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQInputContextPlugin.cc index ffad7a9a1..6420c77fa 100644 --- a/src/gsiqt4/gsiDeclQInputContextPlugin.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQInputContextPlugin.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -261,11 +261,11 @@ static gsi::Methods methods_QInputContextPlugin () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QInputContextPlugin (qtdecl_QObject (), "QInputContextPlugin_Native", +qt_gsi::QtNativeClass decl_QInputContextPlugin (qtdecl_QObject (), "QtGui", "QInputContextPlugin_Native", methods_QInputContextPlugin (), "@hide\n@alias QInputContextPlugin"); -GSIQT_PUBLIC gsi::Class &qtdecl_QInputContextPlugin () { return decl_QInputContextPlugin; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QInputContextPlugin () { return decl_QInputContextPlugin; } } @@ -848,7 +848,7 @@ static gsi::Methods methods_QInputContextPlugin_Adaptor () { return methods; } -gsi::Class decl_QInputContextPlugin_Adaptor (qtdecl_QInputContextPlugin (), "QInputContextPlugin", +gsi::Class decl_QInputContextPlugin_Adaptor (qtdecl_QInputContextPlugin (), "QtGui", "QInputContextPlugin", methods_QInputContextPlugin_Adaptor (), "@qt\n@brief Binding of QInputContextPlugin"); diff --git a/src/gsiqt4/gsiDeclQInputDialog.cc b/src/gsiqt/qt4/QtGui/gsiDeclQInputDialog.cc similarity index 99% rename from src/gsiqt4/gsiDeclQInputDialog.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQInputDialog.cc index b9e7b6c9f..67b855db4 100644 --- a/src/gsiqt4/gsiDeclQInputDialog.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQInputDialog.cc @@ -77,8 +77,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1264,11 +1264,11 @@ static gsi::Methods methods_QInputDialog () { gsi::Class &qtdecl_QDialog (); -qt_gsi::QtNativeClass decl_QInputDialog (qtdecl_QDialog (), "QInputDialog_Native", +qt_gsi::QtNativeClass decl_QInputDialog (qtdecl_QDialog (), "QtGui", "QInputDialog_Native", methods_QInputDialog (), "@hide\n@alias QInputDialog"); -GSIQT_PUBLIC gsi::Class &qtdecl_QInputDialog () { return decl_QInputDialog; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QInputDialog () { return decl_QInputDialog; } } @@ -3838,7 +3838,7 @@ static gsi::Methods methods_QInputDialog_Adaptor () { return methods; } -gsi::Class decl_QInputDialog_Adaptor (qtdecl_QInputDialog (), "QInputDialog", +gsi::Class decl_QInputDialog_Adaptor (qtdecl_QInputDialog (), "QtGui", "QInputDialog", methods_QInputDialog_Adaptor (), "@qt\n@brief Binding of QInputDialog"); @@ -3849,18 +3849,18 @@ gsi::Class decl_QInputDialog_Adaptor (qtdecl_QInputDialog namespace qt_gsi { -static gsi::Enum decl_QInputDialog_InputDialogOption_Enum ("QInputDialog_InputDialogOption", +static gsi::Enum decl_QInputDialog_InputDialogOption_Enum ("QtGui", "QInputDialog_InputDialogOption", gsi::enum_const ("NoButtons", QInputDialog::NoButtons, "@brief Enum constant QInputDialog::NoButtons") + gsi::enum_const ("UseListViewForComboBoxItems", QInputDialog::UseListViewForComboBoxItems, "@brief Enum constant QInputDialog::UseListViewForComboBoxItems"), "@qt\n@brief This class represents the QInputDialog::InputDialogOption enum"); -static gsi::QFlagsClass decl_QInputDialog_InputDialogOption_Enums ("QInputDialog_QFlags_InputDialogOption", +static gsi::QFlagsClass decl_QInputDialog_InputDialogOption_Enums ("QtGui", "QInputDialog_QFlags_InputDialogOption", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QInputDialog_InputDialogOption_Enum_in_parent (decl_QInputDialog_InputDialogOption_Enum.defs ()); -static gsi::ClassExt decl_QInputDialog_InputDialogOption_Enum_as_child (decl_QInputDialog_InputDialogOption_Enum, "InputDialogOption"); -static gsi::ClassExt decl_QInputDialog_InputDialogOption_Enums_as_child (decl_QInputDialog_InputDialogOption_Enums, "QFlags_InputDialogOption"); +static gsi::ClassExt decl_QInputDialog_InputDialogOption_Enum_as_child (decl_QInputDialog_InputDialogOption_Enum, "QtGui", "InputDialogOption"); +static gsi::ClassExt decl_QInputDialog_InputDialogOption_Enums_as_child (decl_QInputDialog_InputDialogOption_Enums, "QtGui", "QFlags_InputDialogOption"); } @@ -3869,19 +3869,19 @@ static gsi::ClassExt decl_QInputDialog_InputDialogOption_Enums_as_ namespace qt_gsi { -static gsi::Enum decl_QInputDialog_InputMode_Enum ("QInputDialog_InputMode", +static gsi::Enum decl_QInputDialog_InputMode_Enum ("QtGui", "QInputDialog_InputMode", gsi::enum_const ("TextInput", QInputDialog::TextInput, "@brief Enum constant QInputDialog::TextInput") + gsi::enum_const ("IntInput", QInputDialog::IntInput, "@brief Enum constant QInputDialog::IntInput") + gsi::enum_const ("DoubleInput", QInputDialog::DoubleInput, "@brief Enum constant QInputDialog::DoubleInput"), "@qt\n@brief This class represents the QInputDialog::InputMode enum"); -static gsi::QFlagsClass decl_QInputDialog_InputMode_Enums ("QInputDialog_QFlags_InputMode", +static gsi::QFlagsClass decl_QInputDialog_InputMode_Enums ("QtGui", "QInputDialog_QFlags_InputMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QInputDialog_InputMode_Enum_in_parent (decl_QInputDialog_InputMode_Enum.defs ()); -static gsi::ClassExt decl_QInputDialog_InputMode_Enum_as_child (decl_QInputDialog_InputMode_Enum, "InputMode"); -static gsi::ClassExt decl_QInputDialog_InputMode_Enums_as_child (decl_QInputDialog_InputMode_Enums, "QFlags_InputMode"); +static gsi::ClassExt decl_QInputDialog_InputMode_Enum_as_child (decl_QInputDialog_InputMode_Enum, "QtGui", "InputMode"); +static gsi::ClassExt decl_QInputDialog_InputMode_Enums_as_child (decl_QInputDialog_InputMode_Enums, "QtGui", "QFlags_InputMode"); } diff --git a/src/gsiqt4/gsiDeclQInputEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQInputEvent.cc similarity index 94% rename from src/gsiqt4/gsiDeclQInputEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQInputEvent.cc index 123fa2234..f89cddec4 100644 --- a/src/gsiqt4/gsiDeclQInputEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQInputEvent.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -83,11 +83,11 @@ static gsi::Methods methods_QInputEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QInputEvent (qtdecl_QEvent (), "QInputEvent_Native", +gsi::Class decl_QInputEvent (qtdecl_QEvent (), "QtGui", "QInputEvent_Native", methods_QInputEvent (), "@hide\n@alias QInputEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QInputEvent () { return decl_QInputEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QInputEvent () { return decl_QInputEvent; } } @@ -147,7 +147,7 @@ static gsi::Methods methods_QInputEvent_Adaptor () { return methods; } -gsi::Class decl_QInputEvent_Adaptor (qtdecl_QInputEvent (), "QInputEvent", +gsi::Class decl_QInputEvent_Adaptor (qtdecl_QInputEvent (), "QtGui", "QInputEvent", methods_QInputEvent_Adaptor (), "@qt\n@brief Binding of QInputEvent"); diff --git a/src/gsiqt4/gsiDeclQInputMethodEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQInputMethodEvent.cc similarity index 95% rename from src/gsiqt4/gsiDeclQInputMethodEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQInputMethodEvent.cc index 6959f62f5..dc5ca9d0f 100644 --- a/src/gsiqt4/gsiDeclQInputMethodEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQInputMethodEvent.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -213,12 +213,12 @@ static gsi::Methods methods_QInputMethodEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QInputMethodEvent (qtdecl_QEvent (), "QInputMethodEvent", +gsi::Class decl_QInputMethodEvent (qtdecl_QEvent (), "QtGui", "QInputMethodEvent", methods_QInputMethodEvent (), "@qt\n@brief Binding of QInputMethodEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QInputMethodEvent () { return decl_QInputMethodEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QInputMethodEvent () { return decl_QInputMethodEvent; } } @@ -227,7 +227,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QInputMethodEvent () { return namespace qt_gsi { -static gsi::Enum decl_QInputMethodEvent_AttributeType_Enum ("QInputMethodEvent_AttributeType", +static gsi::Enum decl_QInputMethodEvent_AttributeType_Enum ("QtGui", "QInputMethodEvent_AttributeType", gsi::enum_const ("TextFormat", QInputMethodEvent::TextFormat, "@brief Enum constant QInputMethodEvent::TextFormat") + gsi::enum_const ("Cursor", QInputMethodEvent::Cursor, "@brief Enum constant QInputMethodEvent::Cursor") + gsi::enum_const ("Language", QInputMethodEvent::Language, "@brief Enum constant QInputMethodEvent::Language") + @@ -235,13 +235,13 @@ static gsi::Enum decl_QInputMethodEvent_Attrib gsi::enum_const ("Selection", QInputMethodEvent::Selection, "@brief Enum constant QInputMethodEvent::Selection"), "@qt\n@brief This class represents the QInputMethodEvent::AttributeType enum"); -static gsi::QFlagsClass decl_QInputMethodEvent_AttributeType_Enums ("QInputMethodEvent_QFlags_AttributeType", +static gsi::QFlagsClass decl_QInputMethodEvent_AttributeType_Enums ("QtGui", "QInputMethodEvent_QFlags_AttributeType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QInputMethodEvent_AttributeType_Enum_in_parent (decl_QInputMethodEvent_AttributeType_Enum.defs ()); -static gsi::ClassExt decl_QInputMethodEvent_AttributeType_Enum_as_child (decl_QInputMethodEvent_AttributeType_Enum, "AttributeType"); -static gsi::ClassExt decl_QInputMethodEvent_AttributeType_Enums_as_child (decl_QInputMethodEvent_AttributeType_Enums, "QFlags_AttributeType"); +static gsi::ClassExt decl_QInputMethodEvent_AttributeType_Enum_as_child (decl_QInputMethodEvent_AttributeType_Enum, "QtGui", "AttributeType"); +static gsi::ClassExt decl_QInputMethodEvent_AttributeType_Enums_as_child (decl_QInputMethodEvent_AttributeType_Enums, "QtGui", "QFlags_AttributeType"); } diff --git a/src/gsiqt4/gsiDeclQInputMethodEvent_Attribute.cc b/src/gsiqt/qt4/QtGui/gsiDeclQInputMethodEvent_Attribute.cc similarity index 90% rename from src/gsiqt4/gsiDeclQInputMethodEvent_Attribute.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQInputMethodEvent_Attribute.cc index f0dd0e144..026a13680 100644 --- a/src/gsiqt4/gsiDeclQInputMethodEvent_Attribute.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQInputMethodEvent_Attribute.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -74,13 +74,13 @@ static gsi::Methods methods_QInputMethodEvent_Attribute () { return methods; } -gsi::Class decl_QInputMethodEvent_Attribute ("QInputMethodEvent_Attribute", +gsi::Class decl_QInputMethodEvent_Attribute ("QtGui", "QInputMethodEvent_Attribute", methods_QInputMethodEvent_Attribute (), "@qt\n@brief Binding of QInputMethodEvent::Attribute"); -gsi::ClassExt decl_QInputMethodEvent_Attribute_as_child (decl_QInputMethodEvent_Attribute, "Attribute"); +gsi::ClassExt decl_QInputMethodEvent_Attribute_as_child (decl_QInputMethodEvent_Attribute, "QtGui", "Attribute"); -GSIQT_PUBLIC gsi::Class &qtdecl_QInputMethodEvent_Attribute () { return decl_QInputMethodEvent_Attribute; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QInputMethodEvent_Attribute () { return decl_QInputMethodEvent_Attribute; } } diff --git a/src/gsiqt4/gsiDeclQIntValidator.cc b/src/gsiqt/qt4/QtGui/gsiDeclQIntValidator.cc similarity index 99% rename from src/gsiqt4/gsiDeclQIntValidator.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQIntValidator.cc index 08698dbd4..27659f58a 100644 --- a/src/gsiqt4/gsiDeclQIntValidator.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQIntValidator.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -286,11 +286,11 @@ static gsi::Methods methods_QIntValidator () { gsi::Class &qtdecl_QValidator (); -qt_gsi::QtNativeClass decl_QIntValidator (qtdecl_QValidator (), "QIntValidator_Native", +qt_gsi::QtNativeClass decl_QIntValidator (qtdecl_QValidator (), "QtGui", "QIntValidator_Native", methods_QIntValidator (), "@hide\n@alias QIntValidator"); -GSIQT_PUBLIC gsi::Class &qtdecl_QIntValidator () { return decl_QIntValidator; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QIntValidator () { return decl_QIntValidator; } } @@ -830,7 +830,7 @@ static gsi::Methods methods_QIntValidator_Adaptor () { return methods; } -gsi::Class decl_QIntValidator_Adaptor (qtdecl_QIntValidator (), "QIntValidator", +gsi::Class decl_QIntValidator_Adaptor (qtdecl_QIntValidator (), "QtGui", "QIntValidator", methods_QIntValidator_Adaptor (), "@qt\n@brief Binding of QIntValidator"); diff --git a/src/gsiqt4/gsiDeclQItemDelegate.cc b/src/gsiqt/qt4/QtGui/gsiDeclQItemDelegate.cc similarity index 99% rename from src/gsiqt4/gsiDeclQItemDelegate.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQItemDelegate.cc index ceedf818e..f1e4dd2f4 100644 --- a/src/gsiqt4/gsiDeclQItemDelegate.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQItemDelegate.cc @@ -48,8 +48,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -409,11 +409,11 @@ static gsi::Methods methods_QItemDelegate () { gsi::Class &qtdecl_QAbstractItemDelegate (); -qt_gsi::QtNativeClass decl_QItemDelegate (qtdecl_QAbstractItemDelegate (), "QItemDelegate_Native", +qt_gsi::QtNativeClass decl_QItemDelegate (qtdecl_QAbstractItemDelegate (), "QtGui", "QItemDelegate_Native", methods_QItemDelegate (), "@hide\n@alias QItemDelegate"); -GSIQT_PUBLIC gsi::Class &qtdecl_QItemDelegate () { return decl_QItemDelegate; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QItemDelegate () { return decl_QItemDelegate; } } @@ -1645,7 +1645,7 @@ static gsi::Methods methods_QItemDelegate_Adaptor () { return methods; } -gsi::Class decl_QItemDelegate_Adaptor (qtdecl_QItemDelegate (), "QItemDelegate", +gsi::Class decl_QItemDelegate_Adaptor (qtdecl_QItemDelegate (), "QtGui", "QItemDelegate", methods_QItemDelegate_Adaptor (), "@qt\n@brief Binding of QItemDelegate"); diff --git a/src/gsiqt4/gsiDeclQItemEditorCreatorBase.cc b/src/gsiqt/qt4/QtGui/gsiDeclQItemEditorCreatorBase.cc similarity index 96% rename from src/gsiqt4/gsiDeclQItemEditorCreatorBase.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQItemEditorCreatorBase.cc index a70f85e66..3c709f35c 100644 --- a/src/gsiqt4/gsiDeclQItemEditorCreatorBase.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQItemEditorCreatorBase.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -81,11 +81,11 @@ static gsi::Methods methods_QItemEditorCreatorBase () { return methods; } -gsi::Class decl_QItemEditorCreatorBase ("QItemEditorCreatorBase_Native", +gsi::Class decl_QItemEditorCreatorBase ("QtGui", "QItemEditorCreatorBase_Native", methods_QItemEditorCreatorBase (), "@hide\n@alias QItemEditorCreatorBase"); -GSIQT_PUBLIC gsi::Class &qtdecl_QItemEditorCreatorBase () { return decl_QItemEditorCreatorBase; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QItemEditorCreatorBase () { return decl_QItemEditorCreatorBase; } } @@ -210,7 +210,7 @@ static gsi::Methods methods_QItemEditorCreatorBase_Adaptor () { return methods; } -gsi::Class decl_QItemEditorCreatorBase_Adaptor (qtdecl_QItemEditorCreatorBase (), "QItemEditorCreatorBase", +gsi::Class decl_QItemEditorCreatorBase_Adaptor (qtdecl_QItemEditorCreatorBase (), "QtGui", "QItemEditorCreatorBase", methods_QItemEditorCreatorBase_Adaptor (), "@qt\n@brief Binding of QItemEditorCreatorBase"); diff --git a/src/gsiqt4/gsiDeclQItemEditorFactory.cc b/src/gsiqt/qt4/QtGui/gsiDeclQItemEditorFactory.cc similarity index 97% rename from src/gsiqt4/gsiDeclQItemEditorFactory.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQItemEditorFactory.cc index ed93765de..ae5d1de53 100644 --- a/src/gsiqt4/gsiDeclQItemEditorFactory.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQItemEditorFactory.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -150,11 +150,11 @@ static gsi::Methods methods_QItemEditorFactory () { return methods; } -gsi::Class decl_QItemEditorFactory ("QItemEditorFactory_Native", +gsi::Class decl_QItemEditorFactory ("QtGui", "QItemEditorFactory_Native", methods_QItemEditorFactory (), "@hide\n@alias QItemEditorFactory"); -GSIQT_PUBLIC gsi::Class &qtdecl_QItemEditorFactory () { return decl_QItemEditorFactory; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QItemEditorFactory () { return decl_QItemEditorFactory; } } @@ -285,7 +285,7 @@ static gsi::Methods methods_QItemEditorFactory_Adaptor () { return methods; } -gsi::Class decl_QItemEditorFactory_Adaptor (qtdecl_QItemEditorFactory (), "QItemEditorFactory", +gsi::Class decl_QItemEditorFactory_Adaptor (qtdecl_QItemEditorFactory (), "QtGui", "QItemEditorFactory", methods_QItemEditorFactory_Adaptor (), "@qt\n@brief Binding of QItemEditorFactory"); diff --git a/src/gsiqt4/gsiDeclQItemSelection.cc b/src/gsiqt/qt4/QtGui/gsiDeclQItemSelection.cc similarity index 97% rename from src/gsiqt4/gsiDeclQItemSelection.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQItemSelection.cc index 330ac0027..d6caacc4c 100644 --- a/src/gsiqt4/gsiDeclQItemSelection.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQItemSelection.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -197,12 +197,12 @@ static gsi::Methods methods_QItemSelection () { return methods; } -gsi::Class decl_QItemSelection ("QItemSelection", +gsi::Class decl_QItemSelection ("QtGui", "QItemSelection", methods_QItemSelection (), "@qt\n@brief Binding of QItemSelection"); -GSIQT_PUBLIC gsi::Class &qtdecl_QItemSelection () { return decl_QItemSelection; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QItemSelection () { return decl_QItemSelection; } } diff --git a/src/gsiqt4/gsiDeclQItemSelectionModel.cc b/src/gsiqt/qt4/QtGui/gsiDeclQItemSelectionModel.cc similarity index 98% rename from src/gsiqt4/gsiDeclQItemSelectionModel.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQItemSelectionModel.cc index 600b551c5..9ed71004b 100644 --- a/src/gsiqt4/gsiDeclQItemSelectionModel.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQItemSelectionModel.cc @@ -37,8 +37,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -526,11 +526,11 @@ static gsi::Methods methods_QItemSelectionModel () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QItemSelectionModel (qtdecl_QObject (), "QItemSelectionModel_Native", +qt_gsi::QtNativeClass decl_QItemSelectionModel (qtdecl_QObject (), "QtGui", "QItemSelectionModel_Native", methods_QItemSelectionModel (), "@hide\n@alias QItemSelectionModel"); -GSIQT_PUBLIC gsi::Class &qtdecl_QItemSelectionModel () { return decl_QItemSelectionModel; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QItemSelectionModel () { return decl_QItemSelectionModel; } } @@ -1236,7 +1236,7 @@ static gsi::Methods methods_QItemSelectionModel_Adaptor () { return methods; } -gsi::Class decl_QItemSelectionModel_Adaptor (qtdecl_QItemSelectionModel (), "QItemSelectionModel", +gsi::Class decl_QItemSelectionModel_Adaptor (qtdecl_QItemSelectionModel (), "QtGui", "QItemSelectionModel", methods_QItemSelectionModel_Adaptor (), "@qt\n@brief Binding of QItemSelectionModel"); @@ -1247,7 +1247,7 @@ gsi::Class decl_QItemSelectionModel_Adaptor (qtdecl namespace qt_gsi { -static gsi::Enum decl_QItemSelectionModel_SelectionFlag_Enum ("QItemSelectionModel_SelectionFlag", +static gsi::Enum decl_QItemSelectionModel_SelectionFlag_Enum ("QtGui", "QItemSelectionModel_SelectionFlag", gsi::enum_const ("NoUpdate", QItemSelectionModel::NoUpdate, "@brief Enum constant QItemSelectionModel::NoUpdate") + gsi::enum_const ("Clear", QItemSelectionModel::Clear, "@brief Enum constant QItemSelectionModel::Clear") + gsi::enum_const ("Select", QItemSelectionModel::Select, "@brief Enum constant QItemSelectionModel::Select") + @@ -1261,13 +1261,13 @@ static gsi::Enum decl_QItemSelectionModel_Se gsi::enum_const ("ClearAndSelect", QItemSelectionModel::ClearAndSelect, "@brief Enum constant QItemSelectionModel::ClearAndSelect"), "@qt\n@brief This class represents the QItemSelectionModel::SelectionFlag enum"); -static gsi::QFlagsClass decl_QItemSelectionModel_SelectionFlag_Enums ("QItemSelectionModel_QFlags_SelectionFlag", +static gsi::QFlagsClass decl_QItemSelectionModel_SelectionFlag_Enums ("QtGui", "QItemSelectionModel_QFlags_SelectionFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QItemSelectionModel_SelectionFlag_Enum_in_parent (decl_QItemSelectionModel_SelectionFlag_Enum.defs ()); -static gsi::ClassExt decl_QItemSelectionModel_SelectionFlag_Enum_as_child (decl_QItemSelectionModel_SelectionFlag_Enum, "SelectionFlag"); -static gsi::ClassExt decl_QItemSelectionModel_SelectionFlag_Enums_as_child (decl_QItemSelectionModel_SelectionFlag_Enums, "QFlags_SelectionFlag"); +static gsi::ClassExt decl_QItemSelectionModel_SelectionFlag_Enum_as_child (decl_QItemSelectionModel_SelectionFlag_Enum, "QtGui", "SelectionFlag"); +static gsi::ClassExt decl_QItemSelectionModel_SelectionFlag_Enums_as_child (decl_QItemSelectionModel_SelectionFlag_Enums, "QtGui", "QFlags_SelectionFlag"); } diff --git a/src/gsiqt4/gsiDeclQItemSelectionRange.cc b/src/gsiqt/qt4/QtGui/gsiDeclQItemSelectionRange.cc similarity index 98% rename from src/gsiqt4/gsiDeclQItemSelectionRange.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQItemSelectionRange.cc index dbb3502bd..a637954bd 100644 --- a/src/gsiqt4/gsiDeclQItemSelectionRange.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQItemSelectionRange.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -464,12 +464,12 @@ static gsi::Methods methods_QItemSelectionRange () { return methods; } -gsi::Class decl_QItemSelectionRange ("QItemSelectionRange", +gsi::Class decl_QItemSelectionRange ("QtGui", "QItemSelectionRange", methods_QItemSelectionRange (), "@qt\n@brief Binding of QItemSelectionRange"); -GSIQT_PUBLIC gsi::Class &qtdecl_QItemSelectionRange () { return decl_QItemSelectionRange; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QItemSelectionRange () { return decl_QItemSelectionRange; } } diff --git a/src/gsiqt4/gsiDeclQKeyEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQKeyEvent.cc similarity index 98% rename from src/gsiqt4/gsiDeclQKeyEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQKeyEvent.cc index 252d40e31..ca963a854 100644 --- a/src/gsiqt4/gsiDeclQKeyEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQKeyEvent.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -254,11 +254,11 @@ static gsi::Methods methods_QKeyEvent () { gsi::Class &qtdecl_QInputEvent (); -gsi::Class decl_QKeyEvent (qtdecl_QInputEvent (), "QKeyEvent_Native", +gsi::Class decl_QKeyEvent (qtdecl_QInputEvent (), "QtGui", "QKeyEvent_Native", methods_QKeyEvent (), "@hide\n@alias QKeyEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QKeyEvent () { return decl_QKeyEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QKeyEvent () { return decl_QKeyEvent; } } @@ -342,7 +342,7 @@ static gsi::Methods methods_QKeyEvent_Adaptor () { return methods; } -gsi::Class decl_QKeyEvent_Adaptor (qtdecl_QKeyEvent (), "QKeyEvent", +gsi::Class decl_QKeyEvent_Adaptor (qtdecl_QKeyEvent (), "QtGui", "QKeyEvent", methods_QKeyEvent_Adaptor (), "@qt\n@brief Binding of QKeyEvent"); diff --git a/src/gsiqt4/gsiDeclQKeySequence.cc b/src/gsiqt/qt4/QtGui/gsiDeclQKeySequence.cc similarity index 96% rename from src/gsiqt4/gsiDeclQKeySequence.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQKeySequence.cc index bd7bdd7c2..d6bdb2038 100644 --- a/src/gsiqt4/gsiDeclQKeySequence.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQKeySequence.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -461,12 +461,12 @@ static gsi::Methods methods_QKeySequence () { return methods; } -gsi::Class decl_QKeySequence ("QKeySequence", +gsi::Class decl_QKeySequence ("QtGui", "QKeySequence", methods_QKeySequence (), "@qt\n@brief Binding of QKeySequence"); -GSIQT_PUBLIC gsi::Class &qtdecl_QKeySequence () { return decl_QKeySequence; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QKeySequence () { return decl_QKeySequence; } } @@ -475,18 +475,18 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QKeySequence () { return decl_QKey namespace qt_gsi { -static gsi::Enum decl_QKeySequence_SequenceFormat_Enum ("QKeySequence_SequenceFormat", +static gsi::Enum decl_QKeySequence_SequenceFormat_Enum ("QtGui", "QKeySequence_SequenceFormat", gsi::enum_const ("NativeText", QKeySequence::NativeText, "@brief Enum constant QKeySequence::NativeText") + gsi::enum_const ("PortableText", QKeySequence::PortableText, "@brief Enum constant QKeySequence::PortableText"), "@qt\n@brief This class represents the QKeySequence::SequenceFormat enum"); -static gsi::QFlagsClass decl_QKeySequence_SequenceFormat_Enums ("QKeySequence_QFlags_SequenceFormat", +static gsi::QFlagsClass decl_QKeySequence_SequenceFormat_Enums ("QtGui", "QKeySequence_QFlags_SequenceFormat", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QKeySequence_SequenceFormat_Enum_in_parent (decl_QKeySequence_SequenceFormat_Enum.defs ()); -static gsi::ClassExt decl_QKeySequence_SequenceFormat_Enum_as_child (decl_QKeySequence_SequenceFormat_Enum, "SequenceFormat"); -static gsi::ClassExt decl_QKeySequence_SequenceFormat_Enums_as_child (decl_QKeySequence_SequenceFormat_Enums, "QFlags_SequenceFormat"); +static gsi::ClassExt decl_QKeySequence_SequenceFormat_Enum_as_child (decl_QKeySequence_SequenceFormat_Enum, "QtGui", "SequenceFormat"); +static gsi::ClassExt decl_QKeySequence_SequenceFormat_Enums_as_child (decl_QKeySequence_SequenceFormat_Enums, "QtGui", "QFlags_SequenceFormat"); } @@ -495,19 +495,19 @@ static gsi::ClassExt decl_QKeySequence_SequenceFormat_Enums_as_chi namespace qt_gsi { -static gsi::Enum decl_QKeySequence_SequenceMatch_Enum ("QKeySequence_SequenceMatch", +static gsi::Enum decl_QKeySequence_SequenceMatch_Enum ("QtGui", "QKeySequence_SequenceMatch", gsi::enum_const ("NoMatch", QKeySequence::NoMatch, "@brief Enum constant QKeySequence::NoMatch") + gsi::enum_const ("PartialMatch", QKeySequence::PartialMatch, "@brief Enum constant QKeySequence::PartialMatch") + gsi::enum_const ("ExactMatch", QKeySequence::ExactMatch, "@brief Enum constant QKeySequence::ExactMatch"), "@qt\n@brief This class represents the QKeySequence::SequenceMatch enum"); -static gsi::QFlagsClass decl_QKeySequence_SequenceMatch_Enums ("QKeySequence_QFlags_SequenceMatch", +static gsi::QFlagsClass decl_QKeySequence_SequenceMatch_Enums ("QtGui", "QKeySequence_QFlags_SequenceMatch", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QKeySequence_SequenceMatch_Enum_in_parent (decl_QKeySequence_SequenceMatch_Enum.defs ()); -static gsi::ClassExt decl_QKeySequence_SequenceMatch_Enum_as_child (decl_QKeySequence_SequenceMatch_Enum, "SequenceMatch"); -static gsi::ClassExt decl_QKeySequence_SequenceMatch_Enums_as_child (decl_QKeySequence_SequenceMatch_Enums, "QFlags_SequenceMatch"); +static gsi::ClassExt decl_QKeySequence_SequenceMatch_Enum_as_child (decl_QKeySequence_SequenceMatch_Enum, "QtGui", "SequenceMatch"); +static gsi::ClassExt decl_QKeySequence_SequenceMatch_Enums_as_child (decl_QKeySequence_SequenceMatch_Enums, "QtGui", "QFlags_SequenceMatch"); } @@ -516,7 +516,7 @@ static gsi::ClassExt decl_QKeySequence_SequenceMatch_Enums_as_chil namespace qt_gsi { -static gsi::Enum decl_QKeySequence_StandardKey_Enum ("QKeySequence_StandardKey", +static gsi::Enum decl_QKeySequence_StandardKey_Enum ("QtGui", "QKeySequence_StandardKey", gsi::enum_const ("UnknownKey", QKeySequence::UnknownKey, "@brief Enum constant QKeySequence::UnknownKey") + gsi::enum_const ("HelpContents", QKeySequence::HelpContents, "@brief Enum constant QKeySequence::HelpContents") + gsi::enum_const ("WhatsThis", QKeySequence::WhatsThis, "@brief Enum constant QKeySequence::WhatsThis") + @@ -585,13 +585,13 @@ static gsi::Enum decl_QKeySequence_StandardKey_Enum ( gsi::enum_const ("Quit", QKeySequence::Quit, "@brief Enum constant QKeySequence::Quit"), "@qt\n@brief This class represents the QKeySequence::StandardKey enum"); -static gsi::QFlagsClass decl_QKeySequence_StandardKey_Enums ("QKeySequence_QFlags_StandardKey", +static gsi::QFlagsClass decl_QKeySequence_StandardKey_Enums ("QtGui", "QKeySequence_QFlags_StandardKey", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QKeySequence_StandardKey_Enum_in_parent (decl_QKeySequence_StandardKey_Enum.defs ()); -static gsi::ClassExt decl_QKeySequence_StandardKey_Enum_as_child (decl_QKeySequence_StandardKey_Enum, "StandardKey"); -static gsi::ClassExt decl_QKeySequence_StandardKey_Enums_as_child (decl_QKeySequence_StandardKey_Enums, "QFlags_StandardKey"); +static gsi::ClassExt decl_QKeySequence_StandardKey_Enum_as_child (decl_QKeySequence_StandardKey_Enum, "QtGui", "StandardKey"); +static gsi::ClassExt decl_QKeySequence_StandardKey_Enums_as_child (decl_QKeySequence_StandardKey_Enums, "QtGui", "QFlags_StandardKey"); } diff --git a/src/gsiqt4/gsiDeclQLCDNumber.cc b/src/gsiqt/qt4/QtGui/gsiDeclQLCDNumber.cc similarity index 99% rename from src/gsiqt4/gsiDeclQLCDNumber.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQLCDNumber.cc index f582e1c81..8d58ca2ba 100644 --- a/src/gsiqt4/gsiDeclQLCDNumber.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQLCDNumber.cc @@ -77,8 +77,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -613,11 +613,11 @@ static gsi::Methods methods_QLCDNumber () { gsi::Class &qtdecl_QFrame (); -qt_gsi::QtNativeClass decl_QLCDNumber (qtdecl_QFrame (), "QLCDNumber_Native", +qt_gsi::QtNativeClass decl_QLCDNumber (qtdecl_QFrame (), "QtGui", "QLCDNumber_Native", methods_QLCDNumber (), "@hide\n@alias QLCDNumber"); -GSIQT_PUBLIC gsi::Class &qtdecl_QLCDNumber () { return decl_QLCDNumber; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QLCDNumber () { return decl_QLCDNumber; } } @@ -2898,7 +2898,7 @@ static gsi::Methods methods_QLCDNumber_Adaptor () { return methods; } -gsi::Class decl_QLCDNumber_Adaptor (qtdecl_QLCDNumber (), "QLCDNumber", +gsi::Class decl_QLCDNumber_Adaptor (qtdecl_QLCDNumber (), "QtGui", "QLCDNumber", methods_QLCDNumber_Adaptor (), "@qt\n@brief Binding of QLCDNumber"); @@ -2909,20 +2909,20 @@ gsi::Class decl_QLCDNumber_Adaptor (qtdecl_QLCDNumber (), "Q namespace qt_gsi { -static gsi::Enum decl_QLCDNumber_Mode_Enum ("QLCDNumber_Mode", +static gsi::Enum decl_QLCDNumber_Mode_Enum ("QtGui", "QLCDNumber_Mode", gsi::enum_const ("Hex", QLCDNumber::Hex, "@brief Enum constant QLCDNumber::Hex") + gsi::enum_const ("Dec", QLCDNumber::Dec, "@brief Enum constant QLCDNumber::Dec") + gsi::enum_const ("Oct", QLCDNumber::Oct, "@brief Enum constant QLCDNumber::Oct") + gsi::enum_const ("Bin", QLCDNumber::Bin, "@brief Enum constant QLCDNumber::Bin"), "@qt\n@brief This class represents the QLCDNumber::Mode enum"); -static gsi::QFlagsClass decl_QLCDNumber_Mode_Enums ("QLCDNumber_QFlags_Mode", +static gsi::QFlagsClass decl_QLCDNumber_Mode_Enums ("QtGui", "QLCDNumber_QFlags_Mode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QLCDNumber_Mode_Enum_in_parent (decl_QLCDNumber_Mode_Enum.defs ()); -static gsi::ClassExt decl_QLCDNumber_Mode_Enum_as_child (decl_QLCDNumber_Mode_Enum, "Mode"); -static gsi::ClassExt decl_QLCDNumber_Mode_Enums_as_child (decl_QLCDNumber_Mode_Enums, "QFlags_Mode"); +static gsi::ClassExt decl_QLCDNumber_Mode_Enum_as_child (decl_QLCDNumber_Mode_Enum, "QtGui", "Mode"); +static gsi::ClassExt decl_QLCDNumber_Mode_Enums_as_child (decl_QLCDNumber_Mode_Enums, "QtGui", "QFlags_Mode"); } @@ -2931,19 +2931,19 @@ static gsi::ClassExt decl_QLCDNumber_Mode_Enums_as_child (decl_QLCDN namespace qt_gsi { -static gsi::Enum decl_QLCDNumber_SegmentStyle_Enum ("QLCDNumber_SegmentStyle", +static gsi::Enum decl_QLCDNumber_SegmentStyle_Enum ("QtGui", "QLCDNumber_SegmentStyle", gsi::enum_const ("Outline", QLCDNumber::Outline, "@brief Enum constant QLCDNumber::Outline") + gsi::enum_const ("Filled", QLCDNumber::Filled, "@brief Enum constant QLCDNumber::Filled") + gsi::enum_const ("Flat", QLCDNumber::Flat, "@brief Enum constant QLCDNumber::Flat"), "@qt\n@brief This class represents the QLCDNumber::SegmentStyle enum"); -static gsi::QFlagsClass decl_QLCDNumber_SegmentStyle_Enums ("QLCDNumber_QFlags_SegmentStyle", +static gsi::QFlagsClass decl_QLCDNumber_SegmentStyle_Enums ("QtGui", "QLCDNumber_QFlags_SegmentStyle", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QLCDNumber_SegmentStyle_Enum_in_parent (decl_QLCDNumber_SegmentStyle_Enum.defs ()); -static gsi::ClassExt decl_QLCDNumber_SegmentStyle_Enum_as_child (decl_QLCDNumber_SegmentStyle_Enum, "SegmentStyle"); -static gsi::ClassExt decl_QLCDNumber_SegmentStyle_Enums_as_child (decl_QLCDNumber_SegmentStyle_Enums, "QFlags_SegmentStyle"); +static gsi::ClassExt decl_QLCDNumber_SegmentStyle_Enum_as_child (decl_QLCDNumber_SegmentStyle_Enum, "QtGui", "SegmentStyle"); +static gsi::ClassExt decl_QLCDNumber_SegmentStyle_Enums_as_child (decl_QLCDNumber_SegmentStyle_Enums, "QtGui", "QFlags_SegmentStyle"); } diff --git a/src/gsiqt4/gsiDeclQLabel.cc b/src/gsiqt/qt4/QtGui/gsiDeclQLabel.cc similarity index 99% rename from src/gsiqt4/gsiDeclQLabel.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQLabel.cc index 9c2bfca24..7783e1afe 100644 --- a/src/gsiqt4/gsiDeclQLabel.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQLabel.cc @@ -80,8 +80,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -805,11 +805,11 @@ static gsi::Methods methods_QLabel () { gsi::Class &qtdecl_QFrame (); -qt_gsi::QtNativeClass decl_QLabel (qtdecl_QFrame (), "QLabel_Native", +qt_gsi::QtNativeClass decl_QLabel (qtdecl_QFrame (), "QtGui", "QLabel_Native", methods_QLabel (), "@hide\n@alias QLabel"); -GSIQT_PUBLIC gsi::Class &qtdecl_QLabel () { return decl_QLabel; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QLabel () { return decl_QLabel; } } @@ -3137,7 +3137,7 @@ static gsi::Methods methods_QLabel_Adaptor () { return methods; } -gsi::Class decl_QLabel_Adaptor (qtdecl_QLabel (), "QLabel", +gsi::Class decl_QLabel_Adaptor (qtdecl_QLabel (), "QtGui", "QLabel", methods_QLabel_Adaptor (), "@qt\n@brief Binding of QLabel"); diff --git a/src/gsiqt4/gsiDeclQLayout.cc b/src/gsiqt/qt4/QtGui/gsiDeclQLayout.cc similarity index 99% rename from src/gsiqt4/gsiDeclQLayout.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQLayout.cc index 3bb55150d..bab5cd869 100644 --- a/src/gsiqt4/gsiDeclQLayout.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQLayout.cc @@ -40,8 +40,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1019,11 +1019,11 @@ static gsi::Methods methods_QLayout () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QLayout (qtdecl_QObject (), "QLayout_Native", +qt_gsi::QtNativeClass decl_QLayout (qtdecl_QObject (), "QtGui", "QLayout_Native", methods_QLayout (), "@hide\n@alias QLayout"); -GSIQT_PUBLIC gsi::Class &qtdecl_QLayout () { return decl_QLayout; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QLayout () { return decl_QLayout; } } @@ -2253,7 +2253,7 @@ static gsi::Methods methods_QLayout_Adaptor () { return methods; } -gsi::Class decl_QLayout_Adaptor (qtdecl_QLayout (), "QLayout", +gsi::Class decl_QLayout_Adaptor (qtdecl_QLayout (), "QtGui", "QLayout", methods_QLayout_Adaptor (), "@qt\n@brief Binding of QLayout"); @@ -2264,7 +2264,7 @@ gsi::Class decl_QLayout_Adaptor (qtdecl_QLayout (), "QLayout", namespace qt_gsi { -static gsi::Enum decl_QLayout_SizeConstraint_Enum ("QLayout_SizeConstraint", +static gsi::Enum decl_QLayout_SizeConstraint_Enum ("QtGui", "QLayout_SizeConstraint", gsi::enum_const ("SetDefaultConstraint", QLayout::SetDefaultConstraint, "@brief Enum constant QLayout::SetDefaultConstraint") + gsi::enum_const ("SetNoConstraint", QLayout::SetNoConstraint, "@brief Enum constant QLayout::SetNoConstraint") + gsi::enum_const ("SetMinimumSize", QLayout::SetMinimumSize, "@brief Enum constant QLayout::SetMinimumSize") + @@ -2273,13 +2273,13 @@ static gsi::Enum decl_QLayout_SizeConstraint_Enum ("QLa gsi::enum_const ("SetMinAndMaxSize", QLayout::SetMinAndMaxSize, "@brief Enum constant QLayout::SetMinAndMaxSize"), "@qt\n@brief This class represents the QLayout::SizeConstraint enum"); -static gsi::QFlagsClass decl_QLayout_SizeConstraint_Enums ("QLayout_QFlags_SizeConstraint", +static gsi::QFlagsClass decl_QLayout_SizeConstraint_Enums ("QtGui", "QLayout_QFlags_SizeConstraint", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QLayout_SizeConstraint_Enum_in_parent (decl_QLayout_SizeConstraint_Enum.defs ()); -static gsi::ClassExt decl_QLayout_SizeConstraint_Enum_as_child (decl_QLayout_SizeConstraint_Enum, "SizeConstraint"); -static gsi::ClassExt decl_QLayout_SizeConstraint_Enums_as_child (decl_QLayout_SizeConstraint_Enums, "QFlags_SizeConstraint"); +static gsi::ClassExt decl_QLayout_SizeConstraint_Enum_as_child (decl_QLayout_SizeConstraint_Enum, "QtGui", "SizeConstraint"); +static gsi::ClassExt decl_QLayout_SizeConstraint_Enums_as_child (decl_QLayout_SizeConstraint_Enums, "QtGui", "QFlags_SizeConstraint"); } diff --git a/src/gsiqt4/gsiDeclQLayoutItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQLayoutItem.cc similarity index 99% rename from src/gsiqt4/gsiDeclQLayoutItem.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQLayoutItem.cc index 5c483ac48..c4adee29e 100644 --- a/src/gsiqt4/gsiDeclQLayoutItem.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQLayoutItem.cc @@ -34,8 +34,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -340,11 +340,11 @@ static gsi::Methods methods_QLayoutItem () { return methods; } -gsi::Class decl_QLayoutItem ("QLayoutItem_Native", +gsi::Class decl_QLayoutItem ("QtGui", "QLayoutItem_Native", methods_QLayoutItem (), "@hide\n@alias QLayoutItem"); -GSIQT_PUBLIC gsi::Class &qtdecl_QLayoutItem () { return decl_QLayoutItem; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QLayoutItem () { return decl_QLayoutItem; } } @@ -933,7 +933,7 @@ static gsi::Methods methods_QLayoutItem_Adaptor () { return methods; } -gsi::Class decl_QLayoutItem_Adaptor (qtdecl_QLayoutItem (), "QLayoutItem", +gsi::Class decl_QLayoutItem_Adaptor (qtdecl_QLayoutItem (), "QtGui", "QLayoutItem", methods_QLayoutItem_Adaptor (), "@qt\n@brief Binding of QLayoutItem"); diff --git a/src/gsiqt4/gsiDeclQLineEdit.cc b/src/gsiqt/qt4/QtGui/gsiDeclQLineEdit.cc similarity index 99% rename from src/gsiqt4/gsiDeclQLineEdit.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQLineEdit.cc index 5eef6dc93..6a1c2e124 100644 --- a/src/gsiqt4/gsiDeclQLineEdit.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQLineEdit.cc @@ -81,8 +81,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1326,11 +1326,11 @@ static gsi::Methods methods_QLineEdit () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QLineEdit (qtdecl_QWidget (), "QLineEdit_Native", +qt_gsi::QtNativeClass decl_QLineEdit (qtdecl_QWidget (), "QtGui", "QLineEdit_Native", methods_QLineEdit (), "@hide\n@alias QLineEdit"); -GSIQT_PUBLIC gsi::Class &qtdecl_QLineEdit () { return decl_QLineEdit; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QLineEdit () { return decl_QLineEdit; } } @@ -3751,7 +3751,7 @@ static gsi::Methods methods_QLineEdit_Adaptor () { return methods; } -gsi::Class decl_QLineEdit_Adaptor (qtdecl_QLineEdit (), "QLineEdit", +gsi::Class decl_QLineEdit_Adaptor (qtdecl_QLineEdit (), "QtGui", "QLineEdit", methods_QLineEdit_Adaptor (), "@qt\n@brief Binding of QLineEdit"); @@ -3762,20 +3762,20 @@ gsi::Class decl_QLineEdit_Adaptor (qtdecl_QLineEdit (), "QLin namespace qt_gsi { -static gsi::Enum decl_QLineEdit_EchoMode_Enum ("QLineEdit_EchoMode", +static gsi::Enum decl_QLineEdit_EchoMode_Enum ("QtGui", "QLineEdit_EchoMode", gsi::enum_const ("Normal", QLineEdit::Normal, "@brief Enum constant QLineEdit::Normal") + gsi::enum_const ("NoEcho", QLineEdit::NoEcho, "@brief Enum constant QLineEdit::NoEcho") + gsi::enum_const ("Password", QLineEdit::Password, "@brief Enum constant QLineEdit::Password") + gsi::enum_const ("PasswordEchoOnEdit", QLineEdit::PasswordEchoOnEdit, "@brief Enum constant QLineEdit::PasswordEchoOnEdit"), "@qt\n@brief This class represents the QLineEdit::EchoMode enum"); -static gsi::QFlagsClass decl_QLineEdit_EchoMode_Enums ("QLineEdit_QFlags_EchoMode", +static gsi::QFlagsClass decl_QLineEdit_EchoMode_Enums ("QtGui", "QLineEdit_QFlags_EchoMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QLineEdit_EchoMode_Enum_in_parent (decl_QLineEdit_EchoMode_Enum.defs ()); -static gsi::ClassExt decl_QLineEdit_EchoMode_Enum_as_child (decl_QLineEdit_EchoMode_Enum, "EchoMode"); -static gsi::ClassExt decl_QLineEdit_EchoMode_Enums_as_child (decl_QLineEdit_EchoMode_Enums, "QFlags_EchoMode"); +static gsi::ClassExt decl_QLineEdit_EchoMode_Enum_as_child (decl_QLineEdit_EchoMode_Enum, "QtGui", "EchoMode"); +static gsi::ClassExt decl_QLineEdit_EchoMode_Enums_as_child (decl_QLineEdit_EchoMode_Enums, "QtGui", "QFlags_EchoMode"); } diff --git a/src/gsiqt4/gsiDeclQLinearGradient.cc b/src/gsiqt/qt4/QtGui/gsiDeclQLinearGradient.cc similarity index 97% rename from src/gsiqt4/gsiDeclQLinearGradient.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQLinearGradient.cc index 37d9eeb6e..f23620fe4 100644 --- a/src/gsiqt4/gsiDeclQLinearGradient.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQLinearGradient.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -240,12 +240,12 @@ static gsi::Methods methods_QLinearGradient () { gsi::Class &qtdecl_QGradient (); -gsi::Class decl_QLinearGradient (qtdecl_QGradient (), "QLinearGradient", +gsi::Class decl_QLinearGradient (qtdecl_QGradient (), "QtGui", "QLinearGradient", methods_QLinearGradient (), "@qt\n@brief Binding of QLinearGradient"); -GSIQT_PUBLIC gsi::Class &qtdecl_QLinearGradient () { return decl_QLinearGradient; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QLinearGradient () { return decl_QLinearGradient; } } diff --git a/src/gsiqt4/gsiDeclQListView.cc b/src/gsiqt/qt4/QtGui/gsiDeclQListView.cc similarity index 99% rename from src/gsiqt4/gsiDeclQListView.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQListView.cc index 7f27fe3a3..1685c5748 100644 --- a/src/gsiqt4/gsiDeclQListView.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQListView.cc @@ -84,8 +84,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -883,11 +883,11 @@ static gsi::Methods methods_QListView () { gsi::Class &qtdecl_QAbstractItemView (); -qt_gsi::QtNativeClass decl_QListView (qtdecl_QAbstractItemView (), "QListView_Native", +qt_gsi::QtNativeClass decl_QListView (qtdecl_QAbstractItemView (), "QtGui", "QListView_Native", methods_QListView (), "@hide\n@alias QListView"); -GSIQT_PUBLIC gsi::Class &qtdecl_QListView () { return decl_QListView; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QListView () { return decl_QListView; } } @@ -5522,7 +5522,7 @@ static gsi::Methods methods_QListView_Adaptor () { return methods; } -gsi::Class decl_QListView_Adaptor (qtdecl_QListView (), "QListView", +gsi::Class decl_QListView_Adaptor (qtdecl_QListView (), "QtGui", "QListView", methods_QListView_Adaptor (), "@qt\n@brief Binding of QListView"); @@ -5533,18 +5533,18 @@ gsi::Class decl_QListView_Adaptor (qtdecl_QListView (), "QLis namespace qt_gsi { -static gsi::Enum decl_QListView_Flow_Enum ("QListView_Flow", +static gsi::Enum decl_QListView_Flow_Enum ("QtGui", "QListView_Flow", gsi::enum_const ("LeftToRight", QListView::LeftToRight, "@brief Enum constant QListView::LeftToRight") + gsi::enum_const ("TopToBottom", QListView::TopToBottom, "@brief Enum constant QListView::TopToBottom"), "@qt\n@brief This class represents the QListView::Flow enum"); -static gsi::QFlagsClass decl_QListView_Flow_Enums ("QListView_QFlags_Flow", +static gsi::QFlagsClass decl_QListView_Flow_Enums ("QtGui", "QListView_QFlags_Flow", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QListView_Flow_Enum_in_parent (decl_QListView_Flow_Enum.defs ()); -static gsi::ClassExt decl_QListView_Flow_Enum_as_child (decl_QListView_Flow_Enum, "Flow"); -static gsi::ClassExt decl_QListView_Flow_Enums_as_child (decl_QListView_Flow_Enums, "QFlags_Flow"); +static gsi::ClassExt decl_QListView_Flow_Enum_as_child (decl_QListView_Flow_Enum, "QtGui", "Flow"); +static gsi::ClassExt decl_QListView_Flow_Enums_as_child (decl_QListView_Flow_Enums, "QtGui", "QFlags_Flow"); } @@ -5553,18 +5553,18 @@ static gsi::ClassExt decl_QListView_Flow_Enums_as_child (decl_QListVi namespace qt_gsi { -static gsi::Enum decl_QListView_LayoutMode_Enum ("QListView_LayoutMode", +static gsi::Enum decl_QListView_LayoutMode_Enum ("QtGui", "QListView_LayoutMode", gsi::enum_const ("SinglePass", QListView::SinglePass, "@brief Enum constant QListView::SinglePass") + gsi::enum_const ("Batched", QListView::Batched, "@brief Enum constant QListView::Batched"), "@qt\n@brief This class represents the QListView::LayoutMode enum"); -static gsi::QFlagsClass decl_QListView_LayoutMode_Enums ("QListView_QFlags_LayoutMode", +static gsi::QFlagsClass decl_QListView_LayoutMode_Enums ("QtGui", "QListView_QFlags_LayoutMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QListView_LayoutMode_Enum_in_parent (decl_QListView_LayoutMode_Enum.defs ()); -static gsi::ClassExt decl_QListView_LayoutMode_Enum_as_child (decl_QListView_LayoutMode_Enum, "LayoutMode"); -static gsi::ClassExt decl_QListView_LayoutMode_Enums_as_child (decl_QListView_LayoutMode_Enums, "QFlags_LayoutMode"); +static gsi::ClassExt decl_QListView_LayoutMode_Enum_as_child (decl_QListView_LayoutMode_Enum, "QtGui", "LayoutMode"); +static gsi::ClassExt decl_QListView_LayoutMode_Enums_as_child (decl_QListView_LayoutMode_Enums, "QtGui", "QFlags_LayoutMode"); } @@ -5573,19 +5573,19 @@ static gsi::ClassExt decl_QListView_LayoutMode_Enums_as_child (decl_Q namespace qt_gsi { -static gsi::Enum decl_QListView_Movement_Enum ("QListView_Movement", +static gsi::Enum decl_QListView_Movement_Enum ("QtGui", "QListView_Movement", gsi::enum_const ("Static", QListView::Static, "@brief Enum constant QListView::Static") + gsi::enum_const ("Free", QListView::Free, "@brief Enum constant QListView::Free") + gsi::enum_const ("Snap", QListView::Snap, "@brief Enum constant QListView::Snap"), "@qt\n@brief This class represents the QListView::Movement enum"); -static gsi::QFlagsClass decl_QListView_Movement_Enums ("QListView_QFlags_Movement", +static gsi::QFlagsClass decl_QListView_Movement_Enums ("QtGui", "QListView_QFlags_Movement", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QListView_Movement_Enum_in_parent (decl_QListView_Movement_Enum.defs ()); -static gsi::ClassExt decl_QListView_Movement_Enum_as_child (decl_QListView_Movement_Enum, "Movement"); -static gsi::ClassExt decl_QListView_Movement_Enums_as_child (decl_QListView_Movement_Enums, "QFlags_Movement"); +static gsi::ClassExt decl_QListView_Movement_Enum_as_child (decl_QListView_Movement_Enum, "QtGui", "Movement"); +static gsi::ClassExt decl_QListView_Movement_Enums_as_child (decl_QListView_Movement_Enums, "QtGui", "QFlags_Movement"); } @@ -5594,18 +5594,18 @@ static gsi::ClassExt decl_QListView_Movement_Enums_as_child (decl_QLi namespace qt_gsi { -static gsi::Enum decl_QListView_ResizeMode_Enum ("QListView_ResizeMode", +static gsi::Enum decl_QListView_ResizeMode_Enum ("QtGui", "QListView_ResizeMode", gsi::enum_const ("Fixed", QListView::Fixed, "@brief Enum constant QListView::Fixed") + gsi::enum_const ("Adjust", QListView::Adjust, "@brief Enum constant QListView::Adjust"), "@qt\n@brief This class represents the QListView::ResizeMode enum"); -static gsi::QFlagsClass decl_QListView_ResizeMode_Enums ("QListView_QFlags_ResizeMode", +static gsi::QFlagsClass decl_QListView_ResizeMode_Enums ("QtGui", "QListView_QFlags_ResizeMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QListView_ResizeMode_Enum_in_parent (decl_QListView_ResizeMode_Enum.defs ()); -static gsi::ClassExt decl_QListView_ResizeMode_Enum_as_child (decl_QListView_ResizeMode_Enum, "ResizeMode"); -static gsi::ClassExt decl_QListView_ResizeMode_Enums_as_child (decl_QListView_ResizeMode_Enums, "QFlags_ResizeMode"); +static gsi::ClassExt decl_QListView_ResizeMode_Enum_as_child (decl_QListView_ResizeMode_Enum, "QtGui", "ResizeMode"); +static gsi::ClassExt decl_QListView_ResizeMode_Enums_as_child (decl_QListView_ResizeMode_Enums, "QtGui", "QFlags_ResizeMode"); } @@ -5614,18 +5614,18 @@ static gsi::ClassExt decl_QListView_ResizeMode_Enums_as_child (decl_Q namespace qt_gsi { -static gsi::Enum decl_QListView_ViewMode_Enum ("QListView_ViewMode", +static gsi::Enum decl_QListView_ViewMode_Enum ("QtGui", "QListView_ViewMode", gsi::enum_const ("ListMode", QListView::ListMode, "@brief Enum constant QListView::ListMode") + gsi::enum_const ("IconMode", QListView::IconMode, "@brief Enum constant QListView::IconMode"), "@qt\n@brief This class represents the QListView::ViewMode enum"); -static gsi::QFlagsClass decl_QListView_ViewMode_Enums ("QListView_QFlags_ViewMode", +static gsi::QFlagsClass decl_QListView_ViewMode_Enums ("QtGui", "QListView_QFlags_ViewMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QListView_ViewMode_Enum_in_parent (decl_QListView_ViewMode_Enum.defs ()); -static gsi::ClassExt decl_QListView_ViewMode_Enum_as_child (decl_QListView_ViewMode_Enum, "ViewMode"); -static gsi::ClassExt decl_QListView_ViewMode_Enums_as_child (decl_QListView_ViewMode_Enums, "QFlags_ViewMode"); +static gsi::ClassExt decl_QListView_ViewMode_Enum_as_child (decl_QListView_ViewMode_Enum, "QtGui", "ViewMode"); +static gsi::ClassExt decl_QListView_ViewMode_Enums_as_child (decl_QListView_ViewMode_Enums, "QtGui", "QFlags_ViewMode"); } diff --git a/src/gsiqt4/gsiDeclQListWidget.cc b/src/gsiqt/qt4/QtGui/gsiDeclQListWidget.cc similarity index 99% rename from src/gsiqt4/gsiDeclQListWidget.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQListWidget.cc index f3e4462d9..43aa90c23 100644 --- a/src/gsiqt4/gsiDeclQListWidget.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQListWidget.cc @@ -86,8 +86,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1007,11 +1007,11 @@ static gsi::Methods methods_QListWidget () { gsi::Class &qtdecl_QListView (); -qt_gsi::QtNativeClass decl_QListWidget (qtdecl_QListView (), "QListWidget_Native", +qt_gsi::QtNativeClass decl_QListWidget (qtdecl_QListView (), "QtGui", "QListWidget_Native", methods_QListWidget (), "@hide\n@alias QListWidget"); -GSIQT_PUBLIC gsi::Class &qtdecl_QListWidget () { return decl_QListWidget; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QListWidget () { return decl_QListWidget; } } @@ -6087,7 +6087,7 @@ static gsi::Methods methods_QListWidget_Adaptor () { return methods; } -gsi::Class decl_QListWidget_Adaptor (qtdecl_QListWidget (), "QListWidget", +gsi::Class decl_QListWidget_Adaptor (qtdecl_QListWidget (), "QtGui", "QListWidget", methods_QListWidget_Adaptor (), "@qt\n@brief Binding of QListWidget"); diff --git a/src/gsiqt4/gsiDeclQListWidgetItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQListWidgetItem.cc similarity index 99% rename from src/gsiqt4/gsiDeclQListWidgetItem.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQListWidgetItem.cc index ce26a5b1d..3333d0eb4 100644 --- a/src/gsiqt4/gsiDeclQListWidgetItem.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQListWidgetItem.cc @@ -36,8 +36,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -817,11 +817,11 @@ static gsi::Methods methods_QListWidgetItem () { return methods; } -gsi::Class decl_QListWidgetItem ("QListWidgetItem_Native", +gsi::Class decl_QListWidgetItem ("QtGui", "QListWidgetItem_Native", methods_QListWidgetItem (), "@hide\n@alias QListWidgetItem"); -GSIQT_PUBLIC gsi::Class &qtdecl_QListWidgetItem () { return decl_QListWidgetItem; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QListWidgetItem () { return decl_QListWidgetItem; } } @@ -1294,7 +1294,7 @@ static gsi::Methods methods_QListWidgetItem_Adaptor () { return methods; } -gsi::Class decl_QListWidgetItem_Adaptor (qtdecl_QListWidgetItem (), "QListWidgetItem", +gsi::Class decl_QListWidgetItem_Adaptor (qtdecl_QListWidgetItem (), "QtGui", "QListWidgetItem", methods_QListWidgetItem_Adaptor (), "@qt\n@brief Binding of QListWidgetItem"); diff --git a/src/gsiqt4/gsiDeclQMainWindow.cc b/src/gsiqt/qt4/QtGui/gsiDeclQMainWindow.cc similarity index 99% rename from src/gsiqt4/gsiDeclQMainWindow.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQMainWindow.cc index 5bcd57b60..fef42133b 100644 --- a/src/gsiqt4/gsiDeclQMainWindow.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQMainWindow.cc @@ -82,8 +82,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1222,11 +1222,11 @@ static gsi::Methods methods_QMainWindow () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QMainWindow (qtdecl_QWidget (), "QMainWindow_Native", +qt_gsi::QtNativeClass decl_QMainWindow (qtdecl_QWidget (), "QtGui", "QMainWindow_Native", methods_QMainWindow (), "@hide\n@alias QMainWindow"); -GSIQT_PUBLIC gsi::Class &qtdecl_QMainWindow () { return decl_QMainWindow; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QMainWindow () { return decl_QMainWindow; } } @@ -3523,7 +3523,7 @@ static gsi::Methods methods_QMainWindow_Adaptor () { return methods; } -gsi::Class decl_QMainWindow_Adaptor (qtdecl_QMainWindow (), "QMainWindow", +gsi::Class decl_QMainWindow_Adaptor (qtdecl_QMainWindow (), "QtGui", "QMainWindow", methods_QMainWindow_Adaptor (), "@qt\n@brief Binding of QMainWindow"); @@ -3534,7 +3534,7 @@ gsi::Class decl_QMainWindow_Adaptor (qtdecl_QMainWindow (), namespace qt_gsi { -static gsi::Enum decl_QMainWindow_DockOption_Enum ("QMainWindow_DockOption", +static gsi::Enum decl_QMainWindow_DockOption_Enum ("QtGui", "QMainWindow_DockOption", gsi::enum_const ("AnimatedDocks", QMainWindow::AnimatedDocks, "@brief Enum constant QMainWindow::AnimatedDocks") + gsi::enum_const ("AllowNestedDocks", QMainWindow::AllowNestedDocks, "@brief Enum constant QMainWindow::AllowNestedDocks") + gsi::enum_const ("AllowTabbedDocks", QMainWindow::AllowTabbedDocks, "@brief Enum constant QMainWindow::AllowTabbedDocks") + @@ -3542,13 +3542,13 @@ static gsi::Enum decl_QMainWindow_DockOption_Enum ("QMa gsi::enum_const ("VerticalTabs", QMainWindow::VerticalTabs, "@brief Enum constant QMainWindow::VerticalTabs"), "@qt\n@brief This class represents the QMainWindow::DockOption enum"); -static gsi::QFlagsClass decl_QMainWindow_DockOption_Enums ("QMainWindow_QFlags_DockOption", +static gsi::QFlagsClass decl_QMainWindow_DockOption_Enums ("QtGui", "QMainWindow_QFlags_DockOption", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QMainWindow_DockOption_Enum_in_parent (decl_QMainWindow_DockOption_Enum.defs ()); -static gsi::ClassExt decl_QMainWindow_DockOption_Enum_as_child (decl_QMainWindow_DockOption_Enum, "DockOption"); -static gsi::ClassExt decl_QMainWindow_DockOption_Enums_as_child (decl_QMainWindow_DockOption_Enums, "QFlags_DockOption"); +static gsi::ClassExt decl_QMainWindow_DockOption_Enum_as_child (decl_QMainWindow_DockOption_Enum, "QtGui", "DockOption"); +static gsi::ClassExt decl_QMainWindow_DockOption_Enums_as_child (decl_QMainWindow_DockOption_Enums, "QtGui", "QFlags_DockOption"); } diff --git a/src/gsiqt4/gsiDeclQMatrix.cc b/src/gsiqt/qt4/QtGui/gsiDeclQMatrix.cc similarity index 99% rename from src/gsiqt4/gsiDeclQMatrix.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQMatrix.cc index bf3ba54fa..066ae2c89 100644 --- a/src/gsiqt4/gsiDeclQMatrix.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQMatrix.cc @@ -39,8 +39,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -848,12 +848,12 @@ static gsi::Methods methods_QMatrix () { return methods; } -gsi::Class decl_QMatrix ("QMatrix", +gsi::Class decl_QMatrix ("QtGui", "QMatrix", methods_QMatrix (), "@qt\n@brief Binding of QMatrix"); -GSIQT_PUBLIC gsi::Class &qtdecl_QMatrix () { return decl_QMatrix; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QMatrix () { return decl_QMatrix; } } diff --git a/src/gsiqt4/gsiDeclQMatrix4x4.cc b/src/gsiqt/qt4/QtGui/gsiDeclQMatrix4x4.cc similarity index 99% rename from src/gsiqt4/gsiDeclQMatrix4x4.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQMatrix4x4.cc index b46a93b4c..107d4b2fd 100644 --- a/src/gsiqt4/gsiDeclQMatrix4x4.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQMatrix4x4.cc @@ -38,8 +38,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1367,12 +1367,12 @@ static gsi::Methods methods_QMatrix4x4 () { return methods; } -gsi::Class decl_QMatrix4x4 ("QMatrix4x4", +gsi::Class decl_QMatrix4x4 ("QtGui", "QMatrix4x4", methods_QMatrix4x4 (), "@qt\n@brief Binding of QMatrix4x4"); -GSIQT_PUBLIC gsi::Class &qtdecl_QMatrix4x4 () { return decl_QMatrix4x4; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QMatrix4x4 () { return decl_QMatrix4x4; } } diff --git a/src/gsiqt4/gsiDeclQMdiArea.cc b/src/gsiqt/qt4/QtGui/gsiDeclQMdiArea.cc similarity index 99% rename from src/gsiqt4/gsiDeclQMdiArea.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQMdiArea.cc index 7f7586430..fa98a87f4 100644 --- a/src/gsiqt4/gsiDeclQMdiArea.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQMdiArea.cc @@ -80,8 +80,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -729,11 +729,11 @@ static gsi::Methods methods_QMdiArea () { gsi::Class &qtdecl_QAbstractScrollArea (); -qt_gsi::QtNativeClass decl_QMdiArea (qtdecl_QAbstractScrollArea (), "QMdiArea_Native", +qt_gsi::QtNativeClass decl_QMdiArea (qtdecl_QAbstractScrollArea (), "QtGui", "QMdiArea_Native", methods_QMdiArea (), "@hide\n@alias QMdiArea"); -GSIQT_PUBLIC gsi::Class &qtdecl_QMdiArea () { return decl_QMdiArea; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QMdiArea () { return decl_QMdiArea; } } @@ -3154,7 +3154,7 @@ static gsi::Methods methods_QMdiArea_Adaptor () { return methods; } -gsi::Class decl_QMdiArea_Adaptor (qtdecl_QMdiArea (), "QMdiArea", +gsi::Class decl_QMdiArea_Adaptor (qtdecl_QMdiArea (), "QtGui", "QMdiArea", methods_QMdiArea_Adaptor (), "@qt\n@brief Binding of QMdiArea"); @@ -3165,17 +3165,17 @@ gsi::Class decl_QMdiArea_Adaptor (qtdecl_QMdiArea (), "QMdiAre namespace qt_gsi { -static gsi::Enum decl_QMdiArea_AreaOption_Enum ("QMdiArea_AreaOption", +static gsi::Enum decl_QMdiArea_AreaOption_Enum ("QtGui", "QMdiArea_AreaOption", gsi::enum_const ("DontMaximizeSubWindowOnActivation", QMdiArea::DontMaximizeSubWindowOnActivation, "@brief Enum constant QMdiArea::DontMaximizeSubWindowOnActivation"), "@qt\n@brief This class represents the QMdiArea::AreaOption enum"); -static gsi::QFlagsClass decl_QMdiArea_AreaOption_Enums ("QMdiArea_QFlags_AreaOption", +static gsi::QFlagsClass decl_QMdiArea_AreaOption_Enums ("QtGui", "QMdiArea_QFlags_AreaOption", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QMdiArea_AreaOption_Enum_in_parent (decl_QMdiArea_AreaOption_Enum.defs ()); -static gsi::ClassExt decl_QMdiArea_AreaOption_Enum_as_child (decl_QMdiArea_AreaOption_Enum, "AreaOption"); -static gsi::ClassExt decl_QMdiArea_AreaOption_Enums_as_child (decl_QMdiArea_AreaOption_Enums, "QFlags_AreaOption"); +static gsi::ClassExt decl_QMdiArea_AreaOption_Enum_as_child (decl_QMdiArea_AreaOption_Enum, "QtGui", "AreaOption"); +static gsi::ClassExt decl_QMdiArea_AreaOption_Enums_as_child (decl_QMdiArea_AreaOption_Enums, "QtGui", "QFlags_AreaOption"); } @@ -3184,18 +3184,18 @@ static gsi::ClassExt decl_QMdiArea_AreaOption_Enums_as_child (decl_QMd namespace qt_gsi { -static gsi::Enum decl_QMdiArea_ViewMode_Enum ("QMdiArea_ViewMode", +static gsi::Enum decl_QMdiArea_ViewMode_Enum ("QtGui", "QMdiArea_ViewMode", gsi::enum_const ("SubWindowView", QMdiArea::SubWindowView, "@brief Enum constant QMdiArea::SubWindowView") + gsi::enum_const ("TabbedView", QMdiArea::TabbedView, "@brief Enum constant QMdiArea::TabbedView"), "@qt\n@brief This class represents the QMdiArea::ViewMode enum"); -static gsi::QFlagsClass decl_QMdiArea_ViewMode_Enums ("QMdiArea_QFlags_ViewMode", +static gsi::QFlagsClass decl_QMdiArea_ViewMode_Enums ("QtGui", "QMdiArea_QFlags_ViewMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QMdiArea_ViewMode_Enum_in_parent (decl_QMdiArea_ViewMode_Enum.defs ()); -static gsi::ClassExt decl_QMdiArea_ViewMode_Enum_as_child (decl_QMdiArea_ViewMode_Enum, "ViewMode"); -static gsi::ClassExt decl_QMdiArea_ViewMode_Enums_as_child (decl_QMdiArea_ViewMode_Enums, "QFlags_ViewMode"); +static gsi::ClassExt decl_QMdiArea_ViewMode_Enum_as_child (decl_QMdiArea_ViewMode_Enum, "QtGui", "ViewMode"); +static gsi::ClassExt decl_QMdiArea_ViewMode_Enums_as_child (decl_QMdiArea_ViewMode_Enums, "QtGui", "QFlags_ViewMode"); } @@ -3204,19 +3204,19 @@ static gsi::ClassExt decl_QMdiArea_ViewMode_Enums_as_child (decl_QMdiA namespace qt_gsi { -static gsi::Enum decl_QMdiArea_WindowOrder_Enum ("QMdiArea_WindowOrder", +static gsi::Enum decl_QMdiArea_WindowOrder_Enum ("QtGui", "QMdiArea_WindowOrder", gsi::enum_const ("CreationOrder", QMdiArea::CreationOrder, "@brief Enum constant QMdiArea::CreationOrder") + gsi::enum_const ("StackingOrder", QMdiArea::StackingOrder, "@brief Enum constant QMdiArea::StackingOrder") + gsi::enum_const ("ActivationHistoryOrder", QMdiArea::ActivationHistoryOrder, "@brief Enum constant QMdiArea::ActivationHistoryOrder"), "@qt\n@brief This class represents the QMdiArea::WindowOrder enum"); -static gsi::QFlagsClass decl_QMdiArea_WindowOrder_Enums ("QMdiArea_QFlags_WindowOrder", +static gsi::QFlagsClass decl_QMdiArea_WindowOrder_Enums ("QtGui", "QMdiArea_QFlags_WindowOrder", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QMdiArea_WindowOrder_Enum_in_parent (decl_QMdiArea_WindowOrder_Enum.defs ()); -static gsi::ClassExt decl_QMdiArea_WindowOrder_Enum_as_child (decl_QMdiArea_WindowOrder_Enum, "WindowOrder"); -static gsi::ClassExt decl_QMdiArea_WindowOrder_Enums_as_child (decl_QMdiArea_WindowOrder_Enums, "QFlags_WindowOrder"); +static gsi::ClassExt decl_QMdiArea_WindowOrder_Enum_as_child (decl_QMdiArea_WindowOrder_Enum, "QtGui", "WindowOrder"); +static gsi::ClassExt decl_QMdiArea_WindowOrder_Enums_as_child (decl_QMdiArea_WindowOrder_Enums, "QtGui", "QFlags_WindowOrder"); } diff --git a/src/gsiqt4/gsiDeclQMdiSubWindow.cc b/src/gsiqt/qt4/QtGui/gsiDeclQMdiSubWindow.cc similarity index 99% rename from src/gsiqt4/gsiDeclQMdiSubWindow.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQMdiSubWindow.cc index 8999ab76a..474fcc6a1 100644 --- a/src/gsiqt4/gsiDeclQMdiSubWindow.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQMdiSubWindow.cc @@ -79,8 +79,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -534,11 +534,11 @@ static gsi::Methods methods_QMdiSubWindow () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QMdiSubWindow (qtdecl_QWidget (), "QMdiSubWindow_Native", +qt_gsi::QtNativeClass decl_QMdiSubWindow (qtdecl_QWidget (), "QtGui", "QMdiSubWindow_Native", methods_QMdiSubWindow (), "@hide\n@alias QMdiSubWindow"); -GSIQT_PUBLIC gsi::Class &qtdecl_QMdiSubWindow () { return decl_QMdiSubWindow; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QMdiSubWindow () { return decl_QMdiSubWindow; } } @@ -2797,7 +2797,7 @@ static gsi::Methods methods_QMdiSubWindow_Adaptor () { return methods; } -gsi::Class decl_QMdiSubWindow_Adaptor (qtdecl_QMdiSubWindow (), "QMdiSubWindow", +gsi::Class decl_QMdiSubWindow_Adaptor (qtdecl_QMdiSubWindow (), "QtGui", "QMdiSubWindow", methods_QMdiSubWindow_Adaptor (), "@qt\n@brief Binding of QMdiSubWindow"); @@ -2808,20 +2808,20 @@ gsi::Class decl_QMdiSubWindow_Adaptor (qtdecl_QMdiSubWind namespace qt_gsi { -static gsi::Enum decl_QMdiSubWindow_SubWindowOption_Enum ("QMdiSubWindow_SubWindowOption", +static gsi::Enum decl_QMdiSubWindow_SubWindowOption_Enum ("QtGui", "QMdiSubWindow_SubWindowOption", gsi::enum_const ("AllowOutsideAreaHorizontally", QMdiSubWindow::AllowOutsideAreaHorizontally, "@brief Enum constant QMdiSubWindow::AllowOutsideAreaHorizontally") + gsi::enum_const ("AllowOutsideAreaVertically", QMdiSubWindow::AllowOutsideAreaVertically, "@brief Enum constant QMdiSubWindow::AllowOutsideAreaVertically") + gsi::enum_const ("RubberBandResize", QMdiSubWindow::RubberBandResize, "@brief Enum constant QMdiSubWindow::RubberBandResize") + gsi::enum_const ("RubberBandMove", QMdiSubWindow::RubberBandMove, "@brief Enum constant QMdiSubWindow::RubberBandMove"), "@qt\n@brief This class represents the QMdiSubWindow::SubWindowOption enum"); -static gsi::QFlagsClass decl_QMdiSubWindow_SubWindowOption_Enums ("QMdiSubWindow_QFlags_SubWindowOption", +static gsi::QFlagsClass decl_QMdiSubWindow_SubWindowOption_Enums ("QtGui", "QMdiSubWindow_QFlags_SubWindowOption", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QMdiSubWindow_SubWindowOption_Enum_in_parent (decl_QMdiSubWindow_SubWindowOption_Enum.defs ()); -static gsi::ClassExt decl_QMdiSubWindow_SubWindowOption_Enum_as_child (decl_QMdiSubWindow_SubWindowOption_Enum, "SubWindowOption"); -static gsi::ClassExt decl_QMdiSubWindow_SubWindowOption_Enums_as_child (decl_QMdiSubWindow_SubWindowOption_Enums, "QFlags_SubWindowOption"); +static gsi::ClassExt decl_QMdiSubWindow_SubWindowOption_Enum_as_child (decl_QMdiSubWindow_SubWindowOption_Enum, "QtGui", "SubWindowOption"); +static gsi::ClassExt decl_QMdiSubWindow_SubWindowOption_Enums_as_child (decl_QMdiSubWindow_SubWindowOption_Enums, "QtGui", "QFlags_SubWindowOption"); } diff --git a/src/gsiqt4/gsiDeclQMenu.cc b/src/gsiqt/qt4/QtGui/gsiDeclQMenu.cc similarity index 99% rename from src/gsiqt4/gsiDeclQMenu.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQMenu.cc index 3be37f562..d77721da8 100644 --- a/src/gsiqt4/gsiDeclQMenu.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQMenu.cc @@ -78,8 +78,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -959,11 +959,11 @@ static gsi::Methods methods_QMenu () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QMenu (qtdecl_QWidget (), "QMenu_Native", +qt_gsi::QtNativeClass decl_QMenu (qtdecl_QWidget (), "QtGui", "QMenu_Native", methods_QMenu (), "@hide\n@alias QMenu"); -GSIQT_PUBLIC gsi::Class &qtdecl_QMenu () { return decl_QMenu; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QMenu () { return decl_QMenu; } } @@ -3338,7 +3338,7 @@ static gsi::Methods methods_QMenu_Adaptor () { return methods; } -gsi::Class decl_QMenu_Adaptor (qtdecl_QMenu (), "QMenu", +gsi::Class decl_QMenu_Adaptor (qtdecl_QMenu (), "QtGui", "QMenu", methods_QMenu_Adaptor (), "@qt\n@brief Binding of QMenu"); diff --git a/src/gsiqt4/gsiDeclQMenuBar.cc b/src/gsiqt/qt4/QtGui/gsiDeclQMenuBar.cc similarity index 99% rename from src/gsiqt4/gsiDeclQMenuBar.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQMenuBar.cc index 04de02891..984433747 100644 --- a/src/gsiqt4/gsiDeclQMenuBar.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQMenuBar.cc @@ -79,8 +79,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -686,11 +686,11 @@ static gsi::Methods methods_QMenuBar () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QMenuBar (qtdecl_QWidget (), "QMenuBar_Native", +qt_gsi::QtNativeClass decl_QMenuBar (qtdecl_QWidget (), "QtGui", "QMenuBar_Native", methods_QMenuBar (), "@hide\n@alias QMenuBar"); -GSIQT_PUBLIC gsi::Class &qtdecl_QMenuBar () { return decl_QMenuBar; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QMenuBar () { return decl_QMenuBar; } } @@ -2969,7 +2969,7 @@ static gsi::Methods methods_QMenuBar_Adaptor () { return methods; } -gsi::Class decl_QMenuBar_Adaptor (qtdecl_QMenuBar (), "QMenuBar", +gsi::Class decl_QMenuBar_Adaptor (qtdecl_QMenuBar (), "QtGui", "QMenuBar", methods_QMenuBar_Adaptor (), "@qt\n@brief Binding of QMenuBar"); diff --git a/src/gsiqt4/gsiDeclQMessageBox.cc b/src/gsiqt/qt4/QtGui/gsiDeclQMessageBox.cc similarity index 99% rename from src/gsiqt4/gsiDeclQMessageBox.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQMessageBox.cc index 78c069380..539cea96b 100644 --- a/src/gsiqt4/gsiDeclQMessageBox.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQMessageBox.cc @@ -80,8 +80,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1092,11 +1092,11 @@ static gsi::Methods methods_QMessageBox () { gsi::Class &qtdecl_QDialog (); -qt_gsi::QtNativeClass decl_QMessageBox (qtdecl_QDialog (), "QMessageBox_Native", +qt_gsi::QtNativeClass decl_QMessageBox (qtdecl_QDialog (), "QtGui", "QMessageBox_Native", methods_QMessageBox (), "@hide\n@alias QMessageBox"); -GSIQT_PUBLIC gsi::Class &qtdecl_QMessageBox () { return decl_QMessageBox; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QMessageBox () { return decl_QMessageBox; } } @@ -3648,7 +3648,7 @@ static gsi::Methods methods_QMessageBox_Adaptor () { return methods; } -gsi::Class decl_QMessageBox_Adaptor (qtdecl_QMessageBox (), "QMessageBox", +gsi::Class decl_QMessageBox_Adaptor (qtdecl_QMessageBox (), "QtGui", "QMessageBox", methods_QMessageBox_Adaptor (), "@qt\n@brief Binding of QMessageBox"); @@ -3659,7 +3659,7 @@ gsi::Class decl_QMessageBox_Adaptor (qtdecl_QMessageBox (), namespace qt_gsi { -static gsi::Enum decl_QMessageBox_ButtonRole_Enum ("QMessageBox_ButtonRole", +static gsi::Enum decl_QMessageBox_ButtonRole_Enum ("QtGui", "QMessageBox_ButtonRole", gsi::enum_const ("InvalidRole", QMessageBox::InvalidRole, "@brief Enum constant QMessageBox::InvalidRole") + gsi::enum_const ("AcceptRole", QMessageBox::AcceptRole, "@brief Enum constant QMessageBox::AcceptRole") + gsi::enum_const ("RejectRole", QMessageBox::RejectRole, "@brief Enum constant QMessageBox::RejectRole") + @@ -3673,13 +3673,13 @@ static gsi::Enum decl_QMessageBox_ButtonRole_Enum ("QMe gsi::enum_const ("NRoles", QMessageBox::NRoles, "@brief Enum constant QMessageBox::NRoles"), "@qt\n@brief This class represents the QMessageBox::ButtonRole enum"); -static gsi::QFlagsClass decl_QMessageBox_ButtonRole_Enums ("QMessageBox_QFlags_ButtonRole", +static gsi::QFlagsClass decl_QMessageBox_ButtonRole_Enums ("QtGui", "QMessageBox_QFlags_ButtonRole", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QMessageBox_ButtonRole_Enum_in_parent (decl_QMessageBox_ButtonRole_Enum.defs ()); -static gsi::ClassExt decl_QMessageBox_ButtonRole_Enum_as_child (decl_QMessageBox_ButtonRole_Enum, "ButtonRole"); -static gsi::ClassExt decl_QMessageBox_ButtonRole_Enums_as_child (decl_QMessageBox_ButtonRole_Enums, "QFlags_ButtonRole"); +static gsi::ClassExt decl_QMessageBox_ButtonRole_Enum_as_child (decl_QMessageBox_ButtonRole_Enum, "QtGui", "ButtonRole"); +static gsi::ClassExt decl_QMessageBox_ButtonRole_Enums_as_child (decl_QMessageBox_ButtonRole_Enums, "QtGui", "QFlags_ButtonRole"); } @@ -3688,7 +3688,7 @@ static gsi::ClassExt decl_QMessageBox_ButtonRole_Enums_as_child (de namespace qt_gsi { -static gsi::Enum decl_QMessageBox_Icon_Enum ("QMessageBox_Icon", +static gsi::Enum decl_QMessageBox_Icon_Enum ("QtGui", "QMessageBox_Icon", gsi::enum_const ("NoIcon", QMessageBox::NoIcon, "@brief Enum constant QMessageBox::NoIcon") + gsi::enum_const ("Information", QMessageBox::Information, "@brief Enum constant QMessageBox::Information") + gsi::enum_const ("Warning", QMessageBox::Warning, "@brief Enum constant QMessageBox::Warning") + @@ -3696,13 +3696,13 @@ static gsi::Enum decl_QMessageBox_Icon_Enum ("QMessageBox_Ico gsi::enum_const ("Question", QMessageBox::Question, "@brief Enum constant QMessageBox::Question"), "@qt\n@brief This class represents the QMessageBox::Icon enum"); -static gsi::QFlagsClass decl_QMessageBox_Icon_Enums ("QMessageBox_QFlags_Icon", +static gsi::QFlagsClass decl_QMessageBox_Icon_Enums ("QtGui", "QMessageBox_QFlags_Icon", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QMessageBox_Icon_Enum_in_parent (decl_QMessageBox_Icon_Enum.defs ()); -static gsi::ClassExt decl_QMessageBox_Icon_Enum_as_child (decl_QMessageBox_Icon_Enum, "Icon"); -static gsi::ClassExt decl_QMessageBox_Icon_Enums_as_child (decl_QMessageBox_Icon_Enums, "QFlags_Icon"); +static gsi::ClassExt decl_QMessageBox_Icon_Enum_as_child (decl_QMessageBox_Icon_Enum, "QtGui", "Icon"); +static gsi::ClassExt decl_QMessageBox_Icon_Enums_as_child (decl_QMessageBox_Icon_Enums, "QtGui", "QFlags_Icon"); } @@ -3711,7 +3711,7 @@ static gsi::ClassExt decl_QMessageBox_Icon_Enums_as_child (decl_QMe namespace qt_gsi { -static gsi::Enum decl_QMessageBox_StandardButton_Enum ("QMessageBox_StandardButton", +static gsi::Enum decl_QMessageBox_StandardButton_Enum ("QtGui", "QMessageBox_StandardButton", gsi::enum_const ("NoButton", QMessageBox::NoButton, "@brief Enum constant QMessageBox::NoButton") + gsi::enum_const ("Ok", QMessageBox::Ok, "@brief Enum constant QMessageBox::Ok") + gsi::enum_const ("Save", QMessageBox::Save, "@brief Enum constant QMessageBox::Save") + @@ -3741,13 +3741,13 @@ static gsi::Enum decl_QMessageBox_StandardButton_En gsi::enum_const ("ButtonMask", QMessageBox::ButtonMask, "@brief Enum constant QMessageBox::ButtonMask"), "@qt\n@brief This class represents the QMessageBox::StandardButton enum"); -static gsi::QFlagsClass decl_QMessageBox_StandardButton_Enums ("QMessageBox_QFlags_StandardButton", +static gsi::QFlagsClass decl_QMessageBox_StandardButton_Enums ("QtGui", "QMessageBox_QFlags_StandardButton", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QMessageBox_StandardButton_Enum_in_parent (decl_QMessageBox_StandardButton_Enum.defs ()); -static gsi::ClassExt decl_QMessageBox_StandardButton_Enum_as_child (decl_QMessageBox_StandardButton_Enum, "StandardButton"); -static gsi::ClassExt decl_QMessageBox_StandardButton_Enums_as_child (decl_QMessageBox_StandardButton_Enums, "QFlags_StandardButton"); +static gsi::ClassExt decl_QMessageBox_StandardButton_Enum_as_child (decl_QMessageBox_StandardButton_Enum, "QtGui", "StandardButton"); +static gsi::ClassExt decl_QMessageBox_StandardButton_Enums_as_child (decl_QMessageBox_StandardButton_Enums, "QtGui", "QFlags_StandardButton"); } diff --git a/src/gsiqt4/gsiDeclQMimeSource.cc b/src/gsiqt/qt4/QtGui/gsiDeclQMimeSource.cc similarity index 97% rename from src/gsiqt4/gsiDeclQMimeSource.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQMimeSource.cc index 6b2deebac..3c376fe5f 100644 --- a/src/gsiqt4/gsiDeclQMimeSource.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQMimeSource.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -104,11 +104,11 @@ static gsi::Methods methods_QMimeSource () { return methods; } -gsi::Class decl_QMimeSource ("QMimeSource_Native", +gsi::Class decl_QMimeSource ("QtGui", "QMimeSource_Native", methods_QMimeSource (), "@hide\n@alias QMimeSource"); -GSIQT_PUBLIC gsi::Class &qtdecl_QMimeSource () { return decl_QMimeSource; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QMimeSource () { return decl_QMimeSource; } } @@ -279,7 +279,7 @@ static gsi::Methods methods_QMimeSource_Adaptor () { return methods; } -gsi::Class decl_QMimeSource_Adaptor (qtdecl_QMimeSource (), "QMimeSource", +gsi::Class decl_QMimeSource_Adaptor (qtdecl_QMimeSource (), "QtGui", "QMimeSource", methods_QMimeSource_Adaptor (), "@qt\n@brief Binding of QMimeSource"); diff --git a/src/gsiqt4/gsiDeclQMotifStyle.cc b/src/gsiqt/qt4/QtGui/gsiDeclQMotifStyle.cc similarity index 99% rename from src/gsiqt4/gsiDeclQMotifStyle.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQMotifStyle.cc index b14d05277..f7524eb7a 100644 --- a/src/gsiqt4/gsiDeclQMotifStyle.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQMotifStyle.cc @@ -48,8 +48,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -611,11 +611,11 @@ static gsi::Methods methods_QMotifStyle () { gsi::Class &qtdecl_QCommonStyle (); -qt_gsi::QtNativeClass decl_QMotifStyle (qtdecl_QCommonStyle (), "QMotifStyle_Native", +qt_gsi::QtNativeClass decl_QMotifStyle (qtdecl_QCommonStyle (), "QtGui", "QMotifStyle_Native", methods_QMotifStyle (), "@hide\n@alias QMotifStyle"); -GSIQT_PUBLIC gsi::Class &qtdecl_QMotifStyle () { return decl_QMotifStyle; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QMotifStyle () { return decl_QMotifStyle; } } @@ -2058,7 +2058,7 @@ static gsi::Methods methods_QMotifStyle_Adaptor () { return methods; } -gsi::Class decl_QMotifStyle_Adaptor (qtdecl_QMotifStyle (), "QMotifStyle", +gsi::Class decl_QMotifStyle_Adaptor (qtdecl_QMotifStyle (), "QtGui", "QMotifStyle", methods_QMotifStyle_Adaptor (), "@qt\n@brief Binding of QMotifStyle"); diff --git a/src/gsiqt4/gsiDeclQMouseEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQMouseEvent.cc similarity index 98% rename from src/gsiqt4/gsiDeclQMouseEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQMouseEvent.cc index a09b8ca54..2a3ae9fad 100644 --- a/src/gsiqt4/gsiDeclQMouseEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQMouseEvent.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -243,11 +243,11 @@ static gsi::Methods methods_QMouseEvent () { gsi::Class &qtdecl_QInputEvent (); -gsi::Class decl_QMouseEvent (qtdecl_QInputEvent (), "QMouseEvent_Native", +gsi::Class decl_QMouseEvent (qtdecl_QInputEvent (), "QtGui", "QMouseEvent_Native", methods_QMouseEvent (), "@hide\n@alias QMouseEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QMouseEvent () { return decl_QMouseEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QMouseEvent () { return decl_QMouseEvent; } } @@ -350,7 +350,7 @@ static gsi::Methods methods_QMouseEvent_Adaptor () { return methods; } -gsi::Class decl_QMouseEvent_Adaptor (qtdecl_QMouseEvent (), "QMouseEvent", +gsi::Class decl_QMouseEvent_Adaptor (qtdecl_QMouseEvent (), "QtGui", "QMouseEvent", methods_QMouseEvent_Adaptor (), "@qt\n@brief Binding of QMouseEvent"); diff --git a/src/gsiqt4/gsiDeclQMoveEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQMoveEvent.cc similarity index 93% rename from src/gsiqt4/gsiDeclQMoveEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQMoveEvent.cc index 64222a8cd..18a964743 100644 --- a/src/gsiqt4/gsiDeclQMoveEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQMoveEvent.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -79,11 +79,11 @@ static gsi::Methods methods_QMoveEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QMoveEvent (qtdecl_QEvent (), "QMoveEvent_Native", +gsi::Class decl_QMoveEvent (qtdecl_QEvent (), "QtGui", "QMoveEvent_Native", methods_QMoveEvent (), "@hide\n@alias QMoveEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QMoveEvent () { return decl_QMoveEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QMoveEvent () { return decl_QMoveEvent; } } @@ -137,7 +137,7 @@ static gsi::Methods methods_QMoveEvent_Adaptor () { return methods; } -gsi::Class decl_QMoveEvent_Adaptor (qtdecl_QMoveEvent (), "QMoveEvent", +gsi::Class decl_QMoveEvent_Adaptor (qtdecl_QMoveEvent (), "QtGui", "QMoveEvent", methods_QMoveEvent_Adaptor (), "@qt\n@brief Binding of QMoveEvent"); diff --git a/src/gsiqt4/gsiDeclQMovie.cc b/src/gsiqt/qt4/QtGui/gsiDeclQMovie.cc similarity index 98% rename from src/gsiqt4/gsiDeclQMovie.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQMovie.cc index 0739c0d39..6a94a919c 100644 --- a/src/gsiqt4/gsiDeclQMovie.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQMovie.cc @@ -40,8 +40,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -703,11 +703,11 @@ static gsi::Methods methods_QMovie () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QMovie (qtdecl_QObject (), "QMovie_Native", +qt_gsi::QtNativeClass decl_QMovie (qtdecl_QObject (), "QtGui", "QMovie_Native", methods_QMovie (), "@hide\n@alias QMovie"); -GSIQT_PUBLIC gsi::Class &qtdecl_QMovie () { return decl_QMovie; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QMovie () { return decl_QMovie; } } @@ -1338,7 +1338,7 @@ static gsi::Methods methods_QMovie_Adaptor () { return methods; } -gsi::Class decl_QMovie_Adaptor (qtdecl_QMovie (), "QMovie", +gsi::Class decl_QMovie_Adaptor (qtdecl_QMovie (), "QtGui", "QMovie", methods_QMovie_Adaptor (), "@qt\n@brief Binding of QMovie"); @@ -1349,18 +1349,18 @@ gsi::Class decl_QMovie_Adaptor (qtdecl_QMovie (), "QMovie", namespace qt_gsi { -static gsi::Enum decl_QMovie_CacheMode_Enum ("QMovie_CacheMode", +static gsi::Enum decl_QMovie_CacheMode_Enum ("QtGui", "QMovie_CacheMode", gsi::enum_const ("CacheNone", QMovie::CacheNone, "@brief Enum constant QMovie::CacheNone") + gsi::enum_const ("CacheAll", QMovie::CacheAll, "@brief Enum constant QMovie::CacheAll"), "@qt\n@brief This class represents the QMovie::CacheMode enum"); -static gsi::QFlagsClass decl_QMovie_CacheMode_Enums ("QMovie_QFlags_CacheMode", +static gsi::QFlagsClass decl_QMovie_CacheMode_Enums ("QtGui", "QMovie_QFlags_CacheMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QMovie_CacheMode_Enum_in_parent (decl_QMovie_CacheMode_Enum.defs ()); -static gsi::ClassExt decl_QMovie_CacheMode_Enum_as_child (decl_QMovie_CacheMode_Enum, "CacheMode"); -static gsi::ClassExt decl_QMovie_CacheMode_Enums_as_child (decl_QMovie_CacheMode_Enums, "QFlags_CacheMode"); +static gsi::ClassExt decl_QMovie_CacheMode_Enum_as_child (decl_QMovie_CacheMode_Enum, "QtGui", "CacheMode"); +static gsi::ClassExt decl_QMovie_CacheMode_Enums_as_child (decl_QMovie_CacheMode_Enums, "QtGui", "QFlags_CacheMode"); } @@ -1369,19 +1369,19 @@ static gsi::ClassExt decl_QMovie_CacheMode_Enums_as_child (decl_QMovie_C namespace qt_gsi { -static gsi::Enum decl_QMovie_MovieState_Enum ("QMovie_MovieState", +static gsi::Enum decl_QMovie_MovieState_Enum ("QtGui", "QMovie_MovieState", gsi::enum_const ("NotRunning", QMovie::NotRunning, "@brief Enum constant QMovie::NotRunning") + gsi::enum_const ("Paused", QMovie::Paused, "@brief Enum constant QMovie::Paused") + gsi::enum_const ("Running", QMovie::Running, "@brief Enum constant QMovie::Running"), "@qt\n@brief This class represents the QMovie::MovieState enum"); -static gsi::QFlagsClass decl_QMovie_MovieState_Enums ("QMovie_QFlags_MovieState", +static gsi::QFlagsClass decl_QMovie_MovieState_Enums ("QtGui", "QMovie_QFlags_MovieState", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QMovie_MovieState_Enum_in_parent (decl_QMovie_MovieState_Enum.defs ()); -static gsi::ClassExt decl_QMovie_MovieState_Enum_as_child (decl_QMovie_MovieState_Enum, "MovieState"); -static gsi::ClassExt decl_QMovie_MovieState_Enums_as_child (decl_QMovie_MovieState_Enums, "QFlags_MovieState"); +static gsi::ClassExt decl_QMovie_MovieState_Enum_as_child (decl_QMovie_MovieState_Enum, "QtGui", "MovieState"); +static gsi::ClassExt decl_QMovie_MovieState_Enums_as_child (decl_QMovie_MovieState_Enums, "QtGui", "QFlags_MovieState"); } diff --git a/src/gsiqt4/gsiDeclQPageSetupDialog.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPageSetupDialog.cc similarity index 97% rename from src/gsiqt4/gsiDeclQPageSetupDialog.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPageSetupDialog.cc index 064a0620a..4e9c04313 100644 --- a/src/gsiqt4/gsiDeclQPageSetupDialog.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPageSetupDialog.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -375,11 +375,11 @@ static gsi::Methods methods_QPageSetupDialog () { return methods; } -gsi::Class decl_QPageSetupDialog ("QPageSetupDialog_Native", +gsi::Class decl_QPageSetupDialog ("QtGui", "QPageSetupDialog_Native", methods_QPageSetupDialog (), "@hide\n@alias QPageSetupDialog"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPageSetupDialog () { return decl_QPageSetupDialog; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPageSetupDialog () { return decl_QPageSetupDialog; } } @@ -506,7 +506,7 @@ static gsi::Methods methods_QPageSetupDialog_Adaptor () { return methods; } -gsi::Class decl_QPageSetupDialog_Adaptor (qtdecl_QPageSetupDialog (), "QPageSetupDialog", +gsi::Class decl_QPageSetupDialog_Adaptor (qtdecl_QPageSetupDialog (), "QtGui", "QPageSetupDialog", methods_QPageSetupDialog_Adaptor (), "@qt\n@brief Binding of QPageSetupDialog"); @@ -517,19 +517,19 @@ gsi::Class decl_QPageSetupDialog_Adaptor (qtdecl_QPage namespace qt_gsi { -static gsi::Enum decl_QPageSetupDialog_PageSetupDialogOption_Enum ("QPageSetupDialog_PageSetupDialogOption", +static gsi::Enum decl_QPageSetupDialog_PageSetupDialogOption_Enum ("QtGui", "QPageSetupDialog_PageSetupDialogOption", gsi::enum_const ("None", QPageSetupDialog::None, "@brief Enum constant QPageSetupDialog::None") + gsi::enum_const ("DontUseSheet", QPageSetupDialog::DontUseSheet, "@brief Enum constant QPageSetupDialog::DontUseSheet") + gsi::enum_const ("OwnsPrinter", QPageSetupDialog::OwnsPrinter, "@brief Enum constant QPageSetupDialog::OwnsPrinter"), "@qt\n@brief This class represents the QPageSetupDialog::PageSetupDialogOption enum"); -static gsi::QFlagsClass decl_QPageSetupDialog_PageSetupDialogOption_Enums ("QPageSetupDialog_QFlags_PageSetupDialogOption", +static gsi::QFlagsClass decl_QPageSetupDialog_PageSetupDialogOption_Enums ("QtGui", "QPageSetupDialog_QFlags_PageSetupDialogOption", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QPageSetupDialog_PageSetupDialogOption_Enum_in_parent (decl_QPageSetupDialog_PageSetupDialogOption_Enum.defs ()); -static gsi::ClassExt decl_QPageSetupDialog_PageSetupDialogOption_Enum_as_child (decl_QPageSetupDialog_PageSetupDialogOption_Enum, "PageSetupDialogOption"); -static gsi::ClassExt decl_QPageSetupDialog_PageSetupDialogOption_Enums_as_child (decl_QPageSetupDialog_PageSetupDialogOption_Enums, "QFlags_PageSetupDialogOption"); +static gsi::ClassExt decl_QPageSetupDialog_PageSetupDialogOption_Enum_as_child (decl_QPageSetupDialog_PageSetupDialogOption_Enum, "QtGui", "PageSetupDialogOption"); +static gsi::ClassExt decl_QPageSetupDialog_PageSetupDialogOption_Enums_as_child (decl_QPageSetupDialog_PageSetupDialogOption_Enums, "QtGui", "QFlags_PageSetupDialogOption"); } diff --git a/src/gsiqt4/gsiDeclQPaintDevice.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPaintDevice.cc similarity index 91% rename from src/gsiqt4/gsiDeclQPaintDevice.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPaintDevice.cc index 18af169fc..4e4934d43 100644 --- a/src/gsiqt4/gsiDeclQPaintDevice.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPaintDevice.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -253,11 +253,11 @@ static gsi::Methods methods_QPaintDevice () { return methods; } -gsi::Class decl_QPaintDevice ("QPaintDevice_Native", +gsi::Class decl_QPaintDevice ("QtGui", "QPaintDevice_Native", methods_QPaintDevice (), "@hide\n@alias QPaintDevice"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPaintDevice () { return decl_QPaintDevice; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPaintDevice () { return decl_QPaintDevice; } } @@ -268,6 +268,12 @@ public: virtual ~QPaintDevice_Adaptor(); + // [adaptor ctor] QPaintDevice::QPaintDevice() + QPaintDevice_Adaptor() : QPaintDevice() + { + qt_gsi::QtObjectBase::init (this); + } + // [adaptor impl] QPaintEngine *QPaintDevice::paintEngine() QPaintEngine * cbs_paintEngine_c0_0() const { @@ -304,6 +310,20 @@ public: QPaintDevice_Adaptor::~QPaintDevice_Adaptor() { } +// Constructor QPaintDevice::QPaintDevice() (adaptor class) + +static void _init_ctor_QPaintDevice_Adaptor_0 (qt_gsi::GenericStaticMethod *decl) +{ + decl->set_return_new (); +} + +static void _call_ctor_QPaintDevice_Adaptor_0 (const qt_gsi::GenericStaticMethod * /*decl*/, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + ret.write (new QPaintDevice_Adaptor ()); +} + + // int QPaintDevice::metric(QPaintDevice::PaintDeviceMetric metric) static void _init_cbs_metric_c3445_0 (qt_gsi::GenericMethod *decl) @@ -353,6 +373,7 @@ gsi::Class &qtdecl_QPaintDevice (); static gsi::Methods methods_QPaintDevice_Adaptor () { gsi::Methods methods; + methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QPaintDevice::QPaintDevice()\nThis method creates an object of class QPaintDevice.", &_init_ctor_QPaintDevice_Adaptor_0, &_call_ctor_QPaintDevice_Adaptor_0); methods += new qt_gsi::GenericMethod ("*metric", "@hide", true, &_init_cbs_metric_c3445_0, &_call_cbs_metric_c3445_0); methods += new qt_gsi::GenericMethod ("*metric", "@brief Virtual method int QPaintDevice::metric(QPaintDevice::PaintDeviceMetric metric)\nThis method can be reimplemented in a derived class.", true, &_init_cbs_metric_c3445_0, &_call_cbs_metric_c3445_0, &_set_callback_cbs_metric_c3445_0); methods += new qt_gsi::GenericMethod ("paintEngine", "@hide", true, &_init_cbs_paintEngine_c0_0, &_call_cbs_paintEngine_c0_0); @@ -360,7 +381,7 @@ static gsi::Methods methods_QPaintDevice_Adaptor () { return methods; } -gsi::Class decl_QPaintDevice_Adaptor (qtdecl_QPaintDevice (), "QPaintDevice", +gsi::Class decl_QPaintDevice_Adaptor (qtdecl_QPaintDevice (), "QtGui", "QPaintDevice", methods_QPaintDevice_Adaptor (), "@qt\n@brief Binding of QPaintDevice"); @@ -371,7 +392,7 @@ gsi::Class decl_QPaintDevice_Adaptor (qtdecl_QPaintDevice namespace qt_gsi { -static gsi::Enum decl_QPaintDevice_PaintDeviceMetric_Enum ("QPaintDevice_PaintDeviceMetric", +static gsi::Enum decl_QPaintDevice_PaintDeviceMetric_Enum ("QtGui", "QPaintDevice_PaintDeviceMetric", gsi::enum_const ("PdmWidth", QPaintDevice::PdmWidth, "@brief Enum constant QPaintDevice::PdmWidth") + gsi::enum_const ("PdmHeight", QPaintDevice::PdmHeight, "@brief Enum constant QPaintDevice::PdmHeight") + gsi::enum_const ("PdmWidthMM", QPaintDevice::PdmWidthMM, "@brief Enum constant QPaintDevice::PdmWidthMM") + @@ -384,13 +405,13 @@ static gsi::Enum decl_QPaintDevice_PaintDeviceM gsi::enum_const ("PdmPhysicalDpiY", QPaintDevice::PdmPhysicalDpiY, "@brief Enum constant QPaintDevice::PdmPhysicalDpiY"), "@qt\n@brief This class represents the QPaintDevice::PaintDeviceMetric enum"); -static gsi::QFlagsClass decl_QPaintDevice_PaintDeviceMetric_Enums ("QPaintDevice_QFlags_PaintDeviceMetric", +static gsi::QFlagsClass decl_QPaintDevice_PaintDeviceMetric_Enums ("QtGui", "QPaintDevice_QFlags_PaintDeviceMetric", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QPaintDevice_PaintDeviceMetric_Enum_in_parent (decl_QPaintDevice_PaintDeviceMetric_Enum.defs ()); -static gsi::ClassExt decl_QPaintDevice_PaintDeviceMetric_Enum_as_child (decl_QPaintDevice_PaintDeviceMetric_Enum, "PaintDeviceMetric"); -static gsi::ClassExt decl_QPaintDevice_PaintDeviceMetric_Enums_as_child (decl_QPaintDevice_PaintDeviceMetric_Enums, "QFlags_PaintDeviceMetric"); +static gsi::ClassExt decl_QPaintDevice_PaintDeviceMetric_Enum_as_child (decl_QPaintDevice_PaintDeviceMetric_Enum, "QtGui", "PaintDeviceMetric"); +static gsi::ClassExt decl_QPaintDevice_PaintDeviceMetric_Enums_as_child (decl_QPaintDevice_PaintDeviceMetric_Enums, "QtGui", "QFlags_PaintDeviceMetric"); } diff --git a/src/gsiqt4/gsiDeclQPaintEngine.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPaintEngine.cc similarity index 98% rename from src/gsiqt4/gsiDeclQPaintEngine.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPaintEngine.cc index da7c38ded..dd05fdfa7 100644 --- a/src/gsiqt4/gsiDeclQPaintEngine.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPaintEngine.cc @@ -41,8 +41,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -595,11 +595,11 @@ static gsi::Methods methods_QPaintEngine () { return methods; } -gsi::Class decl_QPaintEngine ("QPaintEngine_Native", +gsi::Class decl_QPaintEngine ("QtGui", "QPaintEngine_Native", methods_QPaintEngine (), "@hide\n@alias QPaintEngine"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPaintEngine () { return decl_QPaintEngine; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPaintEngine () { return decl_QPaintEngine; } } @@ -1172,7 +1172,7 @@ static gsi::Methods methods_QPaintEngine_Adaptor () { return methods; } -gsi::Class decl_QPaintEngine_Adaptor (qtdecl_QPaintEngine (), "QPaintEngine", +gsi::Class decl_QPaintEngine_Adaptor (qtdecl_QPaintEngine (), "QtGui", "QPaintEngine", methods_QPaintEngine_Adaptor (), "@qt\n@brief Binding of QPaintEngine"); @@ -1183,7 +1183,7 @@ gsi::Class decl_QPaintEngine_Adaptor (qtdecl_QPaintEngine namespace qt_gsi { -static gsi::Enum decl_QPaintEngine_DirtyFlag_Enum ("QPaintEngine_DirtyFlag", +static gsi::Enum decl_QPaintEngine_DirtyFlag_Enum ("QtGui", "QPaintEngine_DirtyFlag", gsi::enum_const ("DirtyPen", QPaintEngine::DirtyPen, "@brief Enum constant QPaintEngine::DirtyPen") + gsi::enum_const ("DirtyBrush", QPaintEngine::DirtyBrush, "@brief Enum constant QPaintEngine::DirtyBrush") + gsi::enum_const ("DirtyBrushOrigin", QPaintEngine::DirtyBrushOrigin, "@brief Enum constant QPaintEngine::DirtyBrushOrigin") + @@ -1200,13 +1200,13 @@ static gsi::Enum decl_QPaintEngine_DirtyFlag_Enum ("QPa gsi::enum_const ("AllDirty", QPaintEngine::AllDirty, "@brief Enum constant QPaintEngine::AllDirty"), "@qt\n@brief This class represents the QPaintEngine::DirtyFlag enum"); -static gsi::QFlagsClass decl_QPaintEngine_DirtyFlag_Enums ("QPaintEngine_QFlags_DirtyFlag", +static gsi::QFlagsClass decl_QPaintEngine_DirtyFlag_Enums ("QtGui", "QPaintEngine_QFlags_DirtyFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QPaintEngine_DirtyFlag_Enum_in_parent (decl_QPaintEngine_DirtyFlag_Enum.defs ()); -static gsi::ClassExt decl_QPaintEngine_DirtyFlag_Enum_as_child (decl_QPaintEngine_DirtyFlag_Enum, "DirtyFlag"); -static gsi::ClassExt decl_QPaintEngine_DirtyFlag_Enums_as_child (decl_QPaintEngine_DirtyFlag_Enums, "QFlags_DirtyFlag"); +static gsi::ClassExt decl_QPaintEngine_DirtyFlag_Enum_as_child (decl_QPaintEngine_DirtyFlag_Enum, "QtGui", "DirtyFlag"); +static gsi::ClassExt decl_QPaintEngine_DirtyFlag_Enums_as_child (decl_QPaintEngine_DirtyFlag_Enums, "QtGui", "QFlags_DirtyFlag"); } @@ -1215,7 +1215,7 @@ static gsi::ClassExt decl_QPaintEngine_DirtyFlag_Enums_as_child (d namespace qt_gsi { -static gsi::Enum decl_QPaintEngine_PaintEngineFeature_Enum ("QPaintEngine_PaintEngineFeature", +static gsi::Enum decl_QPaintEngine_PaintEngineFeature_Enum ("QtGui", "QPaintEngine_PaintEngineFeature", gsi::enum_const ("PrimitiveTransform", QPaintEngine::PrimitiveTransform, "@brief Enum constant QPaintEngine::PrimitiveTransform") + gsi::enum_const ("PatternTransform", QPaintEngine::PatternTransform, "@brief Enum constant QPaintEngine::PatternTransform") + gsi::enum_const ("PixmapTransform", QPaintEngine::PixmapTransform, "@brief Enum constant QPaintEngine::PixmapTransform") + @@ -1238,13 +1238,13 @@ static gsi::Enum decl_QPaintEngine_PaintEngine gsi::enum_const ("AllFeatures", QPaintEngine::AllFeatures, "@brief Enum constant QPaintEngine::AllFeatures"), "@qt\n@brief This class represents the QPaintEngine::PaintEngineFeature enum"); -static gsi::QFlagsClass decl_QPaintEngine_PaintEngineFeature_Enums ("QPaintEngine_QFlags_PaintEngineFeature", +static gsi::QFlagsClass decl_QPaintEngine_PaintEngineFeature_Enums ("QtGui", "QPaintEngine_QFlags_PaintEngineFeature", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QPaintEngine_PaintEngineFeature_Enum_in_parent (decl_QPaintEngine_PaintEngineFeature_Enum.defs ()); -static gsi::ClassExt decl_QPaintEngine_PaintEngineFeature_Enum_as_child (decl_QPaintEngine_PaintEngineFeature_Enum, "PaintEngineFeature"); -static gsi::ClassExt decl_QPaintEngine_PaintEngineFeature_Enums_as_child (decl_QPaintEngine_PaintEngineFeature_Enums, "QFlags_PaintEngineFeature"); +static gsi::ClassExt decl_QPaintEngine_PaintEngineFeature_Enum_as_child (decl_QPaintEngine_PaintEngineFeature_Enum, "QtGui", "PaintEngineFeature"); +static gsi::ClassExt decl_QPaintEngine_PaintEngineFeature_Enums_as_child (decl_QPaintEngine_PaintEngineFeature_Enums, "QtGui", "QFlags_PaintEngineFeature"); } @@ -1253,7 +1253,7 @@ static gsi::ClassExt decl_QPaintEngine_PaintEngineFeature_Enums_as namespace qt_gsi { -static gsi::Enum decl_QPaintEngine_Type_Enum ("QPaintEngine_Type", +static gsi::Enum decl_QPaintEngine_Type_Enum ("QtGui", "QPaintEngine_Type", gsi::enum_const ("X11", QPaintEngine::X11, "@brief Enum constant QPaintEngine::X11") + gsi::enum_const ("Windows", QPaintEngine::Windows, "@brief Enum constant QPaintEngine::Windows") + gsi::enum_const ("QuickDraw", QPaintEngine::QuickDraw, "@brief Enum constant QPaintEngine::QuickDraw") + @@ -1274,13 +1274,13 @@ static gsi::Enum decl_QPaintEngine_Type_Enum ("QPaintEngine_ gsi::enum_const ("MaxUser", QPaintEngine::MaxUser, "@brief Enum constant QPaintEngine::MaxUser"), "@qt\n@brief This class represents the QPaintEngine::Type enum"); -static gsi::QFlagsClass decl_QPaintEngine_Type_Enums ("QPaintEngine_QFlags_Type", +static gsi::QFlagsClass decl_QPaintEngine_Type_Enums ("QtGui", "QPaintEngine_QFlags_Type", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QPaintEngine_Type_Enum_in_parent (decl_QPaintEngine_Type_Enum.defs ()); -static gsi::ClassExt decl_QPaintEngine_Type_Enum_as_child (decl_QPaintEngine_Type_Enum, "Type"); -static gsi::ClassExt decl_QPaintEngine_Type_Enums_as_child (decl_QPaintEngine_Type_Enums, "QFlags_Type"); +static gsi::ClassExt decl_QPaintEngine_Type_Enum_as_child (decl_QPaintEngine_Type_Enum, "QtGui", "Type"); +static gsi::ClassExt decl_QPaintEngine_Type_Enums_as_child (decl_QPaintEngine_Type_Enums, "QtGui", "QFlags_Type"); } diff --git a/src/gsiqt4/gsiDeclQPaintEngineState.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPaintEngineState.cc similarity index 98% rename from src/gsiqt4/gsiDeclQPaintEngineState.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPaintEngineState.cc index 3a2707fe0..24aa70e34 100644 --- a/src/gsiqt4/gsiDeclQPaintEngineState.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPaintEngineState.cc @@ -38,8 +38,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -374,12 +374,12 @@ static gsi::Methods methods_QPaintEngineState () { return methods; } -gsi::Class decl_QPaintEngineState ("QPaintEngineState", +gsi::Class decl_QPaintEngineState ("QtGui", "QPaintEngineState", methods_QPaintEngineState (), "@qt\n@brief Binding of QPaintEngineState"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPaintEngineState () { return decl_QPaintEngineState; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPaintEngineState () { return decl_QPaintEngineState; } } diff --git a/src/gsiqt4/gsiDeclQPaintEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPaintEvent.cc similarity index 94% rename from src/gsiqt4/gsiDeclQPaintEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPaintEvent.cc index da7c1f021..a01a9e8e8 100644 --- a/src/gsiqt4/gsiDeclQPaintEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPaintEvent.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -80,11 +80,11 @@ static gsi::Methods methods_QPaintEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QPaintEvent (qtdecl_QEvent (), "QPaintEvent_Native", +gsi::Class decl_QPaintEvent (qtdecl_QEvent (), "QtGui", "QPaintEvent_Native", methods_QPaintEvent (), "@hide\n@alias QPaintEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPaintEvent () { return decl_QPaintEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPaintEvent () { return decl_QPaintEvent; } } @@ -160,7 +160,7 @@ static gsi::Methods methods_QPaintEvent_Adaptor () { return methods; } -gsi::Class decl_QPaintEvent_Adaptor (qtdecl_QPaintEvent (), "QPaintEvent", +gsi::Class decl_QPaintEvent_Adaptor (qtdecl_QPaintEvent (), "QtGui", "QPaintEvent", methods_QPaintEvent_Adaptor (), "@qt\n@brief Binding of QPaintEvent"); diff --git a/src/gsiqt4/gsiDeclQPainter.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPainter.cc similarity index 99% rename from src/gsiqt4/gsiDeclQPainter.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPainter.cc index 3e46ebeef..3c67c859a 100644 --- a/src/gsiqt4/gsiDeclQPainter.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPainter.cc @@ -55,8 +55,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -4521,12 +4521,12 @@ static gsi::Methods methods_QPainter () { return methods; } -gsi::Class decl_QPainter ("QPainter", +gsi::Class decl_QPainter ("QtGui", "QPainter", methods_QPainter (), "@qt\n@brief Binding of QPainter"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPainter () { return decl_QPainter; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPainter () { return decl_QPainter; } } @@ -4535,7 +4535,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QPainter () { return decl_QPainter; } namespace qt_gsi { -static gsi::Enum decl_QPainter_CompositionMode_Enum ("QPainter_CompositionMode", +static gsi::Enum decl_QPainter_CompositionMode_Enum ("QtGui", "QPainter_CompositionMode", gsi::enum_const ("CompositionMode_SourceOver", QPainter::CompositionMode_SourceOver, "@brief Enum constant QPainter::CompositionMode_SourceOver") + gsi::enum_const ("CompositionMode_DestinationOver", QPainter::CompositionMode_DestinationOver, "@brief Enum constant QPainter::CompositionMode_DestinationOver") + gsi::enum_const ("CompositionMode_Clear", QPainter::CompositionMode_Clear, "@brief Enum constant QPainter::CompositionMode_Clear") + @@ -4571,13 +4571,13 @@ static gsi::Enum decl_QPainter_CompositionMode_Enum ( gsi::enum_const ("RasterOp_SourceAndNotDestination", QPainter::RasterOp_SourceAndNotDestination, "@brief Enum constant QPainter::RasterOp_SourceAndNotDestination"), "@qt\n@brief This class represents the QPainter::CompositionMode enum"); -static gsi::QFlagsClass decl_QPainter_CompositionMode_Enums ("QPainter_QFlags_CompositionMode", +static gsi::QFlagsClass decl_QPainter_CompositionMode_Enums ("QtGui", "QPainter_QFlags_CompositionMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QPainter_CompositionMode_Enum_in_parent (decl_QPainter_CompositionMode_Enum.defs ()); -static gsi::ClassExt decl_QPainter_CompositionMode_Enum_as_child (decl_QPainter_CompositionMode_Enum, "CompositionMode"); -static gsi::ClassExt decl_QPainter_CompositionMode_Enums_as_child (decl_QPainter_CompositionMode_Enums, "QFlags_CompositionMode"); +static gsi::ClassExt decl_QPainter_CompositionMode_Enum_as_child (decl_QPainter_CompositionMode_Enum, "QtGui", "CompositionMode"); +static gsi::ClassExt decl_QPainter_CompositionMode_Enums_as_child (decl_QPainter_CompositionMode_Enums, "QtGui", "QFlags_CompositionMode"); } @@ -4586,7 +4586,7 @@ static gsi::ClassExt decl_QPainter_CompositionMode_Enums_as_child (dec namespace qt_gsi { -static gsi::Enum decl_QPainter_RenderHint_Enum ("QPainter_RenderHint", +static gsi::Enum decl_QPainter_RenderHint_Enum ("QtGui", "QPainter_RenderHint", gsi::enum_const ("Antialiasing", QPainter::Antialiasing, "@brief Enum constant QPainter::Antialiasing") + gsi::enum_const ("TextAntialiasing", QPainter::TextAntialiasing, "@brief Enum constant QPainter::TextAntialiasing") + gsi::enum_const ("SmoothPixmapTransform", QPainter::SmoothPixmapTransform, "@brief Enum constant QPainter::SmoothPixmapTransform") + @@ -4594,13 +4594,13 @@ static gsi::Enum decl_QPainter_RenderHint_Enum ("QPainter_ gsi::enum_const ("NonCosmeticDefaultPen", QPainter::NonCosmeticDefaultPen, "@brief Enum constant QPainter::NonCosmeticDefaultPen"), "@qt\n@brief This class represents the QPainter::RenderHint enum"); -static gsi::QFlagsClass decl_QPainter_RenderHint_Enums ("QPainter_QFlags_RenderHint", +static gsi::QFlagsClass decl_QPainter_RenderHint_Enums ("QtGui", "QPainter_QFlags_RenderHint", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QPainter_RenderHint_Enum_in_parent (decl_QPainter_RenderHint_Enum.defs ()); -static gsi::ClassExt decl_QPainter_RenderHint_Enum_as_child (decl_QPainter_RenderHint_Enum, "RenderHint"); -static gsi::ClassExt decl_QPainter_RenderHint_Enums_as_child (decl_QPainter_RenderHint_Enums, "QFlags_RenderHint"); +static gsi::ClassExt decl_QPainter_RenderHint_Enum_as_child (decl_QPainter_RenderHint_Enum, "QtGui", "RenderHint"); +static gsi::ClassExt decl_QPainter_RenderHint_Enums_as_child (decl_QPainter_RenderHint_Enums, "QtGui", "QFlags_RenderHint"); } diff --git a/src/gsiqt4/gsiDeclQPainterPath.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPainterPath.cc similarity index 99% rename from src/gsiqt4/gsiDeclQPainterPath.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPainterPath.cc index 849d43abb..2c6812e9e 100644 --- a/src/gsiqt4/gsiDeclQPainterPath.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPainterPath.cc @@ -36,8 +36,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1823,12 +1823,12 @@ static gsi::Methods methods_QPainterPath () { return methods; } -gsi::Class decl_QPainterPath ("QPainterPath", +gsi::Class decl_QPainterPath ("QtGui", "QPainterPath", methods_QPainterPath (), "@qt\n@brief Binding of QPainterPath"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPainterPath () { return decl_QPainterPath; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPainterPath () { return decl_QPainterPath; } } diff --git a/src/gsiqt4/gsiDeclQPainterPathStroker.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPainterPathStroker.cc similarity index 98% rename from src/gsiqt4/gsiDeclQPainterPathStroker.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPainterPathStroker.cc index 92454ebaf..7efde0bc8 100644 --- a/src/gsiqt4/gsiDeclQPainterPathStroker.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPainterPathStroker.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -362,12 +362,12 @@ static gsi::Methods methods_QPainterPathStroker () { return methods; } -gsi::Class decl_QPainterPathStroker ("QPainterPathStroker", +gsi::Class decl_QPainterPathStroker ("QtGui", "QPainterPathStroker", methods_QPainterPathStroker (), "@qt\n@brief Binding of QPainterPathStroker"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPainterPathStroker () { return decl_QPainterPathStroker; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPainterPathStroker () { return decl_QPainterPathStroker; } } diff --git a/src/gsiqt4/gsiDeclQPainterPath_Element.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPainterPath_Element.cc similarity index 94% rename from src/gsiqt4/gsiDeclQPainterPath_Element.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPainterPath_Element.cc index 0286dc1a6..b7cbd6faf 100644 --- a/src/gsiqt4/gsiDeclQPainterPath_Element.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPainterPath_Element.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -149,13 +149,13 @@ static gsi::Methods methods_QPainterPath_Element () { return methods; } -gsi::Class decl_QPainterPath_Element ("QPainterPath_Element", +gsi::Class decl_QPainterPath_Element ("QtGui", "QPainterPath_Element", methods_QPainterPath_Element (), "@qt\n@brief Binding of QPainterPath::Element"); -gsi::ClassExt decl_QPainterPath_Element_as_child (decl_QPainterPath_Element, "Element"); +gsi::ClassExt decl_QPainterPath_Element_as_child (decl_QPainterPath_Element, "QtGui", "Element"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPainterPath_Element () { return decl_QPainterPath_Element; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPainterPath_Element () { return decl_QPainterPath_Element; } } diff --git a/src/gsiqt4/gsiDeclQPalette.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPalette.cc similarity index 98% rename from src/gsiqt4/gsiDeclQPalette.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPalette.cc index b3811138b..790f67695 100644 --- a/src/gsiqt4/gsiDeclQPalette.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPalette.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1015,12 +1015,12 @@ static gsi::Methods methods_QPalette () { return methods; } -gsi::Class decl_QPalette ("QPalette", +gsi::Class decl_QPalette ("QtGui", "QPalette", methods_QPalette (), "@qt\n@brief Binding of QPalette"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPalette () { return decl_QPalette; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPalette () { return decl_QPalette; } } @@ -1029,7 +1029,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QPalette () { return decl_QPalette; } namespace qt_gsi { -static gsi::Enum decl_QPalette_ColorGroup_Enum ("QPalette_ColorGroup", +static gsi::Enum decl_QPalette_ColorGroup_Enum ("QtGui", "QPalette_ColorGroup", gsi::enum_const ("Active", QPalette::Active, "@brief Enum constant QPalette::Active") + gsi::enum_const ("Disabled", QPalette::Disabled, "@brief Enum constant QPalette::Disabled") + gsi::enum_const ("Inactive", QPalette::Inactive, "@brief Enum constant QPalette::Inactive") + @@ -1039,13 +1039,13 @@ static gsi::Enum decl_QPalette_ColorGroup_Enum ("QPalette_ gsi::enum_const ("Normal", QPalette::Normal, "@brief Enum constant QPalette::Normal"), "@qt\n@brief This class represents the QPalette::ColorGroup enum"); -static gsi::QFlagsClass decl_QPalette_ColorGroup_Enums ("QPalette_QFlags_ColorGroup", +static gsi::QFlagsClass decl_QPalette_ColorGroup_Enums ("QtGui", "QPalette_QFlags_ColorGroup", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QPalette_ColorGroup_Enum_in_parent (decl_QPalette_ColorGroup_Enum.defs ()); -static gsi::ClassExt decl_QPalette_ColorGroup_Enum_as_child (decl_QPalette_ColorGroup_Enum, "ColorGroup"); -static gsi::ClassExt decl_QPalette_ColorGroup_Enums_as_child (decl_QPalette_ColorGroup_Enums, "QFlags_ColorGroup"); +static gsi::ClassExt decl_QPalette_ColorGroup_Enum_as_child (decl_QPalette_ColorGroup_Enum, "QtGui", "ColorGroup"); +static gsi::ClassExt decl_QPalette_ColorGroup_Enums_as_child (decl_QPalette_ColorGroup_Enums, "QtGui", "QFlags_ColorGroup"); } @@ -1054,7 +1054,7 @@ static gsi::ClassExt decl_QPalette_ColorGroup_Enums_as_child (decl_QPa namespace qt_gsi { -static gsi::Enum decl_QPalette_ColorRole_Enum ("QPalette_ColorRole", +static gsi::Enum decl_QPalette_ColorRole_Enum ("QtGui", "QPalette_ColorRole", gsi::enum_const ("WindowText", QPalette::WindowText, "@brief Enum constant QPalette::WindowText") + gsi::enum_const ("Button", QPalette::Button, "@brief Enum constant QPalette::Button") + gsi::enum_const ("Light", QPalette::Light, "@brief Enum constant QPalette::Light") + @@ -1080,13 +1080,13 @@ static gsi::Enum decl_QPalette_ColorRole_Enum ("QPalette_Co gsi::enum_const ("Background", QPalette::Background, "@brief Enum constant QPalette::Background"), "@qt\n@brief This class represents the QPalette::ColorRole enum"); -static gsi::QFlagsClass decl_QPalette_ColorRole_Enums ("QPalette_QFlags_ColorRole", +static gsi::QFlagsClass decl_QPalette_ColorRole_Enums ("QtGui", "QPalette_QFlags_ColorRole", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QPalette_ColorRole_Enum_in_parent (decl_QPalette_ColorRole_Enum.defs ()); -static gsi::ClassExt decl_QPalette_ColorRole_Enum_as_child (decl_QPalette_ColorRole_Enum, "ColorRole"); -static gsi::ClassExt decl_QPalette_ColorRole_Enums_as_child (decl_QPalette_ColorRole_Enums, "QFlags_ColorRole"); +static gsi::ClassExt decl_QPalette_ColorRole_Enum_as_child (decl_QPalette_ColorRole_Enum, "QtGui", "ColorRole"); +static gsi::ClassExt decl_QPalette_ColorRole_Enums_as_child (decl_QPalette_ColorRole_Enums, "QtGui", "QFlags_ColorRole"); } diff --git a/src/gsiqt4/gsiDeclQPanGesture.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPanGesture.cc similarity index 99% rename from src/gsiqt4/gsiDeclQPanGesture.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPanGesture.cc index 7ac47f1a4..4883a2104 100644 --- a/src/gsiqt4/gsiDeclQPanGesture.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPanGesture.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -292,11 +292,11 @@ static gsi::Methods methods_QPanGesture () { gsi::Class &qtdecl_QGesture (); -qt_gsi::QtNativeClass decl_QPanGesture (qtdecl_QGesture (), "QPanGesture_Native", +qt_gsi::QtNativeClass decl_QPanGesture (qtdecl_QGesture (), "QtGui", "QPanGesture_Native", methods_QPanGesture (), "@hide\n@alias QPanGesture"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPanGesture () { return decl_QPanGesture; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPanGesture () { return decl_QPanGesture; } } @@ -674,7 +674,7 @@ static gsi::Methods methods_QPanGesture_Adaptor () { return methods; } -gsi::Class decl_QPanGesture_Adaptor (qtdecl_QPanGesture (), "QPanGesture", +gsi::Class decl_QPanGesture_Adaptor (qtdecl_QPanGesture (), "QtGui", "QPanGesture", methods_QPanGesture_Adaptor (), "@qt\n@brief Binding of QPanGesture"); diff --git a/src/gsiqt4/gsiDeclQPen.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPen.cc similarity index 99% rename from src/gsiqt4/gsiDeclQPen.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPen.cc index 94f83a7ce..4da3299ef 100644 --- a/src/gsiqt4/gsiDeclQPen.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPen.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -654,12 +654,12 @@ static gsi::Methods methods_QPen () { return methods; } -gsi::Class decl_QPen ("QPen", +gsi::Class decl_QPen ("QtGui", "QPen", methods_QPen (), "@qt\n@brief Binding of QPen"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPen () { return decl_QPen; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPen () { return decl_QPen; } } diff --git a/src/gsiqt4/gsiDeclQPicture.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPicture.cc similarity index 98% rename from src/gsiqt4/gsiDeclQPicture.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPicture.cc index 2cef400a5..c0253d1c8 100644 --- a/src/gsiqt4/gsiDeclQPicture.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPicture.cc @@ -33,8 +33,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -424,11 +424,11 @@ static gsi::Methods methods_QPicture () { gsi::Class &qtdecl_QPaintDevice (); -gsi::Class decl_QPicture (qtdecl_QPaintDevice (), "QPicture_Native", +gsi::Class decl_QPicture (qtdecl_QPaintDevice (), "QtGui", "QPicture_Native", methods_QPicture (), "@hide\n@alias QPicture"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPicture () { return decl_QPicture; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPicture () { return decl_QPicture; } } @@ -632,7 +632,7 @@ static gsi::Methods methods_QPicture_Adaptor () { return methods; } -gsi::Class decl_QPicture_Adaptor (qtdecl_QPicture (), "QPicture", +gsi::Class decl_QPicture_Adaptor (qtdecl_QPicture (), "QtGui", "QPicture", methods_QPicture_Adaptor (), "@qt\n@brief Binding of QPicture"); diff --git a/src/gsiqt4/gsiDeclQPinchGesture.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPinchGesture.cc similarity index 98% rename from src/gsiqt4/gsiDeclQPinchGesture.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPinchGesture.cc index c40df8f38..0b1aebd0f 100644 --- a/src/gsiqt4/gsiDeclQPinchGesture.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPinchGesture.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -572,11 +572,11 @@ static gsi::Methods methods_QPinchGesture () { gsi::Class &qtdecl_QGesture (); -qt_gsi::QtNativeClass decl_QPinchGesture (qtdecl_QGesture (), "QPinchGesture_Native", +qt_gsi::QtNativeClass decl_QPinchGesture (qtdecl_QGesture (), "QtGui", "QPinchGesture_Native", methods_QPinchGesture (), "@hide\n@alias QPinchGesture"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPinchGesture () { return decl_QPinchGesture; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPinchGesture () { return decl_QPinchGesture; } } @@ -954,7 +954,7 @@ static gsi::Methods methods_QPinchGesture_Adaptor () { return methods; } -gsi::Class decl_QPinchGesture_Adaptor (qtdecl_QPinchGesture (), "QPinchGesture", +gsi::Class decl_QPinchGesture_Adaptor (qtdecl_QPinchGesture (), "QtGui", "QPinchGesture", methods_QPinchGesture_Adaptor (), "@qt\n@brief Binding of QPinchGesture"); @@ -965,19 +965,19 @@ gsi::Class decl_QPinchGesture_Adaptor (qtdecl_QPinchGestu namespace qt_gsi { -static gsi::Enum decl_QPinchGesture_ChangeFlag_Enum ("QPinchGesture_ChangeFlag", +static gsi::Enum decl_QPinchGesture_ChangeFlag_Enum ("QtGui", "QPinchGesture_ChangeFlag", gsi::enum_const ("ScaleFactorChanged", QPinchGesture::ScaleFactorChanged, "@brief Enum constant QPinchGesture::ScaleFactorChanged") + gsi::enum_const ("RotationAngleChanged", QPinchGesture::RotationAngleChanged, "@brief Enum constant QPinchGesture::RotationAngleChanged") + gsi::enum_const ("CenterPointChanged", QPinchGesture::CenterPointChanged, "@brief Enum constant QPinchGesture::CenterPointChanged"), "@qt\n@brief This class represents the QPinchGesture::ChangeFlag enum"); -static gsi::QFlagsClass decl_QPinchGesture_ChangeFlag_Enums ("QPinchGesture_QFlags_ChangeFlag", +static gsi::QFlagsClass decl_QPinchGesture_ChangeFlag_Enums ("QtGui", "QPinchGesture_QFlags_ChangeFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QPinchGesture_ChangeFlag_Enum_in_parent (decl_QPinchGesture_ChangeFlag_Enum.defs ()); -static gsi::ClassExt decl_QPinchGesture_ChangeFlag_Enum_as_child (decl_QPinchGesture_ChangeFlag_Enum, "ChangeFlag"); -static gsi::ClassExt decl_QPinchGesture_ChangeFlag_Enums_as_child (decl_QPinchGesture_ChangeFlag_Enums, "QFlags_ChangeFlag"); +static gsi::ClassExt decl_QPinchGesture_ChangeFlag_Enum_as_child (decl_QPinchGesture_ChangeFlag_Enum, "QtGui", "ChangeFlag"); +static gsi::ClassExt decl_QPinchGesture_ChangeFlag_Enums_as_child (decl_QPinchGesture_ChangeFlag_Enums, "QtGui", "QFlags_ChangeFlag"); } diff --git a/src/gsiqt4/gsiDeclQPixmap.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPixmap.cc similarity index 99% rename from src/gsiqt4/gsiDeclQPixmap.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPixmap.cc index e4933da1b..9b0d47f86 100644 --- a/src/gsiqt4/gsiDeclQPixmap.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPixmap.cc @@ -41,8 +41,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1120,11 +1120,11 @@ static gsi::Methods methods_QPixmap () { gsi::Class &qtdecl_QPaintDevice (); -gsi::Class decl_QPixmap (qtdecl_QPaintDevice (), "QPixmap_Native", +gsi::Class decl_QPixmap (qtdecl_QPaintDevice (), "QtGui", "QPixmap_Native", methods_QPixmap (), "@hide\n@alias QPixmap"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPixmap () { return decl_QPixmap; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPixmap () { return decl_QPixmap; } } @@ -1369,7 +1369,7 @@ static gsi::Methods methods_QPixmap_Adaptor () { return methods; } -gsi::Class decl_QPixmap_Adaptor (qtdecl_QPixmap (), "QPixmap", +gsi::Class decl_QPixmap_Adaptor (qtdecl_QPixmap (), "QtGui", "QPixmap", methods_QPixmap_Adaptor (), "@qt\n@brief Binding of QPixmap"); diff --git a/src/gsiqt4/gsiDeclQPixmapCache.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPixmapCache.cc similarity index 97% rename from src/gsiqt4/gsiDeclQPixmapCache.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPixmapCache.cc index e0c3be72a..85d677fad 100644 --- a/src/gsiqt4/gsiDeclQPixmapCache.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPixmapCache.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -226,12 +226,12 @@ static gsi::Methods methods_QPixmapCache () { return methods; } -gsi::Class decl_QPixmapCache ("QPixmapCache", +gsi::Class decl_QPixmapCache ("QtGui", "QPixmapCache", methods_QPixmapCache (), "@qt\n@brief Binding of QPixmapCache"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPixmapCache () { return decl_QPixmapCache; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPixmapCache () { return decl_QPixmapCache; } } diff --git a/src/gsiqt4/gsiDeclQPlainTextDocumentLayout.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPlainTextDocumentLayout.cc similarity index 99% rename from src/gsiqt4/gsiDeclQPlainTextDocumentLayout.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPlainTextDocumentLayout.cc index 02e97a94d..3055d971c 100644 --- a/src/gsiqt4/gsiDeclQPlainTextDocumentLayout.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPlainTextDocumentLayout.cc @@ -46,8 +46,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -374,11 +374,11 @@ static gsi::Methods methods_QPlainTextDocumentLayout () { gsi::Class &qtdecl_QAbstractTextDocumentLayout (); -qt_gsi::QtNativeClass decl_QPlainTextDocumentLayout (qtdecl_QAbstractTextDocumentLayout (), "QPlainTextDocumentLayout_Native", +qt_gsi::QtNativeClass decl_QPlainTextDocumentLayout (qtdecl_QAbstractTextDocumentLayout (), "QtGui", "QPlainTextDocumentLayout_Native", methods_QPlainTextDocumentLayout (), "@hide\n@alias QPlainTextDocumentLayout"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPlainTextDocumentLayout () { return decl_QPlainTextDocumentLayout; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPlainTextDocumentLayout () { return decl_QPlainTextDocumentLayout; } } @@ -1341,7 +1341,7 @@ static gsi::Methods methods_QPlainTextDocumentLayout_Adaptor () { return methods; } -gsi::Class decl_QPlainTextDocumentLayout_Adaptor (qtdecl_QPlainTextDocumentLayout (), "QPlainTextDocumentLayout", +gsi::Class decl_QPlainTextDocumentLayout_Adaptor (qtdecl_QPlainTextDocumentLayout (), "QtGui", "QPlainTextDocumentLayout", methods_QPlainTextDocumentLayout_Adaptor (), "@qt\n@brief Binding of QPlainTextDocumentLayout"); diff --git a/src/gsiqt4/gsiDeclQPlainTextEdit.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPlainTextEdit.cc similarity index 99% rename from src/gsiqt4/gsiDeclQPlainTextEdit.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPlainTextEdit.cc index c84904f85..8d50725e5 100644 --- a/src/gsiqt4/gsiDeclQPlainTextEdit.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPlainTextEdit.cc @@ -88,8 +88,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1326,11 +1326,11 @@ static gsi::Methods methods_QPlainTextEdit () { gsi::Class &qtdecl_QAbstractScrollArea (); -qt_gsi::QtNativeClass decl_QPlainTextEdit (qtdecl_QAbstractScrollArea (), "QPlainTextEdit_Native", +qt_gsi::QtNativeClass decl_QPlainTextEdit (qtdecl_QAbstractScrollArea (), "QtGui", "QPlainTextEdit_Native", methods_QPlainTextEdit (), "@hide\n@alias QPlainTextEdit"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPlainTextEdit () { return decl_QPlainTextEdit; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPlainTextEdit () { return decl_QPlainTextEdit; } } @@ -4248,7 +4248,7 @@ static gsi::Methods methods_QPlainTextEdit_Adaptor () { return methods; } -gsi::Class decl_QPlainTextEdit_Adaptor (qtdecl_QPlainTextEdit (), "QPlainTextEdit", +gsi::Class decl_QPlainTextEdit_Adaptor (qtdecl_QPlainTextEdit (), "QtGui", "QPlainTextEdit", methods_QPlainTextEdit_Adaptor (), "@qt\n@brief Binding of QPlainTextEdit"); @@ -4259,18 +4259,18 @@ gsi::Class decl_QPlainTextEdit_Adaptor (qtdecl_QPlainTex namespace qt_gsi { -static gsi::Enum decl_QPlainTextEdit_LineWrapMode_Enum ("QPlainTextEdit_LineWrapMode", +static gsi::Enum decl_QPlainTextEdit_LineWrapMode_Enum ("QtGui", "QPlainTextEdit_LineWrapMode", gsi::enum_const ("NoWrap", QPlainTextEdit::NoWrap, "@brief Enum constant QPlainTextEdit::NoWrap") + gsi::enum_const ("WidgetWidth", QPlainTextEdit::WidgetWidth, "@brief Enum constant QPlainTextEdit::WidgetWidth"), "@qt\n@brief This class represents the QPlainTextEdit::LineWrapMode enum"); -static gsi::QFlagsClass decl_QPlainTextEdit_LineWrapMode_Enums ("QPlainTextEdit_QFlags_LineWrapMode", +static gsi::QFlagsClass decl_QPlainTextEdit_LineWrapMode_Enums ("QtGui", "QPlainTextEdit_QFlags_LineWrapMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QPlainTextEdit_LineWrapMode_Enum_in_parent (decl_QPlainTextEdit_LineWrapMode_Enum.defs ()); -static gsi::ClassExt decl_QPlainTextEdit_LineWrapMode_Enum_as_child (decl_QPlainTextEdit_LineWrapMode_Enum, "LineWrapMode"); -static gsi::ClassExt decl_QPlainTextEdit_LineWrapMode_Enums_as_child (decl_QPlainTextEdit_LineWrapMode_Enums, "QFlags_LineWrapMode"); +static gsi::ClassExt decl_QPlainTextEdit_LineWrapMode_Enum_as_child (decl_QPlainTextEdit_LineWrapMode_Enum, "QtGui", "LineWrapMode"); +static gsi::ClassExt decl_QPlainTextEdit_LineWrapMode_Enums_as_child (decl_QPlainTextEdit_LineWrapMode_Enums, "QtGui", "QFlags_LineWrapMode"); } diff --git a/src/gsiqt4/gsiDeclQPlastiqueStyle.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPlastiqueStyle.cc similarity index 99% rename from src/gsiqt4/gsiDeclQPlastiqueStyle.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPlastiqueStyle.cc index 5945ea20b..a0b83943b 100644 --- a/src/gsiqt4/gsiDeclQPlastiqueStyle.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPlastiqueStyle.cc @@ -48,8 +48,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -583,11 +583,11 @@ static gsi::Methods methods_QPlastiqueStyle () { gsi::Class &qtdecl_QWindowsStyle (); -qt_gsi::QtNativeClass decl_QPlastiqueStyle (qtdecl_QWindowsStyle (), "QPlastiqueStyle_Native", +qt_gsi::QtNativeClass decl_QPlastiqueStyle (qtdecl_QWindowsStyle (), "QtGui", "QPlastiqueStyle_Native", methods_QPlastiqueStyle (), "@hide\n@alias QPlastiqueStyle"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPlastiqueStyle () { return decl_QPlastiqueStyle; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPlastiqueStyle () { return decl_QPlastiqueStyle; } } @@ -2020,7 +2020,7 @@ static gsi::Methods methods_QPlastiqueStyle_Adaptor () { return methods; } -gsi::Class decl_QPlastiqueStyle_Adaptor (qtdecl_QPlastiqueStyle (), "QPlastiqueStyle", +gsi::Class decl_QPlastiqueStyle_Adaptor (qtdecl_QPlastiqueStyle (), "QtGui", "QPlastiqueStyle", methods_QPlastiqueStyle_Adaptor (), "@qt\n@brief Binding of QPlastiqueStyle"); diff --git a/src/gsiqt4/gsiDeclQPolygon.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPolygon.cc similarity index 99% rename from src/gsiqt4/gsiDeclQPolygon.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPolygon.cc index 343ea1c3c..a9424cfd1 100644 --- a/src/gsiqt4/gsiDeclQPolygon.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPolygon.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -637,7 +637,7 @@ static gsi::Methods methods_QPolygon () { return methods; } -gsi::Class decl_QPolygon ("QPolygon", +gsi::Class decl_QPolygon ("QtGui", "QPolygon", gsi::constructor("new", &ctor_QPolygon_from_polygon, "@brief Creates a polygon from the given KLayout Polygon\n@args p\nRemark: holes are not transferred into the QPolygon.") + gsi::constructor("new", &ctor_QPolygon_from_simple_polygon, "@brief Creates a polygon from the given KLayout SimplePolygon\n@args p") + gsi::iterator_ext ("each", &f_QPolygon_each_begin, &f_QPolygon_each_end, "@brief Iterates over all points of the polygon.") + @@ -661,7 +661,7 @@ gsi::Class decl_QPolygon ("QPolygon", "@qt\n@brief Binding of QPolygon"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPolygon () { return decl_QPolygon; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPolygon () { return decl_QPolygon; } } diff --git a/src/gsiqt4/gsiDeclQPolygonF.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPolygonF.cc similarity index 98% rename from src/gsiqt4/gsiDeclQPolygonF.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPolygonF.cc index cd05360e1..49b85db66 100644 --- a/src/gsiqt4/gsiDeclQPolygonF.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPolygonF.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -502,7 +502,7 @@ static gsi::Methods methods_QPolygonF () { return methods; } -gsi::Class decl_QPolygonF ("QPolygonF", +gsi::Class decl_QPolygonF ("QtGui", "QPolygonF", gsi::constructor("new", &ctor_QPolygonF_from_polygon, "@brief Creates a polygon from the given KLayout DPolygon\n@args p\nRemark: holes are not transferred into the QPolygonF.") + gsi::constructor("new", &ctor_QPolygonF_from_simple_polygon, "@brief Creates a polygon from the given KLayout DSimplePolygon\n@args p") + gsi::iterator_ext ("each", &f_QPolygonF_each_begin, &f_QPolygonF_each_end, "@brief Iterates over all points of the polygon.") + @@ -526,7 +526,7 @@ gsi::Class decl_QPolygonF ("QPolygonF", "@qt\n@brief Binding of QPolygonF"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPolygonF () { return decl_QPolygonF; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPolygonF () { return decl_QPolygonF; } } diff --git a/src/gsiqt4/gsiDeclQPrintDialog.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPrintDialog.cc similarity index 99% rename from src/gsiqt4/gsiDeclQPrintDialog.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPrintDialog.cc index 0c2774ec0..272c95310 100644 --- a/src/gsiqt4/gsiDeclQPrintDialog.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPrintDialog.cc @@ -78,8 +78,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -410,11 +410,11 @@ static gsi::Methods methods_QPrintDialog () { gsi::Class &qtdecl_QAbstractPrintDialog (); -qt_gsi::QtNativeClass decl_QPrintDialog (qtdecl_QAbstractPrintDialog (), "QPrintDialog_Native", +qt_gsi::QtNativeClass decl_QPrintDialog (qtdecl_QAbstractPrintDialog (), "QtGui", "QPrintDialog_Native", methods_QPrintDialog (), "@hide\n@alias QPrintDialog"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPrintDialog () { return decl_QPrintDialog; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPrintDialog () { return decl_QPrintDialog; } } @@ -2921,7 +2921,7 @@ static gsi::Methods methods_QPrintDialog_Adaptor () { return methods; } -gsi::Class decl_QPrintDialog_Adaptor (qtdecl_QPrintDialog (), "QPrintDialog", +gsi::Class decl_QPrintDialog_Adaptor (qtdecl_QPrintDialog (), "QtGui", "QPrintDialog", methods_QPrintDialog_Adaptor (), "@qt\n@brief Binding of QPrintDialog"); diff --git a/src/gsiqt4/gsiDeclQPrintEngine.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPrintEngine.cc similarity index 97% rename from src/gsiqt4/gsiDeclQPrintEngine.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPrintEngine.cc index 8f500701f..79e4d7460 100644 --- a/src/gsiqt4/gsiDeclQPrintEngine.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPrintEngine.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -156,11 +156,11 @@ static gsi::Methods methods_QPrintEngine () { return methods; } -gsi::Class decl_QPrintEngine ("QPrintEngine_Native", +gsi::Class decl_QPrintEngine ("QtGui", "QPrintEngine_Native", methods_QPrintEngine (), "@hide\n@alias QPrintEngine"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPrintEngine () { return decl_QPrintEngine; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPrintEngine () { return decl_QPrintEngine; } } @@ -448,7 +448,7 @@ static gsi::Methods methods_QPrintEngine_Adaptor () { return methods; } -gsi::Class decl_QPrintEngine_Adaptor (qtdecl_QPrintEngine (), "QPrintEngine", +gsi::Class decl_QPrintEngine_Adaptor (qtdecl_QPrintEngine (), "QtGui", "QPrintEngine", methods_QPrintEngine_Adaptor (), "@qt\n@brief Binding of QPrintEngine"); @@ -459,7 +459,7 @@ gsi::Class decl_QPrintEngine_Adaptor (qtdecl_QPrintEngine namespace qt_gsi { -static gsi::Enum decl_QPrintEngine_PrintEnginePropertyKey_Enum ("QPrintEngine_PrintEnginePropertyKey", +static gsi::Enum decl_QPrintEngine_PrintEnginePropertyKey_Enum ("QtGui", "QPrintEngine_PrintEnginePropertyKey", gsi::enum_const ("PPK_CollateCopies", QPrintEngine::PPK_CollateCopies, "@brief Enum constant QPrintEngine::PPK_CollateCopies") + gsi::enum_const ("PPK_ColorMode", QPrintEngine::PPK_ColorMode, "@brief Enum constant QPrintEngine::PPK_ColorMode") + gsi::enum_const ("PPK_Creator", QPrintEngine::PPK_Creator, "@brief Enum constant QPrintEngine::PPK_Creator") + @@ -489,13 +489,13 @@ static gsi::Enum decl_QPrintEngine_PrintEn gsi::enum_const ("PPK_CustomBase", QPrintEngine::PPK_CustomBase, "@brief Enum constant QPrintEngine::PPK_CustomBase"), "@qt\n@brief This class represents the QPrintEngine::PrintEnginePropertyKey enum"); -static gsi::QFlagsClass decl_QPrintEngine_PrintEnginePropertyKey_Enums ("QPrintEngine_QFlags_PrintEnginePropertyKey", +static gsi::QFlagsClass decl_QPrintEngine_PrintEnginePropertyKey_Enums ("QtGui", "QPrintEngine_QFlags_PrintEnginePropertyKey", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QPrintEngine_PrintEnginePropertyKey_Enum_in_parent (decl_QPrintEngine_PrintEnginePropertyKey_Enum.defs ()); -static gsi::ClassExt decl_QPrintEngine_PrintEnginePropertyKey_Enum_as_child (decl_QPrintEngine_PrintEnginePropertyKey_Enum, "PrintEnginePropertyKey"); -static gsi::ClassExt decl_QPrintEngine_PrintEnginePropertyKey_Enums_as_child (decl_QPrintEngine_PrintEnginePropertyKey_Enums, "QFlags_PrintEnginePropertyKey"); +static gsi::ClassExt decl_QPrintEngine_PrintEnginePropertyKey_Enum_as_child (decl_QPrintEngine_PrintEnginePropertyKey_Enum, "QtGui", "PrintEnginePropertyKey"); +static gsi::ClassExt decl_QPrintEngine_PrintEnginePropertyKey_Enums_as_child (decl_QPrintEngine_PrintEnginePropertyKey_Enums, "QtGui", "QFlags_PrintEnginePropertyKey"); } diff --git a/src/gsiqt4/gsiDeclQPrintPreviewDialog.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPrintPreviewDialog.cc similarity index 99% rename from src/gsiqt4/gsiDeclQPrintPreviewDialog.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPrintPreviewDialog.cc index ab9e17b70..3ecd464c2 100644 --- a/src/gsiqt4/gsiDeclQPrintPreviewDialog.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPrintPreviewDialog.cc @@ -78,8 +78,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -312,11 +312,11 @@ static gsi::Methods methods_QPrintPreviewDialog () { gsi::Class &qtdecl_QDialog (); -qt_gsi::QtNativeClass decl_QPrintPreviewDialog (qtdecl_QDialog (), "QPrintPreviewDialog_Native", +qt_gsi::QtNativeClass decl_QPrintPreviewDialog (qtdecl_QDialog (), "QtGui", "QPrintPreviewDialog_Native", methods_QPrintPreviewDialog (), "@hide\n@alias QPrintPreviewDialog"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPrintPreviewDialog () { return decl_QPrintPreviewDialog; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPrintPreviewDialog () { return decl_QPrintPreviewDialog; } } @@ -2804,7 +2804,7 @@ static gsi::Methods methods_QPrintPreviewDialog_Adaptor () { return methods; } -gsi::Class decl_QPrintPreviewDialog_Adaptor (qtdecl_QPrintPreviewDialog (), "QPrintPreviewDialog", +gsi::Class decl_QPrintPreviewDialog_Adaptor (qtdecl_QPrintPreviewDialog (), "QtGui", "QPrintPreviewDialog", methods_QPrintPreviewDialog_Adaptor (), "@qt\n@brief Binding of QPrintPreviewDialog"); diff --git a/src/gsiqt4/gsiDeclQPrintPreviewWidget.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPrintPreviewWidget.cc similarity index 99% rename from src/gsiqt4/gsiDeclQPrintPreviewWidget.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPrintPreviewWidget.cc index bc4342446..c21f74a0c 100644 --- a/src/gsiqt4/gsiDeclQPrintPreviewWidget.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPrintPreviewWidget.cc @@ -78,8 +78,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -644,11 +644,11 @@ static gsi::Methods methods_QPrintPreviewWidget () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QPrintPreviewWidget (qtdecl_QWidget (), "QPrintPreviewWidget_Native", +qt_gsi::QtNativeClass decl_QPrintPreviewWidget (qtdecl_QWidget (), "QtGui", "QPrintPreviewWidget_Native", methods_QPrintPreviewWidget (), "@hide\n@alias QPrintPreviewWidget"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPrintPreviewWidget () { return decl_QPrintPreviewWidget; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPrintPreviewWidget () { return decl_QPrintPreviewWidget; } } @@ -2947,7 +2947,7 @@ static gsi::Methods methods_QPrintPreviewWidget_Adaptor () { return methods; } -gsi::Class decl_QPrintPreviewWidget_Adaptor (qtdecl_QPrintPreviewWidget (), "QPrintPreviewWidget", +gsi::Class decl_QPrintPreviewWidget_Adaptor (qtdecl_QPrintPreviewWidget (), "QtGui", "QPrintPreviewWidget", methods_QPrintPreviewWidget_Adaptor (), "@qt\n@brief Binding of QPrintPreviewWidget"); @@ -2958,19 +2958,19 @@ gsi::Class decl_QPrintPreviewWidget_Adaptor (qtdecl namespace qt_gsi { -static gsi::Enum decl_QPrintPreviewWidget_ViewMode_Enum ("QPrintPreviewWidget_ViewMode", +static gsi::Enum decl_QPrintPreviewWidget_ViewMode_Enum ("QtGui", "QPrintPreviewWidget_ViewMode", gsi::enum_const ("SinglePageView", QPrintPreviewWidget::SinglePageView, "@brief Enum constant QPrintPreviewWidget::SinglePageView") + gsi::enum_const ("FacingPagesView", QPrintPreviewWidget::FacingPagesView, "@brief Enum constant QPrintPreviewWidget::FacingPagesView") + gsi::enum_const ("AllPagesView", QPrintPreviewWidget::AllPagesView, "@brief Enum constant QPrintPreviewWidget::AllPagesView"), "@qt\n@brief This class represents the QPrintPreviewWidget::ViewMode enum"); -static gsi::QFlagsClass decl_QPrintPreviewWidget_ViewMode_Enums ("QPrintPreviewWidget_QFlags_ViewMode", +static gsi::QFlagsClass decl_QPrintPreviewWidget_ViewMode_Enums ("QtGui", "QPrintPreviewWidget_QFlags_ViewMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QPrintPreviewWidget_ViewMode_Enum_in_parent (decl_QPrintPreviewWidget_ViewMode_Enum.defs ()); -static gsi::ClassExt decl_QPrintPreviewWidget_ViewMode_Enum_as_child (decl_QPrintPreviewWidget_ViewMode_Enum, "ViewMode"); -static gsi::ClassExt decl_QPrintPreviewWidget_ViewMode_Enums_as_child (decl_QPrintPreviewWidget_ViewMode_Enums, "QFlags_ViewMode"); +static gsi::ClassExt decl_QPrintPreviewWidget_ViewMode_Enum_as_child (decl_QPrintPreviewWidget_ViewMode_Enum, "QtGui", "ViewMode"); +static gsi::ClassExt decl_QPrintPreviewWidget_ViewMode_Enums_as_child (decl_QPrintPreviewWidget_ViewMode_Enums, "QtGui", "QFlags_ViewMode"); } @@ -2979,19 +2979,19 @@ static gsi::ClassExt decl_QPrintPreviewWidget_ViewMode_Enum namespace qt_gsi { -static gsi::Enum decl_QPrintPreviewWidget_ZoomMode_Enum ("QPrintPreviewWidget_ZoomMode", +static gsi::Enum decl_QPrintPreviewWidget_ZoomMode_Enum ("QtGui", "QPrintPreviewWidget_ZoomMode", gsi::enum_const ("CustomZoom", QPrintPreviewWidget::CustomZoom, "@brief Enum constant QPrintPreviewWidget::CustomZoom") + gsi::enum_const ("FitToWidth", QPrintPreviewWidget::FitToWidth, "@brief Enum constant QPrintPreviewWidget::FitToWidth") + gsi::enum_const ("FitInView", QPrintPreviewWidget::FitInView, "@brief Enum constant QPrintPreviewWidget::FitInView"), "@qt\n@brief This class represents the QPrintPreviewWidget::ZoomMode enum"); -static gsi::QFlagsClass decl_QPrintPreviewWidget_ZoomMode_Enums ("QPrintPreviewWidget_QFlags_ZoomMode", +static gsi::QFlagsClass decl_QPrintPreviewWidget_ZoomMode_Enums ("QtGui", "QPrintPreviewWidget_QFlags_ZoomMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QPrintPreviewWidget_ZoomMode_Enum_in_parent (decl_QPrintPreviewWidget_ZoomMode_Enum.defs ()); -static gsi::ClassExt decl_QPrintPreviewWidget_ZoomMode_Enum_as_child (decl_QPrintPreviewWidget_ZoomMode_Enum, "ZoomMode"); -static gsi::ClassExt decl_QPrintPreviewWidget_ZoomMode_Enums_as_child (decl_QPrintPreviewWidget_ZoomMode_Enums, "QFlags_ZoomMode"); +static gsi::ClassExt decl_QPrintPreviewWidget_ZoomMode_Enum_as_child (decl_QPrintPreviewWidget_ZoomMode_Enum, "QtGui", "ZoomMode"); +static gsi::ClassExt decl_QPrintPreviewWidget_ZoomMode_Enums_as_child (decl_QPrintPreviewWidget_ZoomMode_Enums, "QtGui", "QFlags_ZoomMode"); } diff --git a/src/gsiqt4/gsiDeclQPrinter.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPrinter.cc similarity index 96% rename from src/gsiqt4/gsiDeclQPrinter.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPrinter.cc index 552cd659f..b1867d605 100644 --- a/src/gsiqt4/gsiDeclQPrinter.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPrinter.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1158,11 +1158,11 @@ static gsi::Methods methods_QPrinter () { gsi::Class &qtdecl_QPaintDevice (); -gsi::Class decl_QPrinter (qtdecl_QPaintDevice (), "QPrinter_Native", +gsi::Class decl_QPrinter (qtdecl_QPaintDevice (), "QtGui", "QPrinter_Native", methods_QPrinter (), "@hide\n@alias QPrinter"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPrinter () { return decl_QPrinter; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPrinter () { return decl_QPrinter; } } @@ -1358,7 +1358,7 @@ static gsi::Methods methods_QPrinter_Adaptor () { return methods; } -gsi::Class decl_QPrinter_Adaptor (qtdecl_QPrinter (), "QPrinter", +gsi::Class decl_QPrinter_Adaptor (qtdecl_QPrinter (), "QtGui", "QPrinter", methods_QPrinter_Adaptor (), "@qt\n@brief Binding of QPrinter"); @@ -1369,18 +1369,18 @@ gsi::Class decl_QPrinter_Adaptor (qtdecl_QPrinter (), "QPrinte namespace qt_gsi { -static gsi::Enum decl_QPrinter_ColorMode_Enum ("QPrinter_ColorMode", +static gsi::Enum decl_QPrinter_ColorMode_Enum ("QtGui", "QPrinter_ColorMode", gsi::enum_const ("GrayScale", QPrinter::GrayScale, "@brief Enum constant QPrinter::GrayScale") + gsi::enum_const ("Color", QPrinter::Color, "@brief Enum constant QPrinter::Color"), "@qt\n@brief This class represents the QPrinter::ColorMode enum"); -static gsi::QFlagsClass decl_QPrinter_ColorMode_Enums ("QPrinter_QFlags_ColorMode", +static gsi::QFlagsClass decl_QPrinter_ColorMode_Enums ("QtGui", "QPrinter_QFlags_ColorMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QPrinter_ColorMode_Enum_in_parent (decl_QPrinter_ColorMode_Enum.defs ()); -static gsi::ClassExt decl_QPrinter_ColorMode_Enum_as_child (decl_QPrinter_ColorMode_Enum, "ColorMode"); -static gsi::ClassExt decl_QPrinter_ColorMode_Enums_as_child (decl_QPrinter_ColorMode_Enums, "QFlags_ColorMode"); +static gsi::ClassExt decl_QPrinter_ColorMode_Enum_as_child (decl_QPrinter_ColorMode_Enum, "QtGui", "ColorMode"); +static gsi::ClassExt decl_QPrinter_ColorMode_Enums_as_child (decl_QPrinter_ColorMode_Enums, "QtGui", "QFlags_ColorMode"); } @@ -1389,20 +1389,20 @@ static gsi::ClassExt decl_QPrinter_ColorMode_Enums_as_child (decl_QPri namespace qt_gsi { -static gsi::Enum decl_QPrinter_DuplexMode_Enum ("QPrinter_DuplexMode", +static gsi::Enum decl_QPrinter_DuplexMode_Enum ("QtGui", "QPrinter_DuplexMode", gsi::enum_const ("DuplexNone", QPrinter::DuplexNone, "@brief Enum constant QPrinter::DuplexNone") + gsi::enum_const ("DuplexAuto", QPrinter::DuplexAuto, "@brief Enum constant QPrinter::DuplexAuto") + gsi::enum_const ("DuplexLongSide", QPrinter::DuplexLongSide, "@brief Enum constant QPrinter::DuplexLongSide") + gsi::enum_const ("DuplexShortSide", QPrinter::DuplexShortSide, "@brief Enum constant QPrinter::DuplexShortSide"), "@qt\n@brief This class represents the QPrinter::DuplexMode enum"); -static gsi::QFlagsClass decl_QPrinter_DuplexMode_Enums ("QPrinter_QFlags_DuplexMode", +static gsi::QFlagsClass decl_QPrinter_DuplexMode_Enums ("QtGui", "QPrinter_QFlags_DuplexMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QPrinter_DuplexMode_Enum_in_parent (decl_QPrinter_DuplexMode_Enum.defs ()); -static gsi::ClassExt decl_QPrinter_DuplexMode_Enum_as_child (decl_QPrinter_DuplexMode_Enum, "DuplexMode"); -static gsi::ClassExt decl_QPrinter_DuplexMode_Enums_as_child (decl_QPrinter_DuplexMode_Enums, "QFlags_DuplexMode"); +static gsi::ClassExt decl_QPrinter_DuplexMode_Enum_as_child (decl_QPrinter_DuplexMode_Enum, "QtGui", "DuplexMode"); +static gsi::ClassExt decl_QPrinter_DuplexMode_Enums_as_child (decl_QPrinter_DuplexMode_Enums, "QtGui", "QFlags_DuplexMode"); } @@ -1411,18 +1411,18 @@ static gsi::ClassExt decl_QPrinter_DuplexMode_Enums_as_child (decl_QPr namespace qt_gsi { -static gsi::Enum decl_QPrinter_Orientation_Enum ("QPrinter_Orientation", +static gsi::Enum decl_QPrinter_Orientation_Enum ("QtGui", "QPrinter_Orientation", gsi::enum_const ("Portrait", QPrinter::Portrait, "@brief Enum constant QPrinter::Portrait") + gsi::enum_const ("Landscape", QPrinter::Landscape, "@brief Enum constant QPrinter::Landscape"), "@qt\n@brief This class represents the QPrinter::Orientation enum"); -static gsi::QFlagsClass decl_QPrinter_Orientation_Enums ("QPrinter_QFlags_Orientation", +static gsi::QFlagsClass decl_QPrinter_Orientation_Enums ("QtGui", "QPrinter_QFlags_Orientation", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QPrinter_Orientation_Enum_in_parent (decl_QPrinter_Orientation_Enum.defs ()); -static gsi::ClassExt decl_QPrinter_Orientation_Enum_as_child (decl_QPrinter_Orientation_Enum, "Orientation"); -static gsi::ClassExt decl_QPrinter_Orientation_Enums_as_child (decl_QPrinter_Orientation_Enums, "QFlags_Orientation"); +static gsi::ClassExt decl_QPrinter_Orientation_Enum_as_child (decl_QPrinter_Orientation_Enum, "QtGui", "Orientation"); +static gsi::ClassExt decl_QPrinter_Orientation_Enums_as_child (decl_QPrinter_Orientation_Enums, "QtGui", "QFlags_Orientation"); } @@ -1431,19 +1431,19 @@ static gsi::ClassExt decl_QPrinter_Orientation_Enums_as_child (decl_QP namespace qt_gsi { -static gsi::Enum decl_QPrinter_OutputFormat_Enum ("QPrinter_OutputFormat", +static gsi::Enum decl_QPrinter_OutputFormat_Enum ("QtGui", "QPrinter_OutputFormat", gsi::enum_const ("NativeFormat", QPrinter::NativeFormat, "@brief Enum constant QPrinter::NativeFormat") + gsi::enum_const ("PdfFormat", QPrinter::PdfFormat, "@brief Enum constant QPrinter::PdfFormat") + gsi::enum_const ("PostScriptFormat", QPrinter::PostScriptFormat, "@brief Enum constant QPrinter::PostScriptFormat"), "@qt\n@brief This class represents the QPrinter::OutputFormat enum"); -static gsi::QFlagsClass decl_QPrinter_OutputFormat_Enums ("QPrinter_QFlags_OutputFormat", +static gsi::QFlagsClass decl_QPrinter_OutputFormat_Enums ("QtGui", "QPrinter_QFlags_OutputFormat", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QPrinter_OutputFormat_Enum_in_parent (decl_QPrinter_OutputFormat_Enum.defs ()); -static gsi::ClassExt decl_QPrinter_OutputFormat_Enum_as_child (decl_QPrinter_OutputFormat_Enum, "OutputFormat"); -static gsi::ClassExt decl_QPrinter_OutputFormat_Enums_as_child (decl_QPrinter_OutputFormat_Enums, "QFlags_OutputFormat"); +static gsi::ClassExt decl_QPrinter_OutputFormat_Enum_as_child (decl_QPrinter_OutputFormat_Enum, "QtGui", "OutputFormat"); +static gsi::ClassExt decl_QPrinter_OutputFormat_Enums_as_child (decl_QPrinter_OutputFormat_Enums, "QtGui", "QFlags_OutputFormat"); } @@ -1452,18 +1452,18 @@ static gsi::ClassExt decl_QPrinter_OutputFormat_Enums_as_child (decl_Q namespace qt_gsi { -static gsi::Enum decl_QPrinter_PageOrder_Enum ("QPrinter_PageOrder", +static gsi::Enum decl_QPrinter_PageOrder_Enum ("QtGui", "QPrinter_PageOrder", gsi::enum_const ("FirstPageFirst", QPrinter::FirstPageFirst, "@brief Enum constant QPrinter::FirstPageFirst") + gsi::enum_const ("LastPageFirst", QPrinter::LastPageFirst, "@brief Enum constant QPrinter::LastPageFirst"), "@qt\n@brief This class represents the QPrinter::PageOrder enum"); -static gsi::QFlagsClass decl_QPrinter_PageOrder_Enums ("QPrinter_QFlags_PageOrder", +static gsi::QFlagsClass decl_QPrinter_PageOrder_Enums ("QtGui", "QPrinter_QFlags_PageOrder", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QPrinter_PageOrder_Enum_in_parent (decl_QPrinter_PageOrder_Enum.defs ()); -static gsi::ClassExt decl_QPrinter_PageOrder_Enum_as_child (decl_QPrinter_PageOrder_Enum, "PageOrder"); -static gsi::ClassExt decl_QPrinter_PageOrder_Enums_as_child (decl_QPrinter_PageOrder_Enums, "QFlags_PageOrder"); +static gsi::ClassExt decl_QPrinter_PageOrder_Enum_as_child (decl_QPrinter_PageOrder_Enum, "QtGui", "PageOrder"); +static gsi::ClassExt decl_QPrinter_PageOrder_Enums_as_child (decl_QPrinter_PageOrder_Enums, "QtGui", "QFlags_PageOrder"); } @@ -1472,7 +1472,7 @@ static gsi::ClassExt decl_QPrinter_PageOrder_Enums_as_child (decl_QPri namespace qt_gsi { -static gsi::Enum decl_QPrinter_PageSize_Enum ("QPrinter_PageSize", +static gsi::Enum decl_QPrinter_PageSize_Enum ("QtGui", "QPrinter_PageSize", gsi::enum_const ("A4", QPrinter::A4, "@brief Enum constant QPrinter::A4") + gsi::enum_const ("B5", QPrinter::B5, "@brief Enum constant QPrinter::B5") + gsi::enum_const ("Letter", QPrinter::Letter, "@brief Enum constant QPrinter::Letter") + @@ -1508,13 +1508,13 @@ static gsi::Enum decl_QPrinter_PageSize_Enum ("QPrinter_Page gsi::enum_const ("NPaperSize", QPrinter::NPaperSize, "@brief Enum constant QPrinter::NPaperSize"), "@qt\n@brief This class represents the QPrinter::PageSize enum"); -static gsi::QFlagsClass decl_QPrinter_PageSize_Enums ("QPrinter_QFlags_PageSize", +static gsi::QFlagsClass decl_QPrinter_PageSize_Enums ("QtGui", "QPrinter_QFlags_PageSize", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QPrinter_PageSize_Enum_in_parent (decl_QPrinter_PageSize_Enum.defs ()); -static gsi::ClassExt decl_QPrinter_PageSize_Enum_as_child (decl_QPrinter_PageSize_Enum, "PageSize"); -static gsi::ClassExt decl_QPrinter_PageSize_Enums_as_child (decl_QPrinter_PageSize_Enums, "QFlags_PageSize"); +static gsi::ClassExt decl_QPrinter_PageSize_Enum_as_child (decl_QPrinter_PageSize_Enum, "QtGui", "PageSize"); +static gsi::ClassExt decl_QPrinter_PageSize_Enums_as_child (decl_QPrinter_PageSize_Enums, "QtGui", "QFlags_PageSize"); } @@ -1523,7 +1523,7 @@ static gsi::ClassExt decl_QPrinter_PageSize_Enums_as_child (decl_QPrin namespace qt_gsi { -static gsi::Enum decl_QPrinter_PaperSource_Enum ("QPrinter_PaperSource", +static gsi::Enum decl_QPrinter_PaperSource_Enum ("QtGui", "QPrinter_PaperSource", gsi::enum_const ("OnlyOne", QPrinter::OnlyOne, "@brief Enum constant QPrinter::OnlyOne") + gsi::enum_const ("Lower", QPrinter::Lower, "@brief Enum constant QPrinter::Lower") + gsi::enum_const ("Middle", QPrinter::Middle, "@brief Enum constant QPrinter::Middle") + @@ -1540,13 +1540,13 @@ static gsi::Enum decl_QPrinter_PaperSource_Enum ("QPrinte gsi::enum_const ("MaxPageSource", QPrinter::MaxPageSource, "@brief Enum constant QPrinter::MaxPageSource"), "@qt\n@brief This class represents the QPrinter::PaperSource enum"); -static gsi::QFlagsClass decl_QPrinter_PaperSource_Enums ("QPrinter_QFlags_PaperSource", +static gsi::QFlagsClass decl_QPrinter_PaperSource_Enums ("QtGui", "QPrinter_QFlags_PaperSource", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QPrinter_PaperSource_Enum_in_parent (decl_QPrinter_PaperSource_Enum.defs ()); -static gsi::ClassExt decl_QPrinter_PaperSource_Enum_as_child (decl_QPrinter_PaperSource_Enum, "PaperSource"); -static gsi::ClassExt decl_QPrinter_PaperSource_Enums_as_child (decl_QPrinter_PaperSource_Enums, "QFlags_PaperSource"); +static gsi::ClassExt decl_QPrinter_PaperSource_Enum_as_child (decl_QPrinter_PaperSource_Enum, "QtGui", "PaperSource"); +static gsi::ClassExt decl_QPrinter_PaperSource_Enums_as_child (decl_QPrinter_PaperSource_Enums, "QtGui", "QFlags_PaperSource"); } @@ -1555,19 +1555,19 @@ static gsi::ClassExt decl_QPrinter_PaperSource_Enums_as_child (decl_QP namespace qt_gsi { -static gsi::Enum decl_QPrinter_PrintRange_Enum ("QPrinter_PrintRange", +static gsi::Enum decl_QPrinter_PrintRange_Enum ("QtGui", "QPrinter_PrintRange", gsi::enum_const ("AllPages", QPrinter::AllPages, "@brief Enum constant QPrinter::AllPages") + gsi::enum_const ("Selection", QPrinter::Selection, "@brief Enum constant QPrinter::Selection") + gsi::enum_const ("PageRange", QPrinter::PageRange, "@brief Enum constant QPrinter::PageRange"), "@qt\n@brief This class represents the QPrinter::PrintRange enum"); -static gsi::QFlagsClass decl_QPrinter_PrintRange_Enums ("QPrinter_QFlags_PrintRange", +static gsi::QFlagsClass decl_QPrinter_PrintRange_Enums ("QtGui", "QPrinter_QFlags_PrintRange", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QPrinter_PrintRange_Enum_in_parent (decl_QPrinter_PrintRange_Enum.defs ()); -static gsi::ClassExt decl_QPrinter_PrintRange_Enum_as_child (decl_QPrinter_PrintRange_Enum, "PrintRange"); -static gsi::ClassExt decl_QPrinter_PrintRange_Enums_as_child (decl_QPrinter_PrintRange_Enums, "QFlags_PrintRange"); +static gsi::ClassExt decl_QPrinter_PrintRange_Enum_as_child (decl_QPrinter_PrintRange_Enum, "QtGui", "PrintRange"); +static gsi::ClassExt decl_QPrinter_PrintRange_Enums_as_child (decl_QPrinter_PrintRange_Enums, "QtGui", "QFlags_PrintRange"); } @@ -1576,19 +1576,19 @@ static gsi::ClassExt decl_QPrinter_PrintRange_Enums_as_child (decl_QPr namespace qt_gsi { -static gsi::Enum decl_QPrinter_PrinterMode_Enum ("QPrinter_PrinterMode", +static gsi::Enum decl_QPrinter_PrinterMode_Enum ("QtGui", "QPrinter_PrinterMode", gsi::enum_const ("ScreenResolution", QPrinter::ScreenResolution, "@brief Enum constant QPrinter::ScreenResolution") + gsi::enum_const ("PrinterResolution", QPrinter::PrinterResolution, "@brief Enum constant QPrinter::PrinterResolution") + gsi::enum_const ("HighResolution", QPrinter::HighResolution, "@brief Enum constant QPrinter::HighResolution"), "@qt\n@brief This class represents the QPrinter::PrinterMode enum"); -static gsi::QFlagsClass decl_QPrinter_PrinterMode_Enums ("QPrinter_QFlags_PrinterMode", +static gsi::QFlagsClass decl_QPrinter_PrinterMode_Enums ("QtGui", "QPrinter_QFlags_PrinterMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QPrinter_PrinterMode_Enum_in_parent (decl_QPrinter_PrinterMode_Enum.defs ()); -static gsi::ClassExt decl_QPrinter_PrinterMode_Enum_as_child (decl_QPrinter_PrinterMode_Enum, "PrinterMode"); -static gsi::ClassExt decl_QPrinter_PrinterMode_Enums_as_child (decl_QPrinter_PrinterMode_Enums, "QFlags_PrinterMode"); +static gsi::ClassExt decl_QPrinter_PrinterMode_Enum_as_child (decl_QPrinter_PrinterMode_Enum, "QtGui", "PrinterMode"); +static gsi::ClassExt decl_QPrinter_PrinterMode_Enums_as_child (decl_QPrinter_PrinterMode_Enums, "QtGui", "QFlags_PrinterMode"); } @@ -1597,20 +1597,20 @@ static gsi::ClassExt decl_QPrinter_PrinterMode_Enums_as_child (decl_QP namespace qt_gsi { -static gsi::Enum decl_QPrinter_PrinterState_Enum ("QPrinter_PrinterState", +static gsi::Enum decl_QPrinter_PrinterState_Enum ("QtGui", "QPrinter_PrinterState", gsi::enum_const ("Idle", QPrinter::Idle, "@brief Enum constant QPrinter::Idle") + gsi::enum_const ("Active", QPrinter::Active, "@brief Enum constant QPrinter::Active") + gsi::enum_const ("Aborted", QPrinter::Aborted, "@brief Enum constant QPrinter::Aborted") + gsi::enum_const ("Error", QPrinter::Error, "@brief Enum constant QPrinter::Error"), "@qt\n@brief This class represents the QPrinter::PrinterState enum"); -static gsi::QFlagsClass decl_QPrinter_PrinterState_Enums ("QPrinter_QFlags_PrinterState", +static gsi::QFlagsClass decl_QPrinter_PrinterState_Enums ("QtGui", "QPrinter_QFlags_PrinterState", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QPrinter_PrinterState_Enum_in_parent (decl_QPrinter_PrinterState_Enum.defs ()); -static gsi::ClassExt decl_QPrinter_PrinterState_Enum_as_child (decl_QPrinter_PrinterState_Enum, "PrinterState"); -static gsi::ClassExt decl_QPrinter_PrinterState_Enums_as_child (decl_QPrinter_PrinterState_Enums, "QFlags_PrinterState"); +static gsi::ClassExt decl_QPrinter_PrinterState_Enum_as_child (decl_QPrinter_PrinterState_Enum, "QtGui", "PrinterState"); +static gsi::ClassExt decl_QPrinter_PrinterState_Enums_as_child (decl_QPrinter_PrinterState_Enums, "QtGui", "QFlags_PrinterState"); } @@ -1619,7 +1619,7 @@ static gsi::ClassExt decl_QPrinter_PrinterState_Enums_as_child (decl_Q namespace qt_gsi { -static gsi::Enum decl_QPrinter_Unit_Enum ("QPrinter_Unit", +static gsi::Enum decl_QPrinter_Unit_Enum ("QtGui", "QPrinter_Unit", gsi::enum_const ("Millimeter", QPrinter::Millimeter, "@brief Enum constant QPrinter::Millimeter") + gsi::enum_const ("Point", QPrinter::Point, "@brief Enum constant QPrinter::Point") + gsi::enum_const ("Inch", QPrinter::Inch, "@brief Enum constant QPrinter::Inch") + @@ -1629,13 +1629,13 @@ static gsi::Enum decl_QPrinter_Unit_Enum ("QPrinter_Unit", gsi::enum_const ("DevicePixel", QPrinter::DevicePixel, "@brief Enum constant QPrinter::DevicePixel"), "@qt\n@brief This class represents the QPrinter::Unit enum"); -static gsi::QFlagsClass decl_QPrinter_Unit_Enums ("QPrinter_QFlags_Unit", +static gsi::QFlagsClass decl_QPrinter_Unit_Enums ("QtGui", "QPrinter_QFlags_Unit", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QPrinter_Unit_Enum_in_parent (decl_QPrinter_Unit_Enum.defs ()); -static gsi::ClassExt decl_QPrinter_Unit_Enum_as_child (decl_QPrinter_Unit_Enum, "Unit"); -static gsi::ClassExt decl_QPrinter_Unit_Enums_as_child (decl_QPrinter_Unit_Enums, "QFlags_Unit"); +static gsi::ClassExt decl_QPrinter_Unit_Enum_as_child (decl_QPrinter_Unit_Enum, "QtGui", "Unit"); +static gsi::ClassExt decl_QPrinter_Unit_Enums_as_child (decl_QPrinter_Unit_Enums, "QtGui", "QFlags_Unit"); } diff --git a/src/gsiqt4/gsiDeclQPrinterInfo.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPrinterInfo.cc similarity index 97% rename from src/gsiqt4/gsiDeclQPrinterInfo.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPrinterInfo.cc index 408a93a6a..dd5ddae9a 100644 --- a/src/gsiqt4/gsiDeclQPrinterInfo.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPrinterInfo.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -218,12 +218,12 @@ static gsi::Methods methods_QPrinterInfo () { return methods; } -gsi::Class decl_QPrinterInfo ("QPrinterInfo", +gsi::Class decl_QPrinterInfo ("QtGui", "QPrinterInfo", methods_QPrinterInfo (), "@qt\n@brief Binding of QPrinterInfo"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPrinterInfo () { return decl_QPrinterInfo; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPrinterInfo () { return decl_QPrinterInfo; } } diff --git a/src/gsiqt4/gsiDeclQProgressBar.cc b/src/gsiqt/qt4/QtGui/gsiDeclQProgressBar.cc similarity index 99% rename from src/gsiqt4/gsiDeclQProgressBar.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQProgressBar.cc index 1900d4e1d..b8d45f08b 100644 --- a/src/gsiqt4/gsiDeclQProgressBar.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQProgressBar.cc @@ -78,8 +78,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -632,11 +632,11 @@ static gsi::Methods methods_QProgressBar () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QProgressBar (qtdecl_QWidget (), "QProgressBar_Native", +qt_gsi::QtNativeClass decl_QProgressBar (qtdecl_QWidget (), "QtGui", "QProgressBar_Native", methods_QProgressBar (), "@hide\n@alias QProgressBar"); -GSIQT_PUBLIC gsi::Class &qtdecl_QProgressBar () { return decl_QProgressBar; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QProgressBar () { return decl_QProgressBar; } } @@ -2924,7 +2924,7 @@ static gsi::Methods methods_QProgressBar_Adaptor () { return methods; } -gsi::Class decl_QProgressBar_Adaptor (qtdecl_QProgressBar (), "QProgressBar", +gsi::Class decl_QProgressBar_Adaptor (qtdecl_QProgressBar (), "QtGui", "QProgressBar", methods_QProgressBar_Adaptor (), "@qt\n@brief Binding of QProgressBar"); @@ -2935,18 +2935,18 @@ gsi::Class decl_QProgressBar_Adaptor (qtdecl_QProgressBar namespace qt_gsi { -static gsi::Enum decl_QProgressBar_Direction_Enum ("QProgressBar_Direction", +static gsi::Enum decl_QProgressBar_Direction_Enum ("QtGui", "QProgressBar_Direction", gsi::enum_const ("TopToBottom", QProgressBar::TopToBottom, "@brief Enum constant QProgressBar::TopToBottom") + gsi::enum_const ("BottomToTop", QProgressBar::BottomToTop, "@brief Enum constant QProgressBar::BottomToTop"), "@qt\n@brief This class represents the QProgressBar::Direction enum"); -static gsi::QFlagsClass decl_QProgressBar_Direction_Enums ("QProgressBar_QFlags_Direction", +static gsi::QFlagsClass decl_QProgressBar_Direction_Enums ("QtGui", "QProgressBar_QFlags_Direction", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QProgressBar_Direction_Enum_in_parent (decl_QProgressBar_Direction_Enum.defs ()); -static gsi::ClassExt decl_QProgressBar_Direction_Enum_as_child (decl_QProgressBar_Direction_Enum, "Direction"); -static gsi::ClassExt decl_QProgressBar_Direction_Enums_as_child (decl_QProgressBar_Direction_Enums, "QFlags_Direction"); +static gsi::ClassExt decl_QProgressBar_Direction_Enum_as_child (decl_QProgressBar_Direction_Enum, "QtGui", "Direction"); +static gsi::ClassExt decl_QProgressBar_Direction_Enums_as_child (decl_QProgressBar_Direction_Enums, "QtGui", "QFlags_Direction"); } diff --git a/src/gsiqt4/gsiDeclQProgressDialog.cc b/src/gsiqt/qt4/QtGui/gsiDeclQProgressDialog.cc similarity index 99% rename from src/gsiqt4/gsiDeclQProgressDialog.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQProgressDialog.cc index 626bbcdf7..22fb86bcb 100644 --- a/src/gsiqt4/gsiDeclQProgressDialog.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQProgressDialog.cc @@ -80,8 +80,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -689,11 +689,11 @@ static gsi::Methods methods_QProgressDialog () { gsi::Class &qtdecl_QDialog (); -qt_gsi::QtNativeClass decl_QProgressDialog (qtdecl_QDialog (), "QProgressDialog_Native", +qt_gsi::QtNativeClass decl_QProgressDialog (qtdecl_QDialog (), "QtGui", "QProgressDialog_Native", methods_QProgressDialog (), "@hide\n@alias QProgressDialog"); -GSIQT_PUBLIC gsi::Class &qtdecl_QProgressDialog () { return decl_QProgressDialog; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QProgressDialog () { return decl_QProgressDialog; } } @@ -3207,7 +3207,7 @@ static gsi::Methods methods_QProgressDialog_Adaptor () { return methods; } -gsi::Class decl_QProgressDialog_Adaptor (qtdecl_QProgressDialog (), "QProgressDialog", +gsi::Class decl_QProgressDialog_Adaptor (qtdecl_QProgressDialog (), "QtGui", "QProgressDialog", methods_QProgressDialog_Adaptor (), "@qt\n@brief Binding of QProgressDialog"); diff --git a/src/gsiqt4/gsiDeclQPushButton.cc b/src/gsiqt/qt4/QtGui/gsiDeclQPushButton.cc similarity index 99% rename from src/gsiqt4/gsiDeclQPushButton.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQPushButton.cc index b6f01b29f..8f32dfe35 100644 --- a/src/gsiqt4/gsiDeclQPushButton.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQPushButton.cc @@ -80,8 +80,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -412,11 +412,11 @@ static gsi::Methods methods_QPushButton () { gsi::Class &qtdecl_QAbstractButton (); -qt_gsi::QtNativeClass decl_QPushButton (qtdecl_QAbstractButton (), "QPushButton_Native", +qt_gsi::QtNativeClass decl_QPushButton (qtdecl_QAbstractButton (), "QtGui", "QPushButton_Native", methods_QPushButton (), "@hide\n@alias QPushButton"); -GSIQT_PUBLIC gsi::Class &qtdecl_QPushButton () { return decl_QPushButton; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPushButton () { return decl_QPushButton; } } @@ -2922,7 +2922,7 @@ static gsi::Methods methods_QPushButton_Adaptor () { return methods; } -gsi::Class decl_QPushButton_Adaptor (qtdecl_QPushButton (), "QPushButton", +gsi::Class decl_QPushButton_Adaptor (qtdecl_QPushButton (), "QtGui", "QPushButton", methods_QPushButton_Adaptor (), "@qt\n@brief Binding of QPushButton"); diff --git a/src/gsiqt4/gsiDeclQQuaternion.cc b/src/gsiqt/qt4/QtGui/gsiDeclQQuaternion.cc similarity index 99% rename from src/gsiqt4/gsiDeclQQuaternion.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQQuaternion.cc index f2940fb04..c928961dd 100644 --- a/src/gsiqt4/gsiDeclQQuaternion.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQQuaternion.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -748,12 +748,12 @@ static gsi::Methods methods_QQuaternion () { return methods; } -gsi::Class decl_QQuaternion ("QQuaternion", +gsi::Class decl_QQuaternion ("QtGui", "QQuaternion", methods_QQuaternion (), "@qt\n@brief Binding of QQuaternion"); -GSIQT_PUBLIC gsi::Class &qtdecl_QQuaternion () { return decl_QQuaternion; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QQuaternion () { return decl_QQuaternion; } } diff --git a/src/gsiqt4/gsiDeclQRadialGradient.cc b/src/gsiqt/qt4/QtGui/gsiDeclQRadialGradient.cc similarity index 98% rename from src/gsiqt4/gsiDeclQRadialGradient.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQRadialGradient.cc index 5797a9e1d..495667506 100644 --- a/src/gsiqt4/gsiDeclQRadialGradient.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQRadialGradient.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -332,12 +332,12 @@ static gsi::Methods methods_QRadialGradient () { gsi::Class &qtdecl_QGradient (); -gsi::Class decl_QRadialGradient (qtdecl_QGradient (), "QRadialGradient", +gsi::Class decl_QRadialGradient (qtdecl_QGradient (), "QtGui", "QRadialGradient", methods_QRadialGradient (), "@qt\n@brief Binding of QRadialGradient"); -GSIQT_PUBLIC gsi::Class &qtdecl_QRadialGradient () { return decl_QRadialGradient; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QRadialGradient () { return decl_QRadialGradient; } } diff --git a/src/gsiqt4/gsiDeclQRadioButton.cc b/src/gsiqt/qt4/QtGui/gsiDeclQRadioButton.cc similarity index 99% rename from src/gsiqt4/gsiDeclQRadioButton.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQRadioButton.cc index be67f12f6..a26153f62 100644 --- a/src/gsiqt4/gsiDeclQRadioButton.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQRadioButton.cc @@ -79,8 +79,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -230,11 +230,11 @@ static gsi::Methods methods_QRadioButton () { gsi::Class &qtdecl_QAbstractButton (); -qt_gsi::QtNativeClass decl_QRadioButton (qtdecl_QAbstractButton (), "QRadioButton_Native", +qt_gsi::QtNativeClass decl_QRadioButton (qtdecl_QAbstractButton (), "QtGui", "QRadioButton_Native", methods_QRadioButton (), "@hide\n@alias QRadioButton"); -GSIQT_PUBLIC gsi::Class &qtdecl_QRadioButton () { return decl_QRadioButton; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QRadioButton () { return decl_QRadioButton; } } @@ -2703,7 +2703,7 @@ static gsi::Methods methods_QRadioButton_Adaptor () { return methods; } -gsi::Class decl_QRadioButton_Adaptor (qtdecl_QRadioButton (), "QRadioButton", +gsi::Class decl_QRadioButton_Adaptor (qtdecl_QRadioButton (), "QtGui", "QRadioButton", methods_QRadioButton_Adaptor (), "@qt\n@brief Binding of QRadioButton"); diff --git a/src/gsiqt4/gsiDeclQRegExpValidator.cc b/src/gsiqt/qt4/QtGui/gsiDeclQRegExpValidator.cc similarity index 98% rename from src/gsiqt4/gsiDeclQRegExpValidator.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQRegExpValidator.cc index 90c89b85d..c9a430383 100644 --- a/src/gsiqt4/gsiDeclQRegExpValidator.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQRegExpValidator.cc @@ -36,8 +36,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -226,11 +226,11 @@ static gsi::Methods methods_QRegExpValidator () { gsi::Class &qtdecl_QValidator (); -qt_gsi::QtNativeClass decl_QRegExpValidator (qtdecl_QValidator (), "QRegExpValidator_Native", +qt_gsi::QtNativeClass decl_QRegExpValidator (qtdecl_QValidator (), "QtGui", "QRegExpValidator_Native", methods_QRegExpValidator (), "@hide\n@alias QRegExpValidator"); -GSIQT_PUBLIC gsi::Class &qtdecl_QRegExpValidator () { return decl_QRegExpValidator; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QRegExpValidator () { return decl_QRegExpValidator; } } @@ -716,7 +716,7 @@ static gsi::Methods methods_QRegExpValidator_Adaptor () { return methods; } -gsi::Class decl_QRegExpValidator_Adaptor (qtdecl_QRegExpValidator (), "QRegExpValidator", +gsi::Class decl_QRegExpValidator_Adaptor (qtdecl_QRegExpValidator (), "QtGui", "QRegExpValidator", methods_QRegExpValidator_Adaptor (), "@qt\n@brief Binding of QRegExpValidator"); diff --git a/src/gsiqt4/gsiDeclQRegion.cc b/src/gsiqt/qt4/QtGui/gsiDeclQRegion.cc similarity index 98% rename from src/gsiqt4/gsiDeclQRegion.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQRegion.cc index ec69c1c9f..53b0c78b5 100644 --- a/src/gsiqt4/gsiDeclQRegion.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQRegion.cc @@ -33,8 +33,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1029,14 +1029,14 @@ static gsi::Methods methods_QRegion () { return methods; } -gsi::Class decl_QRegion ("QRegion", +gsi::Class decl_QRegion ("QtGui", "QRegion", gsi::method_ext("setRects", &f_QRegion_setRects, "@brief Adaption of setRects without pointer.") + methods_QRegion (), "@qt\n@brief Binding of QRegion"); -GSIQT_PUBLIC gsi::Class &qtdecl_QRegion () { return decl_QRegion; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QRegion () { return decl_QRegion; } } @@ -1045,18 +1045,18 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QRegion () { return decl_QRegion; } namespace qt_gsi { -static gsi::Enum decl_QRegion_RegionType_Enum ("QRegion_RegionType", +static gsi::Enum decl_QRegion_RegionType_Enum ("QtGui", "QRegion_RegionType", gsi::enum_const ("Rectangle", QRegion::Rectangle, "@brief Enum constant QRegion::Rectangle") + gsi::enum_const ("Ellipse", QRegion::Ellipse, "@brief Enum constant QRegion::Ellipse"), "@qt\n@brief This class represents the QRegion::RegionType enum"); -static gsi::QFlagsClass decl_QRegion_RegionType_Enums ("QRegion_QFlags_RegionType", +static gsi::QFlagsClass decl_QRegion_RegionType_Enums ("QtGui", "QRegion_QFlags_RegionType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QRegion_RegionType_Enum_in_parent (decl_QRegion_RegionType_Enum.defs ()); -static gsi::ClassExt decl_QRegion_RegionType_Enum_as_child (decl_QRegion_RegionType_Enum, "RegionType"); -static gsi::ClassExt decl_QRegion_RegionType_Enums_as_child (decl_QRegion_RegionType_Enums, "QFlags_RegionType"); +static gsi::ClassExt decl_QRegion_RegionType_Enum_as_child (decl_QRegion_RegionType_Enum, "QtGui", "RegionType"); +static gsi::ClassExt decl_QRegion_RegionType_Enums_as_child (decl_QRegion_RegionType_Enums, "QtGui", "QFlags_RegionType"); } diff --git a/src/gsiqt4/gsiDeclQResizeEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQResizeEvent.cc similarity index 94% rename from src/gsiqt4/gsiDeclQResizeEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQResizeEvent.cc index 09a1869c2..d4a8f2bf4 100644 --- a/src/gsiqt4/gsiDeclQResizeEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQResizeEvent.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -79,11 +79,11 @@ static gsi::Methods methods_QResizeEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QResizeEvent (qtdecl_QEvent (), "QResizeEvent_Native", +gsi::Class decl_QResizeEvent (qtdecl_QEvent (), "QtGui", "QResizeEvent_Native", methods_QResizeEvent (), "@hide\n@alias QResizeEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QResizeEvent () { return decl_QResizeEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QResizeEvent () { return decl_QResizeEvent; } } @@ -137,7 +137,7 @@ static gsi::Methods methods_QResizeEvent_Adaptor () { return methods; } -gsi::Class decl_QResizeEvent_Adaptor (qtdecl_QResizeEvent (), "QResizeEvent", +gsi::Class decl_QResizeEvent_Adaptor (qtdecl_QResizeEvent (), "QtGui", "QResizeEvent", methods_QResizeEvent_Adaptor (), "@qt\n@brief Binding of QResizeEvent"); diff --git a/src/gsiqt4/gsiDeclQRubberBand.cc b/src/gsiqt/qt4/QtGui/gsiDeclQRubberBand.cc similarity index 99% rename from src/gsiqt4/gsiDeclQRubberBand.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQRubberBand.cc index 9348971e6..90334d031 100644 --- a/src/gsiqt4/gsiDeclQRubberBand.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQRubberBand.cc @@ -78,8 +78,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -366,11 +366,11 @@ static gsi::Methods methods_QRubberBand () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QRubberBand (qtdecl_QWidget (), "QRubberBand_Native", +qt_gsi::QtNativeClass decl_QRubberBand (qtdecl_QWidget (), "QtGui", "QRubberBand_Native", methods_QRubberBand (), "@hide\n@alias QRubberBand"); -GSIQT_PUBLIC gsi::Class &qtdecl_QRubberBand () { return decl_QRubberBand; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QRubberBand () { return decl_QRubberBand; } } @@ -2599,7 +2599,7 @@ static gsi::Methods methods_QRubberBand_Adaptor () { return methods; } -gsi::Class decl_QRubberBand_Adaptor (qtdecl_QRubberBand (), "QRubberBand", +gsi::Class decl_QRubberBand_Adaptor (qtdecl_QRubberBand (), "QtGui", "QRubberBand", methods_QRubberBand_Adaptor (), "@qt\n@brief Binding of QRubberBand"); @@ -2610,18 +2610,18 @@ gsi::Class decl_QRubberBand_Adaptor (qtdecl_QRubberBand (), namespace qt_gsi { -static gsi::Enum decl_QRubberBand_Shape_Enum ("QRubberBand_Shape", +static gsi::Enum decl_QRubberBand_Shape_Enum ("QtGui", "QRubberBand_Shape", gsi::enum_const ("Line", QRubberBand::Line, "@brief Enum constant QRubberBand::Line") + gsi::enum_const ("Rectangle", QRubberBand::Rectangle, "@brief Enum constant QRubberBand::Rectangle"), "@qt\n@brief This class represents the QRubberBand::Shape enum"); -static gsi::QFlagsClass decl_QRubberBand_Shape_Enums ("QRubberBand_QFlags_Shape", +static gsi::QFlagsClass decl_QRubberBand_Shape_Enums ("QtGui", "QRubberBand_QFlags_Shape", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QRubberBand_Shape_Enum_in_parent (decl_QRubberBand_Shape_Enum.defs ()); -static gsi::ClassExt decl_QRubberBand_Shape_Enum_as_child (decl_QRubberBand_Shape_Enum, "Shape"); -static gsi::ClassExt decl_QRubberBand_Shape_Enums_as_child (decl_QRubberBand_Shape_Enums, "QFlags_Shape"); +static gsi::ClassExt decl_QRubberBand_Shape_Enum_as_child (decl_QRubberBand_Shape_Enum, "QtGui", "Shape"); +static gsi::ClassExt decl_QRubberBand_Shape_Enums_as_child (decl_QRubberBand_Shape_Enums, "QtGui", "QFlags_Shape"); } diff --git a/src/gsiqt4/gsiDeclQScrollArea.cc b/src/gsiqt/qt4/QtGui/gsiDeclQScrollArea.cc similarity index 99% rename from src/gsiqt4/gsiDeclQScrollArea.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQScrollArea.cc index c22aa9bdb..93eacbda2 100644 --- a/src/gsiqt4/gsiDeclQScrollArea.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQScrollArea.cc @@ -78,8 +78,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -429,11 +429,11 @@ static gsi::Methods methods_QScrollArea () { gsi::Class &qtdecl_QAbstractScrollArea (); -qt_gsi::QtNativeClass decl_QScrollArea (qtdecl_QAbstractScrollArea (), "QScrollArea_Native", +qt_gsi::QtNativeClass decl_QScrollArea (qtdecl_QAbstractScrollArea (), "QtGui", "QScrollArea_Native", methods_QScrollArea (), "@hide\n@alias QScrollArea"); -GSIQT_PUBLIC gsi::Class &qtdecl_QScrollArea () { return decl_QScrollArea; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QScrollArea () { return decl_QScrollArea; } } @@ -2829,7 +2829,7 @@ static gsi::Methods methods_QScrollArea_Adaptor () { return methods; } -gsi::Class decl_QScrollArea_Adaptor (qtdecl_QScrollArea (), "QScrollArea", +gsi::Class decl_QScrollArea_Adaptor (qtdecl_QScrollArea (), "QtGui", "QScrollArea", methods_QScrollArea_Adaptor (), "@qt\n@brief Binding of QScrollArea"); diff --git a/src/gsiqt4/gsiDeclQScrollBar.cc b/src/gsiqt/qt4/QtGui/gsiDeclQScrollBar.cc similarity index 99% rename from src/gsiqt4/gsiDeclQScrollBar.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQScrollBar.cc index 214639b64..a21e258cb 100644 --- a/src/gsiqt4/gsiDeclQScrollBar.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQScrollBar.cc @@ -78,8 +78,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -251,11 +251,11 @@ static gsi::Methods methods_QScrollBar () { gsi::Class &qtdecl_QAbstractSlider (); -qt_gsi::QtNativeClass decl_QScrollBar (qtdecl_QAbstractSlider (), "QScrollBar_Native", +qt_gsi::QtNativeClass decl_QScrollBar (qtdecl_QAbstractSlider (), "QtGui", "QScrollBar_Native", methods_QScrollBar (), "@hide\n@alias QScrollBar"); -GSIQT_PUBLIC gsi::Class &qtdecl_QScrollBar () { return decl_QScrollBar; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QScrollBar () { return decl_QScrollBar; } } @@ -2753,7 +2753,7 @@ static gsi::Methods methods_QScrollBar_Adaptor () { return methods; } -gsi::Class decl_QScrollBar_Adaptor (qtdecl_QScrollBar (), "QScrollBar", +gsi::Class decl_QScrollBar_Adaptor (qtdecl_QScrollBar (), "QtGui", "QScrollBar", methods_QScrollBar_Adaptor (), "@qt\n@brief Binding of QScrollBar"); diff --git a/src/gsiqt4/gsiDeclQShortcut.cc b/src/gsiqt/qt4/QtGui/gsiDeclQShortcut.cc similarity index 99% rename from src/gsiqt4/gsiDeclQShortcut.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQShortcut.cc index cc8d5865d..3aa0a4abb 100644 --- a/src/gsiqt4/gsiDeclQShortcut.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQShortcut.cc @@ -36,8 +36,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -385,11 +385,11 @@ static gsi::Methods methods_QShortcut () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QShortcut (qtdecl_QObject (), "QShortcut_Native", +qt_gsi::QtNativeClass decl_QShortcut (qtdecl_QObject (), "QtGui", "QShortcut_Native", methods_QShortcut (), "@hide\n@alias QShortcut"); -GSIQT_PUBLIC gsi::Class &qtdecl_QShortcut () { return decl_QShortcut; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QShortcut () { return decl_QShortcut; } } @@ -858,7 +858,7 @@ static gsi::Methods methods_QShortcut_Adaptor () { return methods; } -gsi::Class decl_QShortcut_Adaptor (qtdecl_QShortcut (), "QShortcut", +gsi::Class decl_QShortcut_Adaptor (qtdecl_QShortcut (), "QtGui", "QShortcut", methods_QShortcut_Adaptor (), "@qt\n@brief Binding of QShortcut"); diff --git a/src/gsiqt4/gsiDeclQShortcutEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQShortcutEvent.cc similarity index 96% rename from src/gsiqt4/gsiDeclQShortcutEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQShortcutEvent.cc index 356023466..da3551f47 100644 --- a/src/gsiqt4/gsiDeclQShortcutEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQShortcutEvent.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -143,11 +143,11 @@ static gsi::Methods methods_QShortcutEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QShortcutEvent (qtdecl_QEvent (), "QShortcutEvent_Native", +gsi::Class decl_QShortcutEvent (qtdecl_QEvent (), "QtGui", "QShortcutEvent_Native", methods_QShortcutEvent (), "@hide\n@alias QShortcutEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QShortcutEvent () { return decl_QShortcutEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QShortcutEvent () { return decl_QShortcutEvent; } } @@ -210,7 +210,7 @@ static gsi::Methods methods_QShortcutEvent_Adaptor () { return methods; } -gsi::Class decl_QShortcutEvent_Adaptor (qtdecl_QShortcutEvent (), "QShortcutEvent", +gsi::Class decl_QShortcutEvent_Adaptor (qtdecl_QShortcutEvent (), "QtGui", "QShortcutEvent", methods_QShortcutEvent_Adaptor (), "@qt\n@brief Binding of QShortcutEvent"); diff --git a/src/gsiqt4/gsiDeclQShowEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQShowEvent.cc similarity index 90% rename from src/gsiqt4/gsiDeclQShowEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQShowEvent.cc index b2da746e5..34f2bfb71 100644 --- a/src/gsiqt4/gsiDeclQShowEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQShowEvent.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -46,11 +46,11 @@ static gsi::Methods methods_QShowEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QShowEvent (qtdecl_QEvent (), "QShowEvent_Native", +gsi::Class decl_QShowEvent (qtdecl_QEvent (), "QtGui", "QShowEvent_Native", methods_QShowEvent (), "@hide\n@alias QShowEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QShowEvent () { return decl_QShowEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QShowEvent () { return decl_QShowEvent; } } @@ -97,7 +97,7 @@ static gsi::Methods methods_QShowEvent_Adaptor () { return methods; } -gsi::Class decl_QShowEvent_Adaptor (qtdecl_QShowEvent (), "QShowEvent", +gsi::Class decl_QShowEvent_Adaptor (qtdecl_QShowEvent (), "QtGui", "QShowEvent", methods_QShowEvent_Adaptor (), "@qt\n@brief Binding of QShowEvent"); diff --git a/src/gsiqt4/gsiDeclQSizeGrip.cc b/src/gsiqt/qt4/QtGui/gsiDeclQSizeGrip.cc similarity index 99% rename from src/gsiqt4/gsiDeclQSizeGrip.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQSizeGrip.cc index 8c1b01f2f..212b0b1a4 100644 --- a/src/gsiqt4/gsiDeclQSizeGrip.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQSizeGrip.cc @@ -77,8 +77,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -245,11 +245,11 @@ static gsi::Methods methods_QSizeGrip () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QSizeGrip (qtdecl_QWidget (), "QSizeGrip_Native", +qt_gsi::QtNativeClass decl_QSizeGrip (qtdecl_QWidget (), "QtGui", "QSizeGrip_Native", methods_QSizeGrip (), "@hide\n@alias QSizeGrip"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSizeGrip () { return decl_QSizeGrip; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QSizeGrip () { return decl_QSizeGrip; } } @@ -2444,7 +2444,7 @@ static gsi::Methods methods_QSizeGrip_Adaptor () { return methods; } -gsi::Class decl_QSizeGrip_Adaptor (qtdecl_QSizeGrip (), "QSizeGrip", +gsi::Class decl_QSizeGrip_Adaptor (qtdecl_QSizeGrip (), "QtGui", "QSizeGrip", methods_QSizeGrip_Adaptor (), "@qt\n@brief Binding of QSizeGrip"); diff --git a/src/gsiqt4/gsiDeclQSizePolicy.cc b/src/gsiqt/qt4/QtGui/gsiDeclQSizePolicy.cc similarity index 96% rename from src/gsiqt4/gsiDeclQSizePolicy.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQSizePolicy.cc index ff15b1144..fa55c8a1d 100644 --- a/src/gsiqt4/gsiDeclQSizePolicy.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQSizePolicy.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -405,12 +405,12 @@ static gsi::Methods methods_QSizePolicy () { return methods; } -gsi::Class decl_QSizePolicy ("QSizePolicy", +gsi::Class decl_QSizePolicy ("QtGui", "QSizePolicy", methods_QSizePolicy (), "@qt\n@brief Binding of QSizePolicy"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSizePolicy () { return decl_QSizePolicy; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QSizePolicy () { return decl_QSizePolicy; } } @@ -419,7 +419,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QSizePolicy () { return decl_QSizeP namespace qt_gsi { -static gsi::Enum decl_QSizePolicy_ControlType_Enum ("QSizePolicy_ControlType", +static gsi::Enum decl_QSizePolicy_ControlType_Enum ("QtGui", "QSizePolicy_ControlType", gsi::enum_const ("DefaultType", QSizePolicy::DefaultType, "@brief Enum constant QSizePolicy::DefaultType") + gsi::enum_const ("ButtonBox", QSizePolicy::ButtonBox, "@brief Enum constant QSizePolicy::ButtonBox") + gsi::enum_const ("CheckBox", QSizePolicy::CheckBox, "@brief Enum constant QSizePolicy::CheckBox") + @@ -437,13 +437,13 @@ static gsi::Enum decl_QSizePolicy_ControlType_Enum ("Q gsi::enum_const ("ToolButton", QSizePolicy::ToolButton, "@brief Enum constant QSizePolicy::ToolButton"), "@qt\n@brief This class represents the QSizePolicy::ControlType enum"); -static gsi::QFlagsClass decl_QSizePolicy_ControlType_Enums ("QSizePolicy_QFlags_ControlType", +static gsi::QFlagsClass decl_QSizePolicy_ControlType_Enums ("QtGui", "QSizePolicy_QFlags_ControlType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSizePolicy_ControlType_Enum_in_parent (decl_QSizePolicy_ControlType_Enum.defs ()); -static gsi::ClassExt decl_QSizePolicy_ControlType_Enum_as_child (decl_QSizePolicy_ControlType_Enum, "ControlType"); -static gsi::ClassExt decl_QSizePolicy_ControlType_Enums_as_child (decl_QSizePolicy_ControlType_Enums, "QFlags_ControlType"); +static gsi::ClassExt decl_QSizePolicy_ControlType_Enum_as_child (decl_QSizePolicy_ControlType_Enum, "QtGui", "ControlType"); +static gsi::ClassExt decl_QSizePolicy_ControlType_Enums_as_child (decl_QSizePolicy_ControlType_Enums, "QtGui", "QFlags_ControlType"); } @@ -452,7 +452,7 @@ static gsi::ClassExt decl_QSizePolicy_ControlType_Enums_as_child (d namespace qt_gsi { -static gsi::Enum decl_QSizePolicy_Policy_Enum ("QSizePolicy_Policy", +static gsi::Enum decl_QSizePolicy_Policy_Enum ("QtGui", "QSizePolicy_Policy", gsi::enum_const ("Fixed", QSizePolicy::Fixed, "@brief Enum constant QSizePolicy::Fixed") + gsi::enum_const ("Minimum", QSizePolicy::Minimum, "@brief Enum constant QSizePolicy::Minimum") + gsi::enum_const ("Maximum", QSizePolicy::Maximum, "@brief Enum constant QSizePolicy::Maximum") + @@ -462,13 +462,13 @@ static gsi::Enum decl_QSizePolicy_Policy_Enum ("QSizePolicy gsi::enum_const ("Ignored", QSizePolicy::Ignored, "@brief Enum constant QSizePolicy::Ignored"), "@qt\n@brief This class represents the QSizePolicy::Policy enum"); -static gsi::QFlagsClass decl_QSizePolicy_Policy_Enums ("QSizePolicy_QFlags_Policy", +static gsi::QFlagsClass decl_QSizePolicy_Policy_Enums ("QtGui", "QSizePolicy_QFlags_Policy", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSizePolicy_Policy_Enum_in_parent (decl_QSizePolicy_Policy_Enum.defs ()); -static gsi::ClassExt decl_QSizePolicy_Policy_Enum_as_child (decl_QSizePolicy_Policy_Enum, "Policy"); -static gsi::ClassExt decl_QSizePolicy_Policy_Enums_as_child (decl_QSizePolicy_Policy_Enums, "QFlags_Policy"); +static gsi::ClassExt decl_QSizePolicy_Policy_Enum_as_child (decl_QSizePolicy_Policy_Enum, "QtGui", "Policy"); +static gsi::ClassExt decl_QSizePolicy_Policy_Enums_as_child (decl_QSizePolicy_Policy_Enums, "QtGui", "QFlags_Policy"); } diff --git a/src/gsiqt4/gsiDeclQSlider.cc b/src/gsiqt/qt4/QtGui/gsiDeclQSlider.cc similarity index 99% rename from src/gsiqt4/gsiDeclQSlider.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQSlider.cc index 9be3f0458..3a00e487a 100644 --- a/src/gsiqt4/gsiDeclQSlider.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQSlider.cc @@ -78,8 +78,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -341,11 +341,11 @@ static gsi::Methods methods_QSlider () { gsi::Class &qtdecl_QAbstractSlider (); -qt_gsi::QtNativeClass decl_QSlider (qtdecl_QAbstractSlider (), "QSlider_Native", +qt_gsi::QtNativeClass decl_QSlider (qtdecl_QAbstractSlider (), "QtGui", "QSlider_Native", methods_QSlider (), "@hide\n@alias QSlider"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSlider () { return decl_QSlider; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QSlider () { return decl_QSlider; } } @@ -2843,7 +2843,7 @@ static gsi::Methods methods_QSlider_Adaptor () { return methods; } -gsi::Class decl_QSlider_Adaptor (qtdecl_QSlider (), "QSlider", +gsi::Class decl_QSlider_Adaptor (qtdecl_QSlider (), "QtGui", "QSlider", methods_QSlider_Adaptor (), "@qt\n@brief Binding of QSlider"); @@ -2854,7 +2854,7 @@ gsi::Class decl_QSlider_Adaptor (qtdecl_QSlider (), "QSlider", namespace qt_gsi { -static gsi::Enum decl_QSlider_TickPosition_Enum ("QSlider_TickPosition", +static gsi::Enum decl_QSlider_TickPosition_Enum ("QtGui", "QSlider_TickPosition", gsi::enum_const ("NoTicks", QSlider::NoTicks, "@brief Enum constant QSlider::NoTicks") + gsi::enum_const ("TicksAbove", QSlider::TicksAbove, "@brief Enum constant QSlider::TicksAbove") + gsi::enum_const ("TicksLeft", QSlider::TicksLeft, "@brief Enum constant QSlider::TicksLeft") + @@ -2863,13 +2863,13 @@ static gsi::Enum decl_QSlider_TickPosition_Enum ("QSlider gsi::enum_const ("TicksBothSides", QSlider::TicksBothSides, "@brief Enum constant QSlider::TicksBothSides"), "@qt\n@brief This class represents the QSlider::TickPosition enum"); -static gsi::QFlagsClass decl_QSlider_TickPosition_Enums ("QSlider_QFlags_TickPosition", +static gsi::QFlagsClass decl_QSlider_TickPosition_Enums ("QtGui", "QSlider_QFlags_TickPosition", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSlider_TickPosition_Enum_in_parent (decl_QSlider_TickPosition_Enum.defs ()); -static gsi::ClassExt decl_QSlider_TickPosition_Enum_as_child (decl_QSlider_TickPosition_Enum, "TickPosition"); -static gsi::ClassExt decl_QSlider_TickPosition_Enums_as_child (decl_QSlider_TickPosition_Enums, "QFlags_TickPosition"); +static gsi::ClassExt decl_QSlider_TickPosition_Enum_as_child (decl_QSlider_TickPosition_Enum, "QtGui", "TickPosition"); +static gsi::ClassExt decl_QSlider_TickPosition_Enums_as_child (decl_QSlider_TickPosition_Enums, "QtGui", "QFlags_TickPosition"); } diff --git a/src/gsiqt4/gsiDeclQSortFilterProxyModel.cc b/src/gsiqt/qt4/QtGui/gsiDeclQSortFilterProxyModel.cc similarity index 99% rename from src/gsiqt4/gsiDeclQSortFilterProxyModel.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQSortFilterProxyModel.cc index a2d7b0f25..cf89bfa54 100644 --- a/src/gsiqt4/gsiDeclQSortFilterProxyModel.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQSortFilterProxyModel.cc @@ -41,8 +41,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1272,11 +1272,11 @@ static gsi::Methods methods_QSortFilterProxyModel () { gsi::Class &qtdecl_QAbstractProxyModel (); -qt_gsi::QtNativeClass decl_QSortFilterProxyModel (qtdecl_QAbstractProxyModel (), "QSortFilterProxyModel_Native", +qt_gsi::QtNativeClass decl_QSortFilterProxyModel (qtdecl_QAbstractProxyModel (), "QtGui", "QSortFilterProxyModel_Native", methods_QSortFilterProxyModel (), "@hide\n@alias QSortFilterProxyModel"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSortFilterProxyModel () { return decl_QSortFilterProxyModel; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QSortFilterProxyModel () { return decl_QSortFilterProxyModel; } } @@ -3991,7 +3991,7 @@ static gsi::Methods methods_QSortFilterProxyModel_Adaptor () { return methods; } -gsi::Class decl_QSortFilterProxyModel_Adaptor (qtdecl_QSortFilterProxyModel (), "QSortFilterProxyModel", +gsi::Class decl_QSortFilterProxyModel_Adaptor (qtdecl_QSortFilterProxyModel (), "QtGui", "QSortFilterProxyModel", methods_QSortFilterProxyModel_Adaptor (), "@qt\n@brief Binding of QSortFilterProxyModel"); diff --git a/src/gsiqt4/gsiDeclQSound.cc b/src/gsiqt/qt4/QtGui/gsiDeclQSound.cc similarity index 99% rename from src/gsiqt4/gsiDeclQSound.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQSound.cc index d1fa79047..eb65765ed 100644 --- a/src/gsiqt4/gsiDeclQSound.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQSound.cc @@ -34,8 +34,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -320,11 +320,11 @@ static gsi::Methods methods_QSound () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QSound (qtdecl_QObject (), "QSound_Native", +qt_gsi::QtNativeClass decl_QSound (qtdecl_QObject (), "QtGui", "QSound_Native", methods_QSound (), "@hide\n@alias QSound"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSound () { return decl_QSound; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QSound () { return decl_QSound; } } @@ -705,7 +705,7 @@ static gsi::Methods methods_QSound_Adaptor () { return methods; } -gsi::Class decl_QSound_Adaptor (qtdecl_QSound (), "QSound", +gsi::Class decl_QSound_Adaptor (qtdecl_QSound (), "QtGui", "QSound", methods_QSound_Adaptor (), "@qt\n@brief Binding of QSound"); diff --git a/src/gsiqt4/gsiDeclQSpacerItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQSpacerItem.cc similarity index 99% rename from src/gsiqt4/gsiDeclQSpacerItem.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQSpacerItem.cc index b4c96751b..e03cad76e 100644 --- a/src/gsiqt4/gsiDeclQSpacerItem.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQSpacerItem.cc @@ -33,8 +33,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -213,11 +213,11 @@ static gsi::Methods methods_QSpacerItem () { gsi::Class &qtdecl_QLayoutItem (); -gsi::Class decl_QSpacerItem (qtdecl_QLayoutItem (), "QSpacerItem_Native", +gsi::Class decl_QSpacerItem (qtdecl_QLayoutItem (), "QtGui", "QSpacerItem_Native", methods_QSpacerItem (), "@hide\n@alias QSpacerItem"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSpacerItem () { return decl_QSpacerItem; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QSpacerItem () { return decl_QSpacerItem; } } @@ -820,7 +820,7 @@ static gsi::Methods methods_QSpacerItem_Adaptor () { return methods; } -gsi::Class decl_QSpacerItem_Adaptor (qtdecl_QSpacerItem (), "QSpacerItem", +gsi::Class decl_QSpacerItem_Adaptor (qtdecl_QSpacerItem (), "QtGui", "QSpacerItem", methods_QSpacerItem_Adaptor (), "@qt\n@brief Binding of QSpacerItem"); diff --git a/src/gsiqt4/gsiDeclQSpinBox.cc b/src/gsiqt/qt4/QtGui/gsiDeclQSpinBox.cc similarity index 99% rename from src/gsiqt4/gsiDeclQSpinBox.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQSpinBox.cc index 0fb97e8d3..9f877e121 100644 --- a/src/gsiqt4/gsiDeclQSpinBox.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQSpinBox.cc @@ -79,8 +79,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -475,11 +475,11 @@ static gsi::Methods methods_QSpinBox () { gsi::Class &qtdecl_QAbstractSpinBox (); -qt_gsi::QtNativeClass decl_QSpinBox (qtdecl_QAbstractSpinBox (), "QSpinBox_Native", +qt_gsi::QtNativeClass decl_QSpinBox (qtdecl_QAbstractSpinBox (), "QtGui", "QSpinBox_Native", methods_QSpinBox (), "@hide\n@alias QSpinBox"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSpinBox () { return decl_QSpinBox; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QSpinBox () { return decl_QSpinBox; } } @@ -3106,7 +3106,7 @@ static gsi::Methods methods_QSpinBox_Adaptor () { return methods; } -gsi::Class decl_QSpinBox_Adaptor (qtdecl_QSpinBox (), "QSpinBox", +gsi::Class decl_QSpinBox_Adaptor (qtdecl_QSpinBox (), "QtGui", "QSpinBox", methods_QSpinBox_Adaptor (), "@qt\n@brief Binding of QSpinBox"); diff --git a/src/gsiqt4/gsiDeclQSplashScreen.cc b/src/gsiqt/qt4/QtGui/gsiDeclQSplashScreen.cc similarity index 99% rename from src/gsiqt4/gsiDeclQSplashScreen.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQSplashScreen.cc index 090801b14..9248c4f0f 100644 --- a/src/gsiqt4/gsiDeclQSplashScreen.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQSplashScreen.cc @@ -79,8 +79,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -330,11 +330,11 @@ static gsi::Methods methods_QSplashScreen () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QSplashScreen (qtdecl_QWidget (), "QSplashScreen_Native", +qt_gsi::QtNativeClass decl_QSplashScreen (qtdecl_QWidget (), "QtGui", "QSplashScreen_Native", methods_QSplashScreen (), "@hide\n@alias QSplashScreen"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSplashScreen () { return decl_QSplashScreen; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QSplashScreen () { return decl_QSplashScreen; } } @@ -2654,7 +2654,7 @@ static gsi::Methods methods_QSplashScreen_Adaptor () { return methods; } -gsi::Class decl_QSplashScreen_Adaptor (qtdecl_QSplashScreen (), "QSplashScreen", +gsi::Class decl_QSplashScreen_Adaptor (qtdecl_QSplashScreen (), "QtGui", "QSplashScreen", methods_QSplashScreen_Adaptor (), "@qt\n@brief Binding of QSplashScreen"); diff --git a/src/gsiqt4/gsiDeclQSplitter.cc b/src/gsiqt/qt4/QtGui/gsiDeclQSplitter.cc similarity index 99% rename from src/gsiqt4/gsiDeclQSplitter.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQSplitter.cc index 904010387..367374ac8 100644 --- a/src/gsiqt4/gsiDeclQSplitter.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQSplitter.cc @@ -78,8 +78,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -696,11 +696,11 @@ static gsi::Methods methods_QSplitter () { gsi::Class &qtdecl_QFrame (); -qt_gsi::QtNativeClass decl_QSplitter (qtdecl_QFrame (), "QSplitter_Native", +qt_gsi::QtNativeClass decl_QSplitter (qtdecl_QFrame (), "QtGui", "QSplitter_Native", methods_QSplitter (), "@hide\n@alias QSplitter"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSplitter () { return decl_QSplitter; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QSplitter () { return decl_QSplitter; } } @@ -3105,7 +3105,7 @@ static gsi::Methods methods_QSplitter_Adaptor () { return methods; } -gsi::Class decl_QSplitter_Adaptor (qtdecl_QSplitter (), "QSplitter", +gsi::Class decl_QSplitter_Adaptor (qtdecl_QSplitter (), "QtGui", "QSplitter", methods_QSplitter_Adaptor (), "@qt\n@brief Binding of QSplitter"); diff --git a/src/gsiqt4/gsiDeclQSplitterHandle.cc b/src/gsiqt/qt4/QtGui/gsiDeclQSplitterHandle.cc similarity index 99% rename from src/gsiqt4/gsiDeclQSplitterHandle.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQSplitterHandle.cc index 449a32761..2d7b34188 100644 --- a/src/gsiqt4/gsiDeclQSplitterHandle.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQSplitterHandle.cc @@ -78,8 +78,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -294,11 +294,11 @@ static gsi::Methods methods_QSplitterHandle () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QSplitterHandle (qtdecl_QWidget (), "QSplitterHandle_Native", +qt_gsi::QtNativeClass decl_QSplitterHandle (qtdecl_QWidget (), "QtGui", "QSplitterHandle_Native", methods_QSplitterHandle (), "@hide\n@alias QSplitterHandle"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSplitterHandle () { return decl_QSplitterHandle; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QSplitterHandle () { return decl_QSplitterHandle; } } @@ -2545,7 +2545,7 @@ static gsi::Methods methods_QSplitterHandle_Adaptor () { return methods; } -gsi::Class decl_QSplitterHandle_Adaptor (qtdecl_QSplitterHandle (), "QSplitterHandle", +gsi::Class decl_QSplitterHandle_Adaptor (qtdecl_QSplitterHandle (), "QtGui", "QSplitterHandle", methods_QSplitterHandle_Adaptor (), "@qt\n@brief Binding of QSplitterHandle"); diff --git a/src/gsiqt4/gsiDeclQStackedLayout.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStackedLayout.cc similarity index 99% rename from src/gsiqt4/gsiDeclQStackedLayout.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStackedLayout.cc index e395965f7..88c80197f 100644 --- a/src/gsiqt4/gsiDeclQStackedLayout.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStackedLayout.cc @@ -41,8 +41,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -493,11 +493,11 @@ static gsi::Methods methods_QStackedLayout () { gsi::Class &qtdecl_QLayout (); -qt_gsi::QtNativeClass decl_QStackedLayout (qtdecl_QLayout (), "QStackedLayout_Native", +qt_gsi::QtNativeClass decl_QStackedLayout (qtdecl_QLayout (), "QtGui", "QStackedLayout_Native", methods_QStackedLayout (), "@hide\n@alias QStackedLayout"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStackedLayout () { return decl_QStackedLayout; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStackedLayout () { return decl_QStackedLayout; } } @@ -1799,7 +1799,7 @@ static gsi::Methods methods_QStackedLayout_Adaptor () { return methods; } -gsi::Class decl_QStackedLayout_Adaptor (qtdecl_QStackedLayout (), "QStackedLayout", +gsi::Class decl_QStackedLayout_Adaptor (qtdecl_QStackedLayout (), "QtGui", "QStackedLayout", methods_QStackedLayout_Adaptor (), "@qt\n@brief Binding of QStackedLayout"); @@ -1810,18 +1810,18 @@ gsi::Class decl_QStackedLayout_Adaptor (qtdecl_QStackedL namespace qt_gsi { -static gsi::Enum decl_QStackedLayout_StackingMode_Enum ("QStackedLayout_StackingMode", +static gsi::Enum decl_QStackedLayout_StackingMode_Enum ("QtGui", "QStackedLayout_StackingMode", gsi::enum_const ("StackOne", QStackedLayout::StackOne, "@brief Enum constant QStackedLayout::StackOne") + gsi::enum_const ("StackAll", QStackedLayout::StackAll, "@brief Enum constant QStackedLayout::StackAll"), "@qt\n@brief This class represents the QStackedLayout::StackingMode enum"); -static gsi::QFlagsClass decl_QStackedLayout_StackingMode_Enums ("QStackedLayout_QFlags_StackingMode", +static gsi::QFlagsClass decl_QStackedLayout_StackingMode_Enums ("QtGui", "QStackedLayout_QFlags_StackingMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QStackedLayout_StackingMode_Enum_in_parent (decl_QStackedLayout_StackingMode_Enum.defs ()); -static gsi::ClassExt decl_QStackedLayout_StackingMode_Enum_as_child (decl_QStackedLayout_StackingMode_Enum, "StackingMode"); -static gsi::ClassExt decl_QStackedLayout_StackingMode_Enums_as_child (decl_QStackedLayout_StackingMode_Enums, "QFlags_StackingMode"); +static gsi::ClassExt decl_QStackedLayout_StackingMode_Enum_as_child (decl_QStackedLayout_StackingMode_Enum, "QtGui", "StackingMode"); +static gsi::ClassExt decl_QStackedLayout_StackingMode_Enums_as_child (decl_QStackedLayout_StackingMode_Enums, "QtGui", "QFlags_StackingMode"); } diff --git a/src/gsiqt4/gsiDeclQStackedWidget.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStackedWidget.cc similarity index 99% rename from src/gsiqt4/gsiDeclQStackedWidget.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStackedWidget.cc index 3a18457c4..69b261f21 100644 --- a/src/gsiqt4/gsiDeclQStackedWidget.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStackedWidget.cc @@ -77,8 +77,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -404,11 +404,11 @@ static gsi::Methods methods_QStackedWidget () { gsi::Class &qtdecl_QFrame (); -qt_gsi::QtNativeClass decl_QStackedWidget (qtdecl_QFrame (), "QStackedWidget_Native", +qt_gsi::QtNativeClass decl_QStackedWidget (qtdecl_QFrame (), "QtGui", "QStackedWidget_Native", methods_QStackedWidget (), "@hide\n@alias QStackedWidget"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStackedWidget () { return decl_QStackedWidget; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStackedWidget () { return decl_QStackedWidget; } } @@ -2684,7 +2684,7 @@ static gsi::Methods methods_QStackedWidget_Adaptor () { return methods; } -gsi::Class decl_QStackedWidget_Adaptor (qtdecl_QStackedWidget (), "QStackedWidget", +gsi::Class decl_QStackedWidget_Adaptor (qtdecl_QStackedWidget (), "QtGui", "QStackedWidget", methods_QStackedWidget_Adaptor (), "@qt\n@brief Binding of QStackedWidget"); diff --git a/src/gsiqt4/gsiDeclQStandardItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStandardItem.cc similarity index 99% rename from src/gsiqt4/gsiDeclQStandardItem.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStandardItem.cc index c1f8a672c..f42ffc5c0 100644 --- a/src/gsiqt4/gsiDeclQStandardItem.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStandardItem.cc @@ -36,8 +36,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1615,11 +1615,11 @@ static gsi::Methods methods_QStandardItem () { return methods; } -gsi::Class decl_QStandardItem ("QStandardItem_Native", +gsi::Class decl_QStandardItem ("QtGui", "QStandardItem_Native", methods_QStandardItem (), "@hide\n@alias QStandardItem"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStandardItem () { return decl_QStandardItem; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStandardItem () { return decl_QStandardItem; } } @@ -2082,7 +2082,7 @@ static gsi::Methods methods_QStandardItem_Adaptor () { return methods; } -gsi::Class decl_QStandardItem_Adaptor (qtdecl_QStandardItem (), "QStandardItem", +gsi::Class decl_QStandardItem_Adaptor (qtdecl_QStandardItem (), "QtGui", "QStandardItem", methods_QStandardItem_Adaptor (), "@qt\n@brief Binding of QStandardItem"); diff --git a/src/gsiqt4/gsiDeclQStandardItemModel.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStandardItemModel.cc similarity index 99% rename from src/gsiqt4/gsiDeclQStandardItemModel.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStandardItemModel.cc index f60f09317..d78df60f8 100644 --- a/src/gsiqt4/gsiDeclQStandardItemModel.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStandardItemModel.cc @@ -39,8 +39,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1378,11 +1378,11 @@ static gsi::Methods methods_QStandardItemModel () { gsi::Class &qtdecl_QAbstractItemModel (); -qt_gsi::QtNativeClass decl_QStandardItemModel (qtdecl_QAbstractItemModel (), "QStandardItemModel_Native", +qt_gsi::QtNativeClass decl_QStandardItemModel (qtdecl_QAbstractItemModel (), "QtGui", "QStandardItemModel_Native", methods_QStandardItemModel (), "@hide\n@alias QStandardItemModel"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStandardItemModel () { return decl_QStandardItemModel; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStandardItemModel () { return decl_QStandardItemModel; } } @@ -3779,7 +3779,7 @@ static gsi::Methods methods_QStandardItemModel_Adaptor () { return methods; } -gsi::Class decl_QStandardItemModel_Adaptor (qtdecl_QStandardItemModel (), "QStandardItemModel", +gsi::Class decl_QStandardItemModel_Adaptor (qtdecl_QStandardItemModel (), "QtGui", "QStandardItemModel", methods_QStandardItemModel_Adaptor (), "@qt\n@brief Binding of QStandardItemModel"); diff --git a/src/gsiqt4/gsiDeclQStatusBar.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStatusBar.cc similarity index 99% rename from src/gsiqt4/gsiDeclQStatusBar.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStatusBar.cc index b8bf2d32f..c7d020fa2 100644 --- a/src/gsiqt4/gsiDeclQStatusBar.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStatusBar.cc @@ -77,8 +77,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -424,11 +424,11 @@ static gsi::Methods methods_QStatusBar () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QStatusBar (qtdecl_QWidget (), "QStatusBar_Native", +qt_gsi::QtNativeClass decl_QStatusBar (qtdecl_QWidget (), "QtGui", "QStatusBar_Native", methods_QStatusBar (), "@hide\n@alias QStatusBar"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStatusBar () { return decl_QStatusBar; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStatusBar () { return decl_QStatusBar; } } @@ -2696,7 +2696,7 @@ static gsi::Methods methods_QStatusBar_Adaptor () { return methods; } -gsi::Class decl_QStatusBar_Adaptor (qtdecl_QStatusBar (), "QStatusBar", +gsi::Class decl_QStatusBar_Adaptor (qtdecl_QStatusBar (), "QtGui", "QStatusBar", methods_QStatusBar_Adaptor (), "@qt\n@brief Binding of QStatusBar"); diff --git a/src/gsiqt4/gsiDeclQStatusTipEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStatusTipEvent.cc similarity index 92% rename from src/gsiqt4/gsiDeclQStatusTipEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStatusTipEvent.cc index 4cd348c47..9f63b58a4 100644 --- a/src/gsiqt4/gsiDeclQStatusTipEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStatusTipEvent.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -62,11 +62,11 @@ static gsi::Methods methods_QStatusTipEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QStatusTipEvent (qtdecl_QEvent (), "QStatusTipEvent_Native", +gsi::Class decl_QStatusTipEvent (qtdecl_QEvent (), "QtGui", "QStatusTipEvent_Native", methods_QStatusTipEvent (), "@hide\n@alias QStatusTipEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStatusTipEvent () { return decl_QStatusTipEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStatusTipEvent () { return decl_QStatusTipEvent; } } @@ -117,7 +117,7 @@ static gsi::Methods methods_QStatusTipEvent_Adaptor () { return methods; } -gsi::Class decl_QStatusTipEvent_Adaptor (qtdecl_QStatusTipEvent (), "QStatusTipEvent", +gsi::Class decl_QStatusTipEvent_Adaptor (qtdecl_QStatusTipEvent (), "QtGui", "QStatusTipEvent", methods_QStatusTipEvent_Adaptor (), "@qt\n@brief Binding of QStatusTipEvent"); diff --git a/src/gsiqt4/gsiDeclQStringListModel.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStringListModel.cc similarity index 99% rename from src/gsiqt4/gsiDeclQStringListModel.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStringListModel.cc index 0b53841ef..38e3606ee 100644 --- a/src/gsiqt4/gsiDeclQStringListModel.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStringListModel.cc @@ -38,8 +38,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -390,11 +390,11 @@ static gsi::Methods methods_QStringListModel () { gsi::Class &qtdecl_QAbstractListModel (); -qt_gsi::QtNativeClass decl_QStringListModel (qtdecl_QAbstractListModel (), "QStringListModel_Native", +qt_gsi::QtNativeClass decl_QStringListModel (qtdecl_QAbstractListModel (), "QtGui", "QStringListModel_Native", methods_QStringListModel (), "@hide\n@alias QStringListModel"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStringListModel () { return decl_QStringListModel; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStringListModel () { return decl_QStringListModel; } } @@ -2640,7 +2640,7 @@ static gsi::Methods methods_QStringListModel_Adaptor () { return methods; } -gsi::Class decl_QStringListModel_Adaptor (qtdecl_QStringListModel (), "QStringListModel", +gsi::Class decl_QStringListModel_Adaptor (qtdecl_QStringListModel (), "QtGui", "QStringListModel", methods_QStringListModel_Adaptor (), "@qt\n@brief Binding of QStringListModel"); diff --git a/src/gsiqt4/gsiDeclQStyle.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyle.cc similarity index 98% rename from src/gsiqt4/gsiDeclQStyle.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyle.cc index f24f5ab25..bb9fef8e6 100644 --- a/src/gsiqt4/gsiDeclQStyle.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyle.cc @@ -47,8 +47,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1009,11 +1009,11 @@ static gsi::Methods methods_QStyle () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QStyle (qtdecl_QObject (), "QStyle_Native", +qt_gsi::QtNativeClass decl_QStyle (qtdecl_QObject (), "QtGui", "QStyle_Native", methods_QStyle (), "@hide\n@alias QStyle"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyle () { return decl_QStyle; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyle () { return decl_QStyle; } } @@ -2486,7 +2486,7 @@ static gsi::Methods methods_QStyle_Adaptor () { return methods; } -gsi::Class decl_QStyle_Adaptor (qtdecl_QStyle (), "QStyle", +gsi::Class decl_QStyle_Adaptor (qtdecl_QStyle (), "QtGui", "QStyle", methods_QStyle_Adaptor (), "@qt\n@brief Binding of QStyle"); @@ -2497,7 +2497,7 @@ gsi::Class decl_QStyle_Adaptor (qtdecl_QStyle (), "QStyle", namespace qt_gsi { -static gsi::Enum decl_QStyle_ComplexControl_Enum ("QStyle_ComplexControl", +static gsi::Enum decl_QStyle_ComplexControl_Enum ("QtGui", "QStyle_ComplexControl", gsi::enum_const ("CC_SpinBox", QStyle::CC_SpinBox, "@brief Enum constant QStyle::CC_SpinBox") + gsi::enum_const ("CC_ComboBox", QStyle::CC_ComboBox, "@brief Enum constant QStyle::CC_ComboBox") + gsi::enum_const ("CC_ScrollBar", QStyle::CC_ScrollBar, "@brief Enum constant QStyle::CC_ScrollBar") + @@ -2511,13 +2511,13 @@ static gsi::Enum decl_QStyle_ComplexControl_Enum ("QStyl gsi::enum_const ("CC_CustomBase", QStyle::CC_CustomBase, "@brief Enum constant QStyle::CC_CustomBase"), "@qt\n@brief This class represents the QStyle::ComplexControl enum"); -static gsi::QFlagsClass decl_QStyle_ComplexControl_Enums ("QStyle_QFlags_ComplexControl", +static gsi::QFlagsClass decl_QStyle_ComplexControl_Enums ("QtGui", "QStyle_QFlags_ComplexControl", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QStyle_ComplexControl_Enum_in_parent (decl_QStyle_ComplexControl_Enum.defs ()); -static gsi::ClassExt decl_QStyle_ComplexControl_Enum_as_child (decl_QStyle_ComplexControl_Enum, "ComplexControl"); -static gsi::ClassExt decl_QStyle_ComplexControl_Enums_as_child (decl_QStyle_ComplexControl_Enums, "QFlags_ComplexControl"); +static gsi::ClassExt decl_QStyle_ComplexControl_Enum_as_child (decl_QStyle_ComplexControl_Enum, "QtGui", "ComplexControl"); +static gsi::ClassExt decl_QStyle_ComplexControl_Enums_as_child (decl_QStyle_ComplexControl_Enums, "QtGui", "QFlags_ComplexControl"); } @@ -2526,7 +2526,7 @@ static gsi::ClassExt decl_QStyle_ComplexControl_Enums_as_child (decl_QSt namespace qt_gsi { -static gsi::Enum decl_QStyle_ContentsType_Enum ("QStyle_ContentsType", +static gsi::Enum decl_QStyle_ContentsType_Enum ("QtGui", "QStyle_ContentsType", gsi::enum_const ("CT_PushButton", QStyle::CT_PushButton, "@brief Enum constant QStyle::CT_PushButton") + gsi::enum_const ("CT_CheckBox", QStyle::CT_CheckBox, "@brief Enum constant QStyle::CT_CheckBox") + gsi::enum_const ("CT_RadioButton", QStyle::CT_RadioButton, "@brief Enum constant QStyle::CT_RadioButton") + @@ -2555,13 +2555,13 @@ static gsi::Enum decl_QStyle_ContentsType_Enum ("QStyle_Co gsi::enum_const ("CT_CustomBase", QStyle::CT_CustomBase, "@brief Enum constant QStyle::CT_CustomBase"), "@qt\n@brief This class represents the QStyle::ContentsType enum"); -static gsi::QFlagsClass decl_QStyle_ContentsType_Enums ("QStyle_QFlags_ContentsType", +static gsi::QFlagsClass decl_QStyle_ContentsType_Enums ("QtGui", "QStyle_QFlags_ContentsType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QStyle_ContentsType_Enum_in_parent (decl_QStyle_ContentsType_Enum.defs ()); -static gsi::ClassExt decl_QStyle_ContentsType_Enum_as_child (decl_QStyle_ContentsType_Enum, "ContentsType"); -static gsi::ClassExt decl_QStyle_ContentsType_Enums_as_child (decl_QStyle_ContentsType_Enums, "QFlags_ContentsType"); +static gsi::ClassExt decl_QStyle_ContentsType_Enum_as_child (decl_QStyle_ContentsType_Enum, "QtGui", "ContentsType"); +static gsi::ClassExt decl_QStyle_ContentsType_Enums_as_child (decl_QStyle_ContentsType_Enums, "QtGui", "QFlags_ContentsType"); } @@ -2570,7 +2570,7 @@ static gsi::ClassExt decl_QStyle_ContentsType_Enums_as_child (decl_QStyl namespace qt_gsi { -static gsi::Enum decl_QStyle_ControlElement_Enum ("QStyle_ControlElement", +static gsi::Enum decl_QStyle_ControlElement_Enum ("QtGui", "QStyle_ControlElement", gsi::enum_const ("CE_PushButton", QStyle::CE_PushButton, "@brief Enum constant QStyle::CE_PushButton") + gsi::enum_const ("CE_PushButtonBevel", QStyle::CE_PushButtonBevel, "@brief Enum constant QStyle::CE_PushButtonBevel") + gsi::enum_const ("CE_PushButtonLabel", QStyle::CE_PushButtonLabel, "@brief Enum constant QStyle::CE_PushButtonLabel") + @@ -2622,13 +2622,13 @@ static gsi::Enum decl_QStyle_ControlElement_Enum ("QStyl gsi::enum_const ("CE_CustomBase", QStyle::CE_CustomBase, "@brief Enum constant QStyle::CE_CustomBase"), "@qt\n@brief This class represents the QStyle::ControlElement enum"); -static gsi::QFlagsClass decl_QStyle_ControlElement_Enums ("QStyle_QFlags_ControlElement", +static gsi::QFlagsClass decl_QStyle_ControlElement_Enums ("QtGui", "QStyle_QFlags_ControlElement", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QStyle_ControlElement_Enum_in_parent (decl_QStyle_ControlElement_Enum.defs ()); -static gsi::ClassExt decl_QStyle_ControlElement_Enum_as_child (decl_QStyle_ControlElement_Enum, "ControlElement"); -static gsi::ClassExt decl_QStyle_ControlElement_Enums_as_child (decl_QStyle_ControlElement_Enums, "QFlags_ControlElement"); +static gsi::ClassExt decl_QStyle_ControlElement_Enum_as_child (decl_QStyle_ControlElement_Enum, "QtGui", "ControlElement"); +static gsi::ClassExt decl_QStyle_ControlElement_Enums_as_child (decl_QStyle_ControlElement_Enums, "QtGui", "QFlags_ControlElement"); } @@ -2637,7 +2637,7 @@ static gsi::ClassExt decl_QStyle_ControlElement_Enums_as_child (decl_QSt namespace qt_gsi { -static gsi::Enum decl_QStyle_PixelMetric_Enum ("QStyle_PixelMetric", +static gsi::Enum decl_QStyle_PixelMetric_Enum ("QtGui", "QStyle_PixelMetric", gsi::enum_const ("PM_ButtonMargin", QStyle::PM_ButtonMargin, "@brief Enum constant QStyle::PM_ButtonMargin") + gsi::enum_const ("PM_ButtonDefaultIndicator", QStyle::PM_ButtonDefaultIndicator, "@brief Enum constant QStyle::PM_ButtonDefaultIndicator") + gsi::enum_const ("PM_MenuButtonIndicator", QStyle::PM_MenuButtonIndicator, "@brief Enum constant QStyle::PM_MenuButtonIndicator") + @@ -2735,13 +2735,13 @@ static gsi::Enum decl_QStyle_PixelMetric_Enum ("QStyle_Pixe gsi::enum_const ("PM_CustomBase", QStyle::PM_CustomBase, "@brief Enum constant QStyle::PM_CustomBase"), "@qt\n@brief This class represents the QStyle::PixelMetric enum"); -static gsi::QFlagsClass decl_QStyle_PixelMetric_Enums ("QStyle_QFlags_PixelMetric", +static gsi::QFlagsClass decl_QStyle_PixelMetric_Enums ("QtGui", "QStyle_QFlags_PixelMetric", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QStyle_PixelMetric_Enum_in_parent (decl_QStyle_PixelMetric_Enum.defs ()); -static gsi::ClassExt decl_QStyle_PixelMetric_Enum_as_child (decl_QStyle_PixelMetric_Enum, "PixelMetric"); -static gsi::ClassExt decl_QStyle_PixelMetric_Enums_as_child (decl_QStyle_PixelMetric_Enums, "QFlags_PixelMetric"); +static gsi::ClassExt decl_QStyle_PixelMetric_Enum_as_child (decl_QStyle_PixelMetric_Enum, "QtGui", "PixelMetric"); +static gsi::ClassExt decl_QStyle_PixelMetric_Enums_as_child (decl_QStyle_PixelMetric_Enums, "QtGui", "QFlags_PixelMetric"); } @@ -2750,7 +2750,7 @@ static gsi::ClassExt decl_QStyle_PixelMetric_Enums_as_child (decl_QStyle namespace qt_gsi { -static gsi::Enum decl_QStyle_PrimitiveElement_Enum ("QStyle_PrimitiveElement", +static gsi::Enum decl_QStyle_PrimitiveElement_Enum ("QtGui", "QStyle_PrimitiveElement", gsi::enum_const ("PE_Q3CheckListController", QStyle::PE_Q3CheckListController, "@brief Enum constant QStyle::PE_Q3CheckListController") + gsi::enum_const ("PE_Q3CheckListExclusiveIndicator", QStyle::PE_Q3CheckListExclusiveIndicator, "@brief Enum constant QStyle::PE_Q3CheckListExclusiveIndicator") + gsi::enum_const ("PE_Q3CheckListIndicator", QStyle::PE_Q3CheckListIndicator, "@brief Enum constant QStyle::PE_Q3CheckListIndicator") + @@ -2810,13 +2810,13 @@ static gsi::Enum decl_QStyle_PrimitiveElement_Enum ("Q gsi::enum_const ("PE_CustomBase", QStyle::PE_CustomBase, "@brief Enum constant QStyle::PE_CustomBase"), "@qt\n@brief This class represents the QStyle::PrimitiveElement enum"); -static gsi::QFlagsClass decl_QStyle_PrimitiveElement_Enums ("QStyle_QFlags_PrimitiveElement", +static gsi::QFlagsClass decl_QStyle_PrimitiveElement_Enums ("QtGui", "QStyle_QFlags_PrimitiveElement", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QStyle_PrimitiveElement_Enum_in_parent (decl_QStyle_PrimitiveElement_Enum.defs ()); -static gsi::ClassExt decl_QStyle_PrimitiveElement_Enum_as_child (decl_QStyle_PrimitiveElement_Enum, "PrimitiveElement"); -static gsi::ClassExt decl_QStyle_PrimitiveElement_Enums_as_child (decl_QStyle_PrimitiveElement_Enums, "QFlags_PrimitiveElement"); +static gsi::ClassExt decl_QStyle_PrimitiveElement_Enum_as_child (decl_QStyle_PrimitiveElement_Enum, "QtGui", "PrimitiveElement"); +static gsi::ClassExt decl_QStyle_PrimitiveElement_Enums_as_child (decl_QStyle_PrimitiveElement_Enums, "QtGui", "QFlags_PrimitiveElement"); } @@ -2825,7 +2825,7 @@ static gsi::ClassExt decl_QStyle_PrimitiveElement_Enums_as_child (decl_Q namespace qt_gsi { -static gsi::Enum decl_QStyle_StandardPixmap_Enum ("QStyle_StandardPixmap", +static gsi::Enum decl_QStyle_StandardPixmap_Enum ("QtGui", "QStyle_StandardPixmap", gsi::enum_const ("SP_TitleBarMenuButton", QStyle::SP_TitleBarMenuButton, "@brief Enum constant QStyle::SP_TitleBarMenuButton") + gsi::enum_const ("SP_TitleBarMinButton", QStyle::SP_TitleBarMinButton, "@brief Enum constant QStyle::SP_TitleBarMinButton") + gsi::enum_const ("SP_TitleBarMaxButton", QStyle::SP_TitleBarMaxButton, "@brief Enum constant QStyle::SP_TitleBarMaxButton") + @@ -2898,13 +2898,13 @@ static gsi::Enum decl_QStyle_StandardPixmap_Enum ("QStyl gsi::enum_const ("SP_CustomBase", QStyle::SP_CustomBase, "@brief Enum constant QStyle::SP_CustomBase"), "@qt\n@brief This class represents the QStyle::StandardPixmap enum"); -static gsi::QFlagsClass decl_QStyle_StandardPixmap_Enums ("QStyle_QFlags_StandardPixmap", +static gsi::QFlagsClass decl_QStyle_StandardPixmap_Enums ("QtGui", "QStyle_QFlags_StandardPixmap", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QStyle_StandardPixmap_Enum_in_parent (decl_QStyle_StandardPixmap_Enum.defs ()); -static gsi::ClassExt decl_QStyle_StandardPixmap_Enum_as_child (decl_QStyle_StandardPixmap_Enum, "StandardPixmap"); -static gsi::ClassExt decl_QStyle_StandardPixmap_Enums_as_child (decl_QStyle_StandardPixmap_Enums, "QFlags_StandardPixmap"); +static gsi::ClassExt decl_QStyle_StandardPixmap_Enum_as_child (decl_QStyle_StandardPixmap_Enum, "QtGui", "StandardPixmap"); +static gsi::ClassExt decl_QStyle_StandardPixmap_Enums_as_child (decl_QStyle_StandardPixmap_Enums, "QtGui", "QFlags_StandardPixmap"); } @@ -2913,7 +2913,7 @@ static gsi::ClassExt decl_QStyle_StandardPixmap_Enums_as_child (decl_QSt namespace qt_gsi { -static gsi::Enum decl_QStyle_StyleHint_Enum ("QStyle_StyleHint", +static gsi::Enum decl_QStyle_StyleHint_Enum ("QtGui", "QStyle_StyleHint", gsi::enum_const ("SH_EtchDisabledText", QStyle::SH_EtchDisabledText, "@brief Enum constant QStyle::SH_EtchDisabledText") + gsi::enum_const ("SH_DitherDisabledText", QStyle::SH_DitherDisabledText, "@brief Enum constant QStyle::SH_DitherDisabledText") + gsi::enum_const ("SH_ScrollBar_MiddleClickAbsolutePosition", QStyle::SH_ScrollBar_MiddleClickAbsolutePosition, "@brief Enum constant QStyle::SH_ScrollBar_MiddleClickAbsolutePosition") + @@ -3016,13 +3016,13 @@ static gsi::Enum decl_QStyle_StyleHint_Enum ("QStyle_StyleHin gsi::enum_const ("SH_CustomBase", QStyle::SH_CustomBase, "@brief Enum constant QStyle::SH_CustomBase"), "@qt\n@brief This class represents the QStyle::StyleHint enum"); -static gsi::QFlagsClass decl_QStyle_StyleHint_Enums ("QStyle_QFlags_StyleHint", +static gsi::QFlagsClass decl_QStyle_StyleHint_Enums ("QtGui", "QStyle_QFlags_StyleHint", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QStyle_StyleHint_Enum_in_parent (decl_QStyle_StyleHint_Enum.defs ()); -static gsi::ClassExt decl_QStyle_StyleHint_Enum_as_child (decl_QStyle_StyleHint_Enum, "StyleHint"); -static gsi::ClassExt decl_QStyle_StyleHint_Enums_as_child (decl_QStyle_StyleHint_Enums, "QFlags_StyleHint"); +static gsi::ClassExt decl_QStyle_StyleHint_Enum_as_child (decl_QStyle_StyleHint_Enum, "QtGui", "StyleHint"); +static gsi::ClassExt decl_QStyle_StyleHint_Enums_as_child (decl_QStyle_StyleHint_Enums, "QtGui", "QFlags_StyleHint"); } @@ -3031,7 +3031,7 @@ static gsi::ClassExt decl_QStyle_StyleHint_Enums_as_child (decl_QStyle_S namespace qt_gsi { -static gsi::Enum decl_QStyle_SubControl_Enum ("QStyle_SubControl", +static gsi::Enum decl_QStyle_SubControl_Enum ("QtGui", "QStyle_SubControl", gsi::enum_const ("SC_None", QStyle::SC_None, "@brief Enum constant QStyle::SC_None") + gsi::enum_const ("SC_ScrollBarAddLine", QStyle::SC_ScrollBarAddLine, "@brief Enum constant QStyle::SC_ScrollBarAddLine") + gsi::enum_const ("SC_ScrollBarSubLine", QStyle::SC_ScrollBarSubLine, "@brief Enum constant QStyle::SC_ScrollBarSubLine") + @@ -3080,13 +3080,13 @@ static gsi::Enum decl_QStyle_SubControl_Enum ("QStyle_SubCon gsi::enum_const ("SC_All", QStyle::SC_All, "@brief Enum constant QStyle::SC_All"), "@qt\n@brief This class represents the QStyle::SubControl enum"); -static gsi::QFlagsClass decl_QStyle_SubControl_Enums ("QStyle_QFlags_SubControl", +static gsi::QFlagsClass decl_QStyle_SubControl_Enums ("QtGui", "QStyle_QFlags_SubControl", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QStyle_SubControl_Enum_in_parent (decl_QStyle_SubControl_Enum.defs ()); -static gsi::ClassExt decl_QStyle_SubControl_Enum_as_child (decl_QStyle_SubControl_Enum, "SubControl"); -static gsi::ClassExt decl_QStyle_SubControl_Enums_as_child (decl_QStyle_SubControl_Enums, "QFlags_SubControl"); +static gsi::ClassExt decl_QStyle_SubControl_Enum_as_child (decl_QStyle_SubControl_Enum, "QtGui", "SubControl"); +static gsi::ClassExt decl_QStyle_SubControl_Enums_as_child (decl_QStyle_SubControl_Enums, "QtGui", "QFlags_SubControl"); } @@ -3095,7 +3095,7 @@ static gsi::ClassExt decl_QStyle_SubControl_Enums_as_child (decl_QStyle_ namespace qt_gsi { -static gsi::Enum decl_QStyle_SubElement_Enum ("QStyle_SubElement", +static gsi::Enum decl_QStyle_SubElement_Enum ("QtGui", "QStyle_SubElement", gsi::enum_const ("SE_PushButtonContents", QStyle::SE_PushButtonContents, "@brief Enum constant QStyle::SE_PushButtonContents") + gsi::enum_const ("SE_PushButtonFocusRect", QStyle::SE_PushButtonFocusRect, "@brief Enum constant QStyle::SE_PushButtonFocusRect") + gsi::enum_const ("SE_CheckBoxIndicator", QStyle::SE_CheckBoxIndicator, "@brief Enum constant QStyle::SE_CheckBoxIndicator") + @@ -3164,13 +3164,13 @@ static gsi::Enum decl_QStyle_SubElement_Enum ("QStyle_SubEle gsi::enum_const ("SE_CustomBase", QStyle::SE_CustomBase, "@brief Enum constant QStyle::SE_CustomBase"), "@qt\n@brief This class represents the QStyle::SubElement enum"); -static gsi::QFlagsClass decl_QStyle_SubElement_Enums ("QStyle_QFlags_SubElement", +static gsi::QFlagsClass decl_QStyle_SubElement_Enums ("QtGui", "QStyle_QFlags_SubElement", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QStyle_SubElement_Enum_in_parent (decl_QStyle_SubElement_Enum.defs ()); -static gsi::ClassExt decl_QStyle_SubElement_Enum_as_child (decl_QStyle_SubElement_Enum, "SubElement"); -static gsi::ClassExt decl_QStyle_SubElement_Enums_as_child (decl_QStyle_SubElement_Enums, "QFlags_SubElement"); +static gsi::ClassExt decl_QStyle_SubElement_Enum_as_child (decl_QStyle_SubElement_Enum, "QtGui", "SubElement"); +static gsi::ClassExt decl_QStyle_SubElement_Enums_as_child (decl_QStyle_SubElement_Enums, "QtGui", "QFlags_SubElement"); } diff --git a/src/gsiqt4/gsiDeclQStyleFactory.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleFactory.cc similarity index 93% rename from src/gsiqt4/gsiDeclQStyleFactory.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleFactory.cc index 5af782223..c4eb68b2c 100644 --- a/src/gsiqt4/gsiDeclQStyleFactory.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleFactory.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -98,12 +98,12 @@ static gsi::Methods methods_QStyleFactory () { return methods; } -gsi::Class decl_QStyleFactory ("QStyleFactory", +gsi::Class decl_QStyleFactory ("QtGui", "QStyleFactory", methods_QStyleFactory (), "@qt\n@brief Binding of QStyleFactory"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleFactory () { return decl_QStyleFactory; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleFactory () { return decl_QStyleFactory; } } diff --git a/src/gsiqt4/gsiDeclQStyleHintReturn.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleHintReturn.cc similarity index 90% rename from src/gsiqt4/gsiDeclQStyleHintReturn.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleHintReturn.cc index 0f6bfc292..e79a9ecb9 100644 --- a/src/gsiqt4/gsiDeclQStyleHintReturn.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleHintReturn.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -68,12 +68,12 @@ static gsi::Methods methods_QStyleHintReturn () { return methods; } -gsi::Class decl_QStyleHintReturn ("QStyleHintReturn", +gsi::Class decl_QStyleHintReturn ("QtGui", "QStyleHintReturn", methods_QStyleHintReturn (), "@qt\n@brief Binding of QStyleHintReturn"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleHintReturn () { return decl_QStyleHintReturn; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleHintReturn () { return decl_QStyleHintReturn; } } diff --git a/src/gsiqt4/gsiDeclQStyleHintReturnMask.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleHintReturnMask.cc similarity index 89% rename from src/gsiqt4/gsiDeclQStyleHintReturnMask.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleHintReturnMask.cc index 56d011895..495fc6276 100644 --- a/src/gsiqt4/gsiDeclQStyleHintReturnMask.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleHintReturnMask.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -63,12 +63,12 @@ static gsi::Methods methods_QStyleHintReturnMask () { gsi::Class &qtdecl_QStyleHintReturn (); -gsi::Class decl_QStyleHintReturnMask (qtdecl_QStyleHintReturn (), "QStyleHintReturnMask", +gsi::Class decl_QStyleHintReturnMask (qtdecl_QStyleHintReturn (), "QtGui", "QStyleHintReturnMask", methods_QStyleHintReturnMask (), "@qt\n@brief Binding of QStyleHintReturnMask"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleHintReturnMask () { return decl_QStyleHintReturnMask; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleHintReturnMask () { return decl_QStyleHintReturnMask; } } diff --git a/src/gsiqt4/gsiDeclQStyleHintReturnVariant.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleHintReturnVariant.cc similarity index 89% rename from src/gsiqt4/gsiDeclQStyleHintReturnVariant.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleHintReturnVariant.cc index e89b0c8f6..99e70162f 100644 --- a/src/gsiqt4/gsiDeclQStyleHintReturnVariant.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleHintReturnVariant.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -63,12 +63,12 @@ static gsi::Methods methods_QStyleHintReturnVariant () { gsi::Class &qtdecl_QStyleHintReturn (); -gsi::Class decl_QStyleHintReturnVariant (qtdecl_QStyleHintReturn (), "QStyleHintReturnVariant", +gsi::Class decl_QStyleHintReturnVariant (qtdecl_QStyleHintReturn (), "QtGui", "QStyleHintReturnVariant", methods_QStyleHintReturnVariant (), "@qt\n@brief Binding of QStyleHintReturnVariant"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleHintReturnVariant () { return decl_QStyleHintReturnVariant; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleHintReturnVariant () { return decl_QStyleHintReturnVariant; } } diff --git a/src/gsiqt4/gsiDeclQStyleOption.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOption.cc similarity index 95% rename from src/gsiqt4/gsiDeclQStyleOption.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOption.cc index c05683785..663ba9c11 100644 --- a/src/gsiqt4/gsiDeclQStyleOption.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOption.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -151,12 +151,12 @@ static gsi::Methods methods_QStyleOption () { return methods; } -gsi::Class decl_QStyleOption ("QStyleOption", +gsi::Class decl_QStyleOption ("QtGui", "QStyleOption", methods_QStyleOption (), "@qt\n@brief Binding of QStyleOption"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOption () { return decl_QStyleOption; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOption () { return decl_QStyleOption; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionButton.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionButton.cc similarity index 93% rename from src/gsiqt4/gsiDeclQStyleOptionButton.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionButton.cc index 22682cb13..45567893a 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionButton.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionButton.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -85,12 +85,12 @@ static gsi::Methods methods_QStyleOptionButton () { gsi::Class &qtdecl_QStyleOption (); -gsi::Class decl_QStyleOptionButton (qtdecl_QStyleOption (), "QStyleOptionButton", +gsi::Class decl_QStyleOptionButton (qtdecl_QStyleOption (), "QtGui", "QStyleOptionButton", methods_QStyleOptionButton (), "@qt\n@brief Binding of QStyleOptionButton"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionButton () { return decl_QStyleOptionButton; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionButton () { return decl_QStyleOptionButton; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionComboBox.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionComboBox.cc similarity index 92% rename from src/gsiqt4/gsiDeclQStyleOptionComboBox.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionComboBox.cc index 5d4b531cc..4bcd4b40d 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionComboBox.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionComboBox.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -85,12 +85,12 @@ static gsi::Methods methods_QStyleOptionComboBox () { gsi::Class &qtdecl_QStyleOptionComplex (); -gsi::Class decl_QStyleOptionComboBox (qtdecl_QStyleOptionComplex (), "QStyleOptionComboBox", +gsi::Class decl_QStyleOptionComboBox (qtdecl_QStyleOptionComplex (), "QtGui", "QStyleOptionComboBox", methods_QStyleOptionComboBox (), "@qt\n@brief Binding of QStyleOptionComboBox"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionComboBox () { return decl_QStyleOptionComboBox; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionComboBox () { return decl_QStyleOptionComboBox; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionComplex.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionComplex.cc similarity index 93% rename from src/gsiqt4/gsiDeclQStyleOptionComplex.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionComplex.cc index 2ce2b909f..cd236b3ac 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionComplex.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionComplex.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -92,12 +92,12 @@ static gsi::Methods methods_QStyleOptionComplex () { gsi::Class &qtdecl_QStyleOption (); -gsi::Class decl_QStyleOptionComplex (qtdecl_QStyleOption (), "QStyleOptionComplex", +gsi::Class decl_QStyleOptionComplex (qtdecl_QStyleOption (), "QtGui", "QStyleOptionComplex", methods_QStyleOptionComplex (), "@qt\n@brief Binding of QStyleOptionComplex"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionComplex () { return decl_QStyleOptionComplex; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionComplex () { return decl_QStyleOptionComplex; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionDockWidget.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionDockWidget.cc similarity index 92% rename from src/gsiqt4/gsiDeclQStyleOptionDockWidget.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionDockWidget.cc index 1155d4c6e..ca3c43639 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionDockWidget.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionDockWidget.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -85,12 +85,12 @@ static gsi::Methods methods_QStyleOptionDockWidget () { gsi::Class &qtdecl_QStyleOption (); -gsi::Class decl_QStyleOptionDockWidget (qtdecl_QStyleOption (), "QStyleOptionDockWidget", +gsi::Class decl_QStyleOptionDockWidget (qtdecl_QStyleOption (), "QtGui", "QStyleOptionDockWidget", methods_QStyleOptionDockWidget (), "@qt\n@brief Binding of QStyleOptionDockWidget"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionDockWidget () { return decl_QStyleOptionDockWidget; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionDockWidget () { return decl_QStyleOptionDockWidget; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionFocusRect.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionFocusRect.cc similarity index 92% rename from src/gsiqt4/gsiDeclQStyleOptionFocusRect.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionFocusRect.cc index 50e77ba40..d65d343f3 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionFocusRect.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionFocusRect.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -85,12 +85,12 @@ static gsi::Methods methods_QStyleOptionFocusRect () { gsi::Class &qtdecl_QStyleOption (); -gsi::Class decl_QStyleOptionFocusRect (qtdecl_QStyleOption (), "QStyleOptionFocusRect", +gsi::Class decl_QStyleOptionFocusRect (qtdecl_QStyleOption (), "QtGui", "QStyleOptionFocusRect", methods_QStyleOptionFocusRect (), "@qt\n@brief Binding of QStyleOptionFocusRect"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionFocusRect () { return decl_QStyleOptionFocusRect; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionFocusRect () { return decl_QStyleOptionFocusRect; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionFrame.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionFrame.cc similarity index 93% rename from src/gsiqt4/gsiDeclQStyleOptionFrame.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionFrame.cc index 0b3079315..b3ad37c77 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionFrame.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionFrame.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -85,12 +85,12 @@ static gsi::Methods methods_QStyleOptionFrame () { gsi::Class &qtdecl_QStyleOption (); -gsi::Class decl_QStyleOptionFrame (qtdecl_QStyleOption (), "QStyleOptionFrame", +gsi::Class decl_QStyleOptionFrame (qtdecl_QStyleOption (), "QtGui", "QStyleOptionFrame", methods_QStyleOptionFrame (), "@qt\n@brief Binding of QStyleOptionFrame"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionFrame () { return decl_QStyleOptionFrame; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionFrame () { return decl_QStyleOptionFrame; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionFrameV2.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionFrameV2.cc similarity index 95% rename from src/gsiqt4/gsiDeclQStyleOptionFrameV2.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionFrameV2.cc index cf1e3f963..ca0b3d81e 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionFrameV2.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionFrameV2.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -125,12 +125,12 @@ static gsi::Methods methods_QStyleOptionFrameV2 () { gsi::Class &qtdecl_QStyleOptionFrame (); -gsi::Class decl_QStyleOptionFrameV2 (qtdecl_QStyleOptionFrame (), "QStyleOptionFrameV2", +gsi::Class decl_QStyleOptionFrameV2 (qtdecl_QStyleOptionFrame (), "QtGui", "QStyleOptionFrameV2", methods_QStyleOptionFrameV2 (), "@qt\n@brief Binding of QStyleOptionFrameV2"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionFrameV2 () { return decl_QStyleOptionFrameV2; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionFrameV2 () { return decl_QStyleOptionFrameV2; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionFrameV3.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionFrameV3.cc similarity index 95% rename from src/gsiqt4/gsiDeclQStyleOptionFrameV3.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionFrameV3.cc index 6ab384260..bfc6ab533 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionFrameV3.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionFrameV3.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -125,12 +125,12 @@ static gsi::Methods methods_QStyleOptionFrameV3 () { gsi::Class &qtdecl_QStyleOptionFrameV2 (); -gsi::Class decl_QStyleOptionFrameV3 (qtdecl_QStyleOptionFrameV2 (), "QStyleOptionFrameV3", +gsi::Class decl_QStyleOptionFrameV3 (qtdecl_QStyleOptionFrameV2 (), "QtGui", "QStyleOptionFrameV3", methods_QStyleOptionFrameV3 (), "@qt\n@brief Binding of QStyleOptionFrameV3"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionFrameV3 () { return decl_QStyleOptionFrameV3; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionFrameV3 () { return decl_QStyleOptionFrameV3; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionGraphicsItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionGraphicsItem.cc similarity index 94% rename from src/gsiqt4/gsiDeclQStyleOptionGraphicsItem.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionGraphicsItem.cc index 5bd141768..5eb670315 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionGraphicsItem.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionGraphicsItem.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -106,12 +106,12 @@ static gsi::Methods methods_QStyleOptionGraphicsItem () { gsi::Class &qtdecl_QStyleOption (); -gsi::Class decl_QStyleOptionGraphicsItem (qtdecl_QStyleOption (), "QStyleOptionGraphicsItem", +gsi::Class decl_QStyleOptionGraphicsItem (qtdecl_QStyleOption (), "QtGui", "QStyleOptionGraphicsItem", methods_QStyleOptionGraphicsItem (), "@qt\n@brief Binding of QStyleOptionGraphicsItem"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionGraphicsItem () { return decl_QStyleOptionGraphicsItem; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionGraphicsItem () { return decl_QStyleOptionGraphicsItem; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionGroupBox.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionGroupBox.cc similarity index 92% rename from src/gsiqt4/gsiDeclQStyleOptionGroupBox.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionGroupBox.cc index 456d36602..2b830a18d 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionGroupBox.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionGroupBox.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -85,12 +85,12 @@ static gsi::Methods methods_QStyleOptionGroupBox () { gsi::Class &qtdecl_QStyleOptionComplex (); -gsi::Class decl_QStyleOptionGroupBox (qtdecl_QStyleOptionComplex (), "QStyleOptionGroupBox", +gsi::Class decl_QStyleOptionGroupBox (qtdecl_QStyleOptionComplex (), "QtGui", "QStyleOptionGroupBox", methods_QStyleOptionGroupBox (), "@qt\n@brief Binding of QStyleOptionGroupBox"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionGroupBox () { return decl_QStyleOptionGroupBox; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionGroupBox () { return decl_QStyleOptionGroupBox; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionHeader.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionHeader.cc similarity index 93% rename from src/gsiqt4/gsiDeclQStyleOptionHeader.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionHeader.cc index a33e858fb..5de2a41ff 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionHeader.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionHeader.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -85,12 +85,12 @@ static gsi::Methods methods_QStyleOptionHeader () { gsi::Class &qtdecl_QStyleOption (); -gsi::Class decl_QStyleOptionHeader (qtdecl_QStyleOption (), "QStyleOptionHeader", +gsi::Class decl_QStyleOptionHeader (qtdecl_QStyleOption (), "QtGui", "QStyleOptionHeader", methods_QStyleOptionHeader (), "@qt\n@brief Binding of QStyleOptionHeader"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionHeader () { return decl_QStyleOptionHeader; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionHeader () { return decl_QStyleOptionHeader; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionMenuItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionMenuItem.cc similarity index 92% rename from src/gsiqt4/gsiDeclQStyleOptionMenuItem.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionMenuItem.cc index e7c47e0cc..4b7a0edda 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionMenuItem.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionMenuItem.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -85,12 +85,12 @@ static gsi::Methods methods_QStyleOptionMenuItem () { gsi::Class &qtdecl_QStyleOption (); -gsi::Class decl_QStyleOptionMenuItem (qtdecl_QStyleOption (), "QStyleOptionMenuItem", +gsi::Class decl_QStyleOptionMenuItem (qtdecl_QStyleOption (), "QtGui", "QStyleOptionMenuItem", methods_QStyleOptionMenuItem (), "@qt\n@brief Binding of QStyleOptionMenuItem"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionMenuItem () { return decl_QStyleOptionMenuItem; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionMenuItem () { return decl_QStyleOptionMenuItem; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionProgressBar.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionProgressBar.cc similarity index 92% rename from src/gsiqt4/gsiDeclQStyleOptionProgressBar.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionProgressBar.cc index 49988633e..2d8cb5a43 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionProgressBar.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionProgressBar.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -85,12 +85,12 @@ static gsi::Methods methods_QStyleOptionProgressBar () { gsi::Class &qtdecl_QStyleOption (); -gsi::Class decl_QStyleOptionProgressBar (qtdecl_QStyleOption (), "QStyleOptionProgressBar", +gsi::Class decl_QStyleOptionProgressBar (qtdecl_QStyleOption (), "QtGui", "QStyleOptionProgressBar", methods_QStyleOptionProgressBar (), "@qt\n@brief Binding of QStyleOptionProgressBar"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionProgressBar () { return decl_QStyleOptionProgressBar; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionProgressBar () { return decl_QStyleOptionProgressBar; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionProgressBarV2.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionProgressBarV2.cc similarity index 94% rename from src/gsiqt4/gsiDeclQStyleOptionProgressBarV2.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionProgressBarV2.cc index f84073637..023d8e33b 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionProgressBarV2.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionProgressBarV2.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -125,12 +125,12 @@ static gsi::Methods methods_QStyleOptionProgressBarV2 () { gsi::Class &qtdecl_QStyleOptionProgressBar (); -gsi::Class decl_QStyleOptionProgressBarV2 (qtdecl_QStyleOptionProgressBar (), "QStyleOptionProgressBarV2", +gsi::Class decl_QStyleOptionProgressBarV2 (qtdecl_QStyleOptionProgressBar (), "QtGui", "QStyleOptionProgressBarV2", methods_QStyleOptionProgressBarV2 (), "@qt\n@brief Binding of QStyleOptionProgressBarV2"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionProgressBarV2 () { return decl_QStyleOptionProgressBarV2; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionProgressBarV2 () { return decl_QStyleOptionProgressBarV2; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionQ3DockWindow.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionQ3DockWindow.cc similarity index 92% rename from src/gsiqt4/gsiDeclQStyleOptionQ3DockWindow.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionQ3DockWindow.cc index 388c5519c..03ccec881 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionQ3DockWindow.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionQ3DockWindow.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -85,12 +85,12 @@ static gsi::Methods methods_QStyleOptionQ3DockWindow () { gsi::Class &qtdecl_QStyleOption (); -gsi::Class decl_QStyleOptionQ3DockWindow (qtdecl_QStyleOption (), "QStyleOptionQ3DockWindow", +gsi::Class decl_QStyleOptionQ3DockWindow (qtdecl_QStyleOption (), "QtGui", "QStyleOptionQ3DockWindow", methods_QStyleOptionQ3DockWindow (), "@qt\n@brief Binding of QStyleOptionQ3DockWindow"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionQ3DockWindow () { return decl_QStyleOptionQ3DockWindow; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionQ3DockWindow () { return decl_QStyleOptionQ3DockWindow; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionQ3ListView.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionQ3ListView.cc similarity index 92% rename from src/gsiqt4/gsiDeclQStyleOptionQ3ListView.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionQ3ListView.cc index 57885638b..1da4ce607 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionQ3ListView.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionQ3ListView.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -85,12 +85,12 @@ static gsi::Methods methods_QStyleOptionQ3ListView () { gsi::Class &qtdecl_QStyleOptionComplex (); -gsi::Class decl_QStyleOptionQ3ListView (qtdecl_QStyleOptionComplex (), "QStyleOptionQ3ListView", +gsi::Class decl_QStyleOptionQ3ListView (qtdecl_QStyleOptionComplex (), "QtGui", "QStyleOptionQ3ListView", methods_QStyleOptionQ3ListView (), "@qt\n@brief Binding of QStyleOptionQ3ListView"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionQ3ListView () { return decl_QStyleOptionQ3ListView; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionQ3ListView () { return decl_QStyleOptionQ3ListView; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionQ3ListViewItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionQ3ListViewItem.cc similarity index 92% rename from src/gsiqt4/gsiDeclQStyleOptionQ3ListViewItem.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionQ3ListViewItem.cc index 999911c1b..adb896f89 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionQ3ListViewItem.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionQ3ListViewItem.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -85,12 +85,12 @@ static gsi::Methods methods_QStyleOptionQ3ListViewItem () { gsi::Class &qtdecl_QStyleOption (); -gsi::Class decl_QStyleOptionQ3ListViewItem (qtdecl_QStyleOption (), "QStyleOptionQ3ListViewItem", +gsi::Class decl_QStyleOptionQ3ListViewItem (qtdecl_QStyleOption (), "QtGui", "QStyleOptionQ3ListViewItem", methods_QStyleOptionQ3ListViewItem (), "@qt\n@brief Binding of QStyleOptionQ3ListViewItem"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionQ3ListViewItem () { return decl_QStyleOptionQ3ListViewItem; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionQ3ListViewItem () { return decl_QStyleOptionQ3ListViewItem; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionRubberBand.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionRubberBand.cc similarity index 92% rename from src/gsiqt4/gsiDeclQStyleOptionRubberBand.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionRubberBand.cc index 31e0b18e6..f0aa182f2 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionRubberBand.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionRubberBand.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -85,12 +85,12 @@ static gsi::Methods methods_QStyleOptionRubberBand () { gsi::Class &qtdecl_QStyleOption (); -gsi::Class decl_QStyleOptionRubberBand (qtdecl_QStyleOption (), "QStyleOptionRubberBand", +gsi::Class decl_QStyleOptionRubberBand (qtdecl_QStyleOption (), "QtGui", "QStyleOptionRubberBand", methods_QStyleOptionRubberBand (), "@qt\n@brief Binding of QStyleOptionRubberBand"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionRubberBand () { return decl_QStyleOptionRubberBand; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionRubberBand () { return decl_QStyleOptionRubberBand; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionSizeGrip.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionSizeGrip.cc similarity index 92% rename from src/gsiqt4/gsiDeclQStyleOptionSizeGrip.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionSizeGrip.cc index 08f2016a2..110de1f1d 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionSizeGrip.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionSizeGrip.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -85,12 +85,12 @@ static gsi::Methods methods_QStyleOptionSizeGrip () { gsi::Class &qtdecl_QStyleOptionComplex (); -gsi::Class decl_QStyleOptionSizeGrip (qtdecl_QStyleOptionComplex (), "QStyleOptionSizeGrip", +gsi::Class decl_QStyleOptionSizeGrip (qtdecl_QStyleOptionComplex (), "QtGui", "QStyleOptionSizeGrip", methods_QStyleOptionSizeGrip (), "@qt\n@brief Binding of QStyleOptionSizeGrip"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionSizeGrip () { return decl_QStyleOptionSizeGrip; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionSizeGrip () { return decl_QStyleOptionSizeGrip; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionSlider.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionSlider.cc similarity index 93% rename from src/gsiqt4/gsiDeclQStyleOptionSlider.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionSlider.cc index 07d0f5bf2..e1271c2e5 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionSlider.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionSlider.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -85,12 +85,12 @@ static gsi::Methods methods_QStyleOptionSlider () { gsi::Class &qtdecl_QStyleOptionComplex (); -gsi::Class decl_QStyleOptionSlider (qtdecl_QStyleOptionComplex (), "QStyleOptionSlider", +gsi::Class decl_QStyleOptionSlider (qtdecl_QStyleOptionComplex (), "QtGui", "QStyleOptionSlider", methods_QStyleOptionSlider (), "@qt\n@brief Binding of QStyleOptionSlider"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionSlider () { return decl_QStyleOptionSlider; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionSlider () { return decl_QStyleOptionSlider; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionSpinBox.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionSpinBox.cc similarity index 92% rename from src/gsiqt4/gsiDeclQStyleOptionSpinBox.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionSpinBox.cc index 9c4471afa..5c2966637 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionSpinBox.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionSpinBox.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -85,12 +85,12 @@ static gsi::Methods methods_QStyleOptionSpinBox () { gsi::Class &qtdecl_QStyleOptionComplex (); -gsi::Class decl_QStyleOptionSpinBox (qtdecl_QStyleOptionComplex (), "QStyleOptionSpinBox", +gsi::Class decl_QStyleOptionSpinBox (qtdecl_QStyleOptionComplex (), "QtGui", "QStyleOptionSpinBox", methods_QStyleOptionSpinBox (), "@qt\n@brief Binding of QStyleOptionSpinBox"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionSpinBox () { return decl_QStyleOptionSpinBox; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionSpinBox () { return decl_QStyleOptionSpinBox; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionTab.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionTab.cc similarity index 93% rename from src/gsiqt4/gsiDeclQStyleOptionTab.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionTab.cc index 1225db76a..6ed982fcc 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionTab.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionTab.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -85,12 +85,12 @@ static gsi::Methods methods_QStyleOptionTab () { gsi::Class &qtdecl_QStyleOption (); -gsi::Class decl_QStyleOptionTab (qtdecl_QStyleOption (), "QStyleOptionTab", +gsi::Class decl_QStyleOptionTab (qtdecl_QStyleOption (), "QtGui", "QStyleOptionTab", methods_QStyleOptionTab (), "@qt\n@brief Binding of QStyleOptionTab"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionTab () { return decl_QStyleOptionTab; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionTab () { return decl_QStyleOptionTab; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionTabBarBase.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionTabBarBase.cc similarity index 92% rename from src/gsiqt4/gsiDeclQStyleOptionTabBarBase.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionTabBarBase.cc index e44865b05..38440cd86 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionTabBarBase.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionTabBarBase.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -85,12 +85,12 @@ static gsi::Methods methods_QStyleOptionTabBarBase () { gsi::Class &qtdecl_QStyleOption (); -gsi::Class decl_QStyleOptionTabBarBase (qtdecl_QStyleOption (), "QStyleOptionTabBarBase", +gsi::Class decl_QStyleOptionTabBarBase (qtdecl_QStyleOption (), "QtGui", "QStyleOptionTabBarBase", methods_QStyleOptionTabBarBase (), "@qt\n@brief Binding of QStyleOptionTabBarBase"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionTabBarBase () { return decl_QStyleOptionTabBarBase; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionTabBarBase () { return decl_QStyleOptionTabBarBase; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionTabBarBaseV2.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionTabBarBaseV2.cc similarity index 95% rename from src/gsiqt4/gsiDeclQStyleOptionTabBarBaseV2.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionTabBarBaseV2.cc index 1b9a0f423..8a4d9d202 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionTabBarBaseV2.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionTabBarBaseV2.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -125,12 +125,12 @@ static gsi::Methods methods_QStyleOptionTabBarBaseV2 () { gsi::Class &qtdecl_QStyleOptionTabBarBase (); -gsi::Class decl_QStyleOptionTabBarBaseV2 (qtdecl_QStyleOptionTabBarBase (), "QStyleOptionTabBarBaseV2", +gsi::Class decl_QStyleOptionTabBarBaseV2 (qtdecl_QStyleOptionTabBarBase (), "QtGui", "QStyleOptionTabBarBaseV2", methods_QStyleOptionTabBarBaseV2 (), "@qt\n@brief Binding of QStyleOptionTabBarBaseV2"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionTabBarBaseV2 () { return decl_QStyleOptionTabBarBaseV2; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionTabBarBaseV2 () { return decl_QStyleOptionTabBarBaseV2; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionTabV2.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionTabV2.cc similarity index 95% rename from src/gsiqt4/gsiDeclQStyleOptionTabV2.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionTabV2.cc index 6a62ff7a3..d1d182464 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionTabV2.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionTabV2.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -125,12 +125,12 @@ static gsi::Methods methods_QStyleOptionTabV2 () { gsi::Class &qtdecl_QStyleOptionTab (); -gsi::Class decl_QStyleOptionTabV2 (qtdecl_QStyleOptionTab (), "QStyleOptionTabV2", +gsi::Class decl_QStyleOptionTabV2 (qtdecl_QStyleOptionTab (), "QtGui", "QStyleOptionTabV2", methods_QStyleOptionTabV2 (), "@qt\n@brief Binding of QStyleOptionTabV2"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionTabV2 () { return decl_QStyleOptionTabV2; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionTabV2 () { return decl_QStyleOptionTabV2; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionTabV3.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionTabV3.cc similarity index 96% rename from src/gsiqt4/gsiDeclQStyleOptionTabV3.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionTabV3.cc index 8b2a27655..f7677e93e 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionTabV3.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionTabV3.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -146,12 +146,12 @@ static gsi::Methods methods_QStyleOptionTabV3 () { gsi::Class &qtdecl_QStyleOptionTabV2 (); -gsi::Class decl_QStyleOptionTabV3 (qtdecl_QStyleOptionTabV2 (), "QStyleOptionTabV3", +gsi::Class decl_QStyleOptionTabV3 (qtdecl_QStyleOptionTabV2 (), "QtGui", "QStyleOptionTabV3", methods_QStyleOptionTabV3 (), "@qt\n@brief Binding of QStyleOptionTabV3"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionTabV3 () { return decl_QStyleOptionTabV3; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionTabV3 () { return decl_QStyleOptionTabV3; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionTabWidgetFrame.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionTabWidgetFrame.cc similarity index 92% rename from src/gsiqt4/gsiDeclQStyleOptionTabWidgetFrame.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionTabWidgetFrame.cc index 9d25225e4..ca6ea3125 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionTabWidgetFrame.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionTabWidgetFrame.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -85,12 +85,12 @@ static gsi::Methods methods_QStyleOptionTabWidgetFrame () { gsi::Class &qtdecl_QStyleOption (); -gsi::Class decl_QStyleOptionTabWidgetFrame (qtdecl_QStyleOption (), "QStyleOptionTabWidgetFrame", +gsi::Class decl_QStyleOptionTabWidgetFrame (qtdecl_QStyleOption (), "QtGui", "QStyleOptionTabWidgetFrame", methods_QStyleOptionTabWidgetFrame (), "@qt\n@brief Binding of QStyleOptionTabWidgetFrame"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionTabWidgetFrame () { return decl_QStyleOptionTabWidgetFrame; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionTabWidgetFrame () { return decl_QStyleOptionTabWidgetFrame; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionTitleBar.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionTitleBar.cc similarity index 92% rename from src/gsiqt4/gsiDeclQStyleOptionTitleBar.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionTitleBar.cc index ccb66a84e..c1ec9cb87 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionTitleBar.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionTitleBar.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -85,12 +85,12 @@ static gsi::Methods methods_QStyleOptionTitleBar () { gsi::Class &qtdecl_QStyleOptionComplex (); -gsi::Class decl_QStyleOptionTitleBar (qtdecl_QStyleOptionComplex (), "QStyleOptionTitleBar", +gsi::Class decl_QStyleOptionTitleBar (qtdecl_QStyleOptionComplex (), "QtGui", "QStyleOptionTitleBar", methods_QStyleOptionTitleBar (), "@qt\n@brief Binding of QStyleOptionTitleBar"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionTitleBar () { return decl_QStyleOptionTitleBar; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionTitleBar () { return decl_QStyleOptionTitleBar; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionToolBar.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionToolBar.cc similarity index 93% rename from src/gsiqt4/gsiDeclQStyleOptionToolBar.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionToolBar.cc index b09fa967f..27e8e8129 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionToolBar.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionToolBar.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -85,12 +85,12 @@ static gsi::Methods methods_QStyleOptionToolBar () { gsi::Class &qtdecl_QStyleOption (); -gsi::Class decl_QStyleOptionToolBar (qtdecl_QStyleOption (), "QStyleOptionToolBar", +gsi::Class decl_QStyleOptionToolBar (qtdecl_QStyleOption (), "QtGui", "QStyleOptionToolBar", methods_QStyleOptionToolBar (), "@qt\n@brief Binding of QStyleOptionToolBar"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionToolBar () { return decl_QStyleOptionToolBar; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionToolBar () { return decl_QStyleOptionToolBar; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionToolBox.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionToolBox.cc similarity index 93% rename from src/gsiqt4/gsiDeclQStyleOptionToolBox.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionToolBox.cc index 31db9c31a..9e876ed1f 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionToolBox.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionToolBox.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -85,12 +85,12 @@ static gsi::Methods methods_QStyleOptionToolBox () { gsi::Class &qtdecl_QStyleOption (); -gsi::Class decl_QStyleOptionToolBox (qtdecl_QStyleOption (), "QStyleOptionToolBox", +gsi::Class decl_QStyleOptionToolBox (qtdecl_QStyleOption (), "QtGui", "QStyleOptionToolBox", methods_QStyleOptionToolBox (), "@qt\n@brief Binding of QStyleOptionToolBox"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionToolBox () { return decl_QStyleOptionToolBox; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionToolBox () { return decl_QStyleOptionToolBox; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionToolBoxV2.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionToolBoxV2.cc similarity index 95% rename from src/gsiqt4/gsiDeclQStyleOptionToolBoxV2.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionToolBoxV2.cc index 3bb76a8db..379a04e2a 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionToolBoxV2.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionToolBoxV2.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -125,12 +125,12 @@ static gsi::Methods methods_QStyleOptionToolBoxV2 () { gsi::Class &qtdecl_QStyleOptionToolBox (); -gsi::Class decl_QStyleOptionToolBoxV2 (qtdecl_QStyleOptionToolBox (), "QStyleOptionToolBoxV2", +gsi::Class decl_QStyleOptionToolBoxV2 (qtdecl_QStyleOptionToolBox (), "QtGui", "QStyleOptionToolBoxV2", methods_QStyleOptionToolBoxV2 (), "@qt\n@brief Binding of QStyleOptionToolBoxV2"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionToolBoxV2 () { return decl_QStyleOptionToolBoxV2; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionToolBoxV2 () { return decl_QStyleOptionToolBoxV2; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionToolButton.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionToolButton.cc similarity index 92% rename from src/gsiqt4/gsiDeclQStyleOptionToolButton.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionToolButton.cc index db4b43176..091954456 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionToolButton.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionToolButton.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -85,12 +85,12 @@ static gsi::Methods methods_QStyleOptionToolButton () { gsi::Class &qtdecl_QStyleOptionComplex (); -gsi::Class decl_QStyleOptionToolButton (qtdecl_QStyleOptionComplex (), "QStyleOptionToolButton", +gsi::Class decl_QStyleOptionToolButton (qtdecl_QStyleOptionComplex (), "QtGui", "QStyleOptionToolButton", methods_QStyleOptionToolButton (), "@qt\n@brief Binding of QStyleOptionToolButton"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionToolButton () { return decl_QStyleOptionToolButton; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionToolButton () { return decl_QStyleOptionToolButton; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionViewItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionViewItem.cc similarity index 92% rename from src/gsiqt4/gsiDeclQStyleOptionViewItem.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionViewItem.cc index 190781514..c9791d6c9 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionViewItem.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionViewItem.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -85,12 +85,12 @@ static gsi::Methods methods_QStyleOptionViewItem () { gsi::Class &qtdecl_QStyleOption (); -gsi::Class decl_QStyleOptionViewItem (qtdecl_QStyleOption (), "QStyleOptionViewItem", +gsi::Class decl_QStyleOptionViewItem (qtdecl_QStyleOption (), "QtGui", "QStyleOptionViewItem", methods_QStyleOptionViewItem (), "@qt\n@brief Binding of QStyleOptionViewItem"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionViewItem () { return decl_QStyleOptionViewItem; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionViewItem () { return decl_QStyleOptionViewItem; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionViewItemV2.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionViewItemV2.cc similarity index 95% rename from src/gsiqt4/gsiDeclQStyleOptionViewItemV2.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionViewItemV2.cc index 956744985..3a2678c11 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionViewItemV2.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionViewItemV2.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -125,12 +125,12 @@ static gsi::Methods methods_QStyleOptionViewItemV2 () { gsi::Class &qtdecl_QStyleOptionViewItem (); -gsi::Class decl_QStyleOptionViewItemV2 (qtdecl_QStyleOptionViewItem (), "QStyleOptionViewItemV2", +gsi::Class decl_QStyleOptionViewItemV2 (qtdecl_QStyleOptionViewItem (), "QtGui", "QStyleOptionViewItemV2", methods_QStyleOptionViewItemV2 (), "@qt\n@brief Binding of QStyleOptionViewItemV2"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionViewItemV2 () { return decl_QStyleOptionViewItemV2; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionViewItemV2 () { return decl_QStyleOptionViewItemV2; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionViewItemV3.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionViewItemV3.cc similarity index 95% rename from src/gsiqt4/gsiDeclQStyleOptionViewItemV3.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionViewItemV3.cc index 18bf9dbbf..4980f76cb 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionViewItemV3.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionViewItemV3.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -126,12 +126,12 @@ static gsi::Methods methods_QStyleOptionViewItemV3 () { gsi::Class &qtdecl_QStyleOptionViewItemV2 (); -gsi::Class decl_QStyleOptionViewItemV3 (qtdecl_QStyleOptionViewItemV2 (), "QStyleOptionViewItemV3", +gsi::Class decl_QStyleOptionViewItemV3 (qtdecl_QStyleOptionViewItemV2 (), "QtGui", "QStyleOptionViewItemV3", methods_QStyleOptionViewItemV3 (), "@qt\n@brief Binding of QStyleOptionViewItemV3"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionViewItemV3 () { return decl_QStyleOptionViewItemV3; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionViewItemV3 () { return decl_QStyleOptionViewItemV3; } } diff --git a/src/gsiqt4/gsiDeclQStyleOptionViewItemV4.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionViewItemV4.cc similarity index 95% rename from src/gsiqt4/gsiDeclQStyleOptionViewItemV4.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionViewItemV4.cc index b58270466..ab925a956 100644 --- a/src/gsiqt4/gsiDeclQStyleOptionViewItemV4.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyleOptionViewItemV4.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -126,12 +126,12 @@ static gsi::Methods methods_QStyleOptionViewItemV4 () { gsi::Class &qtdecl_QStyleOptionViewItemV3 (); -gsi::Class decl_QStyleOptionViewItemV4 (qtdecl_QStyleOptionViewItemV3 (), "QStyleOptionViewItemV4", +gsi::Class decl_QStyleOptionViewItemV4 (qtdecl_QStyleOptionViewItemV3 (), "QtGui", "QStyleOptionViewItemV4", methods_QStyleOptionViewItemV4 (), "@qt\n@brief Binding of QStyleOptionViewItemV4"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionViewItemV4 () { return decl_QStyleOptionViewItemV4; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionViewItemV4 () { return decl_QStyleOptionViewItemV4; } } diff --git a/src/gsiqt4/gsiDeclQStylePainter.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStylePainter.cc similarity index 98% rename from src/gsiqt4/gsiDeclQStylePainter.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStylePainter.cc index 7a489342e..463ad86cf 100644 --- a/src/gsiqt4/gsiDeclQStylePainter.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStylePainter.cc @@ -59,8 +59,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -330,12 +330,12 @@ static gsi::Methods methods_QStylePainter () { gsi::Class &qtdecl_QPainter (); -gsi::Class decl_QStylePainter (qtdecl_QPainter (), "QStylePainter", +gsi::Class decl_QStylePainter (qtdecl_QPainter (), "QtGui", "QStylePainter", methods_QStylePainter (), "@qt\n@brief Binding of QStylePainter"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStylePainter () { return decl_QStylePainter; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStylePainter () { return decl_QStylePainter; } } diff --git a/src/gsiqt4/gsiDeclQStylePlugin.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStylePlugin.cc similarity index 99% rename from src/gsiqt4/gsiDeclQStylePlugin.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStylePlugin.cc index 5bafbafe6..79fe35fa6 100644 --- a/src/gsiqt4/gsiDeclQStylePlugin.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStylePlugin.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -201,11 +201,11 @@ static gsi::Methods methods_QStylePlugin () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QStylePlugin (qtdecl_QObject (), "QStylePlugin_Native", +qt_gsi::QtNativeClass decl_QStylePlugin (qtdecl_QObject (), "QtGui", "QStylePlugin_Native", methods_QStylePlugin (), "@hide\n@alias QStylePlugin"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStylePlugin () { return decl_QStylePlugin; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStylePlugin () { return decl_QStylePlugin; } } @@ -662,7 +662,7 @@ static gsi::Methods methods_QStylePlugin_Adaptor () { return methods; } -gsi::Class decl_QStylePlugin_Adaptor (qtdecl_QStylePlugin (), "QStylePlugin", +gsi::Class decl_QStylePlugin_Adaptor (qtdecl_QStylePlugin (), "QtGui", "QStylePlugin", methods_QStylePlugin_Adaptor (), "@qt\n@brief Binding of QStylePlugin"); diff --git a/src/gsiqt4/gsiDeclQStyledItemDelegate.cc b/src/gsiqt/qt4/QtGui/gsiDeclQStyledItemDelegate.cc similarity index 99% rename from src/gsiqt4/gsiDeclQStyledItemDelegate.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQStyledItemDelegate.cc index d7ede931c..cfbd128c4 100644 --- a/src/gsiqt4/gsiDeclQStyledItemDelegate.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQStyledItemDelegate.cc @@ -45,8 +45,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -392,11 +392,11 @@ static gsi::Methods methods_QStyledItemDelegate () { gsi::Class &qtdecl_QAbstractItemDelegate (); -qt_gsi::QtNativeClass decl_QStyledItemDelegate (qtdecl_QAbstractItemDelegate (), "QStyledItemDelegate_Native", +qt_gsi::QtNativeClass decl_QStyledItemDelegate (qtdecl_QAbstractItemDelegate (), "QtGui", "QStyledItemDelegate_Native", methods_QStyledItemDelegate (), "@hide\n@alias QStyledItemDelegate"); -GSIQT_PUBLIC gsi::Class &qtdecl_QStyledItemDelegate () { return decl_QStyledItemDelegate; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyledItemDelegate () { return decl_QStyledItemDelegate; } } @@ -1271,7 +1271,7 @@ static gsi::Methods methods_QStyledItemDelegate_Adaptor () { return methods; } -gsi::Class decl_QStyledItemDelegate_Adaptor (qtdecl_QStyledItemDelegate (), "QStyledItemDelegate", +gsi::Class decl_QStyledItemDelegate_Adaptor (qtdecl_QStyledItemDelegate (), "QtGui", "QStyledItemDelegate", methods_QStyledItemDelegate_Adaptor (), "@qt\n@brief Binding of QStyledItemDelegate"); diff --git a/src/gsiqt4/gsiDeclQSwipeGesture.cc b/src/gsiqt/qt4/QtGui/gsiDeclQSwipeGesture.cc similarity index 97% rename from src/gsiqt4/gsiDeclQSwipeGesture.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQSwipeGesture.cc index 5f5a99a44..cd22f00c8 100644 --- a/src/gsiqt4/gsiDeclQSwipeGesture.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQSwipeGesture.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -234,11 +234,11 @@ static gsi::Methods methods_QSwipeGesture () { gsi::Class &qtdecl_QGesture (); -qt_gsi::QtNativeClass decl_QSwipeGesture (qtdecl_QGesture (), "QSwipeGesture_Native", +qt_gsi::QtNativeClass decl_QSwipeGesture (qtdecl_QGesture (), "QtGui", "QSwipeGesture_Native", methods_QSwipeGesture (), "@hide\n@alias QSwipeGesture"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSwipeGesture () { return decl_QSwipeGesture; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QSwipeGesture () { return decl_QSwipeGesture; } } @@ -616,7 +616,7 @@ static gsi::Methods methods_QSwipeGesture_Adaptor () { return methods; } -gsi::Class decl_QSwipeGesture_Adaptor (qtdecl_QSwipeGesture (), "QSwipeGesture", +gsi::Class decl_QSwipeGesture_Adaptor (qtdecl_QSwipeGesture (), "QtGui", "QSwipeGesture", methods_QSwipeGesture_Adaptor (), "@qt\n@brief Binding of QSwipeGesture"); @@ -627,7 +627,7 @@ gsi::Class decl_QSwipeGesture_Adaptor (qtdecl_QSwipeGestu namespace qt_gsi { -static gsi::Enum decl_QSwipeGesture_SwipeDirection_Enum ("QSwipeGesture_SwipeDirection", +static gsi::Enum decl_QSwipeGesture_SwipeDirection_Enum ("QtGui", "QSwipeGesture_SwipeDirection", gsi::enum_const ("NoDirection", QSwipeGesture::NoDirection, "@brief Enum constant QSwipeGesture::NoDirection") + gsi::enum_const ("Left", QSwipeGesture::Left, "@brief Enum constant QSwipeGesture::Left") + gsi::enum_const ("Right", QSwipeGesture::Right, "@brief Enum constant QSwipeGesture::Right") + @@ -635,13 +635,13 @@ static gsi::Enum decl_QSwipeGesture_SwipeDirectio gsi::enum_const ("Down", QSwipeGesture::Down, "@brief Enum constant QSwipeGesture::Down"), "@qt\n@brief This class represents the QSwipeGesture::SwipeDirection enum"); -static gsi::QFlagsClass decl_QSwipeGesture_SwipeDirection_Enums ("QSwipeGesture_QFlags_SwipeDirection", +static gsi::QFlagsClass decl_QSwipeGesture_SwipeDirection_Enums ("QtGui", "QSwipeGesture_QFlags_SwipeDirection", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSwipeGesture_SwipeDirection_Enum_in_parent (decl_QSwipeGesture_SwipeDirection_Enum.defs ()); -static gsi::ClassExt decl_QSwipeGesture_SwipeDirection_Enum_as_child (decl_QSwipeGesture_SwipeDirection_Enum, "SwipeDirection"); -static gsi::ClassExt decl_QSwipeGesture_SwipeDirection_Enums_as_child (decl_QSwipeGesture_SwipeDirection_Enums, "QFlags_SwipeDirection"); +static gsi::ClassExt decl_QSwipeGesture_SwipeDirection_Enum_as_child (decl_QSwipeGesture_SwipeDirection_Enum, "QtGui", "SwipeDirection"); +static gsi::ClassExt decl_QSwipeGesture_SwipeDirection_Enums_as_child (decl_QSwipeGesture_SwipeDirection_Enums, "QtGui", "QFlags_SwipeDirection"); } diff --git a/src/gsiqt4/gsiDeclQSyntaxHighlighter.cc b/src/gsiqt/qt4/QtGui/gsiDeclQSyntaxHighlighter.cc similarity index 99% rename from src/gsiqt4/gsiDeclQSyntaxHighlighter.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQSyntaxHighlighter.cc index 37495ef16..36d1b0ffa 100644 --- a/src/gsiqt4/gsiDeclQSyntaxHighlighter.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQSyntaxHighlighter.cc @@ -41,8 +41,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -246,11 +246,11 @@ static gsi::Methods methods_QSyntaxHighlighter () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QSyntaxHighlighter (qtdecl_QObject (), "QSyntaxHighlighter_Native", +qt_gsi::QtNativeClass decl_QSyntaxHighlighter (qtdecl_QObject (), "QtGui", "QSyntaxHighlighter_Native", methods_QSyntaxHighlighter (), "@hide\n@alias QSyntaxHighlighter"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSyntaxHighlighter () { return decl_QSyntaxHighlighter; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QSyntaxHighlighter () { return decl_QSyntaxHighlighter; } } @@ -962,7 +962,7 @@ static gsi::Methods methods_QSyntaxHighlighter_Adaptor () { return methods; } -gsi::Class decl_QSyntaxHighlighter_Adaptor (qtdecl_QSyntaxHighlighter (), "QSyntaxHighlighter", +gsi::Class decl_QSyntaxHighlighter_Adaptor (qtdecl_QSyntaxHighlighter (), "QtGui", "QSyntaxHighlighter", methods_QSyntaxHighlighter_Adaptor (), "@qt\n@brief Binding of QSyntaxHighlighter"); diff --git a/src/gsiqt4/gsiDeclQSystemTrayIcon.cc b/src/gsiqt/qt4/QtGui/gsiDeclQSystemTrayIcon.cc similarity index 97% rename from src/gsiqt4/gsiDeclQSystemTrayIcon.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQSystemTrayIcon.cc index 564280530..2e9d4b7fd 100644 --- a/src/gsiqt4/gsiDeclQSystemTrayIcon.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQSystemTrayIcon.cc @@ -37,8 +37,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -429,11 +429,11 @@ static gsi::Methods methods_QSystemTrayIcon () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QSystemTrayIcon (qtdecl_QObject (), "QSystemTrayIcon_Native", +qt_gsi::QtNativeClass decl_QSystemTrayIcon (qtdecl_QObject (), "QtGui", "QSystemTrayIcon_Native", methods_QSystemTrayIcon (), "@hide\n@alias QSystemTrayIcon"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSystemTrayIcon () { return decl_QSystemTrayIcon; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QSystemTrayIcon () { return decl_QSystemTrayIcon; } } @@ -891,7 +891,7 @@ static gsi::Methods methods_QSystemTrayIcon_Adaptor () { return methods; } -gsi::Class decl_QSystemTrayIcon_Adaptor (qtdecl_QSystemTrayIcon (), "QSystemTrayIcon", +gsi::Class decl_QSystemTrayIcon_Adaptor (qtdecl_QSystemTrayIcon (), "QtGui", "QSystemTrayIcon", methods_QSystemTrayIcon_Adaptor (), "@qt\n@brief Binding of QSystemTrayIcon"); @@ -902,7 +902,7 @@ gsi::Class decl_QSystemTrayIcon_Adaptor (qtdecl_QSystem namespace qt_gsi { -static gsi::Enum decl_QSystemTrayIcon_ActivationReason_Enum ("QSystemTrayIcon_ActivationReason", +static gsi::Enum decl_QSystemTrayIcon_ActivationReason_Enum ("QtGui", "QSystemTrayIcon_ActivationReason", gsi::enum_const ("Unknown", QSystemTrayIcon::Unknown, "@brief Enum constant QSystemTrayIcon::Unknown") + gsi::enum_const ("Context", QSystemTrayIcon::Context, "@brief Enum constant QSystemTrayIcon::Context") + gsi::enum_const ("DoubleClick", QSystemTrayIcon::DoubleClick, "@brief Enum constant QSystemTrayIcon::DoubleClick") + @@ -910,13 +910,13 @@ static gsi::Enum decl_QSystemTrayIcon_Activat gsi::enum_const ("MiddleClick", QSystemTrayIcon::MiddleClick, "@brief Enum constant QSystemTrayIcon::MiddleClick"), "@qt\n@brief This class represents the QSystemTrayIcon::ActivationReason enum"); -static gsi::QFlagsClass decl_QSystemTrayIcon_ActivationReason_Enums ("QSystemTrayIcon_QFlags_ActivationReason", +static gsi::QFlagsClass decl_QSystemTrayIcon_ActivationReason_Enums ("QtGui", "QSystemTrayIcon_QFlags_ActivationReason", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSystemTrayIcon_ActivationReason_Enum_in_parent (decl_QSystemTrayIcon_ActivationReason_Enum.defs ()); -static gsi::ClassExt decl_QSystemTrayIcon_ActivationReason_Enum_as_child (decl_QSystemTrayIcon_ActivationReason_Enum, "ActivationReason"); -static gsi::ClassExt decl_QSystemTrayIcon_ActivationReason_Enums_as_child (decl_QSystemTrayIcon_ActivationReason_Enums, "QFlags_ActivationReason"); +static gsi::ClassExt decl_QSystemTrayIcon_ActivationReason_Enum_as_child (decl_QSystemTrayIcon_ActivationReason_Enum, "QtGui", "ActivationReason"); +static gsi::ClassExt decl_QSystemTrayIcon_ActivationReason_Enums_as_child (decl_QSystemTrayIcon_ActivationReason_Enums, "QtGui", "QFlags_ActivationReason"); } @@ -925,20 +925,20 @@ static gsi::ClassExt decl_QSystemTrayIcon_ActivationReason_Enum namespace qt_gsi { -static gsi::Enum decl_QSystemTrayIcon_MessageIcon_Enum ("QSystemTrayIcon_MessageIcon", +static gsi::Enum decl_QSystemTrayIcon_MessageIcon_Enum ("QtGui", "QSystemTrayIcon_MessageIcon", gsi::enum_const ("NoIcon", QSystemTrayIcon::NoIcon, "@brief Enum constant QSystemTrayIcon::NoIcon") + gsi::enum_const ("Information", QSystemTrayIcon::Information, "@brief Enum constant QSystemTrayIcon::Information") + gsi::enum_const ("Warning", QSystemTrayIcon::Warning, "@brief Enum constant QSystemTrayIcon::Warning") + gsi::enum_const ("Critical", QSystemTrayIcon::Critical, "@brief Enum constant QSystemTrayIcon::Critical"), "@qt\n@brief This class represents the QSystemTrayIcon::MessageIcon enum"); -static gsi::QFlagsClass decl_QSystemTrayIcon_MessageIcon_Enums ("QSystemTrayIcon_QFlags_MessageIcon", +static gsi::QFlagsClass decl_QSystemTrayIcon_MessageIcon_Enums ("QtGui", "QSystemTrayIcon_QFlags_MessageIcon", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSystemTrayIcon_MessageIcon_Enum_in_parent (decl_QSystemTrayIcon_MessageIcon_Enum.defs ()); -static gsi::ClassExt decl_QSystemTrayIcon_MessageIcon_Enum_as_child (decl_QSystemTrayIcon_MessageIcon_Enum, "MessageIcon"); -static gsi::ClassExt decl_QSystemTrayIcon_MessageIcon_Enums_as_child (decl_QSystemTrayIcon_MessageIcon_Enums, "QFlags_MessageIcon"); +static gsi::ClassExt decl_QSystemTrayIcon_MessageIcon_Enum_as_child (decl_QSystemTrayIcon_MessageIcon_Enum, "QtGui", "MessageIcon"); +static gsi::ClassExt decl_QSystemTrayIcon_MessageIcon_Enums_as_child (decl_QSystemTrayIcon_MessageIcon_Enums, "QtGui", "QFlags_MessageIcon"); } diff --git a/src/gsiqt4/gsiDeclQTabBar.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTabBar.cc similarity index 99% rename from src/gsiqt4/gsiDeclQTabBar.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTabBar.cc index 352afe156..d73af1025 100644 --- a/src/gsiqt4/gsiDeclQTabBar.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTabBar.cc @@ -79,8 +79,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1203,11 +1203,11 @@ static gsi::Methods methods_QTabBar () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QTabBar (qtdecl_QWidget (), "QTabBar_Native", +qt_gsi::QtNativeClass decl_QTabBar (qtdecl_QWidget (), "QtGui", "QTabBar_Native", methods_QTabBar (), "@hide\n@alias QTabBar"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTabBar () { return decl_QTabBar; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTabBar () { return decl_QTabBar; } } @@ -3677,7 +3677,7 @@ static gsi::Methods methods_QTabBar_Adaptor () { return methods; } -gsi::Class decl_QTabBar_Adaptor (qtdecl_QTabBar (), "QTabBar", +gsi::Class decl_QTabBar_Adaptor (qtdecl_QTabBar (), "QtGui", "QTabBar", methods_QTabBar_Adaptor (), "@qt\n@brief Binding of QTabBar"); @@ -3688,18 +3688,18 @@ gsi::Class decl_QTabBar_Adaptor (qtdecl_QTabBar (), "QTabBar", namespace qt_gsi { -static gsi::Enum decl_QTabBar_ButtonPosition_Enum ("QTabBar_ButtonPosition", +static gsi::Enum decl_QTabBar_ButtonPosition_Enum ("QtGui", "QTabBar_ButtonPosition", gsi::enum_const ("LeftSide", QTabBar::LeftSide, "@brief Enum constant QTabBar::LeftSide") + gsi::enum_const ("RightSide", QTabBar::RightSide, "@brief Enum constant QTabBar::RightSide"), "@qt\n@brief This class represents the QTabBar::ButtonPosition enum"); -static gsi::QFlagsClass decl_QTabBar_ButtonPosition_Enums ("QTabBar_QFlags_ButtonPosition", +static gsi::QFlagsClass decl_QTabBar_ButtonPosition_Enums ("QtGui", "QTabBar_QFlags_ButtonPosition", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTabBar_ButtonPosition_Enum_in_parent (decl_QTabBar_ButtonPosition_Enum.defs ()); -static gsi::ClassExt decl_QTabBar_ButtonPosition_Enum_as_child (decl_QTabBar_ButtonPosition_Enum, "ButtonPosition"); -static gsi::ClassExt decl_QTabBar_ButtonPosition_Enums_as_child (decl_QTabBar_ButtonPosition_Enums, "QFlags_ButtonPosition"); +static gsi::ClassExt decl_QTabBar_ButtonPosition_Enum_as_child (decl_QTabBar_ButtonPosition_Enum, "QtGui", "ButtonPosition"); +static gsi::ClassExt decl_QTabBar_ButtonPosition_Enums_as_child (decl_QTabBar_ButtonPosition_Enums, "QtGui", "QFlags_ButtonPosition"); } @@ -3708,19 +3708,19 @@ static gsi::ClassExt decl_QTabBar_ButtonPosition_Enums_as_child (decl_Q namespace qt_gsi { -static gsi::Enum decl_QTabBar_SelectionBehavior_Enum ("QTabBar_SelectionBehavior", +static gsi::Enum decl_QTabBar_SelectionBehavior_Enum ("QtGui", "QTabBar_SelectionBehavior", gsi::enum_const ("SelectLeftTab", QTabBar::SelectLeftTab, "@brief Enum constant QTabBar::SelectLeftTab") + gsi::enum_const ("SelectRightTab", QTabBar::SelectRightTab, "@brief Enum constant QTabBar::SelectRightTab") + gsi::enum_const ("SelectPreviousTab", QTabBar::SelectPreviousTab, "@brief Enum constant QTabBar::SelectPreviousTab"), "@qt\n@brief This class represents the QTabBar::SelectionBehavior enum"); -static gsi::QFlagsClass decl_QTabBar_SelectionBehavior_Enums ("QTabBar_QFlags_SelectionBehavior", +static gsi::QFlagsClass decl_QTabBar_SelectionBehavior_Enums ("QtGui", "QTabBar_QFlags_SelectionBehavior", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTabBar_SelectionBehavior_Enum_in_parent (decl_QTabBar_SelectionBehavior_Enum.defs ()); -static gsi::ClassExt decl_QTabBar_SelectionBehavior_Enum_as_child (decl_QTabBar_SelectionBehavior_Enum, "SelectionBehavior"); -static gsi::ClassExt decl_QTabBar_SelectionBehavior_Enums_as_child (decl_QTabBar_SelectionBehavior_Enums, "QFlags_SelectionBehavior"); +static gsi::ClassExt decl_QTabBar_SelectionBehavior_Enum_as_child (decl_QTabBar_SelectionBehavior_Enum, "QtGui", "SelectionBehavior"); +static gsi::ClassExt decl_QTabBar_SelectionBehavior_Enums_as_child (decl_QTabBar_SelectionBehavior_Enums, "QtGui", "QFlags_SelectionBehavior"); } @@ -3729,7 +3729,7 @@ static gsi::ClassExt decl_QTabBar_SelectionBehavior_Enums_as_child (dec namespace qt_gsi { -static gsi::Enum decl_QTabBar_Shape_Enum ("QTabBar_Shape", +static gsi::Enum decl_QTabBar_Shape_Enum ("QtGui", "QTabBar_Shape", gsi::enum_const ("RoundedNorth", QTabBar::RoundedNorth, "@brief Enum constant QTabBar::RoundedNorth") + gsi::enum_const ("RoundedSouth", QTabBar::RoundedSouth, "@brief Enum constant QTabBar::RoundedSouth") + gsi::enum_const ("RoundedWest", QTabBar::RoundedWest, "@brief Enum constant QTabBar::RoundedWest") + @@ -3740,13 +3740,13 @@ static gsi::Enum decl_QTabBar_Shape_Enum ("QTabBar_Shape", gsi::enum_const ("TriangularEast", QTabBar::TriangularEast, "@brief Enum constant QTabBar::TriangularEast"), "@qt\n@brief This class represents the QTabBar::Shape enum"); -static gsi::QFlagsClass decl_QTabBar_Shape_Enums ("QTabBar_QFlags_Shape", +static gsi::QFlagsClass decl_QTabBar_Shape_Enums ("QtGui", "QTabBar_QFlags_Shape", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTabBar_Shape_Enum_in_parent (decl_QTabBar_Shape_Enum.defs ()); -static gsi::ClassExt decl_QTabBar_Shape_Enum_as_child (decl_QTabBar_Shape_Enum, "Shape"); -static gsi::ClassExt decl_QTabBar_Shape_Enums_as_child (decl_QTabBar_Shape_Enums, "QFlags_Shape"); +static gsi::ClassExt decl_QTabBar_Shape_Enum_as_child (decl_QTabBar_Shape_Enum, "QtGui", "Shape"); +static gsi::ClassExt decl_QTabBar_Shape_Enums_as_child (decl_QTabBar_Shape_Enums, "QtGui", "QFlags_Shape"); } diff --git a/src/gsiqt4/gsiDeclQTabWidget.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTabWidget.cc similarity index 99% rename from src/gsiqt4/gsiDeclQTabWidget.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTabWidget.cc index 4842bc5ea..dc77a1ab3 100644 --- a/src/gsiqt4/gsiDeclQTabWidget.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTabWidget.cc @@ -79,8 +79,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1076,11 +1076,11 @@ static gsi::Methods methods_QTabWidget () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QTabWidget (qtdecl_QWidget (), "QTabWidget_Native", +qt_gsi::QtNativeClass decl_QTabWidget (qtdecl_QWidget (), "QtGui", "QTabWidget_Native", methods_QTabWidget (), "@hide\n@alias QTabWidget"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTabWidget () { return decl_QTabWidget; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTabWidget () { return decl_QTabWidget; } } @@ -3485,7 +3485,7 @@ static gsi::Methods methods_QTabWidget_Adaptor () { return methods; } -gsi::Class decl_QTabWidget_Adaptor (qtdecl_QTabWidget (), "QTabWidget", +gsi::Class decl_QTabWidget_Adaptor (qtdecl_QTabWidget (), "QtGui", "QTabWidget", methods_QTabWidget_Adaptor (), "@qt\n@brief Binding of QTabWidget"); @@ -3496,20 +3496,20 @@ gsi::Class decl_QTabWidget_Adaptor (qtdecl_QTabWidget (), "Q namespace qt_gsi { -static gsi::Enum decl_QTabWidget_TabPosition_Enum ("QTabWidget_TabPosition", +static gsi::Enum decl_QTabWidget_TabPosition_Enum ("QtGui", "QTabWidget_TabPosition", gsi::enum_const ("North", QTabWidget::North, "@brief Enum constant QTabWidget::North") + gsi::enum_const ("South", QTabWidget::South, "@brief Enum constant QTabWidget::South") + gsi::enum_const ("West", QTabWidget::West, "@brief Enum constant QTabWidget::West") + gsi::enum_const ("East", QTabWidget::East, "@brief Enum constant QTabWidget::East"), "@qt\n@brief This class represents the QTabWidget::TabPosition enum"); -static gsi::QFlagsClass decl_QTabWidget_TabPosition_Enums ("QTabWidget_QFlags_TabPosition", +static gsi::QFlagsClass decl_QTabWidget_TabPosition_Enums ("QtGui", "QTabWidget_QFlags_TabPosition", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTabWidget_TabPosition_Enum_in_parent (decl_QTabWidget_TabPosition_Enum.defs ()); -static gsi::ClassExt decl_QTabWidget_TabPosition_Enum_as_child (decl_QTabWidget_TabPosition_Enum, "TabPosition"); -static gsi::ClassExt decl_QTabWidget_TabPosition_Enums_as_child (decl_QTabWidget_TabPosition_Enums, "QFlags_TabPosition"); +static gsi::ClassExt decl_QTabWidget_TabPosition_Enum_as_child (decl_QTabWidget_TabPosition_Enum, "QtGui", "TabPosition"); +static gsi::ClassExt decl_QTabWidget_TabPosition_Enums_as_child (decl_QTabWidget_TabPosition_Enums, "QtGui", "QFlags_TabPosition"); } @@ -3518,18 +3518,18 @@ static gsi::ClassExt decl_QTabWidget_TabPosition_Enums_as_child (dec namespace qt_gsi { -static gsi::Enum decl_QTabWidget_TabShape_Enum ("QTabWidget_TabShape", +static gsi::Enum decl_QTabWidget_TabShape_Enum ("QtGui", "QTabWidget_TabShape", gsi::enum_const ("Rounded", QTabWidget::Rounded, "@brief Enum constant QTabWidget::Rounded") + gsi::enum_const ("Triangular", QTabWidget::Triangular, "@brief Enum constant QTabWidget::Triangular"), "@qt\n@brief This class represents the QTabWidget::TabShape enum"); -static gsi::QFlagsClass decl_QTabWidget_TabShape_Enums ("QTabWidget_QFlags_TabShape", +static gsi::QFlagsClass decl_QTabWidget_TabShape_Enums ("QtGui", "QTabWidget_QFlags_TabShape", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTabWidget_TabShape_Enum_in_parent (decl_QTabWidget_TabShape_Enum.defs ()); -static gsi::ClassExt decl_QTabWidget_TabShape_Enum_as_child (decl_QTabWidget_TabShape_Enum, "TabShape"); -static gsi::ClassExt decl_QTabWidget_TabShape_Enums_as_child (decl_QTabWidget_TabShape_Enums, "QFlags_TabShape"); +static gsi::ClassExt decl_QTabWidget_TabShape_Enum_as_child (decl_QTabWidget_TabShape_Enum, "QtGui", "TabShape"); +static gsi::ClassExt decl_QTabWidget_TabShape_Enums_as_child (decl_QTabWidget_TabShape_Enums, "QtGui", "QFlags_TabShape"); } diff --git a/src/gsiqt4/gsiDeclQTableView.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTableView.cc similarity index 99% rename from src/gsiqt4/gsiDeclQTableView.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTableView.cc index ee785b9f0..2b889bf52 100644 --- a/src/gsiqt4/gsiDeclQTableView.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTableView.cc @@ -85,8 +85,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1204,11 +1204,11 @@ static gsi::Methods methods_QTableView () { gsi::Class &qtdecl_QAbstractItemView (); -qt_gsi::QtNativeClass decl_QTableView (qtdecl_QAbstractItemView (), "QTableView_Native", +qt_gsi::QtNativeClass decl_QTableView (qtdecl_QAbstractItemView (), "QtGui", "QTableView_Native", methods_QTableView (), "@hide\n@alias QTableView"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTableView () { return decl_QTableView; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTableView () { return decl_QTableView; } } @@ -5848,7 +5848,7 @@ static gsi::Methods methods_QTableView_Adaptor () { return methods; } -gsi::Class decl_QTableView_Adaptor (qtdecl_QTableView (), "QTableView", +gsi::Class decl_QTableView_Adaptor (qtdecl_QTableView (), "QtGui", "QTableView", methods_QTableView_Adaptor (), "@qt\n@brief Binding of QTableView"); diff --git a/src/gsiqt4/gsiDeclQTableWidget.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTableWidget.cc similarity index 99% rename from src/gsiqt4/gsiDeclQTableWidget.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTableWidget.cc index 9de1bf429..2c983694c 100644 --- a/src/gsiqt4/gsiDeclQTableWidget.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTableWidget.cc @@ -88,8 +88,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1345,11 +1345,11 @@ static gsi::Methods methods_QTableWidget () { gsi::Class &qtdecl_QTableView (); -qt_gsi::QtNativeClass decl_QTableWidget (qtdecl_QTableView (), "QTableWidget_Native", +qt_gsi::QtNativeClass decl_QTableWidget (qtdecl_QTableView (), "QtGui", "QTableWidget_Native", methods_QTableWidget (), "@hide\n@alias QTableWidget"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTableWidget () { return decl_QTableWidget; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTableWidget () { return decl_QTableWidget; } } @@ -6622,7 +6622,7 @@ static gsi::Methods methods_QTableWidget_Adaptor () { return methods; } -gsi::Class decl_QTableWidget_Adaptor (qtdecl_QTableWidget (), "QTableWidget", +gsi::Class decl_QTableWidget_Adaptor (qtdecl_QTableWidget (), "QtGui", "QTableWidget", methods_QTableWidget_Adaptor (), "@qt\n@brief Binding of QTableWidget"); diff --git a/src/gsiqt4/gsiDeclQTableWidgetItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTableWidgetItem.cc similarity index 99% rename from src/gsiqt4/gsiDeclQTableWidgetItem.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTableWidgetItem.cc index 8426fc4a6..db29efb8d 100644 --- a/src/gsiqt4/gsiDeclQTableWidgetItem.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTableWidgetItem.cc @@ -36,8 +36,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -812,11 +812,11 @@ static gsi::Methods methods_QTableWidgetItem () { return methods; } -gsi::Class decl_QTableWidgetItem ("QTableWidgetItem_Native", +gsi::Class decl_QTableWidgetItem ("QtGui", "QTableWidgetItem_Native", methods_QTableWidgetItem (), "@hide\n@alias QTableWidgetItem"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTableWidgetItem () { return decl_QTableWidgetItem; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTableWidgetItem () { return decl_QTableWidgetItem; } } @@ -1216,7 +1216,7 @@ static gsi::Methods methods_QTableWidgetItem_Adaptor () { return methods; } -gsi::Class decl_QTableWidgetItem_Adaptor (qtdecl_QTableWidgetItem (), "QTableWidgetItem", +gsi::Class decl_QTableWidgetItem_Adaptor (qtdecl_QTableWidgetItem (), "QtGui", "QTableWidgetItem", methods_QTableWidgetItem_Adaptor (), "@qt\n@brief Binding of QTableWidgetItem"); diff --git a/src/gsiqt4/gsiDeclQTableWidgetSelectionRange.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTableWidgetSelectionRange.cc similarity index 96% rename from src/gsiqt4/gsiDeclQTableWidgetSelectionRange.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTableWidgetSelectionRange.cc index 32dbeb179..f3341bf11 100644 --- a/src/gsiqt4/gsiDeclQTableWidgetSelectionRange.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTableWidgetSelectionRange.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -206,12 +206,12 @@ static gsi::Methods methods_QTableWidgetSelectionRange () { return methods; } -gsi::Class decl_QTableWidgetSelectionRange ("QTableWidgetSelectionRange", +gsi::Class decl_QTableWidgetSelectionRange ("QtGui", "QTableWidgetSelectionRange", methods_QTableWidgetSelectionRange (), "@qt\n@brief Binding of QTableWidgetSelectionRange"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTableWidgetSelectionRange () { return decl_QTableWidgetSelectionRange; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTableWidgetSelectionRange () { return decl_QTableWidgetSelectionRange; } } diff --git a/src/gsiqt4/gsiDeclQTabletEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTabletEvent.cc similarity index 94% rename from src/gsiqt4/gsiDeclQTabletEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTabletEvent.cc index c9556c0ba..b2890326b 100644 --- a/src/gsiqt4/gsiDeclQTabletEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTabletEvent.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -336,11 +336,11 @@ static gsi::Methods methods_QTabletEvent () { gsi::Class &qtdecl_QInputEvent (); -gsi::Class decl_QTabletEvent (qtdecl_QInputEvent (), "QTabletEvent_Native", +gsi::Class decl_QTabletEvent (qtdecl_QInputEvent (), "QtGui", "QTabletEvent_Native", methods_QTabletEvent (), "@hide\n@alias QTabletEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTabletEvent () { return decl_QTabletEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTabletEvent () { return decl_QTabletEvent; } } @@ -366,7 +366,7 @@ static gsi::Methods methods_QTabletEvent_Adaptor () { return methods; } -gsi::Class decl_QTabletEvent_Adaptor (qtdecl_QTabletEvent (), "QTabletEvent", +gsi::Class decl_QTabletEvent_Adaptor (qtdecl_QTabletEvent (), "QtGui", "QTabletEvent", methods_QTabletEvent_Adaptor (), "@qt\n@brief Binding of QTabletEvent"); @@ -377,20 +377,20 @@ gsi::Class decl_QTabletEvent_Adaptor (qtdecl_QTabletEvent namespace qt_gsi { -static gsi::Enum decl_QTabletEvent_PointerType_Enum ("QTabletEvent_PointerType", +static gsi::Enum decl_QTabletEvent_PointerType_Enum ("QtGui", "QTabletEvent_PointerType", gsi::enum_const ("UnknownPointer", QTabletEvent::UnknownPointer, "@brief Enum constant QTabletEvent::UnknownPointer") + gsi::enum_const ("Pen", QTabletEvent::Pen, "@brief Enum constant QTabletEvent::Pen") + gsi::enum_const ("Cursor", QTabletEvent::Cursor, "@brief Enum constant QTabletEvent::Cursor") + gsi::enum_const ("Eraser", QTabletEvent::Eraser, "@brief Enum constant QTabletEvent::Eraser"), "@qt\n@brief This class represents the QTabletEvent::PointerType enum"); -static gsi::QFlagsClass decl_QTabletEvent_PointerType_Enums ("QTabletEvent_QFlags_PointerType", +static gsi::QFlagsClass decl_QTabletEvent_PointerType_Enums ("QtGui", "QTabletEvent_QFlags_PointerType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTabletEvent_PointerType_Enum_in_parent (decl_QTabletEvent_PointerType_Enum.defs ()); -static gsi::ClassExt decl_QTabletEvent_PointerType_Enum_as_child (decl_QTabletEvent_PointerType_Enum, "PointerType"); -static gsi::ClassExt decl_QTabletEvent_PointerType_Enums_as_child (decl_QTabletEvent_PointerType_Enums, "QFlags_PointerType"); +static gsi::ClassExt decl_QTabletEvent_PointerType_Enum_as_child (decl_QTabletEvent_PointerType_Enum, "QtGui", "PointerType"); +static gsi::ClassExt decl_QTabletEvent_PointerType_Enums_as_child (decl_QTabletEvent_PointerType_Enums, "QtGui", "QFlags_PointerType"); } @@ -399,7 +399,7 @@ static gsi::ClassExt decl_QTabletEvent_PointerType_Enums_as_child namespace qt_gsi { -static gsi::Enum decl_QTabletEvent_TabletDevice_Enum ("QTabletEvent_TabletDevice", +static gsi::Enum decl_QTabletEvent_TabletDevice_Enum ("QtGui", "QTabletEvent_TabletDevice", gsi::enum_const ("NoDevice", QTabletEvent::NoDevice, "@brief Enum constant QTabletEvent::NoDevice") + gsi::enum_const ("Puck", QTabletEvent::Puck, "@brief Enum constant QTabletEvent::Puck") + gsi::enum_const ("Stylus", QTabletEvent::Stylus, "@brief Enum constant QTabletEvent::Stylus") + @@ -409,13 +409,13 @@ static gsi::Enum decl_QTabletEvent_TabletDevice_Enum gsi::enum_const ("RotationStylus", QTabletEvent::RotationStylus, "@brief Enum constant QTabletEvent::RotationStylus"), "@qt\n@brief This class represents the QTabletEvent::TabletDevice enum"); -static gsi::QFlagsClass decl_QTabletEvent_TabletDevice_Enums ("QTabletEvent_QFlags_TabletDevice", +static gsi::QFlagsClass decl_QTabletEvent_TabletDevice_Enums ("QtGui", "QTabletEvent_QFlags_TabletDevice", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTabletEvent_TabletDevice_Enum_in_parent (decl_QTabletEvent_TabletDevice_Enum.defs ()); -static gsi::ClassExt decl_QTabletEvent_TabletDevice_Enum_as_child (decl_QTabletEvent_TabletDevice_Enum, "TabletDevice"); -static gsi::ClassExt decl_QTabletEvent_TabletDevice_Enums_as_child (decl_QTabletEvent_TabletDevice_Enums, "QFlags_TabletDevice"); +static gsi::ClassExt decl_QTabletEvent_TabletDevice_Enum_as_child (decl_QTabletEvent_TabletDevice_Enum, "QtGui", "TabletDevice"); +static gsi::ClassExt decl_QTabletEvent_TabletDevice_Enums_as_child (decl_QTabletEvent_TabletDevice_Enums, "QtGui", "QFlags_TabletDevice"); } diff --git a/src/gsiqt4/gsiDeclQTapAndHoldGesture.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTapAndHoldGesture.cc similarity index 98% rename from src/gsiqt4/gsiDeclQTapAndHoldGesture.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTapAndHoldGesture.cc index 47be89756..03abce365 100644 --- a/src/gsiqt4/gsiDeclQTapAndHoldGesture.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTapAndHoldGesture.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -202,11 +202,11 @@ static gsi::Methods methods_QTapAndHoldGesture () { gsi::Class &qtdecl_QGesture (); -qt_gsi::QtNativeClass decl_QTapAndHoldGesture (qtdecl_QGesture (), "QTapAndHoldGesture_Native", +qt_gsi::QtNativeClass decl_QTapAndHoldGesture (qtdecl_QGesture (), "QtGui", "QTapAndHoldGesture_Native", methods_QTapAndHoldGesture (), "@hide\n@alias QTapAndHoldGesture"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTapAndHoldGesture () { return decl_QTapAndHoldGesture; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTapAndHoldGesture () { return decl_QTapAndHoldGesture; } } @@ -584,7 +584,7 @@ static gsi::Methods methods_QTapAndHoldGesture_Adaptor () { return methods; } -gsi::Class decl_QTapAndHoldGesture_Adaptor (qtdecl_QTapAndHoldGesture (), "QTapAndHoldGesture", +gsi::Class decl_QTapAndHoldGesture_Adaptor (qtdecl_QTapAndHoldGesture (), "QtGui", "QTapAndHoldGesture", methods_QTapAndHoldGesture_Adaptor (), "@qt\n@brief Binding of QTapAndHoldGesture"); diff --git a/src/gsiqt4/gsiDeclQTapGesture.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTapGesture.cc similarity index 98% rename from src/gsiqt4/gsiDeclQTapGesture.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTapGesture.cc index 2e6ec7067..d44c42d86 100644 --- a/src/gsiqt4/gsiDeclQTapGesture.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTapGesture.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -202,11 +202,11 @@ static gsi::Methods methods_QTapGesture () { gsi::Class &qtdecl_QGesture (); -qt_gsi::QtNativeClass decl_QTapGesture (qtdecl_QGesture (), "QTapGesture_Native", +qt_gsi::QtNativeClass decl_QTapGesture (qtdecl_QGesture (), "QtGui", "QTapGesture_Native", methods_QTapGesture (), "@hide\n@alias QTapGesture"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTapGesture () { return decl_QTapGesture; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTapGesture () { return decl_QTapGesture; } } @@ -584,7 +584,7 @@ static gsi::Methods methods_QTapGesture_Adaptor () { return methods; } -gsi::Class decl_QTapGesture_Adaptor (qtdecl_QTapGesture (), "QTapGesture", +gsi::Class decl_QTapGesture_Adaptor (qtdecl_QTapGesture (), "QtGui", "QTapGesture", methods_QTapGesture_Adaptor (), "@qt\n@brief Binding of QTapGesture"); diff --git a/src/gsiqt4/gsiDeclQTextBlock.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextBlock.cc similarity index 99% rename from src/gsiqt4/gsiDeclQTextBlock.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextBlock.cc index a3f0049e1..1023c0f33 100644 --- a/src/gsiqt4/gsiDeclQTextBlock.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextBlock.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -677,12 +677,12 @@ static gsi::Methods methods_QTextBlock () { return methods; } -gsi::Class decl_QTextBlock ("QTextBlock", +gsi::Class decl_QTextBlock ("QtGui", "QTextBlock", methods_QTextBlock (), "@qt\n@brief Binding of QTextBlock"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextBlock () { return decl_QTextBlock; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextBlock () { return decl_QTextBlock; } } diff --git a/src/gsiqt4/gsiDeclQTextBlockFormat.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextBlockFormat.cc similarity index 98% rename from src/gsiqt4/gsiDeclQTextBlockFormat.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextBlockFormat.cc index 77ea813b2..b94557fb6 100644 --- a/src/gsiqt4/gsiDeclQTextBlockFormat.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextBlockFormat.cc @@ -40,8 +40,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -460,12 +460,12 @@ static gsi::Methods methods_QTextBlockFormat () { gsi::Class &qtdecl_QTextFormat (); -gsi::Class decl_QTextBlockFormat (qtdecl_QTextFormat (), "QTextBlockFormat", +gsi::Class decl_QTextBlockFormat (qtdecl_QTextFormat (), "QtGui", "QTextBlockFormat", methods_QTextBlockFormat (), "@qt\n@brief Binding of QTextBlockFormat"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextBlockFormat () { return decl_QTextBlockFormat; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextBlockFormat () { return decl_QTextBlockFormat; } } diff --git a/src/gsiqt4/gsiDeclQTextBlockGroup.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextBlockGroup.cc similarity index 98% rename from src/gsiqt4/gsiDeclQTextBlockGroup.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextBlockGroup.cc index 14582c366..3568ca34c 100644 --- a/src/gsiqt4/gsiDeclQTextBlockGroup.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextBlockGroup.cc @@ -37,8 +37,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -167,11 +167,11 @@ static gsi::Methods methods_QTextBlockGroup () { gsi::Class &qtdecl_QTextObject (); -qt_gsi::QtNativeClass decl_QTextBlockGroup (qtdecl_QTextObject (), "QTextBlockGroup_Native", +qt_gsi::QtNativeClass decl_QTextBlockGroup (qtdecl_QTextObject (), "QtGui", "QTextBlockGroup_Native", methods_QTextBlockGroup (), "@hide\n@alias QTextBlockGroup"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextBlockGroup () { return decl_QTextBlockGroup; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextBlockGroup () { return decl_QTextBlockGroup; } } @@ -689,7 +689,7 @@ static gsi::Methods methods_QTextBlockGroup_Adaptor () { return methods; } -gsi::Class decl_QTextBlockGroup_Adaptor (qtdecl_QTextBlockGroup (), "QTextBlockGroup", +gsi::Class decl_QTextBlockGroup_Adaptor (qtdecl_QTextBlockGroup (), "QtGui", "QTextBlockGroup", methods_QTextBlockGroup_Adaptor (), "@qt\n@brief Binding of QTextBlockGroup"); diff --git a/src/gsiqt4/gsiDeclQTextBlockUserData.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextBlockUserData.cc similarity index 88% rename from src/gsiqt4/gsiDeclQTextBlockUserData.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextBlockUserData.cc index dd5e2e48f..7e869019e 100644 --- a/src/gsiqt4/gsiDeclQTextBlockUserData.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextBlockUserData.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -44,11 +44,11 @@ static gsi::Methods methods_QTextBlockUserData () { return methods; } -gsi::Class decl_QTextBlockUserData ("QTextBlockUserData_Native", +gsi::Class decl_QTextBlockUserData ("QtGui", "QTextBlockUserData_Native", methods_QTextBlockUserData (), "@hide\n@alias QTextBlockUserData"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextBlockUserData () { return decl_QTextBlockUserData; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextBlockUserData () { return decl_QTextBlockUserData; } } @@ -95,7 +95,7 @@ static gsi::Methods methods_QTextBlockUserData_Adaptor () { return methods; } -gsi::Class decl_QTextBlockUserData_Adaptor (qtdecl_QTextBlockUserData (), "QTextBlockUserData", +gsi::Class decl_QTextBlockUserData_Adaptor (qtdecl_QTextBlockUserData (), "QtGui", "QTextBlockUserData", methods_QTextBlockUserData_Adaptor (), "@qt\n@brief Binding of QTextBlockUserData"); diff --git a/src/gsiqt4/gsiDeclQTextBlock_Iterator.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextBlock_Iterator.cc similarity index 96% rename from src/gsiqt4/gsiDeclQTextBlock_Iterator.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextBlock_Iterator.cc index 4dc6082c5..aff036890 100644 --- a/src/gsiqt4/gsiDeclQTextBlock_Iterator.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextBlock_Iterator.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -226,13 +226,13 @@ static gsi::Methods methods_QTextBlock_Iterator () { return methods; } -gsi::Class decl_QTextBlock_Iterator ("QTextBlock_Iterator", +gsi::Class decl_QTextBlock_Iterator ("QtGui", "QTextBlock_Iterator", methods_QTextBlock_Iterator (), "@qt\n@brief Binding of QTextBlock::iterator"); -gsi::ClassExt decl_QTextBlock_Iterator_as_child (decl_QTextBlock_Iterator, "Iterator"); +gsi::ClassExt decl_QTextBlock_Iterator_as_child (decl_QTextBlock_Iterator, "QtGui", "Iterator"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextBlock_Iterator () { return decl_QTextBlock_Iterator; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextBlock_Iterator () { return decl_QTextBlock_Iterator; } } diff --git a/src/gsiqt4/gsiDeclQTextBrowser.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextBrowser.cc similarity index 99% rename from src/gsiqt4/gsiDeclQTextBrowser.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextBrowser.cc index 8209ad101..502fc840d 100644 --- a/src/gsiqt4/gsiDeclQTextBrowser.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextBrowser.cc @@ -86,8 +86,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -591,11 +591,11 @@ static gsi::Methods methods_QTextBrowser () { gsi::Class &qtdecl_QTextEdit (); -qt_gsi::QtNativeClass decl_QTextBrowser (qtdecl_QTextEdit (), "QTextBrowser_Native", +qt_gsi::QtNativeClass decl_QTextBrowser (qtdecl_QTextEdit (), "QtGui", "QTextBrowser_Native", methods_QTextBrowser (), "@hide\n@alias QTextBrowser"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextBrowser () { return decl_QTextBrowser; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextBrowser () { return decl_QTextBrowser; } } @@ -3683,7 +3683,7 @@ static gsi::Methods methods_QTextBrowser_Adaptor () { return methods; } -gsi::Class decl_QTextBrowser_Adaptor (qtdecl_QTextBrowser (), "QTextBrowser", +gsi::Class decl_QTextBrowser_Adaptor (qtdecl_QTextBrowser (), "QtGui", "QTextBrowser", methods_QTextBrowser_Adaptor (), "@qt\n@brief Binding of QTextBrowser"); diff --git a/src/gsiqt4/gsiDeclQTextCharFormat.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextCharFormat.cc similarity index 98% rename from src/gsiqt4/gsiDeclQTextCharFormat.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextCharFormat.cc index fe357f891..b4671c811 100644 --- a/src/gsiqt4/gsiDeclQTextCharFormat.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextCharFormat.cc @@ -41,8 +41,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1056,12 +1056,12 @@ static gsi::Methods methods_QTextCharFormat () { gsi::Class &qtdecl_QTextFormat (); -gsi::Class decl_QTextCharFormat (qtdecl_QTextFormat (), "QTextCharFormat", +gsi::Class decl_QTextCharFormat (qtdecl_QTextFormat (), "QtGui", "QTextCharFormat", methods_QTextCharFormat (), "@qt\n@brief Binding of QTextCharFormat"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextCharFormat () { return decl_QTextCharFormat; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextCharFormat () { return decl_QTextCharFormat; } } @@ -1070,7 +1070,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QTextCharFormat () { return dec namespace qt_gsi { -static gsi::Enum decl_QTextCharFormat_UnderlineStyle_Enum ("QTextCharFormat_UnderlineStyle", +static gsi::Enum decl_QTextCharFormat_UnderlineStyle_Enum ("QtGui", "QTextCharFormat_UnderlineStyle", gsi::enum_const ("NoUnderline", QTextCharFormat::NoUnderline, "@brief Enum constant QTextCharFormat::NoUnderline") + gsi::enum_const ("SingleUnderline", QTextCharFormat::SingleUnderline, "@brief Enum constant QTextCharFormat::SingleUnderline") + gsi::enum_const ("DashUnderline", QTextCharFormat::DashUnderline, "@brief Enum constant QTextCharFormat::DashUnderline") + @@ -1081,13 +1081,13 @@ static gsi::Enum decl_QTextCharFormat_Underline gsi::enum_const ("SpellCheckUnderline", QTextCharFormat::SpellCheckUnderline, "@brief Enum constant QTextCharFormat::SpellCheckUnderline"), "@qt\n@brief This class represents the QTextCharFormat::UnderlineStyle enum"); -static gsi::QFlagsClass decl_QTextCharFormat_UnderlineStyle_Enums ("QTextCharFormat_QFlags_UnderlineStyle", +static gsi::QFlagsClass decl_QTextCharFormat_UnderlineStyle_Enums ("QtGui", "QTextCharFormat_QFlags_UnderlineStyle", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTextCharFormat_UnderlineStyle_Enum_in_parent (decl_QTextCharFormat_UnderlineStyle_Enum.defs ()); -static gsi::ClassExt decl_QTextCharFormat_UnderlineStyle_Enum_as_child (decl_QTextCharFormat_UnderlineStyle_Enum, "UnderlineStyle"); -static gsi::ClassExt decl_QTextCharFormat_UnderlineStyle_Enums_as_child (decl_QTextCharFormat_UnderlineStyle_Enums, "QFlags_UnderlineStyle"); +static gsi::ClassExt decl_QTextCharFormat_UnderlineStyle_Enum_as_child (decl_QTextCharFormat_UnderlineStyle_Enum, "QtGui", "UnderlineStyle"); +static gsi::ClassExt decl_QTextCharFormat_UnderlineStyle_Enums_as_child (decl_QTextCharFormat_UnderlineStyle_Enums, "QtGui", "QFlags_UnderlineStyle"); } @@ -1096,7 +1096,7 @@ static gsi::ClassExt decl_QTextCharFormat_UnderlineStyle_Enums_ namespace qt_gsi { -static gsi::Enum decl_QTextCharFormat_VerticalAlignment_Enum ("QTextCharFormat_VerticalAlignment", +static gsi::Enum decl_QTextCharFormat_VerticalAlignment_Enum ("QtGui", "QTextCharFormat_VerticalAlignment", gsi::enum_const ("AlignNormal", QTextCharFormat::AlignNormal, "@brief Enum constant QTextCharFormat::AlignNormal") + gsi::enum_const ("AlignSuperScript", QTextCharFormat::AlignSuperScript, "@brief Enum constant QTextCharFormat::AlignSuperScript") + gsi::enum_const ("AlignSubScript", QTextCharFormat::AlignSubScript, "@brief Enum constant QTextCharFormat::AlignSubScript") + @@ -1105,13 +1105,13 @@ static gsi::Enum decl_QTextCharFormat_Vertic gsi::enum_const ("AlignBottom", QTextCharFormat::AlignBottom, "@brief Enum constant QTextCharFormat::AlignBottom"), "@qt\n@brief This class represents the QTextCharFormat::VerticalAlignment enum"); -static gsi::QFlagsClass decl_QTextCharFormat_VerticalAlignment_Enums ("QTextCharFormat_QFlags_VerticalAlignment", +static gsi::QFlagsClass decl_QTextCharFormat_VerticalAlignment_Enums ("QtGui", "QTextCharFormat_QFlags_VerticalAlignment", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTextCharFormat_VerticalAlignment_Enum_in_parent (decl_QTextCharFormat_VerticalAlignment_Enum.defs ()); -static gsi::ClassExt decl_QTextCharFormat_VerticalAlignment_Enum_as_child (decl_QTextCharFormat_VerticalAlignment_Enum, "VerticalAlignment"); -static gsi::ClassExt decl_QTextCharFormat_VerticalAlignment_Enums_as_child (decl_QTextCharFormat_VerticalAlignment_Enums, "QFlags_VerticalAlignment"); +static gsi::ClassExt decl_QTextCharFormat_VerticalAlignment_Enum_as_child (decl_QTextCharFormat_VerticalAlignment_Enum, "QtGui", "VerticalAlignment"); +static gsi::ClassExt decl_QTextCharFormat_VerticalAlignment_Enums_as_child (decl_QTextCharFormat_VerticalAlignment_Enums, "QtGui", "QFlags_VerticalAlignment"); } diff --git a/src/gsiqt4/gsiDeclQTextCursor.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextCursor.cc similarity index 98% rename from src/gsiqt4/gsiDeclQTextCursor.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextCursor.cc index 48178b0a0..04aa881c9 100644 --- a/src/gsiqt4/gsiDeclQTextCursor.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextCursor.cc @@ -42,8 +42,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1453,12 +1453,12 @@ static gsi::Methods methods_QTextCursor () { return methods; } -gsi::Class decl_QTextCursor ("QTextCursor", +gsi::Class decl_QTextCursor ("QtGui", "QTextCursor", methods_QTextCursor (), "@qt\n@brief Binding of QTextCursor"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextCursor () { return decl_QTextCursor; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextCursor () { return decl_QTextCursor; } } @@ -1467,18 +1467,18 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QTextCursor () { return decl_QTextC namespace qt_gsi { -static gsi::Enum decl_QTextCursor_MoveMode_Enum ("QTextCursor_MoveMode", +static gsi::Enum decl_QTextCursor_MoveMode_Enum ("QtGui", "QTextCursor_MoveMode", gsi::enum_const ("MoveAnchor", QTextCursor::MoveAnchor, "@brief Enum constant QTextCursor::MoveAnchor") + gsi::enum_const ("KeepAnchor", QTextCursor::KeepAnchor, "@brief Enum constant QTextCursor::KeepAnchor"), "@qt\n@brief This class represents the QTextCursor::MoveMode enum"); -static gsi::QFlagsClass decl_QTextCursor_MoveMode_Enums ("QTextCursor_QFlags_MoveMode", +static gsi::QFlagsClass decl_QTextCursor_MoveMode_Enums ("QtGui", "QTextCursor_QFlags_MoveMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTextCursor_MoveMode_Enum_in_parent (decl_QTextCursor_MoveMode_Enum.defs ()); -static gsi::ClassExt decl_QTextCursor_MoveMode_Enum_as_child (decl_QTextCursor_MoveMode_Enum, "MoveMode"); -static gsi::ClassExt decl_QTextCursor_MoveMode_Enums_as_child (decl_QTextCursor_MoveMode_Enums, "QFlags_MoveMode"); +static gsi::ClassExt decl_QTextCursor_MoveMode_Enum_as_child (decl_QTextCursor_MoveMode_Enum, "QtGui", "MoveMode"); +static gsi::ClassExt decl_QTextCursor_MoveMode_Enums_as_child (decl_QTextCursor_MoveMode_Enums, "QtGui", "QFlags_MoveMode"); } @@ -1487,7 +1487,7 @@ static gsi::ClassExt decl_QTextCursor_MoveMode_Enums_as_child (decl namespace qt_gsi { -static gsi::Enum decl_QTextCursor_MoveOperation_Enum ("QTextCursor_MoveOperation", +static gsi::Enum decl_QTextCursor_MoveOperation_Enum ("QtGui", "QTextCursor_MoveOperation", gsi::enum_const ("NoMove", QTextCursor::NoMove, "@brief Enum constant QTextCursor::NoMove") + gsi::enum_const ("Start", QTextCursor::Start, "@brief Enum constant QTextCursor::Start") + gsi::enum_const ("Up", QTextCursor::Up, "@brief Enum constant QTextCursor::Up") + @@ -1515,13 +1515,13 @@ static gsi::Enum decl_QTextCursor_MoveOperation_Enum gsi::enum_const ("PreviousRow", QTextCursor::PreviousRow, "@brief Enum constant QTextCursor::PreviousRow"), "@qt\n@brief This class represents the QTextCursor::MoveOperation enum"); -static gsi::QFlagsClass decl_QTextCursor_MoveOperation_Enums ("QTextCursor_QFlags_MoveOperation", +static gsi::QFlagsClass decl_QTextCursor_MoveOperation_Enums ("QtGui", "QTextCursor_QFlags_MoveOperation", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTextCursor_MoveOperation_Enum_in_parent (decl_QTextCursor_MoveOperation_Enum.defs ()); -static gsi::ClassExt decl_QTextCursor_MoveOperation_Enum_as_child (decl_QTextCursor_MoveOperation_Enum, "MoveOperation"); -static gsi::ClassExt decl_QTextCursor_MoveOperation_Enums_as_child (decl_QTextCursor_MoveOperation_Enums, "QFlags_MoveOperation"); +static gsi::ClassExt decl_QTextCursor_MoveOperation_Enum_as_child (decl_QTextCursor_MoveOperation_Enum, "QtGui", "MoveOperation"); +static gsi::ClassExt decl_QTextCursor_MoveOperation_Enums_as_child (decl_QTextCursor_MoveOperation_Enums, "QtGui", "QFlags_MoveOperation"); } @@ -1530,20 +1530,20 @@ static gsi::ClassExt decl_QTextCursor_MoveOperation_Enums_as_child namespace qt_gsi { -static gsi::Enum decl_QTextCursor_SelectionType_Enum ("QTextCursor_SelectionType", +static gsi::Enum decl_QTextCursor_SelectionType_Enum ("QtGui", "QTextCursor_SelectionType", gsi::enum_const ("WordUnderCursor", QTextCursor::WordUnderCursor, "@brief Enum constant QTextCursor::WordUnderCursor") + gsi::enum_const ("LineUnderCursor", QTextCursor::LineUnderCursor, "@brief Enum constant QTextCursor::LineUnderCursor") + gsi::enum_const ("BlockUnderCursor", QTextCursor::BlockUnderCursor, "@brief Enum constant QTextCursor::BlockUnderCursor") + gsi::enum_const ("Document", QTextCursor::Document, "@brief Enum constant QTextCursor::Document"), "@qt\n@brief This class represents the QTextCursor::SelectionType enum"); -static gsi::QFlagsClass decl_QTextCursor_SelectionType_Enums ("QTextCursor_QFlags_SelectionType", +static gsi::QFlagsClass decl_QTextCursor_SelectionType_Enums ("QtGui", "QTextCursor_QFlags_SelectionType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTextCursor_SelectionType_Enum_in_parent (decl_QTextCursor_SelectionType_Enum.defs ()); -static gsi::ClassExt decl_QTextCursor_SelectionType_Enum_as_child (decl_QTextCursor_SelectionType_Enum, "SelectionType"); -static gsi::ClassExt decl_QTextCursor_SelectionType_Enums_as_child (decl_QTextCursor_SelectionType_Enums, "QFlags_SelectionType"); +static gsi::ClassExt decl_QTextCursor_SelectionType_Enum_as_child (decl_QTextCursor_SelectionType_Enum, "QtGui", "SelectionType"); +static gsi::ClassExt decl_QTextCursor_SelectionType_Enums_as_child (decl_QTextCursor_SelectionType_Enums, "QtGui", "QFlags_SelectionType"); } diff --git a/src/gsiqt4/gsiDeclQTextDocument.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextDocument.cc similarity index 99% rename from src/gsiqt4/gsiDeclQTextDocument.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextDocument.cc index 88496fbd6..4aca9541a 100644 --- a/src/gsiqt4/gsiDeclQTextDocument.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextDocument.cc @@ -48,8 +48,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1534,11 +1534,11 @@ static gsi::Methods methods_QTextDocument () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QTextDocument (qtdecl_QObject (), "QTextDocument_Native", +qt_gsi::QtNativeClass decl_QTextDocument (qtdecl_QObject (), "QtGui", "QTextDocument_Native", methods_QTextDocument (), "@hide\n@alias QTextDocument"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextDocument () { return decl_QTextDocument; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextDocument () { return decl_QTextDocument; } } @@ -2292,7 +2292,7 @@ static gsi::Methods methods_QTextDocument_Adaptor () { return methods; } -gsi::Class decl_QTextDocument_Adaptor (qtdecl_QTextDocument (), "QTextDocument", +gsi::Class decl_QTextDocument_Adaptor (qtdecl_QTextDocument (), "QtGui", "QTextDocument", methods_QTextDocument_Adaptor (), "@qt\n@brief Binding of QTextDocument"); @@ -2303,19 +2303,19 @@ gsi::Class decl_QTextDocument_Adaptor (qtdecl_QTextDocume namespace qt_gsi { -static gsi::Enum decl_QTextDocument_FindFlag_Enum ("QTextDocument_FindFlag", +static gsi::Enum decl_QTextDocument_FindFlag_Enum ("QtGui", "QTextDocument_FindFlag", gsi::enum_const ("FindBackward", QTextDocument::FindBackward, "@brief Enum constant QTextDocument::FindBackward") + gsi::enum_const ("FindCaseSensitively", QTextDocument::FindCaseSensitively, "@brief Enum constant QTextDocument::FindCaseSensitively") + gsi::enum_const ("FindWholeWords", QTextDocument::FindWholeWords, "@brief Enum constant QTextDocument::FindWholeWords"), "@qt\n@brief This class represents the QTextDocument::FindFlag enum"); -static gsi::QFlagsClass decl_QTextDocument_FindFlag_Enums ("QTextDocument_QFlags_FindFlag", +static gsi::QFlagsClass decl_QTextDocument_FindFlag_Enums ("QtGui", "QTextDocument_QFlags_FindFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTextDocument_FindFlag_Enum_in_parent (decl_QTextDocument_FindFlag_Enum.defs ()); -static gsi::ClassExt decl_QTextDocument_FindFlag_Enum_as_child (decl_QTextDocument_FindFlag_Enum, "FindFlag"); -static gsi::ClassExt decl_QTextDocument_FindFlag_Enums_as_child (decl_QTextDocument_FindFlag_Enums, "QFlags_FindFlag"); +static gsi::ClassExt decl_QTextDocument_FindFlag_Enum_as_child (decl_QTextDocument_FindFlag_Enum, "QtGui", "FindFlag"); +static gsi::ClassExt decl_QTextDocument_FindFlag_Enums_as_child (decl_QTextDocument_FindFlag_Enums, "QtGui", "QFlags_FindFlag"); } @@ -2324,18 +2324,18 @@ static gsi::ClassExt decl_QTextDocument_FindFlag_Enums_as_child ( namespace qt_gsi { -static gsi::Enum decl_QTextDocument_MetaInformation_Enum ("QTextDocument_MetaInformation", +static gsi::Enum decl_QTextDocument_MetaInformation_Enum ("QtGui", "QTextDocument_MetaInformation", gsi::enum_const ("DocumentTitle", QTextDocument::DocumentTitle, "@brief Enum constant QTextDocument::DocumentTitle") + gsi::enum_const ("DocumentUrl", QTextDocument::DocumentUrl, "@brief Enum constant QTextDocument::DocumentUrl"), "@qt\n@brief This class represents the QTextDocument::MetaInformation enum"); -static gsi::QFlagsClass decl_QTextDocument_MetaInformation_Enums ("QTextDocument_QFlags_MetaInformation", +static gsi::QFlagsClass decl_QTextDocument_MetaInformation_Enums ("QtGui", "QTextDocument_QFlags_MetaInformation", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTextDocument_MetaInformation_Enum_in_parent (decl_QTextDocument_MetaInformation_Enum.defs ()); -static gsi::ClassExt decl_QTextDocument_MetaInformation_Enum_as_child (decl_QTextDocument_MetaInformation_Enum, "MetaInformation"); -static gsi::ClassExt decl_QTextDocument_MetaInformation_Enums_as_child (decl_QTextDocument_MetaInformation_Enums, "QFlags_MetaInformation"); +static gsi::ClassExt decl_QTextDocument_MetaInformation_Enum_as_child (decl_QTextDocument_MetaInformation_Enum, "QtGui", "MetaInformation"); +static gsi::ClassExt decl_QTextDocument_MetaInformation_Enums_as_child (decl_QTextDocument_MetaInformation_Enums, "QtGui", "QFlags_MetaInformation"); } diff --git a/src/gsiqt4/gsiDeclQTextDocumentFragment.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextDocumentFragment.cc similarity index 98% rename from src/gsiqt4/gsiDeclQTextDocumentFragment.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextDocumentFragment.cc index 4d0aba3ee..233221f25 100644 --- a/src/gsiqt4/gsiDeclQTextDocumentFragment.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextDocumentFragment.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -274,12 +274,12 @@ static gsi::Methods methods_QTextDocumentFragment () { return methods; } -gsi::Class decl_QTextDocumentFragment ("QTextDocumentFragment", +gsi::Class decl_QTextDocumentFragment ("QtGui", "QTextDocumentFragment", methods_QTextDocumentFragment (), "@qt\n@brief Binding of QTextDocumentFragment"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextDocumentFragment () { return decl_QTextDocumentFragment; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextDocumentFragment () { return decl_QTextDocumentFragment; } } diff --git a/src/gsiqt4/gsiDeclQTextDocumentWriter.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextDocumentWriter.cc similarity index 97% rename from src/gsiqt4/gsiDeclQTextDocumentWriter.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextDocumentWriter.cc index 7bdb8e22b..dda660fc8 100644 --- a/src/gsiqt4/gsiDeclQTextDocumentWriter.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextDocumentWriter.cc @@ -33,8 +33,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -315,12 +315,12 @@ static gsi::Methods methods_QTextDocumentWriter () { return methods; } -gsi::Class decl_QTextDocumentWriter ("QTextDocumentWriter", +gsi::Class decl_QTextDocumentWriter ("QtGui", "QTextDocumentWriter", methods_QTextDocumentWriter (), "@qt\n@brief Binding of QTextDocumentWriter"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextDocumentWriter () { return decl_QTextDocumentWriter; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextDocumentWriter () { return decl_QTextDocumentWriter; } } diff --git a/src/gsiqt4/gsiDeclQTextEdit.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextEdit.cc similarity index 99% rename from src/gsiqt4/gsiDeclQTextEdit.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextEdit.cc index 9d8e66480..02b45b8fe 100644 --- a/src/gsiqt4/gsiDeclQTextEdit.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextEdit.cc @@ -86,8 +86,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1783,11 +1783,11 @@ static gsi::Methods methods_QTextEdit () { gsi::Class &qtdecl_QAbstractScrollArea (); -qt_gsi::QtNativeClass decl_QTextEdit (qtdecl_QAbstractScrollArea (), "QTextEdit_Native", +qt_gsi::QtNativeClass decl_QTextEdit (qtdecl_QAbstractScrollArea (), "QtGui", "QTextEdit_Native", methods_QTextEdit (), "@hide\n@alias QTextEdit"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextEdit () { return decl_QTextEdit; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextEdit () { return decl_QTextEdit; } } @@ -4544,7 +4544,7 @@ static gsi::Methods methods_QTextEdit_Adaptor () { return methods; } -gsi::Class decl_QTextEdit_Adaptor (qtdecl_QTextEdit (), "QTextEdit", +gsi::Class decl_QTextEdit_Adaptor (qtdecl_QTextEdit (), "QtGui", "QTextEdit", methods_QTextEdit_Adaptor (), "@qt\n@brief Binding of QTextEdit"); @@ -4555,19 +4555,19 @@ gsi::Class decl_QTextEdit_Adaptor (qtdecl_QTextEdit (), "QTex namespace qt_gsi { -static gsi::Enum decl_QTextEdit_AutoFormattingFlag_Enum ("QTextEdit_AutoFormattingFlag", +static gsi::Enum decl_QTextEdit_AutoFormattingFlag_Enum ("QtGui", "QTextEdit_AutoFormattingFlag", gsi::enum_const ("AutoNone", QTextEdit::AutoNone, "@brief Enum constant QTextEdit::AutoNone") + gsi::enum_const ("AutoBulletList", QTextEdit::AutoBulletList, "@brief Enum constant QTextEdit::AutoBulletList") + gsi::enum_const ("AutoAll", QTextEdit::AutoAll, "@brief Enum constant QTextEdit::AutoAll"), "@qt\n@brief This class represents the QTextEdit::AutoFormattingFlag enum"); -static gsi::QFlagsClass decl_QTextEdit_AutoFormattingFlag_Enums ("QTextEdit_QFlags_AutoFormattingFlag", +static gsi::QFlagsClass decl_QTextEdit_AutoFormattingFlag_Enums ("QtGui", "QTextEdit_QFlags_AutoFormattingFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTextEdit_AutoFormattingFlag_Enum_in_parent (decl_QTextEdit_AutoFormattingFlag_Enum.defs ()); -static gsi::ClassExt decl_QTextEdit_AutoFormattingFlag_Enum_as_child (decl_QTextEdit_AutoFormattingFlag_Enum, "AutoFormattingFlag"); -static gsi::ClassExt decl_QTextEdit_AutoFormattingFlag_Enums_as_child (decl_QTextEdit_AutoFormattingFlag_Enums, "QFlags_AutoFormattingFlag"); +static gsi::ClassExt decl_QTextEdit_AutoFormattingFlag_Enum_as_child (decl_QTextEdit_AutoFormattingFlag_Enum, "QtGui", "AutoFormattingFlag"); +static gsi::ClassExt decl_QTextEdit_AutoFormattingFlag_Enums_as_child (decl_QTextEdit_AutoFormattingFlag_Enums, "QtGui", "QFlags_AutoFormattingFlag"); } @@ -4576,20 +4576,20 @@ static gsi::ClassExt decl_QTextEdit_AutoFormattingFlag_Enums_as_child namespace qt_gsi { -static gsi::Enum decl_QTextEdit_LineWrapMode_Enum ("QTextEdit_LineWrapMode", +static gsi::Enum decl_QTextEdit_LineWrapMode_Enum ("QtGui", "QTextEdit_LineWrapMode", gsi::enum_const ("NoWrap", QTextEdit::NoWrap, "@brief Enum constant QTextEdit::NoWrap") + gsi::enum_const ("WidgetWidth", QTextEdit::WidgetWidth, "@brief Enum constant QTextEdit::WidgetWidth") + gsi::enum_const ("FixedPixelWidth", QTextEdit::FixedPixelWidth, "@brief Enum constant QTextEdit::FixedPixelWidth") + gsi::enum_const ("FixedColumnWidth", QTextEdit::FixedColumnWidth, "@brief Enum constant QTextEdit::FixedColumnWidth"), "@qt\n@brief This class represents the QTextEdit::LineWrapMode enum"); -static gsi::QFlagsClass decl_QTextEdit_LineWrapMode_Enums ("QTextEdit_QFlags_LineWrapMode", +static gsi::QFlagsClass decl_QTextEdit_LineWrapMode_Enums ("QtGui", "QTextEdit_QFlags_LineWrapMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTextEdit_LineWrapMode_Enum_in_parent (decl_QTextEdit_LineWrapMode_Enum.defs ()); -static gsi::ClassExt decl_QTextEdit_LineWrapMode_Enum_as_child (decl_QTextEdit_LineWrapMode_Enum, "LineWrapMode"); -static gsi::ClassExt decl_QTextEdit_LineWrapMode_Enums_as_child (decl_QTextEdit_LineWrapMode_Enums, "QFlags_LineWrapMode"); +static gsi::ClassExt decl_QTextEdit_LineWrapMode_Enum_as_child (decl_QTextEdit_LineWrapMode_Enum, "QtGui", "LineWrapMode"); +static gsi::ClassExt decl_QTextEdit_LineWrapMode_Enums_as_child (decl_QTextEdit_LineWrapMode_Enums, "QtGui", "QFlags_LineWrapMode"); } diff --git a/src/gsiqt4/gsiDeclQTextEdit_ExtraSelection.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextEdit_ExtraSelection.cc similarity index 87% rename from src/gsiqt4/gsiDeclQTextEdit_ExtraSelection.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextEdit_ExtraSelection.cc index 09be0a0a3..d8bf8b96f 100644 --- a/src/gsiqt4/gsiDeclQTextEdit_ExtraSelection.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextEdit_ExtraSelection.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -61,13 +61,13 @@ static gsi::Methods methods_QTextEdit_ExtraSelection () { return methods; } -gsi::Class decl_QTextEdit_ExtraSelection ("QTextEdit_ExtraSelection", +gsi::Class decl_QTextEdit_ExtraSelection ("QtGui", "QTextEdit_ExtraSelection", methods_QTextEdit_ExtraSelection (), "@qt\n@brief Binding of QTextEdit::ExtraSelection"); -gsi::ClassExt decl_QTextEdit_ExtraSelection_as_child (decl_QTextEdit_ExtraSelection, "ExtraSelection"); +gsi::ClassExt decl_QTextEdit_ExtraSelection_as_child (decl_QTextEdit_ExtraSelection, "QtGui", "ExtraSelection"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextEdit_ExtraSelection () { return decl_QTextEdit_ExtraSelection; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextEdit_ExtraSelection () { return decl_QTextEdit_ExtraSelection; } } diff --git a/src/gsiqt4/gsiDeclQTextFormat.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextFormat.cc similarity index 98% rename from src/gsiqt4/gsiDeclQTextFormat.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextFormat.cc index 61a21bebe..58e4a4c19 100644 --- a/src/gsiqt4/gsiDeclQTextFormat.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextFormat.cc @@ -40,8 +40,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -989,12 +989,12 @@ static gsi::Methods methods_QTextFormat () { return methods; } -gsi::Class decl_QTextFormat ("QTextFormat", +gsi::Class decl_QTextFormat ("QtGui", "QTextFormat", methods_QTextFormat (), "@qt\n@brief Binding of QTextFormat"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextFormat () { return decl_QTextFormat; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextFormat () { return decl_QTextFormat; } } @@ -1003,19 +1003,19 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QTextFormat () { return decl_QTextF namespace qt_gsi { -static gsi::Enum decl_QTextFormat_PageBreakFlag_Enum ("QTextFormat_PageBreakFlag", +static gsi::Enum decl_QTextFormat_PageBreakFlag_Enum ("QtGui", "QTextFormat_PageBreakFlag", gsi::enum_const ("PageBreak_Auto", QTextFormat::PageBreak_Auto, "@brief Enum constant QTextFormat::PageBreak_Auto") + gsi::enum_const ("PageBreak_AlwaysBefore", QTextFormat::PageBreak_AlwaysBefore, "@brief Enum constant QTextFormat::PageBreak_AlwaysBefore") + gsi::enum_const ("PageBreak_AlwaysAfter", QTextFormat::PageBreak_AlwaysAfter, "@brief Enum constant QTextFormat::PageBreak_AlwaysAfter"), "@qt\n@brief This class represents the QTextFormat::PageBreakFlag enum"); -static gsi::QFlagsClass decl_QTextFormat_PageBreakFlag_Enums ("QTextFormat_QFlags_PageBreakFlag", +static gsi::QFlagsClass decl_QTextFormat_PageBreakFlag_Enums ("QtGui", "QTextFormat_QFlags_PageBreakFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTextFormat_PageBreakFlag_Enum_in_parent (decl_QTextFormat_PageBreakFlag_Enum.defs ()); -static gsi::ClassExt decl_QTextFormat_PageBreakFlag_Enum_as_child (decl_QTextFormat_PageBreakFlag_Enum, "PageBreakFlag"); -static gsi::ClassExt decl_QTextFormat_PageBreakFlag_Enums_as_child (decl_QTextFormat_PageBreakFlag_Enums, "QFlags_PageBreakFlag"); +static gsi::ClassExt decl_QTextFormat_PageBreakFlag_Enum_as_child (decl_QTextFormat_PageBreakFlag_Enum, "QtGui", "PageBreakFlag"); +static gsi::ClassExt decl_QTextFormat_PageBreakFlag_Enums_as_child (decl_QTextFormat_PageBreakFlag_Enums, "QtGui", "QFlags_PageBreakFlag"); } diff --git a/src/gsiqt4/gsiDeclQTextFragment.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextFragment.cc similarity index 97% rename from src/gsiqt4/gsiDeclQTextFragment.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextFragment.cc index 3e4daaa45..12f5da403 100644 --- a/src/gsiqt4/gsiDeclQTextFragment.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextFragment.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -278,12 +278,12 @@ static gsi::Methods methods_QTextFragment () { return methods; } -gsi::Class decl_QTextFragment ("QTextFragment", +gsi::Class decl_QTextFragment ("QtGui", "QTextFragment", methods_QTextFragment (), "@qt\n@brief Binding of QTextFragment"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextFragment () { return decl_QTextFragment; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextFragment () { return decl_QTextFragment; } } diff --git a/src/gsiqt4/gsiDeclQTextFrame.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextFrame.cc similarity index 99% rename from src/gsiqt4/gsiDeclQTextFrame.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextFrame.cc index 3383c34db..5e3d35760 100644 --- a/src/gsiqt4/gsiDeclQTextFrame.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextFrame.cc @@ -38,8 +38,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -301,11 +301,11 @@ static gsi::Methods methods_QTextFrame () { gsi::Class &qtdecl_QTextObject (); -qt_gsi::QtNativeClass decl_QTextFrame (qtdecl_QTextObject (), "QTextFrame_Native", +qt_gsi::QtNativeClass decl_QTextFrame (qtdecl_QTextObject (), "QtGui", "QTextFrame_Native", methods_QTextFrame (), "@hide\n@alias QTextFrame"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextFrame () { return decl_QTextFrame; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextFrame () { return decl_QTextFrame; } } @@ -702,7 +702,7 @@ static gsi::Methods methods_QTextFrame_Adaptor () { return methods; } -gsi::Class decl_QTextFrame_Adaptor (qtdecl_QTextFrame (), "QTextFrame", +gsi::Class decl_QTextFrame_Adaptor (qtdecl_QTextFrame (), "QtGui", "QTextFrame", methods_QTextFrame_Adaptor (), "@qt\n@brief Binding of QTextFrame"); diff --git a/src/gsiqt4/gsiDeclQTextFrameFormat.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextFrameFormat.cc similarity index 97% rename from src/gsiqt4/gsiDeclQTextFrameFormat.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextFrameFormat.cc index ee0bb5086..ab3f762c9 100644 --- a/src/gsiqt4/gsiDeclQTextFrameFormat.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextFrameFormat.cc @@ -40,8 +40,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -613,12 +613,12 @@ static gsi::Methods methods_QTextFrameFormat () { gsi::Class &qtdecl_QTextFormat (); -gsi::Class decl_QTextFrameFormat (qtdecl_QTextFormat (), "QTextFrameFormat", +gsi::Class decl_QTextFrameFormat (qtdecl_QTextFormat (), "QtGui", "QTextFrameFormat", methods_QTextFrameFormat (), "@qt\n@brief Binding of QTextFrameFormat"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextFrameFormat () { return decl_QTextFrameFormat; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextFrameFormat () { return decl_QTextFrameFormat; } } @@ -627,7 +627,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QTextFrameFormat () { return d namespace qt_gsi { -static gsi::Enum decl_QTextFrameFormat_BorderStyle_Enum ("QTextFrameFormat_BorderStyle", +static gsi::Enum decl_QTextFrameFormat_BorderStyle_Enum ("QtGui", "QTextFrameFormat_BorderStyle", gsi::enum_const ("BorderStyle_None", QTextFrameFormat::BorderStyle_None, "@brief Enum constant QTextFrameFormat::BorderStyle_None") + gsi::enum_const ("BorderStyle_Dotted", QTextFrameFormat::BorderStyle_Dotted, "@brief Enum constant QTextFrameFormat::BorderStyle_Dotted") + gsi::enum_const ("BorderStyle_Dashed", QTextFrameFormat::BorderStyle_Dashed, "@brief Enum constant QTextFrameFormat::BorderStyle_Dashed") + @@ -641,13 +641,13 @@ static gsi::Enum decl_QTextFrameFormat_BorderStyl gsi::enum_const ("BorderStyle_Outset", QTextFrameFormat::BorderStyle_Outset, "@brief Enum constant QTextFrameFormat::BorderStyle_Outset"), "@qt\n@brief This class represents the QTextFrameFormat::BorderStyle enum"); -static gsi::QFlagsClass decl_QTextFrameFormat_BorderStyle_Enums ("QTextFrameFormat_QFlags_BorderStyle", +static gsi::QFlagsClass decl_QTextFrameFormat_BorderStyle_Enums ("QtGui", "QTextFrameFormat_QFlags_BorderStyle", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTextFrameFormat_BorderStyle_Enum_in_parent (decl_QTextFrameFormat_BorderStyle_Enum.defs ()); -static gsi::ClassExt decl_QTextFrameFormat_BorderStyle_Enum_as_child (decl_QTextFrameFormat_BorderStyle_Enum, "BorderStyle"); -static gsi::ClassExt decl_QTextFrameFormat_BorderStyle_Enums_as_child (decl_QTextFrameFormat_BorderStyle_Enums, "QFlags_BorderStyle"); +static gsi::ClassExt decl_QTextFrameFormat_BorderStyle_Enum_as_child (decl_QTextFrameFormat_BorderStyle_Enum, "QtGui", "BorderStyle"); +static gsi::ClassExt decl_QTextFrameFormat_BorderStyle_Enums_as_child (decl_QTextFrameFormat_BorderStyle_Enums, "QtGui", "QFlags_BorderStyle"); } @@ -656,19 +656,19 @@ static gsi::ClassExt decl_QTextFrameFormat_BorderStyle_Enums_a namespace qt_gsi { -static gsi::Enum decl_QTextFrameFormat_Position_Enum ("QTextFrameFormat_Position", +static gsi::Enum decl_QTextFrameFormat_Position_Enum ("QtGui", "QTextFrameFormat_Position", gsi::enum_const ("InFlow", QTextFrameFormat::InFlow, "@brief Enum constant QTextFrameFormat::InFlow") + gsi::enum_const ("FloatLeft", QTextFrameFormat::FloatLeft, "@brief Enum constant QTextFrameFormat::FloatLeft") + gsi::enum_const ("FloatRight", QTextFrameFormat::FloatRight, "@brief Enum constant QTextFrameFormat::FloatRight"), "@qt\n@brief This class represents the QTextFrameFormat::Position enum"); -static gsi::QFlagsClass decl_QTextFrameFormat_Position_Enums ("QTextFrameFormat_QFlags_Position", +static gsi::QFlagsClass decl_QTextFrameFormat_Position_Enums ("QtGui", "QTextFrameFormat_QFlags_Position", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTextFrameFormat_Position_Enum_in_parent (decl_QTextFrameFormat_Position_Enum.defs ()); -static gsi::ClassExt decl_QTextFrameFormat_Position_Enum_as_child (decl_QTextFrameFormat_Position_Enum, "Position"); -static gsi::ClassExt decl_QTextFrameFormat_Position_Enums_as_child (decl_QTextFrameFormat_Position_Enums, "QFlags_Position"); +static gsi::ClassExt decl_QTextFrameFormat_Position_Enum_as_child (decl_QTextFrameFormat_Position_Enum, "QtGui", "Position"); +static gsi::ClassExt decl_QTextFrameFormat_Position_Enums_as_child (decl_QTextFrameFormat_Position_Enums, "QtGui", "QFlags_Position"); } diff --git a/src/gsiqt4/gsiDeclQTextFrame_Iterator.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextFrame_Iterator.cc similarity index 97% rename from src/gsiqt4/gsiDeclQTextFrame_Iterator.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextFrame_Iterator.cc index 7b50bc83c..4e52bbda4 100644 --- a/src/gsiqt4/gsiDeclQTextFrame_Iterator.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextFrame_Iterator.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -279,13 +279,13 @@ static gsi::Methods methods_QTextFrame_Iterator () { return methods; } -gsi::Class decl_QTextFrame_Iterator ("QTextFrame_Iterator", +gsi::Class decl_QTextFrame_Iterator ("QtGui", "QTextFrame_Iterator", methods_QTextFrame_Iterator (), "@qt\n@brief Binding of QTextFrame::iterator"); -gsi::ClassExt decl_QTextFrame_Iterator_as_child (decl_QTextFrame_Iterator, "Iterator"); +gsi::ClassExt decl_QTextFrame_Iterator_as_child (decl_QTextFrame_Iterator, "QtGui", "Iterator"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextFrame_Iterator () { return decl_QTextFrame_Iterator; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextFrame_Iterator () { return decl_QTextFrame_Iterator; } } diff --git a/src/gsiqt4/gsiDeclQTextImageFormat.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextImageFormat.cc similarity index 96% rename from src/gsiqt4/gsiDeclQTextImageFormat.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextImageFormat.cc index 1b8486602..d0b083016 100644 --- a/src/gsiqt4/gsiDeclQTextImageFormat.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextImageFormat.cc @@ -41,8 +41,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -202,12 +202,12 @@ static gsi::Methods methods_QTextImageFormat () { gsi::Class &qtdecl_QTextCharFormat (); -gsi::Class decl_QTextImageFormat (qtdecl_QTextCharFormat (), "QTextImageFormat", +gsi::Class decl_QTextImageFormat (qtdecl_QTextCharFormat (), "QtGui", "QTextImageFormat", methods_QTextImageFormat (), "@qt\n@brief Binding of QTextImageFormat"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextImageFormat () { return decl_QTextImageFormat; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextImageFormat () { return decl_QTextImageFormat; } } diff --git a/src/gsiqt4/gsiDeclQTextInlineObject.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextInlineObject.cc similarity index 97% rename from src/gsiqt4/gsiDeclQTextInlineObject.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextInlineObject.cc index 19ef954f8..1bdf78daa 100644 --- a/src/gsiqt4/gsiDeclQTextInlineObject.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextInlineObject.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -286,12 +286,12 @@ static gsi::Methods methods_QTextInlineObject () { return methods; } -gsi::Class decl_QTextInlineObject ("QTextInlineObject", +gsi::Class decl_QTextInlineObject ("QtGui", "QTextInlineObject", methods_QTextInlineObject (), "@qt\n@brief Binding of QTextInlineObject"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextInlineObject () { return decl_QTextInlineObject; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextInlineObject () { return decl_QTextInlineObject; } } diff --git a/src/gsiqt4/gsiDeclQTextItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextItem.cc similarity index 93% rename from src/gsiqt4/gsiDeclQTextItem.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextItem.cc index 59d52a239..a0e488609 100644 --- a/src/gsiqt4/gsiDeclQTextItem.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextItem.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -158,12 +158,12 @@ static gsi::Methods methods_QTextItem () { return methods; } -gsi::Class decl_QTextItem ("QTextItem", +gsi::Class decl_QTextItem ("QtGui", "QTextItem", methods_QTextItem (), "@qt\n@brief Binding of QTextItem"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextItem () { return decl_QTextItem; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextItem () { return decl_QTextItem; } } @@ -172,7 +172,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QTextItem () { return decl_QTextItem; namespace qt_gsi { -static gsi::Enum decl_QTextItem_RenderFlag_Enum ("QTextItem_RenderFlag", +static gsi::Enum decl_QTextItem_RenderFlag_Enum ("QtGui", "QTextItem_RenderFlag", gsi::enum_const ("RightToLeft", QTextItem::RightToLeft, "@brief Enum constant QTextItem::RightToLeft") + gsi::enum_const ("Overline", QTextItem::Overline, "@brief Enum constant QTextItem::Overline") + gsi::enum_const ("Underline", QTextItem::Underline, "@brief Enum constant QTextItem::Underline") + @@ -180,13 +180,13 @@ static gsi::Enum decl_QTextItem_RenderFlag_Enum ("QTextIt gsi::enum_const ("Dummy", QTextItem::Dummy, "@brief Enum constant QTextItem::Dummy"), "@qt\n@brief This class represents the QTextItem::RenderFlag enum"); -static gsi::QFlagsClass decl_QTextItem_RenderFlag_Enums ("QTextItem_QFlags_RenderFlag", +static gsi::QFlagsClass decl_QTextItem_RenderFlag_Enums ("QtGui", "QTextItem_QFlags_RenderFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTextItem_RenderFlag_Enum_in_parent (decl_QTextItem_RenderFlag_Enum.defs ()); -static gsi::ClassExt decl_QTextItem_RenderFlag_Enum_as_child (decl_QTextItem_RenderFlag_Enum, "RenderFlag"); -static gsi::ClassExt decl_QTextItem_RenderFlag_Enums_as_child (decl_QTextItem_RenderFlag_Enums, "QFlags_RenderFlag"); +static gsi::ClassExt decl_QTextItem_RenderFlag_Enum_as_child (decl_QTextItem_RenderFlag_Enum, "QtGui", "RenderFlag"); +static gsi::ClassExt decl_QTextItem_RenderFlag_Enums_as_child (decl_QTextItem_RenderFlag_Enums, "QtGui", "QFlags_RenderFlag"); } diff --git a/src/gsiqt4/gsiDeclQTextLayout.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextLayout.cc similarity index 98% rename from src/gsiqt4/gsiDeclQTextLayout.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextLayout.cc index ceb61d796..0970a13f1 100644 --- a/src/gsiqt4/gsiDeclQTextLayout.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextLayout.cc @@ -37,8 +37,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -775,12 +775,12 @@ static gsi::Methods methods_QTextLayout () { return methods; } -gsi::Class decl_QTextLayout ("QTextLayout", +gsi::Class decl_QTextLayout ("QtGui", "QTextLayout", methods_QTextLayout (), "@qt\n@brief Binding of QTextLayout"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextLayout () { return decl_QTextLayout; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextLayout () { return decl_QTextLayout; } } @@ -789,18 +789,18 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QTextLayout () { return decl_QTextL namespace qt_gsi { -static gsi::Enum decl_QTextLayout_CursorMode_Enum ("QTextLayout_CursorMode", +static gsi::Enum decl_QTextLayout_CursorMode_Enum ("QtGui", "QTextLayout_CursorMode", gsi::enum_const ("SkipCharacters", QTextLayout::SkipCharacters, "@brief Enum constant QTextLayout::SkipCharacters") + gsi::enum_const ("SkipWords", QTextLayout::SkipWords, "@brief Enum constant QTextLayout::SkipWords"), "@qt\n@brief This class represents the QTextLayout::CursorMode enum"); -static gsi::QFlagsClass decl_QTextLayout_CursorMode_Enums ("QTextLayout_QFlags_CursorMode", +static gsi::QFlagsClass decl_QTextLayout_CursorMode_Enums ("QtGui", "QTextLayout_QFlags_CursorMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTextLayout_CursorMode_Enum_in_parent (decl_QTextLayout_CursorMode_Enum.defs ()); -static gsi::ClassExt decl_QTextLayout_CursorMode_Enum_as_child (decl_QTextLayout_CursorMode_Enum, "CursorMode"); -static gsi::ClassExt decl_QTextLayout_CursorMode_Enums_as_child (decl_QTextLayout_CursorMode_Enums, "QFlags_CursorMode"); +static gsi::ClassExt decl_QTextLayout_CursorMode_Enum_as_child (decl_QTextLayout_CursorMode_Enum, "QtGui", "CursorMode"); +static gsi::ClassExt decl_QTextLayout_CursorMode_Enums_as_child (decl_QTextLayout_CursorMode_Enums, "QtGui", "QFlags_CursorMode"); } diff --git a/src/gsiqt4/gsiDeclQTextLayout_FormatRange.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextLayout_FormatRange.cc similarity index 88% rename from src/gsiqt4/gsiDeclQTextLayout_FormatRange.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextLayout_FormatRange.cc index 851e2dd1a..8a59aa378 100644 --- a/src/gsiqt4/gsiDeclQTextLayout_FormatRange.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextLayout_FormatRange.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -61,13 +61,13 @@ static gsi::Methods methods_QTextLayout_FormatRange () { return methods; } -gsi::Class decl_QTextLayout_FormatRange ("QTextLayout_FormatRange", +gsi::Class decl_QTextLayout_FormatRange ("QtGui", "QTextLayout_FormatRange", methods_QTextLayout_FormatRange (), "@qt\n@brief Binding of QTextLayout::FormatRange"); -gsi::ClassExt decl_QTextLayout_FormatRange_as_child (decl_QTextLayout_FormatRange, "FormatRange"); +gsi::ClassExt decl_QTextLayout_FormatRange_as_child (decl_QTextLayout_FormatRange, "QtGui", "FormatRange"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextLayout_FormatRange () { return decl_QTextLayout_FormatRange; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextLayout_FormatRange () { return decl_QTextLayout_FormatRange; } } diff --git a/src/gsiqt4/gsiDeclQTextLength.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextLength.cc similarity index 94% rename from src/gsiqt4/gsiDeclQTextLength.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextLength.cc index 2a6ef5637..e9171c529 100644 --- a/src/gsiqt4/gsiDeclQTextLength.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextLength.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -176,12 +176,12 @@ static gsi::Methods methods_QTextLength () { return methods; } -gsi::Class decl_QTextLength ("QTextLength", +gsi::Class decl_QTextLength ("QtGui", "QTextLength", methods_QTextLength (), "@qt\n@brief Binding of QTextLength"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextLength () { return decl_QTextLength; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextLength () { return decl_QTextLength; } } @@ -190,19 +190,19 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QTextLength () { return decl_QTextL namespace qt_gsi { -static gsi::Enum decl_QTextLength_Type_Enum ("QTextLength_Type", +static gsi::Enum decl_QTextLength_Type_Enum ("QtGui", "QTextLength_Type", gsi::enum_const ("VariableLength", QTextLength::VariableLength, "@brief Enum constant QTextLength::VariableLength") + gsi::enum_const ("FixedLength", QTextLength::FixedLength, "@brief Enum constant QTextLength::FixedLength") + gsi::enum_const ("PercentageLength", QTextLength::PercentageLength, "@brief Enum constant QTextLength::PercentageLength"), "@qt\n@brief This class represents the QTextLength::Type enum"); -static gsi::QFlagsClass decl_QTextLength_Type_Enums ("QTextLength_QFlags_Type", +static gsi::QFlagsClass decl_QTextLength_Type_Enums ("QtGui", "QTextLength_QFlags_Type", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTextLength_Type_Enum_in_parent (decl_QTextLength_Type_Enum.defs ()); -static gsi::ClassExt decl_QTextLength_Type_Enum_as_child (decl_QTextLength_Type_Enum, "Type"); -static gsi::ClassExt decl_QTextLength_Type_Enums_as_child (decl_QTextLength_Type_Enums, "QFlags_Type"); +static gsi::ClassExt decl_QTextLength_Type_Enum_as_child (decl_QTextLength_Type_Enum, "QtGui", "Type"); +static gsi::ClassExt decl_QTextLength_Type_Enums_as_child (decl_QTextLength_Type_Enums, "QtGui", "QFlags_Type"); } diff --git a/src/gsiqt4/gsiDeclQTextLine.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextLine.cc similarity index 96% rename from src/gsiqt4/gsiDeclQTextLine.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextLine.cc index 60550dea3..9560e6ffd 100644 --- a/src/gsiqt4/gsiDeclQTextLine.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextLine.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -524,12 +524,12 @@ static gsi::Methods methods_QTextLine () { return methods; } -gsi::Class decl_QTextLine ("QTextLine", +gsi::Class decl_QTextLine ("QtGui", "QTextLine", methods_QTextLine (), "@qt\n@brief Binding of QTextLine"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextLine () { return decl_QTextLine; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextLine () { return decl_QTextLine; } } @@ -538,18 +538,18 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QTextLine () { return decl_QTextLine; namespace qt_gsi { -static gsi::Enum decl_QTextLine_CursorPosition_Enum ("QTextLine_CursorPosition", +static gsi::Enum decl_QTextLine_CursorPosition_Enum ("QtGui", "QTextLine_CursorPosition", gsi::enum_const ("CursorBetweenCharacters", QTextLine::CursorBetweenCharacters, "@brief Enum constant QTextLine::CursorBetweenCharacters") + gsi::enum_const ("CursorOnCharacter", QTextLine::CursorOnCharacter, "@brief Enum constant QTextLine::CursorOnCharacter"), "@qt\n@brief This class represents the QTextLine::CursorPosition enum"); -static gsi::QFlagsClass decl_QTextLine_CursorPosition_Enums ("QTextLine_QFlags_CursorPosition", +static gsi::QFlagsClass decl_QTextLine_CursorPosition_Enums ("QtGui", "QTextLine_QFlags_CursorPosition", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTextLine_CursorPosition_Enum_in_parent (decl_QTextLine_CursorPosition_Enum.defs ()); -static gsi::ClassExt decl_QTextLine_CursorPosition_Enum_as_child (decl_QTextLine_CursorPosition_Enum, "CursorPosition"); -static gsi::ClassExt decl_QTextLine_CursorPosition_Enums_as_child (decl_QTextLine_CursorPosition_Enums, "QFlags_CursorPosition"); +static gsi::ClassExt decl_QTextLine_CursorPosition_Enum_as_child (decl_QTextLine_CursorPosition_Enum, "QtGui", "CursorPosition"); +static gsi::ClassExt decl_QTextLine_CursorPosition_Enums_as_child (decl_QTextLine_CursorPosition_Enums, "QtGui", "QFlags_CursorPosition"); } @@ -558,18 +558,18 @@ static gsi::ClassExt decl_QTextLine_CursorPosition_Enums_as_child (de namespace qt_gsi { -static gsi::Enum decl_QTextLine_Edge_Enum ("QTextLine_Edge", +static gsi::Enum decl_QTextLine_Edge_Enum ("QtGui", "QTextLine_Edge", gsi::enum_const ("Leading", QTextLine::Leading, "@brief Enum constant QTextLine::Leading") + gsi::enum_const ("Trailing", QTextLine::Trailing, "@brief Enum constant QTextLine::Trailing"), "@qt\n@brief This class represents the QTextLine::Edge enum"); -static gsi::QFlagsClass decl_QTextLine_Edge_Enums ("QTextLine_QFlags_Edge", +static gsi::QFlagsClass decl_QTextLine_Edge_Enums ("QtGui", "QTextLine_QFlags_Edge", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTextLine_Edge_Enum_in_parent (decl_QTextLine_Edge_Enum.defs ()); -static gsi::ClassExt decl_QTextLine_Edge_Enum_as_child (decl_QTextLine_Edge_Enum, "Edge"); -static gsi::ClassExt decl_QTextLine_Edge_Enums_as_child (decl_QTextLine_Edge_Enums, "QFlags_Edge"); +static gsi::ClassExt decl_QTextLine_Edge_Enum_as_child (decl_QTextLine_Edge_Enum, "QtGui", "Edge"); +static gsi::ClassExt decl_QTextLine_Edge_Enums_as_child (decl_QTextLine_Edge_Enums, "QtGui", "QFlags_Edge"); } diff --git a/src/gsiqt4/gsiDeclQTextList.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextList.cc similarity index 99% rename from src/gsiqt4/gsiDeclQTextList.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextList.cc index 56fdcee03..06d6fac6e 100644 --- a/src/gsiqt4/gsiDeclQTextList.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextList.cc @@ -37,8 +37,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -359,11 +359,11 @@ static gsi::Methods methods_QTextList () { gsi::Class &qtdecl_QTextBlockGroup (); -qt_gsi::QtNativeClass decl_QTextList (qtdecl_QTextBlockGroup (), "QTextList_Native", +qt_gsi::QtNativeClass decl_QTextList (qtdecl_QTextBlockGroup (), "QtGui", "QTextList_Native", methods_QTextList (), "@hide\n@alias QTextList"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextList () { return decl_QTextList; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextList () { return decl_QTextList; } } @@ -881,7 +881,7 @@ static gsi::Methods methods_QTextList_Adaptor () { return methods; } -gsi::Class decl_QTextList_Adaptor (qtdecl_QTextList (), "QTextList", +gsi::Class decl_QTextList_Adaptor (qtdecl_QTextList (), "QtGui", "QTextList", methods_QTextList_Adaptor (), "@qt\n@brief Binding of QTextList"); diff --git a/src/gsiqt4/gsiDeclQTextListFormat.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextListFormat.cc similarity index 94% rename from src/gsiqt4/gsiDeclQTextListFormat.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextListFormat.cc index 3e4afe590..70fe54424 100644 --- a/src/gsiqt4/gsiDeclQTextListFormat.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextListFormat.cc @@ -40,8 +40,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -164,12 +164,12 @@ static gsi::Methods methods_QTextListFormat () { gsi::Class &qtdecl_QTextFormat (); -gsi::Class decl_QTextListFormat (qtdecl_QTextFormat (), "QTextListFormat", +gsi::Class decl_QTextListFormat (qtdecl_QTextFormat (), "QtGui", "QTextListFormat", methods_QTextListFormat (), "@qt\n@brief Binding of QTextListFormat"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextListFormat () { return decl_QTextListFormat; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextListFormat () { return decl_QTextListFormat; } } @@ -178,7 +178,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QTextListFormat () { return dec namespace qt_gsi { -static gsi::Enum decl_QTextListFormat_Style_Enum ("QTextListFormat_Style", +static gsi::Enum decl_QTextListFormat_Style_Enum ("QtGui", "QTextListFormat_Style", gsi::enum_const ("ListDisc", QTextListFormat::ListDisc, "@brief Enum constant QTextListFormat::ListDisc") + gsi::enum_const ("ListCircle", QTextListFormat::ListCircle, "@brief Enum constant QTextListFormat::ListCircle") + gsi::enum_const ("ListSquare", QTextListFormat::ListSquare, "@brief Enum constant QTextListFormat::ListSquare") + @@ -190,13 +190,13 @@ static gsi::Enum decl_QTextListFormat_Style_Enum ("QText gsi::enum_const ("ListStyleUndefined", QTextListFormat::ListStyleUndefined, "@brief Enum constant QTextListFormat::ListStyleUndefined"), "@qt\n@brief This class represents the QTextListFormat::Style enum"); -static gsi::QFlagsClass decl_QTextListFormat_Style_Enums ("QTextListFormat_QFlags_Style", +static gsi::QFlagsClass decl_QTextListFormat_Style_Enums ("QtGui", "QTextListFormat_QFlags_Style", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTextListFormat_Style_Enum_in_parent (decl_QTextListFormat_Style_Enum.defs ()); -static gsi::ClassExt decl_QTextListFormat_Style_Enum_as_child (decl_QTextListFormat_Style_Enum, "Style"); -static gsi::ClassExt decl_QTextListFormat_Style_Enums_as_child (decl_QTextListFormat_Style_Enums, "QFlags_Style"); +static gsi::ClassExt decl_QTextListFormat_Style_Enum_as_child (decl_QTextListFormat_Style_Enum, "QtGui", "Style"); +static gsi::ClassExt decl_QTextListFormat_Style_Enums_as_child (decl_QTextListFormat_Style_Enums, "QtGui", "QFlags_Style"); } diff --git a/src/gsiqt4/gsiDeclQTextObject.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextObject.cc similarity index 98% rename from src/gsiqt4/gsiDeclQTextObject.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextObject.cc index c15ed3def..f96edaeb7 100644 --- a/src/gsiqt4/gsiDeclQTextObject.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextObject.cc @@ -36,8 +36,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -230,11 +230,11 @@ static gsi::Methods methods_QTextObject () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QTextObject (qtdecl_QObject (), "QTextObject_Native", +qt_gsi::QtNativeClass decl_QTextObject (qtdecl_QObject (), "QtGui", "QTextObject_Native", methods_QTextObject (), "@hide\n@alias QTextObject"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextObject () { return decl_QTextObject; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextObject () { return decl_QTextObject; } } @@ -606,7 +606,7 @@ static gsi::Methods methods_QTextObject_Adaptor () { return methods; } -gsi::Class decl_QTextObject_Adaptor (qtdecl_QTextObject (), "QTextObject", +gsi::Class decl_QTextObject_Adaptor (qtdecl_QTextObject (), "QtGui", "QTextObject", methods_QTextObject_Adaptor (), "@qt\n@brief Binding of QTextObject"); diff --git a/src/gsiqt4/gsiDeclQTextObjectInterface.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextObjectInterface.cc similarity index 96% rename from src/gsiqt4/gsiDeclQTextObjectInterface.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextObjectInterface.cc index 8ce77ff29..6060a3eb9 100644 --- a/src/gsiqt4/gsiDeclQTextObjectInterface.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextObjectInterface.cc @@ -34,8 +34,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -108,11 +108,11 @@ static gsi::Methods methods_QTextObjectInterface () { return methods; } -gsi::Class decl_QTextObjectInterface ("QTextObjectInterface_Native", +gsi::Class decl_QTextObjectInterface ("QtGui", "QTextObjectInterface_Native", methods_QTextObjectInterface (), "@hide\n@alias QTextObjectInterface"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextObjectInterface () { return decl_QTextObjectInterface; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextObjectInterface () { return decl_QTextObjectInterface; } } @@ -267,7 +267,7 @@ static gsi::Methods methods_QTextObjectInterface_Adaptor () { return methods; } -gsi::Class decl_QTextObjectInterface_Adaptor (qtdecl_QTextObjectInterface (), "QTextObjectInterface", +gsi::Class decl_QTextObjectInterface_Adaptor (qtdecl_QTextObjectInterface (), "QtGui", "QTextObjectInterface", methods_QTextObjectInterface_Adaptor (), "@qt\n@brief Binding of QTextObjectInterface"); diff --git a/src/gsiqt4/gsiDeclQTextOption.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextOption.cc similarity index 96% rename from src/gsiqt4/gsiDeclQTextOption.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextOption.cc index 00d26cd66..027238ff8 100644 --- a/src/gsiqt4/gsiDeclQTextOption.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextOption.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -417,12 +417,12 @@ static gsi::Methods methods_QTextOption () { return methods; } -gsi::Class decl_QTextOption ("QTextOption", +gsi::Class decl_QTextOption ("QtGui", "QTextOption", methods_QTextOption (), "@qt\n@brief Binding of QTextOption"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextOption () { return decl_QTextOption; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextOption () { return decl_QTextOption; } } @@ -431,7 +431,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QTextOption () { return decl_QTextO namespace qt_gsi { -static gsi::Enum decl_QTextOption_Flag_Enum ("QTextOption_Flag", +static gsi::Enum decl_QTextOption_Flag_Enum ("QtGui", "QTextOption_Flag", gsi::enum_const ("ShowTabsAndSpaces", QTextOption::ShowTabsAndSpaces, "@brief Enum constant QTextOption::ShowTabsAndSpaces") + gsi::enum_const ("ShowLineAndParagraphSeparators", QTextOption::ShowLineAndParagraphSeparators, "@brief Enum constant QTextOption::ShowLineAndParagraphSeparators") + gsi::enum_const ("AddSpaceForLineAndParagraphSeparators", QTextOption::AddSpaceForLineAndParagraphSeparators, "@brief Enum constant QTextOption::AddSpaceForLineAndParagraphSeparators") + @@ -439,13 +439,13 @@ static gsi::Enum decl_QTextOption_Flag_Enum ("QTextOption_Fla gsi::enum_const ("IncludeTrailingSpaces", QTextOption::IncludeTrailingSpaces, "@brief Enum constant QTextOption::IncludeTrailingSpaces"), "@qt\n@brief This class represents the QTextOption::Flag enum"); -static gsi::QFlagsClass decl_QTextOption_Flag_Enums ("QTextOption_QFlags_Flag", +static gsi::QFlagsClass decl_QTextOption_Flag_Enums ("QtGui", "QTextOption_QFlags_Flag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTextOption_Flag_Enum_in_parent (decl_QTextOption_Flag_Enum.defs ()); -static gsi::ClassExt decl_QTextOption_Flag_Enum_as_child (decl_QTextOption_Flag_Enum, "Flag"); -static gsi::ClassExt decl_QTextOption_Flag_Enums_as_child (decl_QTextOption_Flag_Enums, "QFlags_Flag"); +static gsi::ClassExt decl_QTextOption_Flag_Enum_as_child (decl_QTextOption_Flag_Enum, "QtGui", "Flag"); +static gsi::ClassExt decl_QTextOption_Flag_Enums_as_child (decl_QTextOption_Flag_Enums, "QtGui", "QFlags_Flag"); } @@ -454,7 +454,7 @@ static gsi::ClassExt decl_QTextOption_Flag_Enums_as_child (decl_QTe namespace qt_gsi { -static gsi::Enum decl_QTextOption_WrapMode_Enum ("QTextOption_WrapMode", +static gsi::Enum decl_QTextOption_WrapMode_Enum ("QtGui", "QTextOption_WrapMode", gsi::enum_const ("NoWrap", QTextOption::NoWrap, "@brief Enum constant QTextOption::NoWrap") + gsi::enum_const ("WordWrap", QTextOption::WordWrap, "@brief Enum constant QTextOption::WordWrap") + gsi::enum_const ("ManualWrap", QTextOption::ManualWrap, "@brief Enum constant QTextOption::ManualWrap") + @@ -462,13 +462,13 @@ static gsi::Enum decl_QTextOption_WrapMode_Enum ("QTextOp gsi::enum_const ("WrapAtWordBoundaryOrAnywhere", QTextOption::WrapAtWordBoundaryOrAnywhere, "@brief Enum constant QTextOption::WrapAtWordBoundaryOrAnywhere"), "@qt\n@brief This class represents the QTextOption::WrapMode enum"); -static gsi::QFlagsClass decl_QTextOption_WrapMode_Enums ("QTextOption_QFlags_WrapMode", +static gsi::QFlagsClass decl_QTextOption_WrapMode_Enums ("QtGui", "QTextOption_QFlags_WrapMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTextOption_WrapMode_Enum_in_parent (decl_QTextOption_WrapMode_Enum.defs ()); -static gsi::ClassExt decl_QTextOption_WrapMode_Enum_as_child (decl_QTextOption_WrapMode_Enum, "WrapMode"); -static gsi::ClassExt decl_QTextOption_WrapMode_Enums_as_child (decl_QTextOption_WrapMode_Enums, "QFlags_WrapMode"); +static gsi::ClassExt decl_QTextOption_WrapMode_Enum_as_child (decl_QTextOption_WrapMode_Enum, "QtGui", "WrapMode"); +static gsi::ClassExt decl_QTextOption_WrapMode_Enums_as_child (decl_QTextOption_WrapMode_Enums, "QtGui", "QFlags_WrapMode"); } diff --git a/src/gsiqt4/gsiDeclQTextOption_Tab.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextOption_Tab.cc similarity index 80% rename from src/gsiqt4/gsiDeclQTextOption_Tab.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextOption_Tab.cc index 2a0c98439..07c53d6e5 100644 --- a/src/gsiqt4/gsiDeclQTextOption_Tab.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextOption_Tab.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -54,14 +54,14 @@ static void _call_ctor_QTextOption_Tab_0 (const qt_gsi::GenericStaticMethod * /* // bool QTextOption::Tab::operator!=(const QTextOption::Tab &other) -static void _init_f_operator_excl__eq__c2843u1 (qt_gsi::GenericMethod *decl) +static void _init_f_operator_excl__eq__c2843 (qt_gsi::GenericMethod *decl) { static gsi::ArgSpecBase argspec_0 ("other"); decl->add_arg (argspec_0); decl->set_return (); } -static void _call_f_operator_excl__eq__c2843u1 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +static void _call_f_operator_excl__eq__c2843 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) { __SUPPRESS_UNUSED_WARNING(args); tl::Heap heap; @@ -73,14 +73,14 @@ static void _call_f_operator_excl__eq__c2843u1 (const qt_gsi::GenericMethod * /* // bool QTextOption::Tab::operator==(const QTextOption::Tab &other) -static void _init_f_operator_eq__eq__c2843u1 (qt_gsi::GenericMethod *decl) +static void _init_f_operator_eq__eq__c2843 (qt_gsi::GenericMethod *decl) { static gsi::ArgSpecBase argspec_0 ("other"); decl->add_arg (argspec_0); decl->set_return (); } -static void _call_f_operator_eq__eq__c2843u1 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +static void _call_f_operator_eq__eq__c2843 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) { __SUPPRESS_UNUSED_WARNING(args); tl::Heap heap; @@ -96,18 +96,18 @@ namespace gsi static gsi::Methods methods_QTextOption_Tab () { gsi::Methods methods; methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QTextOption::Tab::Tab()\nThis method creates an object of class QTextOption::Tab.", &_init_ctor_QTextOption_Tab_0, &_call_ctor_QTextOption_Tab_0); - methods += new qt_gsi::GenericMethod ("!=", "@brief Method bool QTextOption::Tab::operator!=(const QTextOption::Tab &other)\n", true, &_init_f_operator_excl__eq__c2843u1, &_call_f_operator_excl__eq__c2843u1); - methods += new qt_gsi::GenericMethod ("==", "@brief Method bool QTextOption::Tab::operator==(const QTextOption::Tab &other)\n", true, &_init_f_operator_eq__eq__c2843u1, &_call_f_operator_eq__eq__c2843u1); + methods += new qt_gsi::GenericMethod ("!=", "@brief Method bool QTextOption::Tab::operator!=(const QTextOption::Tab &other)\n", true, &_init_f_operator_excl__eq__c2843, &_call_f_operator_excl__eq__c2843); + methods += new qt_gsi::GenericMethod ("==", "@brief Method bool QTextOption::Tab::operator==(const QTextOption::Tab &other)\n", true, &_init_f_operator_eq__eq__c2843, &_call_f_operator_eq__eq__c2843); return methods; } -gsi::Class decl_QTextOption_Tab ("QTextOption_Tab", +gsi::Class decl_QTextOption_Tab ("QtGui", "QTextOption_Tab", methods_QTextOption_Tab (), "@qt\n@brief Binding of QTextOption::Tab"); -gsi::ClassExt decl_QTextOption_Tab_as_child (decl_QTextOption_Tab, "Tab"); +gsi::ClassExt decl_QTextOption_Tab_as_child (decl_QTextOption_Tab, "QtGui", "Tab"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextOption_Tab () { return decl_QTextOption_Tab; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextOption_Tab () { return decl_QTextOption_Tab; } } diff --git a/src/gsiqt4/gsiDeclQTextTable.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextTable.cc similarity index 99% rename from src/gsiqt4/gsiDeclQTextTable.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextTable.cc index 1ea69cb32..6b4261f2d 100644 --- a/src/gsiqt4/gsiDeclQTextTable.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextTable.cc @@ -40,8 +40,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -585,11 +585,11 @@ static gsi::Methods methods_QTextTable () { gsi::Class &qtdecl_QTextFrame (); -qt_gsi::QtNativeClass decl_QTextTable (qtdecl_QTextFrame (), "QTextTable_Native", +qt_gsi::QtNativeClass decl_QTextTable (qtdecl_QTextFrame (), "QtGui", "QTextTable_Native", methods_QTextTable (), "@hide\n@alias QTextTable"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextTable () { return decl_QTextTable; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextTable () { return decl_QTextTable; } } @@ -961,7 +961,7 @@ static gsi::Methods methods_QTextTable_Adaptor () { return methods; } -gsi::Class decl_QTextTable_Adaptor (qtdecl_QTextTable (), "QTextTable", +gsi::Class decl_QTextTable_Adaptor (qtdecl_QTextTable (), "QtGui", "QTextTable", methods_QTextTable_Adaptor (), "@qt\n@brief Binding of QTextTable"); diff --git a/src/gsiqt4/gsiDeclQTextTableCell.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextTableCell.cc similarity index 98% rename from src/gsiqt4/gsiDeclQTextTableCell.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextTableCell.cc index b045ecf73..2403c7628 100644 --- a/src/gsiqt4/gsiDeclQTextTableCell.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextTableCell.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -340,12 +340,12 @@ static gsi::Methods methods_QTextTableCell () { return methods; } -gsi::Class decl_QTextTableCell ("QTextTableCell", +gsi::Class decl_QTextTableCell ("QtGui", "QTextTableCell", methods_QTextTableCell (), "@qt\n@brief Binding of QTextTableCell"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextTableCell () { return decl_QTextTableCell; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextTableCell () { return decl_QTextTableCell; } } diff --git a/src/gsiqt4/gsiDeclQTextTableCellFormat.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextTableCellFormat.cc similarity index 97% rename from src/gsiqt4/gsiDeclQTextTableCellFormat.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextTableCellFormat.cc index 4f74db509..c5a13a486 100644 --- a/src/gsiqt4/gsiDeclQTextTableCellFormat.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextTableCellFormat.cc @@ -41,8 +41,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -260,12 +260,12 @@ static gsi::Methods methods_QTextTableCellFormat () { gsi::Class &qtdecl_QTextCharFormat (); -gsi::Class decl_QTextTableCellFormat (qtdecl_QTextCharFormat (), "QTextTableCellFormat", +gsi::Class decl_QTextTableCellFormat (qtdecl_QTextCharFormat (), "QtGui", "QTextTableCellFormat", methods_QTextTableCellFormat (), "@qt\n@brief Binding of QTextTableCellFormat"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextTableCellFormat () { return decl_QTextTableCellFormat; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextTableCellFormat () { return decl_QTextTableCellFormat; } } diff --git a/src/gsiqt4/gsiDeclQTextTableFormat.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTextTableFormat.cc similarity index 98% rename from src/gsiqt4/gsiDeclQTextTableFormat.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTextTableFormat.cc index 843345a99..622f037b2 100644 --- a/src/gsiqt4/gsiDeclQTextTableFormat.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTextTableFormat.cc @@ -40,8 +40,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -329,12 +329,12 @@ static gsi::Methods methods_QTextTableFormat () { gsi::Class &qtdecl_QTextFrameFormat (); -gsi::Class decl_QTextTableFormat (qtdecl_QTextFrameFormat (), "QTextTableFormat", +gsi::Class decl_QTextTableFormat (qtdecl_QTextFrameFormat (), "QtGui", "QTextTableFormat", methods_QTextTableFormat (), "@qt\n@brief Binding of QTextTableFormat"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTextTableFormat () { return decl_QTextTableFormat; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextTableFormat () { return decl_QTextTableFormat; } } diff --git a/src/gsiqt4/gsiDeclQTimeEdit.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTimeEdit.cc similarity index 99% rename from src/gsiqt4/gsiDeclQTimeEdit.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTimeEdit.cc index 3b292f60d..f5117d60e 100644 --- a/src/gsiqt4/gsiDeclQTimeEdit.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTimeEdit.cc @@ -83,8 +83,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -218,11 +218,11 @@ static gsi::Methods methods_QTimeEdit () { gsi::Class &qtdecl_QDateTimeEdit (); -qt_gsi::QtNativeClass decl_QTimeEdit (qtdecl_QDateTimeEdit (), "QTimeEdit_Native", +qt_gsi::QtNativeClass decl_QTimeEdit (qtdecl_QDateTimeEdit (), "QtGui", "QTimeEdit_Native", methods_QTimeEdit (), "@hide\n@alias QTimeEdit"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTimeEdit () { return decl_QTimeEdit; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTimeEdit () { return decl_QTimeEdit; } } @@ -2908,7 +2908,7 @@ static gsi::Methods methods_QTimeEdit_Adaptor () { return methods; } -gsi::Class decl_QTimeEdit_Adaptor (qtdecl_QTimeEdit (), "QTimeEdit", +gsi::Class decl_QTimeEdit_Adaptor (qtdecl_QTimeEdit (), "QtGui", "QTimeEdit", methods_QTimeEdit_Adaptor (), "@qt\n@brief Binding of QTimeEdit"); diff --git a/src/gsiqt4/gsiDeclQToolBar.cc b/src/gsiqt/qt4/QtGui/gsiDeclQToolBar.cc similarity index 99% rename from src/gsiqt4/gsiDeclQToolBar.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQToolBar.cc index 241471030..27748c01f 100644 --- a/src/gsiqt4/gsiDeclQToolBar.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQToolBar.cc @@ -78,8 +78,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -788,11 +788,11 @@ static gsi::Methods methods_QToolBar () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QToolBar (qtdecl_QWidget (), "QToolBar_Native", +qt_gsi::QtNativeClass decl_QToolBar (qtdecl_QWidget (), "QtGui", "QToolBar_Native", methods_QToolBar (), "@hide\n@alias QToolBar"); -GSIQT_PUBLIC gsi::Class &qtdecl_QToolBar () { return decl_QToolBar; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QToolBar () { return decl_QToolBar; } } @@ -3227,7 +3227,7 @@ static gsi::Methods methods_QToolBar_Adaptor () { return methods; } -gsi::Class decl_QToolBar_Adaptor (qtdecl_QToolBar (), "QToolBar", +gsi::Class decl_QToolBar_Adaptor (qtdecl_QToolBar (), "QtGui", "QToolBar", methods_QToolBar_Adaptor (), "@qt\n@brief Binding of QToolBar"); diff --git a/src/gsiqt4/gsiDeclQToolBarChangeEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQToolBarChangeEvent.cc similarity index 92% rename from src/gsiqt4/gsiDeclQToolBarChangeEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQToolBarChangeEvent.cc index 714b30838..442138323 100644 --- a/src/gsiqt4/gsiDeclQToolBarChangeEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQToolBarChangeEvent.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -62,11 +62,11 @@ static gsi::Methods methods_QToolBarChangeEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QToolBarChangeEvent (qtdecl_QEvent (), "QToolBarChangeEvent_Native", +gsi::Class decl_QToolBarChangeEvent (qtdecl_QEvent (), "QtGui", "QToolBarChangeEvent_Native", methods_QToolBarChangeEvent (), "@hide\n@alias QToolBarChangeEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QToolBarChangeEvent () { return decl_QToolBarChangeEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QToolBarChangeEvent () { return decl_QToolBarChangeEvent; } } @@ -117,7 +117,7 @@ static gsi::Methods methods_QToolBarChangeEvent_Adaptor () { return methods; } -gsi::Class decl_QToolBarChangeEvent_Adaptor (qtdecl_QToolBarChangeEvent (), "QToolBarChangeEvent", +gsi::Class decl_QToolBarChangeEvent_Adaptor (qtdecl_QToolBarChangeEvent (), "QtGui", "QToolBarChangeEvent", methods_QToolBarChangeEvent_Adaptor (), "@qt\n@brief Binding of QToolBarChangeEvent"); diff --git a/src/gsiqt4/gsiDeclQToolBox.cc b/src/gsiqt/qt4/QtGui/gsiDeclQToolBox.cc similarity index 99% rename from src/gsiqt4/gsiDeclQToolBox.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQToolBox.cc index e59cd7985..56614811c 100644 --- a/src/gsiqt4/gsiDeclQToolBox.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQToolBox.cc @@ -77,8 +77,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -640,11 +640,11 @@ static gsi::Methods methods_QToolBox () { gsi::Class &qtdecl_QFrame (); -qt_gsi::QtNativeClass decl_QToolBox (qtdecl_QFrame (), "QToolBox_Native", +qt_gsi::QtNativeClass decl_QToolBox (qtdecl_QFrame (), "QtGui", "QToolBox_Native", methods_QToolBox (), "@hide\n@alias QToolBox"); -GSIQT_PUBLIC gsi::Class &qtdecl_QToolBox () { return decl_QToolBox; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QToolBox () { return decl_QToolBox; } } @@ -2988,7 +2988,7 @@ static gsi::Methods methods_QToolBox_Adaptor () { return methods; } -gsi::Class decl_QToolBox_Adaptor (qtdecl_QToolBox (), "QToolBox", +gsi::Class decl_QToolBox_Adaptor (qtdecl_QToolBox (), "QtGui", "QToolBox", methods_QToolBox_Adaptor (), "@qt\n@brief Binding of QToolBox"); diff --git a/src/gsiqt4/gsiDeclQToolButton.cc b/src/gsiqt/qt4/QtGui/gsiDeclQToolButton.cc similarity index 99% rename from src/gsiqt4/gsiDeclQToolButton.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQToolButton.cc index 9afb36f27..9e58e75ae 100644 --- a/src/gsiqt4/gsiDeclQToolButton.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQToolButton.cc @@ -80,8 +80,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -487,11 +487,11 @@ static gsi::Methods methods_QToolButton () { gsi::Class &qtdecl_QAbstractButton (); -qt_gsi::QtNativeClass decl_QToolButton (qtdecl_QAbstractButton (), "QToolButton_Native", +qt_gsi::QtNativeClass decl_QToolButton (qtdecl_QAbstractButton (), "QtGui", "QToolButton_Native", methods_QToolButton (), "@hide\n@alias QToolButton"); -GSIQT_PUBLIC gsi::Class &qtdecl_QToolButton () { return decl_QToolButton; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QToolButton () { return decl_QToolButton; } } @@ -2951,7 +2951,7 @@ static gsi::Methods methods_QToolButton_Adaptor () { return methods; } -gsi::Class decl_QToolButton_Adaptor (qtdecl_QToolButton (), "QToolButton", +gsi::Class decl_QToolButton_Adaptor (qtdecl_QToolButton (), "QtGui", "QToolButton", methods_QToolButton_Adaptor (), "@qt\n@brief Binding of QToolButton"); @@ -2962,19 +2962,19 @@ gsi::Class decl_QToolButton_Adaptor (qtdecl_QToolButton (), namespace qt_gsi { -static gsi::Enum decl_QToolButton_ToolButtonPopupMode_Enum ("QToolButton_ToolButtonPopupMode", +static gsi::Enum decl_QToolButton_ToolButtonPopupMode_Enum ("QtGui", "QToolButton_ToolButtonPopupMode", gsi::enum_const ("DelayedPopup", QToolButton::DelayedPopup, "@brief Enum constant QToolButton::DelayedPopup") + gsi::enum_const ("MenuButtonPopup", QToolButton::MenuButtonPopup, "@brief Enum constant QToolButton::MenuButtonPopup") + gsi::enum_const ("InstantPopup", QToolButton::InstantPopup, "@brief Enum constant QToolButton::InstantPopup"), "@qt\n@brief This class represents the QToolButton::ToolButtonPopupMode enum"); -static gsi::QFlagsClass decl_QToolButton_ToolButtonPopupMode_Enums ("QToolButton_QFlags_ToolButtonPopupMode", +static gsi::QFlagsClass decl_QToolButton_ToolButtonPopupMode_Enums ("QtGui", "QToolButton_QFlags_ToolButtonPopupMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QToolButton_ToolButtonPopupMode_Enum_in_parent (decl_QToolButton_ToolButtonPopupMode_Enum.defs ()); -static gsi::ClassExt decl_QToolButton_ToolButtonPopupMode_Enum_as_child (decl_QToolButton_ToolButtonPopupMode_Enum, "ToolButtonPopupMode"); -static gsi::ClassExt decl_QToolButton_ToolButtonPopupMode_Enums_as_child (decl_QToolButton_ToolButtonPopupMode_Enums, "QFlags_ToolButtonPopupMode"); +static gsi::ClassExt decl_QToolButton_ToolButtonPopupMode_Enum_as_child (decl_QToolButton_ToolButtonPopupMode_Enum, "QtGui", "ToolButtonPopupMode"); +static gsi::ClassExt decl_QToolButton_ToolButtonPopupMode_Enums_as_child (decl_QToolButton_ToolButtonPopupMode_Enums, "QtGui", "QFlags_ToolButtonPopupMode"); } diff --git a/src/gsiqt4/gsiDeclQToolTip.cc b/src/gsiqt/qt4/QtGui/gsiDeclQToolTip.cc similarity index 97% rename from src/gsiqt4/gsiDeclQToolTip.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQToolTip.cc index 68bca297c..04306288d 100644 --- a/src/gsiqt4/gsiDeclQToolTip.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQToolTip.cc @@ -34,8 +34,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -230,12 +230,12 @@ static gsi::Methods methods_QToolTip () { return methods; } -gsi::Class decl_QToolTip ("QToolTip", +gsi::Class decl_QToolTip ("QtGui", "QToolTip", methods_QToolTip (), "@qt\n@brief Binding of QToolTip"); -GSIQT_PUBLIC gsi::Class &qtdecl_QToolTip () { return decl_QToolTip; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QToolTip () { return decl_QToolTip; } } diff --git a/src/gsiqt4/gsiDeclQTouchEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTouchEvent.cc similarity index 96% rename from src/gsiqt4/gsiDeclQTouchEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTouchEvent.cc index 726df14b7..ff702b1c6 100644 --- a/src/gsiqt4/gsiDeclQTouchEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTouchEvent.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -195,11 +195,11 @@ static gsi::Methods methods_QTouchEvent () { gsi::Class &qtdecl_QInputEvent (); -gsi::Class decl_QTouchEvent (qtdecl_QInputEvent (), "QTouchEvent_Native", +gsi::Class decl_QTouchEvent (qtdecl_QInputEvent (), "QtGui", "QTouchEvent_Native", methods_QTouchEvent (), "@hide\n@alias QTouchEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTouchEvent () { return decl_QTouchEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTouchEvent () { return decl_QTouchEvent; } } @@ -286,7 +286,7 @@ static gsi::Methods methods_QTouchEvent_Adaptor () { return methods; } -gsi::Class decl_QTouchEvent_Adaptor (qtdecl_QTouchEvent (), "QTouchEvent", +gsi::Class decl_QTouchEvent_Adaptor (qtdecl_QTouchEvent (), "QtGui", "QTouchEvent", methods_QTouchEvent_Adaptor (), "@qt\n@brief Binding of QTouchEvent"); @@ -297,18 +297,18 @@ gsi::Class decl_QTouchEvent_Adaptor (qtdecl_QTouchEvent (), namespace qt_gsi { -static gsi::Enum decl_QTouchEvent_DeviceType_Enum ("QTouchEvent_DeviceType", +static gsi::Enum decl_QTouchEvent_DeviceType_Enum ("QtGui", "QTouchEvent_DeviceType", gsi::enum_const ("TouchScreen", QTouchEvent::TouchScreen, "@brief Enum constant QTouchEvent::TouchScreen") + gsi::enum_const ("TouchPad", QTouchEvent::TouchPad, "@brief Enum constant QTouchEvent::TouchPad"), "@qt\n@brief This class represents the QTouchEvent::DeviceType enum"); -static gsi::QFlagsClass decl_QTouchEvent_DeviceType_Enums ("QTouchEvent_QFlags_DeviceType", +static gsi::QFlagsClass decl_QTouchEvent_DeviceType_Enums ("QtGui", "QTouchEvent_QFlags_DeviceType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTouchEvent_DeviceType_Enum_in_parent (decl_QTouchEvent_DeviceType_Enum.defs ()); -static gsi::ClassExt decl_QTouchEvent_DeviceType_Enum_as_child (decl_QTouchEvent_DeviceType_Enum, "DeviceType"); -static gsi::ClassExt decl_QTouchEvent_DeviceType_Enums_as_child (decl_QTouchEvent_DeviceType_Enums, "QFlags_DeviceType"); +static gsi::ClassExt decl_QTouchEvent_DeviceType_Enum_as_child (decl_QTouchEvent_DeviceType_Enum, "QtGui", "DeviceType"); +static gsi::ClassExt decl_QTouchEvent_DeviceType_Enums_as_child (decl_QTouchEvent_DeviceType_Enums, "QtGui", "QFlags_DeviceType"); } diff --git a/src/gsiqt4/gsiDeclQTouchEvent_TouchPoint.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTouchEvent_TouchPoint.cc similarity index 99% rename from src/gsiqt4/gsiDeclQTouchEvent_TouchPoint.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTouchEvent_TouchPoint.cc index 1fdcbf0fb..e0a551d3f 100644 --- a/src/gsiqt4/gsiDeclQTouchEvent_TouchPoint.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTouchEvent_TouchPoint.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -789,13 +789,13 @@ static gsi::Methods methods_QTouchEvent_TouchPoint () { return methods; } -gsi::Class decl_QTouchEvent_TouchPoint ("QTouchEvent_TouchPoint", +gsi::Class decl_QTouchEvent_TouchPoint ("QtGui", "QTouchEvent_TouchPoint", methods_QTouchEvent_TouchPoint (), "@qt\n@brief Binding of QTouchEvent::TouchPoint"); -gsi::ClassExt decl_QTouchEvent_TouchPoint_as_child (decl_QTouchEvent_TouchPoint, "TouchPoint"); +gsi::ClassExt decl_QTouchEvent_TouchPoint_as_child (decl_QTouchEvent_TouchPoint, "QtGui", "TouchPoint"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTouchEvent_TouchPoint () { return decl_QTouchEvent_TouchPoint; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTouchEvent_TouchPoint () { return decl_QTouchEvent_TouchPoint; } } diff --git a/src/gsiqt4/gsiDeclQTransform.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTransform.cc similarity index 99% rename from src/gsiqt4/gsiDeclQTransform.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTransform.cc index a029c7916..346be3ec1 100644 --- a/src/gsiqt4/gsiDeclQTransform.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTransform.cc @@ -40,8 +40,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1358,12 +1358,12 @@ static gsi::Methods methods_QTransform () { return methods; } -gsi::Class decl_QTransform ("QTransform", +gsi::Class decl_QTransform ("QtGui", "QTransform", methods_QTransform (), "@qt\n@brief Binding of QTransform"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTransform () { return decl_QTransform; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTransform () { return decl_QTransform; } } @@ -1372,7 +1372,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QTransform () { return decl_QTransfo namespace qt_gsi { -static gsi::Enum decl_QTransform_TransformationType_Enum ("QTransform_TransformationType", +static gsi::Enum decl_QTransform_TransformationType_Enum ("QtGui", "QTransform_TransformationType", gsi::enum_const ("TxNone", QTransform::TxNone, "@brief Enum constant QTransform::TxNone") + gsi::enum_const ("TxTranslate", QTransform::TxTranslate, "@brief Enum constant QTransform::TxTranslate") + gsi::enum_const ("TxScale", QTransform::TxScale, "@brief Enum constant QTransform::TxScale") + @@ -1381,13 +1381,13 @@ static gsi::Enum decl_QTransform_TransformationT gsi::enum_const ("TxProject", QTransform::TxProject, "@brief Enum constant QTransform::TxProject"), "@qt\n@brief This class represents the QTransform::TransformationType enum"); -static gsi::QFlagsClass decl_QTransform_TransformationType_Enums ("QTransform_QFlags_TransformationType", +static gsi::QFlagsClass decl_QTransform_TransformationType_Enums ("QtGui", "QTransform_QFlags_TransformationType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTransform_TransformationType_Enum_in_parent (decl_QTransform_TransformationType_Enum.defs ()); -static gsi::ClassExt decl_QTransform_TransformationType_Enum_as_child (decl_QTransform_TransformationType_Enum, "TransformationType"); -static gsi::ClassExt decl_QTransform_TransformationType_Enums_as_child (decl_QTransform_TransformationType_Enums, "QFlags_TransformationType"); +static gsi::ClassExt decl_QTransform_TransformationType_Enum_as_child (decl_QTransform_TransformationType_Enum, "QtGui", "TransformationType"); +static gsi::ClassExt decl_QTransform_TransformationType_Enums_as_child (decl_QTransform_TransformationType_Enums, "QtGui", "QFlags_TransformationType"); } diff --git a/src/gsiqt4/gsiDeclQTreeView.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTreeView.cc similarity index 99% rename from src/gsiqt4/gsiDeclQTreeView.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTreeView.cc index 40546dfd2..38e83a3bd 100644 --- a/src/gsiqt4/gsiDeclQTreeView.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTreeView.cc @@ -85,8 +85,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1408,11 +1408,11 @@ static gsi::Methods methods_QTreeView () { gsi::Class &qtdecl_QAbstractItemView (); -qt_gsi::QtNativeClass decl_QTreeView (qtdecl_QAbstractItemView (), "QTreeView_Native", +qt_gsi::QtNativeClass decl_QTreeView (qtdecl_QAbstractItemView (), "QtGui", "QTreeView_Native", methods_QTreeView (), "@hide\n@alias QTreeView"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTreeView () { return decl_QTreeView; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTreeView () { return decl_QTreeView; } } @@ -6226,7 +6226,7 @@ static gsi::Methods methods_QTreeView_Adaptor () { return methods; } -gsi::Class decl_QTreeView_Adaptor (qtdecl_QTreeView (), "QTreeView", +gsi::Class decl_QTreeView_Adaptor (qtdecl_QTreeView (), "QtGui", "QTreeView", methods_QTreeView_Adaptor (), "@qt\n@brief Binding of QTreeView"); diff --git a/src/gsiqt4/gsiDeclQTreeWidget.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTreeWidget.cc similarity index 99% rename from src/gsiqt4/gsiDeclQTreeWidget.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTreeWidget.cc index 1989949b2..20d1e21df 100644 --- a/src/gsiqt4/gsiDeclQTreeWidget.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTreeWidget.cc @@ -87,8 +87,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1310,11 +1310,11 @@ static gsi::Methods methods_QTreeWidget () { gsi::Class &qtdecl_QTreeView (); -qt_gsi::QtNativeClass decl_QTreeWidget (qtdecl_QTreeView (), "QTreeWidget_Native", +qt_gsi::QtNativeClass decl_QTreeWidget (qtdecl_QTreeView (), "QtGui", "QTreeWidget_Native", methods_QTreeWidget (), "@hide\n@alias QTreeWidget"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTreeWidget () { return decl_QTreeWidget; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTreeWidget () { return decl_QTreeWidget; } } @@ -6593,7 +6593,7 @@ static gsi::Methods methods_QTreeWidget_Adaptor () { return methods; } -gsi::Class decl_QTreeWidget_Adaptor (qtdecl_QTreeWidget (), "QTreeWidget", +gsi::Class decl_QTreeWidget_Adaptor (qtdecl_QTreeWidget (), "QtGui", "QTreeWidget", methods_QTreeWidget_Adaptor (), "@qt\n@brief Binding of QTreeWidget"); diff --git a/src/gsiqt4/gsiDeclQTreeWidgetItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTreeWidgetItem.cc similarity index 99% rename from src/gsiqt4/gsiDeclQTreeWidgetItem.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTreeWidgetItem.cc index 67c1acb0d..86f0c7d72 100644 --- a/src/gsiqt4/gsiDeclQTreeWidgetItem.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTreeWidgetItem.cc @@ -36,8 +36,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1325,11 +1325,11 @@ static gsi::Methods methods_QTreeWidgetItem () { return methods; } -gsi::Class decl_QTreeWidgetItem ("QTreeWidgetItem_Native", +gsi::Class decl_QTreeWidgetItem ("QtGui", "QTreeWidgetItem_Native", methods_QTreeWidgetItem (), "@hide\n@alias QTreeWidgetItem"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTreeWidgetItem () { return decl_QTreeWidgetItem; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTreeWidgetItem () { return decl_QTreeWidgetItem; } } @@ -1934,7 +1934,7 @@ static gsi::Methods methods_QTreeWidgetItem_Adaptor () { return methods; } -gsi::Class decl_QTreeWidgetItem_Adaptor (qtdecl_QTreeWidgetItem (), "QTreeWidgetItem", +gsi::Class decl_QTreeWidgetItem_Adaptor (qtdecl_QTreeWidgetItem (), "QtGui", "QTreeWidgetItem", methods_QTreeWidgetItem_Adaptor (), "@qt\n@brief Binding of QTreeWidgetItem"); @@ -1945,19 +1945,19 @@ gsi::Class decl_QTreeWidgetItem_Adaptor (qtdecl_QTreeWi namespace qt_gsi { -static gsi::Enum decl_QTreeWidgetItem_ChildIndicatorPolicy_Enum ("QTreeWidgetItem_ChildIndicatorPolicy", +static gsi::Enum decl_QTreeWidgetItem_ChildIndicatorPolicy_Enum ("QtGui", "QTreeWidgetItem_ChildIndicatorPolicy", gsi::enum_const ("ShowIndicator", QTreeWidgetItem::ShowIndicator, "@brief Enum constant QTreeWidgetItem::ShowIndicator") + gsi::enum_const ("DontShowIndicator", QTreeWidgetItem::DontShowIndicator, "@brief Enum constant QTreeWidgetItem::DontShowIndicator") + gsi::enum_const ("DontShowIndicatorWhenChildless", QTreeWidgetItem::DontShowIndicatorWhenChildless, "@brief Enum constant QTreeWidgetItem::DontShowIndicatorWhenChildless"), "@qt\n@brief This class represents the QTreeWidgetItem::ChildIndicatorPolicy enum"); -static gsi::QFlagsClass decl_QTreeWidgetItem_ChildIndicatorPolicy_Enums ("QTreeWidgetItem_QFlags_ChildIndicatorPolicy", +static gsi::QFlagsClass decl_QTreeWidgetItem_ChildIndicatorPolicy_Enums ("QtGui", "QTreeWidgetItem_QFlags_ChildIndicatorPolicy", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTreeWidgetItem_ChildIndicatorPolicy_Enum_in_parent (decl_QTreeWidgetItem_ChildIndicatorPolicy_Enum.defs ()); -static gsi::ClassExt decl_QTreeWidgetItem_ChildIndicatorPolicy_Enum_as_child (decl_QTreeWidgetItem_ChildIndicatorPolicy_Enum, "ChildIndicatorPolicy"); -static gsi::ClassExt decl_QTreeWidgetItem_ChildIndicatorPolicy_Enums_as_child (decl_QTreeWidgetItem_ChildIndicatorPolicy_Enums, "QFlags_ChildIndicatorPolicy"); +static gsi::ClassExt decl_QTreeWidgetItem_ChildIndicatorPolicy_Enum_as_child (decl_QTreeWidgetItem_ChildIndicatorPolicy_Enum, "QtGui", "ChildIndicatorPolicy"); +static gsi::ClassExt decl_QTreeWidgetItem_ChildIndicatorPolicy_Enums_as_child (decl_QTreeWidgetItem_ChildIndicatorPolicy_Enums, "QtGui", "QFlags_ChildIndicatorPolicy"); } diff --git a/src/gsiqt4/gsiDeclQTreeWidgetItemIterator.cc b/src/gsiqt/qt4/QtGui/gsiDeclQTreeWidgetItemIterator.cc similarity index 96% rename from src/gsiqt4/gsiDeclQTreeWidgetItemIterator.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQTreeWidgetItemIterator.cc index e63130ffa..edb70bc4f 100644 --- a/src/gsiqt4/gsiDeclQTreeWidgetItemIterator.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQTreeWidgetItemIterator.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -261,12 +261,12 @@ static gsi::Methods methods_QTreeWidgetItemIterator () { return methods; } -gsi::Class decl_QTreeWidgetItemIterator ("QTreeWidgetItemIterator", +gsi::Class decl_QTreeWidgetItemIterator ("QtGui", "QTreeWidgetItemIterator", methods_QTreeWidgetItemIterator (), "@qt\n@brief Binding of QTreeWidgetItemIterator"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTreeWidgetItemIterator () { return decl_QTreeWidgetItemIterator; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTreeWidgetItemIterator () { return decl_QTreeWidgetItemIterator; } } @@ -275,7 +275,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QTreeWidgetItemIterator namespace qt_gsi { -static gsi::Enum decl_QTreeWidgetItemIterator_IteratorFlag_Enum ("QTreeWidgetItemIterator_IteratorFlag", +static gsi::Enum decl_QTreeWidgetItemIterator_IteratorFlag_Enum ("QtGui", "QTreeWidgetItemIterator_IteratorFlag", gsi::enum_const ("All", QTreeWidgetItemIterator::All, "@brief Enum constant QTreeWidgetItemIterator::All") + gsi::enum_const ("Hidden", QTreeWidgetItemIterator::Hidden, "@brief Enum constant QTreeWidgetItemIterator::Hidden") + gsi::enum_const ("NotHidden", QTreeWidgetItemIterator::NotHidden, "@brief Enum constant QTreeWidgetItemIterator::NotHidden") + @@ -298,13 +298,13 @@ static gsi::Enum decl_QTreeWidgetItemIter gsi::enum_const ("UserFlag", QTreeWidgetItemIterator::UserFlag, "@brief Enum constant QTreeWidgetItemIterator::UserFlag"), "@qt\n@brief This class represents the QTreeWidgetItemIterator::IteratorFlag enum"); -static gsi::QFlagsClass decl_QTreeWidgetItemIterator_IteratorFlag_Enums ("QTreeWidgetItemIterator_QFlags_IteratorFlag", +static gsi::QFlagsClass decl_QTreeWidgetItemIterator_IteratorFlag_Enums ("QtGui", "QTreeWidgetItemIterator_QFlags_IteratorFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QTreeWidgetItemIterator_IteratorFlag_Enum_in_parent (decl_QTreeWidgetItemIterator_IteratorFlag_Enum.defs ()); -static gsi::ClassExt decl_QTreeWidgetItemIterator_IteratorFlag_Enum_as_child (decl_QTreeWidgetItemIterator_IteratorFlag_Enum, "IteratorFlag"); -static gsi::ClassExt decl_QTreeWidgetItemIterator_IteratorFlag_Enums_as_child (decl_QTreeWidgetItemIterator_IteratorFlag_Enums, "QFlags_IteratorFlag"); +static gsi::ClassExt decl_QTreeWidgetItemIterator_IteratorFlag_Enum_as_child (decl_QTreeWidgetItemIterator_IteratorFlag_Enum, "QtGui", "IteratorFlag"); +static gsi::ClassExt decl_QTreeWidgetItemIterator_IteratorFlag_Enums_as_child (decl_QTreeWidgetItemIterator_IteratorFlag_Enums, "QtGui", "QFlags_IteratorFlag"); } diff --git a/src/gsiqt4/gsiDeclQUndoCommand.cc b/src/gsiqt/qt4/QtGui/gsiDeclQUndoCommand.cc similarity index 98% rename from src/gsiqt4/gsiDeclQUndoCommand.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQUndoCommand.cc index fdb99df3f..7865f6e71 100644 --- a/src/gsiqt4/gsiDeclQUndoCommand.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQUndoCommand.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -187,11 +187,11 @@ static gsi::Methods methods_QUndoCommand () { return methods; } -gsi::Class decl_QUndoCommand ("QUndoCommand_Native", +gsi::Class decl_QUndoCommand ("QtGui", "QUndoCommand_Native", methods_QUndoCommand (), "@hide\n@alias QUndoCommand"); -GSIQT_PUBLIC gsi::Class &qtdecl_QUndoCommand () { return decl_QUndoCommand; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QUndoCommand () { return decl_QUndoCommand; } } @@ -435,7 +435,7 @@ static gsi::Methods methods_QUndoCommand_Adaptor () { return methods; } -gsi::Class decl_QUndoCommand_Adaptor (qtdecl_QUndoCommand (), "QUndoCommand", +gsi::Class decl_QUndoCommand_Adaptor (qtdecl_QUndoCommand (), "QtGui", "QUndoCommand", methods_QUndoCommand_Adaptor (), "@qt\n@brief Binding of QUndoCommand"); diff --git a/src/gsiqt4/gsiDeclQUndoGroup.cc b/src/gsiqt/qt4/QtGui/gsiDeclQUndoGroup.cc similarity index 99% rename from src/gsiqt4/gsiDeclQUndoGroup.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQUndoGroup.cc index 0744bce0d..1dc65f840 100644 --- a/src/gsiqt4/gsiDeclQUndoGroup.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQUndoGroup.cc @@ -36,8 +36,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -428,11 +428,11 @@ static gsi::Methods methods_QUndoGroup () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QUndoGroup (qtdecl_QObject (), "QUndoGroup_Native", +qt_gsi::QtNativeClass decl_QUndoGroup (qtdecl_QObject (), "QtGui", "QUndoGroup_Native", methods_QUndoGroup (), "@hide\n@alias QUndoGroup"); -GSIQT_PUBLIC gsi::Class &qtdecl_QUndoGroup () { return decl_QUndoGroup; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QUndoGroup () { return decl_QUndoGroup; } } @@ -985,7 +985,7 @@ static gsi::Methods methods_QUndoGroup_Adaptor () { return methods; } -gsi::Class decl_QUndoGroup_Adaptor (qtdecl_QUndoGroup (), "QUndoGroup", +gsi::Class decl_QUndoGroup_Adaptor (qtdecl_QUndoGroup (), "QtGui", "QUndoGroup", methods_QUndoGroup_Adaptor (), "@qt\n@brief Binding of QUndoGroup"); diff --git a/src/gsiqt4/gsiDeclQUndoStack.cc b/src/gsiqt/qt4/QtGui/gsiDeclQUndoStack.cc similarity index 99% rename from src/gsiqt4/gsiDeclQUndoStack.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQUndoStack.cc index 67ae64bf9..bd2224cbe 100644 --- a/src/gsiqt4/gsiDeclQUndoStack.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQUndoStack.cc @@ -36,8 +36,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -608,11 +608,11 @@ static gsi::Methods methods_QUndoStack () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QUndoStack (qtdecl_QObject (), "QUndoStack_Native", +qt_gsi::QtNativeClass decl_QUndoStack (qtdecl_QObject (), "QtGui", "QUndoStack_Native", methods_QUndoStack (), "@hide\n@alias QUndoStack"); -GSIQT_PUBLIC gsi::Class &qtdecl_QUndoStack () { return decl_QUndoStack; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QUndoStack () { return decl_QUndoStack; } } @@ -1140,7 +1140,7 @@ static gsi::Methods methods_QUndoStack_Adaptor () { return methods; } -gsi::Class decl_QUndoStack_Adaptor (qtdecl_QUndoStack (), "QUndoStack", +gsi::Class decl_QUndoStack_Adaptor (qtdecl_QUndoStack (), "QtGui", "QUndoStack", methods_QUndoStack_Adaptor (), "@qt\n@brief Binding of QUndoStack"); diff --git a/src/gsiqt4/gsiDeclQUndoView.cc b/src/gsiqt/qt4/QtGui/gsiDeclQUndoView.cc similarity index 99% rename from src/gsiqt4/gsiDeclQUndoView.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQUndoView.cc index 78ea770a7..c94e8ee45 100644 --- a/src/gsiqt4/gsiDeclQUndoView.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQUndoView.cc @@ -86,8 +86,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -372,11 +372,11 @@ static gsi::Methods methods_QUndoView () { gsi::Class &qtdecl_QListView (); -qt_gsi::QtNativeClass decl_QUndoView (qtdecl_QListView (), "QUndoView_Native", +qt_gsi::QtNativeClass decl_QUndoView (qtdecl_QListView (), "QtGui", "QUndoView_Native", methods_QUndoView (), "@hide\n@alias QUndoView"); -GSIQT_PUBLIC gsi::Class &qtdecl_QUndoView () { return decl_QUndoView; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QUndoView () { return decl_QUndoView; } } @@ -5079,7 +5079,7 @@ static gsi::Methods methods_QUndoView_Adaptor () { return methods; } -gsi::Class decl_QUndoView_Adaptor (qtdecl_QUndoView (), "QUndoView", +gsi::Class decl_QUndoView_Adaptor (qtdecl_QUndoView (), "QtGui", "QUndoView", methods_QUndoView_Adaptor (), "@qt\n@brief Binding of QUndoView"); diff --git a/src/gsiqt4/gsiDeclQUnixPrintWidget.cc b/src/gsiqt/qt4/QtGui/gsiDeclQUnixPrintWidget.cc similarity index 99% rename from src/gsiqt4/gsiDeclQUnixPrintWidget.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQUnixPrintWidget.cc index a479878d4..80ab9931d 100644 --- a/src/gsiqt4/gsiDeclQUnixPrintWidget.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQUnixPrintWidget.cc @@ -78,8 +78,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -224,11 +224,11 @@ static gsi::Methods methods_QUnixPrintWidget () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QUnixPrintWidget (qtdecl_QWidget (), "QUnixPrintWidget_Native", +qt_gsi::QtNativeClass decl_QUnixPrintWidget (qtdecl_QWidget (), "QtGui", "QUnixPrintWidget_Native", methods_QUnixPrintWidget (), "@hide\n@alias QUnixPrintWidget"); -GSIQT_PUBLIC gsi::Class &qtdecl_QUnixPrintWidget () { return decl_QUnixPrintWidget; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QUnixPrintWidget () { return decl_QUnixPrintWidget; } } @@ -2432,7 +2432,7 @@ static gsi::Methods methods_QUnixPrintWidget_Adaptor () { return methods; } -gsi::Class decl_QUnixPrintWidget_Adaptor (qtdecl_QUnixPrintWidget (), "QUnixPrintWidget", +gsi::Class decl_QUnixPrintWidget_Adaptor (qtdecl_QUnixPrintWidget (), "QtGui", "QUnixPrintWidget", methods_QUnixPrintWidget_Adaptor (), "@qt\n@brief Binding of QUnixPrintWidget"); diff --git a/src/gsiqt4/gsiDeclQVBoxLayout.cc b/src/gsiqt/qt4/QtGui/gsiDeclQVBoxLayout.cc similarity index 99% rename from src/gsiqt4/gsiDeclQVBoxLayout.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQVBoxLayout.cc index b298ea11d..446c21fde 100644 --- a/src/gsiqt4/gsiDeclQVBoxLayout.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQVBoxLayout.cc @@ -41,8 +41,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -171,11 +171,11 @@ static gsi::Methods methods_QVBoxLayout () { gsi::Class &qtdecl_QBoxLayout (); -qt_gsi::QtNativeClass decl_QVBoxLayout (qtdecl_QBoxLayout (), "QVBoxLayout_Native", +qt_gsi::QtNativeClass decl_QVBoxLayout (qtdecl_QBoxLayout (), "QtGui", "QVBoxLayout_Native", methods_QVBoxLayout (), "@hide\n@alias QVBoxLayout"); -GSIQT_PUBLIC gsi::Class &qtdecl_QVBoxLayout () { return decl_QVBoxLayout; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QVBoxLayout () { return decl_QVBoxLayout; } } @@ -1430,7 +1430,7 @@ static gsi::Methods methods_QVBoxLayout_Adaptor () { return methods; } -gsi::Class decl_QVBoxLayout_Adaptor (qtdecl_QVBoxLayout (), "QVBoxLayout", +gsi::Class decl_QVBoxLayout_Adaptor (qtdecl_QVBoxLayout (), "QtGui", "QVBoxLayout", methods_QVBoxLayout_Adaptor (), "@qt\n@brief Binding of QVBoxLayout"); diff --git a/src/gsiqt4/gsiDeclQValidator.cc b/src/gsiqt/qt4/QtGui/gsiDeclQValidator.cc similarity index 98% rename from src/gsiqt4/gsiDeclQValidator.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQValidator.cc index 2a0d5e08d..0a3d86a2d 100644 --- a/src/gsiqt4/gsiDeclQValidator.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQValidator.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -246,11 +246,11 @@ static gsi::Methods methods_QValidator () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QValidator (qtdecl_QObject (), "QValidator_Native", +qt_gsi::QtNativeClass decl_QValidator (qtdecl_QObject (), "QtGui", "QValidator_Native", methods_QValidator (), "@hide\n@alias QValidator"); -GSIQT_PUBLIC gsi::Class &qtdecl_QValidator () { return decl_QValidator; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QValidator () { return decl_QValidator; } } @@ -716,7 +716,7 @@ static gsi::Methods methods_QValidator_Adaptor () { return methods; } -gsi::Class decl_QValidator_Adaptor (qtdecl_QValidator (), "QValidator", +gsi::Class decl_QValidator_Adaptor (qtdecl_QValidator (), "QtGui", "QValidator", methods_QValidator_Adaptor (), "@qt\n@brief Binding of QValidator"); @@ -727,19 +727,19 @@ gsi::Class decl_QValidator_Adaptor (qtdecl_QValidator (), "Q namespace qt_gsi { -static gsi::Enum decl_QValidator_State_Enum ("QValidator_State", +static gsi::Enum decl_QValidator_State_Enum ("QtGui", "QValidator_State", gsi::enum_const ("Invalid", QValidator::Invalid, "@brief Enum constant QValidator::Invalid") + gsi::enum_const ("Intermediate", QValidator::Intermediate, "@brief Enum constant QValidator::Intermediate") + gsi::enum_const ("Acceptable", QValidator::Acceptable, "@brief Enum constant QValidator::Acceptable"), "@qt\n@brief This class represents the QValidator::State enum"); -static gsi::QFlagsClass decl_QValidator_State_Enums ("QValidator_QFlags_State", +static gsi::QFlagsClass decl_QValidator_State_Enums ("QtGui", "QValidator_QFlags_State", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QValidator_State_Enum_in_parent (decl_QValidator_State_Enum.defs ()); -static gsi::ClassExt decl_QValidator_State_Enum_as_child (decl_QValidator_State_Enum, "State"); -static gsi::ClassExt decl_QValidator_State_Enums_as_child (decl_QValidator_State_Enums, "QFlags_State"); +static gsi::ClassExt decl_QValidator_State_Enum_as_child (decl_QValidator_State_Enum, "QtGui", "State"); +static gsi::ClassExt decl_QValidator_State_Enums_as_child (decl_QValidator_State_Enums, "QtGui", "QFlags_State"); } diff --git a/src/gsiqt4/gsiDeclQVector2D.cc b/src/gsiqt/qt4/QtGui/gsiDeclQVector2D.cc similarity index 99% rename from src/gsiqt4/gsiDeclQVector2D.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQVector2D.cc index 6e91ed36c..229ff6a07 100644 --- a/src/gsiqt4/gsiDeclQVector2D.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQVector2D.cc @@ -33,8 +33,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -558,12 +558,12 @@ static gsi::Methods methods_QVector2D () { return methods; } -gsi::Class decl_QVector2D ("QVector2D", +gsi::Class decl_QVector2D ("QtGui", "QVector2D", methods_QVector2D (), "@qt\n@brief Binding of QVector2D"); -GSIQT_PUBLIC gsi::Class &qtdecl_QVector2D () { return decl_QVector2D; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QVector2D () { return decl_QVector2D; } } diff --git a/src/gsiqt4/gsiDeclQVector3D.cc b/src/gsiqt/qt4/QtGui/gsiDeclQVector3D.cc similarity index 99% rename from src/gsiqt4/gsiDeclQVector3D.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQVector3D.cc index 6b5ba2d2f..3a4937c3d 100644 --- a/src/gsiqt4/gsiDeclQVector3D.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQVector3D.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -769,12 +769,12 @@ static gsi::Methods methods_QVector3D () { return methods; } -gsi::Class decl_QVector3D ("QVector3D", +gsi::Class decl_QVector3D ("QtGui", "QVector3D", methods_QVector3D (), "@qt\n@brief Binding of QVector3D"); -GSIQT_PUBLIC gsi::Class &qtdecl_QVector3D () { return decl_QVector3D; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QVector3D () { return decl_QVector3D; } } diff --git a/src/gsiqt4/gsiDeclQVector4D.cc b/src/gsiqt/qt4/QtGui/gsiDeclQVector4D.cc similarity index 99% rename from src/gsiqt4/gsiDeclQVector4D.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQVector4D.cc index 7eb59c13f..6ae8215db 100644 --- a/src/gsiqt4/gsiDeclQVector4D.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQVector4D.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -723,12 +723,12 @@ static gsi::Methods methods_QVector4D () { return methods; } -gsi::Class decl_QVector4D ("QVector4D", +gsi::Class decl_QVector4D ("QtGui", "QVector4D", methods_QVector4D (), "@qt\n@brief Binding of QVector4D"); -GSIQT_PUBLIC gsi::Class &qtdecl_QVector4D () { return decl_QVector4D; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QVector4D () { return decl_QVector4D; } } diff --git a/src/gsiqt4/gsiDeclQWhatsThis.cc b/src/gsiqt/qt4/QtGui/gsiDeclQWhatsThis.cc similarity index 96% rename from src/gsiqt4/gsiDeclQWhatsThis.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQWhatsThis.cc index e346099a9..235ca31c9 100644 --- a/src/gsiqt4/gsiDeclQWhatsThis.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQWhatsThis.cc @@ -33,8 +33,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -163,12 +163,12 @@ static gsi::Methods methods_QWhatsThis () { return methods; } -gsi::Class decl_QWhatsThis ("QWhatsThis", +gsi::Class decl_QWhatsThis ("QtGui", "QWhatsThis", methods_QWhatsThis (), "@qt\n@brief Binding of QWhatsThis"); -GSIQT_PUBLIC gsi::Class &qtdecl_QWhatsThis () { return decl_QWhatsThis; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QWhatsThis () { return decl_QWhatsThis; } } diff --git a/src/gsiqt4/gsiDeclQWhatsThisClickedEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQWhatsThisClickedEvent.cc similarity index 91% rename from src/gsiqt4/gsiDeclQWhatsThisClickedEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQWhatsThisClickedEvent.cc index 7afe5407b..37905e62c 100644 --- a/src/gsiqt4/gsiDeclQWhatsThisClickedEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQWhatsThisClickedEvent.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -62,11 +62,11 @@ static gsi::Methods methods_QWhatsThisClickedEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QWhatsThisClickedEvent (qtdecl_QEvent (), "QWhatsThisClickedEvent_Native", +gsi::Class decl_QWhatsThisClickedEvent (qtdecl_QEvent (), "QtGui", "QWhatsThisClickedEvent_Native", methods_QWhatsThisClickedEvent (), "@hide\n@alias QWhatsThisClickedEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QWhatsThisClickedEvent () { return decl_QWhatsThisClickedEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QWhatsThisClickedEvent () { return decl_QWhatsThisClickedEvent; } } @@ -117,7 +117,7 @@ static gsi::Methods methods_QWhatsThisClickedEvent_Adaptor () { return methods; } -gsi::Class decl_QWhatsThisClickedEvent_Adaptor (qtdecl_QWhatsThisClickedEvent (), "QWhatsThisClickedEvent", +gsi::Class decl_QWhatsThisClickedEvent_Adaptor (qtdecl_QWhatsThisClickedEvent (), "QtGui", "QWhatsThisClickedEvent", methods_QWhatsThisClickedEvent_Adaptor (), "@qt\n@brief Binding of QWhatsThisClickedEvent"); diff --git a/src/gsiqt4/gsiDeclQWheelEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQWheelEvent.cc similarity index 98% rename from src/gsiqt4/gsiDeclQWheelEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQWheelEvent.cc index c3297f7e8..6ee5d43c6 100644 --- a/src/gsiqt4/gsiDeclQWheelEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQWheelEvent.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -191,11 +191,11 @@ static gsi::Methods methods_QWheelEvent () { gsi::Class &qtdecl_QInputEvent (); -gsi::Class decl_QWheelEvent (qtdecl_QInputEvent (), "QWheelEvent_Native", +gsi::Class decl_QWheelEvent (qtdecl_QInputEvent (), "QtGui", "QWheelEvent_Native", methods_QWheelEvent (), "@hide\n@alias QWheelEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QWheelEvent () { return decl_QWheelEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QWheelEvent () { return decl_QWheelEvent; } } @@ -310,7 +310,7 @@ static gsi::Methods methods_QWheelEvent_Adaptor () { return methods; } -gsi::Class decl_QWheelEvent_Adaptor (qtdecl_QWheelEvent (), "QWheelEvent", +gsi::Class decl_QWheelEvent_Adaptor (qtdecl_QWheelEvent (), "QtGui", "QWheelEvent", methods_QWheelEvent_Adaptor (), "@qt\n@brief Binding of QWheelEvent"); diff --git a/src/gsiqt4/gsiDeclQWidget.cc b/src/gsiqt/qt4/QtGui/gsiDeclQWidget.cc similarity index 99% rename from src/gsiqt4/gsiDeclQWidget.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQWidget.cc index 30c8821f8..9a1fa5a01 100644 --- a/src/gsiqt4/gsiDeclQWidget.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQWidget.cc @@ -76,8 +76,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -4779,11 +4779,11 @@ static gsi::Methods methods_QWidget () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QWidget (qtdecl_QObject (), "QWidget_Native", +qt_gsi::QtNativeClass decl_QWidget (qtdecl_QObject (), "QtGui", "QWidget_Native", methods_QWidget (), "@hide\n@alias QWidget"); -GSIQT_PUBLIC gsi::Class &qtdecl_QWidget () { return decl_QWidget; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QWidget () { return decl_QWidget; } } @@ -6993,7 +6993,7 @@ static gsi::Methods methods_QWidget_Adaptor () { return methods; } -gsi::Class decl_QWidget_Adaptor (qtdecl_QWidget (), "QWidget", +gsi::Class decl_QWidget_Adaptor (qtdecl_QWidget (), "QtGui", "QWidget", methods_QWidget_Adaptor (), "@qt\n@brief Binding of QWidget"); @@ -7004,19 +7004,19 @@ gsi::Class decl_QWidget_Adaptor (qtdecl_QWidget (), "QWidget", namespace qt_gsi { -static gsi::Enum decl_QWidget_RenderFlag_Enum ("QWidget_RenderFlag", +static gsi::Enum decl_QWidget_RenderFlag_Enum ("QtGui", "QWidget_RenderFlag", gsi::enum_const ("DrawWindowBackground", QWidget::DrawWindowBackground, "@brief Enum constant QWidget::DrawWindowBackground") + gsi::enum_const ("DrawChildren", QWidget::DrawChildren, "@brief Enum constant QWidget::DrawChildren") + gsi::enum_const ("IgnoreMask", QWidget::IgnoreMask, "@brief Enum constant QWidget::IgnoreMask"), "@qt\n@brief This class represents the QWidget::RenderFlag enum"); -static gsi::QFlagsClass decl_QWidget_RenderFlag_Enums ("QWidget_QFlags_RenderFlag", +static gsi::QFlagsClass decl_QWidget_RenderFlag_Enums ("QtGui", "QWidget_QFlags_RenderFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QWidget_RenderFlag_Enum_in_parent (decl_QWidget_RenderFlag_Enum.defs ()); -static gsi::ClassExt decl_QWidget_RenderFlag_Enum_as_child (decl_QWidget_RenderFlag_Enum, "RenderFlag"); -static gsi::ClassExt decl_QWidget_RenderFlag_Enums_as_child (decl_QWidget_RenderFlag_Enums, "QFlags_RenderFlag"); +static gsi::ClassExt decl_QWidget_RenderFlag_Enum_as_child (decl_QWidget_RenderFlag_Enum, "QtGui", "RenderFlag"); +static gsi::ClassExt decl_QWidget_RenderFlag_Enums_as_child (decl_QWidget_RenderFlag_Enums, "QtGui", "QFlags_RenderFlag"); } diff --git a/src/gsiqt4/gsiDeclQWidgetAction.cc b/src/gsiqt/qt4/QtGui/gsiDeclQWidgetAction.cc similarity index 99% rename from src/gsiqt4/gsiDeclQWidgetAction.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQWidgetAction.cc index 6ba913b16..b5f498087 100644 --- a/src/gsiqt4/gsiDeclQWidgetAction.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQWidgetAction.cc @@ -40,8 +40,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -252,11 +252,11 @@ static gsi::Methods methods_QWidgetAction () { gsi::Class &qtdecl_QAction (); -qt_gsi::QtNativeClass decl_QWidgetAction (qtdecl_QAction (), "QWidgetAction_Native", +qt_gsi::QtNativeClass decl_QWidgetAction (qtdecl_QAction (), "QtGui", "QWidgetAction_Native", methods_QWidgetAction (), "@hide\n@alias QWidgetAction"); -GSIQT_PUBLIC gsi::Class &qtdecl_QWidgetAction () { return decl_QWidgetAction; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QWidgetAction () { return decl_QWidgetAction; } } @@ -823,7 +823,7 @@ static gsi::Methods methods_QWidgetAction_Adaptor () { return methods; } -gsi::Class decl_QWidgetAction_Adaptor (qtdecl_QWidgetAction (), "QWidgetAction", +gsi::Class decl_QWidgetAction_Adaptor (qtdecl_QWidgetAction (), "QtGui", "QWidgetAction", methods_QWidgetAction_Adaptor (), "@qt\n@brief Binding of QWidgetAction"); diff --git a/src/gsiqt4/gsiDeclQWidgetItem.cc b/src/gsiqt/qt4/QtGui/gsiDeclQWidgetItem.cc similarity index 99% rename from src/gsiqt4/gsiDeclQWidgetItem.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQWidgetItem.cc index 250108606..312eb7bc3 100644 --- a/src/gsiqt4/gsiDeclQWidgetItem.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQWidgetItem.cc @@ -34,8 +34,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -220,11 +220,11 @@ static gsi::Methods methods_QWidgetItem () { gsi::Class &qtdecl_QLayoutItem (); -gsi::Class decl_QWidgetItem (qtdecl_QLayoutItem (), "QWidgetItem_Native", +gsi::Class decl_QWidgetItem (qtdecl_QLayoutItem (), "QtGui", "QWidgetItem_Native", methods_QWidgetItem (), "@hide\n@alias QWidgetItem"); -GSIQT_PUBLIC gsi::Class &qtdecl_QWidgetItem () { return decl_QWidgetItem; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QWidgetItem () { return decl_QWidgetItem; } } @@ -806,7 +806,7 @@ static gsi::Methods methods_QWidgetItem_Adaptor () { return methods; } -gsi::Class decl_QWidgetItem_Adaptor (qtdecl_QWidgetItem (), "QWidgetItem", +gsi::Class decl_QWidgetItem_Adaptor (qtdecl_QWidgetItem (), "QtGui", "QWidgetItem", methods_QWidgetItem_Adaptor (), "@qt\n@brief Binding of QWidgetItem"); diff --git a/src/gsiqt4/gsiDeclQWindowStateChangeEvent.cc b/src/gsiqt/qt4/QtGui/gsiDeclQWindowStateChangeEvent.cc similarity index 94% rename from src/gsiqt4/gsiDeclQWindowStateChangeEvent.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQWindowStateChangeEvent.cc index c411831df..9472f3229 100644 --- a/src/gsiqt4/gsiDeclQWindowStateChangeEvent.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQWindowStateChangeEvent.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -78,11 +78,11 @@ static gsi::Methods methods_QWindowStateChangeEvent () { gsi::Class &qtdecl_QEvent (); -gsi::Class decl_QWindowStateChangeEvent (qtdecl_QEvent (), "QWindowStateChangeEvent_Native", +gsi::Class decl_QWindowStateChangeEvent (qtdecl_QEvent (), "QtGui", "QWindowStateChangeEvent_Native", methods_QWindowStateChangeEvent (), "@hide\n@alias QWindowStateChangeEvent"); -GSIQT_PUBLIC gsi::Class &qtdecl_QWindowStateChangeEvent () { return decl_QWindowStateChangeEvent; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QWindowStateChangeEvent () { return decl_QWindowStateChangeEvent; } } @@ -161,7 +161,7 @@ static gsi::Methods methods_QWindowStateChangeEvent_Adaptor () { return methods; } -gsi::Class decl_QWindowStateChangeEvent_Adaptor (qtdecl_QWindowStateChangeEvent (), "QWindowStateChangeEvent", +gsi::Class decl_QWindowStateChangeEvent_Adaptor (qtdecl_QWindowStateChangeEvent (), "QtGui", "QWindowStateChangeEvent", methods_QWindowStateChangeEvent_Adaptor (), "@qt\n@brief Binding of QWindowStateChangeEvent"); diff --git a/src/gsiqt4/gsiDeclQWindowsStyle.cc b/src/gsiqt/qt4/QtGui/gsiDeclQWindowsStyle.cc similarity index 99% rename from src/gsiqt4/gsiDeclQWindowsStyle.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQWindowsStyle.cc index cd64e6a5d..bb0d3ca17 100644 --- a/src/gsiqt4/gsiDeclQWindowsStyle.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQWindowsStyle.cc @@ -48,8 +48,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -509,11 +509,11 @@ static gsi::Methods methods_QWindowsStyle () { gsi::Class &qtdecl_QCommonStyle (); -qt_gsi::QtNativeClass decl_QWindowsStyle (qtdecl_QCommonStyle (), "QWindowsStyle_Native", +qt_gsi::QtNativeClass decl_QWindowsStyle (qtdecl_QCommonStyle (), "QtGui", "QWindowsStyle_Native", methods_QWindowsStyle (), "@hide\n@alias QWindowsStyle"); -GSIQT_PUBLIC gsi::Class &qtdecl_QWindowsStyle () { return decl_QWindowsStyle; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QWindowsStyle () { return decl_QWindowsStyle; } } @@ -1946,7 +1946,7 @@ static gsi::Methods methods_QWindowsStyle_Adaptor () { return methods; } -gsi::Class decl_QWindowsStyle_Adaptor (qtdecl_QWindowsStyle (), "QWindowsStyle", +gsi::Class decl_QWindowsStyle_Adaptor (qtdecl_QWindowsStyle (), "QtGui", "QWindowsStyle", methods_QWindowsStyle_Adaptor (), "@qt\n@brief Binding of QWindowsStyle"); diff --git a/src/gsiqt4/gsiDeclQWizard.cc b/src/gsiqt/qt4/QtGui/gsiDeclQWizard.cc similarity index 99% rename from src/gsiqt4/gsiDeclQWizard.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQWizard.cc index ebb0eca4e..5505b40cb 100644 --- a/src/gsiqt4/gsiDeclQWizard.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQWizard.cc @@ -80,8 +80,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -959,11 +959,11 @@ static gsi::Methods methods_QWizard () { gsi::Class &qtdecl_QDialog (); -qt_gsi::QtNativeClass decl_QWizard (qtdecl_QDialog (), "QWizard_Native", +qt_gsi::QtNativeClass decl_QWizard (qtdecl_QDialog (), "QtGui", "QWizard_Native", methods_QWizard (), "@hide\n@alias QWizard"); -GSIQT_PUBLIC gsi::Class &qtdecl_QWizard () { return decl_QWizard; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QWizard () { return decl_QWizard; } } @@ -3612,7 +3612,7 @@ static gsi::Methods methods_QWizard_Adaptor () { return methods; } -gsi::Class decl_QWizard_Adaptor (qtdecl_QWizard (), "QWizard", +gsi::Class decl_QWizard_Adaptor (qtdecl_QWizard (), "QtGui", "QWizard", methods_QWizard_Adaptor (), "@qt\n@brief Binding of QWizard"); @@ -3623,7 +3623,7 @@ gsi::Class decl_QWizard_Adaptor (qtdecl_QWizard (), "QWizard", namespace qt_gsi { -static gsi::Enum decl_QWizard_WizardButton_Enum ("QWizard_WizardButton", +static gsi::Enum decl_QWizard_WizardButton_Enum ("QtGui", "QWizard_WizardButton", gsi::enum_const ("BackButton", QWizard::BackButton, "@brief Enum constant QWizard::BackButton") + gsi::enum_const ("NextButton", QWizard::NextButton, "@brief Enum constant QWizard::NextButton") + gsi::enum_const ("CommitButton", QWizard::CommitButton, "@brief Enum constant QWizard::CommitButton") + @@ -3639,13 +3639,13 @@ static gsi::Enum decl_QWizard_WizardButton_Enum ("QWizard gsi::enum_const ("NButtons", QWizard::NButtons, "@brief Enum constant QWizard::NButtons"), "@qt\n@brief This class represents the QWizard::WizardButton enum"); -static gsi::QFlagsClass decl_QWizard_WizardButton_Enums ("QWizard_QFlags_WizardButton", +static gsi::QFlagsClass decl_QWizard_WizardButton_Enums ("QtGui", "QWizard_QFlags_WizardButton", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QWizard_WizardButton_Enum_in_parent (decl_QWizard_WizardButton_Enum.defs ()); -static gsi::ClassExt decl_QWizard_WizardButton_Enum_as_child (decl_QWizard_WizardButton_Enum, "WizardButton"); -static gsi::ClassExt decl_QWizard_WizardButton_Enums_as_child (decl_QWizard_WizardButton_Enums, "QFlags_WizardButton"); +static gsi::ClassExt decl_QWizard_WizardButton_Enum_as_child (decl_QWizard_WizardButton_Enum, "QtGui", "WizardButton"); +static gsi::ClassExt decl_QWizard_WizardButton_Enums_as_child (decl_QWizard_WizardButton_Enums, "QtGui", "QFlags_WizardButton"); } @@ -3654,7 +3654,7 @@ static gsi::ClassExt decl_QWizard_WizardButton_Enums_as_child (decl_QWi namespace qt_gsi { -static gsi::Enum decl_QWizard_WizardOption_Enum ("QWizard_WizardOption", +static gsi::Enum decl_QWizard_WizardOption_Enum ("QtGui", "QWizard_WizardOption", gsi::enum_const ("IndependentPages", QWizard::IndependentPages, "@brief Enum constant QWizard::IndependentPages") + gsi::enum_const ("IgnoreSubTitles", QWizard::IgnoreSubTitles, "@brief Enum constant QWizard::IgnoreSubTitles") + gsi::enum_const ("ExtendedWatermarkPixmap", QWizard::ExtendedWatermarkPixmap, "@brief Enum constant QWizard::ExtendedWatermarkPixmap") + @@ -3673,13 +3673,13 @@ static gsi::Enum decl_QWizard_WizardOption_Enum ("QWizard gsi::enum_const ("HaveCustomButton3", QWizard::HaveCustomButton3, "@brief Enum constant QWizard::HaveCustomButton3"), "@qt\n@brief This class represents the QWizard::WizardOption enum"); -static gsi::QFlagsClass decl_QWizard_WizardOption_Enums ("QWizard_QFlags_WizardOption", +static gsi::QFlagsClass decl_QWizard_WizardOption_Enums ("QtGui", "QWizard_QFlags_WizardOption", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QWizard_WizardOption_Enum_in_parent (decl_QWizard_WizardOption_Enum.defs ()); -static gsi::ClassExt decl_QWizard_WizardOption_Enum_as_child (decl_QWizard_WizardOption_Enum, "WizardOption"); -static gsi::ClassExt decl_QWizard_WizardOption_Enums_as_child (decl_QWizard_WizardOption_Enums, "QFlags_WizardOption"); +static gsi::ClassExt decl_QWizard_WizardOption_Enum_as_child (decl_QWizard_WizardOption_Enum, "QtGui", "WizardOption"); +static gsi::ClassExt decl_QWizard_WizardOption_Enums_as_child (decl_QWizard_WizardOption_Enums, "QtGui", "QFlags_WizardOption"); } @@ -3688,7 +3688,7 @@ static gsi::ClassExt decl_QWizard_WizardOption_Enums_as_child (decl_QWi namespace qt_gsi { -static gsi::Enum decl_QWizard_WizardPixmap_Enum ("QWizard_WizardPixmap", +static gsi::Enum decl_QWizard_WizardPixmap_Enum ("QtGui", "QWizard_WizardPixmap", gsi::enum_const ("WatermarkPixmap", QWizard::WatermarkPixmap, "@brief Enum constant QWizard::WatermarkPixmap") + gsi::enum_const ("LogoPixmap", QWizard::LogoPixmap, "@brief Enum constant QWizard::LogoPixmap") + gsi::enum_const ("BannerPixmap", QWizard::BannerPixmap, "@brief Enum constant QWizard::BannerPixmap") + @@ -3696,13 +3696,13 @@ static gsi::Enum decl_QWizard_WizardPixmap_Enum ("QWizard gsi::enum_const ("NPixmaps", QWizard::NPixmaps, "@brief Enum constant QWizard::NPixmaps"), "@qt\n@brief This class represents the QWizard::WizardPixmap enum"); -static gsi::QFlagsClass decl_QWizard_WizardPixmap_Enums ("QWizard_QFlags_WizardPixmap", +static gsi::QFlagsClass decl_QWizard_WizardPixmap_Enums ("QtGui", "QWizard_QFlags_WizardPixmap", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QWizard_WizardPixmap_Enum_in_parent (decl_QWizard_WizardPixmap_Enum.defs ()); -static gsi::ClassExt decl_QWizard_WizardPixmap_Enum_as_child (decl_QWizard_WizardPixmap_Enum, "WizardPixmap"); -static gsi::ClassExt decl_QWizard_WizardPixmap_Enums_as_child (decl_QWizard_WizardPixmap_Enums, "QFlags_WizardPixmap"); +static gsi::ClassExt decl_QWizard_WizardPixmap_Enum_as_child (decl_QWizard_WizardPixmap_Enum, "QtGui", "WizardPixmap"); +static gsi::ClassExt decl_QWizard_WizardPixmap_Enums_as_child (decl_QWizard_WizardPixmap_Enums, "QtGui", "QFlags_WizardPixmap"); } @@ -3711,7 +3711,7 @@ static gsi::ClassExt decl_QWizard_WizardPixmap_Enums_as_child (decl_QWi namespace qt_gsi { -static gsi::Enum decl_QWizard_WizardStyle_Enum ("QWizard_WizardStyle", +static gsi::Enum decl_QWizard_WizardStyle_Enum ("QtGui", "QWizard_WizardStyle", gsi::enum_const ("ClassicStyle", QWizard::ClassicStyle, "@brief Enum constant QWizard::ClassicStyle") + gsi::enum_const ("ModernStyle", QWizard::ModernStyle, "@brief Enum constant QWizard::ModernStyle") + gsi::enum_const ("MacStyle", QWizard::MacStyle, "@brief Enum constant QWizard::MacStyle") + @@ -3719,13 +3719,13 @@ static gsi::Enum decl_QWizard_WizardStyle_Enum ("QWizard_W gsi::enum_const ("NStyles", QWizard::NStyles, "@brief Enum constant QWizard::NStyles"), "@qt\n@brief This class represents the QWizard::WizardStyle enum"); -static gsi::QFlagsClass decl_QWizard_WizardStyle_Enums ("QWizard_QFlags_WizardStyle", +static gsi::QFlagsClass decl_QWizard_WizardStyle_Enums ("QtGui", "QWizard_QFlags_WizardStyle", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QWizard_WizardStyle_Enum_in_parent (decl_QWizard_WizardStyle_Enum.defs ()); -static gsi::ClassExt decl_QWizard_WizardStyle_Enum_as_child (decl_QWizard_WizardStyle_Enum, "WizardStyle"); -static gsi::ClassExt decl_QWizard_WizardStyle_Enums_as_child (decl_QWizard_WizardStyle_Enums, "QFlags_WizardStyle"); +static gsi::ClassExt decl_QWizard_WizardStyle_Enum_as_child (decl_QWizard_WizardStyle_Enum, "QtGui", "WizardStyle"); +static gsi::ClassExt decl_QWizard_WizardStyle_Enums_as_child (decl_QWizard_WizardStyle_Enums, "QtGui", "QFlags_WizardStyle"); } diff --git a/src/gsiqt4/gsiDeclQWizardPage.cc b/src/gsiqt/qt4/QtGui/gsiDeclQWizardPage.cc similarity index 99% rename from src/gsiqt4/gsiDeclQWizardPage.cc rename to src/gsiqt/qt4/QtGui/gsiDeclQWizardPage.cc index 1cf790025..3619b117a 100644 --- a/src/gsiqt4/gsiDeclQWizardPage.cc +++ b/src/gsiqt/qt4/QtGui/gsiDeclQWizardPage.cc @@ -79,8 +79,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtGuiCommon.h" +#include "gsiDeclQtGuiTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -529,11 +529,11 @@ static gsi::Methods methods_QWizardPage () { gsi::Class &qtdecl_QWidget (); -qt_gsi::QtNativeClass decl_QWizardPage (qtdecl_QWidget (), "QWizardPage_Native", +qt_gsi::QtNativeClass decl_QWizardPage (qtdecl_QWidget (), "QtGui", "QWizardPage_Native", methods_QWizardPage (), "@hide\n@alias QWizardPage"); -GSIQT_PUBLIC gsi::Class &qtdecl_QWizardPage () { return decl_QWizardPage; } +GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QWizardPage () { return decl_QWizardPage; } } @@ -3048,7 +3048,7 @@ static gsi::Methods methods_QWizardPage_Adaptor () { return methods; } -gsi::Class decl_QWizardPage_Adaptor (qtdecl_QWizardPage (), "QWizardPage", +gsi::Class decl_QWizardPage_Adaptor (qtdecl_QWizardPage (), "QtGui", "QWizardPage", methods_QWizardPage_Adaptor (), "@qt\n@brief Binding of QWizardPage"); diff --git a/src/gsiqt4/gsiDeclQtTypeTraits.h b/src/gsiqt/qt4/QtGui/gsiDeclQtGuiTypeTraits.h similarity index 82% rename from src/gsiqt4/gsiDeclQtTypeTraits.h rename to src/gsiqt/qt4/QtGui/gsiDeclQtGuiTypeTraits.h index 60f8f7714..e70833255 100644 --- a/src/gsiqt4/gsiDeclQtTypeTraits.h +++ b/src/gsiqt/qt4/QtGui/gsiDeclQtGuiTypeTraits.h @@ -21,15 +21,15 @@ */ /** -* @file generated/gsiDeclQtTypeTraits.h +* @file generated/gsiDeclQtGuiTypeTraits.h * @brief Type traits for the Qt binding classes * * DO NOT EDIT THIS FILE. * This file has been created automatically */ -#ifndef _HDR_gsiDeclQtTypeTraits -#define _HDR_gsiDeclQtTypeTraits +#ifndef _HDR_gsiDeclQtGuiTypeTraits +#define _HDR_gsiDeclQtGuiTypeTraits #include "gsiTypes.h" @@ -49,13 +49,6 @@ template <> struct type_traits : public type_traits struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - class QAbstractGraphicsShapeItem; namespace tl { template <> struct type_traits : public type_traits { @@ -131,21 +124,6 @@ template <> struct type_traits : public type_traits< }; } -class QAbstractNetworkCache; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; - typedef tl::false_tag has_default_constructor; -}; -} - -class QAbstractNetworkCache_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - class QAbstractPageSetupDialog; namespace tl { template <> struct type_traits : public type_traits { @@ -221,14 +199,6 @@ template <> struct type_traits : public type_traits struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; - typedef tl::false_tag has_default_constructor; -}; -} - class QAbstractSpinBox; namespace tl { template <> struct type_traits : public type_traits { @@ -415,18 +385,6 @@ template <> struct type_traits : public type_traits }; } -class QAuthenticator; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QBasicTimer; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - class QBitmap; namespace tl { template <> struct type_traits : public type_traits { @@ -461,13 +419,6 @@ template <> struct type_traits : public type_traits { }; } -class QBuffer; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - class QButtonGroup; namespace tl { template <> struct type_traits : public type_traits { @@ -482,12 +433,6 @@ template <> struct type_traits : public type_traits }; } -class QByteArrayMatcher; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - class QCDEStyle; namespace tl { template <> struct type_traits : public type_traits { @@ -726,14 +671,6 @@ template <> struct type_traits : public type_traits struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; - typedef tl::false_tag has_default_constructor; -}; -} - class QCursor; namespace tl { template <> struct type_traits : public type_traits { @@ -920,108 +857,6 @@ template <> struct type_traits : public type_traits { }; } -class QDomAttr; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QDomCDATASection; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QDomCharacterData; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QDomComment; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QDomDocument; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QDomDocumentFragment; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QDomDocumentType; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QDomElement; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QDomEntity; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QDomEntityReference; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QDomImplementation; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QDomNamedNodeMap; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QDomNode; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QDomNodeList; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QDomNotation; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QDomProcessingInstruction; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QDomText; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - class QDoubleSpinBox; namespace tl { template <> struct type_traits : public type_traits { @@ -1150,12 +985,6 @@ template <> struct type_traits : public typ }; } -class QEasingCurve; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - class QErrorMessage; namespace tl { template <> struct type_traits : public type_traits { @@ -1281,20 +1110,6 @@ template <> struct type_traits : public type_traits struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QFileSystemWatcher_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - class QFocusEvent; namespace tl { template <> struct type_traits : public type_traits { @@ -1384,13 +1199,6 @@ template <> struct type_traits : public type_traits { }; } -class QFormBuilder; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - class QFormLayout; namespace tl { template <> struct type_traits : public type_traits { @@ -1419,20 +1227,6 @@ template <> struct type_traits : public type_traits { }; } -class QFtp; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QFtp_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - class QGesture; namespace tl { template <> struct type_traits : public type_traits { @@ -2121,18 +1915,6 @@ template <> struct type_traits : public type_traits { }; } -class QHostAddress; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QHostInfo; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - class QHoverEvent; namespace tl { template <> struct type_traits : public type_traits { @@ -2155,12 +1937,6 @@ template <> struct type_traits : public type_traits { }; } -class QIPv6Address; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - class QIcon; namespace tl { template <> struct type_traits : public type_traits { @@ -2535,27 +2311,6 @@ template <> struct type_traits : public type_traits { }; } -class QLibrary; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QLibrary_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QLibraryInfo; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_default_constructor; -}; -} - class QLine; namespace tl { template <> struct type_traits : public type_traits { @@ -2628,27 +2383,6 @@ template <> struct type_traits : public type_traits struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QLocalServer_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QLocalSocket; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - class QLocale; namespace tl { template <> struct type_traits : public type_traits { @@ -2883,119 +2617,6 @@ template <> struct type_traits : public type_traits { }; } -class QMutex; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QNetworkAccessManager; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QNetworkAccessManager_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QNetworkAddressEntry; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QNetworkCacheMetaData; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QNetworkCookie; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QNetworkCookieJar; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QNetworkCookieJar_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QNetworkDiskCache; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QNetworkDiskCache_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QNetworkInterface; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QNetworkProxy; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QNetworkProxyFactory; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; - typedef tl::false_tag has_default_constructor; -}; -} - -class QNetworkProxyFactory_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QNetworkProxyQuery; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QNetworkReply; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; - typedef tl::false_tag has_default_constructor; -}; -} - -class QNetworkRequest; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - class QObject; namespace tl { template <> struct type_traits : public type_traits { @@ -3220,20 +2841,6 @@ template <> struct type_traits : public type_traits struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QPluginLoader_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - class QPoint; namespace tl { template <> struct type_traits : public type_traits { @@ -3334,19 +2941,6 @@ template <> struct type_traits : public type_traits { }; } -class QProcess; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QProcessEnvironment; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - class QProgressBar; namespace tl { template <> struct type_traits : public type_traits { @@ -3415,21 +3009,6 @@ template <> struct type_traits : public type_traits }; } -class QReadLocker; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; - typedef tl::false_tag has_default_constructor; -}; -} - -class QReadWriteLock; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - class QRect; namespace tl { template <> struct type_traits : public type_traits { @@ -3484,13 +3063,6 @@ template <> struct type_traits : public type_traits }; } -class QResource; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - class QRubberBand; namespace tl { template <> struct type_traits : public type_traits { @@ -3535,27 +3107,6 @@ template <> struct type_traits : public type_traits { }; } -class QSemaphore; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QSettings; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QSettings_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - class QShortcut; namespace tl { template <> struct type_traits : public type_traits { @@ -3598,20 +3149,6 @@ template <> struct type_traits : public type_traits { }; } -class QSignalMapper; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QSignalMapper_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - class QSize; namespace tl { template <> struct type_traits : public type_traits { @@ -3660,22 +3197,6 @@ template <> struct type_traits : public type_traits { }; } -class QSocketNotifier; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; - typedef tl::false_tag has_default_constructor; -}; -} - -class QSocketNotifier_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; - typedef tl::false_tag has_default_constructor; -}; -} - class QSortFilterProxyModel; namespace tl { template <> struct type_traits : public type_traits { @@ -3778,188 +3299,6 @@ template <> struct type_traits : public type_traits struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; - typedef tl::false_tag has_default_constructor; -}; -} - -class QSqlDatabase; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QSqlDriver; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; - typedef tl::false_tag has_default_constructor; -}; -} - -class QSqlDriver_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QSqlDriverCreatorBase; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; - typedef tl::false_tag has_default_constructor; -}; -} - -class QSqlDriverCreatorBase_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QSqlError; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QSqlField; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QSqlIndex; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QSqlQuery; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QSqlQueryModel; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QSqlQueryModel_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QSqlRecord; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QSqlRelation; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QSqlRelationalTableModel; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QSqlRelationalTableModel_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QSqlResult; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; - typedef tl::false_tag has_default_constructor; -}; -} - -class QSqlResult_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; - typedef tl::false_tag has_default_constructor; -}; -} - -class QSqlTableModel; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QSqlTableModel_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QSsl_Namespace; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; - typedef tl::false_tag has_default_constructor; -}; -} - -class QSslCertificate; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QSslCipher; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QSslConfiguration; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QSslError; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QSslKey; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QSslSocket; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - class QStackedLayout; namespace tl { template <> struct type_traits : public type_traits { @@ -4539,34 +3878,6 @@ template <> struct type_traits : public type_traits { }; } -class QTcpServer; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QTcpServer_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QTcpSocket; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QTemporaryFile; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - class QTextBlock; namespace tl { template <> struct type_traits : public type_traits { @@ -4634,43 +3945,12 @@ template <> struct type_traits : public type_traits { }; } -class QTextCodec; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; - typedef tl::false_tag has_default_constructor; - typedef tl::false_tag has_public_destructor; -}; -} - -class QTextCodec_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -#include -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - class QTextCursor; namespace tl { template <> struct type_traits : public type_traits { }; } -class QTextDecoder; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; - typedef tl::false_tag has_default_constructor; -}; -} - class QTextDocument; namespace tl { template <> struct type_traits : public type_traits { @@ -4718,14 +3998,6 @@ template <> struct type_traits : public type_traits struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; - typedef tl::false_tag has_default_constructor; -}; -} - class QTextFormat; namespace tl { template <> struct type_traits : public type_traits { @@ -4922,20 +4194,6 @@ template <> struct type_traits : public type_traits { }; } -class QThread; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QThread_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - class QTime; namespace tl { template <> struct type_traits : public type_traits { @@ -4956,34 +4214,6 @@ template <> struct type_traits : public type_traits { }; } -class QTimeLine; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QTimeLine_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QTimer; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QTimer_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - class QTimerEvent; namespace tl { template <> struct type_traits : public type_traits { @@ -5087,20 +4317,6 @@ template <> struct type_traits : public type_traits { }; } -class QTranslator; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QTranslator_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - class QTreeView; namespace tl { template <> struct type_traits : public type_traits { @@ -5148,13 +4364,6 @@ template <> struct type_traits : public type_traits struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - class QUndoCommand; namespace tl { template <> struct type_traits : public type_traits { @@ -5233,18 +4442,6 @@ template <> struct type_traits : public type_traits { }; } -class QUrlInfo; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QUrlInfo_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - class QVBoxLayout; namespace tl { template <> struct type_traits : public type_traits { @@ -5292,13 +4489,6 @@ template <> struct type_traits : public type_traits { }; } -class QWaitCondition; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - class QWhatsThis; namespace tl { template <> struct type_traits : public type_traits { @@ -5436,186 +4626,6 @@ template <> struct type_traits : public type_traits { }; } -class QWriteLocker; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; - typedef tl::false_tag has_default_constructor; -}; -} - -class QXmlAttributes; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QXmlAttributes_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QXmlContentHandler; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; - typedef tl::false_tag has_default_constructor; -}; -} - -class QXmlContentHandler_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QXmlDTDHandler; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; - typedef tl::false_tag has_default_constructor; -}; -} - -class QXmlDTDHandler_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QXmlDeclHandler; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; - typedef tl::false_tag has_default_constructor; -}; -} - -class QXmlDeclHandler_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QXmlDefaultHandler; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QXmlDefaultHandler_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QXmlEntityResolver; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; - typedef tl::false_tag has_default_constructor; -}; -} - -class QXmlErrorHandler; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; - typedef tl::false_tag has_default_constructor; -}; -} - -class QXmlErrorHandler_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QXmlInputSource; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QXmlInputSource_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QXmlLexicalHandler; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; - typedef tl::false_tag has_default_constructor; -}; -} - -class QXmlLexicalHandler_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QXmlLocator; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; - typedef tl::false_tag has_default_constructor; -}; -} - -class QXmlLocator_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QXmlNamespaceSupport; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QXmlParseException; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QXmlReader; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; - typedef tl::false_tag has_default_constructor; -}; -} - -class QXmlReader_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { -}; -} - -class QXmlSimpleReader; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - -class QXmlSimpleReader_Adaptor; -namespace tl { -template <> struct type_traits : public type_traits { - typedef tl::false_tag has_copy_constructor; -}; -} - class Qt_Namespace; namespace tl { template <> struct type_traits : public type_traits { diff --git a/src/gsiqt/qt4/QtGui/gsiQtExternals.h b/src/gsiqt/qt4/QtGui/gsiQtExternals.h new file mode 100644 index 000000000..b029115a1 --- /dev/null +++ b/src/gsiqt/qt4/QtGui/gsiQtExternals.h @@ -0,0 +1,1105 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2018 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + +/* + External declarations for for Qt bindings + + DO NOT EDIT THIS FILE. + This file has been created automatically +*/ + +#if !defined(HDR_gsiQtExternals) +#define HDR_gsiQtExternals + +#include "gsiClassBase.h" +#include "gsiQtGuiCommon.h" + +class QAbstractButton; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAbstractButton (); } + +class QAbstractGraphicsShapeItem; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAbstractGraphicsShapeItem (); } + +class QAbstractItemDelegate; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAbstractItemDelegate (); } + +class QAbstractItemView; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAbstractItemView (); } + +class QAbstractPageSetupDialog; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAbstractPageSetupDialog (); } + +class QAbstractPrintDialog; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAbstractPrintDialog (); } + +class QAbstractProxyModel; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAbstractProxyModel (); } + +class QAbstractScrollArea; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAbstractScrollArea (); } + +class QAbstractSlider; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAbstractSlider (); } + +class QAbstractSpinBox; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAbstractSpinBox (); } + +class QAbstractTextDocumentLayout; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAbstractTextDocumentLayout (); } + +class QAbstractUndoItem; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAbstractUndoItem (); } + +class QAccessible; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAccessible (); } + +class QAccessibleApplication; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAccessibleApplication (); } + +class QAccessibleEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAccessibleEvent (); } + +class QAccessibleInterface; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAccessibleInterface (); } + +class QAccessibleObject; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAccessibleObject (); } + +class QAccessibleWidget; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAccessibleWidget (); } + +class QAction; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QAction (); } + +class QActionEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QActionEvent (); } + +class QActionGroup; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QActionGroup (); } + +class QApplication; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QApplication (); } + +class QBitmap; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QBitmap (); } + +class QBoxLayout; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QBoxLayout (); } + +class QBrush; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QBrush (); } + +class QButtonGroup; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QButtonGroup (); } + +class QCDEStyle; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QCDEStyle (); } + +class QCalendarWidget; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QCalendarWidget (); } + +class QCheckBox; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QCheckBox (); } + +class QCleanlooksStyle; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QCleanlooksStyle (); } + +class QClipboard; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QClipboard (); } + +class QClipboardEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QClipboardEvent (); } + +class QCloseEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QCloseEvent (); } + +class QColor; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QColor (); } + +class QColorDialog; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QColorDialog (); } + +class QColormap; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QColormap (); } + +class QColumnView; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QColumnView (); } + +class QComboBox; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QComboBox (); } + +class QCommandLinkButton; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QCommandLinkButton (); } + +class QCommonStyle; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QCommonStyle (); } + +class QCompleter; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QCompleter (); } + +class QConicalGradient; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QConicalGradient (); } + +class QContextMenuEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QContextMenuEvent (); } + +class QCursor; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QCursor (); } + +class QDataWidgetMapper; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDataWidgetMapper (); } + +class QDateEdit; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDateEdit (); } + +class QDateTimeEdit; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDateTimeEdit (); } + +class QDesktopServices; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDesktopServices (); } + +class QDesktopWidget; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDesktopWidget (); } + +class QDial; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDial (); } + +class QDialog; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDialog (); } + +class QDialogButtonBox; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDialogButtonBox (); } + +class QDirIterator; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDirIterator (); } + +class QDirModel; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDirModel (); } + +class QDockWidget; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDockWidget (); } + +class QDoubleSpinBox; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDoubleSpinBox (); } + +class QDoubleValidator; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDoubleValidator (); } + +class QDrag; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDrag (); } + +class QDragEnterEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDragEnterEvent (); } + +class QDragLeaveEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDragLeaveEvent (); } + +class QDragMoveEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDragMoveEvent (); } + +class QDragResponseEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDragResponseEvent (); } + +class QDropEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QDropEvent (); } + +class QErrorMessage; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QErrorMessage (); } + +class QFileDialog; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFileDialog (); } + +class QFileIconProvider; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFileIconProvider (); } + +class QFileOpenEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFileOpenEvent (); } + +class QFileSystemModel; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFileSystemModel (); } + +class QFocusEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFocusEvent (); } + +class QFocusFrame; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFocusFrame (); } + +class QFont; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFont (); } + +class QFontComboBox; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFontComboBox (); } + +class QFontDatabase; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFontDatabase (); } + +class QFontDialog; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFontDialog (); } + +class QFontInfo; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFontInfo (); } + +class QFontMetrics; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFontMetrics (); } + +class QFontMetricsF; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFontMetricsF (); } + +class QFormLayout; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFormLayout (); } + +class QFrame; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QFrame (); } + +class QGesture; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGesture (); } + +class QGestureEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGestureEvent (); } + +class QGestureRecognizer; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGestureRecognizer (); } + +class QGradient; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGradient (); } + +class QGraphicsAnchor; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsAnchor (); } + +class QGraphicsAnchorLayout; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsAnchorLayout (); } + +class QGraphicsBlurEffect; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsBlurEffect (); } + +class QGraphicsColorizeEffect; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsColorizeEffect (); } + +class QGraphicsDropShadowEffect; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsDropShadowEffect (); } + +class QGraphicsEffect; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsEffect (); } + +class QGraphicsEllipseItem; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsEllipseItem (); } + +class QGraphicsGridLayout; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsGridLayout (); } + +class QGraphicsItem; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsItem (); } + +class QGraphicsItemAnimation; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsItemAnimation (); } + +class QGraphicsItemGroup; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsItemGroup (); } + +class QGraphicsLayout; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsLayout (); } + +class QGraphicsLayoutItem; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsLayoutItem (); } + +class QGraphicsLineItem; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsLineItem (); } + +class QGraphicsLinearLayout; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsLinearLayout (); } + +class QGraphicsObject; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsObject (); } + +class QGraphicsOpacityEffect; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsOpacityEffect (); } + +class QGraphicsPathItem; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsPathItem (); } + +class QGraphicsPixmapItem; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsPixmapItem (); } + +class QGraphicsPolygonItem; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsPolygonItem (); } + +class QGraphicsProxyWidget; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsProxyWidget (); } + +class QGraphicsRectItem; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsRectItem (); } + +class QGraphicsRotation; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsRotation (); } + +class QGraphicsScale; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsScale (); } + +class QGraphicsScene; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsScene (); } + +class QGraphicsSceneContextMenuEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsSceneContextMenuEvent (); } + +class QGraphicsSceneDragDropEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsSceneDragDropEvent (); } + +class QGraphicsSceneEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsSceneEvent (); } + +class QGraphicsSceneHelpEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsSceneHelpEvent (); } + +class QGraphicsSceneHoverEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsSceneHoverEvent (); } + +class QGraphicsSceneMouseEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsSceneMouseEvent (); } + +class QGraphicsSceneMoveEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsSceneMoveEvent (); } + +class QGraphicsSceneResizeEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsSceneResizeEvent (); } + +class QGraphicsSceneWheelEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsSceneWheelEvent (); } + +class QGraphicsSimpleTextItem; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsSimpleTextItem (); } + +class QGraphicsTextItem; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsTextItem (); } + +class QGraphicsTransform; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsTransform (); } + +class QGraphicsView; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsView (); } + +class QGraphicsWidget; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGraphicsWidget (); } + +class QGridLayout; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGridLayout (); } + +class QGroupBox; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QGroupBox (); } + +class QHBoxLayout; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QHBoxLayout (); } + +class QHeaderView; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QHeaderView (); } + +class QHelpEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QHelpEvent (); } + +class QHideEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QHideEvent (); } + +class QHoverEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QHoverEvent (); } + +class QIcon; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QIcon (); } + +class QIconDragEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QIconDragEvent (); } + +class QIconEngine; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QIconEngine (); } + +class QIconEnginePlugin; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QIconEnginePlugin (); } + +class QIconEnginePluginV2; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QIconEnginePluginV2 (); } + +class QIconEngineV2; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QIconEngineV2 (); } + +class QImage; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QImage (); } + +class QImageIOHandler; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QImageIOHandler (); } + +class QImageIOPlugin; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QImageIOPlugin (); } + +class QImageReader; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QImageReader (); } + +class QImageTextKeyLang; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QImageTextKeyLang (); } + +class QImageWriter; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QImageWriter (); } + +class QInputContext; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QInputContext (); } + +class QInputContextFactory; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QInputContextFactory (); } + +class QInputContextPlugin; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QInputContextPlugin (); } + +class QInputDialog; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QInputDialog (); } + +class QInputEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QInputEvent (); } + +class QInputMethodEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QInputMethodEvent (); } + +class QIntValidator; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QIntValidator (); } + +class QItemDelegate; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QItemDelegate (); } + +class QItemEditorCreatorBase; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QItemEditorCreatorBase (); } + +class QItemEditorFactory; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QItemEditorFactory (); } + +class QItemSelection; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QItemSelection (); } + +class QItemSelectionModel; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QItemSelectionModel (); } + +class QItemSelectionRange; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QItemSelectionRange (); } + +class QKeyEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QKeyEvent (); } + +class QKeySequence; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QKeySequence (); } + +class QLCDNumber; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QLCDNumber (); } + +class QLabel; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QLabel (); } + +class QLayout; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QLayout (); } + +class QLayoutItem; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QLayoutItem (); } + +class QLineEdit; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QLineEdit (); } + +class QLinearGradient; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QLinearGradient (); } + +class QListView; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QListView (); } + +class QListWidget; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QListWidget (); } + +class QListWidgetItem; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QListWidgetItem (); } + +class QMainWindow; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QMainWindow (); } + +class QMatrix; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QMatrix (); } + +class QMatrix4x4; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QMatrix4x4 (); } + +class QMdiArea; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QMdiArea (); } + +class QMdiSubWindow; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QMdiSubWindow (); } + +class QMenu; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QMenu (); } + +class QMenuBar; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QMenuBar (); } + +class QMessageBox; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QMessageBox (); } + +class QMimeSource; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QMimeSource (); } + +class QMotifStyle; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QMotifStyle (); } + +class QMouseEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QMouseEvent (); } + +class QMoveEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QMoveEvent (); } + +class QMovie; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QMovie (); } + +class QPageSetupDialog; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPageSetupDialog (); } + +class QPaintDevice; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPaintDevice (); } + +class QPaintEngine; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPaintEngine (); } + +class QPaintEngineState; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPaintEngineState (); } + +class QPaintEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPaintEvent (); } + +class QPainter; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPainter (); } + +class QPainterPath; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPainterPath (); } + +class QPainterPathStroker; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPainterPathStroker (); } + +class QPalette; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPalette (); } + +class QPanGesture; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPanGesture (); } + +class QPen; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPen (); } + +class QPicture; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPicture (); } + +class QPinchGesture; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPinchGesture (); } + +class QPixmap; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPixmap (); } + +class QPixmapCache; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPixmapCache (); } + +class QPlainTextDocumentLayout; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPlainTextDocumentLayout (); } + +class QPlainTextEdit; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPlainTextEdit (); } + +class QPlastiqueStyle; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPlastiqueStyle (); } + +class QPolygon; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPolygon (); } + +class QPolygonF; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPolygonF (); } + +class QPrintDialog; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPrintDialog (); } + +class QPrintEngine; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPrintEngine (); } + +class QPrintPreviewDialog; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPrintPreviewDialog (); } + +class QPrintPreviewWidget; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPrintPreviewWidget (); } + +class QPrinter; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPrinter (); } + +class QPrinterInfo; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPrinterInfo (); } + +class QProgressBar; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QProgressBar (); } + +class QProgressDialog; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QProgressDialog (); } + +class QPushButton; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QPushButton (); } + +class QQuaternion; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QQuaternion (); } + +class QRadialGradient; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QRadialGradient (); } + +class QRadioButton; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QRadioButton (); } + +class QRegExpValidator; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QRegExpValidator (); } + +class QRegion; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QRegion (); } + +class QResizeEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QResizeEvent (); } + +class QRubberBand; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QRubberBand (); } + +class QScrollArea; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QScrollArea (); } + +class QScrollBar; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QScrollBar (); } + +class QShortcut; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QShortcut (); } + +class QShortcutEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QShortcutEvent (); } + +class QShowEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QShowEvent (); } + +class QSizeGrip; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QSizeGrip (); } + +class QSizePolicy; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QSizePolicy (); } + +class QSlider; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QSlider (); } + +class QSortFilterProxyModel; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QSortFilterProxyModel (); } + +class QSound; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QSound (); } + +class QSpacerItem; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QSpacerItem (); } + +class QSpinBox; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QSpinBox (); } + +class QSplashScreen; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QSplashScreen (); } + +class QSplitter; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QSplitter (); } + +class QSplitterHandle; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QSplitterHandle (); } + +class QStackedLayout; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStackedLayout (); } + +class QStackedWidget; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStackedWidget (); } + +class QStandardItem; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStandardItem (); } + +class QStandardItemModel; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStandardItemModel (); } + +class QStatusBar; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStatusBar (); } + +class QStatusTipEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStatusTipEvent (); } + +class QStringListModel; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStringListModel (); } + +class QStyle; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyle (); } + +class QStyleFactory; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleFactory (); } + +class QStyleHintReturn; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleHintReturn (); } + +class QStyleHintReturnMask; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleHintReturnMask (); } + +class QStyleHintReturnVariant; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleHintReturnVariant (); } + +class QStyleOption; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOption (); } + +class QStyleOptionButton; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionButton (); } + +class QStyleOptionComboBox; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionComboBox (); } + +class QStyleOptionComplex; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionComplex (); } + +class QStyleOptionDockWidget; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionDockWidget (); } + +class QStyleOptionFocusRect; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionFocusRect (); } + +class QStyleOptionFrame; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionFrame (); } + +class QStyleOptionFrameV2; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionFrameV2 (); } + +class QStyleOptionFrameV3; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionFrameV3 (); } + +class QStyleOptionGraphicsItem; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionGraphicsItem (); } + +class QStyleOptionGroupBox; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionGroupBox (); } + +class QStyleOptionHeader; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionHeader (); } + +class QStyleOptionMenuItem; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionMenuItem (); } + +class QStyleOptionProgressBar; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionProgressBar (); } + +class QStyleOptionProgressBarV2; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionProgressBarV2 (); } + +class QStyleOptionQ3DockWindow; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionQ3DockWindow (); } + +class QStyleOptionQ3ListView; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionQ3ListView (); } + +class QStyleOptionQ3ListViewItem; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionQ3ListViewItem (); } + +class QStyleOptionRubberBand; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionRubberBand (); } + +class QStyleOptionSizeGrip; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionSizeGrip (); } + +class QStyleOptionSlider; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionSlider (); } + +class QStyleOptionSpinBox; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionSpinBox (); } + +class QStyleOptionTab; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionTab (); } + +class QStyleOptionTabBarBase; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionTabBarBase (); } + +class QStyleOptionTabBarBaseV2; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionTabBarBaseV2 (); } + +class QStyleOptionTabV2; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionTabV2 (); } + +class QStyleOptionTabV3; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionTabV3 (); } + +class QStyleOptionTabWidgetFrame; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionTabWidgetFrame (); } + +class QStyleOptionTitleBar; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionTitleBar (); } + +class QStyleOptionToolBar; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionToolBar (); } + +class QStyleOptionToolBox; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionToolBox (); } + +class QStyleOptionToolBoxV2; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionToolBoxV2 (); } + +class QStyleOptionToolButton; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionToolButton (); } + +class QStyleOptionViewItem; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionViewItem (); } + +class QStyleOptionViewItemV2; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionViewItemV2 (); } + +class QStyleOptionViewItemV3; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionViewItemV3 (); } + +class QStyleOptionViewItemV4; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyleOptionViewItemV4 (); } + +class QStylePainter; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStylePainter (); } + +class QStylePlugin; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStylePlugin (); } + +class QStyledItemDelegate; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QStyledItemDelegate (); } + +class QSwipeGesture; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QSwipeGesture (); } + +class QSyntaxHighlighter; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QSyntaxHighlighter (); } + +class QSystemTrayIcon; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QSystemTrayIcon (); } + +class QTabBar; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTabBar (); } + +class QTabWidget; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTabWidget (); } + +class QTableView; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTableView (); } + +class QTableWidget; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTableWidget (); } + +class QTableWidgetItem; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTableWidgetItem (); } + +class QTableWidgetSelectionRange; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTableWidgetSelectionRange (); } + +class QTabletEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTabletEvent (); } + +class QTapAndHoldGesture; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTapAndHoldGesture (); } + +class QTapGesture; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTapGesture (); } + +class QTextBlock; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextBlock (); } + +class QTextBlockFormat; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextBlockFormat (); } + +class QTextBlockGroup; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextBlockGroup (); } + +class QTextBlockUserData; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextBlockUserData (); } + +class QTextBrowser; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextBrowser (); } + +class QTextCharFormat; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextCharFormat (); } + +class QTextCursor; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextCursor (); } + +class QTextDocument; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextDocument (); } + +class QTextDocumentFragment; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextDocumentFragment (); } + +class QTextDocumentWriter; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextDocumentWriter (); } + +class QTextEdit; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextEdit (); } + +class QTextFormat; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextFormat (); } + +class QTextFragment; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextFragment (); } + +class QTextFrame; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextFrame (); } + +class QTextFrameFormat; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextFrameFormat (); } + +class QTextImageFormat; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextImageFormat (); } + +class QTextInlineObject; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextInlineObject (); } + +class QTextItem; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextItem (); } + +class QTextLayout; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextLayout (); } + +class QTextLength; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextLength (); } + +class QTextLine; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextLine (); } + +class QTextList; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextList (); } + +class QTextListFormat; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextListFormat (); } + +class QTextObject; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextObject (); } + +class QTextObjectInterface; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextObjectInterface (); } + +class QTextOption; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextOption (); } + +class QTextTable; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextTable (); } + +class QTextTableCell; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextTableCell (); } + +class QTextTableCellFormat; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextTableCellFormat (); } + +class QTextTableFormat; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTextTableFormat (); } + +class QTimeEdit; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTimeEdit (); } + +class QToolBar; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QToolBar (); } + +class QToolBarChangeEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QToolBarChangeEvent (); } + +class QToolBox; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QToolBox (); } + +class QToolButton; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QToolButton (); } + +class QToolTip; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QToolTip (); } + +class QTouchEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTouchEvent (); } + +class QTransform; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTransform (); } + +class QTreeView; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTreeView (); } + +class QTreeWidget; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTreeWidget (); } + +class QTreeWidgetItem; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTreeWidgetItem (); } + +class QTreeWidgetItemIterator; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QTreeWidgetItemIterator (); } + +class QUndoCommand; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QUndoCommand (); } + +class QUndoGroup; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QUndoGroup (); } + +class QUndoStack; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QUndoStack (); } + +class QUndoView; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QUndoView (); } + +class QUnixPrintWidget; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QUnixPrintWidget (); } + +class QVBoxLayout; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QVBoxLayout (); } + +class QValidator; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QValidator (); } + +class QVector2D; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QVector2D (); } + +class QVector3D; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QVector3D (); } + +class QVector4D; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QVector4D (); } + +class QWhatsThis; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QWhatsThis (); } + +class QWhatsThisClickedEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QWhatsThisClickedEvent (); } + +class QWheelEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QWheelEvent (); } + +class QWidget; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QWidget (); } + +class QWidgetAction; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QWidgetAction (); } + +class QWidgetItem; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QWidgetItem (); } + +class QWindowStateChangeEvent; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QWindowStateChangeEvent (); } + +class QWindowsStyle; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QWindowsStyle (); } + +class QWizard; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QWizard (); } + +class QWizardPage; +namespace gsi { GSI_QTGUI_PUBLIC gsi::Class &qtdecl_QWizardPage (); } + + +#define QT_EXTERNAL_BASE(X) gsi::qtdecl_##X(), + +#endif + diff --git a/src/gsiqt/gsiQtExternals.h b/src/gsiqt/qt4/QtGui/gsiQtGuiCommon.h similarity index 62% rename from src/gsiqt/gsiQtExternals.h rename to src/gsiqt/qt4/QtGui/gsiQtGuiCommon.h index 2eb798529..e8b3cc077 100644 --- a/src/gsiqt/gsiQtExternals.h +++ b/src/gsiqt/qt4/QtGui/gsiQtGuiCommon.h @@ -20,21 +20,20 @@ */ -#ifndef _HDR_gsiQtExternalsWrapper -#define _HDR_gsiQtExternalsWrapper -#if defined(HAVE_QTBINDINGS) +#include "tlDefs.h" -#if QT_VERSION >= 0x050000 -# include "../gsiqt5/gsiQtExternals.h" -#else -# include "../gsiqt4/gsiQtExternals.h" -#endif +#if !defined(HDR_gsiQtGuiCommon_h) +# define HDR_gsiQtGuiCommon_h -#else - -#define QT_EXTERNAL_BASE(X) - -#endif +# ifdef MAKE_GSI_QTGUI_LIBRARY +# define GSI_QTGUI_PUBLIC DEF_INSIDE_PUBLIC +# define GSI_QTGUI_PUBLIC_TEMPLATE DEF_INSIDE_PUBLIC_TEMPLATE +# define GSI_QTGUI_LOCAL DEF_INSIDE_LOCAL +# else +# define GSI_QTGUI_PUBLIC DEF_OUTSIDE_PUBLIC +# define GSI_QTGUI_PUBLIC_TEMPLATE DEF_OUTSIDE_PUBLIC_TEMPLATE +# define GSI_QTGUI_LOCAL DEF_OUTSIDE_LOCAL +# endif #endif diff --git a/src/gsiqt/qt4/QtNetwork/QtNetwork.pri b/src/gsiqt/qt4/QtNetwork/QtNetwork.pri new file mode 100644 index 000000000..137c26be6 --- /dev/null +++ b/src/gsiqt/qt4/QtNetwork/QtNetwork.pri @@ -0,0 +1,40 @@ +# +# Partial QMAKE project file for Qt bindings +# +# DO NOT EDIT THIS FILE. +# This file has been created automatically +# + +SOURCES += \ + $$PWD/gsiDeclQAbstractNetworkCache.cc \ + $$PWD/gsiDeclQAbstractSocket.cc \ + $$PWD/gsiDeclQAuthenticator.cc \ + $$PWD/gsiDeclQFtp.cc \ + $$PWD/gsiDeclQHostAddress.cc \ + $$PWD/gsiDeclQHostInfo.cc \ + $$PWD/gsiDeclQIPv6Address.cc \ + $$PWD/gsiDeclQLocalServer.cc \ + $$PWD/gsiDeclQLocalSocket.cc \ + $$PWD/gsiDeclQNetworkAccessManager.cc \ + $$PWD/gsiDeclQNetworkAddressEntry.cc \ + $$PWD/gsiDeclQNetworkCacheMetaData.cc \ + $$PWD/gsiDeclQNetworkCookie.cc \ + $$PWD/gsiDeclQNetworkCookieJar.cc \ + $$PWD/gsiDeclQNetworkDiskCache.cc \ + $$PWD/gsiDeclQNetworkInterface.cc \ + $$PWD/gsiDeclQNetworkProxy.cc \ + $$PWD/gsiDeclQNetworkProxyFactory.cc \ + $$PWD/gsiDeclQNetworkProxyQuery.cc \ + $$PWD/gsiDeclQNetworkReply.cc \ + $$PWD/gsiDeclQNetworkRequest.cc \ + $$PWD/gsiDeclQSsl.cc \ + $$PWD/gsiDeclQSslCertificate.cc \ + $$PWD/gsiDeclQSslCipher.cc \ + $$PWD/gsiDeclQSslConfiguration.cc \ + $$PWD/gsiDeclQSslError.cc \ + $$PWD/gsiDeclQSslKey.cc \ + $$PWD/gsiDeclQSslSocket.cc \ + $$PWD/gsiDeclQTcpServer.cc \ + $$PWD/gsiDeclQTcpSocket.cc \ + $$PWD/gsiDeclQUdpSocket.cc \ + $$PWD/gsiDeclQUrlInfo.cc diff --git a/src/gsiqt/qt4/QtNetwork/QtNetwork.pro b/src/gsiqt/qt4/QtNetwork/QtNetwork.pro new file mode 100644 index 000000000..f4619c824 --- /dev/null +++ b/src/gsiqt/qt4/QtNetwork/QtNetwork.pro @@ -0,0 +1,20 @@ + + +DESTDIR = $$OUT_PWD/../../.. +TARGET = klayout_QtNetwork + +include($$PWD/../../../lib.pri) + +DEFINES += MAKE_GSI_QTNETWORK_LIBRARY + +INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC +DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC + +LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic + +SOURCES += \ + +HEADERS += \ + +include(QtNetwork.pri) + diff --git a/src/gsiqt4/gsiDeclQAbstractNetworkCache.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQAbstractNetworkCache.cc similarity index 96% rename from src/gsiqt4/gsiDeclQAbstractNetworkCache.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQAbstractNetworkCache.cc index 1dfbec369..8a2618ed5 100644 --- a/src/gsiqt4/gsiDeclQAbstractNetworkCache.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQAbstractNetworkCache.cc @@ -37,8 +37,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -322,11 +322,11 @@ static gsi::Methods methods_QAbstractNetworkCache () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QAbstractNetworkCache (qtdecl_QObject (), "QAbstractNetworkCache_Native", +qt_gsi::QtNativeClass decl_QAbstractNetworkCache (qtdecl_QObject (), "QtNetwork", "QAbstractNetworkCache_Native", methods_QAbstractNetworkCache (), "@hide\n@alias QAbstractNetworkCache"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractNetworkCache () { return decl_QAbstractNetworkCache; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QAbstractNetworkCache () { return decl_QAbstractNetworkCache; } } @@ -337,6 +337,12 @@ public: virtual ~QAbstractNetworkCache_Adaptor(); + // [adaptor ctor] QAbstractNetworkCache::QAbstractNetworkCache() + QAbstractNetworkCache_Adaptor() : QAbstractNetworkCache() + { + qt_gsi::QtObjectBase::init (this); + } + // [expose] int QAbstractNetworkCache::receivers(const char *signal) int fp_QAbstractNetworkCache_receivers_c1731 (const char *signal) const { return QAbstractNetworkCache::receivers(signal); @@ -587,6 +593,20 @@ public: QAbstractNetworkCache_Adaptor::~QAbstractNetworkCache_Adaptor() { } +// Constructor QAbstractNetworkCache::QAbstractNetworkCache() (adaptor class) + +static void _init_ctor_QAbstractNetworkCache_Adaptor_0 (qt_gsi::GenericStaticMethod *decl) +{ + decl->set_return_new (); +} + +static void _call_ctor_QAbstractNetworkCache_Adaptor_0 (const qt_gsi::GenericStaticMethod * /*decl*/, gsi::SerialArgs &args, gsi::SerialArgs &ret) +{ + __SUPPRESS_UNUSED_WARNING(args); + ret.write (new QAbstractNetworkCache_Adaptor ()); +} + + // qint64 QAbstractNetworkCache::cacheSize() static void _init_cbs_cacheSize_c0_0 (qt_gsi::GenericMethod *decl) @@ -968,6 +988,7 @@ gsi::Class &qtdecl_QAbstractNetworkCache (); static gsi::Methods methods_QAbstractNetworkCache_Adaptor () { gsi::Methods methods; + methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QAbstractNetworkCache::QAbstractNetworkCache()\nThis method creates an object of class QAbstractNetworkCache.", &_init_ctor_QAbstractNetworkCache_Adaptor_0, &_call_ctor_QAbstractNetworkCache_Adaptor_0); methods += new qt_gsi::GenericMethod ("cacheSize", "@hide", true, &_init_cbs_cacheSize_c0_0, &_call_cbs_cacheSize_c0_0); methods += new qt_gsi::GenericMethod ("cacheSize", "@brief Virtual method qint64 QAbstractNetworkCache::cacheSize()\nThis method can be reimplemented in a derived class.", true, &_init_cbs_cacheSize_c0_0, &_call_cbs_cacheSize_c0_0, &_set_callback_cbs_cacheSize_c0_0); methods += new qt_gsi::GenericMethod ("*childEvent", "@hide", false, &_init_cbs_childEvent_1701_0, &_call_cbs_childEvent_1701_0); @@ -1002,7 +1023,7 @@ static gsi::Methods methods_QAbstractNetworkCache_Adaptor () { return methods; } -gsi::Class decl_QAbstractNetworkCache_Adaptor (qtdecl_QAbstractNetworkCache (), "QAbstractNetworkCache", +gsi::Class decl_QAbstractNetworkCache_Adaptor (qtdecl_QAbstractNetworkCache (), "QtNetwork", "QAbstractNetworkCache", methods_QAbstractNetworkCache_Adaptor (), "@qt\n@brief Binding of QAbstractNetworkCache"); diff --git a/src/gsiqt4/gsiDeclQAbstractSocket.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQAbstractSocket.cc similarity index 96% rename from src/gsiqt4/gsiDeclQAbstractSocket.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQAbstractSocket.cc index 782b1d0f9..c825166d3 100644 --- a/src/gsiqt4/gsiDeclQAbstractSocket.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQAbstractSocket.cc @@ -37,8 +37,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -786,12 +786,12 @@ static gsi::Methods methods_QAbstractSocket () { gsi::Class &qtdecl_QIODevice (); -qt_gsi::QtNativeClass decl_QAbstractSocket (qtdecl_QIODevice (), "QAbstractSocket", +qt_gsi::QtNativeClass decl_QAbstractSocket (qtdecl_QIODevice (), "QtNetwork", "QAbstractSocket", methods_QAbstractSocket (), "@qt\n@brief Binding of QAbstractSocket"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractSocket () { return decl_QAbstractSocket; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QAbstractSocket () { return decl_QAbstractSocket; } } @@ -800,19 +800,19 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractSocket () { return dec namespace qt_gsi { -static gsi::Enum decl_QAbstractSocket_NetworkLayerProtocol_Enum ("QAbstractSocket_NetworkLayerProtocol", +static gsi::Enum decl_QAbstractSocket_NetworkLayerProtocol_Enum ("QtNetwork", "QAbstractSocket_NetworkLayerProtocol", gsi::enum_const ("IPv4Protocol", QAbstractSocket::IPv4Protocol, "@brief Enum constant QAbstractSocket::IPv4Protocol") + gsi::enum_const ("IPv6Protocol", QAbstractSocket::IPv6Protocol, "@brief Enum constant QAbstractSocket::IPv6Protocol") + gsi::enum_const ("UnknownNetworkLayerProtocol", QAbstractSocket::UnknownNetworkLayerProtocol, "@brief Enum constant QAbstractSocket::UnknownNetworkLayerProtocol"), "@qt\n@brief This class represents the QAbstractSocket::NetworkLayerProtocol enum"); -static gsi::QFlagsClass decl_QAbstractSocket_NetworkLayerProtocol_Enums ("QAbstractSocket_QFlags_NetworkLayerProtocol", +static gsi::QFlagsClass decl_QAbstractSocket_NetworkLayerProtocol_Enums ("QtNetwork", "QAbstractSocket_QFlags_NetworkLayerProtocol", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAbstractSocket_NetworkLayerProtocol_Enum_in_parent (decl_QAbstractSocket_NetworkLayerProtocol_Enum.defs ()); -static gsi::ClassExt decl_QAbstractSocket_NetworkLayerProtocol_Enum_as_child (decl_QAbstractSocket_NetworkLayerProtocol_Enum, "NetworkLayerProtocol"); -static gsi::ClassExt decl_QAbstractSocket_NetworkLayerProtocol_Enums_as_child (decl_QAbstractSocket_NetworkLayerProtocol_Enums, "QFlags_NetworkLayerProtocol"); +static gsi::ClassExt decl_QAbstractSocket_NetworkLayerProtocol_Enum_as_child (decl_QAbstractSocket_NetworkLayerProtocol_Enum, "QtNetwork", "NetworkLayerProtocol"); +static gsi::ClassExt decl_QAbstractSocket_NetworkLayerProtocol_Enums_as_child (decl_QAbstractSocket_NetworkLayerProtocol_Enums, "QtNetwork", "QFlags_NetworkLayerProtocol"); } @@ -821,7 +821,7 @@ static gsi::ClassExt decl_QAbstractSocket_NetworkLayerProtocol_ namespace qt_gsi { -static gsi::Enum decl_QAbstractSocket_SocketError_Enum ("QAbstractSocket_SocketError", +static gsi::Enum decl_QAbstractSocket_SocketError_Enum ("QtNetwork", "QAbstractSocket_SocketError", gsi::enum_const ("ConnectionRefusedError", QAbstractSocket::ConnectionRefusedError, "@brief Enum constant QAbstractSocket::ConnectionRefusedError") + gsi::enum_const ("RemoteHostClosedError", QAbstractSocket::RemoteHostClosedError, "@brief Enum constant QAbstractSocket::RemoteHostClosedError") + gsi::enum_const ("HostNotFoundError", QAbstractSocket::HostNotFoundError, "@brief Enum constant QAbstractSocket::HostNotFoundError") + @@ -844,13 +844,13 @@ static gsi::Enum decl_QAbstractSocket_SocketError_ gsi::enum_const ("UnknownSocketError", QAbstractSocket::UnknownSocketError, "@brief Enum constant QAbstractSocket::UnknownSocketError"), "@qt\n@brief This class represents the QAbstractSocket::SocketError enum"); -static gsi::QFlagsClass decl_QAbstractSocket_SocketError_Enums ("QAbstractSocket_QFlags_SocketError", +static gsi::QFlagsClass decl_QAbstractSocket_SocketError_Enums ("QtNetwork", "QAbstractSocket_QFlags_SocketError", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAbstractSocket_SocketError_Enum_in_parent (decl_QAbstractSocket_SocketError_Enum.defs ()); -static gsi::ClassExt decl_QAbstractSocket_SocketError_Enum_as_child (decl_QAbstractSocket_SocketError_Enum, "SocketError"); -static gsi::ClassExt decl_QAbstractSocket_SocketError_Enums_as_child (decl_QAbstractSocket_SocketError_Enums, "QFlags_SocketError"); +static gsi::ClassExt decl_QAbstractSocket_SocketError_Enum_as_child (decl_QAbstractSocket_SocketError_Enum, "QtNetwork", "SocketError"); +static gsi::ClassExt decl_QAbstractSocket_SocketError_Enums_as_child (decl_QAbstractSocket_SocketError_Enums, "QtNetwork", "QFlags_SocketError"); } @@ -859,18 +859,18 @@ static gsi::ClassExt decl_QAbstractSocket_SocketError_Enums_as_ namespace qt_gsi { -static gsi::Enum decl_QAbstractSocket_SocketOption_Enum ("QAbstractSocket_SocketOption", +static gsi::Enum decl_QAbstractSocket_SocketOption_Enum ("QtNetwork", "QAbstractSocket_SocketOption", gsi::enum_const ("LowDelayOption", QAbstractSocket::LowDelayOption, "@brief Enum constant QAbstractSocket::LowDelayOption") + gsi::enum_const ("KeepAliveOption", QAbstractSocket::KeepAliveOption, "@brief Enum constant QAbstractSocket::KeepAliveOption"), "@qt\n@brief This class represents the QAbstractSocket::SocketOption enum"); -static gsi::QFlagsClass decl_QAbstractSocket_SocketOption_Enums ("QAbstractSocket_QFlags_SocketOption", +static gsi::QFlagsClass decl_QAbstractSocket_SocketOption_Enums ("QtNetwork", "QAbstractSocket_QFlags_SocketOption", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAbstractSocket_SocketOption_Enum_in_parent (decl_QAbstractSocket_SocketOption_Enum.defs ()); -static gsi::ClassExt decl_QAbstractSocket_SocketOption_Enum_as_child (decl_QAbstractSocket_SocketOption_Enum, "SocketOption"); -static gsi::ClassExt decl_QAbstractSocket_SocketOption_Enums_as_child (decl_QAbstractSocket_SocketOption_Enums, "QFlags_SocketOption"); +static gsi::ClassExt decl_QAbstractSocket_SocketOption_Enum_as_child (decl_QAbstractSocket_SocketOption_Enum, "QtNetwork", "SocketOption"); +static gsi::ClassExt decl_QAbstractSocket_SocketOption_Enums_as_child (decl_QAbstractSocket_SocketOption_Enums, "QtNetwork", "QFlags_SocketOption"); } @@ -879,7 +879,7 @@ static gsi::ClassExt decl_QAbstractSocket_SocketOption_Enums_as namespace qt_gsi { -static gsi::Enum decl_QAbstractSocket_SocketState_Enum ("QAbstractSocket_SocketState", +static gsi::Enum decl_QAbstractSocket_SocketState_Enum ("QtNetwork", "QAbstractSocket_SocketState", gsi::enum_const ("UnconnectedState", QAbstractSocket::UnconnectedState, "@brief Enum constant QAbstractSocket::UnconnectedState") + gsi::enum_const ("HostLookupState", QAbstractSocket::HostLookupState, "@brief Enum constant QAbstractSocket::HostLookupState") + gsi::enum_const ("ConnectingState", QAbstractSocket::ConnectingState, "@brief Enum constant QAbstractSocket::ConnectingState") + @@ -889,13 +889,13 @@ static gsi::Enum decl_QAbstractSocket_SocketState_ gsi::enum_const ("ClosingState", QAbstractSocket::ClosingState, "@brief Enum constant QAbstractSocket::ClosingState"), "@qt\n@brief This class represents the QAbstractSocket::SocketState enum"); -static gsi::QFlagsClass decl_QAbstractSocket_SocketState_Enums ("QAbstractSocket_QFlags_SocketState", +static gsi::QFlagsClass decl_QAbstractSocket_SocketState_Enums ("QtNetwork", "QAbstractSocket_QFlags_SocketState", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAbstractSocket_SocketState_Enum_in_parent (decl_QAbstractSocket_SocketState_Enum.defs ()); -static gsi::ClassExt decl_QAbstractSocket_SocketState_Enum_as_child (decl_QAbstractSocket_SocketState_Enum, "SocketState"); -static gsi::ClassExt decl_QAbstractSocket_SocketState_Enums_as_child (decl_QAbstractSocket_SocketState_Enums, "QFlags_SocketState"); +static gsi::ClassExt decl_QAbstractSocket_SocketState_Enum_as_child (decl_QAbstractSocket_SocketState_Enum, "QtNetwork", "SocketState"); +static gsi::ClassExt decl_QAbstractSocket_SocketState_Enums_as_child (decl_QAbstractSocket_SocketState_Enums, "QtNetwork", "QFlags_SocketState"); } @@ -904,19 +904,19 @@ static gsi::ClassExt decl_QAbstractSocket_SocketState_Enums_as_ namespace qt_gsi { -static gsi::Enum decl_QAbstractSocket_SocketType_Enum ("QAbstractSocket_SocketType", +static gsi::Enum decl_QAbstractSocket_SocketType_Enum ("QtNetwork", "QAbstractSocket_SocketType", gsi::enum_const ("TcpSocket", QAbstractSocket::TcpSocket, "@brief Enum constant QAbstractSocket::TcpSocket") + gsi::enum_const ("UdpSocket", QAbstractSocket::UdpSocket, "@brief Enum constant QAbstractSocket::UdpSocket") + gsi::enum_const ("UnknownSocketType", QAbstractSocket::UnknownSocketType, "@brief Enum constant QAbstractSocket::UnknownSocketType"), "@qt\n@brief This class represents the QAbstractSocket::SocketType enum"); -static gsi::QFlagsClass decl_QAbstractSocket_SocketType_Enums ("QAbstractSocket_QFlags_SocketType", +static gsi::QFlagsClass decl_QAbstractSocket_SocketType_Enums ("QtNetwork", "QAbstractSocket_QFlags_SocketType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QAbstractSocket_SocketType_Enum_in_parent (decl_QAbstractSocket_SocketType_Enum.defs ()); -static gsi::ClassExt decl_QAbstractSocket_SocketType_Enum_as_child (decl_QAbstractSocket_SocketType_Enum, "SocketType"); -static gsi::ClassExt decl_QAbstractSocket_SocketType_Enums_as_child (decl_QAbstractSocket_SocketType_Enums, "QFlags_SocketType"); +static gsi::ClassExt decl_QAbstractSocket_SocketType_Enum_as_child (decl_QAbstractSocket_SocketType_Enum, "QtNetwork", "SocketType"); +static gsi::ClassExt decl_QAbstractSocket_SocketType_Enums_as_child (decl_QAbstractSocket_SocketType_Enums, "QtNetwork", "QFlags_SocketType"); } diff --git a/src/gsiqt4/gsiDeclQAuthenticator.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQAuthenticator.cc similarity index 97% rename from src/gsiqt4/gsiDeclQAuthenticator.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQAuthenticator.cc index cac2c11b3..c8479763b 100644 --- a/src/gsiqt4/gsiDeclQAuthenticator.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQAuthenticator.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -264,12 +264,12 @@ static gsi::Methods methods_QAuthenticator () { return methods; } -gsi::Class decl_QAuthenticator ("QAuthenticator", +gsi::Class decl_QAuthenticator ("QtNetwork", "QAuthenticator", methods_QAuthenticator (), "@qt\n@brief Binding of QAuthenticator"); -GSIQT_PUBLIC gsi::Class &qtdecl_QAuthenticator () { return decl_QAuthenticator; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QAuthenticator () { return decl_QAuthenticator; } } diff --git a/src/gsiqt4/gsiDeclQFtp.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQFtp.cc similarity index 97% rename from src/gsiqt4/gsiDeclQFtp.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQFtp.cc index 8eb366836..6bef89450 100644 --- a/src/gsiqt4/gsiDeclQFtp.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQFtp.cc @@ -36,8 +36,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -678,11 +678,11 @@ static gsi::Methods methods_QFtp () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QFtp (qtdecl_QObject (), "QFtp_Native", +qt_gsi::QtNativeClass decl_QFtp (qtdecl_QObject (), "QtNetwork", "QFtp_Native", methods_QFtp (), "@hide\n@alias QFtp"); -GSIQT_PUBLIC gsi::Class &qtdecl_QFtp () { return decl_QFtp; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QFtp () { return decl_QFtp; } } @@ -1265,7 +1265,7 @@ static gsi::Methods methods_QFtp_Adaptor () { return methods; } -gsi::Class decl_QFtp_Adaptor (qtdecl_QFtp (), "QFtp", +gsi::Class decl_QFtp_Adaptor (qtdecl_QFtp (), "QtNetwork", "QFtp", methods_QFtp_Adaptor (), "@qt\n@brief Binding of QFtp"); @@ -1276,7 +1276,7 @@ gsi::Class decl_QFtp_Adaptor (qtdecl_QFtp (), "QFtp", namespace qt_gsi { -static gsi::Enum decl_QFtp_Command_Enum ("QFtp_Command", +static gsi::Enum decl_QFtp_Command_Enum ("QtNetwork", "QFtp_Command", gsi::enum_const ("None", QFtp::None, "@brief Enum constant QFtp::None") + gsi::enum_const ("SetTransferMode", QFtp::SetTransferMode, "@brief Enum constant QFtp::SetTransferMode") + gsi::enum_const ("SetProxy", QFtp::SetProxy, "@brief Enum constant QFtp::SetProxy") + @@ -1294,13 +1294,13 @@ static gsi::Enum decl_QFtp_Command_Enum ("QFtp_Command", gsi::enum_const ("RawCommand", QFtp::RawCommand, "@brief Enum constant QFtp::RawCommand"), "@qt\n@brief This class represents the QFtp::Command enum"); -static gsi::QFlagsClass decl_QFtp_Command_Enums ("QFtp_QFlags_Command", +static gsi::QFlagsClass decl_QFtp_Command_Enums ("QtNetwork", "QFtp_QFlags_Command", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QFtp_Command_Enum_in_parent (decl_QFtp_Command_Enum.defs ()); -static gsi::ClassExt decl_QFtp_Command_Enum_as_child (decl_QFtp_Command_Enum, "Command"); -static gsi::ClassExt decl_QFtp_Command_Enums_as_child (decl_QFtp_Command_Enums, "QFlags_Command"); +static gsi::ClassExt decl_QFtp_Command_Enum_as_child (decl_QFtp_Command_Enum, "QtNetwork", "Command"); +static gsi::ClassExt decl_QFtp_Command_Enums_as_child (decl_QFtp_Command_Enums, "QtNetwork", "QFlags_Command"); } @@ -1309,7 +1309,7 @@ static gsi::ClassExt decl_QFtp_Command_Enums_as_child (decl_QFtp_Command_E namespace qt_gsi { -static gsi::Enum decl_QFtp_Error_Enum ("QFtp_Error", +static gsi::Enum decl_QFtp_Error_Enum ("QtNetwork", "QFtp_Error", gsi::enum_const ("NoError", QFtp::NoError, "@brief Enum constant QFtp::NoError") + gsi::enum_const ("UnknownError", QFtp::UnknownError, "@brief Enum constant QFtp::UnknownError") + gsi::enum_const ("HostNotFound", QFtp::HostNotFound, "@brief Enum constant QFtp::HostNotFound") + @@ -1317,13 +1317,13 @@ static gsi::Enum decl_QFtp_Error_Enum ("QFtp_Error", gsi::enum_const ("NotConnected", QFtp::NotConnected, "@brief Enum constant QFtp::NotConnected"), "@qt\n@brief This class represents the QFtp::Error enum"); -static gsi::QFlagsClass decl_QFtp_Error_Enums ("QFtp_QFlags_Error", +static gsi::QFlagsClass decl_QFtp_Error_Enums ("QtNetwork", "QFtp_QFlags_Error", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QFtp_Error_Enum_in_parent (decl_QFtp_Error_Enum.defs ()); -static gsi::ClassExt decl_QFtp_Error_Enum_as_child (decl_QFtp_Error_Enum, "Error"); -static gsi::ClassExt decl_QFtp_Error_Enums_as_child (decl_QFtp_Error_Enums, "QFlags_Error"); +static gsi::ClassExt decl_QFtp_Error_Enum_as_child (decl_QFtp_Error_Enum, "QtNetwork", "Error"); +static gsi::ClassExt decl_QFtp_Error_Enums_as_child (decl_QFtp_Error_Enums, "QtNetwork", "QFlags_Error"); } @@ -1332,7 +1332,7 @@ static gsi::ClassExt decl_QFtp_Error_Enums_as_child (decl_QFtp_Error_Enums namespace qt_gsi { -static gsi::Enum decl_QFtp_State_Enum ("QFtp_State", +static gsi::Enum decl_QFtp_State_Enum ("QtNetwork", "QFtp_State", gsi::enum_const ("Unconnected", QFtp::Unconnected, "@brief Enum constant QFtp::Unconnected") + gsi::enum_const ("HostLookup", QFtp::HostLookup, "@brief Enum constant QFtp::HostLookup") + gsi::enum_const ("Connecting", QFtp::Connecting, "@brief Enum constant QFtp::Connecting") + @@ -1341,13 +1341,13 @@ static gsi::Enum decl_QFtp_State_Enum ("QFtp_State", gsi::enum_const ("Closing", QFtp::Closing, "@brief Enum constant QFtp::Closing"), "@qt\n@brief This class represents the QFtp::State enum"); -static gsi::QFlagsClass decl_QFtp_State_Enums ("QFtp_QFlags_State", +static gsi::QFlagsClass decl_QFtp_State_Enums ("QtNetwork", "QFtp_QFlags_State", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QFtp_State_Enum_in_parent (decl_QFtp_State_Enum.defs ()); -static gsi::ClassExt decl_QFtp_State_Enum_as_child (decl_QFtp_State_Enum, "State"); -static gsi::ClassExt decl_QFtp_State_Enums_as_child (decl_QFtp_State_Enums, "QFlags_State"); +static gsi::ClassExt decl_QFtp_State_Enum_as_child (decl_QFtp_State_Enum, "QtNetwork", "State"); +static gsi::ClassExt decl_QFtp_State_Enums_as_child (decl_QFtp_State_Enums, "QtNetwork", "QFlags_State"); } @@ -1356,18 +1356,18 @@ static gsi::ClassExt decl_QFtp_State_Enums_as_child (decl_QFtp_State_Enums namespace qt_gsi { -static gsi::Enum decl_QFtp_TransferMode_Enum ("QFtp_TransferMode", +static gsi::Enum decl_QFtp_TransferMode_Enum ("QtNetwork", "QFtp_TransferMode", gsi::enum_const ("Active", QFtp::Active, "@brief Enum constant QFtp::Active") + gsi::enum_const ("Passive", QFtp::Passive, "@brief Enum constant QFtp::Passive"), "@qt\n@brief This class represents the QFtp::TransferMode enum"); -static gsi::QFlagsClass decl_QFtp_TransferMode_Enums ("QFtp_QFlags_TransferMode", +static gsi::QFlagsClass decl_QFtp_TransferMode_Enums ("QtNetwork", "QFtp_QFlags_TransferMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QFtp_TransferMode_Enum_in_parent (decl_QFtp_TransferMode_Enum.defs ()); -static gsi::ClassExt decl_QFtp_TransferMode_Enum_as_child (decl_QFtp_TransferMode_Enum, "TransferMode"); -static gsi::ClassExt decl_QFtp_TransferMode_Enums_as_child (decl_QFtp_TransferMode_Enums, "QFlags_TransferMode"); +static gsi::ClassExt decl_QFtp_TransferMode_Enum_as_child (decl_QFtp_TransferMode_Enum, "QtNetwork", "TransferMode"); +static gsi::ClassExt decl_QFtp_TransferMode_Enums_as_child (decl_QFtp_TransferMode_Enums, "QtNetwork", "QFlags_TransferMode"); } @@ -1376,18 +1376,18 @@ static gsi::ClassExt decl_QFtp_TransferMode_Enums_as_child (decl_QFtp_Tran namespace qt_gsi { -static gsi::Enum decl_QFtp_TransferType_Enum ("QFtp_TransferType", +static gsi::Enum decl_QFtp_TransferType_Enum ("QtNetwork", "QFtp_TransferType", gsi::enum_const ("Binary", QFtp::Binary, "@brief Enum constant QFtp::Binary") + gsi::enum_const ("Ascii", QFtp::Ascii, "@brief Enum constant QFtp::Ascii"), "@qt\n@brief This class represents the QFtp::TransferType enum"); -static gsi::QFlagsClass decl_QFtp_TransferType_Enums ("QFtp_QFlags_TransferType", +static gsi::QFlagsClass decl_QFtp_TransferType_Enums ("QtNetwork", "QFtp_QFlags_TransferType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QFtp_TransferType_Enum_in_parent (decl_QFtp_TransferType_Enum.defs ()); -static gsi::ClassExt decl_QFtp_TransferType_Enum_as_child (decl_QFtp_TransferType_Enum, "TransferType"); -static gsi::ClassExt decl_QFtp_TransferType_Enums_as_child (decl_QFtp_TransferType_Enums, "QFlags_TransferType"); +static gsi::ClassExt decl_QFtp_TransferType_Enum_as_child (decl_QFtp_TransferType_Enum, "QtNetwork", "TransferType"); +static gsi::ClassExt decl_QFtp_TransferType_Enums_as_child (decl_QFtp_TransferType_Enums, "QtNetwork", "QFlags_TransferType"); } diff --git a/src/gsiqt4/gsiDeclQHostAddress.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQHostAddress.cc similarity index 97% rename from src/gsiqt4/gsiDeclQHostAddress.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQHostAddress.cc index 1b64f9cb4..6a113fe90 100644 --- a/src/gsiqt4/gsiDeclQHostAddress.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQHostAddress.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -483,12 +483,12 @@ static gsi::Methods methods_QHostAddress () { return methods; } -gsi::Class decl_QHostAddress ("QHostAddress", +gsi::Class decl_QHostAddress ("QtNetwork", "QHostAddress", methods_QHostAddress (), "@qt\n@brief Binding of QHostAddress"); -GSIQT_PUBLIC gsi::Class &qtdecl_QHostAddress () { return decl_QHostAddress; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QHostAddress () { return decl_QHostAddress; } } @@ -497,7 +497,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QHostAddress () { return decl_QHos namespace qt_gsi { -static gsi::Enum decl_QHostAddress_SpecialAddress_Enum ("QHostAddress_SpecialAddress", +static gsi::Enum decl_QHostAddress_SpecialAddress_Enum ("QtNetwork", "QHostAddress_SpecialAddress", gsi::enum_const ("Null", QHostAddress::Null, "@brief Enum constant QHostAddress::Null") + gsi::enum_const ("Broadcast", QHostAddress::Broadcast, "@brief Enum constant QHostAddress::Broadcast") + gsi::enum_const ("LocalHost", QHostAddress::LocalHost, "@brief Enum constant QHostAddress::LocalHost") + @@ -506,13 +506,13 @@ static gsi::Enum decl_QHostAddress_SpecialAddress_ gsi::enum_const ("AnyIPv6", QHostAddress::AnyIPv6, "@brief Enum constant QHostAddress::AnyIPv6"), "@qt\n@brief This class represents the QHostAddress::SpecialAddress enum"); -static gsi::QFlagsClass decl_QHostAddress_SpecialAddress_Enums ("QHostAddress_QFlags_SpecialAddress", +static gsi::QFlagsClass decl_QHostAddress_SpecialAddress_Enums ("QtNetwork", "QHostAddress_QFlags_SpecialAddress", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QHostAddress_SpecialAddress_Enum_in_parent (decl_QHostAddress_SpecialAddress_Enum.defs ()); -static gsi::ClassExt decl_QHostAddress_SpecialAddress_Enum_as_child (decl_QHostAddress_SpecialAddress_Enum, "SpecialAddress"); -static gsi::ClassExt decl_QHostAddress_SpecialAddress_Enums_as_child (decl_QHostAddress_SpecialAddress_Enums, "QFlags_SpecialAddress"); +static gsi::ClassExt decl_QHostAddress_SpecialAddress_Enum_as_child (decl_QHostAddress_SpecialAddress_Enum, "QtNetwork", "SpecialAddress"); +static gsi::ClassExt decl_QHostAddress_SpecialAddress_Enums_as_child (decl_QHostAddress_SpecialAddress_Enums, "QtNetwork", "QFlags_SpecialAddress"); } diff --git a/src/gsiqt4/gsiDeclQHostInfo.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQHostInfo.cc similarity index 96% rename from src/gsiqt4/gsiDeclQHostInfo.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQHostInfo.cc index d4bd742fc..c1936f2eb 100644 --- a/src/gsiqt4/gsiDeclQHostInfo.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQHostInfo.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -391,12 +391,12 @@ static gsi::Methods methods_QHostInfo () { return methods; } -gsi::Class decl_QHostInfo ("QHostInfo", +gsi::Class decl_QHostInfo ("QtNetwork", "QHostInfo", methods_QHostInfo (), "@qt\n@brief Binding of QHostInfo"); -GSIQT_PUBLIC gsi::Class &qtdecl_QHostInfo () { return decl_QHostInfo; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QHostInfo () { return decl_QHostInfo; } } @@ -405,19 +405,19 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QHostInfo () { return decl_QHostInfo; namespace qt_gsi { -static gsi::Enum decl_QHostInfo_HostInfoError_Enum ("QHostInfo_HostInfoError", +static gsi::Enum decl_QHostInfo_HostInfoError_Enum ("QtNetwork", "QHostInfo_HostInfoError", gsi::enum_const ("NoError", QHostInfo::NoError, "@brief Enum constant QHostInfo::NoError") + gsi::enum_const ("HostNotFound", QHostInfo::HostNotFound, "@brief Enum constant QHostInfo::HostNotFound") + gsi::enum_const ("UnknownError", QHostInfo::UnknownError, "@brief Enum constant QHostInfo::UnknownError"), "@qt\n@brief This class represents the QHostInfo::HostInfoError enum"); -static gsi::QFlagsClass decl_QHostInfo_HostInfoError_Enums ("QHostInfo_QFlags_HostInfoError", +static gsi::QFlagsClass decl_QHostInfo_HostInfoError_Enums ("QtNetwork", "QHostInfo_QFlags_HostInfoError", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QHostInfo_HostInfoError_Enum_in_parent (decl_QHostInfo_HostInfoError_Enum.defs ()); -static gsi::ClassExt decl_QHostInfo_HostInfoError_Enum_as_child (decl_QHostInfo_HostInfoError_Enum, "HostInfoError"); -static gsi::ClassExt decl_QHostInfo_HostInfoError_Enums_as_child (decl_QHostInfo_HostInfoError_Enums, "QFlags_HostInfoError"); +static gsi::ClassExt decl_QHostInfo_HostInfoError_Enum_as_child (decl_QHostInfo_HostInfoError_Enum, "QtNetwork", "HostInfoError"); +static gsi::ClassExt decl_QHostInfo_HostInfoError_Enums_as_child (decl_QHostInfo_HostInfoError_Enums, "QtNetwork", "QFlags_HostInfoError"); } diff --git a/src/gsiqt4/gsiDeclQIPv6Address.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQIPv6Address.cc similarity index 93% rename from src/gsiqt4/gsiDeclQIPv6Address.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQIPv6Address.cc index 6105c6ade..8817d5bdc 100644 --- a/src/gsiqt4/gsiDeclQIPv6Address.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQIPv6Address.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -101,12 +101,12 @@ static gsi::Methods methods_QIPv6Address () { return methods; } -gsi::Class decl_QIPv6Address ("QIPv6Address", +gsi::Class decl_QIPv6Address ("QtNetwork", "QIPv6Address", methods_QIPv6Address (), "@qt\n@brief Binding of QIPv6Address"); -GSIQT_PUBLIC gsi::Class &qtdecl_QIPv6Address () { return decl_QIPv6Address; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QIPv6Address () { return decl_QIPv6Address; } } diff --git a/src/gsiqt4/gsiDeclQLocalServer.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQLocalServer.cc similarity index 99% rename from src/gsiqt4/gsiDeclQLocalServer.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQLocalServer.cc index c657d2963..8327b4147 100644 --- a/src/gsiqt4/gsiDeclQLocalServer.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQLocalServer.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -395,11 +395,11 @@ static gsi::Methods methods_QLocalServer () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QLocalServer (qtdecl_QObject (), "QLocalServer_Native", +qt_gsi::QtNativeClass decl_QLocalServer (qtdecl_QObject (), "QtNetwork", "QLocalServer_Native", methods_QLocalServer (), "@hide\n@alias QLocalServer"); -GSIQT_PUBLIC gsi::Class &qtdecl_QLocalServer () { return decl_QLocalServer; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QLocalServer () { return decl_QLocalServer; } } @@ -914,7 +914,7 @@ static gsi::Methods methods_QLocalServer_Adaptor () { return methods; } -gsi::Class decl_QLocalServer_Adaptor (qtdecl_QLocalServer (), "QLocalServer", +gsi::Class decl_QLocalServer_Adaptor (qtdecl_QLocalServer (), "QtNetwork", "QLocalServer", methods_QLocalServer_Adaptor (), "@qt\n@brief Binding of QLocalServer"); diff --git a/src/gsiqt4/gsiDeclQLocalSocket.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQLocalSocket.cc similarity index 97% rename from src/gsiqt4/gsiDeclQLocalSocket.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQLocalSocket.cc index a10b6c441..8e1e07066 100644 --- a/src/gsiqt4/gsiDeclQLocalSocket.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQLocalSocket.cc @@ -34,8 +34,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -587,12 +587,12 @@ static gsi::Methods methods_QLocalSocket () { gsi::Class &qtdecl_QIODevice (); -qt_gsi::QtNativeClass decl_QLocalSocket (qtdecl_QIODevice (), "QLocalSocket", +qt_gsi::QtNativeClass decl_QLocalSocket (qtdecl_QIODevice (), "QtNetwork", "QLocalSocket", methods_QLocalSocket (), "@qt\n@brief Binding of QLocalSocket"); -GSIQT_PUBLIC gsi::Class &qtdecl_QLocalSocket () { return decl_QLocalSocket; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QLocalSocket () { return decl_QLocalSocket; } } @@ -601,7 +601,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QLocalSocket () { return decl_QLoc namespace qt_gsi { -static gsi::Enum decl_QLocalSocket_LocalSocketError_Enum ("QLocalSocket_LocalSocketError", +static gsi::Enum decl_QLocalSocket_LocalSocketError_Enum ("QtNetwork", "QLocalSocket_LocalSocketError", gsi::enum_const ("ConnectionRefusedError", QLocalSocket::ConnectionRefusedError, "@brief Enum constant QLocalSocket::ConnectionRefusedError") + gsi::enum_const ("PeerClosedError", QLocalSocket::PeerClosedError, "@brief Enum constant QLocalSocket::PeerClosedError") + gsi::enum_const ("ServerNotFoundError", QLocalSocket::ServerNotFoundError, "@brief Enum constant QLocalSocket::ServerNotFoundError") + @@ -614,13 +614,13 @@ static gsi::Enum decl_QLocalSocket_LocalSocketEr gsi::enum_const ("UnknownSocketError", QLocalSocket::UnknownSocketError, "@brief Enum constant QLocalSocket::UnknownSocketError"), "@qt\n@brief This class represents the QLocalSocket::LocalSocketError enum"); -static gsi::QFlagsClass decl_QLocalSocket_LocalSocketError_Enums ("QLocalSocket_QFlags_LocalSocketError", +static gsi::QFlagsClass decl_QLocalSocket_LocalSocketError_Enums ("QtNetwork", "QLocalSocket_QFlags_LocalSocketError", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QLocalSocket_LocalSocketError_Enum_in_parent (decl_QLocalSocket_LocalSocketError_Enum.defs ()); -static gsi::ClassExt decl_QLocalSocket_LocalSocketError_Enum_as_child (decl_QLocalSocket_LocalSocketError_Enum, "LocalSocketError"); -static gsi::ClassExt decl_QLocalSocket_LocalSocketError_Enums_as_child (decl_QLocalSocket_LocalSocketError_Enums, "QFlags_LocalSocketError"); +static gsi::ClassExt decl_QLocalSocket_LocalSocketError_Enum_as_child (decl_QLocalSocket_LocalSocketError_Enum, "QtNetwork", "LocalSocketError"); +static gsi::ClassExt decl_QLocalSocket_LocalSocketError_Enums_as_child (decl_QLocalSocket_LocalSocketError_Enums, "QtNetwork", "QFlags_LocalSocketError"); } @@ -629,20 +629,20 @@ static gsi::ClassExt decl_QLocalSocket_LocalSocketError_Enums_as_c namespace qt_gsi { -static gsi::Enum decl_QLocalSocket_LocalSocketState_Enum ("QLocalSocket_LocalSocketState", +static gsi::Enum decl_QLocalSocket_LocalSocketState_Enum ("QtNetwork", "QLocalSocket_LocalSocketState", gsi::enum_const ("UnconnectedState", QLocalSocket::UnconnectedState, "@brief Enum constant QLocalSocket::UnconnectedState") + gsi::enum_const ("ConnectingState", QLocalSocket::ConnectingState, "@brief Enum constant QLocalSocket::ConnectingState") + gsi::enum_const ("ConnectedState", QLocalSocket::ConnectedState, "@brief Enum constant QLocalSocket::ConnectedState") + gsi::enum_const ("ClosingState", QLocalSocket::ClosingState, "@brief Enum constant QLocalSocket::ClosingState"), "@qt\n@brief This class represents the QLocalSocket::LocalSocketState enum"); -static gsi::QFlagsClass decl_QLocalSocket_LocalSocketState_Enums ("QLocalSocket_QFlags_LocalSocketState", +static gsi::QFlagsClass decl_QLocalSocket_LocalSocketState_Enums ("QtNetwork", "QLocalSocket_QFlags_LocalSocketState", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QLocalSocket_LocalSocketState_Enum_in_parent (decl_QLocalSocket_LocalSocketState_Enum.defs ()); -static gsi::ClassExt decl_QLocalSocket_LocalSocketState_Enum_as_child (decl_QLocalSocket_LocalSocketState_Enum, "LocalSocketState"); -static gsi::ClassExt decl_QLocalSocket_LocalSocketState_Enums_as_child (decl_QLocalSocket_LocalSocketState_Enums, "QFlags_LocalSocketState"); +static gsi::ClassExt decl_QLocalSocket_LocalSocketState_Enum_as_child (decl_QLocalSocket_LocalSocketState_Enum, "QtNetwork", "LocalSocketState"); +static gsi::ClassExt decl_QLocalSocket_LocalSocketState_Enums_as_child (decl_QLocalSocket_LocalSocketState_Enums, "QtNetwork", "QFlags_LocalSocketState"); } diff --git a/src/gsiqt4/gsiDeclQNetworkAccessManager.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkAccessManager.cc similarity index 98% rename from src/gsiqt4/gsiDeclQNetworkAccessManager.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkAccessManager.cc index ffc881218..ae0350199 100644 --- a/src/gsiqt4/gsiDeclQNetworkAccessManager.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkAccessManager.cc @@ -43,8 +43,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -477,11 +477,11 @@ static gsi::Methods methods_QNetworkAccessManager () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QNetworkAccessManager (qtdecl_QObject (), "QNetworkAccessManager_Native", +qt_gsi::QtNativeClass decl_QNetworkAccessManager (qtdecl_QObject (), "QtNetwork", "QNetworkAccessManager_Native", methods_QNetworkAccessManager (), "@hide\n@alias QNetworkAccessManager"); -GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkAccessManager () { return decl_QNetworkAccessManager; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QNetworkAccessManager () { return decl_QNetworkAccessManager; } } @@ -1015,7 +1015,7 @@ static gsi::Methods methods_QNetworkAccessManager_Adaptor () { return methods; } -gsi::Class decl_QNetworkAccessManager_Adaptor (qtdecl_QNetworkAccessManager (), "QNetworkAccessManager", +gsi::Class decl_QNetworkAccessManager_Adaptor (qtdecl_QNetworkAccessManager (), "QtNetwork", "QNetworkAccessManager", methods_QNetworkAccessManager_Adaptor (), "@qt\n@brief Binding of QNetworkAccessManager"); @@ -1026,7 +1026,7 @@ gsi::Class decl_QNetworkAccessManager_Adaptor (qt namespace qt_gsi { -static gsi::Enum decl_QNetworkAccessManager_Operation_Enum ("QNetworkAccessManager_Operation", +static gsi::Enum decl_QNetworkAccessManager_Operation_Enum ("QtNetwork", "QNetworkAccessManager_Operation", gsi::enum_const ("HeadOperation", QNetworkAccessManager::HeadOperation, "@brief Enum constant QNetworkAccessManager::HeadOperation") + gsi::enum_const ("GetOperation", QNetworkAccessManager::GetOperation, "@brief Enum constant QNetworkAccessManager::GetOperation") + gsi::enum_const ("PutOperation", QNetworkAccessManager::PutOperation, "@brief Enum constant QNetworkAccessManager::PutOperation") + @@ -1035,13 +1035,13 @@ static gsi::Enum decl_QNetworkAccessManager_Op gsi::enum_const ("UnknownOperation", QNetworkAccessManager::UnknownOperation, "@brief Enum constant QNetworkAccessManager::UnknownOperation"), "@qt\n@brief This class represents the QNetworkAccessManager::Operation enum"); -static gsi::QFlagsClass decl_QNetworkAccessManager_Operation_Enums ("QNetworkAccessManager_QFlags_Operation", +static gsi::QFlagsClass decl_QNetworkAccessManager_Operation_Enums ("QtNetwork", "QNetworkAccessManager_QFlags_Operation", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QNetworkAccessManager_Operation_Enum_in_parent (decl_QNetworkAccessManager_Operation_Enum.defs ()); -static gsi::ClassExt decl_QNetworkAccessManager_Operation_Enum_as_child (decl_QNetworkAccessManager_Operation_Enum, "Operation"); -static gsi::ClassExt decl_QNetworkAccessManager_Operation_Enums_as_child (decl_QNetworkAccessManager_Operation_Enums, "QFlags_Operation"); +static gsi::ClassExt decl_QNetworkAccessManager_Operation_Enum_as_child (decl_QNetworkAccessManager_Operation_Enum, "QtNetwork", "Operation"); +static gsi::ClassExt decl_QNetworkAccessManager_Operation_Enums_as_child (decl_QNetworkAccessManager_Operation_Enums, "QtNetwork", "QFlags_Operation"); } diff --git a/src/gsiqt4/gsiDeclQNetworkAddressEntry.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkAddressEntry.cc similarity index 97% rename from src/gsiqt4/gsiDeclQNetworkAddressEntry.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkAddressEntry.cc index 17e82f5f3..94f59f41e 100644 --- a/src/gsiqt4/gsiDeclQNetworkAddressEntry.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkAddressEntry.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -290,12 +290,12 @@ static gsi::Methods methods_QNetworkAddressEntry () { return methods; } -gsi::Class decl_QNetworkAddressEntry ("QNetworkAddressEntry", +gsi::Class decl_QNetworkAddressEntry ("QtNetwork", "QNetworkAddressEntry", methods_QNetworkAddressEntry (), "@qt\n@brief Binding of QNetworkAddressEntry"); -GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkAddressEntry () { return decl_QNetworkAddressEntry; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QNetworkAddressEntry () { return decl_QNetworkAddressEntry; } } diff --git a/src/gsiqt4/gsiDeclQNetworkCacheMetaData.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkCacheMetaData.cc similarity index 98% rename from src/gsiqt4/gsiDeclQNetworkCacheMetaData.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkCacheMetaData.cc index f01b951e5..1433d9153 100644 --- a/src/gsiqt4/gsiDeclQNetworkCacheMetaData.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkCacheMetaData.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -344,12 +344,12 @@ static gsi::Methods methods_QNetworkCacheMetaData () { return methods; } -gsi::Class decl_QNetworkCacheMetaData ("QNetworkCacheMetaData", +gsi::Class decl_QNetworkCacheMetaData ("QtNetwork", "QNetworkCacheMetaData", methods_QNetworkCacheMetaData (), "@qt\n@brief Binding of QNetworkCacheMetaData"); -GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkCacheMetaData () { return decl_QNetworkCacheMetaData; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QNetworkCacheMetaData () { return decl_QNetworkCacheMetaData; } } diff --git a/src/gsiqt4/gsiDeclQNetworkCookie.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkCookie.cc similarity index 97% rename from src/gsiqt4/gsiDeclQNetworkCookie.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkCookie.cc index 2f88d78c9..352586ffa 100644 --- a/src/gsiqt4/gsiDeclQNetworkCookie.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkCookie.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -464,12 +464,12 @@ static gsi::Methods methods_QNetworkCookie () { return methods; } -gsi::Class decl_QNetworkCookie ("QNetworkCookie", +gsi::Class decl_QNetworkCookie ("QtNetwork", "QNetworkCookie", methods_QNetworkCookie (), "@qt\n@brief Binding of QNetworkCookie"); -GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkCookie () { return decl_QNetworkCookie; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QNetworkCookie () { return decl_QNetworkCookie; } } @@ -478,18 +478,18 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkCookie () { return decl_ namespace qt_gsi { -static gsi::Enum decl_QNetworkCookie_RawForm_Enum ("QNetworkCookie_RawForm", +static gsi::Enum decl_QNetworkCookie_RawForm_Enum ("QtNetwork", "QNetworkCookie_RawForm", gsi::enum_const ("NameAndValueOnly", QNetworkCookie::NameAndValueOnly, "@brief Enum constant QNetworkCookie::NameAndValueOnly") + gsi::enum_const ("Full", QNetworkCookie::Full, "@brief Enum constant QNetworkCookie::Full"), "@qt\n@brief This class represents the QNetworkCookie::RawForm enum"); -static gsi::QFlagsClass decl_QNetworkCookie_RawForm_Enums ("QNetworkCookie_QFlags_RawForm", +static gsi::QFlagsClass decl_QNetworkCookie_RawForm_Enums ("QtNetwork", "QNetworkCookie_QFlags_RawForm", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QNetworkCookie_RawForm_Enum_in_parent (decl_QNetworkCookie_RawForm_Enum.defs ()); -static gsi::ClassExt decl_QNetworkCookie_RawForm_Enum_as_child (decl_QNetworkCookie_RawForm_Enum, "RawForm"); -static gsi::ClassExt decl_QNetworkCookie_RawForm_Enums_as_child (decl_QNetworkCookie_RawForm_Enums, "QFlags_RawForm"); +static gsi::ClassExt decl_QNetworkCookie_RawForm_Enum_as_child (decl_QNetworkCookie_RawForm_Enum, "QtNetwork", "RawForm"); +static gsi::ClassExt decl_QNetworkCookie_RawForm_Enums_as_child (decl_QNetworkCookie_RawForm_Enums, "QtNetwork", "QFlags_RawForm"); } diff --git a/src/gsiqt4/gsiDeclQNetworkCookieJar.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkCookieJar.cc similarity index 98% rename from src/gsiqt4/gsiDeclQNetworkCookieJar.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkCookieJar.cc index eb9b53122..0aec52671 100644 --- a/src/gsiqt4/gsiDeclQNetworkCookieJar.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkCookieJar.cc @@ -36,8 +36,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -209,11 +209,11 @@ static gsi::Methods methods_QNetworkCookieJar () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QNetworkCookieJar (qtdecl_QObject (), "QNetworkCookieJar_Native", +qt_gsi::QtNativeClass decl_QNetworkCookieJar (qtdecl_QObject (), "QtNetwork", "QNetworkCookieJar_Native", methods_QNetworkCookieJar (), "@hide\n@alias QNetworkCookieJar"); -GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkCookieJar () { return decl_QNetworkCookieJar; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QNetworkCookieJar () { return decl_QNetworkCookieJar; } } @@ -721,7 +721,7 @@ static gsi::Methods methods_QNetworkCookieJar_Adaptor () { return methods; } -gsi::Class decl_QNetworkCookieJar_Adaptor (qtdecl_QNetworkCookieJar (), "QNetworkCookieJar", +gsi::Class decl_QNetworkCookieJar_Adaptor (qtdecl_QNetworkCookieJar (), "QtNetwork", "QNetworkCookieJar", methods_QNetworkCookieJar_Adaptor (), "@qt\n@brief Binding of QNetworkCookieJar"); diff --git a/src/gsiqt4/gsiDeclQNetworkDiskCache.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkDiskCache.cc similarity index 99% rename from src/gsiqt4/gsiDeclQNetworkDiskCache.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkDiskCache.cc index 5e9957d07..2f15b6afc 100644 --- a/src/gsiqt4/gsiDeclQNetworkDiskCache.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkDiskCache.cc @@ -37,8 +37,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -416,11 +416,11 @@ static gsi::Methods methods_QNetworkDiskCache () { gsi::Class &qtdecl_QAbstractNetworkCache (); -qt_gsi::QtNativeClass decl_QNetworkDiskCache (qtdecl_QAbstractNetworkCache (), "QNetworkDiskCache_Native", +qt_gsi::QtNativeClass decl_QNetworkDiskCache (qtdecl_QAbstractNetworkCache (), "QtNetwork", "QNetworkDiskCache_Native", methods_QNetworkDiskCache (), "@hide\n@alias QNetworkDiskCache"); -GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkDiskCache () { return decl_QNetworkDiskCache; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QNetworkDiskCache () { return decl_QNetworkDiskCache; } } @@ -1158,7 +1158,7 @@ static gsi::Methods methods_QNetworkDiskCache_Adaptor () { return methods; } -gsi::Class decl_QNetworkDiskCache_Adaptor (qtdecl_QNetworkDiskCache (), "QNetworkDiskCache", +gsi::Class decl_QNetworkDiskCache_Adaptor (qtdecl_QNetworkDiskCache (), "QtNetwork", "QNetworkDiskCache", methods_QNetworkDiskCache_Adaptor (), "@qt\n@brief Binding of QNetworkDiskCache"); diff --git a/src/gsiqt4/gsiDeclQNetworkInterface.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkInterface.cc similarity index 96% rename from src/gsiqt4/gsiDeclQNetworkInterface.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkInterface.cc index d427927f8..ed1fffc1f 100644 --- a/src/gsiqt4/gsiDeclQNetworkInterface.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkInterface.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -287,12 +287,12 @@ static gsi::Methods methods_QNetworkInterface () { return methods; } -gsi::Class decl_QNetworkInterface ("QNetworkInterface", +gsi::Class decl_QNetworkInterface ("QtNetwork", "QNetworkInterface", methods_QNetworkInterface (), "@qt\n@brief Binding of QNetworkInterface"); -GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkInterface () { return decl_QNetworkInterface; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QNetworkInterface () { return decl_QNetworkInterface; } } @@ -301,7 +301,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkInterface () { return namespace qt_gsi { -static gsi::Enum decl_QNetworkInterface_InterfaceFlag_Enum ("QNetworkInterface_InterfaceFlag", +static gsi::Enum decl_QNetworkInterface_InterfaceFlag_Enum ("QtNetwork", "QNetworkInterface_InterfaceFlag", gsi::enum_const ("IsUp", QNetworkInterface::IsUp, "@brief Enum constant QNetworkInterface::IsUp") + gsi::enum_const ("IsRunning", QNetworkInterface::IsRunning, "@brief Enum constant QNetworkInterface::IsRunning") + gsi::enum_const ("CanBroadcast", QNetworkInterface::CanBroadcast, "@brief Enum constant QNetworkInterface::CanBroadcast") + @@ -310,13 +310,13 @@ static gsi::Enum decl_QNetworkInterface_Interf gsi::enum_const ("CanMulticast", QNetworkInterface::CanMulticast, "@brief Enum constant QNetworkInterface::CanMulticast"), "@qt\n@brief This class represents the QNetworkInterface::InterfaceFlag enum"); -static gsi::QFlagsClass decl_QNetworkInterface_InterfaceFlag_Enums ("QNetworkInterface_QFlags_InterfaceFlag", +static gsi::QFlagsClass decl_QNetworkInterface_InterfaceFlag_Enums ("QtNetwork", "QNetworkInterface_QFlags_InterfaceFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QNetworkInterface_InterfaceFlag_Enum_in_parent (decl_QNetworkInterface_InterfaceFlag_Enum.defs ()); -static gsi::ClassExt decl_QNetworkInterface_InterfaceFlag_Enum_as_child (decl_QNetworkInterface_InterfaceFlag_Enum, "InterfaceFlag"); -static gsi::ClassExt decl_QNetworkInterface_InterfaceFlag_Enums_as_child (decl_QNetworkInterface_InterfaceFlag_Enums, "QFlags_InterfaceFlag"); +static gsi::ClassExt decl_QNetworkInterface_InterfaceFlag_Enum_as_child (decl_QNetworkInterface_InterfaceFlag_Enum, "QtNetwork", "InterfaceFlag"); +static gsi::ClassExt decl_QNetworkInterface_InterfaceFlag_Enums_as_child (decl_QNetworkInterface_InterfaceFlag_Enums, "QtNetwork", "QFlags_InterfaceFlag"); } diff --git a/src/gsiqt4/gsiDeclQNetworkProxy.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkProxy.cc similarity index 96% rename from src/gsiqt4/gsiDeclQNetworkProxy.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkProxy.cc index 0e9decdfb..5e5eb73de 100644 --- a/src/gsiqt4/gsiDeclQNetworkProxy.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkProxy.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -464,12 +464,12 @@ static gsi::Methods methods_QNetworkProxy () { return methods; } -gsi::Class decl_QNetworkProxy ("QNetworkProxy", +gsi::Class decl_QNetworkProxy ("QtNetwork", "QNetworkProxy", methods_QNetworkProxy (), "@qt\n@brief Binding of QNetworkProxy"); -GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkProxy () { return decl_QNetworkProxy; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QNetworkProxy () { return decl_QNetworkProxy; } } @@ -478,7 +478,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkProxy () { return decl_QN namespace qt_gsi { -static gsi::Enum decl_QNetworkProxy_Capability_Enum ("QNetworkProxy_Capability", +static gsi::Enum decl_QNetworkProxy_Capability_Enum ("QtNetwork", "QNetworkProxy_Capability", gsi::enum_const ("TunnelingCapability", QNetworkProxy::TunnelingCapability, "@brief Enum constant QNetworkProxy::TunnelingCapability") + gsi::enum_const ("ListeningCapability", QNetworkProxy::ListeningCapability, "@brief Enum constant QNetworkProxy::ListeningCapability") + gsi::enum_const ("UdpTunnelingCapability", QNetworkProxy::UdpTunnelingCapability, "@brief Enum constant QNetworkProxy::UdpTunnelingCapability") + @@ -486,13 +486,13 @@ static gsi::Enum decl_QNetworkProxy_Capability_Enum ( gsi::enum_const ("HostNameLookupCapability", QNetworkProxy::HostNameLookupCapability, "@brief Enum constant QNetworkProxy::HostNameLookupCapability"), "@qt\n@brief This class represents the QNetworkProxy::Capability enum"); -static gsi::QFlagsClass decl_QNetworkProxy_Capability_Enums ("QNetworkProxy_QFlags_Capability", +static gsi::QFlagsClass decl_QNetworkProxy_Capability_Enums ("QtNetwork", "QNetworkProxy_QFlags_Capability", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QNetworkProxy_Capability_Enum_in_parent (decl_QNetworkProxy_Capability_Enum.defs ()); -static gsi::ClassExt decl_QNetworkProxy_Capability_Enum_as_child (decl_QNetworkProxy_Capability_Enum, "Capability"); -static gsi::ClassExt decl_QNetworkProxy_Capability_Enums_as_child (decl_QNetworkProxy_Capability_Enums, "QFlags_Capability"); +static gsi::ClassExt decl_QNetworkProxy_Capability_Enum_as_child (decl_QNetworkProxy_Capability_Enum, "QtNetwork", "Capability"); +static gsi::ClassExt decl_QNetworkProxy_Capability_Enums_as_child (decl_QNetworkProxy_Capability_Enums, "QtNetwork", "QFlags_Capability"); } @@ -501,7 +501,7 @@ static gsi::ClassExt decl_QNetworkProxy_Capability_Enums_as_child namespace qt_gsi { -static gsi::Enum decl_QNetworkProxy_ProxyType_Enum ("QNetworkProxy_ProxyType", +static gsi::Enum decl_QNetworkProxy_ProxyType_Enum ("QtNetwork", "QNetworkProxy_ProxyType", gsi::enum_const ("DefaultProxy", QNetworkProxy::DefaultProxy, "@brief Enum constant QNetworkProxy::DefaultProxy") + gsi::enum_const ("Socks5Proxy", QNetworkProxy::Socks5Proxy, "@brief Enum constant QNetworkProxy::Socks5Proxy") + gsi::enum_const ("NoProxy", QNetworkProxy::NoProxy, "@brief Enum constant QNetworkProxy::NoProxy") + @@ -510,13 +510,13 @@ static gsi::Enum decl_QNetworkProxy_ProxyType_Enum ("Q gsi::enum_const ("FtpCachingProxy", QNetworkProxy::FtpCachingProxy, "@brief Enum constant QNetworkProxy::FtpCachingProxy"), "@qt\n@brief This class represents the QNetworkProxy::ProxyType enum"); -static gsi::QFlagsClass decl_QNetworkProxy_ProxyType_Enums ("QNetworkProxy_QFlags_ProxyType", +static gsi::QFlagsClass decl_QNetworkProxy_ProxyType_Enums ("QtNetwork", "QNetworkProxy_QFlags_ProxyType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QNetworkProxy_ProxyType_Enum_in_parent (decl_QNetworkProxy_ProxyType_Enum.defs ()); -static gsi::ClassExt decl_QNetworkProxy_ProxyType_Enum_as_child (decl_QNetworkProxy_ProxyType_Enum, "ProxyType"); -static gsi::ClassExt decl_QNetworkProxy_ProxyType_Enums_as_child (decl_QNetworkProxy_ProxyType_Enums, "QFlags_ProxyType"); +static gsi::ClassExt decl_QNetworkProxy_ProxyType_Enum_as_child (decl_QNetworkProxy_ProxyType_Enum, "QtNetwork", "ProxyType"); +static gsi::ClassExt decl_QNetworkProxy_ProxyType_Enums_as_child (decl_QNetworkProxy_ProxyType_Enums, "QtNetwork", "QFlags_ProxyType"); } diff --git a/src/gsiqt4/gsiDeclQNetworkProxyFactory.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkProxyFactory.cc similarity index 96% rename from src/gsiqt4/gsiDeclQNetworkProxyFactory.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkProxyFactory.cc index 4ec9b8b09..edbdfc9c1 100644 --- a/src/gsiqt4/gsiDeclQNetworkProxyFactory.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkProxyFactory.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -148,11 +148,11 @@ static gsi::Methods methods_QNetworkProxyFactory () { return methods; } -gsi::Class decl_QNetworkProxyFactory ("QNetworkProxyFactory_Native", +gsi::Class decl_QNetworkProxyFactory ("QtNetwork", "QNetworkProxyFactory_Native", methods_QNetworkProxyFactory (), "@hide\n@alias QNetworkProxyFactory"); -GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkProxyFactory () { return decl_QNetworkProxyFactory; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QNetworkProxyFactory () { return decl_QNetworkProxyFactory; } } @@ -240,7 +240,7 @@ static gsi::Methods methods_QNetworkProxyFactory_Adaptor () { return methods; } -gsi::Class decl_QNetworkProxyFactory_Adaptor (qtdecl_QNetworkProxyFactory (), "QNetworkProxyFactory", +gsi::Class decl_QNetworkProxyFactory_Adaptor (qtdecl_QNetworkProxyFactory (), "QtNetwork", "QNetworkProxyFactory", methods_QNetworkProxyFactory_Adaptor (), "@qt\n@brief Binding of QNetworkProxyFactory"); diff --git a/src/gsiqt4/gsiDeclQNetworkProxyQuery.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkProxyQuery.cc similarity index 95% rename from src/gsiqt4/gsiDeclQNetworkProxyQuery.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkProxyQuery.cc index 6a5e13bb9..f488b4164 100644 --- a/src/gsiqt4/gsiDeclQNetworkProxyQuery.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkProxyQuery.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -164,14 +164,14 @@ static void _call_f_localPort_c0 (const qt_gsi::GenericMethod * /*decl*/, void * // bool QNetworkProxyQuery::operator!=(const QNetworkProxyQuery &other) -static void _init_f_operator_excl__eq__c3220u1 (qt_gsi::GenericMethod *decl) +static void _init_f_operator_excl__eq__c3220 (qt_gsi::GenericMethod *decl) { static gsi::ArgSpecBase argspec_0 ("other"); decl->add_arg (argspec_0); decl->set_return (); } -static void _call_f_operator_excl__eq__c3220u1 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +static void _call_f_operator_excl__eq__c3220 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) { __SUPPRESS_UNUSED_WARNING(args); tl::Heap heap; @@ -202,14 +202,14 @@ static void _call_f_operator_eq__3220 (const qt_gsi::GenericMethod * /*decl*/, v // bool QNetworkProxyQuery::operator==(const QNetworkProxyQuery &other) -static void _init_f_operator_eq__eq__c3220u1 (qt_gsi::GenericMethod *decl) +static void _init_f_operator_eq__eq__c3220 (qt_gsi::GenericMethod *decl) { static gsi::ArgSpecBase argspec_0 ("other"); decl->add_arg (argspec_0); decl->set_return (); } -static void _call_f_operator_eq__eq__c3220u1 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) +static void _call_f_operator_eq__eq__c3220 (const qt_gsi::GenericMethod * /*decl*/, void *cls, gsi::SerialArgs &args, gsi::SerialArgs &ret) { __SUPPRESS_UNUSED_WARNING(args); tl::Heap heap; @@ -425,9 +425,9 @@ static gsi::Methods methods_QNetworkProxyQuery () { methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QNetworkProxyQuery::QNetworkProxyQuery(quint16 bindPort, const QString &protocolTag, QNetworkProxyQuery::QueryType queryType)\nThis method creates an object of class QNetworkProxyQuery.", &_init_ctor_QNetworkProxyQuery_6320, &_call_ctor_QNetworkProxyQuery_6320); methods += new qt_gsi::GenericStaticMethod ("new", "@brief Constructor QNetworkProxyQuery::QNetworkProxyQuery(const QNetworkProxyQuery &other)\nThis method creates an object of class QNetworkProxyQuery.", &_init_ctor_QNetworkProxyQuery_3220, &_call_ctor_QNetworkProxyQuery_3220); methods += new qt_gsi::GenericMethod (":localPort", "@brief Method int QNetworkProxyQuery::localPort()\n", true, &_init_f_localPort_c0, &_call_f_localPort_c0); - methods += new qt_gsi::GenericMethod ("!=", "@brief Method bool QNetworkProxyQuery::operator!=(const QNetworkProxyQuery &other)\n", true, &_init_f_operator_excl__eq__c3220u1, &_call_f_operator_excl__eq__c3220u1); + methods += new qt_gsi::GenericMethod ("!=", "@brief Method bool QNetworkProxyQuery::operator!=(const QNetworkProxyQuery &other)\n", true, &_init_f_operator_excl__eq__c3220, &_call_f_operator_excl__eq__c3220); methods += new qt_gsi::GenericMethod ("assign", "@brief Method QNetworkProxyQuery &QNetworkProxyQuery::operator=(const QNetworkProxyQuery &other)\n", false, &_init_f_operator_eq__3220, &_call_f_operator_eq__3220); - methods += new qt_gsi::GenericMethod ("==", "@brief Method bool QNetworkProxyQuery::operator==(const QNetworkProxyQuery &other)\n", true, &_init_f_operator_eq__eq__c3220u1, &_call_f_operator_eq__eq__c3220u1); + methods += new qt_gsi::GenericMethod ("==", "@brief Method bool QNetworkProxyQuery::operator==(const QNetworkProxyQuery &other)\n", true, &_init_f_operator_eq__eq__c3220, &_call_f_operator_eq__eq__c3220); methods += new qt_gsi::GenericMethod (":peerHostName", "@brief Method QString QNetworkProxyQuery::peerHostName()\n", true, &_init_f_peerHostName_c0, &_call_f_peerHostName_c0); methods += new qt_gsi::GenericMethod (":peerPort", "@brief Method int QNetworkProxyQuery::peerPort()\n", true, &_init_f_peerPort_c0, &_call_f_peerPort_c0); methods += new qt_gsi::GenericMethod (":protocolTag", "@brief Method QString QNetworkProxyQuery::protocolTag()\n", true, &_init_f_protocolTag_c0, &_call_f_protocolTag_c0); @@ -442,12 +442,12 @@ static gsi::Methods methods_QNetworkProxyQuery () { return methods; } -gsi::Class decl_QNetworkProxyQuery ("QNetworkProxyQuery", +gsi::Class decl_QNetworkProxyQuery ("QtNetwork", "QNetworkProxyQuery", methods_QNetworkProxyQuery (), "@qt\n@brief Binding of QNetworkProxyQuery"); -GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkProxyQuery () { return decl_QNetworkProxyQuery; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QNetworkProxyQuery () { return decl_QNetworkProxyQuery; } } @@ -456,20 +456,20 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkProxyQuery () { retu namespace qt_gsi { -static gsi::Enum decl_QNetworkProxyQuery_QueryType_Enum ("QNetworkProxyQuery_QueryType", +static gsi::Enum decl_QNetworkProxyQuery_QueryType_Enum ("QtNetwork", "QNetworkProxyQuery_QueryType", gsi::enum_const ("TcpSocket", QNetworkProxyQuery::TcpSocket, "@brief Enum constant QNetworkProxyQuery::TcpSocket") + gsi::enum_const ("UdpSocket", QNetworkProxyQuery::UdpSocket, "@brief Enum constant QNetworkProxyQuery::UdpSocket") + gsi::enum_const ("TcpServer", QNetworkProxyQuery::TcpServer, "@brief Enum constant QNetworkProxyQuery::TcpServer") + gsi::enum_const ("UrlRequest", QNetworkProxyQuery::UrlRequest, "@brief Enum constant QNetworkProxyQuery::UrlRequest"), "@qt\n@brief This class represents the QNetworkProxyQuery::QueryType enum"); -static gsi::QFlagsClass decl_QNetworkProxyQuery_QueryType_Enums ("QNetworkProxyQuery_QFlags_QueryType", +static gsi::QFlagsClass decl_QNetworkProxyQuery_QueryType_Enums ("QtNetwork", "QNetworkProxyQuery_QFlags_QueryType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QNetworkProxyQuery_QueryType_Enum_in_parent (decl_QNetworkProxyQuery_QueryType_Enum.defs ()); -static gsi::ClassExt decl_QNetworkProxyQuery_QueryType_Enum_as_child (decl_QNetworkProxyQuery_QueryType_Enum, "QueryType"); -static gsi::ClassExt decl_QNetworkProxyQuery_QueryType_Enums_as_child (decl_QNetworkProxyQuery_QueryType_Enums, "QFlags_QueryType"); +static gsi::ClassExt decl_QNetworkProxyQuery_QueryType_Enum_as_child (decl_QNetworkProxyQuery_QueryType_Enum, "QtNetwork", "QueryType"); +static gsi::ClassExt decl_QNetworkProxyQuery_QueryType_Enums_as_child (decl_QNetworkProxyQuery_QueryType_Enums, "QtNetwork", "QFlags_QueryType"); } diff --git a/src/gsiqt4/gsiDeclQNetworkReply.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkReply.cc similarity index 98% rename from src/gsiqt4/gsiDeclQNetworkReply.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkReply.cc index bbf7464a6..cf72dc1a6 100644 --- a/src/gsiqt4/gsiDeclQNetworkReply.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkReply.cc @@ -39,8 +39,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -550,12 +550,12 @@ static gsi::Methods methods_QNetworkReply () { gsi::Class &qtdecl_QIODevice (); -qt_gsi::QtNativeClass decl_QNetworkReply (qtdecl_QIODevice (), "QNetworkReply", +qt_gsi::QtNativeClass decl_QNetworkReply (qtdecl_QIODevice (), "QtNetwork", "QNetworkReply", methods_QNetworkReply (), "@qt\n@brief Binding of QNetworkReply"); -GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkReply () { return decl_QNetworkReply; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QNetworkReply () { return decl_QNetworkReply; } } @@ -564,7 +564,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkReply () { return decl_QN namespace qt_gsi { -static gsi::Enum decl_QNetworkReply_NetworkError_Enum ("QNetworkReply_NetworkError", +static gsi::Enum decl_QNetworkReply_NetworkError_Enum ("QtNetwork", "QNetworkReply_NetworkError", gsi::enum_const ("NoError", QNetworkReply::NoError, "@brief Enum constant QNetworkReply::NoError") + gsi::enum_const ("ConnectionRefusedError", QNetworkReply::ConnectionRefusedError, "@brief Enum constant QNetworkReply::ConnectionRefusedError") + gsi::enum_const ("RemoteHostClosedError", QNetworkReply::RemoteHostClosedError, "@brief Enum constant QNetworkReply::RemoteHostClosedError") + @@ -590,13 +590,13 @@ static gsi::Enum decl_QNetworkReply_NetworkError_En gsi::enum_const ("ProtocolFailure", QNetworkReply::ProtocolFailure, "@brief Enum constant QNetworkReply::ProtocolFailure"), "@qt\n@brief This class represents the QNetworkReply::NetworkError enum"); -static gsi::QFlagsClass decl_QNetworkReply_NetworkError_Enums ("QNetworkReply_QFlags_NetworkError", +static gsi::QFlagsClass decl_QNetworkReply_NetworkError_Enums ("QtNetwork", "QNetworkReply_QFlags_NetworkError", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QNetworkReply_NetworkError_Enum_in_parent (decl_QNetworkReply_NetworkError_Enum.defs ()); -static gsi::ClassExt decl_QNetworkReply_NetworkError_Enum_as_child (decl_QNetworkReply_NetworkError_Enum, "NetworkError"); -static gsi::ClassExt decl_QNetworkReply_NetworkError_Enums_as_child (decl_QNetworkReply_NetworkError_Enums, "QFlags_NetworkError"); +static gsi::ClassExt decl_QNetworkReply_NetworkError_Enum_as_child (decl_QNetworkReply_NetworkError_Enum, "QtNetwork", "NetworkError"); +static gsi::ClassExt decl_QNetworkReply_NetworkError_Enums_as_child (decl_QNetworkReply_NetworkError_Enums, "QtNetwork", "QFlags_NetworkError"); } diff --git a/src/gsiqt4/gsiDeclQNetworkRequest.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkRequest.cc similarity index 96% rename from src/gsiqt4/gsiDeclQNetworkRequest.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkRequest.cc index fab4c424f..3319a3f39 100644 --- a/src/gsiqt4/gsiDeclQNetworkRequest.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQNetworkRequest.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -430,12 +430,12 @@ static gsi::Methods methods_QNetworkRequest () { return methods; } -gsi::Class decl_QNetworkRequest ("QNetworkRequest", +gsi::Class decl_QNetworkRequest ("QtNetwork", "QNetworkRequest", methods_QNetworkRequest (), "@qt\n@brief Binding of QNetworkRequest"); -GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkRequest () { return decl_QNetworkRequest; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QNetworkRequest () { return decl_QNetworkRequest; } } @@ -444,7 +444,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkRequest () { return dec namespace qt_gsi { -static gsi::Enum decl_QNetworkRequest_Attribute_Enum ("QNetworkRequest_Attribute", +static gsi::Enum decl_QNetworkRequest_Attribute_Enum ("QtNetwork", "QNetworkRequest_Attribute", gsi::enum_const ("HttpStatusCodeAttribute", QNetworkRequest::HttpStatusCodeAttribute, "@brief Enum constant QNetworkRequest::HttpStatusCodeAttribute") + gsi::enum_const ("HttpReasonPhraseAttribute", QNetworkRequest::HttpReasonPhraseAttribute, "@brief Enum constant QNetworkRequest::HttpReasonPhraseAttribute") + gsi::enum_const ("RedirectionTargetAttribute", QNetworkRequest::RedirectionTargetAttribute, "@brief Enum constant QNetworkRequest::RedirectionTargetAttribute") + @@ -459,13 +459,13 @@ static gsi::Enum decl_QNetworkRequest_Attribute_Enum gsi::enum_const ("UserMax", QNetworkRequest::UserMax, "@brief Enum constant QNetworkRequest::UserMax"), "@qt\n@brief This class represents the QNetworkRequest::Attribute enum"); -static gsi::QFlagsClass decl_QNetworkRequest_Attribute_Enums ("QNetworkRequest_QFlags_Attribute", +static gsi::QFlagsClass decl_QNetworkRequest_Attribute_Enums ("QtNetwork", "QNetworkRequest_QFlags_Attribute", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QNetworkRequest_Attribute_Enum_in_parent (decl_QNetworkRequest_Attribute_Enum.defs ()); -static gsi::ClassExt decl_QNetworkRequest_Attribute_Enum_as_child (decl_QNetworkRequest_Attribute_Enum, "Attribute"); -static gsi::ClassExt decl_QNetworkRequest_Attribute_Enums_as_child (decl_QNetworkRequest_Attribute_Enums, "QFlags_Attribute"); +static gsi::ClassExt decl_QNetworkRequest_Attribute_Enum_as_child (decl_QNetworkRequest_Attribute_Enum, "QtNetwork", "Attribute"); +static gsi::ClassExt decl_QNetworkRequest_Attribute_Enums_as_child (decl_QNetworkRequest_Attribute_Enums, "QtNetwork", "QFlags_Attribute"); } @@ -474,7 +474,7 @@ static gsi::ClassExt decl_QNetworkRequest_Attribute_Enums_as_ch namespace qt_gsi { -static gsi::Enum decl_QNetworkRequest_KnownHeaders_Enum ("QNetworkRequest_KnownHeaders", +static gsi::Enum decl_QNetworkRequest_KnownHeaders_Enum ("QtNetwork", "QNetworkRequest_KnownHeaders", gsi::enum_const ("ContentTypeHeader", QNetworkRequest::ContentTypeHeader, "@brief Enum constant QNetworkRequest::ContentTypeHeader") + gsi::enum_const ("ContentLengthHeader", QNetworkRequest::ContentLengthHeader, "@brief Enum constant QNetworkRequest::ContentLengthHeader") + gsi::enum_const ("LocationHeader", QNetworkRequest::LocationHeader, "@brief Enum constant QNetworkRequest::LocationHeader") + @@ -483,13 +483,13 @@ static gsi::Enum decl_QNetworkRequest_KnownHeader gsi::enum_const ("SetCookieHeader", QNetworkRequest::SetCookieHeader, "@brief Enum constant QNetworkRequest::SetCookieHeader"), "@qt\n@brief This class represents the QNetworkRequest::KnownHeaders enum"); -static gsi::QFlagsClass decl_QNetworkRequest_KnownHeaders_Enums ("QNetworkRequest_QFlags_KnownHeaders", +static gsi::QFlagsClass decl_QNetworkRequest_KnownHeaders_Enums ("QtNetwork", "QNetworkRequest_QFlags_KnownHeaders", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QNetworkRequest_KnownHeaders_Enum_in_parent (decl_QNetworkRequest_KnownHeaders_Enum.defs ()); -static gsi::ClassExt decl_QNetworkRequest_KnownHeaders_Enum_as_child (decl_QNetworkRequest_KnownHeaders_Enum, "KnownHeaders"); -static gsi::ClassExt decl_QNetworkRequest_KnownHeaders_Enums_as_child (decl_QNetworkRequest_KnownHeaders_Enums, "QFlags_KnownHeaders"); +static gsi::ClassExt decl_QNetworkRequest_KnownHeaders_Enum_as_child (decl_QNetworkRequest_KnownHeaders_Enum, "QtNetwork", "KnownHeaders"); +static gsi::ClassExt decl_QNetworkRequest_KnownHeaders_Enums_as_child (decl_QNetworkRequest_KnownHeaders_Enums, "QtNetwork", "QFlags_KnownHeaders"); } diff --git a/src/gsiqt4/gsiDeclQSsl.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQSsl.cc similarity index 80% rename from src/gsiqt4/gsiDeclQSsl.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQSsl.cc index fe79c7c53..8dc0ad9eb 100644 --- a/src/gsiqt4/gsiDeclQSsl.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQSsl.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -40,7 +40,7 @@ class QSsl_Namespace { }; namespace gsi { -gsi::Class decl_QSsl_Namespace ("QSsl", +gsi::Class decl_QSsl_Namespace ("QtNetwork", "QSsl", gsi::Methods(), "@qt\n@brief This class represents the QSsl namespace"); } @@ -50,18 +50,18 @@ gsi::Class decl_QSsl_Namespace ("QSsl", namespace qt_gsi { -static gsi::Enum decl_QSsl_AlternateNameEntryType_Enum ("QSsl_AlternateNameEntryType", +static gsi::Enum decl_QSsl_AlternateNameEntryType_Enum ("QtNetwork", "QSsl_AlternateNameEntryType", gsi::enum_const ("EmailEntry", QSsl::EmailEntry, "@brief Enum constant QSsl::EmailEntry") + gsi::enum_const ("DnsEntry", QSsl::DnsEntry, "@brief Enum constant QSsl::DnsEntry"), "@qt\n@brief This class represents the QSsl::AlternateNameEntryType enum"); -static gsi::QFlagsClass decl_QSsl_AlternateNameEntryType_Enums ("QSsl_QFlags_AlternateNameEntryType", +static gsi::QFlagsClass decl_QSsl_AlternateNameEntryType_Enums ("QtNetwork", "QSsl_QFlags_AlternateNameEntryType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSsl_AlternateNameEntryType_Enum_in_parent (decl_QSsl_AlternateNameEntryType_Enum.defs ()); -static gsi::ClassExt decl_QSsl_AlternateNameEntryType_Enum_as_child (decl_QSsl_AlternateNameEntryType_Enum, "AlternateNameEntryType"); -static gsi::ClassExt decl_QSsl_AlternateNameEntryType_Enums_as_child (decl_QSsl_AlternateNameEntryType_Enums, "QFlags_AlternateNameEntryType"); +static gsi::ClassExt decl_QSsl_AlternateNameEntryType_Enum_as_child (decl_QSsl_AlternateNameEntryType_Enum, "QtNetwork", "AlternateNameEntryType"); +static gsi::ClassExt decl_QSsl_AlternateNameEntryType_Enums_as_child (decl_QSsl_AlternateNameEntryType_Enums, "QtNetwork", "QFlags_AlternateNameEntryType"); } @@ -70,18 +70,18 @@ static gsi::ClassExt decl_QSsl_AlternateNameEntryType_Enums_as_c namespace qt_gsi { -static gsi::Enum decl_QSsl_EncodingFormat_Enum ("QSsl_EncodingFormat", +static gsi::Enum decl_QSsl_EncodingFormat_Enum ("QtNetwork", "QSsl_EncodingFormat", gsi::enum_const ("Pem", QSsl::Pem, "@brief Enum constant QSsl::Pem") + gsi::enum_const ("Der", QSsl::Der, "@brief Enum constant QSsl::Der"), "@qt\n@brief This class represents the QSsl::EncodingFormat enum"); -static gsi::QFlagsClass decl_QSsl_EncodingFormat_Enums ("QSsl_QFlags_EncodingFormat", +static gsi::QFlagsClass decl_QSsl_EncodingFormat_Enums ("QtNetwork", "QSsl_QFlags_EncodingFormat", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSsl_EncodingFormat_Enum_in_parent (decl_QSsl_EncodingFormat_Enum.defs ()); -static gsi::ClassExt decl_QSsl_EncodingFormat_Enum_as_child (decl_QSsl_EncodingFormat_Enum, "EncodingFormat"); -static gsi::ClassExt decl_QSsl_EncodingFormat_Enums_as_child (decl_QSsl_EncodingFormat_Enums, "QFlags_EncodingFormat"); +static gsi::ClassExt decl_QSsl_EncodingFormat_Enum_as_child (decl_QSsl_EncodingFormat_Enum, "QtNetwork", "EncodingFormat"); +static gsi::ClassExt decl_QSsl_EncodingFormat_Enums_as_child (decl_QSsl_EncodingFormat_Enums, "QtNetwork", "QFlags_EncodingFormat"); } @@ -90,18 +90,18 @@ static gsi::ClassExt decl_QSsl_EncodingFormat_Enums_as_child (de namespace qt_gsi { -static gsi::Enum decl_QSsl_KeyAlgorithm_Enum ("QSsl_KeyAlgorithm", +static gsi::Enum decl_QSsl_KeyAlgorithm_Enum ("QtNetwork", "QSsl_KeyAlgorithm", gsi::enum_const ("Rsa", QSsl::Rsa, "@brief Enum constant QSsl::Rsa") + gsi::enum_const ("Dsa", QSsl::Dsa, "@brief Enum constant QSsl::Dsa"), "@qt\n@brief This class represents the QSsl::KeyAlgorithm enum"); -static gsi::QFlagsClass decl_QSsl_KeyAlgorithm_Enums ("QSsl_QFlags_KeyAlgorithm", +static gsi::QFlagsClass decl_QSsl_KeyAlgorithm_Enums ("QtNetwork", "QSsl_QFlags_KeyAlgorithm", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSsl_KeyAlgorithm_Enum_in_parent (decl_QSsl_KeyAlgorithm_Enum.defs ()); -static gsi::ClassExt decl_QSsl_KeyAlgorithm_Enum_as_child (decl_QSsl_KeyAlgorithm_Enum, "KeyAlgorithm"); -static gsi::ClassExt decl_QSsl_KeyAlgorithm_Enums_as_child (decl_QSsl_KeyAlgorithm_Enums, "QFlags_KeyAlgorithm"); +static gsi::ClassExt decl_QSsl_KeyAlgorithm_Enum_as_child (decl_QSsl_KeyAlgorithm_Enum, "QtNetwork", "KeyAlgorithm"); +static gsi::ClassExt decl_QSsl_KeyAlgorithm_Enums_as_child (decl_QSsl_KeyAlgorithm_Enums, "QtNetwork", "QFlags_KeyAlgorithm"); } @@ -110,18 +110,18 @@ static gsi::ClassExt decl_QSsl_KeyAlgorithm_Enums_as_child (decl namespace qt_gsi { -static gsi::Enum decl_QSsl_KeyType_Enum ("QSsl_KeyType", +static gsi::Enum decl_QSsl_KeyType_Enum ("QtNetwork", "QSsl_KeyType", gsi::enum_const ("PrivateKey", QSsl::PrivateKey, "@brief Enum constant QSsl::PrivateKey") + gsi::enum_const ("PublicKey", QSsl::PublicKey, "@brief Enum constant QSsl::PublicKey"), "@qt\n@brief This class represents the QSsl::KeyType enum"); -static gsi::QFlagsClass decl_QSsl_KeyType_Enums ("QSsl_QFlags_KeyType", +static gsi::QFlagsClass decl_QSsl_KeyType_Enums ("QtNetwork", "QSsl_QFlags_KeyType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSsl_KeyType_Enum_in_parent (decl_QSsl_KeyType_Enum.defs ()); -static gsi::ClassExt decl_QSsl_KeyType_Enum_as_child (decl_QSsl_KeyType_Enum, "KeyType"); -static gsi::ClassExt decl_QSsl_KeyType_Enums_as_child (decl_QSsl_KeyType_Enums, "QFlags_KeyType"); +static gsi::ClassExt decl_QSsl_KeyType_Enum_as_child (decl_QSsl_KeyType_Enum, "QtNetwork", "KeyType"); +static gsi::ClassExt decl_QSsl_KeyType_Enums_as_child (decl_QSsl_KeyType_Enums, "QtNetwork", "QFlags_KeyType"); } @@ -130,7 +130,7 @@ static gsi::ClassExt decl_QSsl_KeyType_Enums_as_child (decl_QSsl namespace qt_gsi { -static gsi::Enum decl_QSsl_SslProtocol_Enum ("QSsl_SslProtocol", +static gsi::Enum decl_QSsl_SslProtocol_Enum ("QtNetwork", "QSsl_SslProtocol", gsi::enum_const ("SslV3", QSsl::SslV3, "@brief Enum constant QSsl::SslV3") + gsi::enum_const ("SslV2", QSsl::SslV2, "@brief Enum constant QSsl::SslV2") + gsi::enum_const ("TlsV1", QSsl::TlsV1, "@brief Enum constant QSsl::TlsV1") + @@ -138,13 +138,13 @@ static gsi::Enum decl_QSsl_SslProtocol_Enum ("QSsl_SslProtoco gsi::enum_const ("UnknownProtocol", QSsl::UnknownProtocol, "@brief Enum constant QSsl::UnknownProtocol"), "@qt\n@brief This class represents the QSsl::SslProtocol enum"); -static gsi::QFlagsClass decl_QSsl_SslProtocol_Enums ("QSsl_QFlags_SslProtocol", +static gsi::QFlagsClass decl_QSsl_SslProtocol_Enums ("QtNetwork", "QSsl_QFlags_SslProtocol", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSsl_SslProtocol_Enum_in_parent (decl_QSsl_SslProtocol_Enum.defs ()); -static gsi::ClassExt decl_QSsl_SslProtocol_Enum_as_child (decl_QSsl_SslProtocol_Enum, "SslProtocol"); -static gsi::ClassExt decl_QSsl_SslProtocol_Enums_as_child (decl_QSsl_SslProtocol_Enums, "QFlags_SslProtocol"); +static gsi::ClassExt decl_QSsl_SslProtocol_Enum_as_child (decl_QSsl_SslProtocol_Enum, "QtNetwork", "SslProtocol"); +static gsi::ClassExt decl_QSsl_SslProtocol_Enums_as_child (decl_QSsl_SslProtocol_Enums, "QtNetwork", "QFlags_SslProtocol"); } diff --git a/src/gsiqt4/gsiDeclQSslCertificate.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQSslCertificate.cc similarity index 97% rename from src/gsiqt4/gsiDeclQSslCertificate.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQSslCertificate.cc index 2084ce041..26ebee31c 100644 --- a/src/gsiqt4/gsiDeclQSslCertificate.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQSslCertificate.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -523,12 +523,12 @@ static gsi::Methods methods_QSslCertificate () { return methods; } -gsi::Class decl_QSslCertificate ("QSslCertificate", +gsi::Class decl_QSslCertificate ("QtNetwork", "QSslCertificate", methods_QSslCertificate (), "@qt\n@brief Binding of QSslCertificate"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSslCertificate () { return decl_QSslCertificate; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QSslCertificate () { return decl_QSslCertificate; } } @@ -537,7 +537,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QSslCertificate () { return dec namespace qt_gsi { -static gsi::Enum decl_QSslCertificate_SubjectInfo_Enum ("QSslCertificate_SubjectInfo", +static gsi::Enum decl_QSslCertificate_SubjectInfo_Enum ("QtNetwork", "QSslCertificate_SubjectInfo", gsi::enum_const ("Organization", QSslCertificate::Organization, "@brief Enum constant QSslCertificate::Organization") + gsi::enum_const ("CommonName", QSslCertificate::CommonName, "@brief Enum constant QSslCertificate::CommonName") + gsi::enum_const ("LocalityName", QSslCertificate::LocalityName, "@brief Enum constant QSslCertificate::LocalityName") + @@ -546,13 +546,13 @@ static gsi::Enum decl_QSslCertificate_SubjectInfo_ gsi::enum_const ("StateOrProvinceName", QSslCertificate::StateOrProvinceName, "@brief Enum constant QSslCertificate::StateOrProvinceName"), "@qt\n@brief This class represents the QSslCertificate::SubjectInfo enum"); -static gsi::QFlagsClass decl_QSslCertificate_SubjectInfo_Enums ("QSslCertificate_QFlags_SubjectInfo", +static gsi::QFlagsClass decl_QSslCertificate_SubjectInfo_Enums ("QtNetwork", "QSslCertificate_QFlags_SubjectInfo", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSslCertificate_SubjectInfo_Enum_in_parent (decl_QSslCertificate_SubjectInfo_Enum.defs ()); -static gsi::ClassExt decl_QSslCertificate_SubjectInfo_Enum_as_child (decl_QSslCertificate_SubjectInfo_Enum, "SubjectInfo"); -static gsi::ClassExt decl_QSslCertificate_SubjectInfo_Enums_as_child (decl_QSslCertificate_SubjectInfo_Enums, "QFlags_SubjectInfo"); +static gsi::ClassExt decl_QSslCertificate_SubjectInfo_Enum_as_child (decl_QSslCertificate_SubjectInfo_Enum, "QtNetwork", "SubjectInfo"); +static gsi::ClassExt decl_QSslCertificate_SubjectInfo_Enums_as_child (decl_QSslCertificate_SubjectInfo_Enums, "QtNetwork", "QFlags_SubjectInfo"); } diff --git a/src/gsiqt4/gsiDeclQSslCipher.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQSslCipher.cc similarity index 97% rename from src/gsiqt4/gsiDeclQSslCipher.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQSslCipher.cc index 246a34695..ac02edb0c 100644 --- a/src/gsiqt4/gsiDeclQSslCipher.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQSslCipher.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -308,12 +308,12 @@ static gsi::Methods methods_QSslCipher () { return methods; } -gsi::Class decl_QSslCipher ("QSslCipher", +gsi::Class decl_QSslCipher ("QtNetwork", "QSslCipher", methods_QSslCipher (), "@qt\n@brief Binding of QSslCipher"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSslCipher () { return decl_QSslCipher; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QSslCipher () { return decl_QSslCipher; } } diff --git a/src/gsiqt4/gsiDeclQSslConfiguration.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQSslConfiguration.cc similarity index 98% rename from src/gsiqt4/gsiDeclQSslConfiguration.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQSslConfiguration.cc index 156ca1f8b..5a3ddac77 100644 --- a/src/gsiqt4/gsiDeclQSslConfiguration.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQSslConfiguration.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -504,12 +504,12 @@ static gsi::Methods methods_QSslConfiguration () { return methods; } -gsi::Class decl_QSslConfiguration ("QSslConfiguration", +gsi::Class decl_QSslConfiguration ("QtNetwork", "QSslConfiguration", methods_QSslConfiguration (), "@qt\n@brief Binding of QSslConfiguration"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSslConfiguration () { return decl_QSslConfiguration; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QSslConfiguration () { return decl_QSslConfiguration; } } diff --git a/src/gsiqt4/gsiDeclQSslError.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQSslError.cc similarity index 96% rename from src/gsiqt4/gsiDeclQSslError.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQSslError.cc index 4a46fbad0..c33957aaa 100644 --- a/src/gsiqt4/gsiDeclQSslError.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQSslError.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -233,12 +233,12 @@ static gsi::Methods methods_QSslError () { return methods; } -gsi::Class decl_QSslError ("QSslError", +gsi::Class decl_QSslError ("QtNetwork", "QSslError", methods_QSslError (), "@qt\n@brief Binding of QSslError"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSslError () { return decl_QSslError; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QSslError () { return decl_QSslError; } } @@ -247,7 +247,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QSslError () { return decl_QSslError; namespace qt_gsi { -static gsi::Enum decl_QSslError_SslError_Enum ("QSslError_SslError", +static gsi::Enum decl_QSslError_SslError_Enum ("QtNetwork", "QSslError_SslError", gsi::enum_const ("NoError", QSslError::NoError, "@brief Enum constant QSslError::NoError") + gsi::enum_const ("UnableToGetIssuerCertificate", QSslError::UnableToGetIssuerCertificate, "@brief Enum constant QSslError::UnableToGetIssuerCertificate") + gsi::enum_const ("UnableToDecryptCertificateSignature", QSslError::UnableToDecryptCertificateSignature, "@brief Enum constant QSslError::UnableToDecryptCertificateSignature") + @@ -275,13 +275,13 @@ static gsi::Enum decl_QSslError_SslError_Enum ("QSslError_S gsi::enum_const ("UnspecifiedError", QSslError::UnspecifiedError, "@brief Enum constant QSslError::UnspecifiedError"), "@qt\n@brief This class represents the QSslError::SslError enum"); -static gsi::QFlagsClass decl_QSslError_SslError_Enums ("QSslError_QFlags_SslError", +static gsi::QFlagsClass decl_QSslError_SslError_Enums ("QtNetwork", "QSslError_QFlags_SslError", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSslError_SslError_Enum_in_parent (decl_QSslError_SslError_Enum.defs ()); -static gsi::ClassExt decl_QSslError_SslError_Enum_as_child (decl_QSslError_SslError_Enum, "SslError"); -static gsi::ClassExt decl_QSslError_SslError_Enums_as_child (decl_QSslError_SslError_Enums, "QFlags_SslError"); +static gsi::ClassExt decl_QSslError_SslError_Enum_as_child (decl_QSslError_SslError_Enum, "QtNetwork", "SslError"); +static gsi::ClassExt decl_QSslError_SslError_Enums_as_child (decl_QSslError_SslError_Enums, "QtNetwork", "QFlags_SslError"); } diff --git a/src/gsiqt4/gsiDeclQSslKey.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQSslKey.cc similarity index 98% rename from src/gsiqt4/gsiDeclQSslKey.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQSslKey.cc index 498a0f9b3..29f52c60c 100644 --- a/src/gsiqt4/gsiDeclQSslKey.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQSslKey.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -343,12 +343,12 @@ static gsi::Methods methods_QSslKey () { return methods; } -gsi::Class decl_QSslKey ("QSslKey", +gsi::Class decl_QSslKey ("QtNetwork", "QSslKey", methods_QSslKey (), "@qt\n@brief Binding of QSslKey"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSslKey () { return decl_QSslKey; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QSslKey () { return decl_QSslKey; } } diff --git a/src/gsiqt4/gsiDeclQSslSocket.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQSslSocket.cc similarity index 98% rename from src/gsiqt4/gsiDeclQSslSocket.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQSslSocket.cc index db109ee48..9ec94adec 100644 --- a/src/gsiqt4/gsiDeclQSslSocket.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQSslSocket.cc @@ -42,8 +42,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1399,12 +1399,12 @@ static gsi::Methods methods_QSslSocket () { gsi::Class &qtdecl_QTcpSocket (); -qt_gsi::QtNativeClass decl_QSslSocket (qtdecl_QTcpSocket (), "QSslSocket", +qt_gsi::QtNativeClass decl_QSslSocket (qtdecl_QTcpSocket (), "QtNetwork", "QSslSocket", methods_QSslSocket (), "@qt\n@brief Binding of QSslSocket"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSslSocket () { return decl_QSslSocket; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QSslSocket () { return decl_QSslSocket; } } @@ -1413,20 +1413,20 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QSslSocket () { return decl_QSslSock namespace qt_gsi { -static gsi::Enum decl_QSslSocket_PeerVerifyMode_Enum ("QSslSocket_PeerVerifyMode", +static gsi::Enum decl_QSslSocket_PeerVerifyMode_Enum ("QtNetwork", "QSslSocket_PeerVerifyMode", gsi::enum_const ("VerifyNone", QSslSocket::VerifyNone, "@brief Enum constant QSslSocket::VerifyNone") + gsi::enum_const ("QueryPeer", QSslSocket::QueryPeer, "@brief Enum constant QSslSocket::QueryPeer") + gsi::enum_const ("VerifyPeer", QSslSocket::VerifyPeer, "@brief Enum constant QSslSocket::VerifyPeer") + gsi::enum_const ("AutoVerifyPeer", QSslSocket::AutoVerifyPeer, "@brief Enum constant QSslSocket::AutoVerifyPeer"), "@qt\n@brief This class represents the QSslSocket::PeerVerifyMode enum"); -static gsi::QFlagsClass decl_QSslSocket_PeerVerifyMode_Enums ("QSslSocket_QFlags_PeerVerifyMode", +static gsi::QFlagsClass decl_QSslSocket_PeerVerifyMode_Enums ("QtNetwork", "QSslSocket_QFlags_PeerVerifyMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSslSocket_PeerVerifyMode_Enum_in_parent (decl_QSslSocket_PeerVerifyMode_Enum.defs ()); -static gsi::ClassExt decl_QSslSocket_PeerVerifyMode_Enum_as_child (decl_QSslSocket_PeerVerifyMode_Enum, "PeerVerifyMode"); -static gsi::ClassExt decl_QSslSocket_PeerVerifyMode_Enums_as_child (decl_QSslSocket_PeerVerifyMode_Enums, "QFlags_PeerVerifyMode"); +static gsi::ClassExt decl_QSslSocket_PeerVerifyMode_Enum_as_child (decl_QSslSocket_PeerVerifyMode_Enum, "QtNetwork", "PeerVerifyMode"); +static gsi::ClassExt decl_QSslSocket_PeerVerifyMode_Enums_as_child (decl_QSslSocket_PeerVerifyMode_Enums, "QtNetwork", "QFlags_PeerVerifyMode"); } @@ -1435,19 +1435,19 @@ static gsi::ClassExt decl_QSslSocket_PeerVerifyMode_Enums_as_child ( namespace qt_gsi { -static gsi::Enum decl_QSslSocket_SslMode_Enum ("QSslSocket_SslMode", +static gsi::Enum decl_QSslSocket_SslMode_Enum ("QtNetwork", "QSslSocket_SslMode", gsi::enum_const ("UnencryptedMode", QSslSocket::UnencryptedMode, "@brief Enum constant QSslSocket::UnencryptedMode") + gsi::enum_const ("SslClientMode", QSslSocket::SslClientMode, "@brief Enum constant QSslSocket::SslClientMode") + gsi::enum_const ("SslServerMode", QSslSocket::SslServerMode, "@brief Enum constant QSslSocket::SslServerMode"), "@qt\n@brief This class represents the QSslSocket::SslMode enum"); -static gsi::QFlagsClass decl_QSslSocket_SslMode_Enums ("QSslSocket_QFlags_SslMode", +static gsi::QFlagsClass decl_QSslSocket_SslMode_Enums ("QtNetwork", "QSslSocket_QFlags_SslMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSslSocket_SslMode_Enum_in_parent (decl_QSslSocket_SslMode_Enum.defs ()); -static gsi::ClassExt decl_QSslSocket_SslMode_Enum_as_child (decl_QSslSocket_SslMode_Enum, "SslMode"); -static gsi::ClassExt decl_QSslSocket_SslMode_Enums_as_child (decl_QSslSocket_SslMode_Enums, "QFlags_SslMode"); +static gsi::ClassExt decl_QSslSocket_SslMode_Enum_as_child (decl_QSslSocket_SslMode_Enum, "QtNetwork", "SslMode"); +static gsi::ClassExt decl_QSslSocket_SslMode_Enums_as_child (decl_QSslSocket_SslMode_Enums, "QtNetwork", "QFlags_SslMode"); } diff --git a/src/gsiqt4/gsiDeclQTcpServer.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQTcpServer.cc similarity index 99% rename from src/gsiqt4/gsiDeclQTcpServer.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQTcpServer.cc index 9eee506be..908f4d64f 100644 --- a/src/gsiqt4/gsiDeclQTcpServer.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQTcpServer.cc @@ -37,8 +37,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -453,11 +453,11 @@ static gsi::Methods methods_QTcpServer () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QTcpServer (qtdecl_QObject (), "QTcpServer_Native", +qt_gsi::QtNativeClass decl_QTcpServer (qtdecl_QObject (), "QtNetwork", "QTcpServer_Native", methods_QTcpServer (), "@hide\n@alias QTcpServer"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTcpServer () { return decl_QTcpServer; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QTcpServer () { return decl_QTcpServer; } } @@ -972,7 +972,7 @@ static gsi::Methods methods_QTcpServer_Adaptor () { return methods; } -gsi::Class decl_QTcpServer_Adaptor (qtdecl_QTcpServer (), "QTcpServer", +gsi::Class decl_QTcpServer_Adaptor (qtdecl_QTcpServer (), "QtNetwork", "QTcpServer", methods_QTcpServer_Adaptor (), "@qt\n@brief Binding of QTcpServer"); diff --git a/src/gsiqt4/gsiDeclQTcpSocket.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQTcpSocket.cc similarity index 97% rename from src/gsiqt4/gsiDeclQTcpSocket.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQTcpSocket.cc index 175c79e76..1498e944b 100644 --- a/src/gsiqt4/gsiDeclQTcpSocket.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQTcpSocket.cc @@ -37,8 +37,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -198,12 +198,12 @@ static gsi::Methods methods_QTcpSocket () { gsi::Class &qtdecl_QAbstractSocket (); -qt_gsi::QtNativeClass decl_QTcpSocket (qtdecl_QAbstractSocket (), "QTcpSocket", +qt_gsi::QtNativeClass decl_QTcpSocket (qtdecl_QAbstractSocket (), "QtNetwork", "QTcpSocket", methods_QTcpSocket (), "@qt\n@brief Binding of QTcpSocket"); -GSIQT_PUBLIC gsi::Class &qtdecl_QTcpSocket () { return decl_QTcpSocket; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QTcpSocket () { return decl_QTcpSocket; } } diff --git a/src/gsiqt4/gsiDeclQUdpSocket.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQUdpSocket.cc similarity index 97% rename from src/gsiqt4/gsiDeclQUdpSocket.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQUdpSocket.cc index 7efa193ec..2e5715daf 100644 --- a/src/gsiqt4/gsiDeclQUdpSocket.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQUdpSocket.cc @@ -37,8 +37,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -377,12 +377,12 @@ static gsi::Methods methods_QUdpSocket () { gsi::Class &qtdecl_QAbstractSocket (); -qt_gsi::QtNativeClass decl_QUdpSocket (qtdecl_QAbstractSocket (), "QUdpSocket", +qt_gsi::QtNativeClass decl_QUdpSocket (qtdecl_QAbstractSocket (), "QtNetwork", "QUdpSocket", methods_QUdpSocket (), "@qt\n@brief Binding of QUdpSocket"); -GSIQT_PUBLIC gsi::Class &qtdecl_QUdpSocket () { return decl_QUdpSocket; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QUdpSocket () { return decl_QUdpSocket; } } @@ -391,20 +391,20 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QUdpSocket () { return decl_QUdpSock namespace qt_gsi { -static gsi::Enum decl_QUdpSocket_BindFlag_Enum ("QUdpSocket_BindFlag", +static gsi::Enum decl_QUdpSocket_BindFlag_Enum ("QtNetwork", "QUdpSocket_BindFlag", gsi::enum_const ("DefaultForPlatform", QUdpSocket::DefaultForPlatform, "@brief Enum constant QUdpSocket::DefaultForPlatform") + gsi::enum_const ("ShareAddress", QUdpSocket::ShareAddress, "@brief Enum constant QUdpSocket::ShareAddress") + gsi::enum_const ("DontShareAddress", QUdpSocket::DontShareAddress, "@brief Enum constant QUdpSocket::DontShareAddress") + gsi::enum_const ("ReuseAddressHint", QUdpSocket::ReuseAddressHint, "@brief Enum constant QUdpSocket::ReuseAddressHint"), "@qt\n@brief This class represents the QUdpSocket::BindFlag enum"); -static gsi::QFlagsClass decl_QUdpSocket_BindFlag_Enums ("QUdpSocket_QFlags_BindFlag", +static gsi::QFlagsClass decl_QUdpSocket_BindFlag_Enums ("QtNetwork", "QUdpSocket_QFlags_BindFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QUdpSocket_BindFlag_Enum_in_parent (decl_QUdpSocket_BindFlag_Enum.defs ()); -static gsi::ClassExt decl_QUdpSocket_BindFlag_Enum_as_child (decl_QUdpSocket_BindFlag_Enum, "BindFlag"); -static gsi::ClassExt decl_QUdpSocket_BindFlag_Enums_as_child (decl_QUdpSocket_BindFlag_Enums, "QFlags_BindFlag"); +static gsi::ClassExt decl_QUdpSocket_BindFlag_Enum_as_child (decl_QUdpSocket_BindFlag_Enum, "QtNetwork", "BindFlag"); +static gsi::ClassExt decl_QUdpSocket_BindFlag_Enums_as_child (decl_QUdpSocket_BindFlag_Enums, "QtNetwork", "QFlags_BindFlag"); } diff --git a/src/gsiqt4/gsiDeclQUrlInfo.cc b/src/gsiqt/qt4/QtNetwork/gsiDeclQUrlInfo.cc similarity index 99% rename from src/gsiqt4/gsiDeclQUrlInfo.cc rename to src/gsiqt/qt4/QtNetwork/gsiDeclQUrlInfo.cc index b78214cc8..c6b484658 100644 --- a/src/gsiqt4/gsiDeclQUrlInfo.cc +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQUrlInfo.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtNetworkCommon.h" +#include "gsiDeclQtNetworkTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -659,11 +659,11 @@ static gsi::Methods methods_QUrlInfo () { return methods; } -gsi::Class decl_QUrlInfo ("QUrlInfo_Native", +gsi::Class decl_QUrlInfo ("QtNetwork", "QUrlInfo_Native", methods_QUrlInfo (), "@hide\n@alias QUrlInfo"); -GSIQT_PUBLIC gsi::Class &qtdecl_QUrlInfo () { return decl_QUrlInfo; } +GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QUrlInfo () { return decl_QUrlInfo; } } @@ -1196,7 +1196,7 @@ static gsi::Methods methods_QUrlInfo_Adaptor () { return methods; } -gsi::Class decl_QUrlInfo_Adaptor (qtdecl_QUrlInfo (), "QUrlInfo", +gsi::Class decl_QUrlInfo_Adaptor (qtdecl_QUrlInfo (), "QtNetwork", "QUrlInfo", methods_QUrlInfo_Adaptor (), "@qt\n@brief Binding of QUrlInfo"); diff --git a/src/gsiqt/qt4/QtNetwork/gsiDeclQtNetworkTypeTraits.h b/src/gsiqt/qt4/QtNetwork/gsiDeclQtNetworkTypeTraits.h new file mode 100644 index 000000000..48c165629 --- /dev/null +++ b/src/gsiqt/qt4/QtNetwork/gsiDeclQtNetworkTypeTraits.h @@ -0,0 +1,443 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2018 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + +/** +* @file generated/gsiDeclQtNetworkTypeTraits.h +* @brief Type traits for the Qt binding classes +* +* DO NOT EDIT THIS FILE. +* This file has been created automatically +*/ + +#ifndef _HDR_gsiDeclQtNetworkTypeTraits +#define _HDR_gsiDeclQtNetworkTypeTraits + +#include "gsiTypes.h" + + +class QAbstractNetworkCache; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QAbstractNetworkCache_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QAbstractSocket; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QAuthenticator; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QCryptographicHash; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QDataStream; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QDataStream_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QDate; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QDateTime; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QFtp; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QFtp_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QHostAddress; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QHostInfo; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QIODevice; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QIPv6Address; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QLocalServer; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QLocalServer_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QLocalSocket; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QLocale; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +struct QMetaObject; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QMetaType; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QNetworkAccessManager; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QNetworkAccessManager_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QNetworkAddressEntry; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QNetworkCacheMetaData; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QNetworkCookie; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QNetworkCookieJar; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QNetworkCookieJar_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QNetworkDiskCache; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QNetworkDiskCache_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QNetworkInterface; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QNetworkProxy; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QNetworkProxyFactory; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QNetworkProxyFactory_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QNetworkProxyQuery; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QNetworkReply; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QNetworkRequest; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QObject; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QObject_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QRegExp; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSsl_Namespace; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QSslCertificate; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSslCipher; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSslConfiguration; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSslError; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSslKey; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSslSocket; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QSysInfo; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSystemLocale; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSystemLocale_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QTcpServer; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QTcpServer_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QTcpSocket; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QTextStream; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QTextStream_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QTime; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QUdpSocket; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QUrl; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QUrlInfo; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QUrlInfo_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class Qt_Namespace; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + + +#endif diff --git a/src/gsiqt/qt4/QtNetwork/gsiQtExternals.h b/src/gsiqt/qt4/QtNetwork/gsiQtExternals.h new file mode 100644 index 000000000..c692fe3df --- /dev/null +++ b/src/gsiqt/qt4/QtNetwork/gsiQtExternals.h @@ -0,0 +1,133 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2018 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + +/* + External declarations for for Qt bindings + + DO NOT EDIT THIS FILE. + This file has been created automatically +*/ + +#if !defined(HDR_gsiQtExternals) +#define HDR_gsiQtExternals + +#include "gsiClassBase.h" +#include "gsiQtNetworkCommon.h" + +class QAbstractNetworkCache; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QAbstractNetworkCache (); } + +class QAbstractSocket; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QAbstractSocket (); } + +class QAuthenticator; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QAuthenticator (); } + +class QFtp; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QFtp (); } + +class QHostAddress; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QHostAddress (); } + +class QHostInfo; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QHostInfo (); } + +class QIPv6Address; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QIPv6Address (); } + +class QLocalServer; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QLocalServer (); } + +class QLocalSocket; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QLocalSocket (); } + +class QNetworkAccessManager; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QNetworkAccessManager (); } + +class QNetworkAddressEntry; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QNetworkAddressEntry (); } + +class QNetworkCacheMetaData; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QNetworkCacheMetaData (); } + +class QNetworkCookie; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QNetworkCookie (); } + +class QNetworkCookieJar; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QNetworkCookieJar (); } + +class QNetworkDiskCache; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QNetworkDiskCache (); } + +class QNetworkInterface; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QNetworkInterface (); } + +class QNetworkProxy; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QNetworkProxy (); } + +class QNetworkProxyFactory; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QNetworkProxyFactory (); } + +class QNetworkProxyQuery; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QNetworkProxyQuery (); } + +class QNetworkReply; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QNetworkReply (); } + +class QNetworkRequest; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QNetworkRequest (); } + +class QSslCertificate; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QSslCertificate (); } + +class QSslCipher; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QSslCipher (); } + +class QSslConfiguration; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QSslConfiguration (); } + +class QSslError; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QSslError (); } + +class QSslKey; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QSslKey (); } + +class QSslSocket; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QSslSocket (); } + +class QTcpServer; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QTcpServer (); } + +class QTcpSocket; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QTcpSocket (); } + +class QUdpSocket; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QUdpSocket (); } + +class QUrlInfo; +namespace gsi { GSI_QTNETWORK_PUBLIC gsi::Class &qtdecl_QUrlInfo (); } + + +#define QT_EXTERNAL_BASE(X) gsi::qtdecl_##X(), + +#endif + diff --git a/src/gsiqt/qt4/QtNetwork/gsiQtNetworkCommon.h b/src/gsiqt/qt4/QtNetwork/gsiQtNetworkCommon.h new file mode 100644 index 000000000..b44449419 --- /dev/null +++ b/src/gsiqt/qt4/QtNetwork/gsiQtNetworkCommon.h @@ -0,0 +1,39 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2018 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + + +#include "tlDefs.h" + +#if !defined(HDR_gsiQtNetworkCommon_h) +# define HDR_gsiQtNetworkCommon_h + +# ifdef MAKE_GSI_QTNETWORK_LIBRARY +# define GSI_QTNETWORK_PUBLIC DEF_INSIDE_PUBLIC +# define GSI_QTNETWORK_PUBLIC_TEMPLATE DEF_INSIDE_PUBLIC_TEMPLATE +# define GSI_QTNETWORK_LOCAL DEF_INSIDE_LOCAL +# else +# define GSI_QTNETWORK_PUBLIC DEF_OUTSIDE_PUBLIC +# define GSI_QTNETWORK_PUBLIC_TEMPLATE DEF_OUTSIDE_PUBLIC_TEMPLATE +# define GSI_QTNETWORK_LOCAL DEF_OUTSIDE_LOCAL +# endif + +#endif diff --git a/src/gsiqt/qt4/QtSql/QtSql.pri b/src/gsiqt/qt4/QtSql/QtSql.pri new file mode 100644 index 000000000..7b5cdf145 --- /dev/null +++ b/src/gsiqt/qt4/QtSql/QtSql.pri @@ -0,0 +1,22 @@ +# +# Partial QMAKE project file for Qt bindings +# +# DO NOT EDIT THIS FILE. +# This file has been created automatically +# + +SOURCES += \ + $$PWD/gsiDeclQSql.cc \ + $$PWD/gsiDeclQSqlDatabase.cc \ + $$PWD/gsiDeclQSqlDriver.cc \ + $$PWD/gsiDeclQSqlDriverCreatorBase.cc \ + $$PWD/gsiDeclQSqlError.cc \ + $$PWD/gsiDeclQSqlField.cc \ + $$PWD/gsiDeclQSqlIndex.cc \ + $$PWD/gsiDeclQSqlQuery.cc \ + $$PWD/gsiDeclQSqlQueryModel.cc \ + $$PWD/gsiDeclQSqlRecord.cc \ + $$PWD/gsiDeclQSqlRelation.cc \ + $$PWD/gsiDeclQSqlRelationalTableModel.cc \ + $$PWD/gsiDeclQSqlResult.cc \ + $$PWD/gsiDeclQSqlTableModel.cc diff --git a/src/gsiqt/qt4/QtSql/QtSql.pro b/src/gsiqt/qt4/QtSql/QtSql.pro new file mode 100644 index 000000000..663f99b2b --- /dev/null +++ b/src/gsiqt/qt4/QtSql/QtSql.pro @@ -0,0 +1,20 @@ + + +DESTDIR = $$OUT_PWD/../../.. +TARGET = klayout_QtSql + +include($$PWD/../../../lib.pri) + +DEFINES += MAKE_GSI_QTSQL_LIBRARY + +INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC +DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC + +LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic + +SOURCES += \ + +HEADERS += \ + +include(QtSql.pri) + diff --git a/src/gsiqt4/gsiDeclQSql.cc b/src/gsiqt/qt4/QtSql/gsiDeclQSql.cc similarity index 82% rename from src/gsiqt4/gsiDeclQSql.cc rename to src/gsiqt/qt4/QtSql/gsiDeclQSql.cc index f3b147b38..d1dd80f84 100644 --- a/src/gsiqt4/gsiDeclQSql.cc +++ b/src/gsiqt/qt4/QtSql/gsiDeclQSql.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtSqlCommon.h" +#include "gsiDeclQtSqlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -40,7 +40,7 @@ class QSql_Namespace { }; namespace gsi { -gsi::Class decl_QSql_Namespace ("QSql", +gsi::Class decl_QSql_Namespace ("QtSql", "QSql", gsi::Methods(), "@qt\n@brief This class represents the QSql namespace"); } @@ -50,18 +50,18 @@ gsi::Class decl_QSql_Namespace ("QSql", namespace qt_gsi { -static gsi::Enum decl_QSql_Location_Enum ("QSql_Location", +static gsi::Enum decl_QSql_Location_Enum ("QtSql", "QSql_Location", gsi::enum_const ("BeforeFirstRow", QSql::BeforeFirstRow, "@brief Enum constant QSql::BeforeFirstRow") + gsi::enum_const ("AfterLastRow", QSql::AfterLastRow, "@brief Enum constant QSql::AfterLastRow"), "@qt\n@brief This class represents the QSql::Location enum"); -static gsi::QFlagsClass decl_QSql_Location_Enums ("QSql_QFlags_Location", +static gsi::QFlagsClass decl_QSql_Location_Enums ("QtSql", "QSql_QFlags_Location", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSql_Location_Enum_in_parent (decl_QSql_Location_Enum.defs ()); -static gsi::ClassExt decl_QSql_Location_Enum_as_child (decl_QSql_Location_Enum, "Location"); -static gsi::ClassExt decl_QSql_Location_Enums_as_child (decl_QSql_Location_Enums, "QFlags_Location"); +static gsi::ClassExt decl_QSql_Location_Enum_as_child (decl_QSql_Location_Enum, "QtSql", "Location"); +static gsi::ClassExt decl_QSql_Location_Enums_as_child (decl_QSql_Location_Enums, "QtSql", "QFlags_Location"); } @@ -70,20 +70,20 @@ static gsi::ClassExt decl_QSql_Location_Enums_as_child (decl_QSq namespace qt_gsi { -static gsi::Enum decl_QSql_NumericalPrecisionPolicy_Enum ("QSql_NumericalPrecisionPolicy", +static gsi::Enum decl_QSql_NumericalPrecisionPolicy_Enum ("QtSql", "QSql_NumericalPrecisionPolicy", gsi::enum_const ("LowPrecisionInt32", QSql::LowPrecisionInt32, "@brief Enum constant QSql::LowPrecisionInt32") + gsi::enum_const ("LowPrecisionInt64", QSql::LowPrecisionInt64, "@brief Enum constant QSql::LowPrecisionInt64") + gsi::enum_const ("LowPrecisionDouble", QSql::LowPrecisionDouble, "@brief Enum constant QSql::LowPrecisionDouble") + gsi::enum_const ("HighPrecision", QSql::HighPrecision, "@brief Enum constant QSql::HighPrecision"), "@qt\n@brief This class represents the QSql::NumericalPrecisionPolicy enum"); -static gsi::QFlagsClass decl_QSql_NumericalPrecisionPolicy_Enums ("QSql_QFlags_NumericalPrecisionPolicy", +static gsi::QFlagsClass decl_QSql_NumericalPrecisionPolicy_Enums ("QtSql", "QSql_QFlags_NumericalPrecisionPolicy", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSql_NumericalPrecisionPolicy_Enum_in_parent (decl_QSql_NumericalPrecisionPolicy_Enum.defs ()); -static gsi::ClassExt decl_QSql_NumericalPrecisionPolicy_Enum_as_child (decl_QSql_NumericalPrecisionPolicy_Enum, "NumericalPrecisionPolicy"); -static gsi::ClassExt decl_QSql_NumericalPrecisionPolicy_Enums_as_child (decl_QSql_NumericalPrecisionPolicy_Enums, "QFlags_NumericalPrecisionPolicy"); +static gsi::ClassExt decl_QSql_NumericalPrecisionPolicy_Enum_as_child (decl_QSql_NumericalPrecisionPolicy_Enum, "QtSql", "NumericalPrecisionPolicy"); +static gsi::ClassExt decl_QSql_NumericalPrecisionPolicy_Enums_as_child (decl_QSql_NumericalPrecisionPolicy_Enums, "QtSql", "QFlags_NumericalPrecisionPolicy"); } @@ -92,20 +92,20 @@ static gsi::ClassExt decl_QSql_NumericalPrecisionPolicy_Enums_as namespace qt_gsi { -static gsi::Enum decl_QSql_ParamTypeFlag_Enum ("QSql_ParamTypeFlag", +static gsi::Enum decl_QSql_ParamTypeFlag_Enum ("QtSql", "QSql_ParamTypeFlag", gsi::enum_const ("In", QSql::In, "@brief Enum constant QSql::In") + gsi::enum_const ("Out", QSql::Out, "@brief Enum constant QSql::Out") + gsi::enum_const ("InOut", QSql::InOut, "@brief Enum constant QSql::InOut") + gsi::enum_const ("Binary", QSql::Binary, "@brief Enum constant QSql::Binary"), "@qt\n@brief This class represents the QSql::ParamTypeFlag enum"); -static gsi::QFlagsClass decl_QSql_ParamTypeFlag_Enums ("QSql_QFlags_ParamTypeFlag", +static gsi::QFlagsClass decl_QSql_ParamTypeFlag_Enums ("QtSql", "QSql_QFlags_ParamTypeFlag", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSql_ParamTypeFlag_Enum_in_parent (decl_QSql_ParamTypeFlag_Enum.defs ()); -static gsi::ClassExt decl_QSql_ParamTypeFlag_Enum_as_child (decl_QSql_ParamTypeFlag_Enum, "ParamTypeFlag"); -static gsi::ClassExt decl_QSql_ParamTypeFlag_Enums_as_child (decl_QSql_ParamTypeFlag_Enums, "QFlags_ParamTypeFlag"); +static gsi::ClassExt decl_QSql_ParamTypeFlag_Enum_as_child (decl_QSql_ParamTypeFlag_Enum, "QtSql", "ParamTypeFlag"); +static gsi::ClassExt decl_QSql_ParamTypeFlag_Enums_as_child (decl_QSql_ParamTypeFlag_Enums, "QtSql", "QFlags_ParamTypeFlag"); } @@ -114,20 +114,20 @@ static gsi::ClassExt decl_QSql_ParamTypeFlag_Enums_as_child (dec namespace qt_gsi { -static gsi::Enum decl_QSql_TableType_Enum ("QSql_TableType", +static gsi::Enum decl_QSql_TableType_Enum ("QtSql", "QSql_TableType", gsi::enum_const ("Tables", QSql::Tables, "@brief Enum constant QSql::Tables") + gsi::enum_const ("SystemTables", QSql::SystemTables, "@brief Enum constant QSql::SystemTables") + gsi::enum_const ("Views", QSql::Views, "@brief Enum constant QSql::Views") + gsi::enum_const ("AllTables", QSql::AllTables, "@brief Enum constant QSql::AllTables"), "@qt\n@brief This class represents the QSql::TableType enum"); -static gsi::QFlagsClass decl_QSql_TableType_Enums ("QSql_QFlags_TableType", +static gsi::QFlagsClass decl_QSql_TableType_Enums ("QtSql", "QSql_QFlags_TableType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSql_TableType_Enum_in_parent (decl_QSql_TableType_Enum.defs ()); -static gsi::ClassExt decl_QSql_TableType_Enum_as_child (decl_QSql_TableType_Enum, "TableType"); -static gsi::ClassExt decl_QSql_TableType_Enums_as_child (decl_QSql_TableType_Enums, "QFlags_TableType"); +static gsi::ClassExt decl_QSql_TableType_Enum_as_child (decl_QSql_TableType_Enum, "QtSql", "TableType"); +static gsi::ClassExt decl_QSql_TableType_Enums_as_child (decl_QSql_TableType_Enums, "QtSql", "QFlags_TableType"); } diff --git a/src/gsiqt4/gsiDeclQSqlDatabase.cc b/src/gsiqt/qt4/QtSql/gsiDeclQSqlDatabase.cc similarity index 99% rename from src/gsiqt4/gsiDeclQSqlDatabase.cc rename to src/gsiqt/qt4/QtSql/gsiDeclQSqlDatabase.cc index 8998f6aee..e36501a60 100644 --- a/src/gsiqt4/gsiDeclQSqlDatabase.cc +++ b/src/gsiqt/qt4/QtSql/gsiDeclQSqlDatabase.cc @@ -35,8 +35,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtSqlCommon.h" +#include "gsiDeclQtSqlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -871,12 +871,12 @@ static gsi::Methods methods_QSqlDatabase () { return methods; } -gsi::Class decl_QSqlDatabase ("QSqlDatabase", +gsi::Class decl_QSqlDatabase ("QtSql", "QSqlDatabase", methods_QSqlDatabase (), "@qt\n@brief Binding of QSqlDatabase"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSqlDatabase () { return decl_QSqlDatabase; } +GSI_QTSQL_PUBLIC gsi::Class &qtdecl_QSqlDatabase () { return decl_QSqlDatabase; } } diff --git a/src/gsiqt4/gsiDeclQSqlDriver.cc b/src/gsiqt/qt4/QtSql/gsiDeclQSqlDriver.cc similarity index 98% rename from src/gsiqt4/gsiDeclQSqlDriver.cc rename to src/gsiqt/qt4/QtSql/gsiDeclQSqlDriver.cc index c809d9f2d..70327015a 100644 --- a/src/gsiqt4/gsiDeclQSqlDriver.cc +++ b/src/gsiqt/qt4/QtSql/gsiDeclQSqlDriver.cc @@ -39,8 +39,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtSqlCommon.h" +#include "gsiDeclQtSqlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -644,11 +644,11 @@ static gsi::Methods methods_QSqlDriver () { gsi::Class &qtdecl_QObject (); -qt_gsi::QtNativeClass decl_QSqlDriver (qtdecl_QObject (), "QSqlDriver_Native", +qt_gsi::QtNativeClass decl_QSqlDriver (qtdecl_QObject (), "QtSql", "QSqlDriver_Native", methods_QSqlDriver (), "@hide\n@alias QSqlDriver"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSqlDriver () { return decl_QSqlDriver; } +GSI_QTSQL_PUBLIC gsi::Class &qtdecl_QSqlDriver () { return decl_QSqlDriver; } } @@ -1924,7 +1924,7 @@ static gsi::Methods methods_QSqlDriver_Adaptor () { return methods; } -gsi::Class decl_QSqlDriver_Adaptor (qtdecl_QSqlDriver (), "QSqlDriver", +gsi::Class decl_QSqlDriver_Adaptor (qtdecl_QSqlDriver (), "QtSql", "QSqlDriver", methods_QSqlDriver_Adaptor (), "@qt\n@brief Binding of QSqlDriver"); @@ -1935,7 +1935,7 @@ gsi::Class decl_QSqlDriver_Adaptor (qtdecl_QSqlDriver (), "Q namespace qt_gsi { -static gsi::Enum decl_QSqlDriver_DriverFeature_Enum ("QSqlDriver_DriverFeature", +static gsi::Enum decl_QSqlDriver_DriverFeature_Enum ("QtSql", "QSqlDriver_DriverFeature", gsi::enum_const ("Transactions", QSqlDriver::Transactions, "@brief Enum constant QSqlDriver::Transactions") + gsi::enum_const ("QuerySize", QSqlDriver::QuerySize, "@brief Enum constant QSqlDriver::QuerySize") + gsi::enum_const ("BLOB", QSqlDriver::BLOB, "@brief Enum constant QSqlDriver::BLOB") + @@ -1952,13 +1952,13 @@ static gsi::Enum decl_QSqlDriver_DriverFeature_Enum ( gsi::enum_const ("MultipleResultSets", QSqlDriver::MultipleResultSets, "@brief Enum constant QSqlDriver::MultipleResultSets"), "@qt\n@brief This class represents the QSqlDriver::DriverFeature enum"); -static gsi::QFlagsClass decl_QSqlDriver_DriverFeature_Enums ("QSqlDriver_QFlags_DriverFeature", +static gsi::QFlagsClass decl_QSqlDriver_DriverFeature_Enums ("QtSql", "QSqlDriver_QFlags_DriverFeature", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSqlDriver_DriverFeature_Enum_in_parent (decl_QSqlDriver_DriverFeature_Enum.defs ()); -static gsi::ClassExt decl_QSqlDriver_DriverFeature_Enum_as_child (decl_QSqlDriver_DriverFeature_Enum, "DriverFeature"); -static gsi::ClassExt decl_QSqlDriver_DriverFeature_Enums_as_child (decl_QSqlDriver_DriverFeature_Enums, "QFlags_DriverFeature"); +static gsi::ClassExt decl_QSqlDriver_DriverFeature_Enum_as_child (decl_QSqlDriver_DriverFeature_Enum, "QtSql", "DriverFeature"); +static gsi::ClassExt decl_QSqlDriver_DriverFeature_Enums_as_child (decl_QSqlDriver_DriverFeature_Enums, "QtSql", "QFlags_DriverFeature"); } @@ -1967,18 +1967,18 @@ static gsi::ClassExt decl_QSqlDriver_DriverFeature_Enums_as_child (d namespace qt_gsi { -static gsi::Enum decl_QSqlDriver_IdentifierType_Enum ("QSqlDriver_IdentifierType", +static gsi::Enum decl_QSqlDriver_IdentifierType_Enum ("QtSql", "QSqlDriver_IdentifierType", gsi::enum_const ("FieldName", QSqlDriver::FieldName, "@brief Enum constant QSqlDriver::FieldName") + gsi::enum_const ("TableName", QSqlDriver::TableName, "@brief Enum constant QSqlDriver::TableName"), "@qt\n@brief This class represents the QSqlDriver::IdentifierType enum"); -static gsi::QFlagsClass decl_QSqlDriver_IdentifierType_Enums ("QSqlDriver_QFlags_IdentifierType", +static gsi::QFlagsClass decl_QSqlDriver_IdentifierType_Enums ("QtSql", "QSqlDriver_QFlags_IdentifierType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSqlDriver_IdentifierType_Enum_in_parent (decl_QSqlDriver_IdentifierType_Enum.defs ()); -static gsi::ClassExt decl_QSqlDriver_IdentifierType_Enum_as_child (decl_QSqlDriver_IdentifierType_Enum, "IdentifierType"); -static gsi::ClassExt decl_QSqlDriver_IdentifierType_Enums_as_child (decl_QSqlDriver_IdentifierType_Enums, "QFlags_IdentifierType"); +static gsi::ClassExt decl_QSqlDriver_IdentifierType_Enum_as_child (decl_QSqlDriver_IdentifierType_Enum, "QtSql", "IdentifierType"); +static gsi::ClassExt decl_QSqlDriver_IdentifierType_Enums_as_child (decl_QSqlDriver_IdentifierType_Enums, "QtSql", "QFlags_IdentifierType"); } @@ -1987,7 +1987,7 @@ static gsi::ClassExt decl_QSqlDriver_IdentifierType_Enums_as_child ( namespace qt_gsi { -static gsi::Enum decl_QSqlDriver_StatementType_Enum ("QSqlDriver_StatementType", +static gsi::Enum decl_QSqlDriver_StatementType_Enum ("QtSql", "QSqlDriver_StatementType", gsi::enum_const ("WhereStatement", QSqlDriver::WhereStatement, "@brief Enum constant QSqlDriver::WhereStatement") + gsi::enum_const ("SelectStatement", QSqlDriver::SelectStatement, "@brief Enum constant QSqlDriver::SelectStatement") + gsi::enum_const ("UpdateStatement", QSqlDriver::UpdateStatement, "@brief Enum constant QSqlDriver::UpdateStatement") + @@ -1995,13 +1995,13 @@ static gsi::Enum decl_QSqlDriver_StatementType_Enum ( gsi::enum_const ("DeleteStatement", QSqlDriver::DeleteStatement, "@brief Enum constant QSqlDriver::DeleteStatement"), "@qt\n@brief This class represents the QSqlDriver::StatementType enum"); -static gsi::QFlagsClass decl_QSqlDriver_StatementType_Enums ("QSqlDriver_QFlags_StatementType", +static gsi::QFlagsClass decl_QSqlDriver_StatementType_Enums ("QtSql", "QSqlDriver_QFlags_StatementType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSqlDriver_StatementType_Enum_in_parent (decl_QSqlDriver_StatementType_Enum.defs ()); -static gsi::ClassExt decl_QSqlDriver_StatementType_Enum_as_child (decl_QSqlDriver_StatementType_Enum, "StatementType"); -static gsi::ClassExt decl_QSqlDriver_StatementType_Enums_as_child (decl_QSqlDriver_StatementType_Enums, "QFlags_StatementType"); +static gsi::ClassExt decl_QSqlDriver_StatementType_Enum_as_child (decl_QSqlDriver_StatementType_Enum, "QtSql", "StatementType"); +static gsi::ClassExt decl_QSqlDriver_StatementType_Enums_as_child (decl_QSqlDriver_StatementType_Enums, "QtSql", "QFlags_StatementType"); } diff --git a/src/gsiqt4/gsiDeclQSqlDriverCreatorBase.cc b/src/gsiqt/qt4/QtSql/gsiDeclQSqlDriverCreatorBase.cc similarity index 94% rename from src/gsiqt4/gsiDeclQSqlDriverCreatorBase.cc rename to src/gsiqt/qt4/QtSql/gsiDeclQSqlDriverCreatorBase.cc index e52751202..eb9c51899 100644 --- a/src/gsiqt4/gsiDeclQSqlDriverCreatorBase.cc +++ b/src/gsiqt/qt4/QtSql/gsiDeclQSqlDriverCreatorBase.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtSqlCommon.h" +#include "gsiDeclQtSqlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -61,11 +61,11 @@ static gsi::Methods methods_QSqlDriverCreatorBase () { return methods; } -gsi::Class decl_QSqlDriverCreatorBase ("QSqlDriverCreatorBase_Native", +gsi::Class decl_QSqlDriverCreatorBase ("QtSql", "QSqlDriverCreatorBase_Native", methods_QSqlDriverCreatorBase (), "@hide\n@alias QSqlDriverCreatorBase"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSqlDriverCreatorBase () { return decl_QSqlDriverCreatorBase; } +GSI_QTSQL_PUBLIC gsi::Class &qtdecl_QSqlDriverCreatorBase () { return decl_QSqlDriverCreatorBase; } } @@ -148,7 +148,7 @@ static gsi::Methods methods_QSqlDriverCreatorBase_Adaptor () { return methods; } -gsi::Class decl_QSqlDriverCreatorBase_Adaptor (qtdecl_QSqlDriverCreatorBase (), "QSqlDriverCreatorBase", +gsi::Class decl_QSqlDriverCreatorBase_Adaptor (qtdecl_QSqlDriverCreatorBase (), "QtSql", "QSqlDriverCreatorBase", methods_QSqlDriverCreatorBase_Adaptor (), "@qt\n@brief Binding of QSqlDriverCreatorBase"); diff --git a/src/gsiqt4/gsiDeclQSqlError.cc b/src/gsiqt/qt4/QtSql/gsiDeclQSqlError.cc similarity index 96% rename from src/gsiqt4/gsiDeclQSqlError.cc rename to src/gsiqt/qt4/QtSql/gsiDeclQSqlError.cc index cf0e78e1d..699cd0c64 100644 --- a/src/gsiqt4/gsiDeclQSqlError.cc +++ b/src/gsiqt/qt4/QtSql/gsiDeclQSqlError.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtSqlCommon.h" +#include "gsiDeclQtSqlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -294,12 +294,12 @@ static gsi::Methods methods_QSqlError () { return methods; } -gsi::Class decl_QSqlError ("QSqlError", +gsi::Class decl_QSqlError ("QtSql", "QSqlError", methods_QSqlError (), "@qt\n@brief Binding of QSqlError"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSqlError () { return decl_QSqlError; } +GSI_QTSQL_PUBLIC gsi::Class &qtdecl_QSqlError () { return decl_QSqlError; } } @@ -308,7 +308,7 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QSqlError () { return decl_QSqlError; namespace qt_gsi { -static gsi::Enum decl_QSqlError_ErrorType_Enum ("QSqlError_ErrorType", +static gsi::Enum decl_QSqlError_ErrorType_Enum ("QtSql", "QSqlError_ErrorType", gsi::enum_const ("NoError", QSqlError::NoError, "@brief Enum constant QSqlError::NoError") + gsi::enum_const ("ConnectionError", QSqlError::ConnectionError, "@brief Enum constant QSqlError::ConnectionError") + gsi::enum_const ("StatementError", QSqlError::StatementError, "@brief Enum constant QSqlError::StatementError") + @@ -316,13 +316,13 @@ static gsi::Enum decl_QSqlError_ErrorType_Enum ("QSqlError gsi::enum_const ("UnknownError", QSqlError::UnknownError, "@brief Enum constant QSqlError::UnknownError"), "@qt\n@brief This class represents the QSqlError::ErrorType enum"); -static gsi::QFlagsClass decl_QSqlError_ErrorType_Enums ("QSqlError_QFlags_ErrorType", +static gsi::QFlagsClass decl_QSqlError_ErrorType_Enums ("QtSql", "QSqlError_QFlags_ErrorType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSqlError_ErrorType_Enum_in_parent (decl_QSqlError_ErrorType_Enum.defs ()); -static gsi::ClassExt decl_QSqlError_ErrorType_Enum_as_child (decl_QSqlError_ErrorType_Enum, "ErrorType"); -static gsi::ClassExt decl_QSqlError_ErrorType_Enums_as_child (decl_QSqlError_ErrorType_Enums, "QFlags_ErrorType"); +static gsi::ClassExt decl_QSqlError_ErrorType_Enum_as_child (decl_QSqlError_ErrorType_Enum, "QtSql", "ErrorType"); +static gsi::ClassExt decl_QSqlError_ErrorType_Enums_as_child (decl_QSqlError_ErrorType_Enums, "QtSql", "QFlags_ErrorType"); } diff --git a/src/gsiqt4/gsiDeclQSqlField.cc b/src/gsiqt/qt4/QtSql/gsiDeclQSqlField.cc similarity index 98% rename from src/gsiqt4/gsiDeclQSqlField.cc rename to src/gsiqt/qt4/QtSql/gsiDeclQSqlField.cc index f81a67795..9fc7ac5d7 100644 --- a/src/gsiqt4/gsiDeclQSqlField.cc +++ b/src/gsiqt/qt4/QtSql/gsiDeclQSqlField.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtSqlCommon.h" +#include "gsiDeclQtSqlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -625,12 +625,12 @@ static gsi::Methods methods_QSqlField () { return methods; } -gsi::Class decl_QSqlField ("QSqlField", +gsi::Class decl_QSqlField ("QtSql", "QSqlField", methods_QSqlField (), "@qt\n@brief Binding of QSqlField"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSqlField () { return decl_QSqlField; } +GSI_QTSQL_PUBLIC gsi::Class &qtdecl_QSqlField () { return decl_QSqlField; } } @@ -639,19 +639,19 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QSqlField () { return decl_QSqlField; namespace qt_gsi { -static gsi::Enum decl_QSqlField_RequiredStatus_Enum ("QSqlField_RequiredStatus", +static gsi::Enum decl_QSqlField_RequiredStatus_Enum ("QtSql", "QSqlField_RequiredStatus", gsi::enum_const ("Unknown", QSqlField::Unknown, "@brief Enum constant QSqlField::Unknown") + gsi::enum_const ("Optional", QSqlField::Optional, "@brief Enum constant QSqlField::Optional") + gsi::enum_const ("Required", QSqlField::Required, "@brief Enum constant QSqlField::Required"), "@qt\n@brief This class represents the QSqlField::RequiredStatus enum"); -static gsi::QFlagsClass decl_QSqlField_RequiredStatus_Enums ("QSqlField_QFlags_RequiredStatus", +static gsi::QFlagsClass decl_QSqlField_RequiredStatus_Enums ("QtSql", "QSqlField_QFlags_RequiredStatus", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSqlField_RequiredStatus_Enum_in_parent (decl_QSqlField_RequiredStatus_Enum.defs ()); -static gsi::ClassExt decl_QSqlField_RequiredStatus_Enum_as_child (decl_QSqlField_RequiredStatus_Enum, "RequiredStatus"); -static gsi::ClassExt decl_QSqlField_RequiredStatus_Enums_as_child (decl_QSqlField_RequiredStatus_Enums, "QFlags_RequiredStatus"); +static gsi::ClassExt decl_QSqlField_RequiredStatus_Enum_as_child (decl_QSqlField_RequiredStatus_Enum, "QtSql", "RequiredStatus"); +static gsi::ClassExt decl_QSqlField_RequiredStatus_Enums_as_child (decl_QSqlField_RequiredStatus_Enums, "QtSql", "QFlags_RequiredStatus"); } diff --git a/src/gsiqt4/gsiDeclQSqlIndex.cc b/src/gsiqt/qt4/QtSql/gsiDeclQSqlIndex.cc similarity index 97% rename from src/gsiqt4/gsiDeclQSqlIndex.cc rename to src/gsiqt/qt4/QtSql/gsiDeclQSqlIndex.cc index b3e2540cd..95180084e 100644 --- a/src/gsiqt4/gsiDeclQSqlIndex.cc +++ b/src/gsiqt/qt4/QtSql/gsiDeclQSqlIndex.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtSqlCommon.h" +#include "gsiDeclQtSqlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -275,12 +275,12 @@ static gsi::Methods methods_QSqlIndex () { gsi::Class &qtdecl_QSqlRecord (); -gsi::Class decl_QSqlIndex (qtdecl_QSqlRecord (), "QSqlIndex", +gsi::Class decl_QSqlIndex (qtdecl_QSqlRecord (), "QtSql", "QSqlIndex", methods_QSqlIndex (), "@qt\n@brief Binding of QSqlIndex"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSqlIndex () { return decl_QSqlIndex; } +GSI_QTSQL_PUBLIC gsi::Class &qtdecl_QSqlIndex () { return decl_QSqlIndex; } } diff --git a/src/gsiqt4/gsiDeclQSqlQuery.cc b/src/gsiqt/qt4/QtSql/gsiDeclQSqlQuery.cc similarity index 98% rename from src/gsiqt4/gsiDeclQSqlQuery.cc rename to src/gsiqt/qt4/QtSql/gsiDeclQSqlQuery.cc index 1ff72c9c7..b631c7858 100644 --- a/src/gsiqt4/gsiDeclQSqlQuery.cc +++ b/src/gsiqt/qt4/QtSql/gsiDeclQSqlQuery.cc @@ -34,8 +34,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtSqlCommon.h" +#include "gsiDeclQtSqlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -822,12 +822,12 @@ static gsi::Methods methods_QSqlQuery () { return methods; } -gsi::Class decl_QSqlQuery ("QSqlQuery", +gsi::Class decl_QSqlQuery ("QtSql", "QSqlQuery", methods_QSqlQuery (), "@qt\n@brief Binding of QSqlQuery"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSqlQuery () { return decl_QSqlQuery; } +GSI_QTSQL_PUBLIC gsi::Class &qtdecl_QSqlQuery () { return decl_QSqlQuery; } } @@ -836,18 +836,18 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QSqlQuery () { return decl_QSqlQuery; namespace qt_gsi { -static gsi::Enum decl_QSqlQuery_BatchExecutionMode_Enum ("QSqlQuery_BatchExecutionMode", +static gsi::Enum decl_QSqlQuery_BatchExecutionMode_Enum ("QtSql", "QSqlQuery_BatchExecutionMode", gsi::enum_const ("ValuesAsRows", QSqlQuery::ValuesAsRows, "@brief Enum constant QSqlQuery::ValuesAsRows") + gsi::enum_const ("ValuesAsColumns", QSqlQuery::ValuesAsColumns, "@brief Enum constant QSqlQuery::ValuesAsColumns"), "@qt\n@brief This class represents the QSqlQuery::BatchExecutionMode enum"); -static gsi::QFlagsClass decl_QSqlQuery_BatchExecutionMode_Enums ("QSqlQuery_QFlags_BatchExecutionMode", +static gsi::QFlagsClass decl_QSqlQuery_BatchExecutionMode_Enums ("QtSql", "QSqlQuery_QFlags_BatchExecutionMode", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSqlQuery_BatchExecutionMode_Enum_in_parent (decl_QSqlQuery_BatchExecutionMode_Enum.defs ()); -static gsi::ClassExt decl_QSqlQuery_BatchExecutionMode_Enum_as_child (decl_QSqlQuery_BatchExecutionMode_Enum, "BatchExecutionMode"); -static gsi::ClassExt decl_QSqlQuery_BatchExecutionMode_Enums_as_child (decl_QSqlQuery_BatchExecutionMode_Enums, "QFlags_BatchExecutionMode"); +static gsi::ClassExt decl_QSqlQuery_BatchExecutionMode_Enum_as_child (decl_QSqlQuery_BatchExecutionMode_Enum, "QtSql", "BatchExecutionMode"); +static gsi::ClassExt decl_QSqlQuery_BatchExecutionMode_Enums_as_child (decl_QSqlQuery_BatchExecutionMode_Enums, "QtSql", "QFlags_BatchExecutionMode"); } diff --git a/src/gsiqt4/gsiDeclQSqlQueryModel.cc b/src/gsiqt/qt4/QtSql/gsiDeclQSqlQueryModel.cc similarity index 99% rename from src/gsiqt4/gsiDeclQSqlQueryModel.cc rename to src/gsiqt/qt4/QtSql/gsiDeclQSqlQueryModel.cc index 968a76f96..641b1ba64 100644 --- a/src/gsiqt4/gsiDeclQSqlQueryModel.cc +++ b/src/gsiqt/qt4/QtSql/gsiDeclQSqlQueryModel.cc @@ -42,8 +42,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtSqlCommon.h" +#include "gsiDeclQtSqlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -517,11 +517,11 @@ static gsi::Methods methods_QSqlQueryModel () { gsi::Class &qtdecl_QAbstractTableModel (); -qt_gsi::QtNativeClass decl_QSqlQueryModel (qtdecl_QAbstractTableModel (), "QSqlQueryModel_Native", +qt_gsi::QtNativeClass decl_QSqlQueryModel (qtdecl_QAbstractTableModel (), "QtSql", "QSqlQueryModel_Native", methods_QSqlQueryModel (), "@hide\n@alias QSqlQueryModel"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSqlQueryModel () { return decl_QSqlQueryModel; } +GSI_QTSQL_PUBLIC gsi::Class &qtdecl_QSqlQueryModel () { return decl_QSqlQueryModel; } } @@ -2899,7 +2899,7 @@ static gsi::Methods methods_QSqlQueryModel_Adaptor () { return methods; } -gsi::Class decl_QSqlQueryModel_Adaptor (qtdecl_QSqlQueryModel (), "QSqlQueryModel", +gsi::Class decl_QSqlQueryModel_Adaptor (qtdecl_QSqlQueryModel (), "QtSql", "QSqlQueryModel", methods_QSqlQueryModel_Adaptor (), "@qt\n@brief Binding of QSqlQueryModel"); diff --git a/src/gsiqt4/gsiDeclQSqlRecord.cc b/src/gsiqt/qt4/QtSql/gsiDeclQSqlRecord.cc similarity index 99% rename from src/gsiqt4/gsiDeclQSqlRecord.cc rename to src/gsiqt/qt4/QtSql/gsiDeclQSqlRecord.cc index 655cbb90e..06217a116 100644 --- a/src/gsiqt4/gsiDeclQSqlRecord.cc +++ b/src/gsiqt/qt4/QtSql/gsiDeclQSqlRecord.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtSqlCommon.h" +#include "gsiDeclQtSqlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -656,12 +656,12 @@ static gsi::Methods methods_QSqlRecord () { return methods; } -gsi::Class decl_QSqlRecord ("QSqlRecord", +gsi::Class decl_QSqlRecord ("QtSql", "QSqlRecord", methods_QSqlRecord (), "@qt\n@brief Binding of QSqlRecord"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSqlRecord () { return decl_QSqlRecord; } +GSI_QTSQL_PUBLIC gsi::Class &qtdecl_QSqlRecord () { return decl_QSqlRecord; } } diff --git a/src/gsiqt4/gsiDeclQSqlRelation.cc b/src/gsiqt/qt4/QtSql/gsiDeclQSqlRelation.cc similarity index 95% rename from src/gsiqt4/gsiDeclQSqlRelation.cc rename to src/gsiqt/qt4/QtSql/gsiDeclQSqlRelation.cc index a27e6ac66..0051532e2 100644 --- a/src/gsiqt4/gsiDeclQSqlRelation.cc +++ b/src/gsiqt/qt4/QtSql/gsiDeclQSqlRelation.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtSqlCommon.h" +#include "gsiDeclQtSqlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -151,12 +151,12 @@ static gsi::Methods methods_QSqlRelation () { return methods; } -gsi::Class decl_QSqlRelation ("QSqlRelation", +gsi::Class decl_QSqlRelation ("QtSql", "QSqlRelation", methods_QSqlRelation (), "@qt\n@brief Binding of QSqlRelation"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSqlRelation () { return decl_QSqlRelation; } +GSI_QTSQL_PUBLIC gsi::Class &qtdecl_QSqlRelation () { return decl_QSqlRelation; } } diff --git a/src/gsiqt4/gsiDeclQSqlRelationalTableModel.cc b/src/gsiqt/qt4/QtSql/gsiDeclQSqlRelationalTableModel.cc similarity index 99% rename from src/gsiqt4/gsiDeclQSqlRelationalTableModel.cc rename to src/gsiqt/qt4/QtSql/gsiDeclQSqlRelationalTableModel.cc index 71be01c68..327bf8b9f 100644 --- a/src/gsiqt4/gsiDeclQSqlRelationalTableModel.cc +++ b/src/gsiqt/qt4/QtSql/gsiDeclQSqlRelationalTableModel.cc @@ -45,8 +45,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtSqlCommon.h" +#include "gsiDeclQtSqlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -397,11 +397,11 @@ static gsi::Methods methods_QSqlRelationalTableModel () { gsi::Class &qtdecl_QSqlTableModel (); -qt_gsi::QtNativeClass decl_QSqlRelationalTableModel (qtdecl_QSqlTableModel (), "QSqlRelationalTableModel_Native", +qt_gsi::QtNativeClass decl_QSqlRelationalTableModel (qtdecl_QSqlTableModel (), "QtSql", "QSqlRelationalTableModel_Native", methods_QSqlRelationalTableModel (), "@hide\n@alias QSqlRelationalTableModel"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSqlRelationalTableModel () { return decl_QSqlRelationalTableModel; } +GSI_QTSQL_PUBLIC gsi::Class &qtdecl_QSqlRelationalTableModel () { return decl_QSqlRelationalTableModel; } } @@ -3480,7 +3480,7 @@ static gsi::Methods methods_QSqlRelationalTableModel_Adaptor () { return methods; } -gsi::Class decl_QSqlRelationalTableModel_Adaptor (qtdecl_QSqlRelationalTableModel (), "QSqlRelationalTableModel", +gsi::Class decl_QSqlRelationalTableModel_Adaptor (qtdecl_QSqlRelationalTableModel (), "QtSql", "QSqlRelationalTableModel", methods_QSqlRelationalTableModel_Adaptor (), "@qt\n@brief Binding of QSqlRelationalTableModel"); diff --git a/src/gsiqt4/gsiDeclQSqlResult.cc b/src/gsiqt/qt4/QtSql/gsiDeclQSqlResult.cc similarity index 99% rename from src/gsiqt4/gsiDeclQSqlResult.cc rename to src/gsiqt/qt4/QtSql/gsiDeclQSqlResult.cc index 0ff9b836c..bd27d8beb 100644 --- a/src/gsiqt4/gsiDeclQSqlResult.cc +++ b/src/gsiqt/qt4/QtSql/gsiDeclQSqlResult.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtSqlCommon.h" +#include "gsiDeclQtSqlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -63,11 +63,11 @@ static gsi::Methods methods_QSqlResult () { return methods; } -gsi::Class decl_QSqlResult ("QSqlResult_Native", +gsi::Class decl_QSqlResult ("QtSql", "QSqlResult_Native", methods_QSqlResult (), "@hide\n@alias QSqlResult"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSqlResult () { return decl_QSqlResult; } +GSI_QTSQL_PUBLIC gsi::Class &qtdecl_QSqlResult () { return decl_QSqlResult; } } @@ -1644,7 +1644,7 @@ static gsi::Methods methods_QSqlResult_Adaptor () { return methods; } -gsi::Class decl_QSqlResult_Adaptor (qtdecl_QSqlResult (), "QSqlResult", +gsi::Class decl_QSqlResult_Adaptor (qtdecl_QSqlResult (), "QtSql", "QSqlResult", methods_QSqlResult_Adaptor (), "@qt\n@brief Binding of QSqlResult"); diff --git a/src/gsiqt4/gsiDeclQSqlTableModel.cc b/src/gsiqt/qt4/QtSql/gsiDeclQSqlTableModel.cc similarity index 99% rename from src/gsiqt4/gsiDeclQSqlTableModel.cc rename to src/gsiqt/qt4/QtSql/gsiDeclQSqlTableModel.cc index 3274faf77..86dc2a083 100644 --- a/src/gsiqt4/gsiDeclQSqlTableModel.cc +++ b/src/gsiqt/qt4/QtSql/gsiDeclQSqlTableModel.cc @@ -43,8 +43,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtSqlCommon.h" +#include "gsiDeclQtSqlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -771,11 +771,11 @@ static gsi::Methods methods_QSqlTableModel () { gsi::Class &qtdecl_QSqlQueryModel (); -qt_gsi::QtNativeClass decl_QSqlTableModel (qtdecl_QSqlQueryModel (), "QSqlTableModel_Native", +qt_gsi::QtNativeClass decl_QSqlTableModel (qtdecl_QSqlQueryModel (), "QtSql", "QSqlTableModel_Native", methods_QSqlTableModel (), "@hide\n@alias QSqlTableModel"); -GSIQT_PUBLIC gsi::Class &qtdecl_QSqlTableModel () { return decl_QSqlTableModel; } +GSI_QTSQL_PUBLIC gsi::Class &qtdecl_QSqlTableModel () { return decl_QSqlTableModel; } } @@ -3768,7 +3768,7 @@ static gsi::Methods methods_QSqlTableModel_Adaptor () { return methods; } -gsi::Class decl_QSqlTableModel_Adaptor (qtdecl_QSqlTableModel (), "QSqlTableModel", +gsi::Class decl_QSqlTableModel_Adaptor (qtdecl_QSqlTableModel (), "QtSql", "QSqlTableModel", methods_QSqlTableModel_Adaptor (), "@qt\n@brief Binding of QSqlTableModel"); @@ -3779,19 +3779,19 @@ gsi::Class decl_QSqlTableModel_Adaptor (qtdecl_QSqlTable namespace qt_gsi { -static gsi::Enum decl_QSqlTableModel_EditStrategy_Enum ("QSqlTableModel_EditStrategy", +static gsi::Enum decl_QSqlTableModel_EditStrategy_Enum ("QtSql", "QSqlTableModel_EditStrategy", gsi::enum_const ("OnFieldChange", QSqlTableModel::OnFieldChange, "@brief Enum constant QSqlTableModel::OnFieldChange") + gsi::enum_const ("OnRowChange", QSqlTableModel::OnRowChange, "@brief Enum constant QSqlTableModel::OnRowChange") + gsi::enum_const ("OnManualSubmit", QSqlTableModel::OnManualSubmit, "@brief Enum constant QSqlTableModel::OnManualSubmit"), "@qt\n@brief This class represents the QSqlTableModel::EditStrategy enum"); -static gsi::QFlagsClass decl_QSqlTableModel_EditStrategy_Enums ("QSqlTableModel_QFlags_EditStrategy", +static gsi::QFlagsClass decl_QSqlTableModel_EditStrategy_Enums ("QtSql", "QSqlTableModel_QFlags_EditStrategy", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QSqlTableModel_EditStrategy_Enum_in_parent (decl_QSqlTableModel_EditStrategy_Enum.defs ()); -static gsi::ClassExt decl_QSqlTableModel_EditStrategy_Enum_as_child (decl_QSqlTableModel_EditStrategy_Enum, "EditStrategy"); -static gsi::ClassExt decl_QSqlTableModel_EditStrategy_Enums_as_child (decl_QSqlTableModel_EditStrategy_Enums, "QFlags_EditStrategy"); +static gsi::ClassExt decl_QSqlTableModel_EditStrategy_Enum_as_child (decl_QSqlTableModel_EditStrategy_Enum, "QtSql", "EditStrategy"); +static gsi::ClassExt decl_QSqlTableModel_EditStrategy_Enums_as_child (decl_QSqlTableModel_EditStrategy_Enums, "QtSql", "QFlags_EditStrategy"); } diff --git a/src/gsiqt/qt4/QtSql/gsiDeclQtSqlTypeTraits.h b/src/gsiqt/qt4/QtSql/gsiDeclQtSqlTypeTraits.h new file mode 100644 index 000000000..d57dfdae9 --- /dev/null +++ b/src/gsiqt/qt4/QtSql/gsiDeclQtSqlTypeTraits.h @@ -0,0 +1,306 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2018 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + +/** +* @file generated/gsiDeclQtSqlTypeTraits.h +* @brief Type traits for the Qt binding classes +* +* DO NOT EDIT THIS FILE. +* This file has been created automatically +*/ + +#ifndef _HDR_gsiDeclQtSqlTypeTraits +#define _HDR_gsiDeclQtSqlTypeTraits + +#include "gsiTypes.h" + + +class QAbstractItemModel; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QAbstractItemModel_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QAbstractListModel; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QAbstractListModel_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QAbstractTableModel; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QAbstractTableModel_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QDataStream; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QDataStream_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QIODevice; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +struct QMetaObject; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QMetaType; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QModelIndex; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QObject; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QObject_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QPersistentModelIndex; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QRegExp; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSql_Namespace; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QSqlDatabase; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSqlDriver; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QSqlDriver_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QSqlDriverCreatorBase; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QSqlDriverCreatorBase_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSqlError; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSqlField; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSqlIndex; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSqlQuery; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSqlQueryModel; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QSqlQueryModel_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QSqlRecord; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSqlRelation; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSqlRelationalTableModel; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QSqlRelationalTableModel_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QSqlResult; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QSqlResult_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QSqlTableModel; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QSqlTableModel_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QStringMatcher; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSysInfo; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class Qt_Namespace; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + + +#endif diff --git a/src/gsiqt/qt4/QtSql/gsiQtExternals.h b/src/gsiqt/qt4/QtSql/gsiQtExternals.h new file mode 100644 index 000000000..829cb4623 --- /dev/null +++ b/src/gsiqt/qt4/QtSql/gsiQtExternals.h @@ -0,0 +1,79 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2018 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + +/* + External declarations for for Qt bindings + + DO NOT EDIT THIS FILE. + This file has been created automatically +*/ + +#if !defined(HDR_gsiQtExternals) +#define HDR_gsiQtExternals + +#include "gsiClassBase.h" +#include "gsiQtSqlCommon.h" + +class QSqlDatabase; +namespace gsi { GSI_QTSQL_PUBLIC gsi::Class &qtdecl_QSqlDatabase (); } + +class QSqlDriver; +namespace gsi { GSI_QTSQL_PUBLIC gsi::Class &qtdecl_QSqlDriver (); } + +class QSqlDriverCreatorBase; +namespace gsi { GSI_QTSQL_PUBLIC gsi::Class &qtdecl_QSqlDriverCreatorBase (); } + +class QSqlError; +namespace gsi { GSI_QTSQL_PUBLIC gsi::Class &qtdecl_QSqlError (); } + +class QSqlField; +namespace gsi { GSI_QTSQL_PUBLIC gsi::Class &qtdecl_QSqlField (); } + +class QSqlIndex; +namespace gsi { GSI_QTSQL_PUBLIC gsi::Class &qtdecl_QSqlIndex (); } + +class QSqlQuery; +namespace gsi { GSI_QTSQL_PUBLIC gsi::Class &qtdecl_QSqlQuery (); } + +class QSqlQueryModel; +namespace gsi { GSI_QTSQL_PUBLIC gsi::Class &qtdecl_QSqlQueryModel (); } + +class QSqlRecord; +namespace gsi { GSI_QTSQL_PUBLIC gsi::Class &qtdecl_QSqlRecord (); } + +class QSqlRelation; +namespace gsi { GSI_QTSQL_PUBLIC gsi::Class &qtdecl_QSqlRelation (); } + +class QSqlRelationalTableModel; +namespace gsi { GSI_QTSQL_PUBLIC gsi::Class &qtdecl_QSqlRelationalTableModel (); } + +class QSqlResult; +namespace gsi { GSI_QTSQL_PUBLIC gsi::Class &qtdecl_QSqlResult (); } + +class QSqlTableModel; +namespace gsi { GSI_QTSQL_PUBLIC gsi::Class &qtdecl_QSqlTableModel (); } + + +#define QT_EXTERNAL_BASE(X) gsi::qtdecl_##X(), + +#endif + diff --git a/src/gsiqt4/gsiDeclQtAdditional.cc b/src/gsiqt/qt4/QtSql/gsiQtSqlCommon.h similarity index 61% rename from src/gsiqt4/gsiDeclQtAdditional.cc rename to src/gsiqt/qt4/QtSql/gsiQtSqlCommon.h index 9ae64503f..37945a31b 100644 --- a/src/gsiqt4/gsiDeclQtAdditional.cc +++ b/src/gsiqt/qt4/QtSql/gsiQtSqlCommon.h @@ -21,6 +21,19 @@ */ -#include "gsiQt.h" +#include "tlDefs.h" -// .. nothing yet .. +#if !defined(HDR_gsiQtSqlCommon_h) +# define HDR_gsiQtSqlCommon_h + +# ifdef MAKE_GSI_QTSQL_LIBRARY +# define GSI_QTSQL_PUBLIC DEF_INSIDE_PUBLIC +# define GSI_QTSQL_PUBLIC_TEMPLATE DEF_INSIDE_PUBLIC_TEMPLATE +# define GSI_QTSQL_LOCAL DEF_INSIDE_LOCAL +# else +# define GSI_QTSQL_PUBLIC DEF_OUTSIDE_PUBLIC +# define GSI_QTSQL_PUBLIC_TEMPLATE DEF_OUTSIDE_PUBLIC_TEMPLATE +# define GSI_QTSQL_LOCAL DEF_OUTSIDE_LOCAL +# endif + +#endif diff --git a/src/gsiqt/qt4/QtXml/QtXml.pri b/src/gsiqt/qt4/QtXml/QtXml.pri new file mode 100644 index 000000000..08ca42cc0 --- /dev/null +++ b/src/gsiqt/qt4/QtXml/QtXml.pri @@ -0,0 +1,39 @@ +# +# Partial QMAKE project file for Qt bindings +# +# DO NOT EDIT THIS FILE. +# This file has been created automatically +# + +SOURCES += \ + $$PWD/gsiDeclQDomAttr.cc \ + $$PWD/gsiDeclQDomCDATASection.cc \ + $$PWD/gsiDeclQDomCharacterData.cc \ + $$PWD/gsiDeclQDomComment.cc \ + $$PWD/gsiDeclQDomDocument.cc \ + $$PWD/gsiDeclQDomDocumentFragment.cc \ + $$PWD/gsiDeclQDomDocumentType.cc \ + $$PWD/gsiDeclQDomElement.cc \ + $$PWD/gsiDeclQDomEntity.cc \ + $$PWD/gsiDeclQDomEntityReference.cc \ + $$PWD/gsiDeclQDomImplementation.cc \ + $$PWD/gsiDeclQDomNamedNodeMap.cc \ + $$PWD/gsiDeclQDomNode.cc \ + $$PWD/gsiDeclQDomNodeList.cc \ + $$PWD/gsiDeclQDomNotation.cc \ + $$PWD/gsiDeclQDomProcessingInstruction.cc \ + $$PWD/gsiDeclQDomText.cc \ + $$PWD/gsiDeclQXmlAttributes.cc \ + $$PWD/gsiDeclQXmlContentHandler.cc \ + $$PWD/gsiDeclQXmlDTDHandler.cc \ + $$PWD/gsiDeclQXmlDeclHandler.cc \ + $$PWD/gsiDeclQXmlDefaultHandler.cc \ + $$PWD/gsiDeclQXmlEntityResolver.cc \ + $$PWD/gsiDeclQXmlErrorHandler.cc \ + $$PWD/gsiDeclQXmlInputSource.cc \ + $$PWD/gsiDeclQXmlLexicalHandler.cc \ + $$PWD/gsiDeclQXmlLocator.cc \ + $$PWD/gsiDeclQXmlNamespaceSupport.cc \ + $$PWD/gsiDeclQXmlParseException.cc \ + $$PWD/gsiDeclQXmlReader.cc \ + $$PWD/gsiDeclQXmlSimpleReader.cc diff --git a/src/gsiqt/qt4/QtXml/QtXml.pro b/src/gsiqt/qt4/QtXml/QtXml.pro new file mode 100644 index 000000000..0a5a84eb3 --- /dev/null +++ b/src/gsiqt/qt4/QtXml/QtXml.pro @@ -0,0 +1,20 @@ + + +DESTDIR = $$OUT_PWD/../../.. +TARGET = klayout_QtXml + +include($$PWD/../../../lib.pri) + +DEFINES += MAKE_GSI_QTXML_LIBRARY + +INCLUDEPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC +DEPENDPATH += $$TL_INC $$GSI_INC $$QTBASIC_INC + +LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_qtbasic + +SOURCES += \ + +HEADERS += \ + +include(QtXml.pri) + diff --git a/src/gsiqt4/gsiDeclQDomAttr.cc b/src/gsiqt/qt4/QtXml/gsiDeclQDomAttr.cc similarity index 96% rename from src/gsiqt4/gsiDeclQDomAttr.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQDomAttr.cc index 26a74b564..b8a8693c7 100644 --- a/src/gsiqt4/gsiDeclQDomAttr.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQDomAttr.cc @@ -45,8 +45,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -220,12 +220,12 @@ static gsi::Methods methods_QDomAttr () { gsi::Class &qtdecl_QDomNode (); -gsi::Class decl_QDomAttr (qtdecl_QDomNode (), "QDomAttr", +gsi::Class decl_QDomAttr (qtdecl_QDomNode (), "QtXml", "QDomAttr", methods_QDomAttr (), "@qt\n@brief Binding of QDomAttr"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDomAttr () { return decl_QDomAttr; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomAttr () { return decl_QDomAttr; } } diff --git a/src/gsiqt4/gsiDeclQDomCDATASection.cc b/src/gsiqt/qt4/QtXml/gsiDeclQDomCDATASection.cc similarity index 95% rename from src/gsiqt4/gsiDeclQDomCDATASection.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQDomCDATASection.cc index a3b190c7f..f0d5de8a7 100644 --- a/src/gsiqt4/gsiDeclQDomCDATASection.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQDomCDATASection.cc @@ -45,8 +45,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -135,12 +135,12 @@ static gsi::Methods methods_QDomCDATASection () { gsi::Class &qtdecl_QDomText (); -gsi::Class decl_QDomCDATASection (qtdecl_QDomText (), "QDomCDATASection", +gsi::Class decl_QDomCDATASection (qtdecl_QDomText (), "QtXml", "QDomCDATASection", methods_QDomCDATASection (), "@qt\n@brief Binding of QDomCDATASection"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDomCDATASection () { return decl_QDomCDATASection; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomCDATASection () { return decl_QDomCDATASection; } } diff --git a/src/gsiqt4/gsiDeclQDomCharacterData.cc b/src/gsiqt/qt4/QtXml/gsiDeclQDomCharacterData.cc similarity index 98% rename from src/gsiqt4/gsiDeclQDomCharacterData.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQDomCharacterData.cc index 5b982d999..c39b690b3 100644 --- a/src/gsiqt4/gsiDeclQDomCharacterData.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQDomCharacterData.cc @@ -45,8 +45,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -307,12 +307,12 @@ static gsi::Methods methods_QDomCharacterData () { gsi::Class &qtdecl_QDomNode (); -gsi::Class decl_QDomCharacterData (qtdecl_QDomNode (), "QDomCharacterData", +gsi::Class decl_QDomCharacterData (qtdecl_QDomNode (), "QtXml", "QDomCharacterData", methods_QDomCharacterData (), "@qt\n@brief Binding of QDomCharacterData"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDomCharacterData () { return decl_QDomCharacterData; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomCharacterData () { return decl_QDomCharacterData; } } diff --git a/src/gsiqt4/gsiDeclQDomComment.cc b/src/gsiqt/qt4/QtXml/gsiDeclQDomComment.cc similarity index 96% rename from src/gsiqt4/gsiDeclQDomComment.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQDomComment.cc index b4b355b70..8b1ed0744 100644 --- a/src/gsiqt4/gsiDeclQDomComment.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQDomComment.cc @@ -45,8 +45,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -135,12 +135,12 @@ static gsi::Methods methods_QDomComment () { gsi::Class &qtdecl_QDomCharacterData (); -gsi::Class decl_QDomComment (qtdecl_QDomCharacterData (), "QDomComment", +gsi::Class decl_QDomComment (qtdecl_QDomCharacterData (), "QtXml", "QDomComment", methods_QDomComment (), "@qt\n@brief Binding of QDomComment"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDomComment () { return decl_QDomComment; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomComment () { return decl_QDomComment; } } diff --git a/src/gsiqt4/gsiDeclQDomDocument.cc b/src/gsiqt/qt4/QtXml/gsiDeclQDomDocument.cc similarity index 99% rename from src/gsiqt4/gsiDeclQDomDocument.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQDomDocument.cc index e186e9f27..4b6890ae2 100644 --- a/src/gsiqt4/gsiDeclQDomDocument.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQDomDocument.cc @@ -49,8 +49,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -744,12 +744,12 @@ static gsi::Methods methods_QDomDocument () { gsi::Class &qtdecl_QDomNode (); -gsi::Class decl_QDomDocument (qtdecl_QDomNode (), "QDomDocument", +gsi::Class decl_QDomDocument (qtdecl_QDomNode (), "QtXml", "QDomDocument", methods_QDomDocument (), "@qt\n@brief Binding of QDomDocument"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDomDocument () { return decl_QDomDocument; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomDocument () { return decl_QDomDocument; } } diff --git a/src/gsiqt4/gsiDeclQDomDocumentFragment.cc b/src/gsiqt/qt4/QtXml/gsiDeclQDomDocumentFragment.cc similarity index 95% rename from src/gsiqt4/gsiDeclQDomDocumentFragment.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQDomDocumentFragment.cc index 8ab635492..9ec827327 100644 --- a/src/gsiqt4/gsiDeclQDomDocumentFragment.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQDomDocumentFragment.cc @@ -45,8 +45,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -135,12 +135,12 @@ static gsi::Methods methods_QDomDocumentFragment () { gsi::Class &qtdecl_QDomNode (); -gsi::Class decl_QDomDocumentFragment (qtdecl_QDomNode (), "QDomDocumentFragment", +gsi::Class decl_QDomDocumentFragment (qtdecl_QDomNode (), "QtXml", "QDomDocumentFragment", methods_QDomDocumentFragment (), "@qt\n@brief Binding of QDomDocumentFragment"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDomDocumentFragment () { return decl_QDomDocumentFragment; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomDocumentFragment () { return decl_QDomDocumentFragment; } } diff --git a/src/gsiqt4/gsiDeclQDomDocumentType.cc b/src/gsiqt/qt4/QtXml/gsiDeclQDomDocumentType.cc similarity index 97% rename from src/gsiqt4/gsiDeclQDomDocumentType.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQDomDocumentType.cc index d0ffc7340..313fbc510 100644 --- a/src/gsiqt4/gsiDeclQDomDocumentType.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQDomDocumentType.cc @@ -45,8 +45,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -231,12 +231,12 @@ static gsi::Methods methods_QDomDocumentType () { gsi::Class &qtdecl_QDomNode (); -gsi::Class decl_QDomDocumentType (qtdecl_QDomNode (), "QDomDocumentType", +gsi::Class decl_QDomDocumentType (qtdecl_QDomNode (), "QtXml", "QDomDocumentType", methods_QDomDocumentType (), "@qt\n@brief Binding of QDomDocumentType"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDomDocumentType () { return decl_QDomDocumentType; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomDocumentType () { return decl_QDomDocumentType; } } diff --git a/src/gsiqt4/gsiDeclQDomElement.cc b/src/gsiqt/qt4/QtXml/gsiDeclQDomElement.cc similarity index 99% rename from src/gsiqt4/gsiDeclQDomElement.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQDomElement.cc index 3ec441806..010063eab 100644 --- a/src/gsiqt4/gsiDeclQDomElement.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQDomElement.cc @@ -45,8 +45,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -817,12 +817,12 @@ static gsi::Methods methods_QDomElement () { gsi::Class &qtdecl_QDomNode (); -gsi::Class decl_QDomElement (qtdecl_QDomNode (), "QDomElement", +gsi::Class decl_QDomElement (qtdecl_QDomNode (), "QtXml", "QDomElement", methods_QDomElement (), "@qt\n@brief Binding of QDomElement"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDomElement () { return decl_QDomElement; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomElement () { return decl_QDomElement; } } diff --git a/src/gsiqt4/gsiDeclQDomEntity.cc b/src/gsiqt/qt4/QtXml/gsiDeclQDomEntity.cc similarity index 96% rename from src/gsiqt4/gsiDeclQDomEntity.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQDomEntity.cc index 33585febb..2ee000d49 100644 --- a/src/gsiqt4/gsiDeclQDomEntity.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQDomEntity.cc @@ -45,8 +45,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -183,12 +183,12 @@ static gsi::Methods methods_QDomEntity () { gsi::Class &qtdecl_QDomNode (); -gsi::Class decl_QDomEntity (qtdecl_QDomNode (), "QDomEntity", +gsi::Class decl_QDomEntity (qtdecl_QDomNode (), "QtXml", "QDomEntity", methods_QDomEntity (), "@qt\n@brief Binding of QDomEntity"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDomEntity () { return decl_QDomEntity; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomEntity () { return decl_QDomEntity; } } diff --git a/src/gsiqt4/gsiDeclQDomEntityReference.cc b/src/gsiqt/qt4/QtXml/gsiDeclQDomEntityReference.cc similarity index 95% rename from src/gsiqt4/gsiDeclQDomEntityReference.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQDomEntityReference.cc index c2095e830..a5a174943 100644 --- a/src/gsiqt4/gsiDeclQDomEntityReference.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQDomEntityReference.cc @@ -45,8 +45,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -135,12 +135,12 @@ static gsi::Methods methods_QDomEntityReference () { gsi::Class &qtdecl_QDomNode (); -gsi::Class decl_QDomEntityReference (qtdecl_QDomNode (), "QDomEntityReference", +gsi::Class decl_QDomEntityReference (qtdecl_QDomNode (), "QtXml", "QDomEntityReference", methods_QDomEntityReference (), "@qt\n@brief Binding of QDomEntityReference"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDomEntityReference () { return decl_QDomEntityReference; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomEntityReference () { return decl_QDomEntityReference; } } diff --git a/src/gsiqt4/gsiDeclQDomImplementation.cc b/src/gsiqt/qt4/QtXml/gsiDeclQDomImplementation.cc similarity index 95% rename from src/gsiqt4/gsiDeclQDomImplementation.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQDomImplementation.cc index 38b6d43d6..14ea2946e 100644 --- a/src/gsiqt4/gsiDeclQDomImplementation.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQDomImplementation.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -271,12 +271,12 @@ static gsi::Methods methods_QDomImplementation () { return methods; } -gsi::Class decl_QDomImplementation ("QDomImplementation", +gsi::Class decl_QDomImplementation ("QtXml", "QDomImplementation", methods_QDomImplementation (), "@qt\n@brief Binding of QDomImplementation"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDomImplementation () { return decl_QDomImplementation; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomImplementation () { return decl_QDomImplementation; } } @@ -285,19 +285,19 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QDomImplementation () { retu namespace qt_gsi { -static gsi::Enum decl_QDomImplementation_InvalidDataPolicy_Enum ("QDomImplementation_InvalidDataPolicy", +static gsi::Enum decl_QDomImplementation_InvalidDataPolicy_Enum ("QtXml", "QDomImplementation_InvalidDataPolicy", gsi::enum_const ("AcceptInvalidChars", QDomImplementation::AcceptInvalidChars, "@brief Enum constant QDomImplementation::AcceptInvalidChars") + gsi::enum_const ("DropInvalidChars", QDomImplementation::DropInvalidChars, "@brief Enum constant QDomImplementation::DropInvalidChars") + gsi::enum_const ("ReturnNullNode", QDomImplementation::ReturnNullNode, "@brief Enum constant QDomImplementation::ReturnNullNode"), "@qt\n@brief This class represents the QDomImplementation::InvalidDataPolicy enum"); -static gsi::QFlagsClass decl_QDomImplementation_InvalidDataPolicy_Enums ("QDomImplementation_QFlags_InvalidDataPolicy", +static gsi::QFlagsClass decl_QDomImplementation_InvalidDataPolicy_Enums ("QtXml", "QDomImplementation_QFlags_InvalidDataPolicy", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QDomImplementation_InvalidDataPolicy_Enum_in_parent (decl_QDomImplementation_InvalidDataPolicy_Enum.defs ()); -static gsi::ClassExt decl_QDomImplementation_InvalidDataPolicy_Enum_as_child (decl_QDomImplementation_InvalidDataPolicy_Enum, "InvalidDataPolicy"); -static gsi::ClassExt decl_QDomImplementation_InvalidDataPolicy_Enums_as_child (decl_QDomImplementation_InvalidDataPolicy_Enums, "QFlags_InvalidDataPolicy"); +static gsi::ClassExt decl_QDomImplementation_InvalidDataPolicy_Enum_as_child (decl_QDomImplementation_InvalidDataPolicy_Enum, "QtXml", "InvalidDataPolicy"); +static gsi::ClassExt decl_QDomImplementation_InvalidDataPolicy_Enums_as_child (decl_QDomImplementation_InvalidDataPolicy_Enums, "QtXml", "QFlags_InvalidDataPolicy"); } diff --git a/src/gsiqt4/gsiDeclQDomNamedNodeMap.cc b/src/gsiqt/qt4/QtXml/gsiDeclQDomNamedNodeMap.cc similarity index 98% rename from src/gsiqt4/gsiDeclQDomNamedNodeMap.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQDomNamedNodeMap.cc index bc0d06549..ad8c3d532 100644 --- a/src/gsiqt4/gsiDeclQDomNamedNodeMap.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQDomNamedNodeMap.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -372,12 +372,12 @@ static gsi::Methods methods_QDomNamedNodeMap () { return methods; } -gsi::Class decl_QDomNamedNodeMap ("QDomNamedNodeMap", +gsi::Class decl_QDomNamedNodeMap ("QtXml", "QDomNamedNodeMap", methods_QDomNamedNodeMap (), "@qt\n@brief Binding of QDomNamedNodeMap"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDomNamedNodeMap () { return decl_QDomNamedNodeMap; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomNamedNodeMap () { return decl_QDomNamedNodeMap; } } diff --git a/src/gsiqt4/gsiDeclQDomNode.cc b/src/gsiqt/qt4/QtXml/gsiDeclQDomNode.cc similarity index 98% rename from src/gsiqt4/gsiDeclQDomNode.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQDomNode.cc index e0ef44e7c..6ee1604b4 100644 --- a/src/gsiqt4/gsiDeclQDomNode.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQDomNode.cc @@ -45,8 +45,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -1256,12 +1256,12 @@ static gsi::Methods methods_QDomNode () { return methods; } -gsi::Class decl_QDomNode ("QDomNode", +gsi::Class decl_QDomNode ("QtXml", "QDomNode", methods_QDomNode (), "@qt\n@brief Binding of QDomNode"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDomNode () { return decl_QDomNode; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomNode () { return decl_QDomNode; } } @@ -1270,18 +1270,18 @@ GSIQT_PUBLIC gsi::Class &qtdecl_QDomNode () { return decl_QDomNode; } namespace qt_gsi { -static gsi::Enum decl_QDomNode_EncodingPolicy_Enum ("QDomNode_EncodingPolicy", +static gsi::Enum decl_QDomNode_EncodingPolicy_Enum ("QtXml", "QDomNode_EncodingPolicy", gsi::enum_const ("EncodingFromDocument", QDomNode::EncodingFromDocument, "@brief Enum constant QDomNode::EncodingFromDocument") + gsi::enum_const ("EncodingFromTextStream", QDomNode::EncodingFromTextStream, "@brief Enum constant QDomNode::EncodingFromTextStream"), "@qt\n@brief This class represents the QDomNode::EncodingPolicy enum"); -static gsi::QFlagsClass decl_QDomNode_EncodingPolicy_Enums ("QDomNode_QFlags_EncodingPolicy", +static gsi::QFlagsClass decl_QDomNode_EncodingPolicy_Enums ("QtXml", "QDomNode_QFlags_EncodingPolicy", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QDomNode_EncodingPolicy_Enum_in_parent (decl_QDomNode_EncodingPolicy_Enum.defs ()); -static gsi::ClassExt decl_QDomNode_EncodingPolicy_Enum_as_child (decl_QDomNode_EncodingPolicy_Enum, "EncodingPolicy"); -static gsi::ClassExt decl_QDomNode_EncodingPolicy_Enums_as_child (decl_QDomNode_EncodingPolicy_Enums, "QFlags_EncodingPolicy"); +static gsi::ClassExt decl_QDomNode_EncodingPolicy_Enum_as_child (decl_QDomNode_EncodingPolicy_Enum, "QtXml", "EncodingPolicy"); +static gsi::ClassExt decl_QDomNode_EncodingPolicy_Enums_as_child (decl_QDomNode_EncodingPolicy_Enums, "QtXml", "QFlags_EncodingPolicy"); } @@ -1290,7 +1290,7 @@ static gsi::ClassExt decl_QDomNode_EncodingPolicy_Enums_as_child (decl namespace qt_gsi { -static gsi::Enum decl_QDomNode_NodeType_Enum ("QDomNode_NodeType", +static gsi::Enum decl_QDomNode_NodeType_Enum ("QtXml", "QDomNode_NodeType", gsi::enum_const ("ElementNode", QDomNode::ElementNode, "@brief Enum constant QDomNode::ElementNode") + gsi::enum_const ("AttributeNode", QDomNode::AttributeNode, "@brief Enum constant QDomNode::AttributeNode") + gsi::enum_const ("TextNode", QDomNode::TextNode, "@brief Enum constant QDomNode::TextNode") + @@ -1307,13 +1307,13 @@ static gsi::Enum decl_QDomNode_NodeType_Enum ("QDomNode_Node gsi::enum_const ("CharacterDataNode", QDomNode::CharacterDataNode, "@brief Enum constant QDomNode::CharacterDataNode"), "@qt\n@brief This class represents the QDomNode::NodeType enum"); -static gsi::QFlagsClass decl_QDomNode_NodeType_Enums ("QDomNode_QFlags_NodeType", +static gsi::QFlagsClass decl_QDomNode_NodeType_Enums ("QtXml", "QDomNode_QFlags_NodeType", "@qt\n@brief This class represents the QFlags flag set"); // Inject the declarations into the parent static gsi::ClassExt inject_QDomNode_NodeType_Enum_in_parent (decl_QDomNode_NodeType_Enum.defs ()); -static gsi::ClassExt decl_QDomNode_NodeType_Enum_as_child (decl_QDomNode_NodeType_Enum, "NodeType"); -static gsi::ClassExt decl_QDomNode_NodeType_Enums_as_child (decl_QDomNode_NodeType_Enums, "QFlags_NodeType"); +static gsi::ClassExt decl_QDomNode_NodeType_Enum_as_child (decl_QDomNode_NodeType_Enum, "QtXml", "NodeType"); +static gsi::ClassExt decl_QDomNode_NodeType_Enums_as_child (decl_QDomNode_NodeType_Enums, "QtXml", "QFlags_NodeType"); } diff --git a/src/gsiqt4/gsiDeclQDomNodeList.cc b/src/gsiqt/qt4/QtXml/gsiDeclQDomNodeList.cc similarity index 97% rename from src/gsiqt4/gsiDeclQDomNodeList.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQDomNodeList.cc index 246a61f55..f9cfe9ebf 100644 --- a/src/gsiqt4/gsiDeclQDomNodeList.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQDomNodeList.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -246,12 +246,12 @@ static gsi::Methods methods_QDomNodeList () { return methods; } -gsi::Class decl_QDomNodeList ("QDomNodeList", +gsi::Class decl_QDomNodeList ("QtXml", "QDomNodeList", methods_QDomNodeList (), "@qt\n@brief Binding of QDomNodeList"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDomNodeList () { return decl_QDomNodeList; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomNodeList () { return decl_QDomNodeList; } } diff --git a/src/gsiqt4/gsiDeclQDomNotation.cc b/src/gsiqt/qt4/QtXml/gsiDeclQDomNotation.cc similarity index 96% rename from src/gsiqt4/gsiDeclQDomNotation.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQDomNotation.cc index 485d72cfa..cf9d0e01c 100644 --- a/src/gsiqt4/gsiDeclQDomNotation.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQDomNotation.cc @@ -45,8 +45,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -167,12 +167,12 @@ static gsi::Methods methods_QDomNotation () { gsi::Class &qtdecl_QDomNode (); -gsi::Class decl_QDomNotation (qtdecl_QDomNode (), "QDomNotation", +gsi::Class decl_QDomNotation (qtdecl_QDomNode (), "QtXml", "QDomNotation", methods_QDomNotation (), "@qt\n@brief Binding of QDomNotation"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDomNotation () { return decl_QDomNotation; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomNotation () { return decl_QDomNotation; } } diff --git a/src/gsiqt4/gsiDeclQDomProcessingInstruction.cc b/src/gsiqt/qt4/QtXml/gsiDeclQDomProcessingInstruction.cc similarity index 96% rename from src/gsiqt4/gsiDeclQDomProcessingInstruction.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQDomProcessingInstruction.cc index 90c739c05..4dcd19ed0 100644 --- a/src/gsiqt4/gsiDeclQDomProcessingInstruction.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQDomProcessingInstruction.cc @@ -45,8 +45,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -188,12 +188,12 @@ static gsi::Methods methods_QDomProcessingInstruction () { gsi::Class &qtdecl_QDomNode (); -gsi::Class decl_QDomProcessingInstruction (qtdecl_QDomNode (), "QDomProcessingInstruction", +gsi::Class decl_QDomProcessingInstruction (qtdecl_QDomNode (), "QtXml", "QDomProcessingInstruction", methods_QDomProcessingInstruction (), "@qt\n@brief Binding of QDomProcessingInstruction"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDomProcessingInstruction () { return decl_QDomProcessingInstruction; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomProcessingInstruction () { return decl_QDomProcessingInstruction; } } diff --git a/src/gsiqt4/gsiDeclQDomText.cc b/src/gsiqt/qt4/QtXml/gsiDeclQDomText.cc similarity index 96% rename from src/gsiqt4/gsiDeclQDomText.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQDomText.cc index 9d275f16e..328843540 100644 --- a/src/gsiqt4/gsiDeclQDomText.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQDomText.cc @@ -45,8 +45,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -155,12 +155,12 @@ static gsi::Methods methods_QDomText () { gsi::Class &qtdecl_QDomCharacterData (); -gsi::Class decl_QDomText (qtdecl_QDomCharacterData (), "QDomText", +gsi::Class decl_QDomText (qtdecl_QDomCharacterData (), "QtXml", "QDomText", methods_QDomText (), "@qt\n@brief Binding of QDomText"); -GSIQT_PUBLIC gsi::Class &qtdecl_QDomText () { return decl_QDomText; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomText () { return decl_QDomText; } } diff --git a/src/gsiqt4/gsiDeclQXmlAttributes.cc b/src/gsiqt/qt4/QtXml/gsiDeclQXmlAttributes.cc similarity index 97% rename from src/gsiqt4/gsiDeclQXmlAttributes.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQXmlAttributes.cc index a15b1099d..e583beee4 100644 --- a/src/gsiqt4/gsiDeclQXmlAttributes.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQXmlAttributes.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -352,11 +352,11 @@ static gsi::Methods methods_QXmlAttributes () { return methods; } -gsi::Class decl_QXmlAttributes ("QXmlAttributes_Native", +gsi::Class decl_QXmlAttributes ("QtXml", "QXmlAttributes_Native", methods_QXmlAttributes (), "@hide\n@alias QXmlAttributes"); -GSIQT_PUBLIC gsi::Class &qtdecl_QXmlAttributes () { return decl_QXmlAttributes; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlAttributes () { return decl_QXmlAttributes; } } @@ -403,7 +403,7 @@ static gsi::Methods methods_QXmlAttributes_Adaptor () { return methods; } -gsi::Class decl_QXmlAttributes_Adaptor (qtdecl_QXmlAttributes (), "QXmlAttributes", +gsi::Class decl_QXmlAttributes_Adaptor (qtdecl_QXmlAttributes (), "QtXml", "QXmlAttributes", methods_QXmlAttributes_Adaptor (), "@qt\n@brief Binding of QXmlAttributes"); diff --git a/src/gsiqt4/gsiDeclQXmlContentHandler.cc b/src/gsiqt/qt4/QtXml/gsiDeclQXmlContentHandler.cc similarity index 99% rename from src/gsiqt4/gsiDeclQXmlContentHandler.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQXmlContentHandler.cc index 568bf72f0..1322fe3d6 100644 --- a/src/gsiqt4/gsiDeclQXmlContentHandler.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQXmlContentHandler.cc @@ -31,8 +31,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -296,11 +296,11 @@ static gsi::Methods methods_QXmlContentHandler () { return methods; } -gsi::Class decl_QXmlContentHandler ("QXmlContentHandler_Native", +gsi::Class decl_QXmlContentHandler ("QtXml", "QXmlContentHandler_Native", methods_QXmlContentHandler (), "@hide\n@alias QXmlContentHandler"); -GSIQT_PUBLIC gsi::Class &qtdecl_QXmlContentHandler () { return decl_QXmlContentHandler; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlContentHandler () { return decl_QXmlContentHandler; } } @@ -864,7 +864,7 @@ static gsi::Methods methods_QXmlContentHandler_Adaptor () { return methods; } -gsi::Class decl_QXmlContentHandler_Adaptor (qtdecl_QXmlContentHandler (), "QXmlContentHandler", +gsi::Class decl_QXmlContentHandler_Adaptor (qtdecl_QXmlContentHandler (), "QtXml", "QXmlContentHandler", methods_QXmlContentHandler_Adaptor (), "@qt\n@brief Binding of QXmlContentHandler"); diff --git a/src/gsiqt4/gsiDeclQXmlDTDHandler.cc b/src/gsiqt/qt4/QtXml/gsiDeclQXmlDTDHandler.cc similarity index 97% rename from src/gsiqt4/gsiDeclQXmlDTDHandler.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQXmlDTDHandler.cc index e70899055..4281bafc1 100644 --- a/src/gsiqt4/gsiDeclQXmlDTDHandler.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQXmlDTDHandler.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -115,11 +115,11 @@ static gsi::Methods methods_QXmlDTDHandler () { return methods; } -gsi::Class decl_QXmlDTDHandler ("QXmlDTDHandler_Native", +gsi::Class decl_QXmlDTDHandler ("QtXml", "QXmlDTDHandler_Native", methods_QXmlDTDHandler (), "@hide\n@alias QXmlDTDHandler"); -GSIQT_PUBLIC gsi::Class &qtdecl_QXmlDTDHandler () { return decl_QXmlDTDHandler; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlDTDHandler () { return decl_QXmlDTDHandler; } } @@ -306,7 +306,7 @@ static gsi::Methods methods_QXmlDTDHandler_Adaptor () { return methods; } -gsi::Class decl_QXmlDTDHandler_Adaptor (qtdecl_QXmlDTDHandler (), "QXmlDTDHandler", +gsi::Class decl_QXmlDTDHandler_Adaptor (qtdecl_QXmlDTDHandler (), "QtXml", "QXmlDTDHandler", methods_QXmlDTDHandler_Adaptor (), "@qt\n@brief Binding of QXmlDTDHandler"); diff --git a/src/gsiqt4/gsiDeclQXmlDeclHandler.cc b/src/gsiqt/qt4/QtXml/gsiDeclQXmlDeclHandler.cc similarity index 98% rename from src/gsiqt4/gsiDeclQXmlDeclHandler.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQXmlDeclHandler.cc index e1fb291f5..8d65bfa7f 100644 --- a/src/gsiqt4/gsiDeclQXmlDeclHandler.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQXmlDeclHandler.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -141,11 +141,11 @@ static gsi::Methods methods_QXmlDeclHandler () { return methods; } -gsi::Class decl_QXmlDeclHandler ("QXmlDeclHandler_Native", +gsi::Class decl_QXmlDeclHandler ("QtXml", "QXmlDeclHandler_Native", methods_QXmlDeclHandler (), "@hide\n@alias QXmlDeclHandler"); -GSIQT_PUBLIC gsi::Class &qtdecl_QXmlDeclHandler () { return decl_QXmlDeclHandler; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlDeclHandler () { return decl_QXmlDeclHandler; } } @@ -382,7 +382,7 @@ static gsi::Methods methods_QXmlDeclHandler_Adaptor () { return methods; } -gsi::Class decl_QXmlDeclHandler_Adaptor (qtdecl_QXmlDeclHandler (), "QXmlDeclHandler", +gsi::Class decl_QXmlDeclHandler_Adaptor (qtdecl_QXmlDeclHandler (), "QtXml", "QXmlDeclHandler", methods_QXmlDeclHandler_Adaptor (), "@qt\n@brief Binding of QXmlDeclHandler"); diff --git a/src/gsiqt4/gsiDeclQXmlDefaultHandler.cc b/src/gsiqt/qt4/QtXml/gsiDeclQXmlDefaultHandler.cc similarity index 99% rename from src/gsiqt4/gsiDeclQXmlDefaultHandler.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQXmlDefaultHandler.cc index c03506c63..7c21839c9 100644 --- a/src/gsiqt4/gsiDeclQXmlDefaultHandler.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQXmlDefaultHandler.cc @@ -32,8 +32,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -774,11 +774,11 @@ static gsi::Methods methods_QXmlDefaultHandler () { gsi::Class &qtdecl_QXmlContentHandler (); -gsi::Class decl_QXmlDefaultHandler (qtdecl_QXmlContentHandler (), "QXmlDefaultHandler_Native", +gsi::Class decl_QXmlDefaultHandler (qtdecl_QXmlContentHandler (), "QtXml", "QXmlDefaultHandler_Native", methods_QXmlDefaultHandler (), "@hide\n@alias QXmlDefaultHandler"); -GSIQT_PUBLIC gsi::Class &qtdecl_QXmlDefaultHandler () { return decl_QXmlDefaultHandler; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlDefaultHandler () { return decl_QXmlDefaultHandler; } } @@ -1971,7 +1971,7 @@ static gsi::Methods methods_QXmlDefaultHandler_Adaptor () { return methods; } -gsi::Class decl_QXmlDefaultHandler_Adaptor (qtdecl_QXmlDefaultHandler (), "QXmlDefaultHandler", +gsi::Class decl_QXmlDefaultHandler_Adaptor (qtdecl_QXmlDefaultHandler (), "QtXml", "QXmlDefaultHandler", methods_QXmlDefaultHandler_Adaptor (), "@qt\n@brief Binding of QXmlDefaultHandler"); diff --git a/src/gsiqt4/gsiDeclQXmlEntityResolver.cc b/src/gsiqt/qt4/QtXml/gsiDeclQXmlEntityResolver.cc similarity index 87% rename from src/gsiqt4/gsiDeclQXmlEntityResolver.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQXmlEntityResolver.cc index 5ab464486..83462f189 100644 --- a/src/gsiqt4/gsiDeclQXmlEntityResolver.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQXmlEntityResolver.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -61,12 +61,12 @@ static gsi::Methods methods_QXmlEntityResolver () { return methods; } -gsi::Class decl_QXmlEntityResolver ("QXmlEntityResolver", +gsi::Class decl_QXmlEntityResolver ("QtXml", "QXmlEntityResolver", methods_QXmlEntityResolver (), "@qt\n@brief Binding of QXmlEntityResolver"); -GSIQT_PUBLIC gsi::Class &qtdecl_QXmlEntityResolver () { return decl_QXmlEntityResolver; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlEntityResolver () { return decl_QXmlEntityResolver; } } diff --git a/src/gsiqt4/gsiDeclQXmlErrorHandler.cc b/src/gsiqt/qt4/QtXml/gsiDeclQXmlErrorHandler.cc similarity index 97% rename from src/gsiqt4/gsiDeclQXmlErrorHandler.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQXmlErrorHandler.cc index b0bd97ab3..a60b5fa1f 100644 --- a/src/gsiqt4/gsiDeclQXmlErrorHandler.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQXmlErrorHandler.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -121,11 +121,11 @@ static gsi::Methods methods_QXmlErrorHandler () { return methods; } -gsi::Class decl_QXmlErrorHandler ("QXmlErrorHandler_Native", +gsi::Class decl_QXmlErrorHandler ("QtXml", "QXmlErrorHandler_Native", methods_QXmlErrorHandler (), "@hide\n@alias QXmlErrorHandler"); -GSIQT_PUBLIC gsi::Class &qtdecl_QXmlErrorHandler () { return decl_QXmlErrorHandler; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlErrorHandler () { return decl_QXmlErrorHandler; } } @@ -334,7 +334,7 @@ static gsi::Methods methods_QXmlErrorHandler_Adaptor () { return methods; } -gsi::Class decl_QXmlErrorHandler_Adaptor (qtdecl_QXmlErrorHandler (), "QXmlErrorHandler", +gsi::Class decl_QXmlErrorHandler_Adaptor (qtdecl_QXmlErrorHandler (), "QtXml", "QXmlErrorHandler", methods_QXmlErrorHandler_Adaptor (), "@qt\n@brief Binding of QXmlErrorHandler"); diff --git a/src/gsiqt4/gsiDeclQXmlInputSource.cc b/src/gsiqt/qt4/QtXml/gsiDeclQXmlInputSource.cc similarity index 98% rename from src/gsiqt4/gsiDeclQXmlInputSource.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQXmlInputSource.cc index 6d53699a8..2a360d264 100644 --- a/src/gsiqt4/gsiDeclQXmlInputSource.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQXmlInputSource.cc @@ -30,8 +30,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -132,11 +132,11 @@ static gsi::Methods methods_QXmlInputSource () { return methods; } -gsi::Class decl_QXmlInputSource ("QXmlInputSource_Native", +gsi::Class decl_QXmlInputSource ("QtXml", "QXmlInputSource_Native", methods_QXmlInputSource (), "@hide\n@alias QXmlInputSource"); -GSIQT_PUBLIC gsi::Class &qtdecl_QXmlInputSource () { return decl_QXmlInputSource; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlInputSource () { return decl_QXmlInputSource; } } @@ -443,7 +443,7 @@ static gsi::Methods methods_QXmlInputSource_Adaptor () { return methods; } -gsi::Class decl_QXmlInputSource_Adaptor (qtdecl_QXmlInputSource (), "QXmlInputSource", +gsi::Class decl_QXmlInputSource_Adaptor (qtdecl_QXmlInputSource (), "QtXml", "QXmlInputSource", methods_QXmlInputSource_Adaptor (), "@qt\n@brief Binding of QXmlInputSource"); diff --git a/src/gsiqt4/gsiDeclQXmlLexicalHandler.cc b/src/gsiqt/qt4/QtXml/gsiDeclQXmlLexicalHandler.cc similarity index 98% rename from src/gsiqt4/gsiDeclQXmlLexicalHandler.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQXmlLexicalHandler.cc index 862aece6a..da9112317 100644 --- a/src/gsiqt4/gsiDeclQXmlLexicalHandler.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQXmlLexicalHandler.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -194,11 +194,11 @@ static gsi::Methods methods_QXmlLexicalHandler () { return methods; } -gsi::Class decl_QXmlLexicalHandler ("QXmlLexicalHandler_Native", +gsi::Class decl_QXmlLexicalHandler ("QtXml", "QXmlLexicalHandler_Native", methods_QXmlLexicalHandler (), "@hide\n@alias QXmlLexicalHandler"); -GSIQT_PUBLIC gsi::Class &qtdecl_QXmlLexicalHandler () { return decl_QXmlLexicalHandler; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlLexicalHandler () { return decl_QXmlLexicalHandler; } } @@ -568,7 +568,7 @@ static gsi::Methods methods_QXmlLexicalHandler_Adaptor () { return methods; } -gsi::Class decl_QXmlLexicalHandler_Adaptor (qtdecl_QXmlLexicalHandler (), "QXmlLexicalHandler", +gsi::Class decl_QXmlLexicalHandler_Adaptor (qtdecl_QXmlLexicalHandler (), "QtXml", "QXmlLexicalHandler", methods_QXmlLexicalHandler_Adaptor (), "@qt\n@brief Binding of QXmlLexicalHandler"); diff --git a/src/gsiqt4/gsiDeclQXmlLocator.cc b/src/gsiqt/qt4/QtXml/gsiDeclQXmlLocator.cc similarity index 95% rename from src/gsiqt4/gsiDeclQXmlLocator.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQXmlLocator.cc index 78771397f..52084ecec 100644 --- a/src/gsiqt4/gsiDeclQXmlLocator.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQXmlLocator.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -76,11 +76,11 @@ static gsi::Methods methods_QXmlLocator () { return methods; } -gsi::Class decl_QXmlLocator ("QXmlLocator_Native", +gsi::Class decl_QXmlLocator ("QtXml", "QXmlLocator_Native", methods_QXmlLocator (), "@hide\n@alias QXmlLocator"); -GSIQT_PUBLIC gsi::Class &qtdecl_QXmlLocator () { return decl_QXmlLocator; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlLocator () { return decl_QXmlLocator; } } @@ -200,7 +200,7 @@ static gsi::Methods methods_QXmlLocator_Adaptor () { return methods; } -gsi::Class decl_QXmlLocator_Adaptor (qtdecl_QXmlLocator (), "QXmlLocator", +gsi::Class decl_QXmlLocator_Adaptor (qtdecl_QXmlLocator (), "QtXml", "QXmlLocator", methods_QXmlLocator_Adaptor (), "@qt\n@brief Binding of QXmlLocator"); diff --git a/src/gsiqt4/gsiDeclQXmlNamespaceSupport.cc b/src/gsiqt/qt4/QtXml/gsiDeclQXmlNamespaceSupport.cc similarity index 97% rename from src/gsiqt4/gsiDeclQXmlNamespaceSupport.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQXmlNamespaceSupport.cc index df608ef23..dea5d7cf9 100644 --- a/src/gsiqt4/gsiDeclQXmlNamespaceSupport.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQXmlNamespaceSupport.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -269,12 +269,12 @@ static gsi::Methods methods_QXmlNamespaceSupport () { return methods; } -gsi::Class decl_QXmlNamespaceSupport ("QXmlNamespaceSupport", +gsi::Class decl_QXmlNamespaceSupport ("QtXml", "QXmlNamespaceSupport", methods_QXmlNamespaceSupport (), "@qt\n@brief Binding of QXmlNamespaceSupport"); -GSIQT_PUBLIC gsi::Class &qtdecl_QXmlNamespaceSupport () { return decl_QXmlNamespaceSupport; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlNamespaceSupport () { return decl_QXmlNamespaceSupport; } } diff --git a/src/gsiqt4/gsiDeclQXmlParseException.cc b/src/gsiqt/qt4/QtXml/gsiDeclQXmlParseException.cc similarity index 96% rename from src/gsiqt4/gsiDeclQXmlParseException.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQXmlParseException.cc index 705e70280..093ee25a5 100644 --- a/src/gsiqt4/gsiDeclQXmlParseException.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQXmlParseException.cc @@ -29,8 +29,8 @@ #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -177,12 +177,12 @@ static gsi::Methods methods_QXmlParseException () { return methods; } -gsi::Class decl_QXmlParseException ("QXmlParseException", +gsi::Class decl_QXmlParseException ("QtXml", "QXmlParseException", methods_QXmlParseException (), "@qt\n@brief Binding of QXmlParseException"); -GSIQT_PUBLIC gsi::Class &qtdecl_QXmlParseException () { return decl_QXmlParseException; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlParseException () { return decl_QXmlParseException; } } diff --git a/src/gsiqt4/gsiDeclQXmlReader.cc b/src/gsiqt/qt4/QtXml/gsiDeclQXmlReader.cc similarity index 99% rename from src/gsiqt4/gsiDeclQXmlReader.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQXmlReader.cc index a37394de7..bca2e26ee 100644 --- a/src/gsiqt4/gsiDeclQXmlReader.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQXmlReader.cc @@ -36,8 +36,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -447,11 +447,11 @@ static gsi::Methods methods_QXmlReader () { return methods; } -gsi::Class decl_QXmlReader ("QXmlReader_Native", +gsi::Class decl_QXmlReader ("QtXml", "QXmlReader_Native", methods_QXmlReader (), "@hide\n@alias QXmlReader"); -GSIQT_PUBLIC gsi::Class &qtdecl_QXmlReader () { return decl_QXmlReader; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlReader () { return decl_QXmlReader; } } @@ -1331,7 +1331,7 @@ static gsi::Methods methods_QXmlReader_Adaptor () { return methods; } -gsi::Class decl_QXmlReader_Adaptor (qtdecl_QXmlReader (), "QXmlReader", +gsi::Class decl_QXmlReader_Adaptor (qtdecl_QXmlReader (), "QtXml", "QXmlReader", methods_QXmlReader_Adaptor (), "@qt\n@brief Binding of QXmlReader"); diff --git a/src/gsiqt4/gsiDeclQXmlSimpleReader.cc b/src/gsiqt/qt4/QtXml/gsiDeclQXmlSimpleReader.cc similarity index 99% rename from src/gsiqt4/gsiDeclQXmlSimpleReader.cc rename to src/gsiqt/qt4/QtXml/gsiDeclQXmlSimpleReader.cc index cf9b472cf..8771095eb 100644 --- a/src/gsiqt4/gsiDeclQXmlSimpleReader.cc +++ b/src/gsiqt/qt4/QtXml/gsiDeclQXmlSimpleReader.cc @@ -36,8 +36,8 @@ #include #include #include "gsiQt.h" -#include "gsiQtCommon.h" -#include "gsiDeclQtTypeTraits.h" +#include "gsiQtXmlCommon.h" +#include "gsiDeclQtXmlTypeTraits.h" #include // ----------------------------------------------------------------------- @@ -468,11 +468,11 @@ static gsi::Methods methods_QXmlSimpleReader () { gsi::Class &qtdecl_QXmlReader (); -gsi::Class decl_QXmlSimpleReader (qtdecl_QXmlReader (), "QXmlSimpleReader_Native", +gsi::Class decl_QXmlSimpleReader (qtdecl_QXmlReader (), "QtXml", "QXmlSimpleReader_Native", methods_QXmlSimpleReader (), "@hide\n@alias QXmlSimpleReader"); -GSIQT_PUBLIC gsi::Class &qtdecl_QXmlSimpleReader () { return decl_QXmlSimpleReader; } +GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlSimpleReader () { return decl_QXmlSimpleReader; } } @@ -1374,7 +1374,7 @@ static gsi::Methods methods_QXmlSimpleReader_Adaptor () { return methods; } -gsi::Class decl_QXmlSimpleReader_Adaptor (qtdecl_QXmlSimpleReader (), "QXmlSimpleReader", +gsi::Class decl_QXmlSimpleReader_Adaptor (qtdecl_QXmlSimpleReader (), "QtXml", "QXmlSimpleReader", methods_QXmlSimpleReader_Adaptor (), "@qt\n@brief Binding of QXmlSimpleReader"); diff --git a/src/gsiqt/qt4/QtXml/gsiDeclQtXmlTypeTraits.h b/src/gsiqt/qt4/QtXml/gsiDeclQtXmlTypeTraits.h new file mode 100644 index 000000000..08e08b0dc --- /dev/null +++ b/src/gsiqt/qt4/QtXml/gsiDeclQtXmlTypeTraits.h @@ -0,0 +1,419 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2018 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + +/** +* @file generated/gsiDeclQtXmlTypeTraits.h +* @brief Type traits for the Qt binding classes +* +* DO NOT EDIT THIS FILE. +* This file has been created automatically +*/ + +#ifndef _HDR_gsiDeclQtXmlTypeTraits +#define _HDR_gsiDeclQtXmlTypeTraits + +#include "gsiTypes.h" + + +class QDataStream; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QDataStream_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QDomAttr; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QDomCDATASection; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QDomCharacterData; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QDomComment; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QDomDocument; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QDomDocumentFragment; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QDomDocumentType; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QDomElement; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QDomEntity; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QDomEntityReference; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QDomImplementation; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QDomNamedNodeMap; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QDomNode; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QDomNodeList; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QDomNotation; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QDomProcessingInstruction; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QDomText; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QFile; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QIODevice; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QLocale; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +struct QMetaObject; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QObject; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QObject_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QRegExp; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QStringMatcher; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSysInfo; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSystemLocale; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QSystemLocale_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QTextStream; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QTextStream_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QXmlAttributes; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QXmlAttributes_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QXmlContentHandler; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QXmlContentHandler_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QXmlDTDHandler; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QXmlDTDHandler_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QXmlDeclHandler; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QXmlDeclHandler_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QXmlDefaultHandler; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QXmlDefaultHandler_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QXmlEntityResolver; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QXmlErrorHandler; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QXmlErrorHandler_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QXmlInputSource; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QXmlInputSource_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QXmlLexicalHandler; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QXmlLexicalHandler_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QXmlLocator; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QXmlLocator_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QXmlNamespaceSupport; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QXmlParseException; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QXmlReader; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + +class QXmlReader_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { +}; +} + +class QXmlSimpleReader; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class QXmlSimpleReader_Adaptor; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; +}; +} + +class Qt_Namespace; +namespace tl { +template <> struct type_traits : public type_traits { + typedef tl::false_tag has_copy_constructor; + typedef tl::false_tag has_default_constructor; +}; +} + + +#endif diff --git a/src/gsiqt/qt4/QtXml/gsiQtExternals.h b/src/gsiqt/qt4/QtXml/gsiQtExternals.h new file mode 100644 index 000000000..35b9ce57d --- /dev/null +++ b/src/gsiqt/qt4/QtXml/gsiQtExternals.h @@ -0,0 +1,133 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2018 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + +/* + External declarations for for Qt bindings + + DO NOT EDIT THIS FILE. + This file has been created automatically +*/ + +#if !defined(HDR_gsiQtExternals) +#define HDR_gsiQtExternals + +#include "gsiClassBase.h" +#include "gsiQtXmlCommon.h" + +class QDomAttr; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomAttr (); } + +class QDomCDATASection; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomCDATASection (); } + +class QDomCharacterData; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomCharacterData (); } + +class QDomComment; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomComment (); } + +class QDomDocument; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomDocument (); } + +class QDomDocumentFragment; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomDocumentFragment (); } + +class QDomDocumentType; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomDocumentType (); } + +class QDomElement; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomElement (); } + +class QDomEntity; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomEntity (); } + +class QDomEntityReference; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomEntityReference (); } + +class QDomImplementation; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomImplementation (); } + +class QDomNamedNodeMap; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomNamedNodeMap (); } + +class QDomNode; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomNode (); } + +class QDomNodeList; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomNodeList (); } + +class QDomNotation; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomNotation (); } + +class QDomProcessingInstruction; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomProcessingInstruction (); } + +class QDomText; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QDomText (); } + +class QXmlAttributes; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlAttributes (); } + +class QXmlContentHandler; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlContentHandler (); } + +class QXmlDTDHandler; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlDTDHandler (); } + +class QXmlDeclHandler; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlDeclHandler (); } + +class QXmlDefaultHandler; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlDefaultHandler (); } + +class QXmlEntityResolver; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlEntityResolver (); } + +class QXmlErrorHandler; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlErrorHandler (); } + +class QXmlInputSource; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlInputSource (); } + +class QXmlLexicalHandler; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlLexicalHandler (); } + +class QXmlLocator; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlLocator (); } + +class QXmlNamespaceSupport; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlNamespaceSupport (); } + +class QXmlParseException; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlParseException (); } + +class QXmlReader; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlReader (); } + +class QXmlSimpleReader; +namespace gsi { GSI_QTXML_PUBLIC gsi::Class &qtdecl_QXmlSimpleReader (); } + + +#define QT_EXTERNAL_BASE(X) gsi::qtdecl_##X(), + +#endif + diff --git a/src/gsiqt/gsiQtCommon.h b/src/gsiqt/qt4/QtXml/gsiQtXmlCommon.h similarity index 61% rename from src/gsiqt/gsiQtCommon.h rename to src/gsiqt/qt4/QtXml/gsiQtXmlCommon.h index 4c277cb7e..ccb92271b 100644 --- a/src/gsiqt/gsiQtCommon.h +++ b/src/gsiqt/qt4/QtXml/gsiQtXmlCommon.h @@ -21,28 +21,19 @@ */ -#if !defined(HDR_gsiQtCommon_h) -# define HDR_gsiQtCommon_h +#include "tlDefs.h" -# if defined _WIN32 || defined __CYGWIN__ - -# ifdef MAKE_GSIQT_LIBRARY -# define GSIQT_PUBLIC __declspec(dllexport) -# else -# define GSIQT_PUBLIC __declspec(dllimport) -# endif -# define GSIQT_LOCAL +#if !defined(HDR_gsiQtXmlCommon_h) +# define HDR_gsiQtXmlCommon_h +# ifdef MAKE_GSI_QTXML_LIBRARY +# define GSI_QTXML_PUBLIC DEF_INSIDE_PUBLIC +# define GSI_QTXML_PUBLIC_TEMPLATE DEF_INSIDE_PUBLIC_TEMPLATE +# define GSI_QTXML_LOCAL DEF_INSIDE_LOCAL # else - -# if __GNUC__ >= 4 || defined(__clang__) -# define GSIQT_PUBLIC __attribute__ ((visibility ("default"))) -# define GSIQT_LOCAL __attribute__ ((visibility ("hidden"))) -# else -# define GSIQT_PUBLIC -# define GSIQT_LOCAL -# endif - +# define GSI_QTXML_PUBLIC DEF_OUTSIDE_PUBLIC +# define GSI_QTXML_PUBLIC_TEMPLATE DEF_OUTSIDE_PUBLIC_TEMPLATE +# define GSI_QTXML_LOCAL DEF_OUTSIDE_LOCAL # endif #endif diff --git a/src/gsiqt/qt4/qt4.pro b/src/gsiqt/qt4/qt4.pro new file mode 100644 index 000000000..b8f00fed9 --- /dev/null +++ b/src/gsiqt/qt4/qt4.pro @@ -0,0 +1,17 @@ + +TEMPLATE = subdirs + +SUBDIRS = \ + QtCore \ + QtGui \ + QtXml \ + QtSql \ + QtNetwork \ + QtDesigner + +QtGui.depends += QtCore +QtXml.depends += QtCore +QtSql.depends += QtCore +QtNetwork.depends += QtCore +QtDesigner.depends += QtGui QtCore + diff --git a/src/gsiqt/gsiDeclQt5Basic.cc b/src/gsiqt/qtbasic/gsiDeclQt5Basic.cc similarity index 100% rename from src/gsiqt/gsiDeclQt5Basic.cc rename to src/gsiqt/qtbasic/gsiDeclQt5Basic.cc diff --git a/src/gsiqt/qtbasic/gsiDeclQtAllTypeTraits.h b/src/gsiqt/qtbasic/gsiDeclQtAllTypeTraits.h new file mode 100644 index 000000000..0ac68bf7d --- /dev/null +++ b/src/gsiqt/qtbasic/gsiDeclQtAllTypeTraits.h @@ -0,0 +1,50 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2018 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + +/** +* @file generated/gsiDeclQtCoreTypeTraits.h +* @brief Type traits for the Qt binding classes +* +* DO NOT EDIT THIS FILE. +* This file has been created automatically +*/ + +#ifndef _HDR_gsiDeclQtAllTypeTraits +#define _HDR_gsiDeclQtAllTypeTraits + +#if defined(HAVE_QT4) + +#include "../qt4/QtCore/gsiDeclQtCoreTypeTraits.h" +#include "../qt4/QtCore/gsiDeclQtGuiTypeTraits.h" +#include "../qt4/QtCore/gsiDeclQtXmlTypeTraits.h" +#include "../qt4/QtCore/gsiDeclQtNetworkTypeTraits.h" +#include "../qt4/QtCore/gsiDeclQtSqlTypeTraits.h" +#include "../qt4/QtCore/gsiDeclQtDesignerTypeTraits.h" + +#else + +// ... + +#endif + +#endif + diff --git a/src/gsiqt/gsiDeclQtBasic.cc b/src/gsiqt/qtbasic/gsiDeclQtBasic.cc similarity index 91% rename from src/gsiqt/gsiDeclQtBasic.cc rename to src/gsiqt/qtbasic/gsiDeclQtBasic.cc index 0040885eb..7bb186614 100644 --- a/src/gsiqt/gsiDeclQtBasic.cc +++ b/src/gsiqt/qtbasic/gsiDeclQtBasic.cc @@ -102,7 +102,7 @@ struct pair_decl // ------------------------------------------------------------ // Declarations for QPair -gsi::Class > decl_QString_QPair ("QPair_QString_QString", +gsi::Class > decl_QString_QPair ("Qt", "QPair_QString_QString", qt_gsi::pair_decl::methods (), "@qt\\n@brief Represents a QPair" ); @@ -110,7 +110,7 @@ gsi::Class > decl_QString_QPair ("QPair_QString_QString" // ------------------------------------------------------------ // Declarations for QPair -gsi::Class > decl_QByteArray_QPair ("QPair_QByteArray_QByteArray", +gsi::Class > decl_QByteArray_QPair ("Qt", "QPair_QByteArray_QByteArray", qt_gsi::pair_decl::methods (), "@qt\\n@brief Represents a QPair" ); @@ -118,7 +118,7 @@ gsi::Class > decl_QByteArray_QPair ("QPair_QByteAr // ------------------------------------------------------------ // Declarations for QPair -gsi::Class > decl_double_QPair ("QPair_double_double", +gsi::Class > decl_double_QPair ("Qt", "QPair_double_double", qt_gsi::pair_decl::methods (), "@qt\\n@brief Represents a QPair" ); @@ -126,7 +126,7 @@ gsi::Class > decl_double_QPair ("QPair_double_double", // ------------------------------------------------------------ // Declarations for QPair -gsi::Class > decl_double_QPointF_QPair ("QPair_double_QPointF", +gsi::Class > decl_double_QPointF_QPair ("Qt", "QPair_double_QPointF", qt_gsi::pair_decl::methods (), "@qt\\n@brief Represents a QPair" ); @@ -134,7 +134,7 @@ gsi::Class > decl_double_QPointF_QPair ("QPair_double_QPo // ------------------------------------------------------------ // Declarations for QPair -gsi::Class > decl_double_QColor_QPair ("QPair_double_QColor", +gsi::Class > decl_double_QColor_QPair ("Qt", "QPair_double_QColor", qt_gsi::pair_decl::methods (), "@qt\\n@brief Represents a QPair" ); @@ -142,7 +142,7 @@ gsi::Class > decl_double_QColor_QPair ("QPair_double_QColo // ------------------------------------------------------------ // Declarations for QPair -gsi::Class > decl_QHostAddress_int_QPair ("QPair_QHostAddress_int", +gsi::Class > decl_QHostAddress_int_QPair ("Qt", "QPair_QHostAddress_int", qt_gsi::pair_decl::methods (), "@qt\\n@brief Represents a QPair" ); @@ -150,7 +150,7 @@ gsi::Class > decl_QHostAddress_int_QPair ("QPair_QHostA // ------------------------------------------------------------ // Declarations for QPair -gsi::Class > decl_int_int_QPair ("QPair_int_int", +gsi::Class > decl_int_int_QPair ("Qt", "QPair_int_int", qt_gsi::pair_decl::methods (), "@qt\\n@brief Represents a QPair" ); @@ -158,7 +158,7 @@ gsi::Class > decl_int_int_QPair ("QPair_int_int", // ------------------------------------------------------------ // Declarations for QPair -gsi::Class > decl_QString_QSizeF_QPair ("QPair_QString_QSizeF", +gsi::Class > decl_QString_QSizeF_QPair ("Qt", "QPair_QString_QSizeF", qt_gsi::pair_decl::methods (), "@qt\\n@brief Represents a QPair" ); @@ -166,7 +166,7 @@ gsi::Class > decl_QString_QSizeF_QPair ("QPair_QString_QS // ------------------------------------------------------------ // Declarations for QPair -gsi::Class > decl_double_QVariant_QPair ("QPair_double_QVariant", +gsi::Class > decl_double_QVariant_QPair ("Qt", "QPair_double_QVariant", qt_gsi::pair_decl::methods (), "@qt\\n@brief Represents a QPair" ); @@ -174,7 +174,7 @@ gsi::Class > decl_double_QVariant_QPair ("QPair_double_Q // ------------------------------------------------------------ // Declarations for QPair -gsi::Class > decl_QAccessibleInterfacePtr_Relation_QPair ("QPair_QAccessibleInterfacePtr_QAccessible_Relation", +gsi::Class > decl_QAccessibleInterfacePtr_Relation_QPair ("Qt", "QPair_QAccessibleInterfacePtr_QAccessible_Relation", qt_gsi::pair_decl::methods (), "@qt\\n@brief Represents a QPair >" ); diff --git a/src/gsiqt/gsiQt.cc b/src/gsiqt/qtbasic/gsiQt.cc similarity index 96% rename from src/gsiqt/gsiQt.cc rename to src/gsiqt/qtbasic/gsiQt.cc index e3b0cd5bf..a6af2d7c7 100644 --- a/src/gsiqt/gsiQt.cc +++ b/src/gsiqt/qtbasic/gsiQt.cc @@ -36,11 +36,11 @@ namespace qt_gsi class QVariant_Namespace { }; // A dummy namespace "QVariant" -gsi::Class decl_QVariant_Namespace ("QVariant", +gsi::Class decl_QVariant_Namespace ("Qt", "QVariant", gsi::Methods(), "@qt\n@brief This class represents the QVariant namespace"); -static gsi::Enum decl_QVariant_Type_Enum ("QVariant_Type", +static gsi::Enum decl_QVariant_Type_Enum ("Qt", "QVariant_Type", gsi::enum_const ("Invalid", QVariant::Invalid, "@brief Enum constant QVariant::Invalid") + gsi::enum_const ("Bool", QVariant::Bool, "@brief Enum constant QVariant::Bool") + gsi::enum_const ("Int", QVariant::Int, "@brief Enum constant QVariant::Int") + @@ -104,8 +104,8 @@ static gsi::QFlagsClass decl_QVariant_Type_Enums ("QVariant_QFla // Inject the declarations into the parent static gsi::ClassExt inject_QVariant_Type_Enum_in_parent (decl_QVariant_Type_Enum.defs ()); -static gsi::ClassExt decl_QVariant_Type_Enum_as_child (decl_QVariant_Type_Enum, "Type"); -static gsi::ClassExt decl_QVariant_Type_Enums_as_child (decl_QVariant_Type_Enums, "QFlags_Type"); +static gsi::ClassExt decl_QVariant_Type_Enum_as_child (decl_QVariant_Type_Enum, "Qt", "Type"); +static gsi::ClassExt decl_QVariant_Type_Enums_as_child (decl_QVariant_Type_Enums, "Qt", "QFlags_Type"); // --------------------------------------------------------------------------- // AbstractMethodCalledException implementation diff --git a/src/gsiqt/gsiQt.h b/src/gsiqt/qtbasic/gsiQt.h similarity index 92% rename from src/gsiqt/gsiQt.h rename to src/gsiqt/qtbasic/gsiQt.h index 3c300c32e..204388827 100644 --- a/src/gsiqt/gsiQt.h +++ b/src/gsiqt/qtbasic/gsiQt.h @@ -27,6 +27,7 @@ #include "gsiDecl.h" #include "gsiEnums.h" #include "gsiSignals.h" +#include "gsiQtBasicCommon.h" #include "tlString.h" #include "tlException.h" #include "tlTypeTraits.h" @@ -53,7 +54,7 @@ class QGraphicsObject; namespace qt_gsi { -gsi::ObjectBase *get_watcher_object (QObject *qobject, bool required); +GSI_QTBASIC_PUBLIC gsi::ObjectBase *get_watcher_object (QObject *qobject, bool required); /** * @brief A Qt class declaration @@ -69,25 +70,25 @@ class QtNativeClass : public gsi::Class { public: - QtNativeClass (const std::string &name, const gsi::Methods &mm, const std::string &doc = std::string ()) - : gsi::Class (name, mm, doc) + QtNativeClass (const std::string &module, const std::string &name, const gsi::Methods &mm, const std::string &doc = std::string ()) + : gsi::Class (module, name, mm, doc) { } template - QtNativeClass (const gsi::Class &base, const std::string &name, const gsi::Methods &mm, const std::string &doc = std::string ()) - : gsi::Class (base, name, mm, doc) + QtNativeClass (const gsi::Class &base, const std::string &module, const std::string &name, const gsi::Methods &mm, const std::string &doc = std::string ()) + : gsi::Class (base, module, name, mm, doc) { } - QtNativeClass (const std::string &name, const std::string &doc = std::string ()) - : gsi::Class (name, doc) + QtNativeClass (const std::string &module, const std::string &name, const std::string &doc = std::string ()) + : gsi::Class (module, name, doc) { } template - QtNativeClass (const gsi::Class &base, const std::string &name, const std::string &doc = std::string ()) - : gsi::Class (base, name, doc) + QtNativeClass (const gsi::Class &base, const std::string &module, const std::string &name, const std::string &doc = std::string ()) + : gsi::Class (base, module, name, doc) { } @@ -107,7 +108,7 @@ public: * * Using that way saves compile time and memory */ -class GenericMethod : public gsi::MethodBase +class GSI_QTBASIC_PUBLIC GenericMethod : public gsi::MethodBase { public: GenericMethod (const char *name, const char *doc, bool is_const, void (*init_func)(GenericMethod *), void (*call_func)(const GenericMethod *, void *, gsi::SerialArgs &args, gsi::SerialArgs &ret)) @@ -159,7 +160,7 @@ private: * * Using that way saves compile time and memory */ -class GenericStaticMethod : public gsi::StaticMethodBase +class GSI_QTBASIC_PUBLIC GenericStaticMethod : public gsi::StaticMethodBase { public: GenericStaticMethod (const char *name, const char *doc, void (*init_func)(GenericStaticMethod *), void (*call_func)(const GenericStaticMethod *self, gsi::SerialArgs &args, gsi::SerialArgs &ret)) @@ -455,14 +456,14 @@ public: #endif -class AbstractMethodCalledException +class GSI_QTBASIC_PUBLIC AbstractMethodCalledException : public tl::Exception { public: AbstractMethodCalledException (const char *method_name); }; -class QtObjectBase +class GSI_QTBASIC_PUBLIC QtObjectBase : public gsi::ObjectBase { public: diff --git a/src/gsiqt/qtbasic/gsiQtBasicCommon.h b/src/gsiqt/qtbasic/gsiQtBasicCommon.h new file mode 100644 index 000000000..015ca44d7 --- /dev/null +++ b/src/gsiqt/qtbasic/gsiQtBasicCommon.h @@ -0,0 +1,39 @@ + +/* + + KLayout Layout Viewer + Copyright (C) 2006-2018 Matthias Koefferlein + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + + +#include "tlDefs.h" + +#if !defined(HDR_gsiQtBasicCommon_h) +# define HDR_gsiQtBasicCommon_h + +# ifdef MAKE_GSI_QTBASIC_LIBRARY +# define GSI_QTBASIC_PUBLIC DEF_INSIDE_PUBLIC +# define GSI_QTBASIC_PUBLIC_TEMPLATE DEF_INSIDE_PUBLIC_TEMPLATE +# define GSI_QTBASIC_LOCAL DEF_INSIDE_LOCAL +# else +# define GSI_QTBASIC_PUBLIC DEF_OUTSIDE_PUBLIC +# define GSI_QTBASIC_PUBLIC_TEMPLATE DEF_OUTSIDE_PUBLIC_TEMPLATE +# define GSI_QTBASIC_LOCAL DEF_OUTSIDE_LOCAL +# endif + +#endif diff --git a/src/gsiqt/gsiQtHelper.cc b/src/gsiqt/qtbasic/gsiQtHelper.cc similarity index 99% rename from src/gsiqt/gsiQtHelper.cc rename to src/gsiqt/qtbasic/gsiQtHelper.cc index b6304a402..1c530a5fa 100644 --- a/src/gsiqt/gsiQtHelper.cc +++ b/src/gsiqt/qtbasic/gsiQtHelper.cc @@ -20,7 +20,7 @@ */ -#include "gsiQtHelper.h" +#include "gsiQt.h" #include "tlObject.h" #include diff --git a/src/gsiqt/gsiQtHelper.h b/src/gsiqt/qtbasic/gsiQtHelper.h similarity index 88% rename from src/gsiqt/gsiQtHelper.h rename to src/gsiqt/qtbasic/gsiQtHelper.h index df77e18a4..28333046a 100644 --- a/src/gsiqt/gsiQtHelper.h +++ b/src/gsiqt/qtbasic/gsiQtHelper.h @@ -23,6 +23,7 @@ #if !defined(HDR_gsiQtHelper_h) # define HDR_gsiQtHelper_h +#include "gsiQtBasicCommon.h" #include "gsiDecl.h" #include @@ -30,7 +31,7 @@ namespace qt_gsi { -gsi::ObjectBase *get_watcher_object (QObject *qobject, bool required); +QTBASIC_PUBLIC gsi::ObjectBase *get_watcher_object (QObject *qobject, bool required); } diff --git a/src/gsiqt/qtbasic/qtbasic.pro b/src/gsiqt/qtbasic/qtbasic.pro new file mode 100644 index 000000000..d20370fb2 --- /dev/null +++ b/src/gsiqt/qtbasic/qtbasic.pro @@ -0,0 +1,23 @@ + +DESTDIR = $$OUT_PWD/../.. +TARGET = klayout_qtbasic + +include($$PWD/../../lib.pri) + +DEFINES += MAKE_GSI_QTBASIC_LIBRARY + +# NOTE: db is required since some bridges to db are provided (i.e db::Polygon) +INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$QTBASIC_INC +DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$QTBASIC_INC + +LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db + +SOURCES += \ + gsiQt.cc \ + gsiDeclQtBasic.cc \ + gsiDeclQt5Basic.cc \ + gsiQtHelper.cc + +HEADERS += \ + gsiQt.h \ + gsiQtBasicCommon.h diff --git a/src/gsiqt4/gsiQtExternals.h b/src/gsiqt4/gsiQtExternals.h deleted file mode 100644 index 3dc00bce2..000000000 --- a/src/gsiqt4/gsiQtExternals.h +++ /dev/null @@ -1,1555 +0,0 @@ - -/* - - KLayout Layout Viewer - Copyright (C) 2006-2018 Matthias Koefferlein - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -*/ - -/* - External declarations for for Qt bindings - - DO NOT EDIT THIS FILE. - This file has been created automatically -*/ - -#if !defined(HDR_gsiQtExternals) -#define HDR_gsiQtExternals - -#include "gsiClassBase.h" -#include "gsiQtCommon.h" - -class QAbstractButton; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractButton (); } - -class QAbstractFormBuilder; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractFormBuilder (); } - -class QAbstractGraphicsShapeItem; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractGraphicsShapeItem (); } - -class QAbstractItemDelegate; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractItemDelegate (); } - -class QAbstractItemModel; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractItemModel (); } - -class QAbstractItemView; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractItemView (); } - -class QAbstractListModel; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractListModel (); } - -class QAbstractNetworkCache; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractNetworkCache (); } - -class QAbstractPageSetupDialog; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractPageSetupDialog (); } - -class QAbstractPrintDialog; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractPrintDialog (); } - -class QAbstractProxyModel; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractProxyModel (); } - -class QAbstractScrollArea; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractScrollArea (); } - -class QAbstractSlider; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractSlider (); } - -class QAbstractSocket; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractSocket (); } - -class QAbstractSpinBox; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractSpinBox (); } - -class QAbstractTableModel; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractTableModel (); } - -class QAbstractTextDocumentLayout; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractTextDocumentLayout (); } - -class QAbstractUndoItem; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAbstractUndoItem (); } - -class QAccessible; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAccessible (); } - -class QAccessibleApplication; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAccessibleApplication (); } - -class QAccessibleEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAccessibleEvent (); } - -class QAccessibleInterface; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAccessibleInterface (); } - -class QAccessibleObject; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAccessibleObject (); } - -class QAccessibleWidget; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAccessibleWidget (); } - -class QAction; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAction (); } - -class QActionEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QActionEvent (); } - -class QActionGroup; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QActionGroup (); } - -class QApplication; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QApplication (); } - -class QAuthenticator; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QAuthenticator (); } - -class QBasicTimer; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QBasicTimer (); } - -class QBitmap; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QBitmap (); } - -class QBoxLayout; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QBoxLayout (); } - -class QBrush; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QBrush (); } - -class QBuffer; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QBuffer (); } - -class QButtonGroup; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QButtonGroup (); } - -class QByteArrayMatcher; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QByteArrayMatcher (); } - -class QCDEStyle; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QCDEStyle (); } - -class QCalendarWidget; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QCalendarWidget (); } - -class QCheckBox; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QCheckBox (); } - -class QChildEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QChildEvent (); } - -class QCleanlooksStyle; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QCleanlooksStyle (); } - -class QClipboard; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QClipboard (); } - -class QClipboardEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QClipboardEvent (); } - -class QCloseEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QCloseEvent (); } - -class QColor; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QColor (); } - -class QColorDialog; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QColorDialog (); } - -class QColormap; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QColormap (); } - -class QColumnView; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QColumnView (); } - -class QComboBox; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QComboBox (); } - -class QCommandLinkButton; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QCommandLinkButton (); } - -class QCommonStyle; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QCommonStyle (); } - -class QCompleter; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QCompleter (); } - -class QConicalGradient; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QConicalGradient (); } - -class QContextMenuEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QContextMenuEvent (); } - -class QCoreApplication; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QCoreApplication (); } - -class QCryptographicHash; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QCryptographicHash (); } - -class QCursor; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QCursor (); } - -class QDataStream; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDataStream (); } - -class QDataWidgetMapper; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDataWidgetMapper (); } - -class QDate; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDate (); } - -class QDateEdit; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDateEdit (); } - -class QDateTime; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDateTime (); } - -class QDateTimeEdit; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDateTimeEdit (); } - -class QDesktopServices; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDesktopServices (); } - -class QDesktopWidget; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDesktopWidget (); } - -class QDial; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDial (); } - -class QDialog; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDialog (); } - -class QDialogButtonBox; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDialogButtonBox (); } - -class QDir; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDir (); } - -class QDirIterator; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDirIterator (); } - -class QDirModel; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDirModel (); } - -class QDockWidget; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDockWidget (); } - -class QDomAttr; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDomAttr (); } - -class QDomCDATASection; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDomCDATASection (); } - -class QDomCharacterData; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDomCharacterData (); } - -class QDomComment; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDomComment (); } - -class QDomDocument; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDomDocument (); } - -class QDomDocumentFragment; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDomDocumentFragment (); } - -class QDomDocumentType; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDomDocumentType (); } - -class QDomElement; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDomElement (); } - -class QDomEntity; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDomEntity (); } - -class QDomEntityReference; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDomEntityReference (); } - -class QDomImplementation; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDomImplementation (); } - -class QDomNamedNodeMap; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDomNamedNodeMap (); } - -class QDomNode; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDomNode (); } - -class QDomNodeList; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDomNodeList (); } - -class QDomNotation; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDomNotation (); } - -class QDomProcessingInstruction; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDomProcessingInstruction (); } - -class QDomText; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDomText (); } - -class QDoubleSpinBox; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDoubleSpinBox (); } - -class QDoubleValidator; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDoubleValidator (); } - -class QDrag; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDrag (); } - -class QDragEnterEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDragEnterEvent (); } - -class QDragLeaveEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDragLeaveEvent (); } - -class QDragMoveEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDragMoveEvent (); } - -class QDragResponseEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDragResponseEvent (); } - -class QDropEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDropEvent (); } - -class QDynamicPropertyChangeEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QDynamicPropertyChangeEvent (); } - -class QEasingCurve; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QEasingCurve (); } - -class QErrorMessage; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QErrorMessage (); } - -class QEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QEvent (); } - -class QEventLoop; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QEventLoop (); } - -struct QFactoryInterface; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QFactoryInterface (); } - -class QFile; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QFile (); } - -class QFileDialog; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QFileDialog (); } - -class QFileIconProvider; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QFileIconProvider (); } - -class QFileInfo; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QFileInfo (); } - -class QFileOpenEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QFileOpenEvent (); } - -class QFileSystemModel; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QFileSystemModel (); } - -class QFileSystemWatcher; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QFileSystemWatcher (); } - -class QFocusEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QFocusEvent (); } - -class QFocusFrame; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QFocusFrame (); } - -class QFont; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QFont (); } - -class QFontComboBox; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QFontComboBox (); } - -class QFontDatabase; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QFontDatabase (); } - -class QFontDialog; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QFontDialog (); } - -class QFontInfo; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QFontInfo (); } - -class QFontMetrics; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QFontMetrics (); } - -class QFontMetricsF; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QFontMetricsF (); } - -class QFormBuilder; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QFormBuilder (); } - -class QFormLayout; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QFormLayout (); } - -class QFrame; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QFrame (); } - -class QFtp; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QFtp (); } - -class QGesture; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGesture (); } - -class QGestureEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGestureEvent (); } - -class QGestureRecognizer; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGestureRecognizer (); } - -class QGradient; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGradient (); } - -class QGraphicsAnchor; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsAnchor (); } - -class QGraphicsAnchorLayout; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsAnchorLayout (); } - -class QGraphicsBlurEffect; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsBlurEffect (); } - -class QGraphicsColorizeEffect; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsColorizeEffect (); } - -class QGraphicsDropShadowEffect; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsDropShadowEffect (); } - -class QGraphicsEffect; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsEffect (); } - -class QGraphicsEllipseItem; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsEllipseItem (); } - -class QGraphicsGridLayout; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsGridLayout (); } - -class QGraphicsItem; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsItem (); } - -class QGraphicsItemAnimation; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsItemAnimation (); } - -class QGraphicsItemGroup; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsItemGroup (); } - -class QGraphicsLayout; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsLayout (); } - -class QGraphicsLayoutItem; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsLayoutItem (); } - -class QGraphicsLineItem; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsLineItem (); } - -class QGraphicsLinearLayout; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsLinearLayout (); } - -class QGraphicsObject; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsObject (); } - -class QGraphicsOpacityEffect; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsOpacityEffect (); } - -class QGraphicsPathItem; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsPathItem (); } - -class QGraphicsPixmapItem; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsPixmapItem (); } - -class QGraphicsPolygonItem; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsPolygonItem (); } - -class QGraphicsProxyWidget; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsProxyWidget (); } - -class QGraphicsRectItem; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsRectItem (); } - -class QGraphicsRotation; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsRotation (); } - -class QGraphicsScale; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsScale (); } - -class QGraphicsScene; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsScene (); } - -class QGraphicsSceneContextMenuEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsSceneContextMenuEvent (); } - -class QGraphicsSceneDragDropEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsSceneDragDropEvent (); } - -class QGraphicsSceneEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsSceneEvent (); } - -class QGraphicsSceneHelpEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsSceneHelpEvent (); } - -class QGraphicsSceneHoverEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsSceneHoverEvent (); } - -class QGraphicsSceneMouseEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsSceneMouseEvent (); } - -class QGraphicsSceneMoveEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsSceneMoveEvent (); } - -class QGraphicsSceneResizeEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsSceneResizeEvent (); } - -class QGraphicsSceneWheelEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsSceneWheelEvent (); } - -class QGraphicsSimpleTextItem; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsSimpleTextItem (); } - -class QGraphicsTextItem; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsTextItem (); } - -class QGraphicsTransform; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsTransform (); } - -class QGraphicsView; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsView (); } - -class QGraphicsWidget; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGraphicsWidget (); } - -class QGridLayout; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGridLayout (); } - -class QGroupBox; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QGroupBox (); } - -class QHBoxLayout; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QHBoxLayout (); } - -class QHeaderView; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QHeaderView (); } - -class QHelpEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QHelpEvent (); } - -class QHideEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QHideEvent (); } - -class QHostAddress; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QHostAddress (); } - -class QHostInfo; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QHostInfo (); } - -class QHoverEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QHoverEvent (); } - -class QIODevice; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QIODevice (); } - -class QIPv6Address; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QIPv6Address (); } - -class QIcon; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QIcon (); } - -class QIconDragEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QIconDragEvent (); } - -class QIconEngine; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QIconEngine (); } - -class QIconEnginePlugin; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QIconEnginePlugin (); } - -class QIconEnginePluginV2; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QIconEnginePluginV2 (); } - -class QIconEngineV2; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QIconEngineV2 (); } - -class QImage; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QImage (); } - -class QImageIOHandler; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QImageIOHandler (); } - -class QImageIOPlugin; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QImageIOPlugin (); } - -class QImageReader; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QImageReader (); } - -class QImageTextKeyLang; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QImageTextKeyLang (); } - -class QImageWriter; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QImageWriter (); } - -class QInputContext; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QInputContext (); } - -class QInputContextFactory; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QInputContextFactory (); } - -class QInputContextPlugin; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QInputContextPlugin (); } - -class QInputDialog; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QInputDialog (); } - -class QInputEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QInputEvent (); } - -class QInputMethodEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QInputMethodEvent (); } - -class QIntValidator; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QIntValidator (); } - -class QItemDelegate; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QItemDelegate (); } - -class QItemEditorCreatorBase; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QItemEditorCreatorBase (); } - -class QItemEditorFactory; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QItemEditorFactory (); } - -class QItemSelection; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QItemSelection (); } - -class QItemSelectionModel; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QItemSelectionModel (); } - -class QItemSelectionRange; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QItemSelectionRange (); } - -class QKeyEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QKeyEvent (); } - -class QKeySequence; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QKeySequence (); } - -class QLCDNumber; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QLCDNumber (); } - -class QLabel; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QLabel (); } - -class QLayout; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QLayout (); } - -class QLayoutItem; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QLayoutItem (); } - -class QLibrary; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QLibrary (); } - -class QLibraryInfo; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QLibraryInfo (); } - -class QLine; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QLine (); } - -class QLineEdit; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QLineEdit (); } - -class QLineF; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QLineF (); } - -class QLinearGradient; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QLinearGradient (); } - -class QListView; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QListView (); } - -class QListWidget; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QListWidget (); } - -class QListWidgetItem; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QListWidgetItem (); } - -class QLocalServer; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QLocalServer (); } - -class QLocalSocket; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QLocalSocket (); } - -class QLocale; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QLocale (); } - -class QMainWindow; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMainWindow (); } - -class QMargins; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMargins (); } - -class QMatrix; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMatrix (); } - -class QMatrix4x4; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMatrix4x4 (); } - -class QMdiArea; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMdiArea (); } - -class QMdiSubWindow; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMdiSubWindow (); } - -class QMenu; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMenu (); } - -class QMenuBar; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMenuBar (); } - -class QMessageBox; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMessageBox (); } - -class QMetaClassInfo; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMetaClassInfo (); } - -class QMetaEnum; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMetaEnum (); } - -class QMetaMethod; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMetaMethod (); } - -struct QMetaObject; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMetaObject (); } - -class QMetaProperty; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMetaProperty (); } - -class QMetaType; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMetaType (); } - -class QMimeData; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMimeData (); } - -class QMimeSource; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMimeSource (); } - -class QModelIndex; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QModelIndex (); } - -class QMotifStyle; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMotifStyle (); } - -class QMouseEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMouseEvent (); } - -class QMoveEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMoveEvent (); } - -class QMovie; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMovie (); } - -class QMutex; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QMutex (); } - -class QNetworkAccessManager; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkAccessManager (); } - -class QNetworkAddressEntry; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkAddressEntry (); } - -class QNetworkCacheMetaData; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkCacheMetaData (); } - -class QNetworkCookie; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkCookie (); } - -class QNetworkCookieJar; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkCookieJar (); } - -class QNetworkDiskCache; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkDiskCache (); } - -class QNetworkInterface; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkInterface (); } - -class QNetworkProxy; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkProxy (); } - -class QNetworkProxyFactory; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkProxyFactory (); } - -class QNetworkProxyQuery; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkProxyQuery (); } - -class QNetworkReply; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkReply (); } - -class QNetworkRequest; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QNetworkRequest (); } - -class QObject; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QObject (); } - -class QPageSetupDialog; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPageSetupDialog (); } - -class QPaintDevice; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPaintDevice (); } - -class QPaintEngine; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPaintEngine (); } - -class QPaintEngineState; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPaintEngineState (); } - -class QPaintEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPaintEvent (); } - -class QPainter; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPainter (); } - -class QPainterPath; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPainterPath (); } - -class QPainterPathStroker; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPainterPathStroker (); } - -class QPalette; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPalette (); } - -class QPanGesture; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPanGesture (); } - -class QPen; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPen (); } - -class QPersistentModelIndex; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPersistentModelIndex (); } - -class QPicture; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPicture (); } - -class QPinchGesture; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPinchGesture (); } - -class QPixmap; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPixmap (); } - -class QPixmapCache; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPixmapCache (); } - -class QPlainTextDocumentLayout; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPlainTextDocumentLayout (); } - -class QPlainTextEdit; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPlainTextEdit (); } - -class QPlastiqueStyle; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPlastiqueStyle (); } - -class QPluginLoader; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPluginLoader (); } - -class QPoint; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPoint (); } - -class QPointF; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPointF (); } - -class QPolygon; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPolygon (); } - -class QPolygonF; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPolygonF (); } - -class QPrintDialog; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPrintDialog (); } - -class QPrintEngine; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPrintEngine (); } - -class QPrintPreviewDialog; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPrintPreviewDialog (); } - -class QPrintPreviewWidget; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPrintPreviewWidget (); } - -class QPrinter; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPrinter (); } - -class QPrinterInfo; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPrinterInfo (); } - -class QProcess; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QProcess (); } - -class QProcessEnvironment; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QProcessEnvironment (); } - -class QProgressBar; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QProgressBar (); } - -class QProgressDialog; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QProgressDialog (); } - -class QPushButton; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QPushButton (); } - -class QQuaternion; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QQuaternion (); } - -class QRadialGradient; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QRadialGradient (); } - -class QRadioButton; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QRadioButton (); } - -class QReadLocker; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QReadLocker (); } - -class QReadWriteLock; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QReadWriteLock (); } - -class QRect; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QRect (); } - -class QRectF; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QRectF (); } - -class QRegExp; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QRegExp (); } - -class QRegExpValidator; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QRegExpValidator (); } - -class QRegion; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QRegion (); } - -class QResizeEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QResizeEvent (); } - -class QResource; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QResource (); } - -class QRubberBand; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QRubberBand (); } - -class QScrollArea; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QScrollArea (); } - -class QScrollBar; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QScrollBar (); } - -class QSemaphore; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSemaphore (); } - -class QSettings; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSettings (); } - -class QShortcut; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QShortcut (); } - -class QShortcutEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QShortcutEvent (); } - -class QShowEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QShowEvent (); } - -class QSignalMapper; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSignalMapper (); } - -class QSize; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSize (); } - -class QSizeF; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSizeF (); } - -class QSizeGrip; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSizeGrip (); } - -class QSizePolicy; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSizePolicy (); } - -class QSlider; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSlider (); } - -class QSocketNotifier; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSocketNotifier (); } - -class QSortFilterProxyModel; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSortFilterProxyModel (); } - -class QSound; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSound (); } - -class QSpacerItem; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSpacerItem (); } - -class QSpinBox; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSpinBox (); } - -class QSplashScreen; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSplashScreen (); } - -class QSplitter; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSplitter (); } - -class QSplitterHandle; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSplitterHandle (); } - -class QSqlDatabase; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSqlDatabase (); } - -class QSqlDriver; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSqlDriver (); } - -class QSqlDriverCreatorBase; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSqlDriverCreatorBase (); } - -class QSqlError; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSqlError (); } - -class QSqlField; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSqlField (); } - -class QSqlIndex; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSqlIndex (); } - -class QSqlQuery; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSqlQuery (); } - -class QSqlQueryModel; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSqlQueryModel (); } - -class QSqlRecord; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSqlRecord (); } - -class QSqlRelation; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSqlRelation (); } - -class QSqlRelationalTableModel; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSqlRelationalTableModel (); } - -class QSqlResult; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSqlResult (); } - -class QSqlTableModel; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSqlTableModel (); } - -class QSslCertificate; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSslCertificate (); } - -class QSslCipher; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSslCipher (); } - -class QSslConfiguration; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSslConfiguration (); } - -class QSslError; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSslError (); } - -class QSslKey; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSslKey (); } - -class QSslSocket; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSslSocket (); } - -class QStackedLayout; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStackedLayout (); } - -class QStackedWidget; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStackedWidget (); } - -class QStandardItem; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStandardItem (); } - -class QStandardItemModel; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStandardItemModel (); } - -class QStatusBar; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStatusBar (); } - -class QStatusTipEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStatusTipEvent (); } - -class QStringListModel; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStringListModel (); } - -class QStringMatcher; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStringMatcher (); } - -class QStyle; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyle (); } - -class QStyleFactory; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleFactory (); } - -class QStyleHintReturn; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleHintReturn (); } - -class QStyleHintReturnMask; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleHintReturnMask (); } - -class QStyleHintReturnVariant; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleHintReturnVariant (); } - -class QStyleOption; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOption (); } - -class QStyleOptionButton; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionButton (); } - -class QStyleOptionComboBox; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionComboBox (); } - -class QStyleOptionComplex; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionComplex (); } - -class QStyleOptionDockWidget; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionDockWidget (); } - -class QStyleOptionFocusRect; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionFocusRect (); } - -class QStyleOptionFrame; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionFrame (); } - -class QStyleOptionFrameV2; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionFrameV2 (); } - -class QStyleOptionFrameV3; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionFrameV3 (); } - -class QStyleOptionGraphicsItem; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionGraphicsItem (); } - -class QStyleOptionGroupBox; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionGroupBox (); } - -class QStyleOptionHeader; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionHeader (); } - -class QStyleOptionMenuItem; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionMenuItem (); } - -class QStyleOptionProgressBar; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionProgressBar (); } - -class QStyleOptionProgressBarV2; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionProgressBarV2 (); } - -class QStyleOptionQ3DockWindow; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionQ3DockWindow (); } - -class QStyleOptionQ3ListView; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionQ3ListView (); } - -class QStyleOptionQ3ListViewItem; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionQ3ListViewItem (); } - -class QStyleOptionRubberBand; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionRubberBand (); } - -class QStyleOptionSizeGrip; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionSizeGrip (); } - -class QStyleOptionSlider; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionSlider (); } - -class QStyleOptionSpinBox; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionSpinBox (); } - -class QStyleOptionTab; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionTab (); } - -class QStyleOptionTabBarBase; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionTabBarBase (); } - -class QStyleOptionTabBarBaseV2; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionTabBarBaseV2 (); } - -class QStyleOptionTabV2; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionTabV2 (); } - -class QStyleOptionTabV3; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionTabV3 (); } - -class QStyleOptionTabWidgetFrame; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionTabWidgetFrame (); } - -class QStyleOptionTitleBar; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionTitleBar (); } - -class QStyleOptionToolBar; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionToolBar (); } - -class QStyleOptionToolBox; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionToolBox (); } - -class QStyleOptionToolBoxV2; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionToolBoxV2 (); } - -class QStyleOptionToolButton; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionToolButton (); } - -class QStyleOptionViewItem; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionViewItem (); } - -class QStyleOptionViewItemV2; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionViewItemV2 (); } - -class QStyleOptionViewItemV3; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionViewItemV3 (); } - -class QStyleOptionViewItemV4; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyleOptionViewItemV4 (); } - -class QStylePainter; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStylePainter (); } - -class QStylePlugin; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStylePlugin (); } - -class QStyledItemDelegate; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QStyledItemDelegate (); } - -class QSwipeGesture; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSwipeGesture (); } - -class QSyntaxHighlighter; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSyntaxHighlighter (); } - -class QSysInfo; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSysInfo (); } - -class QSystemLocale; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSystemLocale (); } - -class QSystemTrayIcon; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QSystemTrayIcon (); } - -class QTabBar; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTabBar (); } - -class QTabWidget; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTabWidget (); } - -class QTableView; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTableView (); } - -class QTableWidget; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTableWidget (); } - -class QTableWidgetItem; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTableWidgetItem (); } - -class QTableWidgetSelectionRange; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTableWidgetSelectionRange (); } - -class QTabletEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTabletEvent (); } - -class QTapAndHoldGesture; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTapAndHoldGesture (); } - -class QTapGesture; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTapGesture (); } - -class QTcpServer; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTcpServer (); } - -class QTcpSocket; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTcpSocket (); } - -class QTemporaryFile; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTemporaryFile (); } - -class QTextBlock; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextBlock (); } - -class QTextBlockFormat; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextBlockFormat (); } - -class QTextBlockGroup; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextBlockGroup (); } - -class QTextBlockUserData; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextBlockUserData (); } - -class QTextBrowser; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextBrowser (); } - -class QTextCharFormat; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextCharFormat (); } - -class QTextCodec; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextCodec (); } - -class QTextCursor; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextCursor (); } - -class QTextDecoder; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextDecoder (); } - -class QTextDocument; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextDocument (); } - -class QTextDocumentFragment; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextDocumentFragment (); } - -class QTextDocumentWriter; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextDocumentWriter (); } - -class QTextEdit; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextEdit (); } - -class QTextEncoder; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextEncoder (); } - -class QTextFormat; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextFormat (); } - -class QTextFragment; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextFragment (); } - -class QTextFrame; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextFrame (); } - -class QTextFrameFormat; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextFrameFormat (); } - -class QTextImageFormat; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextImageFormat (); } - -class QTextInlineObject; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextInlineObject (); } - -class QTextItem; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextItem (); } - -class QTextLayout; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextLayout (); } - -class QTextLength; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextLength (); } - -class QTextLine; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextLine (); } - -class QTextList; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextList (); } - -class QTextListFormat; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextListFormat (); } - -class QTextObject; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextObject (); } - -class QTextObjectInterface; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextObjectInterface (); } - -class QTextOption; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextOption (); } - -class QTextStream; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextStream (); } - -class QTextTable; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextTable (); } - -class QTextTableCell; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextTableCell (); } - -class QTextTableCellFormat; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextTableCellFormat (); } - -class QTextTableFormat; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTextTableFormat (); } - -class QThread; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QThread (); } - -class QTime; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTime (); } - -class QTimeEdit; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTimeEdit (); } - -class QTimeLine; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTimeLine (); } - -class QTimer; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTimer (); } - -class QTimerEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTimerEvent (); } - -class QToolBar; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QToolBar (); } - -class QToolBarChangeEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QToolBarChangeEvent (); } - -class QToolBox; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QToolBox (); } - -class QToolButton; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QToolButton (); } - -class QToolTip; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QToolTip (); } - -class QTouchEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTouchEvent (); } - -class QTransform; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTransform (); } - -class QTranslator; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTranslator (); } - -class QTreeView; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTreeView (); } - -class QTreeWidget; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTreeWidget (); } - -class QTreeWidgetItem; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTreeWidgetItem (); } - -class QTreeWidgetItemIterator; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QTreeWidgetItemIterator (); } - -class QUdpSocket; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QUdpSocket (); } - -class QUndoCommand; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QUndoCommand (); } - -class QUndoGroup; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QUndoGroup (); } - -class QUndoStack; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QUndoStack (); } - -class QUndoView; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QUndoView (); } - -class QUnixPrintWidget; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QUnixPrintWidget (); } - -class QUrl; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QUrl (); } - -class QUrlInfo; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QUrlInfo (); } - -class QVBoxLayout; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QVBoxLayout (); } - -class QValidator; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QValidator (); } - -class QVector2D; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QVector2D (); } - -class QVector3D; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QVector3D (); } - -class QVector4D; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QVector4D (); } - -class QWaitCondition; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QWaitCondition (); } - -class QWhatsThis; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QWhatsThis (); } - -class QWhatsThisClickedEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QWhatsThisClickedEvent (); } - -class QWheelEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QWheelEvent (); } - -class QWidget; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QWidget (); } - -class QWidgetAction; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QWidgetAction (); } - -class QWidgetItem; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QWidgetItem (); } - -class QWindowStateChangeEvent; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QWindowStateChangeEvent (); } - -class QWindowsStyle; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QWindowsStyle (); } - -class QWizard; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QWizard (); } - -class QWizardPage; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QWizardPage (); } - -class QWriteLocker; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QWriteLocker (); } - -class QXmlAttributes; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QXmlAttributes (); } - -class QXmlContentHandler; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QXmlContentHandler (); } - -class QXmlDTDHandler; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QXmlDTDHandler (); } - -class QXmlDeclHandler; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QXmlDeclHandler (); } - -class QXmlDefaultHandler; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QXmlDefaultHandler (); } - -class QXmlEntityResolver; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QXmlEntityResolver (); } - -class QXmlErrorHandler; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QXmlErrorHandler (); } - -class QXmlInputSource; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QXmlInputSource (); } - -class QXmlLexicalHandler; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QXmlLexicalHandler (); } - -class QXmlLocator; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QXmlLocator (); } - -class QXmlNamespaceSupport; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QXmlNamespaceSupport (); } - -class QXmlParseException; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QXmlParseException (); } - -class QXmlReader; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QXmlReader (); } - -class QXmlSimpleReader; -namespace gsi { GSIQT_PUBLIC gsi::Class &qtdecl_QXmlSimpleReader (); } - - -#define QT_EXTERNAL_BASE(X) gsi::qtdecl_##X(), - -#endif - diff --git a/src/gsiqt4/gsiqt.pro b/src/gsiqt4/gsiqt.pro deleted file mode 100644 index 890459c7a..000000000 --- a/src/gsiqt4/gsiqt.pro +++ /dev/null @@ -1,17 +0,0 @@ - -DESTDIR=$$OUT_PWD/.. - -include($$PWD/../klayout.pri) -include(qtdecl.pro) -include($$PWD/../gsiqt_common/gsiqt_common.pri) - -DEFINES += MAKE_GSIQT_LIBRARY - -TEMPLATE = lib - -# NOTE: db is required since some bridges to db are provided (i.e db::Polygon) -INCLUDEPATH += ../tl ../gsi ../db ../gsiqt_common -DEPENDPATH += ../tl ../gsi ../db ../gsiqt_common - -LIBS += -L$$DESTDIR -ltl -lgsi -ldb - diff --git a/src/img/img/gsiDeclImg.cc b/src/img/img/gsiDeclImg.cc index c275a3d19..0fa337d5e 100644 --- a/src/img/img/gsiDeclImg.cc +++ b/src/img/img/gsiDeclImg.cc @@ -130,7 +130,7 @@ static double blue_gain (const img::DataMapping *dm) return dm->blue_gain; } -gsi::Class decl_ImageDataMapping ("ImageDataMapping", +gsi::Class decl_ImageDataMapping ("lay", "ImageDataMapping", gsi::constructor ("new", &gsi::new_data_mapping, "@brief Create a new data mapping object with default settings" ) + @@ -446,9 +446,9 @@ static void img_set_trans (ImageRef *obj, const db::DCplxTrans &t) } // NOTE: img::Object is available as "BasicImage" to allow binding for other methods. -gsi::Class decl_BasicImage ("BasicImage", gsi::Methods (), "@hide"); +gsi::Class decl_BasicImage ("lay", "BasicImage", gsi::Methods (), "@hide"); -gsi::Class decl_Image (decl_BasicImage, "Image", +gsi::Class decl_Image (decl_BasicImage, "lay", "Image", gsi::constructor ("new", &gsi::new_image, "@brief Create a new image with the default attributes" "\n" diff --git a/src/klayout.pri b/src/klayout.pri index 728f60a7b..96a4595ad 100644 --- a/src/klayout.pri +++ b/src/klayout.pri @@ -13,7 +13,7 @@ LIB_INC = $$PWD/lib/lib LAY_INC = $$PWD/lay/lay LAYBASIC_INC = $$PWD/laybasic/laybasic -GSIQT_INC = $$PWD/gsiqt +QTBASIC_INC = $$PWD/gsiqt/qtbasic BD_INC = $$PWD/buddies/src/bd diff --git a/src/lay/lay/gsiDeclLayApplication.cc b/src/lay/lay/gsiDeclLayApplication.cc index 2a10a2e71..87ca59f0b 100644 --- a/src/lay/lay/gsiDeclLayApplication.cc +++ b/src/lay/lay/gsiDeclLayApplication.cc @@ -245,7 +245,7 @@ LAY_PUBLIC make_application_decl (bool non_gui_mode) if (non_gui_mode) { non_gui_app_decl.reset ( - new Class (QT_EXTERNAL_BASE (QCoreApplication) "Application", + new Class (QT_EXTERNAL_BASE (QCoreApplication) "lay", "Application", application_methods (), application_doc () ) @@ -254,7 +254,7 @@ LAY_PUBLIC make_application_decl (bool non_gui_mode) } else { gui_app_decl.reset ( - new Class (QT_EXTERNAL_BASE (QApplication) "Application", + new Class (QT_EXTERNAL_BASE (QApplication) "lay", "Application", application_methods (), application_doc () ) diff --git a/src/lay/lay/gsiDeclLayHelpDialog.cc b/src/lay/lay/gsiDeclLayHelpDialog.cc index 9a01dea71..960a3b979 100644 --- a/src/lay/lay/gsiDeclLayHelpDialog.cc +++ b/src/lay/lay/gsiDeclLayHelpDialog.cc @@ -94,7 +94,7 @@ Class decl_HelpDialog (QT_EXTERNAL_BASE (QDialog) "HelpDialog", LAYBASIC_PUBLIC Class &laybasicdecl_BrowserSource (); -Class decl_HelpSource (laybasicdecl_BrowserSource (), "HelpSource", +Class decl_HelpSource (laybasicdecl_BrowserSource (), "lay", "HelpSource", #if defined(HAVE_QTBINDINGS) gsi::method ("get_dom", &lay::HelpSource::get_dom, "@brief For internal use") + #endif diff --git a/src/laybasic/laybasic/gsiDeclLayDialogs.cc b/src/laybasic/laybasic/gsiDeclLayDialogs.cc index aa9aaa5d4..0927c4a4c 100644 --- a/src/laybasic/laybasic/gsiDeclLayDialogs.cc +++ b/src/laybasic/laybasic/gsiDeclLayDialogs.cc @@ -120,7 +120,7 @@ struct DoubleValue bool has_value () const { return h; } }; -Class decl_DoubleValue ("DoubleValue", +Class decl_DoubleValue ("lay", "DoubleValue", gsi::method ("has_value?", &DoubleValue::has_value, "@brief True, if a value is present" ) + @@ -149,7 +149,7 @@ struct IntValue bool has_value () const { return h; } }; -Class decl_IntValue ("IntValue", +Class decl_IntValue ("lay", "IntValue", gsi::method ("has_value?", &IntValue::has_value, "@brief True, if a value is present" ) + @@ -178,7 +178,7 @@ struct StringValue bool has_value () const { return h; } }; -Class decl_StringValue ("StringValue", +Class decl_StringValue ("lay", "StringValue", gsi::method ("has_value?", &StringValue::has_value, "@brief True, if a value is present" ) + @@ -207,7 +207,7 @@ struct StringListValue bool has_value () const { return h; } }; -Class decl_StringListValue ("StringListValue", +Class decl_StringListValue ("lay", "StringListValue", gsi::method ("has_value?", &StringListValue::has_value, "@brief True, if a value is present" ) + @@ -404,7 +404,7 @@ static BrowserSource_Stub *new_html (const std::string &html) return new BrowserSource_Stub (html); } -Class decl_BrowserSource ("BrowserSource_Native", +Class decl_BrowserSource ("lay", "BrowserSource_Native", gsi::method ("get", &lay::BrowserSource::get), "@hide\n@alias BrowserSource" ); @@ -415,7 +415,7 @@ Class &laybasicdecl_BrowserSource () return decl_BrowserSource; } -Class decl_BrowserSourceStub ("BrowserSource", +Class decl_BrowserSourceStub ("lay", "BrowserSource", gsi::constructor ("new|#new_html", &new_html, "@brief construct a BrowserSource object with a default HTML string\n" "\n" @@ -701,7 +701,7 @@ static tl::Variant ask_item (const std::string &title, const std::string &label, struct InputDialog { }; -Class decl_InputDialog ("InputDialog", +Class decl_InputDialog ("lay", "InputDialog", gsi::method ("#get_string", &get_string, "@brief Open an input dialog requesting a string\n" "@args title, label, value\n" @@ -958,7 +958,7 @@ static tl::Variant ask_save_file_name (const std::string &title, const std::stri } } -Class decl_FileDialog ("FileDialog", +Class decl_FileDialog ("lay", "FileDialog", gsi::method ("#get_existing_dir", &get_existing_dir, "@brief Open a dialog to select a directory\n" "@args title, dir\n" diff --git a/src/laybasic/laybasic/gsiDeclLayLayers.cc b/src/laybasic/laybasic/gsiDeclLayLayers.cc index b3d790ba2..3f432de67 100644 --- a/src/laybasic/laybasic/gsiDeclLayLayers.cc +++ b/src/laybasic/laybasic/gsiDeclLayLayers.cc @@ -420,7 +420,7 @@ static std::string source_string_1 (const lay::LayerProperties *n) return n->source_string (true); } -Class decl_LayerProperties ("LayerProperties", +Class decl_LayerProperties ("lay", "LayerProperties", method ("==", &lay::LayerProperties::operator==, "@brief Equality \n" "@args other\n" @@ -1239,7 +1239,7 @@ static void clear_children (lay::LayerPropertiesNode *node) Class decl_LayerPropertiesNode ( decl_LayerProperties, - "LayerPropertiesNode", + "lay", "LayerPropertiesNode", method ("==", &lay::LayerPropertiesNode::operator==, "@brief Equality \n" "@args other\n" @@ -1341,7 +1341,7 @@ static lay::LayerPropertiesNode lp_dup (const lay::LayerPropertiesNodeRef *ref) Class decl_LayerPropertiesNodeRef ( decl_LayerPropertiesNode, - "LayerPropertiesNodeRef", + "lay", "LayerPropertiesNodeRef", method ("delete", &lay::LayerPropertiesNodeRef::erase, "@brief Erases the current node and all child nodes\n" "\n" @@ -1394,7 +1394,7 @@ static lay::LayerPropertiesNodeRef current (lay::LayerPropertiesConstIterator *i } Class decl_LayerPropertiesIterator ( - "LayerPropertiesIterator", + "lay", "LayerPropertiesIterator", method ("!=", &lay::LayerPropertiesConstIterator::operator!=, "@brief Inequality\n" "@args other\n" diff --git a/src/laybasic/laybasic/gsiDeclLayMarker.cc b/src/laybasic/laybasic/gsiDeclLayMarker.cc index e489b9252..15dab23ed 100644 --- a/src/laybasic/laybasic/gsiDeclLayMarker.cc +++ b/src/laybasic/laybasic/gsiDeclLayMarker.cc @@ -82,7 +82,7 @@ bool has_color (const lay::DMarker *marker) return marker->get_color ().isValid (); } -Class decl_Marker ("Marker", +Class decl_Marker ("lay", "Marker", gsi::constructor ("new", &create_marker, "@brief Creates a marker\n" "@args view\n" diff --git a/src/laybasic/laybasic/gsiDeclLayMenu.cc b/src/laybasic/laybasic/gsiDeclLayMenu.cc index a161a32d0..e6b98e99a 100644 --- a/src/laybasic/laybasic/gsiDeclLayMenu.cc +++ b/src/laybasic/laybasic/gsiDeclLayMenu.cc @@ -28,7 +28,7 @@ namespace gsi { -Class decl_AbstractMenu ("AbstractMenu", +Class decl_AbstractMenu ("lay", "AbstractMenu", method ("action", &lay::AbstractMenu::action, "@brief Get the reference to a Action object associated with the given path\n" "@args path\n" @@ -142,7 +142,7 @@ Class decl_AbstractMenu ("AbstractMenu", "with code. See the \\Action class description for further details.\n" ); -Class decl_ActionBase ("ActionBase", +Class decl_ActionBase ("lay", "ActionBase", method ("title=", &lay::Action::set_title, "@brief Sets the title\n" "@args title\n" @@ -310,7 +310,7 @@ public: tl::Event on_triggered_event; }; -Class decl_Action (decl_ActionBase, "Action", +Class decl_Action (decl_ActionBase, "lay", "Action", gsi::callback ("triggered", &ActionStub::triggered, &ActionStub::triggered_cb, "@brief This method is called if the menu item is selected" ) + diff --git a/src/laybasic/laybasic/gsiDeclLayPlugin.cc b/src/laybasic/laybasic/gsiDeclLayPlugin.cc index 71e8ae5f7..2049ecbdb 100644 --- a/src/laybasic/laybasic/gsiDeclLayPlugin.cc +++ b/src/laybasic/laybasic/gsiDeclLayPlugin.cc @@ -440,7 +440,7 @@ private: tl::RegisteredClass *mp_registration; }; -Class decl_PluginFactory ("PluginFactory", +Class decl_PluginFactory ("lay", "PluginFactory", method ("register", &PluginFactoryBase::register_gsi, "@brief Registers the plugin factory\n" "@args position, name, title\n" @@ -639,7 +639,7 @@ Class decl_PluginFactory ("PluginFactory", "This class has been introduced in version 0.22.\n" ); -Class decl_Plugin ("Plugin", +Class decl_Plugin ("lay", "Plugin", callback ("menu_activated", &gsi::PluginBase::menu_activated, &gsi::PluginBase::f_menu_activated, "@brief Gets called when a custom menu item is selected\n" "@args symbol\n" @@ -800,7 +800,7 @@ static int cursor_shape_busy () { return int (lay::Cursor::busy); } static int cursor_shape_open_hand () { return int (lay::Cursor::open_hand); } static int cursor_shape_closed_hand () { return int (lay::Cursor::closed_hand); } -Class decl_Cursor ("Cursor", +Class decl_Cursor ("lay", "Cursor", method ("None", &cursor_shape_none, "@brief 'No cursor (default)' constant for \\set_cursor (resets cursor to default)") + method ("Arrow", &cursor_shape_arrow, "@brief 'Arrow cursor' constant") + method ("UpArrow", &cursor_shape_up_arrow, "@brief 'Upward arrow cursor' constant") + @@ -836,7 +836,7 @@ static int const_LeftButton() { return (int) lay::LeftButton; } static int const_MidButton() { return (int) lay::MidButton; } static int const_RightButton() { return (int) lay::RightButton; } -Class decl_ButtonState ("ButtonState", +Class decl_ButtonState ("lay", "ButtonState", method ("ShiftKey", &const_ShiftButton, "@brief Indicates that the Shift key is pressed\nThis constant is combined with other constants within \\ButtonState") + method ("ControlKey", &const_ControlButton, "@brief Indicates that the Control key is pressed\nThis constant is combined with other constants within \\ButtonState") + method ("AltKey", &const_AltButton, "@brief Indicates that the Alt key is pressed\nThis constant is combined with other constants within \\ButtonState") + @@ -874,7 +874,7 @@ lay::PluginRoot *config_root_instance () * This is intentional since we don't want to spend the only derivation path on this. * Once there is a mixin concept, provide a path through that concept. */ -Class decl_PluginRoot ("PluginRoot", +Class decl_PluginRoot ("lay", "PluginRoot", method ("clear_config", &lay::PluginRoot::clear_config, "@brief Clears the configuration parameters\n" ) + diff --git a/src/laybasic/laybasic/gsiDeclLayTechnologies.cc b/src/laybasic/laybasic/gsiDeclLayTechnologies.cc index 9ed316979..a4cc8ecdf 100644 --- a/src/laybasic/laybasic/gsiDeclLayTechnologies.cc +++ b/src/laybasic/laybasic/gsiDeclLayTechnologies.cc @@ -101,7 +101,7 @@ static std::vector get_component_names (const lay::Technology *tech return tech->component_names (); } -gsi::Class technology_component_decl ("TechnologyComponent", +gsi::Class technology_component_decl ("lay", "TechnologyComponent", gsi::method ("name", &lay::TechnologyComponent::name, "@brief Gets the formal name of the technology component\n" "This is the name by which the component can be obtained from a technology using " @@ -124,7 +124,7 @@ gsi::Class technology_component_decl ("TechnologyCompo LAYBASIC_PUBLIC gsi::Class &decl_layTechnologyComponent () { return technology_component_decl; } -gsi::Class technology_decl ("Technology", +gsi::Class technology_decl ("lay", "Technology", gsi::method ("name", &lay::Technology::name, "@brief Gets the name of the technology" ) + diff --git a/src/lym/lym/gsiDeclLymMacro.cc b/src/lym/lym/gsiDeclLymMacro.cc index 5c7b056d2..e1f4f5317 100644 --- a/src/lym/lym/gsiDeclLymMacro.cc +++ b/src/lym/lym/gsiDeclLymMacro.cc @@ -71,7 +71,7 @@ public: } }; -Class decl_MacroExecutionContext ("MacroExecutionContext", +Class decl_MacroExecutionContext ("lay", "MacroExecutionContext", gsi::method ("set_debugger_scope", &gsi::MacroExecutionContext::set_debugger_scope, "@brief Sets a debugger scope (file level which shall appear in the debugger)\n" "@args filename\n" @@ -254,7 +254,7 @@ int const_NoDebugger () return int (lym::Macro::None); } -Class decl_MacroInterpreter ("MacroInterpreter", +Class decl_MacroInterpreter ("lay", "MacroInterpreter", gsi::method ("PlainTextFormat", &const_PlainTextFormat, "@brief Indicates plain text format for \\storage_scheme\n" ) + @@ -420,7 +420,7 @@ Class decl_MacroInterpreter ("MacroInterpreter", "This class has been introduced in version 0.23.\n" ); -Class decl_Macro ("Macro", +Class decl_Macro ("lay", "Macro", gsi::method ("path", &lym::Macro::path, "@brief Gets the path of the macro\n" "\n" diff --git a/src/pymod/db/db.pro b/src/pymod/db/db.pro new file mode 100644 index 000000000..c30b09565 --- /dev/null +++ b/src/pymod/db/db.pro @@ -0,0 +1,21 @@ + +LIBDIR = $$OUT_PWD/../.. +DESTDIR = $$LIBDIR/pymod +TARGET = db + +include($$PWD/../../lib.pri) + +SOURCES = \ + dbMain.cc \ + +HEADERS += \ + +INCLUDEPATH += $$PYTHONINCLUDE $$TL_INC $$GSI_INC $$DB_INC $$GSI_INC $$PYA_INC +DEPENDPATH += $$PYTHONINCLUDE $$TL_INC $$GSI_INC $$DB_INC $$GSI_INC $$PYA_INC +LIBS += $$PYTHONLIBFILE -L$$LIBDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_gsi -lklayout_pya + +# Python is somewhat sloppy and relies on the compiler initializing fields +# of strucs to 0: +QMAKE_CXXFLAGS_WARN_ON += \ + -Wno-missing-field-initializers + diff --git a/src/gsiqt/gsiDeclQtTypeTraits.h b/src/pymod/db/dbMain.cc similarity index 70% rename from src/gsiqt/gsiDeclQtTypeTraits.h rename to src/pymod/db/dbMain.cc index d838df55f..2641f1c9f 100644 --- a/src/gsiqt/gsiDeclQtTypeTraits.h +++ b/src/pymod/db/dbMain.cc @@ -20,18 +20,21 @@ */ -#ifndef _HDR_gsiDeclQtTypeTraits -#define _HDR_gsiDeclQtTypeTraits +#include +#include "pya.h" +#include "gsi.h" +#include "gsiExpression.h" -#if defined(HAVE_QTBINDINGS) +PyMODINIT_FUNC +DEF_INSIDE_PUBLIC +PyInit_db () +{ + gsi::initialize (); + gsi::initialize_expressions (); -#if QT_VERSION >= 0x050000 -# include "../gsiqt5/gsiDeclQtTypeTraits.h" -#else -# include "../gsiqt4/gsiDeclQtTypeTraits.h" -#endif - -#endif - -#endif + static pya::PythonModule module; + module.init ("klayout.db", "KLayout core module (db)"); + module.make_classes (); + return module.module (); +} diff --git a/src/pymod/pymod.pro b/src/pymod/pymod.pro new file mode 100644 index 000000000..d5c55c1c5 --- /dev/null +++ b/src/pymod/pymod.pro @@ -0,0 +1,4 @@ + +TEMPLATE = subdirs +SUBDIRS = db + diff --git a/src/rdb/rdb/gsiDeclRdb.cc b/src/rdb/rdb/gsiDeclRdb.cc index fc753f770..f420a3b58 100644 --- a/src/rdb/rdb/gsiDeclRdb.cc +++ b/src/rdb/rdb/gsiDeclRdb.cc @@ -96,7 +96,7 @@ static rdb::Reference *new_ref_tp (const db::DCplxTrans &trans, rdb::id_type par return new rdb::Reference (trans, parent_cell_id); } -Class decl_RdbReference ("RdbReference", +Class decl_RdbReference ("lay", "RdbReference", gsi::constructor ("new", &new_ref_tp, "@brief Creates a reference with a given transformation and parent cell ID\n" "@args trans, parent_cell_id\n" @@ -166,7 +166,7 @@ ItemRefUnwrappingIterator cell_items_end (const rdb::Cell *cell) return cell->database ()->items_by_cell (cell->id ()).second; } -Class decl_RdbCell ("RdbCell", +Class decl_RdbCell ("lay", "RdbCell", gsi::method ("rdb_id", &rdb::Cell::id, "@brief Gets the cell ID\n" "The cell ID is an integer that uniquely identifies the cell. It is used for referring to a " @@ -272,7 +272,7 @@ static void scan_shapes (rdb::Category *cat, const db::RecursiveShapeIterator &i rdb::scan_layer (cat, iter); } -Class decl_RdbCategory ("RdbCategory", +Class decl_RdbCategory ("lay", "RdbCategory", gsi::method ("rdb_id", &rdb::Category::id, "@brief Gets the category ID\n" "The category ID is an integer that uniquely identifies the category. It is used for referring to a " @@ -559,7 +559,7 @@ void value_set_tag_id (rdb::ValueWrapper *v, rdb::id_type id) v->set_tag_id (id); } -Class decl_RdbItemValue ("RdbItemValue", +Class decl_RdbItemValue ("lay", "RdbItemValue", gsi::method ("from_s", &value_from_string, "@brief Creates a value object from a string\n" "@args s\n" @@ -739,7 +739,7 @@ static void clear_values (rdb::Item *item) item->set_values (rdb::Values ()); } -Class decl_RdbItem ("RdbItem", +Class decl_RdbItem ("lay", "RdbItem", gsi::method ("database", (const rdb::Database *(rdb::Item::*)() const) &rdb::Item::database, "@brief Gets the database object that item is associated with\n" "\n" @@ -1078,7 +1078,7 @@ static rdb::Item *create_item_from_objects (rdb::Database *db, rdb::Cell *cell, } } -Class decl_ReportDatabase ("ReportDatabase", +Class decl_ReportDatabase ("lay", "ReportDatabase", gsi::constructor ("new", &create_rdb, "@brief Creates a report database\n" "@args name\n" diff --git a/src/tl/tl/tlCommon.h b/src/tl/tl/tlCommon.h index 850d13512..4049a3bd7 100644 --- a/src/tl/tl/tlCommon.h +++ b/src/tl/tl/tlCommon.h @@ -20,59 +20,32 @@ */ +#include "tlDefs.h" #if !defined(HDR_tlCommon_h) # define HDR_tlCommon_h -# if defined _WIN32 || defined __CYGWIN__ - -# ifdef MAKE_TL_LIBRARY -# define TL_PUBLIC __declspec(dllexport) -# else -# define TL_PUBLIC __declspec(dllimport) -# endif -# define TL_LOCAL -# define TL_PUBLIC_TEMPLATE - +# ifdef MAKE_TL_LIBRARY +# define TL_PUBLIC DEF_INSIDE_PUBLIC +# define TL_PUBLIC_TEMPLATE DEF_INSIDE_PUBLIC_TEMPLATE +# define TL_LOCAL DEF_INSIDE_LOCAL # else - -# if __GNUC__ >= 4 || defined(__clang__) -# define TL_PUBLIC __attribute__ ((visibility ("default"))) -# define TL_PUBLIC_TEMPLATE __attribute__ ((visibility ("default"))) -# define TL_LOCAL __attribute__ ((visibility ("hidden"))) -# else -# define TL_PUBLIC -# define TL_PUBLIC_TEMPLATE -# define TL_LOCAL -# endif - +# define TL_PUBLIC DEF_OUTSIDE_PUBLIC +# define TL_PUBLIC_TEMPLATE DEF_OUTSIDE_PUBLIC_TEMPLATE +# define TL_LOCAL DEF_OUTSIDE_LOCAL # endif // NOTE: this is required because we have some forward declarations to // gsi::Class and gsi::ClassBase in tlVariant.h. // TODO: there should not be any dependency of tl on gsi. -# if defined _WIN32 || defined __CYGWIN__ - -# ifdef MAKE_GSI_LIBRARY -# define GSI_PUBLIC __declspec(dllexport) -# else -# define GSI_PUBLIC __declspec(dllimport) -# endif -# define GSI_LOCAL -# define GSI_PUBLIC_TEMPLATE - +# ifdef MAKE_GSI_LIBRARY +# define GSI_PUBLIC DEF_INSIDE_PUBLIC +# define GSI_PUBLIC_TEMPLATE DEF_INSIDE_PUBLIC_TEMPLATE +# define GSI_LOCAL DEF_INSIDE_LOCAL # else - -# if __GNUC__ >= 4 || defined(__clang__) -# define GSI_PUBLIC __attribute__ ((visibility ("default"))) -# define GSI_PUBLIC_TEMPLATE __attribute__ ((visibility ("default"))) -# define GSI_LOCAL __attribute__ ((visibility ("hidden"))) -# else -# define GSI_PUBLIC -# define GSI_PUBLIC_TEMPLATE -# define GSI_LOCAL -# endif - +# define GSI_PUBLIC DEF_OUTSIDE_PUBLIC +# define GSI_PUBLIC_TEMPLATE DEF_OUTSIDE_PUBLIC_TEMPLATE +# define GSI_LOCAL DEF_OUTSIDE_LOCAL # endif #endif