diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 56bf1ee547..3a9947a78a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,477 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-10-15 18:43 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * contrib/hbqt/generator/hbqtgen.prg + ! Changes to implemented GC pointers. + + * contrib/hbqt/filelist.mk + + hbqt_destruct.cpp + + * contrib/hbqt/hbqt.h + ! Reworked to honor GC pointers. + + + contrib/hbqt/hbqt_destruct.cpp + + Added routines to manage HVM controlled garbage collection. + + * contrib/hbqt/hbqt_slots.cpp + ! Minot tweaks. + + * contrib/hbqt/QAbstractButton.cpp + * contrib/hbqt/QAbstractItemModel.cpp + * contrib/hbqt/QAbstractItemView.cpp + * contrib/hbqt/QAbstractListModel.cpp + * contrib/hbqt/QAbstractPrintDialog.cpp + * contrib/hbqt/QAbstractScrollArea.cpp + * contrib/hbqt/QAbstractSlider.cpp + * contrib/hbqt/QAbstractSpinBox.cpp + * contrib/hbqt/QAbstractTableModel.cpp + * contrib/hbqt/QAction.cpp + * contrib/hbqt/QApplication.cpp + * contrib/hbqt/QBitmap.cpp + * contrib/hbqt/QBoxLayout.cpp + * contrib/hbqt/QBrush.cpp + * contrib/hbqt/QButtonGroup.cpp + * contrib/hbqt/QCalendarWidget.cpp + * contrib/hbqt/QCheckBox.cpp + * contrib/hbqt/QClipboard.cpp + * contrib/hbqt/QColor.cpp + * contrib/hbqt/QColorDialog.cpp + * contrib/hbqt/QComboBox.cpp + * contrib/hbqt/QCommandLinkButton.cpp + * contrib/hbqt/QCommonStyle.cpp + * contrib/hbqt/QConicalGradient.cpp + * contrib/hbqt/QCoreApplication.cpp + * contrib/hbqt/QCursor.cpp + * contrib/hbqt/QDateEdit.cpp + * contrib/hbqt/QDateTime.cpp + * contrib/hbqt/QDateTimeEdit.cpp + * contrib/hbqt/QDesktopWidget.cpp + * contrib/hbqt/QDial.cpp + * contrib/hbqt/QDialog.cpp + * contrib/hbqt/QDir.cpp + * contrib/hbqt/QDirModel.cpp + * contrib/hbqt/QDockWidget.cpp + * contrib/hbqt/QDoubleSpinBox.cpp + * contrib/hbqt/QDragEnterEvent.cpp + * contrib/hbqt/QDragLeaveEvent.cpp + * contrib/hbqt/QDragMoveEvent.cpp + * contrib/hbqt/QDropEvent.cpp + * contrib/hbqt/QErrorMessage.cpp + * contrib/hbqt/QEvent.cpp + * contrib/hbqt/QEventLoop.cpp + * contrib/hbqt/QFileDialog.cpp + * contrib/hbqt/QFileSystemModel.cpp + * contrib/hbqt/QFocusEvent.cpp + * contrib/hbqt/QFocusFrame.cpp + * contrib/hbqt/QFont.cpp + * contrib/hbqt/QFontComboBox.cpp + * contrib/hbqt/QFontDatabase.cpp + * contrib/hbqt/QFontDialog.cpp + * contrib/hbqt/QFontInfo.cpp + * contrib/hbqt/QFontMetrics.cpp + * contrib/hbqt/QFontMetricsF.cpp + * contrib/hbqt/QFormLayout.cpp + * contrib/hbqt/QFrame.cpp + * contrib/hbqt/QFtp.cpp + * contrib/hbqt/QGradient.cpp + * contrib/hbqt/QGridLayout.cpp + * contrib/hbqt/QGroupBox.cpp + * contrib/hbqt/QHBoxLayout.cpp + * contrib/hbqt/QHeaderView.cpp + * contrib/hbqt/QHttp.cpp + * contrib/hbqt/QIcon.cpp + * contrib/hbqt/QImage.cpp + * contrib/hbqt/QImageReader.cpp + * contrib/hbqt/QImageWriter.cpp + * contrib/hbqt/QInputDialog.cpp + * contrib/hbqt/QInputEvent.cpp + * contrib/hbqt/QIODevice.cpp + * contrib/hbqt/QKeyEvent.cpp + * contrib/hbqt/QKeySequence.cpp + * contrib/hbqt/QLabel.cpp + * contrib/hbqt/QLatin1Char.cpp + * contrib/hbqt/QLatin1String.cpp + * contrib/hbqt/QLayout.cpp + * contrib/hbqt/QLayoutItem.cpp + * contrib/hbqt/QLCDNumber.cpp + * contrib/hbqt/QLine.cpp + * contrib/hbqt/QLinearGradient.cpp + * contrib/hbqt/QLineEdit.cpp + * contrib/hbqt/QList.cpp + * contrib/hbqt/QListView.cpp + * contrib/hbqt/QListWidget.cpp + * contrib/hbqt/QListWidgetItem.cpp + * contrib/hbqt/QMainWindow.cpp + * contrib/hbqt/QMenu.cpp + * contrib/hbqt/QMenuBar.cpp + * contrib/hbqt/QMessageBox.cpp + * contrib/hbqt/QModelIndex.cpp + * contrib/hbqt/QMouseEvent.cpp + * contrib/hbqt/QMoveEvent.cpp + * contrib/hbqt/QObject.cpp + * contrib/hbqt/QPageSetupDialog.cpp + * contrib/hbqt/QPaintDevice.cpp + * contrib/hbqt/QPainter.cpp + * contrib/hbqt/QPaintEvent.cpp + * contrib/hbqt/QPalette.cpp + * contrib/hbqt/QPen.cpp + * contrib/hbqt/QPicture.cpp + * contrib/hbqt/QPixmap.cpp + * contrib/hbqt/QPoint.cpp + * contrib/hbqt/QPointF.cpp + * contrib/hbqt/QPrintDialog.cpp + * contrib/hbqt/QPrintEngine.cpp + * contrib/hbqt/QPrinter.cpp + * contrib/hbqt/QPrintPreviewDialog.cpp + * contrib/hbqt/QProcess.cpp + * contrib/hbqt/QProgressBar.cpp + * contrib/hbqt/QProgressDialog.cpp + * contrib/hbqt/QPushButton.cpp + * contrib/hbqt/QRadialGradient.cpp + * contrib/hbqt/QRadioButton.cpp + * contrib/hbqt/QRect.cpp + * contrib/hbqt/QRectF.cpp + * contrib/hbqt/QRegion.cpp + * contrib/hbqt/QResizeEvent.cpp + * contrib/hbqt/QResource.cpp + * contrib/hbqt/QScrollArea.cpp + * contrib/hbqt/QScrollBar.cpp + * contrib/hbqt/QSignalMapper.cpp + * contrib/hbqt/QSize.cpp + * contrib/hbqt/QSizeF.cpp + * contrib/hbqt/QSizeGrip.cpp + * contrib/hbqt/QSizePolicy.cpp + * contrib/hbqt/QSlider.cpp + * contrib/hbqt/QSound.cpp + * contrib/hbqt/QSpinBox.cpp + * contrib/hbqt/QSplashScreen.cpp + * contrib/hbqt/QSplitter.cpp + * contrib/hbqt/QStandardItem.cpp + * contrib/hbqt/QStandardItemModel.cpp + * contrib/hbqt/QStatusBar.cpp + * contrib/hbqt/QStringList.cpp + * contrib/hbqt/QStringListModel.cpp + * contrib/hbqt/QStyle.cpp + * contrib/hbqt/QStyledItemDelegate.cpp + * contrib/hbqt/QStyleFactory.cpp + * contrib/hbqt/QStyleHintReturn.cpp + * contrib/hbqt/QStyleHintReturnMask.cpp + * contrib/hbqt/QStyleHintReturnVariant.cpp + * contrib/hbqt/QStyleOption.cpp + * contrib/hbqt/QStyleOptionButton.cpp + * contrib/hbqt/QStyleOptionComboBox.cpp + * contrib/hbqt/QStyleOptionComplex.cpp + * contrib/hbqt/QStyleOptionDockWidget.cpp + * contrib/hbqt/QStyleOptionFocusRect.cpp + * contrib/hbqt/QStyleOptionFrame.cpp + * contrib/hbqt/QStyleOptionGroupBox.cpp + * contrib/hbqt/QStyleOptionHeader.cpp + * contrib/hbqt/QStyleOptionMenuItem.cpp + * contrib/hbqt/QStyleOptionProgressBar.cpp + * contrib/hbqt/QStyleOptionSizeGrip.cpp + * contrib/hbqt/QStyleOptionSlider.cpp + * contrib/hbqt/QStyleOptionSpinBox.cpp + * contrib/hbqt/QStyleOptionTab.cpp + * contrib/hbqt/QStyleOptionTabBarBase.cpp + * contrib/hbqt/QStyleOptionTabWidgetFrame.cpp + * contrib/hbqt/QStyleOptionTitleBar.cpp + * contrib/hbqt/QStyleOptionToolBar.cpp + * contrib/hbqt/QStyleOptionToolBox.cpp + * contrib/hbqt/QStyleOptionToolButton.cpp + * contrib/hbqt/QStyleOptionViewItem.cpp + * contrib/hbqt/QStylePainter.cpp + * contrib/hbqt/QSystemTrayIcon.cpp + * contrib/hbqt/QTabBar.cpp + * contrib/hbqt/QTableView.cpp + * contrib/hbqt/QTableWidget.cpp + * contrib/hbqt/QTableWidgetItem.cpp + * contrib/hbqt/QTabWidget.cpp + * contrib/hbqt/QTextBlock.cpp + * contrib/hbqt/QTextBlockFormat.cpp + * contrib/hbqt/QTextBlockGroup.cpp + * contrib/hbqt/QTextBoundaryFinder.cpp + * contrib/hbqt/QTextBrowser.cpp + * contrib/hbqt/QTextCharFormat.cpp + * contrib/hbqt/QTextCodec.cpp + * contrib/hbqt/QTextCursor.cpp + * contrib/hbqt/QTextDecoder.cpp + * contrib/hbqt/QTextDocument.cpp + * contrib/hbqt/QTextDocumentFragment.cpp + * contrib/hbqt/QTextDocumentWriter.cpp + * contrib/hbqt/QTextEdit.cpp + * contrib/hbqt/QTextEncoder.cpp + * contrib/hbqt/QTextFormat.cpp + * contrib/hbqt/QTextFragment.cpp + * contrib/hbqt/QTextFrame.cpp + * contrib/hbqt/QTextFrameFormat.cpp + * contrib/hbqt/QTextImageFormat.cpp + * contrib/hbqt/QTextInlineObject.cpp + * contrib/hbqt/QTextItem.cpp + * contrib/hbqt/QTextLayout.cpp + * contrib/hbqt/QTextLength.cpp + * contrib/hbqt/QTextLine.cpp + * contrib/hbqt/QTextObject.cpp + * contrib/hbqt/QTextStream.cpp + * contrib/hbqt/QTimeEdit.cpp + * contrib/hbqt/QTimer.cpp + * contrib/hbqt/QToolBar.cpp + * contrib/hbqt/QToolBox.cpp + * contrib/hbqt/QToolButton.cpp + * contrib/hbqt/QTreeView.cpp + * contrib/hbqt/QTreeWidget.cpp + * contrib/hbqt/QTreeWidgetItem.cpp + * contrib/hbqt/QUrl.cpp + * contrib/hbqt/QVariant.cpp + * contrib/hbqt/QVBoxLayout.cpp + * contrib/hbqt/QWebFrame.cpp + * contrib/hbqt/QWebHistory.cpp + * contrib/hbqt/QWebHistoryInterface.cpp + * contrib/hbqt/QWebHistoryItem.cpp + * contrib/hbqt/QWebHitTestResult.cpp + * contrib/hbqt/QWebPage.cpp + * contrib/hbqt/QWebPluginFactory.cpp + * contrib/hbqt/QWebSecurityOrigin.cpp + * contrib/hbqt/QWebSettings.cpp + * contrib/hbqt/QWebView.cpp + * contrib/hbqt/QWheelEvent.cpp + * contrib/hbqt/QWidget.cpp + * contrib/hbqt/QWidgetAction.cpp + * contrib/hbqt/QWidgetItem.cpp + * contrib/hbqt/QWindowsStyle.cpp + * contrib/hbqt/QWindowsXPStyle.cpp + * contrib/hbqt/QWizard.cpp + ! Auto generated sources by virtue of changes in hbqtgen.prg + + * contrib/hbqt/tests/demoqt.prg + * contrib/hbqt/TQAbstractButton.prg + * contrib/hbqt/TQAbstractItemModel.prg + * contrib/hbqt/TQAbstractItemView.prg + * contrib/hbqt/TQAbstractListModel.prg + * contrib/hbqt/TQAbstractPrintDialog.prg + * contrib/hbqt/TQAbstractScrollArea.prg + * contrib/hbqt/TQAbstractSlider.prg + * contrib/hbqt/TQAbstractSpinBox.prg + * contrib/hbqt/TQAbstractTableModel.prg + * contrib/hbqt/TQAction.prg + * contrib/hbqt/TQApplication.prg + * contrib/hbqt/TQBitmap.prg + * contrib/hbqt/TQBoxLayout.prg + * contrib/hbqt/TQBrush.prg + * contrib/hbqt/TQButtonGroup.prg + * contrib/hbqt/TQCalendarWidget.prg + * contrib/hbqt/TQCheckBox.prg + * contrib/hbqt/TQClipboard.prg + * contrib/hbqt/TQColor.prg + * contrib/hbqt/TQColorDialog.prg + * contrib/hbqt/TQComboBox.prg + * contrib/hbqt/TQCommandLinkButton.prg + * contrib/hbqt/TQCommonStyle.prg + * contrib/hbqt/TQConicalGradient.prg + * contrib/hbqt/TQCoreApplication.prg + * contrib/hbqt/TQCursor.prg + * contrib/hbqt/TQDateEdit.prg + * contrib/hbqt/TQDateTime.prg + * contrib/hbqt/TQDateTimeEdit.prg + * contrib/hbqt/TQDesktopWidget.prg + * contrib/hbqt/TQDial.prg + * contrib/hbqt/TQDialog.prg + * contrib/hbqt/TQDir.prg + * contrib/hbqt/TQDirModel.prg + * contrib/hbqt/TQDockWidget.prg + * contrib/hbqt/TQDoubleSpinBox.prg + * contrib/hbqt/TQDragEnterEvent.prg + * contrib/hbqt/TQDragLeaveEvent.prg + * contrib/hbqt/TQDragMoveEvent.prg + * contrib/hbqt/TQDropEvent.prg + * contrib/hbqt/TQErrorMessage.prg + * contrib/hbqt/TQEvent.prg + * contrib/hbqt/TQEventLoop.prg + * contrib/hbqt/TQFileDialog.prg + * contrib/hbqt/TQFileSystemModel.prg + * contrib/hbqt/TQFocusEvent.prg + * contrib/hbqt/TQFocusFrame.prg + * contrib/hbqt/TQFont.prg + * contrib/hbqt/TQFontComboBox.prg + * contrib/hbqt/TQFontDatabase.prg + * contrib/hbqt/TQFontDialog.prg + * contrib/hbqt/TQFontInfo.prg + * contrib/hbqt/TQFontMetrics.prg + * contrib/hbqt/TQFontMetricsF.prg + * contrib/hbqt/TQFormLayout.prg + * contrib/hbqt/TQFrame.prg + * contrib/hbqt/TQFtp.prg + * contrib/hbqt/TQGradient.prg + * contrib/hbqt/TQGridLayout.prg + * contrib/hbqt/TQGroupBox.prg + * contrib/hbqt/TQHBoxLayout.prg + * contrib/hbqt/TQHeaderView.prg + * contrib/hbqt/TQHttp.prg + * contrib/hbqt/TQIcon.prg + * contrib/hbqt/TQImage.prg + * contrib/hbqt/TQImageReader.prg + * contrib/hbqt/TQImageWriter.prg + * contrib/hbqt/TQInputDialog.prg + * contrib/hbqt/TQInputEvent.prg + * contrib/hbqt/TQIODevice.prg + * contrib/hbqt/TQKeyEvent.prg + * contrib/hbqt/TQKeySequence.prg + * contrib/hbqt/TQLabel.prg + * contrib/hbqt/TQLatin1Char.prg + * contrib/hbqt/TQLatin1String.prg + * contrib/hbqt/TQLayout.prg + * contrib/hbqt/TQLayoutItem.prg + * contrib/hbqt/TQLCDNumber.prg + * contrib/hbqt/TQLine.prg + * contrib/hbqt/TQLinearGradient.prg + * contrib/hbqt/TQLineEdit.prg + * contrib/hbqt/TQList.prg + * contrib/hbqt/TQListView.prg + * contrib/hbqt/TQListWidget.prg + * contrib/hbqt/TQListWidgetItem.prg + * contrib/hbqt/TQMainWindow.prg + * contrib/hbqt/TQMenu.prg + * contrib/hbqt/TQMenuBar.prg + * contrib/hbqt/TQMessageBox.prg + * contrib/hbqt/TQModelIndex.prg + * contrib/hbqt/TQMouseEvent.prg + * contrib/hbqt/TQMoveEvent.prg + * contrib/hbqt/TQObject.prg + * contrib/hbqt/TQPageSetupDialog.prg + * contrib/hbqt/TQPaintDevice.prg + * contrib/hbqt/TQPainter.prg + * contrib/hbqt/TQPaintEvent.prg + * contrib/hbqt/TQPalette.prg + * contrib/hbqt/TQPen.prg + * contrib/hbqt/TQPicture.prg + * contrib/hbqt/TQPixmap.prg + * contrib/hbqt/TQPoint.prg + * contrib/hbqt/TQPointF.prg + * contrib/hbqt/TQPrintDialog.prg + * contrib/hbqt/TQPrintEngine.prg + * contrib/hbqt/TQPrinter.prg + * contrib/hbqt/TQPrintPreviewDialog.prg + * contrib/hbqt/TQProcess.prg + * contrib/hbqt/TQProgressBar.prg + * contrib/hbqt/TQProgressDialog.prg + * contrib/hbqt/TQPushButton.prg + * contrib/hbqt/TQRadialGradient.prg + * contrib/hbqt/TQRadioButton.prg + * contrib/hbqt/TQRect.prg + * contrib/hbqt/TQRectF.prg + * contrib/hbqt/TQRegion.prg + * contrib/hbqt/TQResizeEvent.prg + * contrib/hbqt/TQResource.prg + * contrib/hbqt/TQScrollArea.prg + * contrib/hbqt/TQScrollBar.prg + * contrib/hbqt/TQSignalMapper.prg + * contrib/hbqt/TQSize.prg + * contrib/hbqt/TQSizeF.prg + * contrib/hbqt/TQSizeGrip.prg + * contrib/hbqt/TQSizePolicy.prg + * contrib/hbqt/TQSlider.prg + * contrib/hbqt/TQSound.prg + * contrib/hbqt/TQSpinBox.prg + * contrib/hbqt/TQSplashScreen.prg + * contrib/hbqt/TQSplitter.prg + * contrib/hbqt/TQStandardItem.prg + * contrib/hbqt/TQStandardItemModel.prg + * contrib/hbqt/TQStatusBar.prg + * contrib/hbqt/TQStringList.prg + * contrib/hbqt/TQStringListModel.prg + * contrib/hbqt/TQStyle.prg + * contrib/hbqt/TQStyledItemDelegate.prg + * contrib/hbqt/TQStyleFactory.prg + * contrib/hbqt/TQStyleHintReturn.prg + * contrib/hbqt/TQStyleHintReturnMask.prg + * contrib/hbqt/TQStyleHintReturnVariant.prg + * contrib/hbqt/TQStyleOption.prg + * contrib/hbqt/TQStyleOptionButton.prg + * contrib/hbqt/TQStyleOptionComboBox.prg + * contrib/hbqt/TQStyleOptionComplex.prg + * contrib/hbqt/TQStyleOptionDockWidget.prg + * contrib/hbqt/TQStyleOptionFocusRect.prg + * contrib/hbqt/TQStyleOptionFrame.prg + * contrib/hbqt/TQStyleOptionGroupBox.prg + * contrib/hbqt/TQStyleOptionHeader.prg + * contrib/hbqt/TQStyleOptionMenuItem.prg + * contrib/hbqt/TQStyleOptionProgressBar.prg + * contrib/hbqt/TQStyleOptionSizeGrip.prg + * contrib/hbqt/TQStyleOptionSlider.prg + * contrib/hbqt/TQStyleOptionSpinBox.prg + * contrib/hbqt/TQStyleOptionTab.prg + * contrib/hbqt/TQStyleOptionTabBarBase.prg + * contrib/hbqt/TQStyleOptionTabWidgetFrame.prg + * contrib/hbqt/TQStyleOptionTitleBar.prg + * contrib/hbqt/TQStyleOptionToolBar.prg + * contrib/hbqt/TQStyleOptionToolBox.prg + * contrib/hbqt/TQStyleOptionToolButton.prg + * contrib/hbqt/TQStyleOptionViewItem.prg + * contrib/hbqt/TQStylePainter.prg + * contrib/hbqt/TQSystemTrayIcon.prg + * contrib/hbqt/TQTabBar.prg + * contrib/hbqt/TQTableView.prg + * contrib/hbqt/TQTableWidget.prg + * contrib/hbqt/TQTableWidgetItem.prg + * contrib/hbqt/TQTabWidget.prg + * contrib/hbqt/TQTextBlock.prg + * contrib/hbqt/TQTextBlockFormat.prg + * contrib/hbqt/TQTextBlockGroup.prg + * contrib/hbqt/TQTextBoundaryFinder.prg + * contrib/hbqt/TQTextBrowser.prg + * contrib/hbqt/TQTextCharFormat.prg + * contrib/hbqt/TQTextCodec.prg + * contrib/hbqt/TQTextCursor.prg + * contrib/hbqt/TQTextDecoder.prg + * contrib/hbqt/TQTextDocument.prg + * contrib/hbqt/TQTextDocumentFragment.prg + * contrib/hbqt/TQTextDocumentWriter.prg + * contrib/hbqt/TQTextEdit.prg + * contrib/hbqt/TQTextEncoder.prg + * contrib/hbqt/TQTextFormat.prg + * contrib/hbqt/TQTextFragment.prg + * contrib/hbqt/TQTextFrame.prg + * contrib/hbqt/TQTextFrameFormat.prg + * contrib/hbqt/TQTextImageFormat.prg + * contrib/hbqt/TQTextInlineObject.prg + * contrib/hbqt/TQTextItem.prg + * contrib/hbqt/TQTextLayout.prg + * contrib/hbqt/TQTextLength.prg + * contrib/hbqt/TQTextLine.prg + * contrib/hbqt/TQTextObject.prg + * contrib/hbqt/TQTextStream.prg + * contrib/hbqt/TQTimeEdit.prg + * contrib/hbqt/TQTimer.prg + * contrib/hbqt/TQToolBar.prg + * contrib/hbqt/TQToolBox.prg + * contrib/hbqt/TQToolButton.prg + * contrib/hbqt/TQTreeView.prg + * contrib/hbqt/TQTreeWidget.prg + * contrib/hbqt/TQTreeWidgetItem.prg + * contrib/hbqt/TQUrl.prg + * contrib/hbqt/TQVariant.prg + * contrib/hbqt/TQVBoxLayout.prg + * contrib/hbqt/TQWebFrame.prg + * contrib/hbqt/TQWebHistory.prg + * contrib/hbqt/TQWebHistoryInterface.prg + * contrib/hbqt/TQWebHistoryItem.prg + * contrib/hbqt/TQWebHitTestResult.prg + * contrib/hbqt/TQWebPage.prg + * contrib/hbqt/TQWebPluginFactory.prg + * contrib/hbqt/TQWebSecurityOrigin.prg + * contrib/hbqt/TQWebSettings.prg + * contrib/hbqt/TQWebView.prg + * contrib/hbqt/TQWheelEvent.prg + * contrib/hbqt/TQWidget.prg + * contrib/hbqt/TQWidgetAction.prg + * contrib/hbqt/TQWidgetItem.prg + * contrib/hbqt/TQWindowsStyle.prg + * contrib/hbqt/TQWindowsXPStyle.prg + * contrib/hbqt/TQWizard.prg + ! Auto generated sources by virtue of changes in hbqtgen.prg + + [ Detailed analysis will follow in a separate thread ] + 2009-10-15 12:53 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbqt/qth/QIODevice.qth * contrib/hbqt/qth/QWidget.qth diff --git a/harbour/contrib/hbqt/QAbstractButton.cpp b/harbour/contrib/hbqt/QAbstractButton.cpp index 29e6ff4ac0..2e5181f508 100644 --- a/harbour/contrib/hbqt/QAbstractButton.cpp +++ b/harbour/contrib/hbqt/QAbstractButton.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,19 +75,10 @@ * QAbstractButton ( QWidget * parent = 0 ) * ~QAbstractButton () */ + HB_FUNC( QT_QABSTRACTBUTTON ) { - } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QABSTRACTBUTTON_DESTROY ) -{ - delete hbqt_par_QAbstractButton( 1 ); -} - /* * bool autoExclusive () const */ @@ -132,7 +124,7 @@ HB_FUNC( QT_QABSTRACTBUTTON_GROUP ) */ HB_FUNC( QT_QABSTRACTBUTTON_ICON ) { - hb_retptr( new QIcon( hbqt_par_QAbstractButton( 1 )->icon() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QAbstractButton( 1 )->icon() ) ) ); } /* @@ -140,7 +132,7 @@ HB_FUNC( QT_QABSTRACTBUTTON_ICON ) */ HB_FUNC( QT_QABSTRACTBUTTON_ICONSIZE ) { - hb_retptr( new QSize( hbqt_par_QAbstractButton( 1 )->iconSize() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QAbstractButton( 1 )->iconSize() ) ) ); } /* @@ -244,7 +236,7 @@ HB_FUNC( QT_QABSTRACTBUTTON_SETTEXT ) */ HB_FUNC( QT_QABSTRACTBUTTON_SHORTCUT ) { - hb_retptr( new QKeySequence( hbqt_par_QAbstractButton( 1 )->shortcut() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QKeySequence( hbqt_par_QAbstractButton( 1 )->shortcut() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QAbstractItemModel.cpp b/harbour/contrib/hbqt/QAbstractItemModel.cpp index 7623cc9827..3bd1d69e72 100644 --- a/harbour/contrib/hbqt/QAbstractItemModel.cpp +++ b/harbour/contrib/hbqt/QAbstractItemModel.cpp @@ -80,6 +80,7 @@ * // virtual QModelIndexList match ( const QModelIndex & start, int role, const QVariant & value, int hits = 1, Qt::MatchFlags flags = Qt::MatchFlags( Qt::MatchStartsWith | Qt::MatchWrap ) ) const */ +#include #include #include @@ -91,10 +92,6 @@ * QAbstractItemModel ( QObject * parent = 0 ) * virtual ~QAbstractItemModel () */ -HB_FUNC( QT_QABSTRACTITEMMODEL ) -{ - //hb_retptr( ( QAbstractItemModel* ) new QAbstractItemModel( hbqt_par_QObject( 1 ) ) ); -} HB_FUNC( QT_HBDBFMODEL ) { @@ -117,20 +114,15 @@ HB_FUNC( QT_HBDBFMODEL_HBSETROWCOLUMNS ) } -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QABSTRACTITEMMODEL_DESTROY ) +HB_FUNC( QT_QABSTRACTITEMMODEL ) { - delete hbqt_par_QAbstractItemModel( 1 ); } - /* * virtual QModelIndex buddy ( const QModelIndex & index ) const */ HB_FUNC( QT_QABSTRACTITEMMODEL_BUDDY ) { - hb_retptr( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->buddy( *hbqt_par_QModelIndex( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->buddy( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* @@ -154,7 +146,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_COLUMNCOUNT ) */ HB_FUNC( QT_QABSTRACTITEMMODEL_DATA ) { - hb_retptr( new QVariant( hbqt_par_QAbstractItemModel( 1 )->data( *hbqt_par_QModelIndex( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::DisplayRole ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QAbstractItemModel( 1 )->data( *hbqt_par_QModelIndex( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::DisplayRole ) ) ) ) ); } /* @@ -202,7 +194,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_HASINDEX ) */ HB_FUNC( QT_QABSTRACTITEMMODEL_HEADERDATA ) { - hb_retptr( new QVariant( hbqt_par_QAbstractItemModel( 1 )->headerData( hb_parni( 2 ), ( Qt::Orientation ) hb_parni( 3 ), ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : Qt::DisplayRole ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QAbstractItemModel( 1 )->headerData( hb_parni( 2 ), ( Qt::Orientation ) hb_parni( 3 ), ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : Qt::DisplayRole ) ) ) ) ); } /* @@ -210,7 +202,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_HEADERDATA ) */ HB_FUNC( QT_QABSTRACTITEMMODEL_INDEX ) { - hb_retptr( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ) ) ); } /* @@ -258,7 +250,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_MIMEDATA ) */ HB_FUNC( QT_QABSTRACTITEMMODEL_MIMETYPES ) { - hb_retptr( new QStringList( hbqt_par_QAbstractItemModel( 1 )->mimeTypes() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QAbstractItemModel( 1 )->mimeTypes() ) ) ); } /* @@ -266,7 +258,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_MIMETYPES ) */ HB_FUNC( QT_QABSTRACTITEMMODEL_PARENT ) { - hb_retptr( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->parent( *hbqt_par_QModelIndex( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->parent( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* @@ -338,7 +330,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_SETSUPPORTEDDRAGACTIONS ) */ HB_FUNC( QT_QABSTRACTITEMMODEL_SIBLING ) { - hb_retptr( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->sibling( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QModelIndex( 4 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->sibling( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QModelIndex( 4 ) ) ) ) ); } /* @@ -354,7 +346,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_SORT ) */ HB_FUNC( QT_QABSTRACTITEMMODEL_SPAN ) { - hb_retptr( new QSize( hbqt_par_QAbstractItemModel( 1 )->span( *hbqt_par_QModelIndex( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QAbstractItemModel( 1 )->span( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QAbstractItemView.cpp b/harbour/contrib/hbqt/QAbstractItemView.cpp index 083310eef9..4ed9e070ea 100644 --- a/harbour/contrib/hbqt/QAbstractItemView.cpp +++ b/harbour/contrib/hbqt/QAbstractItemView.cpp @@ -76,6 +76,7 @@ * enum SelectionMode { SingleSelection, ContiguousSelection, ExtendedSelection, MultiSelection, NoSelection } */ +#include #include @@ -84,19 +85,10 @@ * QAbstractItemView ( QWidget * parent = 0 ) * ~QAbstractItemView () */ + HB_FUNC( QT_QABSTRACTITEMVIEW ) { - } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QABSTRACTITEMVIEW_DESTROY ) -{ - delete hbqt_par_QAbstractItemView( 1 ); -} - /* * bool alternatingRowColors () const */ @@ -126,7 +118,7 @@ HB_FUNC( QT_QABSTRACTITEMVIEW_CLOSEPERSISTENTEDITOR ) */ HB_FUNC( QT_QABSTRACTITEMVIEW_CURRENTINDEX ) { - hb_retptr( new QModelIndex( hbqt_par_QAbstractItemView( 1 )->currentIndex() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QAbstractItemView( 1 )->currentIndex() ) ) ); } /* @@ -182,7 +174,7 @@ HB_FUNC( QT_QABSTRACTITEMVIEW_HORIZONTALSCROLLMODE ) */ HB_FUNC( QT_QABSTRACTITEMVIEW_ICONSIZE ) { - hb_retptr( new QSize( hbqt_par_QAbstractItemView( 1 )->iconSize() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QAbstractItemView( 1 )->iconSize() ) ) ); } /* @@ -190,7 +182,7 @@ HB_FUNC( QT_QABSTRACTITEMVIEW_ICONSIZE ) */ HB_FUNC( QT_QABSTRACTITEMVIEW_INDEXAT ) { - hb_retptr( new QModelIndex( hbqt_par_QAbstractItemView( 1 )->indexAt( *hbqt_par_QPoint( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QAbstractItemView( 1 )->indexAt( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* @@ -262,7 +254,7 @@ HB_FUNC( QT_QABSTRACTITEMVIEW_OPENPERSISTENTEDITOR ) */ HB_FUNC( QT_QABSTRACTITEMVIEW_ROOTINDEX ) { - hb_retptr( new QModelIndex( hbqt_par_QAbstractItemView( 1 )->rootIndex() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QAbstractItemView( 1 )->rootIndex() ) ) ); } /* @@ -486,7 +478,7 @@ HB_FUNC( QT_QABSTRACTITEMVIEW_SIZEHINTFORCOLUMN ) */ HB_FUNC( QT_QABSTRACTITEMVIEW_SIZEHINTFORINDEX ) { - hb_retptr( new QSize( hbqt_par_QAbstractItemView( 1 )->sizeHintForIndex( *hbqt_par_QModelIndex( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QAbstractItemView( 1 )->sizeHintForIndex( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* @@ -526,7 +518,7 @@ HB_FUNC( QT_QABSTRACTITEMVIEW_VERTICALSCROLLMODE ) */ HB_FUNC( QT_QABSTRACTITEMVIEW_VISUALRECT ) { - hb_retptr( new QRect( hbqt_par_QAbstractItemView( 1 )->visualRect( *hbqt_par_QModelIndex( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QAbstractItemView( 1 )->visualRect( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QAbstractListModel.cpp b/harbour/contrib/hbqt/QAbstractListModel.cpp index 31f4b04d17..07cafd15a5 100644 --- a/harbour/contrib/hbqt/QAbstractListModel.cpp +++ b/harbour/contrib/hbqt/QAbstractListModel.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,25 +75,16 @@ * QAbstractListModel ( QObject * parent = 0 ) * ~QAbstractListModel () */ + HB_FUNC( QT_QABSTRACTLISTMODEL ) { - //hb_retptr( ( QAbstractListModel* ) new QAbstractListModel() ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QABSTRACTLISTMODEL_DESTROY ) -{ - delete hbqt_par_QAbstractListModel( 1 ); -} - /* * virtual QModelIndex index ( int row, int column = 0, const QModelIndex & parent = QModelIndex() ) const */ HB_FUNC( QT_QABSTRACTLISTMODEL_INDEX ) { - hb_retptr( new QModelIndex( hbqt_par_QAbstractListModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QAbstractListModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/QAbstractPrintDialog.cpp b/harbour/contrib/hbqt/QAbstractPrintDialog.cpp index 5919dbdb1d..cb1a7a40f6 100644 --- a/harbour/contrib/hbqt/QAbstractPrintDialog.cpp +++ b/harbour/contrib/hbqt/QAbstractPrintDialog.cpp @@ -81,6 +81,7 @@ * void setOptionTabs ( const QList & tabs ) */ +#include #include @@ -88,19 +89,10 @@ /* * QAbstractPrintDialog ( QPrinter * printer, QWidget * parent = 0 ) */ + HB_FUNC( QT_QABSTRACTPRINTDIALOG ) { - } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QABSTRACTPRINTDIALOG_DESTROY ) -{ - -} - /* * virtual int exec () = 0 */ diff --git a/harbour/contrib/hbqt/QAbstractScrollArea.cpp b/harbour/contrib/hbqt/QAbstractScrollArea.cpp index 488eab1b0d..1bd0b26957 100644 --- a/harbour/contrib/hbqt/QAbstractScrollArea.cpp +++ b/harbour/contrib/hbqt/QAbstractScrollArea.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,19 +75,10 @@ * QAbstractScrollArea ( QWidget * parent = 0 ) * ~QAbstractScrollArea () */ + HB_FUNC( QT_QABSTRACTSCROLLAREA ) { - } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QABSTRACTSCROLLAREA_DESTROY ) -{ - delete hbqt_par_QAbstractScrollArea( 1 ); -} - /* * void addScrollBarWidget ( QWidget * widget, Qt::Alignment alignment ) */ @@ -124,7 +116,7 @@ HB_FUNC( QT_QABSTRACTSCROLLAREA_HORIZONTALSCROLLBARPOLICY ) */ HB_FUNC( QT_QABSTRACTSCROLLAREA_MAXIMUMVIEWPORTSIZE ) { - hb_retptr( new QSize( hbqt_par_QAbstractScrollArea( 1 )->maximumViewportSize() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QAbstractScrollArea( 1 )->maximumViewportSize() ) ) ); } /* @@ -132,7 +124,7 @@ HB_FUNC( QT_QABSTRACTSCROLLAREA_MAXIMUMVIEWPORTSIZE ) */ HB_FUNC( QT_QABSTRACTSCROLLAREA_SCROLLBARWIDGETS ) { - hb_retptr( new QWidgetList( hbqt_par_QAbstractScrollArea( 1 )->scrollBarWidgets( ( Qt::Alignment ) hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QWidgetList( hbqt_par_QAbstractScrollArea( 1 )->scrollBarWidgets( ( Qt::Alignment ) hb_parni( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QAbstractSlider.cpp b/harbour/contrib/hbqt/QAbstractSlider.cpp index 6307bf6267..0f5391be5d 100644 --- a/harbour/contrib/hbqt/QAbstractSlider.cpp +++ b/harbour/contrib/hbqt/QAbstractSlider.cpp @@ -70,6 +70,7 @@ * enum SliderAction { SliderNoAction, SliderSingleStepAdd, SliderSingleStepSub, SliderPageStepAdd, ..., SliderMove } */ +#include #include @@ -78,19 +79,10 @@ * QAbstractSlider ( QWidget * parent = 0 ) * ~QAbstractSlider () */ + HB_FUNC( QT_QABSTRACTSLIDER ) { - } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QABSTRACTSLIDER_DESTROY ) -{ - delete hbqt_par_QAbstractSlider( 1 ); -} - /* * bool hasTracking () const */ diff --git a/harbour/contrib/hbqt/QAbstractSpinBox.cpp b/harbour/contrib/hbqt/QAbstractSpinBox.cpp index e6174fd15f..85e577b420 100644 --- a/harbour/contrib/hbqt/QAbstractSpinBox.cpp +++ b/harbour/contrib/hbqt/QAbstractSpinBox.cpp @@ -73,6 +73,7 @@ * enum StepEnabledFlag { StepNone, StepUpEnabled, StepDownEnabled } */ +#include #include @@ -81,19 +82,10 @@ * QAbstractSpinBox ( QWidget * parent = 0 ) * ~QAbstractSpinBox () */ + HB_FUNC( QT_QABSTRACTSPINBOX ) { - } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QABSTRACTSPINBOX_DESTROY ) -{ - delete hbqt_par_QAbstractSpinBox( 1 ); -} - /* * Qt::Alignment alignment () const */ diff --git a/harbour/contrib/hbqt/QAbstractTableModel.cpp b/harbour/contrib/hbqt/QAbstractTableModel.cpp index 4474527fea..64bc1439fd 100644 --- a/harbour/contrib/hbqt/QAbstractTableModel.cpp +++ b/harbour/contrib/hbqt/QAbstractTableModel.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,25 +75,16 @@ * QAbstractTableModel ( QObject * parent = 0 ) * ~QAbstractTableModel () */ + HB_FUNC( QT_QABSTRACTTABLEMODEL ) { - // hb_retptr( ( QAbstractTableModel * ) new QAbstractTableModel() ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QABSTRACTTABLEMODEL_DESTROY ) -{ - delete hbqt_par_QAbstractTableModel( 1 ); -} - /* * virtual QModelIndex index ( int row, int column, const QModelIndex & parent = QModelIndex() ) const */ HB_FUNC( QT_QABSTRACTTABLEMODEL_INDEX ) { - hb_retptr( new QModelIndex( hbqt_par_QAbstractTableModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QAbstractTableModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/QAction.cpp b/harbour/contrib/hbqt/QAction.cpp index 8ee86f9d2b..86ac5c0d53 100644 --- a/harbour/contrib/hbqt/QAction.cpp +++ b/harbour/contrib/hbqt/QAction.cpp @@ -83,6 +83,7 @@ * QList shortcuts () const */ +#include #include @@ -93,24 +94,23 @@ * QAction ( const QIcon & icon, const QString & text, QObject * parent ) * ~QAction () */ + HB_FUNC( QT_QACTION ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QAction > pObj = NULL; + if( HB_ISPOINTER( 1 ) ) - hb_retptr( new QAction( hbqt_par_QObject( 1 ) ) ); + pObj = new QAction( hbqt_par_QObject( 1 ) ) ; else if( HB_ISPOINTER( 2 ) ) - hb_retptr( new QAction( hbqt_par_QString( 1 ), hbqt_par_QObject( 2 ) ) ); + pObj = new QAction( hbqt_par_QString( 1 ), hbqt_par_QObject( 2 ) ) ; else if( HB_ISPOINTER( 3 ) ) - hb_retptr( new QAction( *hbqt_par_QIcon( 1 ), hbqt_par_QString( 2 ), hbqt_par_QObject( 3 ) ) ); -} + pObj = new QAction( *hbqt_par_QIcon( 1 ), hbqt_par_QString( 2 ), hbqt_par_QObject( 3 ) ) ; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QACTION_DESTROY ) -{ - delete hbqt_par_QAction( 1 ); + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } - /* * QActionGroup * actionGroup () const */ @@ -140,7 +140,7 @@ HB_FUNC( QT_QACTION_AUTOREPEAT ) */ HB_FUNC( QT_QACTION_DATA ) { - hb_retptr( new QVariant( hbqt_par_QAction( 1 )->data() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QAction( 1 )->data() ) ) ); } /* @@ -148,7 +148,7 @@ HB_FUNC( QT_QACTION_DATA ) */ HB_FUNC( QT_QACTION_FONT ) { - hb_retptr( new QFont( hbqt_par_QAction( 1 )->font() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QAction( 1 )->font() ) ) ); } /* @@ -156,7 +156,7 @@ HB_FUNC( QT_QACTION_FONT ) */ HB_FUNC( QT_QACTION_ICON ) { - hb_retptr( new QIcon( hbqt_par_QAction( 1 )->icon() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QAction( 1 )->icon() ) ) ); } /* @@ -388,7 +388,7 @@ HB_FUNC( QT_QACTION_SETWHATSTHIS ) */ HB_FUNC( QT_QACTION_SHORTCUT ) { - hb_retptr( new QKeySequence( hbqt_par_QAction( 1 )->shortcut() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QKeySequence( hbqt_par_QAction( 1 )->shortcut() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QApplication.cpp b/harbour/contrib/hbqt/QApplication.cpp index fe6eda51c4..82b0e63e0d 100644 --- a/harbour/contrib/hbqt/QApplication.cpp +++ b/harbour/contrib/hbqt/QApplication.cpp @@ -71,6 +71,7 @@ * enum Type { Tty, GuiClient, GuiServer } */ +#include #include "hbapi.h" #include "hbinit.h" @@ -107,27 +108,6 @@ static char ** s_argv; * virtual ~QApplication () */ -#if 0 -HB_FUNC( QT_QAPPLICATION ) -{ - int i_argc = 0; - char** c_argv = NULL; - app = new QApplication( i_argc, c_argv ); - hb_retptr( ( QApplication* ) app); -} -#endif - -HB_FUNC( QT_QAPPLICATION ) -{ -#if 0 - int i_argc; - char ** c_argv; - i_argc = hb_cmdargARGC(); - c_argv = hb_cmdargARGV(); - app = new QApplication( i_argc, c_argv ); -#endif - hb_retptr( ( QApplication * ) app ); -} static void hbqt_Exit( void * cargo ) { @@ -181,31 +161,17 @@ HB_FUNC( QT_QAPPLICATION_QUIT ) app->quit(); } -#if 0 -HB_FUNC( QT_QAPPLICATION_EXECUTE ) +HB_FUNC( QT_QAPPLICATION ) { - hb_retni( app->exec() ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QApplication > pObj = NULL; -HB_FUNC( QT_QAPPLICATION_SETSTYLE ) -{ - app->setStyle( hb_parcx( 2 ) ); -} + pObj = ( QApplication * ) app ; -HB_FUNC( QT_QAPPLICATION_QUIT ) -{ - app->quit(); + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } -#endif - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QAPPLICATION_DESTROY ) -{ - delete hbqt_par_QApplication( 1 ); -} - /* * virtual void commitData ( QSessionManager & manager ) */ @@ -307,7 +273,7 @@ HB_FUNC( QT_QAPPLICATION_ALERT ) */ HB_FUNC( QT_QAPPLICATION_ALLWIDGETS ) { - hb_retptr( new QWidgetList( hbqt_par_QApplication( 1 )->allWidgets() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QWidgetList( hbqt_par_QApplication( 1 )->allWidgets() ) ) ); } /* @@ -395,7 +361,7 @@ HB_FUNC( QT_QAPPLICATION_FOCUSWIDGET ) */ HB_FUNC( QT_QAPPLICATION_FONT ) { - hb_retptr( new QFont( hbqt_par_QApplication( 1 )->font() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QApplication( 1 )->font() ) ) ); } /* @@ -403,7 +369,7 @@ HB_FUNC( QT_QAPPLICATION_FONT ) */ HB_FUNC( QT_QAPPLICATION_FONT_1 ) { - hb_retptr( new QFont( hbqt_par_QApplication( 1 )->font( hbqt_par_QWidget( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QApplication( 1 )->font( hbqt_par_QWidget( 2 ) ) ) ) ); } /* @@ -411,7 +377,7 @@ HB_FUNC( QT_QAPPLICATION_FONT_1 ) */ HB_FUNC( QT_QAPPLICATION_FONT_2 ) { - hb_retptr( new QFont( hbqt_par_QApplication( 1 )->font( hbqt_par_char( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QApplication( 1 )->font( hbqt_par_char( 2 ) ) ) ) ); } /* @@ -419,7 +385,7 @@ HB_FUNC( QT_QAPPLICATION_FONT_2 ) */ HB_FUNC( QT_QAPPLICATION_FONTMETRICS ) { - hb_retptr( new QFontMetrics( hbqt_par_QApplication( 1 )->fontMetrics() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFontMetrics( hbqt_par_QApplication( 1 )->fontMetrics() ) ) ); } /* @@ -427,7 +393,7 @@ HB_FUNC( QT_QAPPLICATION_FONTMETRICS ) */ HB_FUNC( QT_QAPPLICATION_GLOBALSTRUT ) { - hb_retptr( new QSize( hbqt_par_QApplication( 1 )->globalStrut() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QApplication( 1 )->globalStrut() ) ) ); } /* @@ -475,7 +441,7 @@ HB_FUNC( QT_QAPPLICATION_KEYBOARDINPUTINTERVAL ) */ HB_FUNC( QT_QAPPLICATION_KEYBOARDINPUTLOCALE ) { - hb_retptr( new QLocale( hbqt_par_QApplication( 1 )->keyboardInputLocale() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QLocale( hbqt_par_QApplication( 1 )->keyboardInputLocale() ) ) ); } /* @@ -515,7 +481,7 @@ HB_FUNC( QT_QAPPLICATION_OVERRIDECURSOR ) */ HB_FUNC( QT_QAPPLICATION_PALETTE ) { - hb_retptr( new QPalette( hbqt_par_QApplication( 1 )->palette() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPalette( hbqt_par_QApplication( 1 )->palette() ) ) ); } /* @@ -523,7 +489,7 @@ HB_FUNC( QT_QAPPLICATION_PALETTE ) */ HB_FUNC( QT_QAPPLICATION_PALETTE_1 ) { - hb_retptr( new QPalette( hbqt_par_QApplication( 1 )->palette( hbqt_par_QWidget( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPalette( hbqt_par_QApplication( 1 )->palette( hbqt_par_QWidget( 2 ) ) ) ) ); } /* @@ -531,7 +497,7 @@ HB_FUNC( QT_QAPPLICATION_PALETTE_1 ) */ HB_FUNC( QT_QAPPLICATION_PALETTE_2 ) { - hb_retptr( new QPalette( hbqt_par_QApplication( 1 )->palette( hbqt_par_char( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPalette( hbqt_par_QApplication( 1 )->palette( hbqt_par_char( 2 ) ) ) ) ); } /* @@ -763,7 +729,7 @@ HB_FUNC( QT_QAPPLICATION_TOPLEVELAT_1 ) */ HB_FUNC( QT_QAPPLICATION_TOPLEVELWIDGETS ) { - hb_retptr( new QWidgetList( hbqt_par_QApplication( 1 )->topLevelWidgets() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QWidgetList( hbqt_par_QApplication( 1 )->topLevelWidgets() ) ) ); } /* @@ -803,7 +769,7 @@ HB_FUNC( QT_QAPPLICATION_WIDGETAT_1 ) */ HB_FUNC( QT_QAPPLICATION_WINDOWICON ) { - hb_retptr( new QIcon( hbqt_par_QApplication( 1 )->windowIcon() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QApplication( 1 )->windowIcon() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QBitmap.cpp b/harbour/contrib/hbqt/QBitmap.cpp index 8931121694..40accd66eb 100644 --- a/harbour/contrib/hbqt/QBitmap.cpp +++ b/harbour/contrib/hbqt/QBitmap.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -78,53 +79,52 @@ * QBitmap ( const QString & fileName, const char * format = 0 ) * ~QBitmap () */ + HB_FUNC( QT_QBITMAP ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QBitmap* ) new QBitmap( *hbqt_par_QBitmap( 1 ) ) ); + pObj = ( QBitmap* ) new QBitmap( *hbqt_par_QBitmap( 1 ) ) ; } else if( hb_pcount() == 1 && HB_ISCHAR( 1 ) ) { - hb_retptr( ( QBitmap* ) new QBitmap( hbqt_par_QString( 1 ), ( const char * ) 0 ) ); + pObj = ( QBitmap* ) new QBitmap( hbqt_par_QString( 1 ), ( const char * ) 0 ) ; } else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISCHAR( 2 ) ) { - hb_retptr( ( QBitmap* ) new QBitmap( hbqt_par_QString( 1 ), hb_parc( 2 ) ) ); + pObj = ( QBitmap* ) new QBitmap( hbqt_par_QString( 1 ), hb_parc( 2 ) ) ; } else if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( ( QBitmap* ) new QBitmap( hb_parni( 1 ), hb_parni( 2 ) ) ); + pObj = ( QBitmap* ) new QBitmap( hb_parni( 1 ), hb_parni( 2 ) ) ; } else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) ) { if( ( QString ) "QPixmap" == hbqt_par_QString( 1 ) ) { - hb_retptr( ( QBitmap* ) new QBitmap( *hbqt_par_QPixmap( 2 ) ) ); + pObj = ( QBitmap* ) new QBitmap( *hbqt_par_QPixmap( 2 ) ) ; } else if( ( QString ) "QSize" == hbqt_par_QString( 1 ) ) { - hb_retptr( ( QBitmap* ) new QBitmap( *hbqt_par_QSize( 2 ) ) ); + pObj = ( QBitmap* ) new QBitmap( *hbqt_par_QSize( 2 ) ) ; } else { - hb_retptr( ( QBitmap* ) new QBitmap() ); + pObj = ( QBitmap* ) new QBitmap() ; } } else { - hb_retptr( ( QBitmap* ) new QBitmap() ); + pObj = ( QBitmap* ) new QBitmap() ; } -} -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QBITMAP_DESTROY ) -{ - delete hbqt_par_QBitmap( 1 ); + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QBitmap" ); + hb_retptrGC( p ); } - /* * void clear () */ @@ -138,7 +138,7 @@ HB_FUNC( QT_QBITMAP_CLEAR ) */ HB_FUNC( QT_QBITMAP_TRANSFORMED ) { - hb_retptr( new QBitmap( hbqt_par_QBitmap( 1 )->transformed( *hbqt_par_QTransform( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBitmap( hbqt_par_QBitmap( 1 )->transformed( *hbqt_par_QTransform( 2 ) ) ) ) ); } /* @@ -146,7 +146,7 @@ HB_FUNC( QT_QBITMAP_TRANSFORMED ) */ HB_FUNC( QT_QBITMAP_TRANSFORMED_1 ) { - hb_retptr( new QBitmap( hbqt_par_QBitmap( 1 )->transformed( *hbqt_par_QMatrix( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBitmap( hbqt_par_QBitmap( 1 )->transformed( *hbqt_par_QMatrix( 2 ) ) ) ) ); } /* @@ -154,7 +154,7 @@ HB_FUNC( QT_QBITMAP_TRANSFORMED_1 ) */ HB_FUNC( QT_QBITMAP_FROMIMAGE ) { - hb_retptr( new QBitmap( hbqt_par_QBitmap( 1 )->fromImage( *hbqt_par_QImage( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::ImageConversionFlags ) hb_parni( 3 ) : ( Qt::ImageConversionFlags ) Qt::AutoColor ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBitmap( hbqt_par_QBitmap( 1 )->fromImage( *hbqt_par_QImage( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::ImageConversionFlags ) hb_parni( 3 ) : ( Qt::ImageConversionFlags ) Qt::AutoColor ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/QBoxLayout.cpp b/harbour/contrib/hbqt/QBoxLayout.cpp index b7786fe037..0bb0432ede 100644 --- a/harbour/contrib/hbqt/QBoxLayout.cpp +++ b/harbour/contrib/hbqt/QBoxLayout.cpp @@ -70,6 +70,7 @@ * enum Direction { LeftToRight, RightToLeft, TopToBottom, BottomToTop } */ +#include #include @@ -78,20 +79,18 @@ * QBoxLayout ( Direction dir, QWidget * parent = 0 ) * ~QBoxLayout () */ + HB_FUNC( QT_QBOXLAYOUT ) { - hb_retptr( ( QBoxLayout* ) new QBoxLayout( ( QBoxLayout::Direction ) hb_parni( 1 ), - hbqt_par_QWidget( 2 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QBoxLayout > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QBOXLAYOUT_DESTROY ) -{ - delete hbqt_par_QBoxLayout( 1 ); -} + pObj = ( QBoxLayout* ) new QBoxLayout( ( QBoxLayout::Direction ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * void addLayout ( QLayout * layout, int stretch = 0 ) */ diff --git a/harbour/contrib/hbqt/QBrush.cpp b/harbour/contrib/hbqt/QBrush.cpp index 358cd56fe3..4df89edfce 100644 --- a/harbour/contrib/hbqt/QBrush.cpp +++ b/harbour/contrib/hbqt/QBrush.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -83,31 +84,35 @@ * QBrush ( const QGradient & gradient ) * ~QBrush () */ + HB_FUNC( QT_QBRUSH ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QBrush* ) new QBrush( *hbqt_par_QBrush( 1 ) ) ); + pObj = ( QBrush* ) new QBrush( *hbqt_par_QBrush( 1 ) ) ; } else if( hb_pcount() == 1 && HB_ISNUM( 1 ) ) { - hb_retptr( ( QBrush* ) new QBrush( ( Qt::GlobalColor ) hb_parni( 1 ), Qt::SolidPattern ) ); + pObj = ( QBrush* ) new QBrush( ( Qt::GlobalColor ) hb_parni( 1 ), Qt::SolidPattern ) ; } else if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( ( QBrush* ) new QBrush( ( Qt::GlobalColor ) hb_parni( 1 ), ( Qt::BrushStyle ) hb_parni( 2 ) ) ); + pObj = ( QBrush* ) new QBrush( ( Qt::GlobalColor ) hb_parni( 1 ), ( Qt::BrushStyle ) hb_parni( 2 ) ) ; } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( ( QBrush* ) new QBrush( *hbqt_par_QColor( 1 ), ( Qt::BrushStyle ) hb_parni( 2 ) ) ); + pObj = ( QBrush* ) new QBrush( *hbqt_par_QColor( 1 ), ( Qt::BrushStyle ) hb_parni( 2 ) ) ; } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( ( QBrush* ) new QBrush( *hbqt_par_QColor( 1 ), *hbqt_par_QPixmap( 2 ) ) ); + pObj = ( QBrush* ) new QBrush( *hbqt_par_QColor( 1 ), *hbqt_par_QPixmap( 2 ) ) ; } else if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( ( QBrush* ) new QBrush( ( Qt::GlobalColor ) hb_parni( 1 ), *hbqt_par_QPixmap( 2 ) ) ); + pObj = ( QBrush* ) new QBrush( ( Qt::GlobalColor ) hb_parni( 1 ), *hbqt_par_QPixmap( 2 ) ) ; } else if( hb_pcount() >= 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) ) { @@ -115,46 +120,40 @@ HB_FUNC( QT_QBRUSH ) if( objName == ( QString ) "QPixmap" ) { - hb_retptr( ( QBrush* ) new QBrush( *hbqt_par_QPixmap( 2 ) ) ); + pObj = ( QBrush* ) new QBrush( *hbqt_par_QPixmap( 2 ) ) ; } else if( objName == ( QString ) "QImage" ) { - hb_retptr( ( QBrush* ) new QBrush( *hbqt_par_QImage( 2 ) ) ); + pObj = ( QBrush* ) new QBrush( *hbqt_par_QImage( 2 ) ) ; } else if( objName == ( QString ) "QGradient" ) { - hb_retptr( ( QBrush* ) new QBrush( *hbqt_par_QGradient( 2 ) ) ); + pObj = ( QBrush* ) new QBrush( *hbqt_par_QGradient( 2 ) ) ; } else if( objName == ( QString ) "QColor" ) { - hb_retptr( ( QBrush* ) new QBrush( *hbqt_par_QColor( 2 ), - HB_ISNUM( 3 ) ? ( Qt::BrushStyle ) hb_parni( 3 ) : Qt::SolidPattern ) ); + pObj = ( QBrush* ) new QBrush( *hbqt_par_QColor( 2 ), HB_ISNUM( 3 ) ? ( Qt::BrushStyle ) hb_parni( 3 ) : Qt::SolidPattern ) ; } else { - hb_retptr( ( QBrush* ) new QBrush() ); + pObj = ( QBrush* ) new QBrush() ; } } else { - hb_retptr( ( QBrush* ) new QBrush() ); + pObj = ( QBrush* ) new QBrush() ; } -} -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QBRUSH_DESTROY ) -{ - delete hbqt_par_QBrush( 1 ); + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QBrush" ); + hb_retptrGC( p ); } - /* * const QColor & color () const */ HB_FUNC( QT_QBRUSH_COLOR ) { - hb_retptr( new QColor( hbqt_par_QBrush( 1 )->color() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QBrush( 1 )->color() ) ) ); } /* @@ -170,7 +169,7 @@ HB_FUNC( QT_QBRUSH_ISOPAQUE ) */ HB_FUNC( QT_QBRUSH_MATRIX ) { - hb_retptr( new QMatrix( hbqt_par_QBrush( 1 )->matrix() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QMatrix( hbqt_par_QBrush( 1 )->matrix() ) ) ); } /* @@ -242,7 +241,7 @@ HB_FUNC( QT_QBRUSH_STYLE ) */ HB_FUNC( QT_QBRUSH_TEXTURE ) { - hb_retptr( new QPixmap( hbqt_par_QBrush( 1 )->texture() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QBrush( 1 )->texture() ) ) ); } /* @@ -250,7 +249,7 @@ HB_FUNC( QT_QBRUSH_TEXTURE ) */ HB_FUNC( QT_QBRUSH_TEXTUREIMAGE ) { - hb_retptr( new QImage( hbqt_par_QBrush( 1 )->textureImage() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QImage( hbqt_par_QBrush( 1 )->textureImage() ) ) ); } /* @@ -258,7 +257,7 @@ HB_FUNC( QT_QBRUSH_TEXTUREIMAGE ) */ HB_FUNC( QT_QBRUSH_TRANSFORM ) { - hb_retptr( new QTransform( hbqt_par_QBrush( 1 )->transform() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTransform( hbqt_par_QBrush( 1 )->transform() ) ) ); } diff --git a/harbour/contrib/hbqt/QButtonGroup.cpp b/harbour/contrib/hbqt/QButtonGroup.cpp index c3fa0642a7..d4070c97f3 100644 --- a/harbour/contrib/hbqt/QButtonGroup.cpp +++ b/harbour/contrib/hbqt/QButtonGroup.cpp @@ -75,6 +75,7 @@ * QList buttons () const */ +#include #include @@ -83,26 +84,25 @@ * QButtonGroup ( QObject * parent = 0 ) * ~QButtonGroup () */ + HB_FUNC( QT_QBUTTONGROUP ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QButtonGroup > pObj = NULL; + if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QButtonGroup* ) new QButtonGroup( hbqt_par_QObject( 1 ) ) ); + pObj = ( QButtonGroup* ) new QButtonGroup( hbqt_par_QObject( 1 ) ) ; } else { - hb_retptr( ( QButtonGroup* ) new QButtonGroup() ); + pObj = ( QButtonGroup* ) new QButtonGroup() ; } -} -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QBUTTONGROUP_DESTROY ) -{ - delete hbqt_par_QButtonGroup( 1 ); + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } - /* * void addButton ( QAbstractButton * button ) */ diff --git a/harbour/contrib/hbqt/QCalendarWidget.cpp b/harbour/contrib/hbqt/QCalendarWidget.cpp index ded48a1748..2bda86a46b 100644 --- a/harbour/contrib/hbqt/QCalendarWidget.cpp +++ b/harbour/contrib/hbqt/QCalendarWidget.cpp @@ -81,6 +81,7 @@ * QMap dateTextFormat () const */ +#include #include #include @@ -89,19 +90,18 @@ * QCalendarWidget ( QWidget * parent = 0 ) * ~QCalendarWidget () */ + HB_FUNC( QT_QCALENDARWIDGET ) { - hb_retptr( ( QCalendarWidget* ) new QCalendarWidget( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QCalendarWidget > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QCALENDARWIDGET_DESTROY ) -{ - delete hbqt_par_QCalendarWidget( 1 ); -} + pObj = ( QCalendarWidget* ) new QCalendarWidget( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * int dateEditAcceptDelay () const */ @@ -115,7 +115,7 @@ HB_FUNC( QT_QCALENDARWIDGET_DATEEDITACCEPTDELAY ) */ HB_FUNC( QT_QCALENDARWIDGET_DATETEXTFORMAT ) { - hb_retptr( new QTextCharFormat( hbqt_par_QCalendarWidget( 1 )->dateTextFormat( *hbqt_par_QDate( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextCharFormat( hbqt_par_QCalendarWidget( 1 )->dateTextFormat( *hbqt_par_QDate( 2 ) ) ) ) ); } /* @@ -131,7 +131,7 @@ HB_FUNC( QT_QCALENDARWIDGET_FIRSTDAYOFWEEK ) */ HB_FUNC( QT_QCALENDARWIDGET_HEADERTEXTFORMAT ) { - hb_retptr( new QTextCharFormat( hbqt_par_QCalendarWidget( 1 )->headerTextFormat() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextCharFormat( hbqt_par_QCalendarWidget( 1 )->headerTextFormat() ) ) ); } /* @@ -171,7 +171,7 @@ HB_FUNC( QT_QCALENDARWIDGET_ISNAVIGATIONBARVISIBLE ) */ HB_FUNC( QT_QCALENDARWIDGET_MAXIMUMDATE ) { - hb_retptr( new QDate( hbqt_par_QCalendarWidget( 1 )->maximumDate() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDate( hbqt_par_QCalendarWidget( 1 )->maximumDate() ) ) ); } /* @@ -179,7 +179,7 @@ HB_FUNC( QT_QCALENDARWIDGET_MAXIMUMDATE ) */ HB_FUNC( QT_QCALENDARWIDGET_MINIMUMDATE ) { - hb_retptr( new QDate( hbqt_par_QCalendarWidget( 1 )->minimumDate() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDate( hbqt_par_QCalendarWidget( 1 )->minimumDate() ) ) ); } /* @@ -195,7 +195,7 @@ HB_FUNC( QT_QCALENDARWIDGET_MONTHSHOWN ) */ HB_FUNC( QT_QCALENDARWIDGET_SELECTEDDATE ) { - hb_retptr( new QDate( hbqt_par_QCalendarWidget( 1 )->selectedDate() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDate( hbqt_par_QCalendarWidget( 1 )->selectedDate() ) ) ); } /* @@ -307,7 +307,7 @@ HB_FUNC( QT_QCALENDARWIDGET_VERTICALHEADERFORMAT ) */ HB_FUNC( QT_QCALENDARWIDGET_WEEKDAYTEXTFORMAT ) { - hb_retptr( new QTextCharFormat( hbqt_par_QCalendarWidget( 1 )->weekdayTextFormat( ( Qt::DayOfWeek ) hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextCharFormat( hbqt_par_QCalendarWidget( 1 )->weekdayTextFormat( ( Qt::DayOfWeek ) hb_parni( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QCheckBox.cpp b/harbour/contrib/hbqt/QCheckBox.cpp index f744bfc12e..35bc547b9d 100644 --- a/harbour/contrib/hbqt/QCheckBox.cpp +++ b/harbour/contrib/hbqt/QCheckBox.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,26 +75,25 @@ * QCheckBox ( QWidget * parent = 0 ) * QCheckBox ( const QString & text, QWidget * parent = 0 ) */ + HB_FUNC( QT_QCHECKBOX ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QCheckBox > pObj = NULL; + if( hb_pcount() >= 1 && HB_ISCHAR( 1 ) ) { - hb_retptr( ( QCheckBox* ) new QCheckBox( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) ); + pObj = ( QCheckBox* ) new QCheckBox( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) ; } else { - hb_retptr( ( QCheckBox* ) new QCheckBox( hbqt_par_QWidget( 1 ) ) ); + pObj = ( QCheckBox* ) new QCheckBox( hbqt_par_QWidget( 1 ) ) ; } + + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QCHECKBOX_DESTROY ) -{ - -} - /* * Qt::CheckState checkState () const */ diff --git a/harbour/contrib/hbqt/QClipboard.cpp b/harbour/contrib/hbqt/QClipboard.cpp index 7b2d93fac5..00eeeec5b6 100644 --- a/harbour/contrib/hbqt/QClipboard.cpp +++ b/harbour/contrib/hbqt/QClipboard.cpp @@ -70,6 +70,7 @@ * enum Mode { Clipboard, Selection, FindBuffer } */ +#include #include #include @@ -79,19 +80,18 @@ * * */ + HB_FUNC( QT_QCLIPBOARD ) { - hb_retptr( ( QClipboard* ) QApplication::clipboard() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QClipboard > pObj = NULL; + + pObj = ( QClipboard* ) QApplication::clipboard() ; + + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QCLIPBOARD_DESTROY ) -{ - -} - /* * void clear ( Mode mode = Clipboard ) */ @@ -105,7 +105,7 @@ HB_FUNC( QT_QCLIPBOARD_CLEAR ) */ HB_FUNC( QT_QCLIPBOARD_IMAGE ) { - hb_retptr( new QImage( hbqt_par_QClipboard( 1 )->image( ( HB_ISNUM( 2 ) ? ( QClipboard::Mode ) hb_parni( 2 ) : ( QClipboard::Mode ) QClipboard::Clipboard ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QImage( hbqt_par_QClipboard( 1 )->image( ( HB_ISNUM( 2 ) ? ( QClipboard::Mode ) hb_parni( 2 ) : ( QClipboard::Mode ) QClipboard::Clipboard ) ) ) ) ); } /* @@ -145,7 +145,7 @@ HB_FUNC( QT_QCLIPBOARD_OWNSSELECTION ) */ HB_FUNC( QT_QCLIPBOARD_PIXMAP ) { - hb_retptr( new QPixmap( hbqt_par_QClipboard( 1 )->pixmap( ( HB_ISNUM( 2 ) ? ( QClipboard::Mode ) hb_parni( 2 ) : ( QClipboard::Mode ) QClipboard::Clipboard ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QClipboard( 1 )->pixmap( ( HB_ISNUM( 2 ) ? ( QClipboard::Mode ) hb_parni( 2 ) : ( QClipboard::Mode ) QClipboard::Clipboard ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QColor.cpp b/harbour/contrib/hbqt/QColor.cpp index 92dcbb9f27..e0c291ce7a 100644 --- a/harbour/contrib/hbqt/QColor.cpp +++ b/harbour/contrib/hbqt/QColor.cpp @@ -70,6 +70,7 @@ * enum Spec { Rgb, Hsv, Cmyk, Invalid } */ +#include #include @@ -83,53 +84,52 @@ QColor ( const char * name ) QColor ( const QColor & color ) ~QColor () */ + HB_FUNC( QT_QCOLOR ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + if( hb_pcount() >= 1 ) { if( hb_pcount() == 1 && HB_ISNUM( 1 ) && hb_parni( 1 ) < 25 ) { - hb_retptr( ( QColor* ) new QColor( ( Qt::GlobalColor ) hb_parni( 1 ) ) ); + pObj = ( QColor* ) new QColor( ( Qt::GlobalColor ) hb_parni( 1 ) ) ; } else if( hb_pcount() == 1 && HB_ISNUM( 1 ) ) { - hb_retptr( ( QColor* ) new QColor( ( QRgb ) hb_parni( 1 ) ) ); + pObj = ( QColor* ) new QColor( ( QRgb ) hb_parni( 1 ) ) ; } else if( hb_pcount() == 1 && HB_ISCHAR( 1 ) ) { - hb_retptr( ( QColor* ) new QColor( hbqt_par_QString( 1 ) ) ); + pObj = ( QColor* ) new QColor( hbqt_par_QString( 1 ) ) ; } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QColor* ) new QColor( *hbqt_par_QColor( 1 ) ) ); + pObj = ( QColor* ) new QColor( *hbqt_par_QColor( 1 ) ) ; } else if( hb_pcount() == 3 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) ) { - hb_retptr( ( QColor* ) new QColor( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), ( int ) 255 ) ); + pObj = ( QColor* ) new QColor( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), ( int ) 255 ) ; } else if( hb_pcount() == 4 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) ) { - hb_retptr( ( QColor* ) new QColor( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ) ) ); + pObj = ( QColor* ) new QColor( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ) ) ; } else { - hb_retptr( ( QColor* ) new QColor() ); + pObj = ( QColor* ) new QColor() ; } } else { - hb_retptr( ( QColor* ) new QColor() ); + pObj = ( QColor* ) new QColor() ; } -} -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QCOLOR_DESTROY ) -{ - delete hbqt_par_QColor( 1 ); + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QColor" ); + hb_retptrGC( p ); } - /* * int alpha () const */ @@ -183,7 +183,7 @@ HB_FUNC( QT_QCOLOR_BLUEF ) */ HB_FUNC( QT_QCOLOR_CONVERTTO ) { - hb_retptr( new QColor( hbqt_par_QColor( 1 )->convertTo( ( QColor::Spec ) hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->convertTo( ( QColor::Spec ) hb_parni( 2 ) ) ) ) ); } /* @@ -207,7 +207,7 @@ HB_FUNC( QT_QCOLOR_CYANF ) */ HB_FUNC( QT_QCOLOR_DARKER ) { - hb_retptr( new QColor( hbqt_par_QColor( 1 )->darker( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 200 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->darker( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 200 ) ) ) ) ); } /* @@ -367,7 +367,7 @@ HB_FUNC( QT_QCOLOR_ISVALID ) */ HB_FUNC( QT_QCOLOR_LIGHTER ) { - hb_retptr( new QColor( hbqt_par_QColor( 1 )->lighter( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 150 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->lighter( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 150 ) ) ) ) ); } /* @@ -591,7 +591,7 @@ HB_FUNC( QT_QCOLOR_SPEC ) */ HB_FUNC( QT_QCOLOR_TOCMYK ) { - hb_retptr( new QColor( hbqt_par_QColor( 1 )->toCmyk() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->toCmyk() ) ) ); } /* @@ -599,7 +599,7 @@ HB_FUNC( QT_QCOLOR_TOCMYK ) */ HB_FUNC( QT_QCOLOR_TOHSV ) { - hb_retptr( new QColor( hbqt_par_QColor( 1 )->toHsv() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->toHsv() ) ) ); } /* @@ -607,7 +607,7 @@ HB_FUNC( QT_QCOLOR_TOHSV ) */ HB_FUNC( QT_QCOLOR_TORGB ) { - hb_retptr( new QColor( hbqt_par_QColor( 1 )->toRgb() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->toRgb() ) ) ); } /* @@ -647,7 +647,7 @@ HB_FUNC( QT_QCOLOR_YELLOWF ) */ HB_FUNC( QT_QCOLOR_COLORNAMES ) { - hb_retptr( new QStringList( hbqt_par_QColor( 1 )->colorNames() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QColor( 1 )->colorNames() ) ) ); } /* @@ -655,7 +655,7 @@ HB_FUNC( QT_QCOLOR_COLORNAMES ) */ HB_FUNC( QT_QCOLOR_FROMCMYK ) { - hb_retptr( new QColor( hbqt_par_QColor( 1 )->fromCmyk( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), ( HB_ISNUM( 6 ) ? hb_parni( 6 ) : 255 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->fromCmyk( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), ( HB_ISNUM( 6 ) ? hb_parni( 6 ) : 255 ) ) ) ) ); } /* @@ -663,7 +663,7 @@ HB_FUNC( QT_QCOLOR_FROMCMYK ) */ HB_FUNC( QT_QCOLOR_FROMCMYKF ) { - hb_retptr( new QColor( hbqt_par_QColor( 1 )->fromCmykF( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->fromCmykF( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ) ) ) ) ); } /* @@ -671,7 +671,7 @@ HB_FUNC( QT_QCOLOR_FROMCMYKF ) */ HB_FUNC( QT_QCOLOR_FROMHSV ) { - hb_retptr( new QColor( hbqt_par_QColor( 1 )->fromHsv( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : 255 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->fromHsv( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : 255 ) ) ) ) ); } /* @@ -679,7 +679,7 @@ HB_FUNC( QT_QCOLOR_FROMHSV ) */ HB_FUNC( QT_QCOLOR_FROMHSVF ) { - hb_retptr( new QColor( hbqt_par_QColor( 1 )->fromHsvF( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->fromHsvF( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ) ) ) ); } /* @@ -687,7 +687,7 @@ HB_FUNC( QT_QCOLOR_FROMHSVF ) */ HB_FUNC( QT_QCOLOR_FROMRGB ) { - hb_retptr( new QColor( hbqt_par_QColor( 1 )->fromRgb( hb_parnl( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->fromRgb( hb_parnl( 2 ) ) ) ) ); } /* @@ -695,7 +695,7 @@ HB_FUNC( QT_QCOLOR_FROMRGB ) */ HB_FUNC( QT_QCOLOR_FROMRGB_1 ) { - hb_retptr( new QColor( hbqt_par_QColor( 1 )->fromRgb( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : 255 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->fromRgb( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : 255 ) ) ) ) ); } /* @@ -703,7 +703,7 @@ HB_FUNC( QT_QCOLOR_FROMRGB_1 ) */ HB_FUNC( QT_QCOLOR_FROMRGBF ) { - hb_retptr( new QColor( hbqt_par_QColor( 1 )->fromRgbF( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->fromRgbF( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ) ) ) ); } /* @@ -711,7 +711,7 @@ HB_FUNC( QT_QCOLOR_FROMRGBF ) */ HB_FUNC( QT_QCOLOR_FROMRGBA ) { - hb_retptr( new QColor( hbqt_par_QColor( 1 )->fromRgba( hb_parnl( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->fromRgba( hb_parnl( 2 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/QColorDialog.cpp b/harbour/contrib/hbqt/QColorDialog.cpp index cafcda33e8..e8e31bc509 100644 --- a/harbour/contrib/hbqt/QColorDialog.cpp +++ b/harbour/contrib/hbqt/QColorDialog.cpp @@ -71,6 +71,7 @@ * flags ColorDialogOptions */ +#include #include @@ -79,33 +80,31 @@ * QColorDialog ( const QColor & initial, QWidget * parent = 0 ) * ~QColorDialog () */ + HB_FUNC( QT_QCOLORDIALOG ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QColorDialog > pObj = NULL; + if( hb_pcount() >= 1 && HB_ISNUM( 1 ) ) { - hb_retptr( ( QColorDialog* ) new QColorDialog( hb_parni( 1 ), - hbqt_par_QWidget( 2 ) ) ); + pObj = ( QColorDialog* ) new QColorDialog( hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) ; } else { - hb_retptr( ( QColorDialog* ) new QColorDialog( hbqt_par_QWidget( 1 ) ) ); + pObj = ( QColorDialog* ) new QColorDialog( hbqt_par_QWidget( 1 ) ) ; } -} -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QCOLORDIALOG_DESTROY ) -{ - delete hbqt_par_QColorDialog( 1 ); + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } - /* * QColor currentColor () const */ HB_FUNC( QT_QCOLORDIALOG_CURRENTCOLOR ) { - hb_retptr( new QColor( hbqt_par_QColorDialog( 1 )->currentColor() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColorDialog( 1 )->currentColor() ) ) ); } /* @@ -129,7 +128,7 @@ HB_FUNC( QT_QCOLORDIALOG_OPTIONS ) */ HB_FUNC( QT_QCOLORDIALOG_SELECTEDCOLOR ) { - hb_retptr( new QColor( hbqt_par_QColorDialog( 1 )->selectedColor() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColorDialog( 1 )->selectedColor() ) ) ); } /* @@ -193,7 +192,7 @@ HB_FUNC( QT_QCOLORDIALOG_CUSTOMCOUNT ) */ HB_FUNC( QT_QCOLORDIALOG_GETCOLOR ) { - hb_retptr( new QColor( hbqt_par_QColorDialog( 1 )->getColor( *hbqt_par_QColor( 2 ), hbqt_par_QWidget( 3 ), hbqt_par_QString( 4 ), ( QColorDialog::ColorDialogOptions ) hb_parni( 5 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColorDialog( 1 )->getColor( *hbqt_par_QColor( 2 ), hbqt_par_QWidget( 3 ), hbqt_par_QString( 4 ), ( QColorDialog::ColorDialogOptions ) hb_parni( 5 ) ) ) ) ); } /* @@ -201,7 +200,7 @@ HB_FUNC( QT_QCOLORDIALOG_GETCOLOR ) */ HB_FUNC( QT_QCOLORDIALOG_GETCOLOR_1 ) { - hb_retptr( new QColor( hbqt_par_QColorDialog( 1 )->getColor( *hbqt_par_QColor( 2 ), hbqt_par_QWidget( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColorDialog( 1 )->getColor( *hbqt_par_QColor( 2 ), hbqt_par_QWidget( 3 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QComboBox.cpp b/harbour/contrib/hbqt/QComboBox.cpp index 027903c3c8..f0ef4f2dfc 100644 --- a/harbour/contrib/hbqt/QComboBox.cpp +++ b/harbour/contrib/hbqt/QComboBox.cpp @@ -71,6 +71,7 @@ * enum SizeAdjustPolicy { AdjustToContents, AdjustToContentsOnFirstShow, AdjustToMinimumContentsLength, AdjustToMinimumContentsLengthWithIcon } */ +#include #include @@ -79,19 +80,18 @@ * QComboBox ( QWidget * parent = 0 ) * ~QComboBox () */ + HB_FUNC( QT_QCOMBOBOX ) { - hb_retptr( ( QComboBox* ) new QComboBox( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QComboBox > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QCOMBOBOX_DESTROY ) -{ - delete hbqt_par_QComboBox( 1 ); -} + pObj = ( QComboBox* ) new QComboBox( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * void addItem ( const QString & text, const QVariant & userData = QVariant() ) */ @@ -193,7 +193,7 @@ HB_FUNC( QT_QCOMBOBOX_HIDEPOPUP ) */ HB_FUNC( QT_QCOMBOBOX_ICONSIZE ) { - hb_retptr( new QSize( hbqt_par_QComboBox( 1 )->iconSize() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QComboBox( 1 )->iconSize() ) ) ); } /* @@ -249,7 +249,7 @@ HB_FUNC( QT_QCOMBOBOX_ISEDITABLE ) */ HB_FUNC( QT_QCOMBOBOX_ITEMDATA ) { - hb_retptr( new QVariant( hbqt_par_QComboBox( 1 )->itemData( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::UserRole ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QComboBox( 1 )->itemData( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::UserRole ) ) ) ) ); } /* @@ -265,7 +265,7 @@ HB_FUNC( QT_QCOMBOBOX_ITEMDELEGATE ) */ HB_FUNC( QT_QCOMBOBOX_ITEMICON ) { - hb_retptr( new QIcon( hbqt_par_QComboBox( 1 )->itemIcon( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QComboBox( 1 )->itemIcon( hb_parni( 2 ) ) ) ) ); } /* @@ -337,7 +337,7 @@ HB_FUNC( QT_QCOMBOBOX_REMOVEITEM ) */ HB_FUNC( QT_QCOMBOBOX_ROOTMODELINDEX ) { - hb_retptr( new QModelIndex( hbqt_par_QComboBox( 1 )->rootModelIndex() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QComboBox( 1 )->rootModelIndex() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QCommandLinkButton.cpp b/harbour/contrib/hbqt/QCommandLinkButton.cpp index 380bb4e6a3..9e905a456c 100644 --- a/harbour/contrib/hbqt/QCommandLinkButton.cpp +++ b/harbour/contrib/hbqt/QCommandLinkButton.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -75,19 +76,18 @@ * QCommandLinkButton ( const QString & text, QWidget * parent = 0 ) * QCommandLinkButton ( const QString & text, const QString & description, QWidget * parent = 0 ) */ + HB_FUNC( QT_QCOMMANDLINKBUTTON ) { - hb_retptr( ( QCommandLinkButton* ) new QCommandLinkButton( hbqt_par_QWidget( 1 ) ) ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QCommandLinkButton > pObj = NULL; + + pObj = ( QCommandLinkButton* ) new QCommandLinkButton( hbqt_par_QWidget( 1 ) ) ; + + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QCOMMANDLINKBUTTON_DESTROY ) -{ - -} - /* * QString description () const */ diff --git a/harbour/contrib/hbqt/QCommonStyle.cpp b/harbour/contrib/hbqt/QCommonStyle.cpp index 44f22c8bd4..79f5856352 100644 --- a/harbour/contrib/hbqt/QCommonStyle.cpp +++ b/harbour/contrib/hbqt/QCommonStyle.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -73,20 +74,19 @@ /* * QCommonStyle () */ + HB_FUNC( QT_QCOMMONSTYLE ) { - hb_retptr( ( QCommonStyle* ) new QCommonStyle() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QCommonStyle > pObj = NULL; + + pObj = ( QCommonStyle* ) new QCommonStyle() ; + + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QCOMMONSTYLE_DESTROY ) -{ - -} - - /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/QConicalGradient.cpp b/harbour/contrib/hbqt/QConicalGradient.cpp index 0e19d710a7..84db2a83c0 100644 --- a/harbour/contrib/hbqt/QConicalGradient.cpp +++ b/harbour/contrib/hbqt/QConicalGradient.cpp @@ -72,6 +72,7 @@ * enum Type { LinearGradient, RadialGradient, ConicalGradient, NoGradient } */ +#include #include @@ -81,19 +82,15 @@ * QConicalGradient ( const QPointF & center, qreal angle ) * QConicalGradient ( qreal cx, qreal cy, qreal angle ) */ + HB_FUNC( QT_QCONICALGRADIENT ) { - hb_retptr( ( QConicalGradient* ) new QConicalGradient() ); + void * pObj = NULL; + + pObj = ( QConicalGradient* ) new QConicalGradient() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QCONICALGRADIENT_DESTROY ) -{ - -} - /* * qreal angle () const */ @@ -107,7 +104,7 @@ HB_FUNC( QT_QCONICALGRADIENT_ANGLE ) */ HB_FUNC( QT_QCONICALGRADIENT_CENTER ) { - hb_retptr( new QPointF( hbqt_par_QConicalGradient( 1 )->center() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPointF( hbqt_par_QConicalGradient( 1 )->center() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QCoreApplication.cpp b/harbour/contrib/hbqt/QCoreApplication.cpp index 9138276c5a..f8adf2ff20 100644 --- a/harbour/contrib/hbqt/QCoreApplication.cpp +++ b/harbour/contrib/hbqt/QCoreApplication.cpp @@ -84,6 +84,7 @@ * // virtual bool winEventFilter ( MSG * msg, long * result ) */ +#include #include #include @@ -93,19 +94,10 @@ * QCoreApplication ( int & argc, char ** argv ) * ~QCoreApplication () */ + HB_FUNC( QT_QCOREAPPLICATION ) { - } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QCOREAPPLICATION_DESTROY ) -{ - delete hbqt_par_QCoreApplication( 1 ); -} - /* * virtual bool notify ( QObject * receiver, QEvent * event ) */ @@ -167,7 +159,7 @@ HB_FUNC( QT_QCOREAPPLICATION_APPLICATIONVERSION ) */ HB_FUNC( QT_QCOREAPPLICATION_ARGUMENTS ) { - hb_retptr( new QStringList( hbqt_par_QCoreApplication( 1 )->arguments() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QCoreApplication( 1 )->arguments() ) ) ); } /* @@ -231,7 +223,7 @@ HB_FUNC( QT_QCOREAPPLICATION_INSTANCE ) */ HB_FUNC( QT_QCOREAPPLICATION_LIBRARYPATHS ) { - hb_retptr( new QStringList( hbqt_par_QCoreApplication( 1 )->libraryPaths() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QCoreApplication( 1 )->libraryPaths() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QCursor.cpp b/harbour/contrib/hbqt/QCursor.cpp index 069de8074c..43474b2869 100644 --- a/harbour/contrib/hbqt/QCursor.cpp +++ b/harbour/contrib/hbqt/QCursor.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include #include @@ -80,15 +81,19 @@ * QCursor ( Qt::HANDLE handle ) * ~QCursor () */ + HB_FUNC( QT_QCURSOR ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + if( hb_pcount() == 1 && HB_ISNUM( 1 ) ) { - hb_retptr( ( QCursor* ) new QCursor( ( Qt::CursorShape ) hb_parni( 1 ) ) ); + pObj = ( QCursor* ) new QCursor( ( Qt::CursorShape ) hb_parni( 1 ) ) ; } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QCursor* ) new QCursor( *hbqt_par_QCursor( 1 ) ) ); + pObj = ( QCursor* ) new QCursor( *hbqt_par_QCursor( 1 ) ) ; } else if( hb_pcount() >= 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) ) { @@ -96,35 +101,26 @@ HB_FUNC( QT_QCURSOR ) if( objName == ( QString ) "QPixmap" ) { - hb_retptr( ( QCursor* ) new QCursor( *hbqt_par_QPixmap( 2 ), - HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1, - HB_ISNUM( 4 ) ? hb_parni( 4 ) : -1 ) ); + pObj = ( QCursor* ) new QCursor( *hbqt_par_QPixmap( 2 ), HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1, HB_ISNUM( 4 ) ? hb_parni( 4 ) : -1 ) ; } else { - hb_retptr( ( QCursor* ) new QCursor() ); + pObj = ( QCursor* ) new QCursor() ; } } else if( hb_pcount() >= 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( ( QCursor* ) new QCursor( *hbqt_par_QBitmap( 1 ), *hbqt_par_QBitmap( 2 ), - HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1, - HB_ISNUM( 4 ) ? hb_parni( 4 ) : -1 ) ); + pObj = ( QCursor* ) new QCursor( *hbqt_par_QBitmap( 1 ), *hbqt_par_QBitmap( 2 ), HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1, HB_ISNUM( 4 ) ? hb_parni( 4 ) : -1 ) ; } else { - hb_retptr( ( QCursor* ) new QCursor() ); + pObj = ( QCursor* ) new QCursor() ; } -} -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QCURSOR_DESTROY ) -{ - delete hbqt_par_QCursor( 1 ); + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QCursor" ); + hb_retptrGC( p ); } - /* * const QBitmap * bitmap () const */ @@ -138,7 +134,7 @@ HB_FUNC( QT_QCURSOR_BITMAP ) */ HB_FUNC( QT_QCURSOR_HOTSPOT ) { - hb_retptr( new QPoint( hbqt_par_QCursor( 1 )->hotSpot() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QCursor( 1 )->hotSpot() ) ) ); } /* @@ -154,7 +150,7 @@ HB_FUNC( QT_QCURSOR_MASK ) */ HB_FUNC( QT_QCURSOR_PIXMAP ) { - hb_retptr( new QPixmap( hbqt_par_QCursor( 1 )->pixmap() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QCursor( 1 )->pixmap() ) ) ); } /* @@ -178,7 +174,7 @@ HB_FUNC( QT_QCURSOR_SHAPE ) */ HB_FUNC( QT_QCURSOR_POS ) { - hb_retptr( new QPoint( hbqt_par_QCursor( 1 )->pos() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QCursor( 1 )->pos() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QDateEdit.cpp b/harbour/contrib/hbqt/QDateEdit.cpp index 2c7f04c453..7165b659af 100644 --- a/harbour/contrib/hbqt/QDateEdit.cpp +++ b/harbour/contrib/hbqt/QDateEdit.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,20 +75,19 @@ * QDateEdit ( QWidget * parent = 0 ) * QDateEdit ( const QDate & date, QWidget * parent = 0 ) */ + HB_FUNC( QT_QDATEEDIT ) { - hb_retptr( ( QDateEdit* ) new QDateEdit( hbqt_par_QWidget( 1 ) ) ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QDateEdit > pObj = NULL; + + pObj = ( QDateEdit* ) new QDateEdit( hbqt_par_QWidget( 1 ) ) ; + + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QDATEEDIT_DESTROY ) -{ - -} - - /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/QDateTime.cpp b/harbour/contrib/hbqt/QDateTime.cpp index db40b8c915..9a915ff8c9 100644 --- a/harbour/contrib/hbqt/QDateTime.cpp +++ b/harbour/contrib/hbqt/QDateTime.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -77,25 +78,24 @@ * QDateTime ( const QDateTime & other ) * ~QDateTime () */ + HB_FUNC( QT_QDATETIME ) { - hb_retptr( ( QDateTime* ) new QDateTime() ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QDATETIME_DESTROY ) -{ - delete hbqt_par_QDateTime( 1 ); -} + pObj = ( QDateTime* ) new QDateTime() ; + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QDateTime" ); + hb_retptrGC( p ); +} /* * QDateTime addDays ( int ndays ) const */ HB_FUNC( QT_QDATETIME_ADDDAYS ) { - hb_retptr( new QDateTime( hbqt_par_QDateTime( 1 )->addDays( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTime( 1 )->addDays( hb_parni( 2 ) ) ) ) ); } /* @@ -103,7 +103,7 @@ HB_FUNC( QT_QDATETIME_ADDDAYS ) */ HB_FUNC( QT_QDATETIME_ADDMSECS ) { - hb_retptr( new QDateTime( hbqt_par_QDateTime( 1 )->addMSecs( hb_parnint( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTime( 1 )->addMSecs( hb_parnint( 2 ) ) ) ) ); } /* @@ -111,7 +111,7 @@ HB_FUNC( QT_QDATETIME_ADDMSECS ) */ HB_FUNC( QT_QDATETIME_ADDMONTHS ) { - hb_retptr( new QDateTime( hbqt_par_QDateTime( 1 )->addMonths( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTime( 1 )->addMonths( hb_parni( 2 ) ) ) ) ); } /* @@ -119,7 +119,7 @@ HB_FUNC( QT_QDATETIME_ADDMONTHS ) */ HB_FUNC( QT_QDATETIME_ADDSECS ) { - hb_retptr( new QDateTime( hbqt_par_QDateTime( 1 )->addSecs( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTime( 1 )->addSecs( hb_parni( 2 ) ) ) ) ); } /* @@ -127,7 +127,7 @@ HB_FUNC( QT_QDATETIME_ADDSECS ) */ HB_FUNC( QT_QDATETIME_ADDYEARS ) { - hb_retptr( new QDateTime( hbqt_par_QDateTime( 1 )->addYears( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTime( 1 )->addYears( hb_parni( 2 ) ) ) ) ); } /* @@ -135,7 +135,7 @@ HB_FUNC( QT_QDATETIME_ADDYEARS ) */ HB_FUNC( QT_QDATETIME_DATE ) { - hb_retptr( new QDate( hbqt_par_QDateTime( 1 )->date() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDate( hbqt_par_QDateTime( 1 )->date() ) ) ); } /* @@ -207,7 +207,7 @@ HB_FUNC( QT_QDATETIME_SETTIME_T ) */ HB_FUNC( QT_QDATETIME_TIME ) { - hb_retptr( new QTime( hbqt_par_QDateTime( 1 )->time() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTime( hbqt_par_QDateTime( 1 )->time() ) ) ); } /* @@ -223,7 +223,7 @@ HB_FUNC( QT_QDATETIME_TIMESPEC ) */ HB_FUNC( QT_QDATETIME_TOLOCALTIME ) { - hb_retptr( new QDateTime( hbqt_par_QDateTime( 1 )->toLocalTime() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTime( 1 )->toLocalTime() ) ) ); } /* @@ -247,7 +247,7 @@ HB_FUNC( QT_QDATETIME_TOSTRING_1 ) */ HB_FUNC( QT_QDATETIME_TOTIMESPEC ) { - hb_retptr( new QDateTime( hbqt_par_QDateTime( 1 )->toTimeSpec( ( Qt::TimeSpec ) hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTime( 1 )->toTimeSpec( ( Qt::TimeSpec ) hb_parni( 2 ) ) ) ) ); } /* @@ -263,7 +263,7 @@ HB_FUNC( QT_QDATETIME_TOTIME_T ) */ HB_FUNC( QT_QDATETIME_TOUTC ) { - hb_retptr( new QDateTime( hbqt_par_QDateTime( 1 )->toUTC() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTime( 1 )->toUTC() ) ) ); } /* @@ -271,7 +271,7 @@ HB_FUNC( QT_QDATETIME_TOUTC ) */ HB_FUNC( QT_QDATETIME_CURRENTDATETIME ) { - hb_retptr( new QDateTime( hbqt_par_QDateTime( 1 )->currentDateTime() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTime( 1 )->currentDateTime() ) ) ); } /* @@ -279,7 +279,7 @@ HB_FUNC( QT_QDATETIME_CURRENTDATETIME ) */ HB_FUNC( QT_QDATETIME_FROMSTRING ) { - hb_retptr( new QDateTime( hbqt_par_QDateTime( 1 )->fromString( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::DateFormat ) hb_parni( 3 ) : ( Qt::DateFormat ) Qt::TextDate ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTime( 1 )->fromString( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::DateFormat ) hb_parni( 3 ) : ( Qt::DateFormat ) Qt::TextDate ) ) ) ) ); } /* @@ -287,7 +287,7 @@ HB_FUNC( QT_QDATETIME_FROMSTRING ) */ HB_FUNC( QT_QDATETIME_FROMSTRING_1 ) { - hb_retptr( new QDateTime( hbqt_par_QDateTime( 1 )->fromString( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTime( 1 )->fromString( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ) ) ); } /* @@ -295,7 +295,7 @@ HB_FUNC( QT_QDATETIME_FROMSTRING_1 ) */ HB_FUNC( QT_QDATETIME_FROMTIME_T ) { - hb_retptr( new QDateTime( hbqt_par_QDateTime( 1 )->fromTime_t( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTime( 1 )->fromTime_t( hb_parni( 2 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/QDateTimeEdit.cpp b/harbour/contrib/hbqt/QDateTimeEdit.cpp index 89954ff02c..f1f2c64006 100644 --- a/harbour/contrib/hbqt/QDateTimeEdit.cpp +++ b/harbour/contrib/hbqt/QDateTimeEdit.cpp @@ -71,6 +71,7 @@ * flags Sections */ +#include #include @@ -81,19 +82,18 @@ * QDateTimeEdit ( const QDate & date, QWidget * parent = 0 ) * QDateTimeEdit ( const QTime & time, QWidget * parent = 0 ) */ + HB_FUNC( QT_QDATETIMEEDIT ) { - hb_retptr( ( QDateTimeEdit* ) new QDateTimeEdit( hbqt_par_QWidget( 1 ) ) ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QDateTimeEdit > pObj = NULL; + + pObj = ( QDateTimeEdit* ) new QDateTimeEdit( hbqt_par_QWidget( 1 ) ) ; + + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QDATETIMEEDIT_DESTROY ) -{ - -} - /* * bool calendarPopup () const */ @@ -179,7 +179,7 @@ HB_FUNC( QT_QDATETIMEEDIT_CURRENTSECTIONINDEX ) */ HB_FUNC( QT_QDATETIMEEDIT_DATE ) { - hb_retptr( new QDate( hbqt_par_QDateTimeEdit( 1 )->date() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDate( hbqt_par_QDateTimeEdit( 1 )->date() ) ) ); } /* @@ -187,7 +187,7 @@ HB_FUNC( QT_QDATETIMEEDIT_DATE ) */ HB_FUNC( QT_QDATETIMEEDIT_DATETIME ) { - hb_retptr( new QDateTime( hbqt_par_QDateTimeEdit( 1 )->dateTime() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTimeEdit( 1 )->dateTime() ) ) ); } /* @@ -211,7 +211,7 @@ HB_FUNC( QT_QDATETIMEEDIT_DISPLAYEDSECTIONS ) */ HB_FUNC( QT_QDATETIMEEDIT_MAXIMUMDATE ) { - hb_retptr( new QDate( hbqt_par_QDateTimeEdit( 1 )->maximumDate() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDate( hbqt_par_QDateTimeEdit( 1 )->maximumDate() ) ) ); } /* @@ -219,7 +219,7 @@ HB_FUNC( QT_QDATETIMEEDIT_MAXIMUMDATE ) */ HB_FUNC( QT_QDATETIMEEDIT_MAXIMUMDATETIME ) { - hb_retptr( new QDateTime( hbqt_par_QDateTimeEdit( 1 )->maximumDateTime() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTimeEdit( 1 )->maximumDateTime() ) ) ); } /* @@ -227,7 +227,7 @@ HB_FUNC( QT_QDATETIMEEDIT_MAXIMUMDATETIME ) */ HB_FUNC( QT_QDATETIMEEDIT_MAXIMUMTIME ) { - hb_retptr( new QTime( hbqt_par_QDateTimeEdit( 1 )->maximumTime() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTime( hbqt_par_QDateTimeEdit( 1 )->maximumTime() ) ) ); } /* @@ -235,7 +235,7 @@ HB_FUNC( QT_QDATETIMEEDIT_MAXIMUMTIME ) */ HB_FUNC( QT_QDATETIMEEDIT_MINIMUMDATE ) { - hb_retptr( new QDate( hbqt_par_QDateTimeEdit( 1 )->minimumDate() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDate( hbqt_par_QDateTimeEdit( 1 )->minimumDate() ) ) ); } /* @@ -243,7 +243,7 @@ HB_FUNC( QT_QDATETIMEEDIT_MINIMUMDATE ) */ HB_FUNC( QT_QDATETIMEEDIT_MINIMUMDATETIME ) { - hb_retptr( new QDateTime( hbqt_par_QDateTimeEdit( 1 )->minimumDateTime() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTimeEdit( 1 )->minimumDateTime() ) ) ); } /* @@ -251,7 +251,7 @@ HB_FUNC( QT_QDATETIMEEDIT_MINIMUMDATETIME ) */ HB_FUNC( QT_QDATETIMEEDIT_MINIMUMTIME ) { - hb_retptr( new QTime( hbqt_par_QDateTimeEdit( 1 )->minimumTime() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTime( hbqt_par_QDateTimeEdit( 1 )->minimumTime() ) ) ); } /* @@ -411,7 +411,7 @@ HB_FUNC( QT_QDATETIMEEDIT_SETTIMESPEC ) */ HB_FUNC( QT_QDATETIMEEDIT_TIME ) { - hb_retptr( new QTime( hbqt_par_QDateTimeEdit( 1 )->time() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTime( hbqt_par_QDateTimeEdit( 1 )->time() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QDesktopWidget.cpp b/harbour/contrib/hbqt/QDesktopWidget.cpp index d36d572773..fc0cf9cf17 100644 --- a/harbour/contrib/hbqt/QDesktopWidget.cpp +++ b/harbour/contrib/hbqt/QDesktopWidget.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,25 +75,24 @@ * QDesktopWidget () * ~QDesktopWidget () */ + HB_FUNC( QT_QDESKTOPWIDGET ) { - hb_retptr( new QDesktopWidget() ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QDesktopWidget > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QDESKTOPWIDGET_DESTROY ) -{ - delete hbqt_par_QDesktopWidget( 1 ); -} + pObj = new QDesktopWidget() ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * const QRect availableGeometry ( int screen = -1 ) const */ HB_FUNC( QT_QDESKTOPWIDGET_AVAILABLEGEOMETRY ) { - hb_retptr( new QRect( hbqt_par_QDesktopWidget( 1 )->availableGeometry( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : -1 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QDesktopWidget( 1 )->availableGeometry( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : -1 ) ) ) ) ); } /* @@ -100,7 +100,7 @@ HB_FUNC( QT_QDESKTOPWIDGET_AVAILABLEGEOMETRY ) */ HB_FUNC( QT_QDESKTOPWIDGET_AVAILABLEGEOMETRY_1 ) { - hb_retptr( new QRect( hbqt_par_QDesktopWidget( 1 )->availableGeometry( hbqt_par_QWidget( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QDesktopWidget( 1 )->availableGeometry( hbqt_par_QWidget( 2 ) ) ) ) ); } /* @@ -108,7 +108,7 @@ HB_FUNC( QT_QDESKTOPWIDGET_AVAILABLEGEOMETRY_1 ) */ HB_FUNC( QT_QDESKTOPWIDGET_AVAILABLEGEOMETRY_2 ) { - hb_retptr( new QRect( hbqt_par_QDesktopWidget( 1 )->availableGeometry( *hbqt_par_QPoint( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QDesktopWidget( 1 )->availableGeometry( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* @@ -148,7 +148,7 @@ HB_FUNC( QT_QDESKTOPWIDGET_SCREEN ) */ HB_FUNC( QT_QDESKTOPWIDGET_SCREENGEOMETRY ) { - hb_retptr( new QRect( hbqt_par_QDesktopWidget( 1 )->screenGeometry( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : -1 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QDesktopWidget( 1 )->screenGeometry( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : -1 ) ) ) ) ); } /* @@ -156,7 +156,7 @@ HB_FUNC( QT_QDESKTOPWIDGET_SCREENGEOMETRY ) */ HB_FUNC( QT_QDESKTOPWIDGET_SCREENGEOMETRY_1 ) { - hb_retptr( new QRect( hbqt_par_QDesktopWidget( 1 )->screenGeometry( hbqt_par_QWidget( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QDesktopWidget( 1 )->screenGeometry( hbqt_par_QWidget( 2 ) ) ) ) ); } /* @@ -164,7 +164,7 @@ HB_FUNC( QT_QDESKTOPWIDGET_SCREENGEOMETRY_1 ) */ HB_FUNC( QT_QDESKTOPWIDGET_SCREENGEOMETRY_2 ) { - hb_retptr( new QRect( hbqt_par_QDesktopWidget( 1 )->screenGeometry( *hbqt_par_QPoint( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QDesktopWidget( 1 )->screenGeometry( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QDial.cpp b/harbour/contrib/hbqt/QDial.cpp index c0c3076a32..1cbb18663c 100644 --- a/harbour/contrib/hbqt/QDial.cpp +++ b/harbour/contrib/hbqt/QDial.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,19 +75,18 @@ * QDial ( QWidget * parent = 0 ) * ~QDial () */ + HB_FUNC( QT_QDIAL ) { - hb_retptr( ( QDial* ) new QDial( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QDial > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QDIAL_DESTROY ) -{ - delete hbqt_par_QDial( 1 ); -} + pObj = ( QDial* ) new QDial( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * int notchSize () const */ diff --git a/harbour/contrib/hbqt/QDialog.cpp b/harbour/contrib/hbqt/QDialog.cpp index 53a6b0ea2d..4b560beade 100644 --- a/harbour/contrib/hbqt/QDialog.cpp +++ b/harbour/contrib/hbqt/QDialog.cpp @@ -70,6 +70,7 @@ * enum DialogCode { Accepted, Rejected } */ +#include #include @@ -78,19 +79,18 @@ * QDialog ( QWidget * parent = 0, Qt::WindowFlags f = 0 ) * ~QDialog () */ + HB_FUNC( QT_QDIALOG ) { - hb_retptr( new QDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QDialog > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QDIALOG_DESTROY ) -{ - delete hbqt_par_QDialog( 1 ); -} + pObj = new QDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * bool isSizeGripEnabled () const */ diff --git a/harbour/contrib/hbqt/QDir.cpp b/harbour/contrib/hbqt/QDir.cpp index 414f7c0c1b..476f2553f6 100644 --- a/harbour/contrib/hbqt/QDir.cpp +++ b/harbour/contrib/hbqt/QDir.cpp @@ -73,6 +73,7 @@ * flags SortFlags */ +#include #include @@ -83,19 +84,18 @@ * QDir ( const QString & path, const QString & nameFilter, SortFlags sort = SortFlags( Name | IgnoreCase ), Filters filters = AllEntries ) * ~QDir () */ + HB_FUNC( QT_QDIR ) { - hb_retptr( new QDir( hbqt_par_QString( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QDIR_DESTROY ) -{ - delete hbqt_par_QDir( 1 ); -} + pObj = new QDir( hbqt_par_QString( 1 ) ) ; + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QDir" ); + hb_retptrGC( p ); +} /* * QString absoluteFilePath ( const QString & fileName ) const */ @@ -157,7 +157,7 @@ HB_FUNC( QT_QDIR_DIRNAME ) */ HB_FUNC( QT_QDIR_ENTRYINFOLIST ) { - hb_retptr( new QFileInfoList( hbqt_par_QDir( 1 )->entryInfoList( *hbqt_par_QStringList( 2 ), ( HB_ISNUM( 3 ) ? ( QDir::Filters ) hb_parni( 3 ) : ( QDir::Filters ) QDir::NoFilter ), ( HB_ISNUM( 4 ) ? ( QDir::SortFlags ) hb_parni( 4 ) : ( QDir::SortFlags ) QDir::NoSort ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFileInfoList( hbqt_par_QDir( 1 )->entryInfoList( *hbqt_par_QStringList( 2 ), ( HB_ISNUM( 3 ) ? ( QDir::Filters ) hb_parni( 3 ) : ( QDir::Filters ) QDir::NoFilter ), ( HB_ISNUM( 4 ) ? ( QDir::SortFlags ) hb_parni( 4 ) : ( QDir::SortFlags ) QDir::NoSort ) ) ) ) ); } /* @@ -165,7 +165,7 @@ HB_FUNC( QT_QDIR_ENTRYINFOLIST ) */ HB_FUNC( QT_QDIR_ENTRYINFOLIST_1 ) { - hb_retptr( new QFileInfoList( hbqt_par_QDir( 1 )->entryInfoList( ( HB_ISNUM( 2 ) ? ( QDir::Filters ) hb_parni( 2 ) : ( QDir::Filters ) QDir::NoFilter ), ( HB_ISNUM( 3 ) ? ( QDir::SortFlags ) hb_parni( 3 ) : ( QDir::SortFlags ) QDir::NoSort ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFileInfoList( hbqt_par_QDir( 1 )->entryInfoList( ( HB_ISNUM( 2 ) ? ( QDir::Filters ) hb_parni( 2 ) : ( QDir::Filters ) QDir::NoFilter ), ( HB_ISNUM( 3 ) ? ( QDir::SortFlags ) hb_parni( 3 ) : ( QDir::SortFlags ) QDir::NoSort ) ) ) ) ); } /* @@ -173,7 +173,7 @@ HB_FUNC( QT_QDIR_ENTRYINFOLIST_1 ) */ HB_FUNC( QT_QDIR_ENTRYLIST ) { - hb_retptr( new QStringList( hbqt_par_QDir( 1 )->entryList( *hbqt_par_QStringList( 2 ), ( HB_ISNUM( 3 ) ? ( QDir::Filters ) hb_parni( 3 ) : ( QDir::Filters ) QDir::NoFilter ), ( HB_ISNUM( 4 ) ? ( QDir::SortFlags ) hb_parni( 4 ) : ( QDir::SortFlags ) QDir::NoSort ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QDir( 1 )->entryList( *hbqt_par_QStringList( 2 ), ( HB_ISNUM( 3 ) ? ( QDir::Filters ) hb_parni( 3 ) : ( QDir::Filters ) QDir::NoFilter ), ( HB_ISNUM( 4 ) ? ( QDir::SortFlags ) hb_parni( 4 ) : ( QDir::SortFlags ) QDir::NoSort ) ) ) ) ); } /* @@ -181,7 +181,7 @@ HB_FUNC( QT_QDIR_ENTRYLIST ) */ HB_FUNC( QT_QDIR_ENTRYLIST_1 ) { - hb_retptr( new QStringList( hbqt_par_QDir( 1 )->entryList( ( HB_ISNUM( 2 ) ? ( QDir::Filters ) hb_parni( 2 ) : ( QDir::Filters ) QDir::NoFilter ), ( HB_ISNUM( 3 ) ? ( QDir::SortFlags ) hb_parni( 3 ) : ( QDir::SortFlags ) QDir::NoSort ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QDir( 1 )->entryList( ( HB_ISNUM( 2 ) ? ( QDir::Filters ) hb_parni( 2 ) : ( QDir::Filters ) QDir::NoFilter ), ( HB_ISNUM( 3 ) ? ( QDir::SortFlags ) hb_parni( 3 ) : ( QDir::SortFlags ) QDir::NoSort ) ) ) ) ); } /* @@ -277,7 +277,7 @@ HB_FUNC( QT_QDIR_MKPATH ) */ HB_FUNC( QT_QDIR_NAMEFILTERS ) { - hb_retptr( new QStringList( hbqt_par_QDir( 1 )->nameFilters() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QDir( 1 )->nameFilters() ) ) ); } /* @@ -397,7 +397,7 @@ HB_FUNC( QT_QDIR_CLEANPATH ) */ HB_FUNC( QT_QDIR_CURRENT ) { - hb_retptr( new QDir( hbqt_par_QDir( 1 )->current() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDir( hbqt_par_QDir( 1 )->current() ) ) ); } /* @@ -413,7 +413,7 @@ HB_FUNC( QT_QDIR_CURRENTPATH ) */ HB_FUNC( QT_QDIR_DRIVES ) { - hb_retptr( new QFileInfoList( hbqt_par_QDir( 1 )->drives() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFileInfoList( hbqt_par_QDir( 1 )->drives() ) ) ); } /* @@ -429,7 +429,7 @@ HB_FUNC( QT_QDIR_FROMNATIVESEPARATORS ) */ HB_FUNC( QT_QDIR_HOME ) { - hb_retptr( new QDir( hbqt_par_QDir( 1 )->home() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDir( hbqt_par_QDir( 1 )->home() ) ) ); } /* @@ -477,7 +477,7 @@ HB_FUNC( QT_QDIR_MATCH_1 ) */ HB_FUNC( QT_QDIR_ROOT ) { - hb_retptr( new QDir( hbqt_par_QDir( 1 )->root() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDir( hbqt_par_QDir( 1 )->root() ) ) ); } /* @@ -493,7 +493,7 @@ HB_FUNC( QT_QDIR_ROOTPATH ) */ HB_FUNC( QT_QDIR_SEARCHPATHS ) { - hb_retptr( new QStringList( hbqt_par_QDir( 1 )->searchPaths( hbqt_par_QString( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QDir( 1 )->searchPaths( hbqt_par_QString( 2 ) ) ) ) ); } /* @@ -517,7 +517,7 @@ HB_FUNC( QT_QDIR_SETSEARCHPATHS ) */ HB_FUNC( QT_QDIR_TEMP ) { - hb_retptr( new QDir( hbqt_par_QDir( 1 )->temp() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDir( hbqt_par_QDir( 1 )->temp() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QDirModel.cpp b/harbour/contrib/hbqt/QDirModel.cpp index d3e89988c2..e53fbd302a 100644 --- a/harbour/contrib/hbqt/QDirModel.cpp +++ b/harbour/contrib/hbqt/QDirModel.cpp @@ -70,6 +70,7 @@ * enum Roles { FileIconRole, FilePathRole, FileNameRole } */ +#include #include @@ -79,19 +80,18 @@ * QDirModel ( QObject * parent = 0 ) * ~QDirModel () */ + HB_FUNC( QT_QDIRMODEL ) { - hb_retptr( ( QDirModel* ) new QDirModel( hbqt_par_QObject( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QDirModel > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QDIRMODEL_DESTROY ) -{ - delete hbqt_par_QDirModel( 1 ); -} + pObj = ( QDirModel* ) new QDirModel( hbqt_par_QObject( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * virtual int columnCount ( const QModelIndex & parent = QModelIndex() ) const */ @@ -105,7 +105,7 @@ HB_FUNC( QT_QDIRMODEL_COLUMNCOUNT ) */ HB_FUNC( QT_QDIRMODEL_DATA ) { - hb_retptr( new QVariant( hbqt_par_QDirModel( 1 )->data( *hbqt_par_QModelIndex( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::DisplayRole ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QDirModel( 1 )->data( *hbqt_par_QModelIndex( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::DisplayRole ) ) ) ) ); } /* @@ -121,7 +121,7 @@ HB_FUNC( QT_QDIRMODEL_DROPMIMEDATA ) */ HB_FUNC( QT_QDIRMODEL_FILEICON ) { - hb_retptr( new QIcon( hbqt_par_QDirModel( 1 )->fileIcon( *hbqt_par_QModelIndex( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QDirModel( 1 )->fileIcon( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* @@ -129,7 +129,7 @@ HB_FUNC( QT_QDIRMODEL_FILEICON ) */ HB_FUNC( QT_QDIRMODEL_FILEINFO ) { - hb_retptr( new QFileInfo( hbqt_par_QDirModel( 1 )->fileInfo( *hbqt_par_QModelIndex( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFileInfo( hbqt_par_QDirModel( 1 )->fileInfo( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* @@ -177,7 +177,7 @@ HB_FUNC( QT_QDIRMODEL_HASCHILDREN ) */ HB_FUNC( QT_QDIRMODEL_HEADERDATA ) { - hb_retptr( new QVariant( hbqt_par_QDirModel( 1 )->headerData( hb_parni( 2 ), ( Qt::Orientation ) hb_parni( 3 ), ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : Qt::DisplayRole ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QDirModel( 1 )->headerData( hb_parni( 2 ), ( Qt::Orientation ) hb_parni( 3 ), ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : Qt::DisplayRole ) ) ) ) ); } /* @@ -193,7 +193,7 @@ HB_FUNC( QT_QDIRMODEL_ICONPROVIDER ) */ HB_FUNC( QT_QDIRMODEL_INDEX ) { - hb_retptr( new QModelIndex( hbqt_par_QDirModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QDirModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ) ) ); } /* @@ -201,7 +201,7 @@ HB_FUNC( QT_QDIRMODEL_INDEX ) */ HB_FUNC( QT_QDIRMODEL_INDEX_1 ) { - hb_retptr( new QModelIndex( hbqt_par_QDirModel( 1 )->index( hbqt_par_QString( 2 ), hb_parni( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QDirModel( 1 )->index( hbqt_par_QString( 2 ), hb_parni( 3 ) ) ) ) ); } /* @@ -241,7 +241,7 @@ HB_FUNC( QT_QDIRMODEL_MIMEDATA ) */ HB_FUNC( QT_QDIRMODEL_MIMETYPES ) { - hb_retptr( new QStringList( hbqt_par_QDirModel( 1 )->mimeTypes() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QDirModel( 1 )->mimeTypes() ) ) ); } /* @@ -249,7 +249,7 @@ HB_FUNC( QT_QDIRMODEL_MIMETYPES ) */ HB_FUNC( QT_QDIRMODEL_MKDIR ) { - hb_retptr( new QModelIndex( hbqt_par_QDirModel( 1 )->mkdir( *hbqt_par_QModelIndex( 2 ), hbqt_par_QString( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QDirModel( 1 )->mkdir( *hbqt_par_QModelIndex( 2 ), hbqt_par_QString( 3 ) ) ) ) ); } /* @@ -257,7 +257,7 @@ HB_FUNC( QT_QDIRMODEL_MKDIR ) */ HB_FUNC( QT_QDIRMODEL_NAMEFILTERS ) { - hb_retptr( new QStringList( hbqt_par_QDirModel( 1 )->nameFilters() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QDirModel( 1 )->nameFilters() ) ) ); } /* @@ -265,7 +265,7 @@ HB_FUNC( QT_QDIRMODEL_NAMEFILTERS ) */ HB_FUNC( QT_QDIRMODEL_PARENT ) { - hb_retptr( new QModelIndex( hbqt_par_QDirModel( 1 )->parent( *hbqt_par_QModelIndex( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QDirModel( 1 )->parent( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QDockWidget.cpp b/harbour/contrib/hbqt/QDockWidget.cpp index 5fd4de159b..90f51ae42f 100644 --- a/harbour/contrib/hbqt/QDockWidget.cpp +++ b/harbour/contrib/hbqt/QDockWidget.cpp @@ -71,6 +71,7 @@ * flags DockWidgetFeatures */ +#include #include @@ -80,19 +81,18 @@ * QDockWidget ( QWidget * parent = 0, Qt::WindowFlags flags = 0 ) * ~QDockWidget () */ + HB_FUNC( QT_QDOCKWIDGET ) { - hb_retptr( new QDockWidget( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QDockWidget > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QDOCKWIDGET_DESTROY ) -{ - delete hbqt_par_QDockWidget( 1 ); -} + pObj = new QDockWidget( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * Qt::DockWidgetAreas allowedAreas () const */ diff --git a/harbour/contrib/hbqt/QDoubleSpinBox.cpp b/harbour/contrib/hbqt/QDoubleSpinBox.cpp index c7b1c40b3d..6e5f1b3bb0 100644 --- a/harbour/contrib/hbqt/QDoubleSpinBox.cpp +++ b/harbour/contrib/hbqt/QDoubleSpinBox.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -73,19 +74,18 @@ /* * QDoubleSpinBox ( QWidget * parent = 0 ) */ + HB_FUNC( QT_QDOUBLESPINBOX ) { - hb_retptr( ( QDoubleSpinBox* ) new QDoubleSpinBox( hbqt_par_QWidget( 1 ) ) ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QDoubleSpinBox > pObj = NULL; + + pObj = ( QDoubleSpinBox* ) new QDoubleSpinBox( hbqt_par_QWidget( 1 ) ) ; + + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QDOUBLESPINBOX_DESTROY ) -{ - -} - /* * QString cleanText () const */ diff --git a/harbour/contrib/hbqt/QDragEnterEvent.cpp b/harbour/contrib/hbqt/QDragEnterEvent.cpp index aa1b529ccd..288efc33c5 100644 --- a/harbour/contrib/hbqt/QDragEnterEvent.cpp +++ b/harbour/contrib/hbqt/QDragEnterEvent.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -73,20 +74,11 @@ /* * QDragEnterEvent ( const QPoint & point, Qt::DropActions actions, const QMimeData * data, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers ) */ + HB_FUNC( QT_QDRAGENTEREVENT ) { - // hb_retptr( ( * ) new () ); } -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QDRAGENTEREVENT_DESTROY ) -{ - -} - - /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/QDragLeaveEvent.cpp b/harbour/contrib/hbqt/QDragLeaveEvent.cpp index 8e61d12608..d2758819aa 100644 --- a/harbour/contrib/hbqt/QDragLeaveEvent.cpp +++ b/harbour/contrib/hbqt/QDragLeaveEvent.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -73,20 +74,11 @@ /* * QDragLeaveEvent () */ + HB_FUNC( QT_QDRAGLEAVEEVENT ) { - // hb_retptr( ( * ) new () ); } -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QDRAGLEAVEEVENT_DESTROY ) -{ - -} - - /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/QDragMoveEvent.cpp b/harbour/contrib/hbqt/QDragMoveEvent.cpp index 7c677e66a2..c2682e8615 100644 --- a/harbour/contrib/hbqt/QDragMoveEvent.cpp +++ b/harbour/contrib/hbqt/QDragMoveEvent.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,19 +75,10 @@ * QDragMoveEvent ( const QPoint & pos, Qt::DropActions actions, const QMimeData * data, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Type type = DragMove ) * ~QDragMoveEvent () */ + HB_FUNC( QT_QDRAGMOVEEVENT ) { - // hb_retptr( ( * ) new () ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QDRAGMOVEEVENT_DESTROY ) -{ - delete hbqt_par_QDragMoveEvent( 1 ); -} - /* * void accept ( const QRect & rectangle ) */ @@ -108,7 +100,7 @@ HB_FUNC( QT_QDRAGMOVEEVENT_ACCEPT_1 ) */ HB_FUNC( QT_QDRAGMOVEEVENT_ANSWERRECT ) { - hb_retptr( new QRect( hbqt_par_QDragMoveEvent( 1 )->answerRect() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QDragMoveEvent( 1 )->answerRect() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QDropEvent.cpp b/harbour/contrib/hbqt/QDropEvent.cpp index 7dd6e052c9..0fc011a78d 100644 --- a/harbour/contrib/hbqt/QDropEvent.cpp +++ b/harbour/contrib/hbqt/QDropEvent.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -73,19 +74,10 @@ /* * QDropEvent ( const QPoint & pos, Qt::DropActions actions, const QMimeData * data, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Type type = Drop ) */ + HB_FUNC( QT_QDROPEVENT ) { - // hb_retptr( ( QDropEvent* ) new QDropEvent() ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QDROPEVENT_DESTROY ) -{ - -} - /* * void acceptProposedAction () */ @@ -131,7 +123,7 @@ HB_FUNC( QT_QDROPEVENT_MOUSEBUTTONS ) */ HB_FUNC( QT_QDROPEVENT_POS ) { - hb_retptr( new QPoint( hbqt_par_QDropEvent( 1 )->pos() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QDropEvent( 1 )->pos() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QErrorMessage.cpp b/harbour/contrib/hbqt/QErrorMessage.cpp index 64a9a9eb80..f77ac48c9b 100644 --- a/harbour/contrib/hbqt/QErrorMessage.cpp +++ b/harbour/contrib/hbqt/QErrorMessage.cpp @@ -75,6 +75,7 @@ * oid showMessage ( const QString & message ) */ +#include #include @@ -83,19 +84,18 @@ * QErrorMessage ( QWidget * parent = 0 ) * ~QErrorMessage () */ + HB_FUNC( QT_QERRORMESSAGE ) { - hb_retptr( ( QErrorMessage* ) new QErrorMessage( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QErrorMessage > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QERRORMESSAGE_DESTROY ) -{ - delete hbqt_par_QErrorMessage( 1 ); -} + pObj = ( QErrorMessage* ) new QErrorMessage( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * void showMessage ( const QString & message, const QString & type ) */ diff --git a/harbour/contrib/hbqt/QEvent.cpp b/harbour/contrib/hbqt/QEvent.cpp index 35b9b59fb5..c6b0fbca1c 100644 --- a/harbour/contrib/hbqt/QEvent.cpp +++ b/harbour/contrib/hbqt/QEvent.cpp @@ -70,6 +70,7 @@ * enum Type { None, AccessibilityDescription, AccessibilityHelp, AccessibilityPrepare, ..., MaxUser } */ +#include #include @@ -78,19 +79,15 @@ * QEvent ( Type type ) * virtual ~QEvent () */ + HB_FUNC( QT_QEVENT ) { - hb_retptr( ( QEvent* ) new QEvent( ( QEvent::Type ) hb_parni( 1 ) ) ); -} + void * pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QEVENT_DESTROY ) -{ - delete hbqt_par_QEvent( 1 ); -} + pObj = ( QEvent* ) new QEvent( ( QEvent::Type ) hb_parni( 1 ) ) ; + hb_retptr( pObj ); +} /* * void accept () */ diff --git a/harbour/contrib/hbqt/QEventLoop.cpp b/harbour/contrib/hbqt/QEventLoop.cpp index 086d596dc8..7b6ab62b96 100644 --- a/harbour/contrib/hbqt/QEventLoop.cpp +++ b/harbour/contrib/hbqt/QEventLoop.cpp @@ -71,6 +71,7 @@ * flags ProcessEventsFlags */ +#include #include #include @@ -79,19 +80,18 @@ * QEventLoop ( QObject * parent = 0 ) * ~QEventLoop () */ + HB_FUNC( QT_QEVENTLOOP ) { - hb_retptr( ( QEvent* ) new QEventLoop( hbqt_par_QObject( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QEventLoop > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QEVENTLOOP_DESTROY ) -{ - delete hbqt_par_QEventLoop( 1 ); -} + pObj = new QEventLoop( hbqt_par_QObject( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * int exec ( ProcessEventsFlags flags = AllEvents ) */ diff --git a/harbour/contrib/hbqt/QFileDialog.cpp b/harbour/contrib/hbqt/QFileDialog.cpp index 76fbafe5b7..83f4e772f7 100644 --- a/harbour/contrib/hbqt/QFileDialog.cpp +++ b/harbour/contrib/hbqt/QFileDialog.cpp @@ -92,6 +92,7 @@ * //QString getSaveFileName ( QWidget * parent = 0, const QString & caption = QString(), const QString & dir = QString(), const QString & filter = QString(), QString * selectedFilter = 0, Options options = 0 ) */ +#include #include @@ -101,19 +102,29 @@ * QFileDialog ( QWidget * parent = 0, const QString & caption = QString(), const QString & directory = QString(), const QString & filter = QString() ) * ~QFileDialog () */ + HB_FUNC( QT_QFILEDIALOG ) { - hb_retptr( ( QFileDialog* ) new QFileDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QFileDialog > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QFILEDIALOG_DESTROY ) -{ - delete hbqt_par_QFileDialog( 1 ); -} + if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) + { + pObj = new QFileDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) 0 ) ; + } + else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) ) + { + pObj = new QFileDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ; + } + else + { + pObj = new QFileDialog() ; + } + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * AcceptMode acceptMode () const */ @@ -143,7 +154,7 @@ HB_FUNC( QT_QFILEDIALOG_DEFAULTSUFFIX ) */ HB_FUNC( QT_QFILEDIALOG_DIRECTORY ) { - hb_retptr( new QDir( hbqt_par_QFileDialog( 1 )->directory() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDir( hbqt_par_QFileDialog( 1 )->directory() ) ) ); } /* @@ -167,7 +178,7 @@ HB_FUNC( QT_QFILEDIALOG_FILTER ) */ HB_FUNC( QT_QFILEDIALOG_HISTORY ) { - hb_retptr( new QStringList( hbqt_par_QFileDialog( 1 )->history() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QFileDialog( 1 )->history() ) ) ); } /* @@ -215,7 +226,7 @@ HB_FUNC( QT_QFILEDIALOG_LABELTEXT ) */ HB_FUNC( QT_QFILEDIALOG_NAMEFILTERS ) { - hb_retptr( new QStringList( hbqt_par_QFileDialog( 1 )->nameFilters() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QFileDialog( 1 )->nameFilters() ) ) ); } /* @@ -255,7 +266,7 @@ HB_FUNC( QT_QFILEDIALOG_RESTORESTATE ) */ HB_FUNC( QT_QFILEDIALOG_SAVESTATE ) { - hb_retptr( new QByteArray( hbqt_par_QFileDialog( 1 )->saveState() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QFileDialog( 1 )->saveState() ) ) ); } /* @@ -279,7 +290,7 @@ HB_FUNC( QT_QFILEDIALOG_SELECTNAMEFILTER ) */ HB_FUNC( QT_QFILEDIALOG_SELECTEDFILES ) { - hb_retptr( new QStringList( hbqt_par_QFileDialog( 1 )->selectedFiles() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QFileDialog( 1 )->selectedFiles() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QFileSystemModel.cpp b/harbour/contrib/hbqt/QFileSystemModel.cpp index b063fd35fd..54f63556e1 100644 --- a/harbour/contrib/hbqt/QFileSystemModel.cpp +++ b/harbour/contrib/hbqt/QFileSystemModel.cpp @@ -70,6 +70,7 @@ * enum Roles { FileIconRole, FilePathRole, FileNameRole, FilePermissions } */ +#include #include #include @@ -78,19 +79,18 @@ * QFileSystemModel ( QObject * parent = 0 ) * ~QFileSystemModel () */ + HB_FUNC( QT_QFILESYSTEMMODEL ) { - hb_retptr( ( QFileSystemModel * ) new QFileSystemModel() ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QFileSystemModel > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QFILESYSTEMMODEL_DESTROY ) -{ - delete hbqt_par_QFileSystemModel( 1 ); -} + pObj = ( QFileSystemModel * ) new QFileSystemModel() ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * virtual bool dropMimeData ( const QMimeData * data, Qt::DropAction action, int row, int column, const QModelIndex & parent ) */ @@ -104,7 +104,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_DROPMIMEDATA ) */ HB_FUNC( QT_QFILESYSTEMMODEL_FILEICON ) { - hb_retptr( new QIcon( hbqt_par_QFileSystemModel( 1 )->fileIcon( *hbqt_par_QModelIndex( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QFileSystemModel( 1 )->fileIcon( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* @@ -112,7 +112,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_FILEICON ) */ HB_FUNC( QT_QFILESYSTEMMODEL_FILEINFO ) { - hb_retptr( new QFileInfo( hbqt_par_QFileSystemModel( 1 )->fileInfo( *hbqt_par_QModelIndex( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFileInfo( hbqt_par_QFileSystemModel( 1 )->fileInfo( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* @@ -152,7 +152,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_ICONPROVIDER ) */ HB_FUNC( QT_QFILESYSTEMMODEL_INDEX ) { - hb_retptr( new QModelIndex( hbqt_par_QFileSystemModel( 1 )->index( hbqt_par_QString( 2 ), hb_parni( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QFileSystemModel( 1 )->index( hbqt_par_QString( 2 ), hb_parni( 3 ) ) ) ) ); } /* @@ -176,7 +176,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_ISREADONLY ) */ HB_FUNC( QT_QFILESYSTEMMODEL_LASTMODIFIED ) { - hb_retptr( new QDateTime( hbqt_par_QFileSystemModel( 1 )->lastModified( *hbqt_par_QModelIndex( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QFileSystemModel( 1 )->lastModified( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* @@ -192,7 +192,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_MIMEDATA ) */ HB_FUNC( QT_QFILESYSTEMMODEL_MIMETYPES ) { - hb_retptr( new QStringList( hbqt_par_QFileSystemModel( 1 )->mimeTypes() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QFileSystemModel( 1 )->mimeTypes() ) ) ); } /* @@ -200,7 +200,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_MIMETYPES ) */ HB_FUNC( QT_QFILESYSTEMMODEL_MKDIR ) { - hb_retptr( new QModelIndex( hbqt_par_QFileSystemModel( 1 )->mkdir( *hbqt_par_QModelIndex( 2 ), hbqt_par_QString( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QFileSystemModel( 1 )->mkdir( *hbqt_par_QModelIndex( 2 ), hbqt_par_QString( 3 ) ) ) ) ); } /* @@ -208,7 +208,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_MKDIR ) */ HB_FUNC( QT_QFILESYSTEMMODEL_MYCOMPUTER ) { - hb_retptr( new QVariant( hbqt_par_QFileSystemModel( 1 )->myComputer( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : Qt::DisplayRole ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QFileSystemModel( 1 )->myComputer( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : Qt::DisplayRole ) ) ) ) ); } /* @@ -224,7 +224,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_NAMEFILTERDISABLES ) */ HB_FUNC( QT_QFILESYSTEMMODEL_NAMEFILTERS ) { - hb_retptr( new QStringList( hbqt_par_QFileSystemModel( 1 )->nameFilters() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QFileSystemModel( 1 )->nameFilters() ) ) ); } /* @@ -264,7 +264,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_RMDIR ) */ HB_FUNC( QT_QFILESYSTEMMODEL_ROOTDIRECTORY ) { - hb_retptr( new QDir( hbqt_par_QFileSystemModel( 1 )->rootDirectory() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDir( hbqt_par_QFileSystemModel( 1 )->rootDirectory() ) ) ); } /* @@ -328,7 +328,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_SETRESOLVESYMLINKS ) */ HB_FUNC( QT_QFILESYSTEMMODEL_SETROOTPATH ) { - hb_retptr( new QModelIndex( hbqt_par_QFileSystemModel( 1 )->setRootPath( hbqt_par_QString( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QFileSystemModel( 1 )->setRootPath( hbqt_par_QString( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QFocusEvent.cpp b/harbour/contrib/hbqt/QFocusEvent.cpp index 536489143e..a1b3fcb958 100644 --- a/harbour/contrib/hbqt/QFocusEvent.cpp +++ b/harbour/contrib/hbqt/QFocusEvent.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -73,19 +74,10 @@ /* * QFocusEvent ( Type type, Qt::FocusReason reason = Qt::OtherFocusReason ) */ + HB_FUNC( QT_QFOCUSEVENT ) { - // hb_retptr( ( QFocusEvent* ) new QFocusEvent() ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QFOCUSEVENT_DESTROY ) -{ - -} - /* * bool gotFocus () const */ diff --git a/harbour/contrib/hbqt/QFocusFrame.cpp b/harbour/contrib/hbqt/QFocusFrame.cpp index 641d0385d9..3cb42b684f 100644 --- a/harbour/contrib/hbqt/QFocusFrame.cpp +++ b/harbour/contrib/hbqt/QFocusFrame.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,19 +75,18 @@ * QFocusFrame ( QWidget * parent = 0 ) * ~QFocusFrame () */ + HB_FUNC( QT_QFOCUSFRAME ) { - hb_retptr( ( QFocusFrame* ) new QFocusFrame( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QFocusFrame > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QFOCUSFRAME_DESTROY ) -{ - delete hbqt_par_QFocusFrame( 1 ); -} + pObj = ( QFocusFrame* ) new QFocusFrame( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * void setWidget ( QWidget * widget ) */ diff --git a/harbour/contrib/hbqt/QFont.cpp b/harbour/contrib/hbqt/QFont.cpp index 3fe18a44e4..cf0da9bb37 100644 --- a/harbour/contrib/hbqt/QFont.cpp +++ b/harbour/contrib/hbqt/QFont.cpp @@ -76,6 +76,7 @@ * enum Weight { Light, Normal, DemiBold, Bold, Black } */ +#include #include #include @@ -87,46 +88,45 @@ * QFont ( const QFont & font ) * ~QFont () */ + HB_FUNC( QT_QFONT ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + if( hb_pcount() == 1 && HB_ISCHAR( 1 ) ) { - hb_retptr( ( QFont* ) new QFont( hbqt_par_QString( 1 ), -1, -1, false ) ); + pObj = ( QFont* ) new QFont( hbqt_par_QString( 1 ), -1, -1, false ) ; } else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( ( QFont* ) new QFont( hbqt_par_QString( 1 ), hb_parni( 2 ), -1, false ) ); + pObj = ( QFont* ) new QFont( hbqt_par_QString( 1 ), hb_parni( 2 ), -1, false ) ; } else if( hb_pcount() == 3 && HB_ISCHAR( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) ) { - hb_retptr( ( QFont* ) new QFont( hbqt_par_QString( 1 ), hb_parni( 2 ), hb_parni( 3 ), false ) ); + pObj = ( QFont* ) new QFont( hbqt_par_QString( 1 ), hb_parni( 2 ), hb_parni( 3 ), false ) ; } else if( hb_pcount() == 4 && HB_ISCHAR( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISLOG( 4 ) ) { - hb_retptr( ( QFont* ) new QFont( hbqt_par_QString( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parl( 4 ) ) ); + pObj = ( QFont* ) new QFont( hbqt_par_QString( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parl( 4 ) ) ; } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QFont* ) new QFont( *hbqt_par_QFont( 1 ) ) ); + pObj = ( QFont* ) new QFont( *hbqt_par_QFont( 1 ) ) ; } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( ( QFont* ) new QFont( *hbqt_par_QFont( 1 ), hbqt_par_QPaintDevice( 2 ) ) ); + pObj = ( QFont* ) new QFont( *hbqt_par_QFont( 1 ), hbqt_par_QPaintDevice( 2 ) ) ; } else { - hb_retptr( ( QFont* ) new QFont() ); + pObj = ( QFont* ) new QFont() ; } -} -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QFONT_DESTROY ) -{ - delete hbqt_par_QFont( 1 ); + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QFont" ); + hb_retptrGC( p ); } - /* * bool bold () const */ @@ -580,7 +580,7 @@ HB_FUNC( QT_QFONT_SUBSTITUTE ) */ HB_FUNC( QT_QFONT_SUBSTITUTES ) { - hb_retptr( new QStringList( hbqt_par_QFont( 1 )->substitutes( hbqt_par_QString( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QFont( 1 )->substitutes( hbqt_par_QString( 2 ) ) ) ) ); } /* @@ -588,7 +588,7 @@ HB_FUNC( QT_QFONT_SUBSTITUTES ) */ HB_FUNC( QT_QFONT_SUBSTITUTIONS ) { - hb_retptr( new QStringList( hbqt_par_QFont( 1 )->substitutions() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QFont( 1 )->substitutions() ) ) ); } diff --git a/harbour/contrib/hbqt/QFontComboBox.cpp b/harbour/contrib/hbqt/QFontComboBox.cpp index 95eec9bca8..867ec177c5 100644 --- a/harbour/contrib/hbqt/QFontComboBox.cpp +++ b/harbour/contrib/hbqt/QFontComboBox.cpp @@ -71,6 +71,7 @@ * flags FontFilters */ +#include #include @@ -79,25 +80,24 @@ * QFontComboBox ( QWidget * parent = 0 ) * ~QFontComboBox () */ + HB_FUNC( QT_QFONTCOMBOBOX ) { - hb_retptr( ( QFontComboBox * ) new QFontComboBox( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QFontComboBox > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QFONTCOMBOBOX_DESTROY ) -{ - delete hbqt_par_QFontComboBox( 1 ); -} + pObj = ( QFontComboBox * ) new QFontComboBox( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * QFont currentFont () const */ HB_FUNC( QT_QFONTCOMBOBOX_CURRENTFONT ) { - hb_retptr( new QFont( hbqt_par_QFontComboBox( 1 )->currentFont() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QFontComboBox( 1 )->currentFont() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QFontDatabase.cpp b/harbour/contrib/hbqt/QFontDatabase.cpp index dec0dec1a7..3866badaaa 100644 --- a/harbour/contrib/hbqt/QFontDatabase.cpp +++ b/harbour/contrib/hbqt/QFontDatabase.cpp @@ -83,6 +83,7 @@ * QList standardSizes () */ +#include #include #include @@ -91,19 +92,15 @@ /* * QFontDatabase () */ + HB_FUNC( QT_QFONTDATABASE ) { - hb_retptr( ( QFontDatabase* ) new QFontDatabase() ); + void * pObj = NULL; + + pObj = new QFontDatabase() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QFONTDATABASE_DESTROY ) -{ - -} - /* * bool bold ( const QString & family, const QString & style ) const */ @@ -117,7 +114,7 @@ HB_FUNC( QT_QFONTDATABASE_BOLD ) */ HB_FUNC( QT_QFONTDATABASE_FAMILIES ) { - hb_retptr( new QStringList( hbqt_par_QFontDatabase( 1 )->families( ( HB_ISNUM( 2 ) ? ( QFontDatabase::WritingSystem ) hb_parni( 2 ) : ( QFontDatabase::WritingSystem ) QFontDatabase::Any ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QFontDatabase( 1 )->families( ( HB_ISNUM( 2 ) ? ( QFontDatabase::WritingSystem ) hb_parni( 2 ) : ( QFontDatabase::WritingSystem ) QFontDatabase::Any ) ) ) ) ); } /* @@ -125,7 +122,7 @@ HB_FUNC( QT_QFONTDATABASE_FAMILIES ) */ HB_FUNC( QT_QFONTDATABASE_FONT ) { - hb_retptr( new QFont( hbqt_par_QFontDatabase( 1 )->font( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ), hb_parni( 4 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QFontDatabase( 1 )->font( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ), hb_parni( 4 ) ) ) ) ); } /* @@ -189,7 +186,7 @@ HB_FUNC( QT_QFONTDATABASE_STYLESTRING_1 ) */ HB_FUNC( QT_QFONTDATABASE_STYLES ) { - hb_retptr( new QStringList( hbqt_par_QFontDatabase( 1 )->styles( hbqt_par_QString( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QFontDatabase( 1 )->styles( hbqt_par_QString( 2 ) ) ) ) ); } /* @@ -221,7 +218,7 @@ HB_FUNC( QT_QFONTDATABASE_ADDAPPLICATIONFONTFROMDATA ) */ HB_FUNC( QT_QFONTDATABASE_APPLICATIONFONTFAMILIES ) { - hb_retptr( new QStringList( hbqt_par_QFontDatabase( 1 )->applicationFontFamilies( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QFontDatabase( 1 )->applicationFontFamilies( hb_parni( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QFontDialog.cpp b/harbour/contrib/hbqt/QFontDialog.cpp index a56e9db763..bbc82860bc 100644 --- a/harbour/contrib/hbqt/QFontDialog.cpp +++ b/harbour/contrib/hbqt/QFontDialog.cpp @@ -71,6 +71,7 @@ * flags FontDialogOptions */ +#include #include @@ -79,25 +80,35 @@ * QFontDialog ( QWidget * parent = 0 ) * QFontDialog ( const QFont & initial, QWidget * parent = 0 ) */ + HB_FUNC( QT_QFONTDIALOG ) { - hb_retptr( ( QFontDialog * ) new QFontDialog( hbqt_par_QWidget( 1 ) ) ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QFontDialog > pObj = NULL; + + if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) + { + pObj = new QFontDialog( hbqt_par_QWidget( 1 ) ) ; + } + else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) ) + { + pObj = new QFontDialog( *hbqt_par_QFont( 1 ), hbqt_par_QWidget( 2 ) ) ; + } + else + { + pObj = new QFontDialog( 0 ) ; + } + + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QFONTDIALOG_DESTROY ) -{ - -} - /* * QFont currentFont () const */ HB_FUNC( QT_QFONTDIALOG_CURRENTFONT ) { - hb_retptr( new QFont( hbqt_par_QFontDialog( 1 )->currentFont() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QFontDialog( 1 )->currentFont() ) ) ); } /* @@ -113,7 +124,7 @@ HB_FUNC( QT_QFONTDIALOG_OPTIONS ) */ HB_FUNC( QT_QFONTDIALOG_SELECTEDFONT ) { - hb_retptr( new QFont( hbqt_par_QFontDialog( 1 )->selectedFont() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QFontDialog( 1 )->selectedFont() ) ) ); } /* @@ -155,7 +166,7 @@ HB_FUNC( QT_QFONTDIALOG_GETFONT ) { bool iOk = 0; - hb_retptr( new QFont( hbqt_par_QFontDialog( 1 )->getFont( &iOk, *hbqt_par_QFont( 3 ), hbqt_par_QWidget( 4 ), hbqt_par_QString( 5 ), ( QFontDialog::FontDialogOptions ) hb_parni( 6 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QFontDialog( 1 )->getFont( &iOk, *hbqt_par_QFont( 3 ), hbqt_par_QWidget( 4 ), hbqt_par_QString( 5 ), ( QFontDialog::FontDialogOptions ) hb_parni( 6 ) ) ) ) ); hb_stornl( iOk, 2 ); } @@ -167,7 +178,7 @@ HB_FUNC( QT_QFONTDIALOG_GETFONT_1 ) { bool iOk = 0; - hb_retptr( new QFont( hbqt_par_QFontDialog( 1 )->getFont( &iOk, *hbqt_par_QFont( 3 ), hbqt_par_QWidget( 4 ), hbqt_par_char( 5 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QFontDialog( 1 )->getFont( &iOk, *hbqt_par_QFont( 3 ), hbqt_par_QWidget( 4 ), hbqt_par_char( 5 ) ) ) ) ); hb_stornl( iOk, 2 ); } @@ -179,7 +190,7 @@ HB_FUNC( QT_QFONTDIALOG_GETFONT_2 ) { bool iOk = 0; - hb_retptr( new QFont( hbqt_par_QFontDialog( 1 )->getFont( &iOk, *hbqt_par_QFont( 3 ), hbqt_par_QWidget( 4 ), hbqt_par_QString( 5 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QFontDialog( 1 )->getFont( &iOk, *hbqt_par_QFont( 3 ), hbqt_par_QWidget( 4 ), hbqt_par_QString( 5 ) ) ) ) ); hb_stornl( iOk, 2 ); } @@ -191,7 +202,7 @@ HB_FUNC( QT_QFONTDIALOG_GETFONT_3 ) { bool iOk = 0; - hb_retptr( new QFont( hbqt_par_QFontDialog( 1 )->getFont( &iOk, *hbqt_par_QFont( 3 ), hbqt_par_QWidget( 4 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QFontDialog( 1 )->getFont( &iOk, *hbqt_par_QFont( 3 ), hbqt_par_QWidget( 4 ) ) ) ) ); hb_stornl( iOk, 2 ); } @@ -203,7 +214,7 @@ HB_FUNC( QT_QFONTDIALOG_GETFONT_4 ) { bool iOk = 0; - hb_retptr( new QFont( hbqt_par_QFontDialog( 1 )->getFont( &iOk, hbqt_par_QWidget( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QFontDialog( 1 )->getFont( &iOk, hbqt_par_QWidget( 3 ) ) ) ) ); hb_stornl( iOk, 2 ); } diff --git a/harbour/contrib/hbqt/QFontInfo.cpp b/harbour/contrib/hbqt/QFontInfo.cpp index f50439ba11..167a4f5b16 100644 --- a/harbour/contrib/hbqt/QFontInfo.cpp +++ b/harbour/contrib/hbqt/QFontInfo.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -75,19 +76,25 @@ * QFontInfo ( const QFontInfo & fi ) * ~QFontInfo () */ + HB_FUNC( QT_QFONTINFO ) { - hb_retptr( new QFontInfo( *hbqt_par_QFont( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QFONTINFO_DESTROY ) -{ - delete hbqt_par_QFontInfo( 1 ); -} + if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) + { + pObj = new QFontInfo( *hbqt_par_QFontInfo( 1 ) ) ; + } + else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) ) + { + pObj = new QFontInfo( *hbqt_par_QFont( 2 ) ) ; + } + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QFontInfo" ); + hb_retptrGC( p ); +} /* * bool bold () const */ diff --git a/harbour/contrib/hbqt/QFontMetrics.cpp b/harbour/contrib/hbqt/QFontMetrics.cpp index af803ff36b..6886625829 100644 --- a/harbour/contrib/hbqt/QFontMetrics.cpp +++ b/harbour/contrib/hbqt/QFontMetrics.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -76,33 +77,32 @@ * QFontMetrics ( const QFontMetrics & fm ) * ~QFontMetrics () */ + HB_FUNC( QT_QFONTMETRICS ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QFontMetrics* ) new QFontMetrics( *hbqt_par_QFontMetrics( 1 ) ) ); + pObj = new QFontMetrics( *hbqt_par_QFontMetrics( 1 ) ) ; } else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) ) { if( hbqt_par_QString( 1 ) == ( QString ) "QFont" ) { - hb_retptr( ( QFontMetrics* ) new QFontMetrics( *hbqt_par_QFont( 2 ) ) ); + pObj = new QFontMetrics( *hbqt_par_QFont( 2 ) ) ; } } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( ( QFontMetrics* ) new QFontMetrics( *hbqt_par_QFont( 1 ), hbqt_par_QPaintDevice( 2 ) ) ); + pObj = new QFontMetrics( *hbqt_par_QFont( 1 ), hbqt_par_QPaintDevice( 2 ) ) ; } -} -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QFONTMETRICS_DESTROY ) -{ - delete hbqt_par_QFontMetrics( 1 ); + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QFontMetrics" ); + hb_retptrGC( p ); } - /* * int ascent () const */ @@ -124,7 +124,7 @@ HB_FUNC( QT_QFONTMETRICS_AVERAGECHARWIDTH ) */ HB_FUNC( QT_QFONTMETRICS_BOUNDINGRECT ) { - hb_retptr( new QRect( hbqt_par_QFontMetrics( 1 )->boundingRect( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QFontMetrics( 1 )->boundingRect( hb_parni( 2 ) ) ) ) ); } /* @@ -132,7 +132,7 @@ HB_FUNC( QT_QFONTMETRICS_BOUNDINGRECT ) */ HB_FUNC( QT_QFONTMETRICS_BOUNDINGRECT_1 ) { - hb_retptr( new QRect( hbqt_par_QFontMetrics( 1 )->boundingRect( hbqt_par_QString( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QFontMetrics( 1 )->boundingRect( hbqt_par_QString( 2 ) ) ) ) ); } /* @@ -142,7 +142,7 @@ HB_FUNC( QT_QFONTMETRICS_BOUNDINGRECT_2 ) { int iTabArray = 0; - hb_retptr( new QRect( hbqt_par_QFontMetrics( 1 )->boundingRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), hbqt_par_QString( 7 ), hb_parni( 8 ), &iTabArray ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QFontMetrics( 1 )->boundingRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), hbqt_par_QString( 7 ), hb_parni( 8 ), &iTabArray ) ) ) ); hb_storni( iTabArray, 9 ); } @@ -154,7 +154,7 @@ HB_FUNC( QT_QFONTMETRICS_BOUNDINGRECT_3 ) { int iTabArray = 0; - hb_retptr( new QRect( hbqt_par_QFontMetrics( 1 )->boundingRect( *hbqt_par_QRect( 2 ), hb_parni( 3 ), hbqt_par_QString( 4 ), hb_parni( 5 ), &iTabArray ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QFontMetrics( 1 )->boundingRect( *hbqt_par_QRect( 2 ), hb_parni( 3 ), hbqt_par_QString( 4 ), hb_parni( 5 ), &iTabArray ) ) ) ); hb_storni( iTabArray, 6 ); } @@ -270,7 +270,7 @@ HB_FUNC( QT_QFONTMETRICS_SIZE ) { int iTabArray = 0; - hb_retptr( new QSize( hbqt_par_QFontMetrics( 1 )->size( hb_parni( 2 ), hbqt_par_QString( 3 ), hb_parni( 4 ), &iTabArray ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QFontMetrics( 1 )->size( hb_parni( 2 ), hbqt_par_QString( 3 ), hb_parni( 4 ), &iTabArray ) ) ) ); hb_storni( iTabArray, 5 ); } @@ -288,7 +288,7 @@ HB_FUNC( QT_QFONTMETRICS_STRIKEOUTPOS ) */ HB_FUNC( QT_QFONTMETRICS_TIGHTBOUNDINGRECT ) { - hb_retptr( new QRect( hbqt_par_QFontMetrics( 1 )->tightBoundingRect( hbqt_par_QString( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QFontMetrics( 1 )->tightBoundingRect( hbqt_par_QString( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QFontMetricsF.cpp b/harbour/contrib/hbqt/QFontMetricsF.cpp index bcc0931146..8d6e3f1b07 100644 --- a/harbour/contrib/hbqt/QFontMetricsF.cpp +++ b/harbour/contrib/hbqt/QFontMetricsF.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -77,37 +78,33 @@ * QFontMetricsF ( const QFontMetricsF & fm ) * ~QFontMetricsF () */ + HB_FUNC( QT_QFONTMETRICSF ) { + void * pObj = NULL; + if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QFontMetricsF* ) new QFontMetricsF( *hbqt_par_QFontMetricsF( 1 ) ) ); + pObj = ( QFontMetricsF* ) new QFontMetricsF( *hbqt_par_QFontMetricsF( 1 ) ) ; } else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) ) { if( hbqt_par_QString( 1 ) == ( QString ) "QFont" ) { - hb_retptr( ( QFontMetricsF* ) new QFontMetricsF( *hbqt_par_QFont( 2 ) ) ); + pObj = ( QFontMetricsF* ) new QFontMetricsF( *hbqt_par_QFont( 2 ) ) ; } else if( hbqt_par_QString( 1 ) == ( QString ) "QFontMetrics" ) { - hb_retptr( ( QFontMetricsF* ) new QFontMetricsF( *hbqt_par_QFontMetrics( 2 ) ) ); + pObj = ( QFontMetricsF* ) new QFontMetricsF( *hbqt_par_QFontMetrics( 2 ) ) ; } } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( ( QFontMetricsF* ) new QFontMetricsF( *hbqt_par_QFont( 1 ), hbqt_par_QPaintDevice( 2 ) ) ); + pObj = ( QFontMetricsF* ) new QFontMetricsF( *hbqt_par_QFont( 1 ), hbqt_par_QPaintDevice( 2 ) ) ; } -} -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QFONTMETRICSF_DESTROY ) -{ - delete hbqt_par_QFontMetricsF( 1 ); + hb_retptr( pObj ); } - /* * qreal ascent () const */ @@ -129,7 +126,7 @@ HB_FUNC( QT_QFONTMETRICSF_AVERAGECHARWIDTH ) */ HB_FUNC( QT_QFONTMETRICSF_BOUNDINGRECT ) { - hb_retptr( new QRectF( hbqt_par_QFontMetricsF( 1 )->boundingRect( hbqt_par_QString( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QFontMetricsF( 1 )->boundingRect( hbqt_par_QString( 2 ) ) ) ) ); } /* @@ -137,7 +134,7 @@ HB_FUNC( QT_QFONTMETRICSF_BOUNDINGRECT ) */ HB_FUNC( QT_QFONTMETRICSF_BOUNDINGRECT_1 ) { - hb_retptr( new QRectF( hbqt_par_QFontMetricsF( 1 )->boundingRect( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QFontMetricsF( 1 )->boundingRect( hb_parni( 2 ) ) ) ) ); } /* @@ -147,7 +144,7 @@ HB_FUNC( QT_QFONTMETRICSF_BOUNDINGRECT_2 ) { int iTabArray = 0; - hb_retptr( new QRectF( hbqt_par_QFontMetricsF( 1 )->boundingRect( *hbqt_par_QRectF( 2 ), hb_parni( 3 ), hbqt_par_QString( 4 ), hb_parni( 5 ), &iTabArray ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QFontMetricsF( 1 )->boundingRect( *hbqt_par_QRectF( 2 ), hb_parni( 3 ), hbqt_par_QString( 4 ), hb_parni( 5 ), &iTabArray ) ) ) ); hb_storni( iTabArray, 6 ); } @@ -263,7 +260,7 @@ HB_FUNC( QT_QFONTMETRICSF_SIZE ) { int iTabArray = 0; - hb_retptr( new QSizeF( hbqt_par_QFontMetricsF( 1 )->size( hb_parni( 2 ), hbqt_par_QString( 3 ), hb_parni( 4 ), &iTabArray ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSizeF( hbqt_par_QFontMetricsF( 1 )->size( hb_parni( 2 ), hbqt_par_QString( 3 ), hb_parni( 4 ), &iTabArray ) ) ) ); hb_storni( iTabArray, 5 ); } @@ -281,7 +278,7 @@ HB_FUNC( QT_QFONTMETRICSF_STRIKEOUTPOS ) */ HB_FUNC( QT_QFONTMETRICSF_TIGHTBOUNDINGRECT ) { - hb_retptr( new QRectF( hbqt_par_QFontMetricsF( 1 )->tightBoundingRect( hbqt_par_QString( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QFontMetricsF( 1 )->tightBoundingRect( hbqt_par_QString( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QFormLayout.cpp b/harbour/contrib/hbqt/QFormLayout.cpp index 9b28f7469c..7715206fba 100644 --- a/harbour/contrib/hbqt/QFormLayout.cpp +++ b/harbour/contrib/hbqt/QFormLayout.cpp @@ -72,6 +72,7 @@ * enum RowWrapPolicy { DontWrapRows, WrapLongRows, WrapAllRows } */ +#include #include @@ -80,19 +81,18 @@ * QFormLayout ( QWidget * parent = 0 ) * ~QFormLayout () */ + HB_FUNC( QT_QFORMLAYOUT ) { - hb_retptr( ( QFormLayout * ) new QFormLayout( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QFormLayout > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QFORMLAYOUT_DESTROY ) -{ - delete hbqt_par_QFormLayout( 1 ); -} + pObj = ( QFormLayout * ) new QFormLayout( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * void addRow ( QWidget * label, QWidget * field ) */ diff --git a/harbour/contrib/hbqt/QFrame.cpp b/harbour/contrib/hbqt/QFrame.cpp index 900ad51cbc..7c4eb76bb4 100644 --- a/harbour/contrib/hbqt/QFrame.cpp +++ b/harbour/contrib/hbqt/QFrame.cpp @@ -72,6 +72,7 @@ * enum StyleMask { Shadow_Mask, Shape_Mask } */ +#include #include @@ -80,25 +81,24 @@ * QFrame ( QWidget * parent = 0, Qt::WindowFlags f = 0 ) * ~QFrame () */ + HB_FUNC( QT_QFRAME ) { - hb_retptr( new QFrame( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QFrame > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QFRAME_DESTROY ) -{ - delete hbqt_par_QFrame( 1 ); -} + pObj = new QFrame( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * QRect frameRect () const */ HB_FUNC( QT_QFRAME_FRAMERECT ) { - hb_retptr( new QRect( hbqt_par_QFrame( 1 )->frameRect() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QFrame( 1 )->frameRect() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QFtp.cpp b/harbour/contrib/hbqt/QFtp.cpp index 9a28f42c7d..c83c5f82b7 100644 --- a/harbour/contrib/hbqt/QFtp.cpp +++ b/harbour/contrib/hbqt/QFtp.cpp @@ -74,6 +74,7 @@ * enum TransferType { Binary, Ascii } */ +#include #include @@ -82,10 +83,6 @@ * QFtp ( QObject * parent = 0 ) * virtual ~QFtp () */ -HB_FUNC( QT_QFTP ) -{ - hb_retptr( new QFtp( hbqt_par_QObject( 1 ) ) ); -} /* * qint64 read ( char * data, qint64 maxlen ) @@ -102,14 +99,17 @@ HB_FUNC( QT_QFTP_READ ) hb_xfree( iData ); } -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QFTP_DESTROY ) +HB_FUNC( QT_QFTP ) { - delete hbqt_par_QFtp( 1 ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QFtp > pObj = NULL; + pObj = new QFtp( hbqt_par_QObject( 1 ) ) ; + + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * qint64 bytesAvailable () const */ @@ -259,7 +259,7 @@ HB_FUNC( QT_QFTP_RAWCOMMAND ) */ HB_FUNC( QT_QFTP_READALL ) { - hb_retptr( new QByteArray( hbqt_par_QFtp( 1 )->readAll() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QFtp( 1 )->readAll() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QGradient.cpp b/harbour/contrib/hbqt/QGradient.cpp index 6fd7c06ce2..bffa5e34f0 100644 --- a/harbour/contrib/hbqt/QGradient.cpp +++ b/harbour/contrib/hbqt/QGradient.cpp @@ -72,6 +72,7 @@ * enum Type { LinearGradient, RadialGradient, ConicalGradient, NoGradient } */ +#include #include @@ -79,19 +80,10 @@ /* * */ + HB_FUNC( QT_QGRADIENT ) { - } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QGRADIENT_DESTROY ) -{ - -} - /* * CoordinateMode coordinateMode () const */ @@ -145,7 +137,7 @@ HB_FUNC( QT_QGRADIENT_SPREAD ) */ HB_FUNC( QT_QGRADIENT_STOPS ) { - hb_retptr( new QGradientStops( hbqt_par_QGradient( 1 )->stops() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QGradientStops( hbqt_par_QGradient( 1 )->stops() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QGridLayout.cpp b/harbour/contrib/hbqt/QGridLayout.cpp index c8252a3bea..d1b3a8b61e 100644 --- a/harbour/contrib/hbqt/QGridLayout.cpp +++ b/harbour/contrib/hbqt/QGridLayout.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -75,19 +76,18 @@ * QGridLayout () * ~QGridLayout () */ + HB_FUNC( QT_QGRIDLAYOUT ) { - hb_retptr( new QGridLayout( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QGridLayout > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QGRIDLAYOUT_DESTROY ) -{ - delete hbqt_par_QGridLayout( 1 ); -} + pObj = new QGridLayout( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * void addItem ( QLayoutItem * item, int row, int column, int rowSpan = 1, int columnSpan = 1, Qt::Alignment alignment = 0 ) */ @@ -133,7 +133,7 @@ HB_FUNC( QT_QGRIDLAYOUT_ADDWIDGET_1 ) */ HB_FUNC( QT_QGRIDLAYOUT_CELLRECT ) { - hb_retptr( new QRect( hbqt_par_QGridLayout( 1 )->cellRect( hb_parni( 2 ), hb_parni( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QGridLayout( 1 )->cellRect( hb_parni( 2 ), hb_parni( 3 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QGroupBox.cpp b/harbour/contrib/hbqt/QGroupBox.cpp index 3177fdab10..ddd9722241 100644 --- a/harbour/contrib/hbqt/QGroupBox.cpp +++ b/harbour/contrib/hbqt/QGroupBox.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -75,19 +76,18 @@ * QGroupBox ( const QString & title, QWidget * parent = 0 ) * ~QGroupBox () */ + HB_FUNC( QT_QGROUPBOX ) { - hb_retptr( ( QGroupBox * ) new QGroupBox( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QGroupBox > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QGROUPBOX_DESTROY ) -{ - delete hbqt_par_QGroupBox( 1 ); -} + pObj = ( QGroupBox * ) new QGroupBox( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * Qt::Alignment alignment () const */ diff --git a/harbour/contrib/hbqt/QHBoxLayout.cpp b/harbour/contrib/hbqt/QHBoxLayout.cpp index 5589379ec0..bc4e97b37e 100644 --- a/harbour/contrib/hbqt/QHBoxLayout.cpp +++ b/harbour/contrib/hbqt/QHBoxLayout.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -75,19 +76,18 @@ * QHBoxLayout ( QWidget * parent ) * ~QHBoxLayout () */ + HB_FUNC( QT_QHBOXLAYOUT ) { - hb_retptr( ( QHBoxLayout * ) new QHBoxLayout( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QHBoxLayout > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QHBOXLAYOUT_DESTROY ) -{ - delete hbqt_par_QHBoxLayout( 1 ); -} + pObj = ( QHBoxLayout * ) new QHBoxLayout( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ diff --git a/harbour/contrib/hbqt/QHeaderView.cpp b/harbour/contrib/hbqt/QHeaderView.cpp index 98aa3e6392..4b123efa7c 100644 --- a/harbour/contrib/hbqt/QHeaderView.cpp +++ b/harbour/contrib/hbqt/QHeaderView.cpp @@ -70,6 +70,7 @@ * enum ResizeMode { Interactive, Fixed, Stretch, ResizeToContents, Custom } */ +#include #include @@ -78,19 +79,18 @@ * QHeaderView ( Qt::Orientation orientation, QWidget * parent = 0 ) * virtual ~QHeaderView () */ + HB_FUNC( QT_QHEADERVIEW ) { - hb_retptr( new QHeaderView( ( Qt::Orientation ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QHeaderView > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QHEADERVIEW_DESTROY ) -{ - delete hbqt_par_QHeaderView( 1 ); -} + pObj = new QHeaderView( ( Qt::Orientation ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * bool cascadingSectionResizes () const */ @@ -288,7 +288,7 @@ HB_FUNC( QT_QHEADERVIEW_RESTORESTATE ) */ HB_FUNC( QT_QHEADERVIEW_SAVESTATE ) { - hb_retptr( new QByteArray( hbqt_par_QHeaderView( 1 )->saveState() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QHeaderView( 1 )->saveState() ) ) ); } /* @@ -456,7 +456,7 @@ HB_FUNC( QT_QHEADERVIEW_SHOWSECTION ) */ HB_FUNC( QT_QHEADERVIEW_SIZEHINT ) { - hb_retptr( new QSize( hbqt_par_QHeaderView( 1 )->sizeHint() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QHeaderView( 1 )->sizeHint() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QHttp.cpp b/harbour/contrib/hbqt/QHttp.cpp index 2770f0c42c..e459db6df4 100644 --- a/harbour/contrib/hbqt/QHttp.cpp +++ b/harbour/contrib/hbqt/QHttp.cpp @@ -72,6 +72,7 @@ * enum State { Unconnected, HostLookup, Connecting, Sending, ..., Closing } */ +#include #include @@ -82,10 +83,6 @@ * QHttp ( const QString & hostName, ConnectionMode mode, quint16 port = 0, QObject * parent = 0 ) * virtual ~QHttp () */ -HB_FUNC( QT_QHTTP ) -{ - hb_retptr( new QHttp( hbqt_par_QObject( 1 ) ) ); -} /* * qint64 read ( char * data, qint64 maxlen ) @@ -102,14 +99,17 @@ HB_FUNC( QT_QHTTP_READ ) hb_xfree( iData ); } -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QHTTP_DESTROY ) +HB_FUNC( QT_QHTTP ) { - delete hbqt_par_QHttp( 1 ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QHttp > pObj = NULL; + pObj = new QHttp( hbqt_par_QObject( 1 ) ) ; + + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * qint64 bytesAvailable () const */ @@ -155,7 +155,7 @@ HB_FUNC( QT_QHTTP_CURRENTID ) */ HB_FUNC( QT_QHTTP_CURRENTREQUEST ) { - hb_retptr( new QHttpRequestHeader( hbqt_par_QHttp( 1 )->currentRequest() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QHttpRequestHeader( hbqt_par_QHttp( 1 )->currentRequest() ) ) ); } /* @@ -211,7 +211,7 @@ HB_FUNC( QT_QHTTP_HEAD ) */ HB_FUNC( QT_QHTTP_LASTRESPONSE ) { - hb_retptr( new QHttpResponseHeader( hbqt_par_QHttp( 1 )->lastResponse() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QHttpResponseHeader( hbqt_par_QHttp( 1 )->lastResponse() ) ) ); } /* @@ -235,7 +235,7 @@ HB_FUNC( QT_QHTTP_POST_1 ) */ HB_FUNC( QT_QHTTP_READALL ) { - hb_retptr( new QByteArray( hbqt_par_QHttp( 1 )->readAll() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QHttp( 1 )->readAll() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QIODevice.cpp b/harbour/contrib/hbqt/QIODevice.cpp index 28e354a28f..9ab562aea3 100644 --- a/harbour/contrib/hbqt/QIODevice.cpp +++ b/harbour/contrib/hbqt/QIODevice.cpp @@ -71,6 +71,7 @@ * enum OpenModeFlag { NotOpen, ReadOnly, WriteOnly, ReadWrite, ..., Unbuffered } */ +#include #include @@ -80,28 +81,10 @@ * QIODevice ( QObject * parent ) * virtual ~QIODevice () */ + HB_FUNC( QT_QIODEVICE ) { - #if 0 - if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) - { - hb_retptr( ( QIODevice* ) new QIODevice( hbqt_par_QObject( 1 ) ) ); - } - else - { - hb_retptr( ( QIODevice* ) new QIODevice() ); - } - #endif } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QIODEVICE_DESTROY ) -{ - delete hbqt_par_QIODevice( 1 ); -} - /* * virtual bool atEnd () const */ @@ -227,7 +210,7 @@ HB_FUNC( QT_QIODEVICE_PEEK ) */ HB_FUNC( QT_QIODEVICE_PEEK_1 ) { - hb_retptr( new QByteArray( hbqt_par_QIODevice( 1 )->peek( hb_parnint( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QIODevice( 1 )->peek( hb_parnint( 2 ) ) ) ) ); } /* @@ -259,7 +242,7 @@ HB_FUNC( QT_QIODEVICE_READ ) */ HB_FUNC( QT_QIODEVICE_READ_1 ) { - hb_retptr( new QByteArray( hbqt_par_QIODevice( 1 )->read( hb_parnint( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QIODevice( 1 )->read( hb_parnint( 2 ) ) ) ) ); } /* @@ -267,7 +250,7 @@ HB_FUNC( QT_QIODEVICE_READ_1 ) */ HB_FUNC( QT_QIODEVICE_READALL ) { - hb_retptr( new QByteArray( hbqt_par_QIODevice( 1 )->readAll() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QIODevice( 1 )->readAll() ) ) ); } /* @@ -283,7 +266,7 @@ HB_FUNC( QT_QIODEVICE_READLINE ) */ HB_FUNC( QT_QIODEVICE_READLINE_1 ) { - hb_retptr( new QByteArray( hbqt_par_QIODevice( 1 )->readLine( hb_parnint( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QIODevice( 1 )->readLine( hb_parnint( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QIcon.cpp b/harbour/contrib/hbqt/QIcon.cpp index 7f37d23f64..9b54c59660 100644 --- a/harbour/contrib/hbqt/QIcon.cpp +++ b/harbour/contrib/hbqt/QIcon.cpp @@ -80,6 +80,7 @@ * QList availableSizes ( Mode mode = Normal, State state = Off ) const */ +#include #include @@ -93,36 +94,35 @@ * QIcon ( QIconEngineV2 * engine ) * ~QIcon () */ + HB_FUNC( QT_QICON ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + if( hb_pcount() == 1 && HB_ISCHAR( 1 ) ) { - hb_retptr( ( QIcon* ) new QIcon( hbqt_par_QString( 1 ) ) ); + pObj = ( QIcon* ) new QIcon( hbqt_par_QString( 1 ) ) ; } if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QIcon* ) new QIcon( *hbqt_par_QPixmap( 1 ) ) ); + pObj = ( QIcon* ) new QIcon( *hbqt_par_QPixmap( 1 ) ) ; } else { - hb_retptr( ( QIcon* ) new QIcon() ); + pObj = ( QIcon* ) new QIcon() ; } -} -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QICON_DESTROY ) -{ - delete hbqt_par_QIcon( 1 ); + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QIcon" ); + hb_retptrGC( p ); } - /* * QSize actualSize ( const QSize & size, Mode mode = Normal, State state = Off ) const */ HB_FUNC( QT_QICON_ACTUALSIZE ) { - hb_retptr( new QSize( hbqt_par_QIcon( 1 )->actualSize( *hbqt_par_QSize( 2 ), ( HB_ISNUM( 3 ) ? ( QIcon::Mode ) hb_parni( 3 ) : ( QIcon::Mode ) QIcon::Normal ), ( HB_ISNUM( 4 ) ? ( QIcon::State ) hb_parni( 4 ) : ( QIcon::State ) QIcon::Off ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QIcon( 1 )->actualSize( *hbqt_par_QSize( 2 ), ( HB_ISNUM( 3 ) ? ( QIcon::Mode ) hb_parni( 3 ) : ( QIcon::Mode ) QIcon::Normal ), ( HB_ISNUM( 4 ) ? ( QIcon::State ) hb_parni( 4 ) : ( QIcon::State ) QIcon::Off ) ) ) ) ); } /* @@ -178,7 +178,7 @@ HB_FUNC( QT_QICON_PAINT_1 ) */ HB_FUNC( QT_QICON_PIXMAP ) { - hb_retptr( new QPixmap( hbqt_par_QIcon( 1 )->pixmap( *hbqt_par_QSize( 2 ), ( HB_ISNUM( 3 ) ? ( QIcon::Mode ) hb_parni( 3 ) : ( QIcon::Mode ) QIcon::Normal ), ( HB_ISNUM( 4 ) ? ( QIcon::State ) hb_parni( 4 ) : ( QIcon::State ) QIcon::Off ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QIcon( 1 )->pixmap( *hbqt_par_QSize( 2 ), ( HB_ISNUM( 3 ) ? ( QIcon::Mode ) hb_parni( 3 ) : ( QIcon::Mode ) QIcon::Normal ), ( HB_ISNUM( 4 ) ? ( QIcon::State ) hb_parni( 4 ) : ( QIcon::State ) QIcon::Off ) ) ) ) ); } /* @@ -186,7 +186,7 @@ HB_FUNC( QT_QICON_PIXMAP ) */ HB_FUNC( QT_QICON_PIXMAP_1 ) { - hb_retptr( new QPixmap( hbqt_par_QIcon( 1 )->pixmap( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISNUM( 4 ) ? ( QIcon::Mode ) hb_parni( 4 ) : ( QIcon::Mode ) QIcon::Normal ), ( HB_ISNUM( 5 ) ? ( QIcon::State ) hb_parni( 5 ) : ( QIcon::State ) QIcon::Off ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QIcon( 1 )->pixmap( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISNUM( 4 ) ? ( QIcon::Mode ) hb_parni( 4 ) : ( QIcon::Mode ) QIcon::Normal ), ( HB_ISNUM( 5 ) ? ( QIcon::State ) hb_parni( 5 ) : ( QIcon::State ) QIcon::Off ) ) ) ) ); } /* @@ -194,7 +194,7 @@ HB_FUNC( QT_QICON_PIXMAP_1 ) */ HB_FUNC( QT_QICON_PIXMAP_2 ) { - hb_retptr( new QPixmap( hbqt_par_QIcon( 1 )->pixmap( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( QIcon::Mode ) hb_parni( 3 ) : ( QIcon::Mode ) QIcon::Normal ), ( HB_ISNUM( 4 ) ? ( QIcon::State ) hb_parni( 4 ) : ( QIcon::State ) QIcon::Off ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QIcon( 1 )->pixmap( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( QIcon::Mode ) hb_parni( 3 ) : ( QIcon::Mode ) QIcon::Normal ), ( HB_ISNUM( 4 ) ? ( QIcon::State ) hb_parni( 4 ) : ( QIcon::State ) QIcon::Off ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/QImage.cpp b/harbour/contrib/hbqt/QImage.cpp index eaf461b804..e7f539e33f 100644 --- a/harbour/contrib/hbqt/QImage.cpp +++ b/harbour/contrib/hbqt/QImage.cpp @@ -86,6 +86,7 @@ * // bool loadFromData ( const uchar * data, int len, const char * format = 0 ) */ +#include #include #include @@ -105,50 +106,49 @@ * QImage ( const QImage & image ) * ~QImage () */ + HB_FUNC( QT_QIMAGE ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QImage* ) new QImage( *hbqt_par_QImage( 1 ) ) ); + pObj = ( QImage* ) new QImage( *hbqt_par_QImage( 1 ) ) ; } else if( hb_pcount() == 1 && HB_ISCHAR( 1 ) ) { - hb_retptr( ( QImage* ) new QImage( hbqt_par_QString( 1 ), ( const char * ) 0 ) ); + pObj = ( QImage* ) new QImage( hbqt_par_QString( 1 ), ( const char * ) 0 ) ; } else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISCHAR( 2 ) ) { - hb_retptr( ( QImage* ) new QImage( hbqt_par_QString( 1 ), ( const char * ) hb_parcx( 2 ) ) ); + pObj = ( QImage* ) new QImage( hbqt_par_QString( 1 ), ( const char * ) hb_parcx( 2 ) ) ; } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( ( QImage* ) new QImage( *hbqt_par_QSize( 1 ), ( QImage::Format ) hb_parni( 2 ) ) ); + pObj = ( QImage* ) new QImage( *hbqt_par_QSize( 1 ), ( QImage::Format ) hb_parni( 2 ) ) ; } else if( hb_pcount() == 3 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) ) { - hb_retptr( ( QImage* ) new QImage( hb_parni( 1 ), hb_parni( 2 ), ( QImage::Format ) hb_parni( 3 ) ) ); + pObj = ( QImage* ) new QImage( hb_parni( 1 ), hb_parni( 2 ), ( QImage::Format ) hb_parni( 3 ) ) ; } else if( hb_pcount() == 4 && HB_ISCHAR( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) ) { - hb_retptr( ( QImage* ) new QImage( ( const uchar * ) hb_parc( 1 ), hb_parni( 2 ), hb_parni( 3 ), ( QImage::Format ) hb_parni( 4 ) ) ); + pObj = ( QImage* ) new QImage( ( const uchar * ) hb_parc( 1 ), hb_parni( 2 ), hb_parni( 3 ), ( QImage::Format ) hb_parni( 4 ) ) ; } else if( hb_pcount() == 5 && HB_ISCHAR( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) && HB_ISNUM( 5 ) ) { - hb_retptr( ( QImage* ) new QImage( ( const uchar * ) hb_parc( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( QImage::Format ) hb_parni( 5 ) ) ); + pObj = ( QImage* ) new QImage( ( const uchar * ) hb_parc( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( QImage::Format ) hb_parni( 5 ) ) ; } else { - hb_retptr( ( QImage* ) new QImage() ); + pObj = ( QImage* ) new QImage() ; } -} -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QIMAGE_DESTROY ) -{ - delete hbqt_par_QImage( 1 ); + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QImage" ); + hb_retptrGC( p ); } - /* * bool allGray () const */ @@ -162,7 +162,7 @@ HB_FUNC( QT_QIMAGE_ALLGRAY ) */ HB_FUNC( QT_QIMAGE_ALPHACHANNEL ) { - hb_retptr( new QImage( hbqt_par_QImage( 1 )->alphaChannel() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QImage( hbqt_par_QImage( 1 )->alphaChannel() ) ) ); } /* @@ -210,7 +210,7 @@ HB_FUNC( QT_QIMAGE_COLOR ) */ HB_FUNC( QT_QIMAGE_CONVERTTOFORMAT ) { - hb_retptr( new QImage( hbqt_par_QImage( 1 )->convertToFormat( ( QImage::Format ) hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::ImageConversionFlags ) hb_parni( 3 ) : ( Qt::ImageConversionFlags ) Qt::AutoColor ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QImage( hbqt_par_QImage( 1 )->convertToFormat( ( QImage::Format ) hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::ImageConversionFlags ) hb_parni( 3 ) : ( Qt::ImageConversionFlags ) Qt::AutoColor ) ) ) ) ); } /* @@ -218,7 +218,7 @@ HB_FUNC( QT_QIMAGE_CONVERTTOFORMAT ) */ HB_FUNC( QT_QIMAGE_COPY ) { - hb_retptr( new QImage( hbqt_par_QImage( 1 )->copy( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QRect( 2 ) : QRect() ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QImage( hbqt_par_QImage( 1 )->copy( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QRect( 2 ) : QRect() ) ) ) ) ); } /* @@ -226,7 +226,7 @@ HB_FUNC( QT_QIMAGE_COPY ) */ HB_FUNC( QT_QIMAGE_COPY_1 ) { - hb_retptr( new QImage( hbqt_par_QImage( 1 )->copy( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QImage( hbqt_par_QImage( 1 )->copy( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ) ) ) ); } /* @@ -234,7 +234,7 @@ HB_FUNC( QT_QIMAGE_COPY_1 ) */ HB_FUNC( QT_QIMAGE_CREATEALPHAMASK ) { - hb_retptr( new QImage( hbqt_par_QImage( 1 )->createAlphaMask( ( HB_ISNUM( 2 ) ? ( Qt::ImageConversionFlags ) hb_parni( 2 ) : ( Qt::ImageConversionFlags ) Qt::AutoColor ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QImage( hbqt_par_QImage( 1 )->createAlphaMask( ( HB_ISNUM( 2 ) ? ( Qt::ImageConversionFlags ) hb_parni( 2 ) : ( Qt::ImageConversionFlags ) Qt::AutoColor ) ) ) ) ); } /* @@ -242,7 +242,7 @@ HB_FUNC( QT_QIMAGE_CREATEALPHAMASK ) */ HB_FUNC( QT_QIMAGE_CREATEHEURISTICMASK ) { - hb_retptr( new QImage( hbqt_par_QImage( 1 )->createHeuristicMask( hb_parl( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QImage( hbqt_par_QImage( 1 )->createHeuristicMask( hb_parl( 2 ) ) ) ) ); } /* @@ -250,7 +250,7 @@ HB_FUNC( QT_QIMAGE_CREATEHEURISTICMASK ) */ HB_FUNC( QT_QIMAGE_CREATEMASKFROMCOLOR ) { - hb_retptr( new QImage( hbqt_par_QImage( 1 )->createMaskFromColor( hb_parnl( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::MaskMode ) hb_parni( 3 ) : ( Qt::MaskMode ) Qt::MaskInColor ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QImage( hbqt_par_QImage( 1 )->createMaskFromColor( hb_parnl( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::MaskMode ) hb_parni( 3 ) : ( Qt::MaskMode ) Qt::MaskInColor ) ) ) ) ); } /* @@ -362,7 +362,7 @@ HB_FUNC( QT_QIMAGE_LOADFROMDATA ) */ HB_FUNC( QT_QIMAGE_MIRRORED ) { - hb_retptr( new QImage( hbqt_par_QImage( 1 )->mirrored( hb_parl( 2 ), hb_parl( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QImage( hbqt_par_QImage( 1 )->mirrored( hb_parl( 2 ), hb_parl( 3 ) ) ) ) ); } /* @@ -386,7 +386,7 @@ HB_FUNC( QT_QIMAGE_NUMCOLORS ) */ HB_FUNC( QT_QIMAGE_OFFSET ) { - hb_retptr( new QPoint( hbqt_par_QImage( 1 )->offset() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QImage( 1 )->offset() ) ) ); } /* @@ -426,7 +426,7 @@ HB_FUNC( QT_QIMAGE_PIXELINDEX_1 ) */ HB_FUNC( QT_QIMAGE_RECT ) { - hb_retptr( new QRect( hbqt_par_QImage( 1 )->rect() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QImage( 1 )->rect() ) ) ); } /* @@ -434,7 +434,7 @@ HB_FUNC( QT_QIMAGE_RECT ) */ HB_FUNC( QT_QIMAGE_RGBSWAPPED ) { - hb_retptr( new QImage( hbqt_par_QImage( 1 )->rgbSwapped() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QImage( hbqt_par_QImage( 1 )->rgbSwapped() ) ) ); } /* @@ -458,7 +458,7 @@ HB_FUNC( QT_QIMAGE_SAVE_1 ) */ HB_FUNC( QT_QIMAGE_SCALED ) { - hb_retptr( new QImage( hbqt_par_QImage( 1 )->scaled( *hbqt_par_QSize( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::AspectRatioMode ) hb_parni( 3 ) : ( Qt::AspectRatioMode ) Qt::IgnoreAspectRatio ), ( HB_ISNUM( 4 ) ? ( Qt::TransformationMode ) hb_parni( 4 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QImage( hbqt_par_QImage( 1 )->scaled( *hbqt_par_QSize( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::AspectRatioMode ) hb_parni( 3 ) : ( Qt::AspectRatioMode ) Qt::IgnoreAspectRatio ), ( HB_ISNUM( 4 ) ? ( Qt::TransformationMode ) hb_parni( 4 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); } /* @@ -466,7 +466,7 @@ HB_FUNC( QT_QIMAGE_SCALED ) */ HB_FUNC( QT_QIMAGE_SCALED_1 ) { - hb_retptr( new QImage( hbqt_par_QImage( 1 )->scaled( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISNUM( 4 ) ? ( Qt::AspectRatioMode ) hb_parni( 4 ) : ( Qt::AspectRatioMode ) Qt::IgnoreAspectRatio ), ( HB_ISNUM( 5 ) ? ( Qt::TransformationMode ) hb_parni( 5 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QImage( hbqt_par_QImage( 1 )->scaled( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISNUM( 4 ) ? ( Qt::AspectRatioMode ) hb_parni( 4 ) : ( Qt::AspectRatioMode ) Qt::IgnoreAspectRatio ), ( HB_ISNUM( 5 ) ? ( Qt::TransformationMode ) hb_parni( 5 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); } /* @@ -474,7 +474,7 @@ HB_FUNC( QT_QIMAGE_SCALED_1 ) */ HB_FUNC( QT_QIMAGE_SCALEDTOHEIGHT ) { - hb_retptr( new QImage( hbqt_par_QImage( 1 )->scaledToHeight( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QImage( hbqt_par_QImage( 1 )->scaledToHeight( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); } /* @@ -482,7 +482,7 @@ HB_FUNC( QT_QIMAGE_SCALEDTOHEIGHT ) */ HB_FUNC( QT_QIMAGE_SCALEDTOWIDTH ) { - hb_retptr( new QImage( hbqt_par_QImage( 1 )->scaledToWidth( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QImage( hbqt_par_QImage( 1 )->scaledToWidth( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); } /* @@ -570,7 +570,7 @@ HB_FUNC( QT_QIMAGE_SETTEXT ) */ HB_FUNC( QT_QIMAGE_SIZE ) { - hb_retptr( new QSize( hbqt_par_QImage( 1 )->size() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QImage( 1 )->size() ) ) ); } /* @@ -586,7 +586,7 @@ HB_FUNC( QT_QIMAGE_TEXT ) */ HB_FUNC( QT_QIMAGE_TEXTKEYS ) { - hb_retptr( new QStringList( hbqt_par_QImage( 1 )->textKeys() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QImage( 1 )->textKeys() ) ) ); } /* @@ -594,7 +594,7 @@ HB_FUNC( QT_QIMAGE_TEXTKEYS ) */ HB_FUNC( QT_QIMAGE_TRANSFORMED ) { - hb_retptr( new QImage( hbqt_par_QImage( 1 )->transformed( *hbqt_par_QMatrix( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QImage( hbqt_par_QImage( 1 )->transformed( *hbqt_par_QMatrix( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); } /* @@ -602,7 +602,7 @@ HB_FUNC( QT_QIMAGE_TRANSFORMED ) */ HB_FUNC( QT_QIMAGE_TRANSFORMED_1 ) { - hb_retptr( new QImage( hbqt_par_QImage( 1 )->transformed( *hbqt_par_QTransform( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QImage( hbqt_par_QImage( 1 )->transformed( *hbqt_par_QTransform( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QImageReader.cpp b/harbour/contrib/hbqt/QImageReader.cpp index a45f2eb8aa..0f55c9a7b6 100644 --- a/harbour/contrib/hbqt/QImageReader.cpp +++ b/harbour/contrib/hbqt/QImageReader.cpp @@ -79,6 +79,7 @@ * QList supportedImageFormats () */ +#include #include #include @@ -90,19 +91,15 @@ * QImageReader ( const QString & fileName, const QByteArray & format = QByteArray() ) * ~QImageReader () */ + HB_FUNC( QT_QIMAGEREADER ) { - hb_retptr( ( QImageReader* ) new QImageReader() ); -} + void * pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QIMAGEREADER_DESTROY ) -{ - delete hbqt_par_QImageReader( 1 ); -} + pObj = ( QImageReader* ) new QImageReader() ; + hb_retptr( pObj ); +} /* * bool autoDetectImageFormat () const */ @@ -116,7 +113,7 @@ HB_FUNC( QT_QIMAGEREADER_AUTODETECTIMAGEFORMAT ) */ HB_FUNC( QT_QIMAGEREADER_BACKGROUNDCOLOR ) { - hb_retptr( new QColor( hbqt_par_QImageReader( 1 )->backgroundColor() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QImageReader( 1 )->backgroundColor() ) ) ); } /* @@ -132,7 +129,7 @@ HB_FUNC( QT_QIMAGEREADER_CANREAD ) */ HB_FUNC( QT_QIMAGEREADER_CLIPRECT ) { - hb_retptr( new QRect( hbqt_par_QImageReader( 1 )->clipRect() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QImageReader( 1 )->clipRect() ) ) ); } /* @@ -148,7 +145,7 @@ HB_FUNC( QT_QIMAGEREADER_CURRENTIMAGENUMBER ) */ HB_FUNC( QT_QIMAGEREADER_CURRENTIMAGERECT ) { - hb_retptr( new QRect( hbqt_par_QImageReader( 1 )->currentImageRect() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QImageReader( 1 )->currentImageRect() ) ) ); } /* @@ -188,7 +185,7 @@ HB_FUNC( QT_QIMAGEREADER_FILENAME ) */ HB_FUNC( QT_QIMAGEREADER_FORMAT ) { - hb_retptr( new QByteArray( hbqt_par_QImageReader( 1 )->format() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QImageReader( 1 )->format() ) ) ); } /* @@ -252,7 +249,7 @@ HB_FUNC( QT_QIMAGEREADER_QUALITY ) */ HB_FUNC( QT_QIMAGEREADER_READ ) { - hb_retptr( new QImage( hbqt_par_QImageReader( 1 )->read() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QImage( hbqt_par_QImageReader( 1 )->read() ) ) ); } /* @@ -268,7 +265,7 @@ HB_FUNC( QT_QIMAGEREADER_READ_1 ) */ HB_FUNC( QT_QIMAGEREADER_SCALEDCLIPRECT ) { - hb_retptr( new QRect( hbqt_par_QImageReader( 1 )->scaledClipRect() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QImageReader( 1 )->scaledClipRect() ) ) ); } /* @@ -276,7 +273,7 @@ HB_FUNC( QT_QIMAGEREADER_SCALEDCLIPRECT ) */ HB_FUNC( QT_QIMAGEREADER_SCALEDSIZE ) { - hb_retptr( new QSize( hbqt_par_QImageReader( 1 )->scaledSize() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QImageReader( 1 )->scaledSize() ) ) ); } /* @@ -356,7 +353,7 @@ HB_FUNC( QT_QIMAGEREADER_SETSCALEDSIZE ) */ HB_FUNC( QT_QIMAGEREADER_SIZE ) { - hb_retptr( new QSize( hbqt_par_QImageReader( 1 )->size() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QImageReader( 1 )->size() ) ) ); } /* @@ -388,7 +385,7 @@ HB_FUNC( QT_QIMAGEREADER_TEXT ) */ HB_FUNC( QT_QIMAGEREADER_TEXTKEYS ) { - hb_retptr( new QStringList( hbqt_par_QImageReader( 1 )->textKeys() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QImageReader( 1 )->textKeys() ) ) ); } /* @@ -396,7 +393,7 @@ HB_FUNC( QT_QIMAGEREADER_TEXTKEYS ) */ HB_FUNC( QT_QIMAGEREADER_IMAGEFORMAT_1 ) { - hb_retptr( new QByteArray( hbqt_par_QImageReader( 1 )->imageFormat( hbqt_par_QString( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QImageReader( 1 )->imageFormat( hbqt_par_QString( 2 ) ) ) ) ); } /* @@ -404,7 +401,7 @@ HB_FUNC( QT_QIMAGEREADER_IMAGEFORMAT_1 ) */ HB_FUNC( QT_QIMAGEREADER_IMAGEFORMAT_2 ) { - hb_retptr( new QByteArray( hbqt_par_QImageReader( 1 )->imageFormat( hbqt_par_QIODevice( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QImageReader( 1 )->imageFormat( hbqt_par_QIODevice( 2 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/QImageWriter.cpp b/harbour/contrib/hbqt/QImageWriter.cpp index 685d7b8ddf..429e18f6b6 100644 --- a/harbour/contrib/hbqt/QImageWriter.cpp +++ b/harbour/contrib/hbqt/QImageWriter.cpp @@ -79,6 +79,7 @@ * QList supportedImageFormats () */ +#include #include @@ -89,19 +90,15 @@ * QImageWriter ( const QString & fileName, const QByteArray & format = QByteArray() ) * ~QImageWriter () */ + HB_FUNC( QT_QIMAGEWRITER ) { - hb_retptr( ( QImageWriter* ) new QImageWriter() ); -} + void * pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QIMAGEWRITER_DESTROY ) -{ - delete hbqt_par_QImageWriter( 1 ); -} + pObj = ( QImageWriter* ) new QImageWriter() ; + hb_retptr( pObj ); +} /* * bool canWrite () const */ @@ -155,7 +152,7 @@ HB_FUNC( QT_QIMAGEWRITER_FILENAME ) */ HB_FUNC( QT_QIMAGEWRITER_FORMAT ) { - hb_retptr( new QByteArray( hbqt_par_QImageWriter( 1 )->format() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QImageWriter( 1 )->format() ) ) ); } /* @@ -163,7 +160,7 @@ HB_FUNC( QT_QIMAGEWRITER_FORMAT ) */ HB_FUNC( QT_QIMAGEWRITER_GAMMA ) { - hb_retptr( new float( hbqt_par_QImageWriter( 1 )->gamma() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new float( hbqt_par_QImageWriter( 1 )->gamma() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QInputDialog.cpp b/harbour/contrib/hbqt/QInputDialog.cpp index 73e0415f9d..30a2782db2 100644 --- a/harbour/contrib/hbqt/QInputDialog.cpp +++ b/harbour/contrib/hbqt/QInputDialog.cpp @@ -72,6 +72,7 @@ * flags InputDialogOptions */ +#include #include @@ -80,19 +81,18 @@ * QInputDialog ( QWidget * parent = 0, Qt::WindowFlags flags = 0 ) * ~QInputDialog () */ + HB_FUNC( QT_QINPUTDIALOG ) { - hb_retptr( ( QInputDialog * ) new QInputDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QInputDialog > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QINPUTDIALOG_DESTROY ) -{ - delete hbqt_par_QInputDialog( 1 ); -} + pObj = ( QInputDialog * ) new QInputDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * QString cancelButtonText () const */ @@ -106,7 +106,7 @@ HB_FUNC( QT_QINPUTDIALOG_CANCELBUTTONTEXT ) */ HB_FUNC( QT_QINPUTDIALOG_COMBOBOXITEMS ) { - hb_retptr( new QStringList( hbqt_par_QInputDialog( 1 )->comboBoxItems() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QInputDialog( 1 )->comboBoxItems() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QInputEvent.cpp b/harbour/contrib/hbqt/QInputEvent.cpp index 68dc596f21..9953f3c220 100644 --- a/harbour/contrib/hbqt/QInputEvent.cpp +++ b/harbour/contrib/hbqt/QInputEvent.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include #include @@ -74,20 +75,15 @@ * * */ + HB_FUNC( QT_QINPUTEVENT ) { - hb_retptr( ( QInputEvent* ) new QInputEvent( ( QEvent::Type ) hb_parni( 1 ), - ( Qt::KeyboardModifiers ) hb_parni( 2 ) ) ); + void * pObj = NULL; + + pObj = ( QInputEvent* ) new QInputEvent( ( QEvent::Type ) hb_parni( 1 ), ( Qt::KeyboardModifiers ) hb_parni( 2 ) ) ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QINPUTEVENT_DESTROY ) -{ - -} - /* * Qt::KeyboardModifiers modifiers () const */ diff --git a/harbour/contrib/hbqt/QKeyEvent.cpp b/harbour/contrib/hbqt/QKeyEvent.cpp index 91ad411e88..5818b595b4 100644 --- a/harbour/contrib/hbqt/QKeyEvent.cpp +++ b/harbour/contrib/hbqt/QKeyEvent.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,19 +75,10 @@ * QKeyEvent ( Type type, int key, Qt::KeyboardModifiers modifiers, const QString & text = QString(), bool autorep = false, ushort count = 1 ) * ~QKeyEvent () */ + HB_FUNC( QT_QKEYEVENT ) { - //hb_retptr( ( QKeyEvent * ) new QKeyEvent( *hbqt_par_QKeyEvent( 1 ) ) ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QKEYEVENT_DESTROY ) -{ - delete hbqt_par_QKeyEvent( 1 ); -} - /* * int count () const */ diff --git a/harbour/contrib/hbqt/QKeySequence.cpp b/harbour/contrib/hbqt/QKeySequence.cpp index f80c38bd02..36f0ba68f3 100644 --- a/harbour/contrib/hbqt/QKeySequence.cpp +++ b/harbour/contrib/hbqt/QKeySequence.cpp @@ -81,6 +81,7 @@ * QList keyBindings ( StandardKey key ) */ +#include #include @@ -93,26 +94,25 @@ * QKeySequence ( StandardKey key ) * ~QKeySequence () */ + HB_FUNC( QT_QKEYSEQUENCE ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + if( HB_ISPOINTER( 1 ) ) - hb_retptr( ( QKeySequence * ) new QKeySequence( *hbqt_par_QKeySequence( 1 ) ) ); + pObj = ( QKeySequence * ) new QKeySequence( *hbqt_par_QKeySequence( 1 ) ) ; else if( HB_ISCHAR( 1 ) ) - hb_retptr( ( QKeySequence * ) new QKeySequence( hbqt_par_QString( 1 ) ) ); + pObj = ( QKeySequence * ) new QKeySequence( hbqt_par_QString( 1 ) ) ; else if( HB_ISNUM( 1 ) ) - hb_retptr( ( QKeySequence * ) new QKeySequence( hb_parni( 1 ) ) ); + pObj = ( QKeySequence * ) new QKeySequence( hb_parni( 1 ) ) ; else - hb_retptr( ( QKeySequence * ) new QKeySequence() ); -} + pObj = ( QKeySequence * ) new QKeySequence() ; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QKEYSEQUENCE_DESTROY ) -{ - delete hbqt_par_QKeySequence( 1 ); + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QKeySequence" ); + hb_retptrGC( p ); } - /* * uint count () const */ @@ -150,7 +150,7 @@ HB_FUNC( QT_QKEYSEQUENCE_TOSTRING ) */ HB_FUNC( QT_QKEYSEQUENCE_FROMSTRING ) { - hb_retptr( new QKeySequence( hbqt_par_QKeySequence( 1 )->fromString( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( QKeySequence::SequenceFormat ) hb_parni( 3 ) : ( QKeySequence::SequenceFormat ) QKeySequence::PortableText ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QKeySequence( hbqt_par_QKeySequence( 1 )->fromString( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( QKeySequence::SequenceFormat ) hb_parni( 3 ) : ( QKeySequence::SequenceFormat ) QKeySequence::PortableText ) ) ) ) ); } /* @@ -158,7 +158,7 @@ HB_FUNC( QT_QKEYSEQUENCE_FROMSTRING ) */ HB_FUNC( QT_QKEYSEQUENCE_MNEMONIC ) { - hb_retptr( new QKeySequence( hbqt_par_QKeySequence( 1 )->mnemonic( hbqt_par_QString( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QKeySequence( hbqt_par_QKeySequence( 1 )->mnemonic( hbqt_par_QString( 2 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/QLCDNumber.cpp b/harbour/contrib/hbqt/QLCDNumber.cpp index d518a154eb..1ee0a06c31 100644 --- a/harbour/contrib/hbqt/QLCDNumber.cpp +++ b/harbour/contrib/hbqt/QLCDNumber.cpp @@ -71,6 +71,7 @@ * enum SegmentStyle { Outline, Filled, Flat } */ +#include #include @@ -80,19 +81,18 @@ * QLCDNumber ( uint numDigits, QWidget * parent = 0 ) * ~QLCDNumber () */ + HB_FUNC( QT_QLCDNUMBER ) { - hb_retptr( ( QLCDNumber * ) new QLCDNumber( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QLCDNumber > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QLCDNUMBER_DESTROY ) -{ - delete hbqt_par_QLCDNumber( 1 ); -} + pObj = ( QLCDNumber * ) new QLCDNumber( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * bool checkOverflow ( double num ) const */ diff --git a/harbour/contrib/hbqt/QLabel.cpp b/harbour/contrib/hbqt/QLabel.cpp index 24b2c22581..f109428add 100644 --- a/harbour/contrib/hbqt/QLabel.cpp +++ b/harbour/contrib/hbqt/QLabel.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -75,19 +76,18 @@ * QLabel ( const QString & text, QWidget * parent = 0, Qt::WindowFlags f = 0 ) * ~QLabel () */ + HB_FUNC( QT_QLABEL ) { - hb_retptr( ( QLabel* ) new QLabel( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QLabel > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QLABEL_DESTROY ) -{ - delete hbqt_par_QLabel( 1 ); -} + pObj = ( QLabel* ) new QLabel( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * Qt::Alignment alignment () const */ diff --git a/harbour/contrib/hbqt/QLatin1Char.cpp b/harbour/contrib/hbqt/QLatin1Char.cpp index 5b165e5777..2e7ed3b994 100644 --- a/harbour/contrib/hbqt/QLatin1Char.cpp +++ b/harbour/contrib/hbqt/QLatin1Char.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -73,19 +74,15 @@ /* * QLatin1Char ( char c ) */ + HB_FUNC( QT_QLATIN1CHAR ) { - hb_retptr( ( QLatin1Char* ) new QLatin1Char( *hb_parcx( 1 ) ) ); + void * pObj = NULL; + + pObj = ( QLatin1Char* ) new QLatin1Char( *hb_parcx( 1 ) ) ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QLATIN1CHAR_DESTROY ) -{ - -} - /* * char toLatin1 () const */ @@ -99,7 +96,7 @@ HB_FUNC( QT_QLATIN1CHAR_TOLATIN1 ) */ HB_FUNC( QT_QLATIN1CHAR_UNICODE ) { - hb_retptr( new ushort( hbqt_par_QLatin1Char( 1 )->unicode() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new ushort( hbqt_par_QLatin1Char( 1 )->unicode() ) ) ); } diff --git a/harbour/contrib/hbqt/QLatin1String.cpp b/harbour/contrib/hbqt/QLatin1String.cpp index 7dc37dc34f..8c8b833de1 100644 --- a/harbour/contrib/hbqt/QLatin1String.cpp +++ b/harbour/contrib/hbqt/QLatin1String.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -73,19 +74,15 @@ /* * QLatin1String ( const char * str ) */ + HB_FUNC( QT_QLATIN1STRING ) { - hb_retptr( ( QLatin1String* ) new QLatin1String( hb_parcx( 1 ) ) ); + void * pObj = NULL; + + pObj = ( QLatin1String* ) new QLatin1String( hb_parcx( 1 ) ) ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QLATIN1STRING_DESTROY ) -{ - -} - /* * const char * latin1 () const */ diff --git a/harbour/contrib/hbqt/QLayout.cpp b/harbour/contrib/hbqt/QLayout.cpp index 8714df1ebd..2c90343dd9 100644 --- a/harbour/contrib/hbqt/QLayout.cpp +++ b/harbour/contrib/hbqt/QLayout.cpp @@ -70,6 +70,7 @@ * enum SizeConstraint { SetDefaultConstraint, SetFixedSize, SetMinimumSize, SetMaximumSize, SetMinAndMaxSize, SetNoConstraint } */ +#include #include @@ -78,19 +79,10 @@ * QLayout ( QWidget * parent ) * QLayout () */ + HB_FUNC( QT_QLAYOUT ) { - } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QLAYOUT_DESTROY ) -{ - -} - /* * bool activate () */ @@ -120,7 +112,7 @@ HB_FUNC( QT_QLAYOUT_ADDWIDGET ) */ HB_FUNC( QT_QLAYOUT_CONTENTSRECT ) { - hb_retptr( new QRect( hbqt_par_QLayout( 1 )->contentsRect() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QLayout( 1 )->contentsRect() ) ) ); } /* @@ -186,7 +178,7 @@ HB_FUNC( QT_QLAYOUT_ITEMAT ) */ HB_FUNC( QT_QLAYOUT_MAXIMUMSIZE ) { - hb_retptr( new QSize( hbqt_par_QLayout( 1 )->maximumSize() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QLayout( 1 )->maximumSize() ) ) ); } /* @@ -202,7 +194,7 @@ HB_FUNC( QT_QLAYOUT_MENUBAR ) */ HB_FUNC( QT_QLAYOUT_MINIMUMSIZE ) { - hb_retptr( new QSize( hbqt_par_QLayout( 1 )->minimumSize() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QLayout( 1 )->minimumSize() ) ) ); } /* @@ -330,7 +322,7 @@ HB_FUNC( QT_QLAYOUT_UPDATE ) */ HB_FUNC( QT_QLAYOUT_CLOSESTACCEPTABLESIZE ) { - hb_retptr( new QSize( hbqt_par_QLayout( 1 )->closestAcceptableSize( hbqt_par_QWidget( 2 ), *hbqt_par_QSize( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QLayout( 1 )->closestAcceptableSize( hbqt_par_QWidget( 2 ), *hbqt_par_QSize( 3 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/QLayoutItem.cpp b/harbour/contrib/hbqt/QLayoutItem.cpp index 7ebaca6c7f..ac494c1061 100644 --- a/harbour/contrib/hbqt/QLayoutItem.cpp +++ b/harbour/contrib/hbqt/QLayoutItem.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,19 +75,10 @@ * QLayoutItem ( Qt::Alignment alignment = 0 ) * virtual ~QLayoutItem () */ + HB_FUNC( QT_QLAYOUTITEM ) { - } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QLAYOUTITEM_DESTROY ) -{ - delete hbqt_par_QLayoutItem( 1 ); -} - /* * Qt::Alignment alignment () const */ @@ -116,7 +108,7 @@ HB_FUNC( QT_QLAYOUTITEM_EXPANDINGDIRECTIONS ) */ HB_FUNC( QT_QLAYOUTITEM_GEOMETRY ) { - hb_retptr( new QRect( hbqt_par_QLayoutItem( 1 )->geometry() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QLayoutItem( 1 )->geometry() ) ) ); } /* @@ -164,7 +156,7 @@ HB_FUNC( QT_QLAYOUTITEM_LAYOUT ) */ HB_FUNC( QT_QLAYOUTITEM_MAXIMUMSIZE ) { - hb_retptr( new QSize( hbqt_par_QLayoutItem( 1 )->maximumSize() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QLayoutItem( 1 )->maximumSize() ) ) ); } /* @@ -180,7 +172,7 @@ HB_FUNC( QT_QLAYOUTITEM_MINIMUMHEIGHTFORWIDTH ) */ HB_FUNC( QT_QLAYOUTITEM_MINIMUMSIZE ) { - hb_retptr( new QSize( hbqt_par_QLayoutItem( 1 )->minimumSize() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QLayoutItem( 1 )->minimumSize() ) ) ); } /* @@ -204,7 +196,7 @@ HB_FUNC( QT_QLAYOUTITEM_SETGEOMETRY ) */ HB_FUNC( QT_QLAYOUTITEM_SIZEHINT ) { - hb_retptr( new QSize( hbqt_par_QLayoutItem( 1 )->sizeHint() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QLayoutItem( 1 )->sizeHint() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QLine.cpp b/harbour/contrib/hbqt/QLine.cpp index 9da38980f8..71c20a2ffe 100644 --- a/harbour/contrib/hbqt/QLine.cpp +++ b/harbour/contrib/hbqt/QLine.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -75,40 +76,39 @@ * QLine ( const QPoint & p1, const QPoint & p2 ) * QLine ( int x1, int y1, int x2, int y2 ) */ + HB_FUNC( QT_QLINE ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QLine* ) new QLine( *hbqt_par_QLine( 1 ) ) ); + pObj = ( QLine* ) new QLine( *hbqt_par_QLine( 1 ) ) ; } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( ( QLine* ) new QLine( *hbqt_par_QPoint( 1 ), *hbqt_par_QPoint( 2 ) ) ); + pObj = ( QLine* ) new QLine( *hbqt_par_QPoint( 1 ), *hbqt_par_QPoint( 2 ) ) ; } else if( hb_pcount() == 4 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) ) { - hb_retptr( ( QLine* ) new QLine( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ) ) ); + pObj = ( QLine* ) new QLine( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ) ) ; } else { - hb_retptr( ( QLine* ) new QLine() ); + pObj = ( QLine* ) new QLine() ; } + + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QLine" ); + hb_retptrGC( p ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QLINE_DESTROY ) -{ - -} - /* * QPoint p1 () const */ HB_FUNC( QT_QLINE_P1 ) { - hb_retptr( new QPoint( hbqt_par_QLine( 1 )->p1() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QLine( 1 )->p1() ) ) ); } /* @@ -116,7 +116,7 @@ HB_FUNC( QT_QLINE_P1 ) */ HB_FUNC( QT_QLINE_P2 ) { - hb_retptr( new QPoint( hbqt_par_QLine( 1 )->p2() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QLine( 1 )->p2() ) ) ); } /* @@ -228,7 +228,7 @@ HB_FUNC( QT_QLINE_TRANSLATE_1 ) */ HB_FUNC( QT_QLINE_TRANSLATED ) { - hb_retptr( new QLine( hbqt_par_QLine( 1 )->translated( *hbqt_par_QPoint( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QLine( hbqt_par_QLine( 1 )->translated( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* @@ -236,7 +236,7 @@ HB_FUNC( QT_QLINE_TRANSLATED ) */ HB_FUNC( QT_QLINE_TRANSLATED_1 ) { - hb_retptr( new QLine( hbqt_par_QLine( 1 )->translated( hb_parni( 2 ), hb_parni( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QLine( hbqt_par_QLine( 1 )->translated( hb_parni( 2 ), hb_parni( 3 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/QLineEdit.cpp b/harbour/contrib/hbqt/QLineEdit.cpp index 85b2ac93e2..83d6243822 100644 --- a/harbour/contrib/hbqt/QLineEdit.cpp +++ b/harbour/contrib/hbqt/QLineEdit.cpp @@ -70,6 +70,7 @@ * enum EchoMode { Normal, NoEcho, Password, PasswordEchoOnEdit } */ +#include #include @@ -79,19 +80,18 @@ * QLineEdit ( const QString & contents, QWidget * parent = 0 ) * ~QLineEdit () */ + HB_FUNC( QT_QLINEEDIT ) { - hb_retptr( ( QLineEdit* ) new QLineEdit( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QLineEdit > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QLINEEDIT_DESTROY ) -{ - delete hbqt_par_QLineEdit( 1 ); -} + pObj = ( QLineEdit* ) new QLineEdit( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * Qt::Alignment alignment () const */ @@ -331,7 +331,7 @@ HB_FUNC( QT_QLINEEDIT_MAXLENGTH ) */ HB_FUNC( QT_QLINEEDIT_MINIMUMSIZEHINT ) { - hb_retptr( new QSize( hbqt_par_QLineEdit( 1 )->minimumSizeHint() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QLineEdit( 1 )->minimumSizeHint() ) ) ); } /* @@ -459,7 +459,7 @@ HB_FUNC( QT_QLINEEDIT_SETVALIDATOR ) */ HB_FUNC( QT_QLINEEDIT_SIZEHINT ) { - hb_retptr( new QSize( hbqt_par_QLineEdit( 1 )->sizeHint() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QLineEdit( 1 )->sizeHint() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QLinearGradient.cpp b/harbour/contrib/hbqt/QLinearGradient.cpp index bb13da6fba..d45ea60f6e 100644 --- a/harbour/contrib/hbqt/QLinearGradient.cpp +++ b/harbour/contrib/hbqt/QLinearGradient.cpp @@ -72,6 +72,7 @@ * enum Type { LinearGradient, RadialGradient, ConicalGradient, NoGradient } */ +#include #include @@ -81,40 +82,36 @@ * QLinearGradient ( const QPointF & start, const QPointF & finalStop ) * QLinearGradient ( qreal x1, qreal y1, qreal x2, qreal y2 ) */ + HB_FUNC( QT_QLINEARGRADIENT ) { + void * pObj = NULL; + if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QLinearGradient* ) new QLinearGradient( *hbqt_par_QLinearGradient( 1 ) ) ); + pObj = ( QLinearGradient* ) new QLinearGradient( *hbqt_par_QLinearGradient( 1 ) ) ; } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( ( QLinearGradient* ) new QLinearGradient( *hbqt_par_QPoint( 1 ), *hbqt_par_QPoint( 2 ) ) ); + pObj = ( QLinearGradient* ) new QLinearGradient( *hbqt_par_QPoint( 1 ), *hbqt_par_QPoint( 2 ) ) ; } else if( hb_pcount() == 4 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) ) { - hb_retptr( ( QLinearGradient* ) new QLinearGradient( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ) ) ); + pObj = ( QLinearGradient* ) new QLinearGradient( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ) ) ; } else { - hb_retptr( ( QLinearGradient* ) new QLinearGradient() ); + pObj = ( QLinearGradient* ) new QLinearGradient() ; } + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QLINEARGRADIENT_DESTROY ) -{ - -} - /* * QPointF finalStop () const */ HB_FUNC( QT_QLINEARGRADIENT_FINALSTOP ) { - hb_retptr( new QPointF( hbqt_par_QLinearGradient( 1 )->finalStop() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPointF( hbqt_par_QLinearGradient( 1 )->finalStop() ) ) ); } /* @@ -154,7 +151,7 @@ HB_FUNC( QT_QLINEARGRADIENT_SETSTART_1 ) */ HB_FUNC( QT_QLINEARGRADIENT_START ) { - hb_retptr( new QPointF( hbqt_par_QLinearGradient( 1 )->start() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPointF( hbqt_par_QLinearGradient( 1 )->start() ) ) ); } diff --git a/harbour/contrib/hbqt/QList.cpp b/harbour/contrib/hbqt/QList.cpp index ea4c74232b..1752f7744b 100644 --- a/harbour/contrib/hbqt/QList.cpp +++ b/harbour/contrib/hbqt/QList.cpp @@ -92,6 +92,7 @@ * //const_iterator end () const */ +#include #include @@ -101,20 +102,16 @@ * QList ( const QList & other ) * ~QList () */ + HB_FUNC( QT_QLIST ) { + void * pObj = NULL; + QList* list = NULL; - hb_retptr( ( QList* ) list ); -} + pObj = ( QList* ) list ; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QLIST_DESTROY ) -{ - delete hbqt_par_QList( 1 ); + hb_retptr( pObj ); } - /* * void append ( const T & value ) */ diff --git a/harbour/contrib/hbqt/QListView.cpp b/harbour/contrib/hbqt/QListView.cpp index 5d86c92251..b38e68a891 100644 --- a/harbour/contrib/hbqt/QListView.cpp +++ b/harbour/contrib/hbqt/QListView.cpp @@ -74,6 +74,7 @@ * enum ViewMode { ListMode, IconMode } */ +#include #include @@ -82,19 +83,18 @@ * QListView ( QWidget * parent = 0 ) * ~QListView () */ + HB_FUNC( QT_QLISTVIEW ) { - hb_retptr( ( QListView * ) new QListView( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QListView > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QLISTVIEW_DESTROY ) -{ - delete hbqt_par_QListView( 1 ); -} + pObj = ( QListView * ) new QListView( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * int batchSize () const */ @@ -124,7 +124,7 @@ HB_FUNC( QT_QLISTVIEW_FLOW ) */ HB_FUNC( QT_QLISTVIEW_GRIDSIZE ) { - hb_retptr( new QSize( hbqt_par_QListView( 1 )->gridSize() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QListView( 1 )->gridSize() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QListWidget.cpp b/harbour/contrib/hbqt/QListWidget.cpp index 6a307fb4c1..6edab1b0b3 100644 --- a/harbour/contrib/hbqt/QListWidget.cpp +++ b/harbour/contrib/hbqt/QListWidget.cpp @@ -76,6 +76,7 @@ * QList selectedItems () const */ +#include #include @@ -84,19 +85,18 @@ * QListWidget ( QWidget * parent = 0 ) * ~QListWidget () */ + HB_FUNC( QT_QLISTWIDGET ) { - hb_retptr( new QListWidget( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QListWidget > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QLISTWIDGET_DESTROY ) -{ - delete hbqt_par_QListWidget( 1 ); -} + pObj = new QListWidget( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * void addItem ( const QString & label ) */ @@ -318,7 +318,7 @@ HB_FUNC( QT_QLISTWIDGET_TAKEITEM ) */ HB_FUNC( QT_QLISTWIDGET_VISUALITEMRECT ) { - hb_retptr( new QRect( hbqt_par_QListWidget( 1 )->visualItemRect( hbqt_par_QListWidgetItem( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QListWidget( 1 )->visualItemRect( hbqt_par_QListWidgetItem( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QListWidgetItem.cpp b/harbour/contrib/hbqt/QListWidgetItem.cpp index 5e17c337b8..7d5fc133a0 100644 --- a/harbour/contrib/hbqt/QListWidgetItem.cpp +++ b/harbour/contrib/hbqt/QListWidgetItem.cpp @@ -70,6 +70,7 @@ * enum ItemType { Type, UserType } */ +#include #include @@ -81,25 +82,21 @@ * QListWidgetItem ( const QListWidgetItem & other ) * virtual ~QListWidgetItem () */ + HB_FUNC( QT_QLISTWIDGETITEM ) { - hb_retptr( new QListWidgetItem( hbqt_par_QListWidget( 1 ), hb_parni( 2 ) ) ); -} + void * pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QLISTWIDGETITEM_DESTROY ) -{ - delete hbqt_par_QListWidgetItem( 1 ); -} + pObj = new QListWidgetItem( hbqt_par_QListWidget( 1 ), hb_parni( 2 ) ) ; + hb_retptr( pObj ); +} /* * QBrush background () const */ HB_FUNC( QT_QLISTWIDGETITEM_BACKGROUND ) { - hb_retptr( new QBrush( hbqt_par_QListWidgetItem( 1 )->background() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QListWidgetItem( 1 )->background() ) ) ); } /* @@ -123,7 +120,7 @@ HB_FUNC( QT_QLISTWIDGETITEM_CLONE ) */ HB_FUNC( QT_QLISTWIDGETITEM_DATA ) { - hb_retptr( new QVariant( hbqt_par_QListWidgetItem( 1 )->data( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QListWidgetItem( 1 )->data( hb_parni( 2 ) ) ) ) ); } /* @@ -139,7 +136,7 @@ HB_FUNC( QT_QLISTWIDGETITEM_FLAGS ) */ HB_FUNC( QT_QLISTWIDGETITEM_FONT ) { - hb_retptr( new QFont( hbqt_par_QListWidgetItem( 1 )->font() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QListWidgetItem( 1 )->font() ) ) ); } /* @@ -147,7 +144,7 @@ HB_FUNC( QT_QLISTWIDGETITEM_FONT ) */ HB_FUNC( QT_QLISTWIDGETITEM_FOREGROUND ) { - hb_retptr( new QBrush( hbqt_par_QListWidgetItem( 1 )->foreground() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QListWidgetItem( 1 )->foreground() ) ) ); } /* @@ -155,7 +152,7 @@ HB_FUNC( QT_QLISTWIDGETITEM_FOREGROUND ) */ HB_FUNC( QT_QLISTWIDGETITEM_ICON ) { - hb_retptr( new QIcon( hbqt_par_QListWidgetItem( 1 )->icon() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QListWidgetItem( 1 )->icon() ) ) ); } /* @@ -315,7 +312,7 @@ HB_FUNC( QT_QLISTWIDGETITEM_SETWHATSTHIS ) */ HB_FUNC( QT_QLISTWIDGETITEM_SIZEHINT ) { - hb_retptr( new QSize( hbqt_par_QListWidgetItem( 1 )->sizeHint() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QListWidgetItem( 1 )->sizeHint() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QMainWindow.cpp b/harbour/contrib/hbqt/QMainWindow.cpp index a98c068673..79807606f2 100644 --- a/harbour/contrib/hbqt/QMainWindow.cpp +++ b/harbour/contrib/hbqt/QMainWindow.cpp @@ -80,6 +80,7 @@ * QList tabifiedDockWidgets ( QDockWidget * dockwidget ) const */ +#include #include @@ -88,19 +89,18 @@ * QMainWindow ( QWidget * parent = 0, Qt::WindowFlags flags = 0 ) * ~QMainWindow () */ + HB_FUNC( QT_QMAINWINDOW ) { - hb_retptr( ( QMainWindow* ) new QMainWindow( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QMainWindow > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QMAINWINDOW_DESTROY ) -{ - delete hbqt_par_QMainWindow( 1 ); -} + pObj = ( QMainWindow* ) new QMainWindow( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget ) */ @@ -202,7 +202,7 @@ HB_FUNC( QT_QMAINWINDOW_DOCUMENTMODE ) */ HB_FUNC( QT_QMAINWINDOW_ICONSIZE ) { - hb_retptr( new QSize( hbqt_par_QMainWindow( 1 )->iconSize() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QMainWindow( 1 )->iconSize() ) ) ); } /* @@ -298,7 +298,7 @@ HB_FUNC( QT_QMAINWINDOW_RESTORESTATE ) */ HB_FUNC( QT_QMAINWINDOW_SAVESTATE ) { - hb_retptr( new QByteArray( hbqt_par_QMainWindow( 1 )->saveState( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QMainWindow( 1 )->saveState( hb_parni( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QMenu.cpp b/harbour/contrib/hbqt/QMenu.cpp index 19ff024582..1a8358f412 100644 --- a/harbour/contrib/hbqt/QMenu.cpp +++ b/harbour/contrib/hbqt/QMenu.cpp @@ -76,6 +76,7 @@ * HMENU wceMenu ( bool create = false ) */ +#include #include @@ -85,26 +86,25 @@ * QMenu ( const QString & title, QWidget * parent = 0 ) * ~QMenu () */ + HB_FUNC( QT_QMENU ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QMenu > pObj = NULL; + if( hb_pcount() >= 1 && HB_ISCHAR( 1 ) ) { - hb_retptr( ( QMenu* ) new QMenu( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) ); + pObj = ( QMenu* ) new QMenu( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) ; } else { - hb_retptr( ( QMenu* ) new QMenu( hbqt_par_QWidget( 1 ) ) ); + pObj = ( QMenu* ) new QMenu( hbqt_par_QWidget( 1 ) ) ; } -} -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QMENU_DESTROY ) -{ - delete hbqt_par_QMenu( 1 ); + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } - /* * QAction * actionAt ( const QPoint & pt ) const */ @@ -118,7 +118,7 @@ HB_FUNC( QT_QMENU_ACTIONAT ) */ HB_FUNC( QT_QMENU_ACTIONGEOMETRY ) { - hb_retptr( new QRect( hbqt_par_QMenu( 1 )->actionGeometry( hbqt_par_QAction( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QMenu( 1 )->actionGeometry( hbqt_par_QAction( 2 ) ) ) ) ); } /* @@ -246,7 +246,7 @@ HB_FUNC( QT_QMENU_HIDETEAROFFMENU ) */ HB_FUNC( QT_QMENU_ICON ) { - hb_retptr( new QIcon( hbqt_par_QMenu( 1 )->icon() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QMenu( 1 )->icon() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QMenuBar.cpp b/harbour/contrib/hbqt/QMenuBar.cpp index 52a80ef172..1a0a950d4c 100644 --- a/harbour/contrib/hbqt/QMenuBar.cpp +++ b/harbour/contrib/hbqt/QMenuBar.cpp @@ -80,6 +80,7 @@ * // void setDefaultAction ( QAction * act ) */ +#include #include @@ -88,19 +89,18 @@ * QMenuBar ( QWidget * parent = 0 ) * ~QMenuBar () */ + HB_FUNC( QT_QMENUBAR ) { - hb_retptr( ( QMenuBar* ) new QMenuBar( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QMenuBar > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QMENUBAR_DESTROY ) -{ - delete hbqt_par_QMenuBar( 1 ); -} + pObj = ( QMenuBar* ) new QMenuBar( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * QAction * activeAction () const */ diff --git a/harbour/contrib/hbqt/QMessageBox.cpp b/harbour/contrib/hbqt/QMessageBox.cpp index 0263d0cf54..7e570f7963 100644 --- a/harbour/contrib/hbqt/QMessageBox.cpp +++ b/harbour/contrib/hbqt/QMessageBox.cpp @@ -82,6 +82,7 @@ * QList buttons () const */ +#include #include @@ -91,19 +92,18 @@ * QMessageBox ( Icon icon, const QString & title, const QString & text, StandardButtons buttons = NoButton, QWidget * parent = 0, Qt::WindowFlags f = Qt::Dialog | Qt::MSWindowsFixedSizeDialogHint ) * ~QMessageBox () */ + HB_FUNC( QT_QMESSAGEBOX ) { - hb_retptr( ( QMessageBox* ) new QMessageBox() ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QMessageBox > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QMESSAGEBOX_DESTROY ) -{ - delete hbqt_par_QMessageBox( 1 ); -} + pObj = ( QMessageBox* ) new QMessageBox() ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * void addButton ( QAbstractButton * button, ButtonRole role ) */ @@ -189,7 +189,7 @@ HB_FUNC( QT_QMESSAGEBOX_ICON ) */ HB_FUNC( QT_QMESSAGEBOX_ICONPIXMAP ) { - hb_retptr( new QPixmap( hbqt_par_QMessageBox( 1 )->iconPixmap() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QMessageBox( 1 )->iconPixmap() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QModelIndex.cpp b/harbour/contrib/hbqt/QModelIndex.cpp index cfd80bae10..6bfc05de49 100644 --- a/harbour/contrib/hbqt/QModelIndex.cpp +++ b/harbour/contrib/hbqt/QModelIndex.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -75,25 +76,24 @@ * QModelIndex ( const QModelIndex & other ) * ~QModelIndex () */ + HB_FUNC( QT_QMODELINDEX ) { - hb_retptr( ( QModelIndex * ) new QModelIndex() ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QMODELINDEX_DESTROY ) -{ - delete hbqt_par_QModelIndex( 1 ); -} + pObj = new QModelIndex() ; + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QModelIndex" ); + hb_retptrGC( p ); +} /* * QModelIndex child ( int row, int column ) const */ HB_FUNC( QT_QMODELINDEX_CHILD ) { - hb_retptr( new QModelIndex( hbqt_par_QModelIndex( 1 )->child( hb_parni( 2 ), hb_parni( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QModelIndex( 1 )->child( hb_parni( 2 ), hb_parni( 3 ) ) ) ) ); } /* @@ -109,7 +109,7 @@ HB_FUNC( QT_QMODELINDEX_COLUMN ) */ HB_FUNC( QT_QMODELINDEX_DATA ) { - hb_retptr( new QVariant( hbqt_par_QModelIndex( 1 )->data( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : Qt::DisplayRole ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QModelIndex( 1 )->data( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : Qt::DisplayRole ) ) ) ) ); } /* @@ -157,7 +157,7 @@ HB_FUNC( QT_QMODELINDEX_MODEL ) */ HB_FUNC( QT_QMODELINDEX_PARENT ) { - hb_retptr( new QModelIndex( hbqt_par_QModelIndex( 1 )->parent() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QModelIndex( 1 )->parent() ) ) ); } /* @@ -173,7 +173,7 @@ HB_FUNC( QT_QMODELINDEX_ROW ) */ HB_FUNC( QT_QMODELINDEX_SIBLING ) { - hb_retptr( new QModelIndex( hbqt_par_QModelIndex( 1 )->sibling( hb_parni( 2 ), hb_parni( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QModelIndex( 1 )->sibling( hb_parni( 2 ), hb_parni( 3 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/QMouseEvent.cpp b/harbour/contrib/hbqt/QMouseEvent.cpp index 902e2c222c..23cd71c5e6 100644 --- a/harbour/contrib/hbqt/QMouseEvent.cpp +++ b/harbour/contrib/hbqt/QMouseEvent.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -75,19 +76,18 @@ * QMouseEvent ( Type type, const QPoint & pos, const QPoint & globalPos, Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers ) * ~QMouseEvent () */ + HB_FUNC( QT_QMOUSEEVENT ) { - hb_retptr( ( QMouseEvent * ) new QMouseEvent( *hbqt_par_QMouseEvent( 1 ) ) ); -} + void * pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QMOUSEEVENT_DESTROY ) -{ - delete hbqt_par_QMouseEvent( 1 ); -} + if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) + { + pObj = new QMouseEvent( *hbqt_par_QMouseEvent( 1 ) ) ; + } + hb_retptr( pObj ); +} /* * Qt::MouseButton button () const */ @@ -109,7 +109,7 @@ HB_FUNC( QT_QMOUSEEVENT_BUTTONS ) */ HB_FUNC( QT_QMOUSEEVENT_GLOBALPOS ) { - hb_retptr( new QPoint( hbqt_par_QMouseEvent( 1 )->globalPos() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QMouseEvent( 1 )->globalPos() ) ) ); } /* @@ -133,7 +133,7 @@ HB_FUNC( QT_QMOUSEEVENT_GLOBALY ) */ HB_FUNC( QT_QMOUSEEVENT_POS ) { - hb_retptr( new QPoint( hbqt_par_QMouseEvent( 1 )->pos() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QMouseEvent( 1 )->pos() ) ) ); } /* @@ -141,7 +141,7 @@ HB_FUNC( QT_QMOUSEEVENT_POS ) */ HB_FUNC( QT_QMOUSEEVENT_POSF ) { - hb_retptr( new QPointF( hbqt_par_QMouseEvent( 1 )->posF() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPointF( hbqt_par_QMouseEvent( 1 )->posF() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QMoveEvent.cpp b/harbour/contrib/hbqt/QMoveEvent.cpp index 1f0a483604..5531cbcb7e 100644 --- a/harbour/contrib/hbqt/QMoveEvent.cpp +++ b/harbour/contrib/hbqt/QMoveEvent.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,25 +75,16 @@ * QMoveEvent ( const QPoint & pos, const QPoint & oldPos ) * ~QMoveEvent () */ + HB_FUNC( QT_QMOVEEVENT ) { - // hb_retptr( ( QMoveEvent* ) new QMoveEvent() ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QMOVEEVENT_DESTROY ) -{ - delete hbqt_par_QMoveEvent( 1 ); -} - /* * const QPoint & oldPos () const */ HB_FUNC( QT_QMOVEEVENT_OLDPOS ) { - hb_retptr( new QPoint( hbqt_par_QMoveEvent( 1 )->oldPos() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QMoveEvent( 1 )->oldPos() ) ) ); } /* @@ -100,7 +92,7 @@ HB_FUNC( QT_QMOVEEVENT_OLDPOS ) */ HB_FUNC( QT_QMOVEEVENT_POS ) { - hb_retptr( new QPoint( hbqt_par_QMoveEvent( 1 )->pos() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QMoveEvent( 1 )->pos() ) ) ); } diff --git a/harbour/contrib/hbqt/QObject.cpp b/harbour/contrib/hbqt/QObject.cpp index 8a9ba84605..0869a87c91 100644 --- a/harbour/contrib/hbqt/QObject.cpp +++ b/harbour/contrib/hbqt/QObject.cpp @@ -82,6 +82,7 @@ * //T findChild ( const QString & name = QString() ) const */ +#include #include #include @@ -91,19 +92,18 @@ * Q_INVOKABLE QObject ( QObject * parent = 0 ) * virtual ~QObject () */ + HB_FUNC( QT_QOBJECT ) { - hb_retptr( ( QObject* ) new QObject( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QObject > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QOBJECT_DESTROY ) -{ - delete hbqt_par_QObject( 1 ); -} + pObj = ( QObject* ) new QObject( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * bool blockSignals ( bool block ) */ @@ -117,7 +117,7 @@ HB_FUNC( QT_QOBJECT_BLOCKSIGNALS ) */ HB_FUNC( QT_QOBJECT_CHILDREN ) { - hb_retptr( new QObjectList( hbqt_par_QObject( 1 )->children() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QObjectList( hbqt_par_QObject( 1 )->children() ) ) ); } /* @@ -245,7 +245,7 @@ HB_FUNC( QT_QOBJECT_PARENT ) */ HB_FUNC( QT_QOBJECT_PROPERTY ) { - hb_retptr( new QVariant( hbqt_par_QObject( 1 )->property( hbqt_par_char( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QObject( 1 )->property( hbqt_par_char( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QPageSetupDialog.cpp b/harbour/contrib/hbqt/QPageSetupDialog.cpp index b01c77bb33..8bcbabbf08 100644 --- a/harbour/contrib/hbqt/QPageSetupDialog.cpp +++ b/harbour/contrib/hbqt/QPageSetupDialog.cpp @@ -71,6 +71,7 @@ * flags PageSetupDialogOptions */ +#include #include @@ -79,22 +80,21 @@ * QPageSetupDialog ( QPrinter * printer, QWidget * parent = 0 ) * QPageSetupDialog ( QWidget * parent = 0 ) */ + HB_FUNC( QT_QPAGESETUPDIALOG ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QPageSetupDialog > pObj = NULL; + if( hb_pcount() >= 2 ) - hb_retptr( ( QPageSetupDialog* ) new QPageSetupDialog( hbqt_par_QPrinter( 1 ), hbqt_par_QWidget( 1 ) ) ); + pObj = ( QPageSetupDialog* ) new QPageSetupDialog( hbqt_par_QPrinter( 1 ), hbqt_par_QWidget( 1 ) ) ; else - hb_retptr( ( QPageSetupDialog* ) new QPageSetupDialog( hbqt_par_QWidget( 1 ) ) ); + pObj = ( QPageSetupDialog* ) new QPageSetupDialog( hbqt_par_QWidget( 1 ) ) ; + + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QPAGESETUPDIALOG_DESTROY ) -{ - -} - /* * virtual int exec () */ diff --git a/harbour/contrib/hbqt/QPaintDevice.cpp b/harbour/contrib/hbqt/QPaintDevice.cpp index e7bd0995d8..4a011b7957 100644 --- a/harbour/contrib/hbqt/QPaintDevice.cpp +++ b/harbour/contrib/hbqt/QPaintDevice.cpp @@ -70,25 +70,17 @@ * enum PaintDeviceMetric { PdmWidth, PdmHeight, PdmWidthMM, PdmHeightMM, ..., PdmPhysicalDpiY } */ +#include #include /* * virtual ~QPaintDevice () */ + HB_FUNC( QT_QPAINTDEVICE ) { - } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QPAINTDEVICE_DESTROY ) -{ - delete hbqt_par_QPaintDevice( 1 ); -} - /* * int depth () const */ diff --git a/harbour/contrib/hbqt/QPaintEvent.cpp b/harbour/contrib/hbqt/QPaintEvent.cpp index be17934dae..42fda1ef74 100644 --- a/harbour/contrib/hbqt/QPaintEvent.cpp +++ b/harbour/contrib/hbqt/QPaintEvent.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,25 +75,33 @@ * QPaintEvent ( const QRegion & paintRegion ) * QPaintEvent ( const QRect & paintRect ) */ + HB_FUNC( QT_QPAINTEVENT ) { - hb_retptr( ( QPaintEvent* ) new QPaintEvent( *hbqt_par_QRect( 1 ) ) ); + void * pObj = NULL; + + if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) ) + { + QString objName = ( QString ) hbqt_par_QString( 1 ); + + if( objName == ( QString ) "QRect" ) + { + pObj = new QPaintEvent( *hbqt_par_QRect( 1 ) ) ; + } + else if( objName == ( QString ) "QRegion" ) + { + pObj = new QPaintEvent( *hbqt_par_QRegion( 1 ) ) ; + } + } + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QPAINTEVENT_DESTROY ) -{ - -} - /* * const QRect & rect () const */ HB_FUNC( QT_QPAINTEVENT_RECT ) { - hb_retptr( new QRect( hbqt_par_QPaintEvent( 1 )->rect() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QPaintEvent( 1 )->rect() ) ) ); } /* @@ -100,7 +109,7 @@ HB_FUNC( QT_QPAINTEVENT_RECT ) */ HB_FUNC( QT_QPAINTEVENT_REGION ) { - hb_retptr( new QRegion( hbqt_par_QPaintEvent( 1 )->region() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRegion( hbqt_par_QPaintEvent( 1 )->region() ) ) ); } diff --git a/harbour/contrib/hbqt/QPainter.cpp b/harbour/contrib/hbqt/QPainter.cpp index 4b9aceaa50..4ac8333b72 100644 --- a/harbour/contrib/hbqt/QPainter.cpp +++ b/harbour/contrib/hbqt/QPainter.cpp @@ -86,6 +86,7 @@ * void drawRects ( const QVector & rectangles ) */ +#include #include @@ -94,32 +95,28 @@ * QPainter ( QPaintDevice * device ) * ~QPainter () */ + HB_FUNC( QT_QPAINTER ) { - if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) ) - { - hb_retptr( ( QPainter* ) new QPainter( hbqt_par_QPaintDevice( 1 ) ) ); - } - else - { - hb_retptr( ( QPainter* ) new QPainter() ); - } -} + void * pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QPAINTER_DESTROY ) -{ - delete hbqt_par_QPainter( 1 ); -} + if( hb_pcount() >= 1 && HB_ISPOINTER( 1 ) ) + { + pObj = new QPainter( hbqt_par_QPaintDevice( 1 ) ) ; + } + else + { + pObj = new QPainter() ; + } + hb_retptr( pObj ); +} /* * const QBrush & background () const */ HB_FUNC( QT_QPAINTER_BACKGROUND ) { - hb_retptr( new QBrush( hbqt_par_QPainter( 1 )->background() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QPainter( 1 )->background() ) ) ); } /* @@ -143,7 +140,7 @@ HB_FUNC( QT_QPAINTER_BEGIN ) */ HB_FUNC( QT_QPAINTER_BOUNDINGRECT ) { - hb_retptr( new QRectF( hbqt_par_QPainter( 1 )->boundingRect( *hbqt_par_QRectF( 2 ), hb_parni( 3 ), hbqt_par_QString( 4 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QPainter( 1 )->boundingRect( *hbqt_par_QRectF( 2 ), hb_parni( 3 ), hbqt_par_QString( 4 ) ) ) ) ); } /* @@ -151,7 +148,7 @@ HB_FUNC( QT_QPAINTER_BOUNDINGRECT ) */ HB_FUNC( QT_QPAINTER_BOUNDINGRECT_1 ) { - hb_retptr( new QRect( hbqt_par_QPainter( 1 )->boundingRect( *hbqt_par_QRect( 2 ), hb_parni( 3 ), hbqt_par_QString( 4 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QPainter( 1 )->boundingRect( *hbqt_par_QRect( 2 ), hb_parni( 3 ), hbqt_par_QString( 4 ) ) ) ) ); } /* @@ -159,7 +156,7 @@ HB_FUNC( QT_QPAINTER_BOUNDINGRECT_1 ) */ HB_FUNC( QT_QPAINTER_BOUNDINGRECT_2 ) { - hb_retptr( new QRect( hbqt_par_QPainter( 1 )->boundingRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), hbqt_par_QString( 7 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QPainter( 1 )->boundingRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), hbqt_par_QString( 7 ) ) ) ) ); } /* @@ -167,7 +164,7 @@ HB_FUNC( QT_QPAINTER_BOUNDINGRECT_2 ) */ HB_FUNC( QT_QPAINTER_BOUNDINGRECT_3 ) { - hb_retptr( new QRectF( hbqt_par_QPainter( 1 )->boundingRect( *hbqt_par_QRectF( 2 ), hbqt_par_QString( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QTextOption( 4 ) : QTextOption() ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QPainter( 1 )->boundingRect( *hbqt_par_QRectF( 2 ), hbqt_par_QString( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QTextOption( 4 ) : QTextOption() ) ) ) ) ); } /* @@ -175,7 +172,7 @@ HB_FUNC( QT_QPAINTER_BOUNDINGRECT_3 ) */ HB_FUNC( QT_QPAINTER_BRUSH ) { - hb_retptr( new QBrush( hbqt_par_QPainter( 1 )->brush() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QPainter( 1 )->brush() ) ) ); } /* @@ -183,7 +180,7 @@ HB_FUNC( QT_QPAINTER_BRUSH ) */ HB_FUNC( QT_QPAINTER_BRUSHORIGIN ) { - hb_retptr( new QPoint( hbqt_par_QPainter( 1 )->brushOrigin() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QPainter( 1 )->brushOrigin() ) ) ); } /* @@ -191,7 +188,7 @@ HB_FUNC( QT_QPAINTER_BRUSHORIGIN ) */ HB_FUNC( QT_QPAINTER_CLIPPATH ) { - hb_retptr( new QPainterPath( hbqt_par_QPainter( 1 )->clipPath() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPainterPath( hbqt_par_QPainter( 1 )->clipPath() ) ) ); } /* @@ -199,7 +196,7 @@ HB_FUNC( QT_QPAINTER_CLIPPATH ) */ HB_FUNC( QT_QPAINTER_CLIPREGION ) { - hb_retptr( new QRegion( hbqt_par_QPainter( 1 )->clipRegion() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRegion( hbqt_par_QPainter( 1 )->clipRegion() ) ) ); } /* @@ -207,7 +204,7 @@ HB_FUNC( QT_QPAINTER_CLIPREGION ) */ HB_FUNC( QT_QPAINTER_COMBINEDMATRIX ) { - hb_retptr( new QMatrix( hbqt_par_QPainter( 1 )->combinedMatrix() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QMatrix( hbqt_par_QPainter( 1 )->combinedMatrix() ) ) ); } /* @@ -215,7 +212,7 @@ HB_FUNC( QT_QPAINTER_COMBINEDMATRIX ) */ HB_FUNC( QT_QPAINTER_COMBINEDTRANSFORM ) { - hb_retptr( new QTransform( hbqt_par_QPainter( 1 )->combinedTransform() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTransform( hbqt_par_QPainter( 1 )->combinedTransform() ) ) ); } /* @@ -239,7 +236,7 @@ HB_FUNC( QT_QPAINTER_DEVICE ) */ HB_FUNC( QT_QPAINTER_DEVICEMATRIX ) { - hb_retptr( new QMatrix( hbqt_par_QPainter( 1 )->deviceMatrix() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QMatrix( hbqt_par_QPainter( 1 )->deviceMatrix() ) ) ); } /* @@ -247,7 +244,7 @@ HB_FUNC( QT_QPAINTER_DEVICEMATRIX ) */ HB_FUNC( QT_QPAINTER_DEVICETRANSFORM ) { - hb_retptr( new QTransform( hbqt_par_QPainter( 1 )->deviceTransform() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTransform( hbqt_par_QPainter( 1 )->deviceTransform() ) ) ); } /* @@ -1063,7 +1060,7 @@ HB_FUNC( QT_QPAINTER_FILLRECT_11 ) */ HB_FUNC( QT_QPAINTER_FONT ) { - hb_retptr( new QFont( hbqt_par_QPainter( 1 )->font() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QPainter( 1 )->font() ) ) ); } /* @@ -1071,7 +1068,7 @@ HB_FUNC( QT_QPAINTER_FONT ) */ HB_FUNC( QT_QPAINTER_FONTINFO ) { - hb_retptr( new QFontInfo( hbqt_par_QPainter( 1 )->fontInfo() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFontInfo( hbqt_par_QPainter( 1 )->fontInfo() ) ) ); } /* @@ -1079,7 +1076,7 @@ HB_FUNC( QT_QPAINTER_FONTINFO ) */ HB_FUNC( QT_QPAINTER_FONTMETRICS ) { - hb_retptr( new QFontMetrics( hbqt_par_QPainter( 1 )->fontMetrics() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFontMetrics( hbqt_par_QPainter( 1 )->fontMetrics() ) ) ); } /* @@ -1135,7 +1132,7 @@ HB_FUNC( QT_QPAINTER_PAINTENGINE ) */ HB_FUNC( QT_QPAINTER_PEN ) { - hb_retptr( new QPen( hbqt_par_QPainter( 1 )->pen() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPen( hbqt_par_QPainter( 1 )->pen() ) ) ); } /* @@ -1471,7 +1468,7 @@ HB_FUNC( QT_QPAINTER_TESTRENDERHINT ) */ HB_FUNC( QT_QPAINTER_TRANSFORM ) { - hb_retptr( new QTransform( hbqt_par_QPainter( 1 )->transform() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTransform( hbqt_par_QPainter( 1 )->transform() ) ) ); } /* @@ -1511,7 +1508,7 @@ HB_FUNC( QT_QPAINTER_VIEWTRANSFORMENABLED ) */ HB_FUNC( QT_QPAINTER_VIEWPORT ) { - hb_retptr( new QRect( hbqt_par_QPainter( 1 )->viewport() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QPainter( 1 )->viewport() ) ) ); } /* @@ -1519,7 +1516,7 @@ HB_FUNC( QT_QPAINTER_VIEWPORT ) */ HB_FUNC( QT_QPAINTER_WINDOW ) { - hb_retptr( new QRect( hbqt_par_QPainter( 1 )->window() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QPainter( 1 )->window() ) ) ); } /* @@ -1527,7 +1524,7 @@ HB_FUNC( QT_QPAINTER_WINDOW ) */ HB_FUNC( QT_QPAINTER_WORLDMATRIX ) { - hb_retptr( new QMatrix( hbqt_par_QPainter( 1 )->worldMatrix() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QMatrix( hbqt_par_QPainter( 1 )->worldMatrix() ) ) ); } /* @@ -1543,7 +1540,7 @@ HB_FUNC( QT_QPAINTER_WORLDMATRIXENABLED ) */ HB_FUNC( QT_QPAINTER_WORLDTRANSFORM ) { - hb_retptr( new QTransform( hbqt_par_QPainter( 1 )->worldTransform() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTransform( hbqt_par_QPainter( 1 )->worldTransform() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QPalette.cpp b/harbour/contrib/hbqt/QPalette.cpp index 6113510fcf..6299266ff7 100644 --- a/harbour/contrib/hbqt/QPalette.cpp +++ b/harbour/contrib/hbqt/QPalette.cpp @@ -71,6 +71,7 @@ * enum ColorRole { Window, Background, WindowText, Foreground, ..., NoRole } */ +#include #include @@ -84,40 +85,39 @@ * QPalette ( const QPalette & p ) * ~QPalette () */ + HB_FUNC( QT_QPALETTE ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + if( hb_pcount() == 1 && HB_ISNUM( 1 ) ) { - hb_retptr( ( QPalette* ) new QPalette( ( Qt::GlobalColor ) hb_parni( 1 ) ) ); + pObj = ( QPalette* ) new QPalette( ( Qt::GlobalColor ) hb_parni( 1 ) ) ; } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QPalette* ) new QPalette( *hbqt_par_QPalette( 1 ) ) ); + pObj = ( QPalette* ) new QPalette( *hbqt_par_QPalette( 1 ) ) ; } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( ( QPalette* ) new QPalette( *hbqt_par_QColor( 1 ), *hbqt_par_QColor( 2 ) ) ); + pObj = ( QPalette* ) new QPalette( *hbqt_par_QColor( 1 ), *hbqt_par_QColor( 2 ) ) ; } else { - hb_retptr( ( QPalette* ) new QPalette() ); + pObj = ( QPalette* ) new QPalette() ; } -} -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QPALETTE_DESTROY ) -{ - delete hbqt_par_QPalette( 1 ); + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QPalette" ); + hb_retptrGC( p ); } - /* * const QBrush & alternateBase () const */ HB_FUNC( QT_QPALETTE_ALTERNATEBASE ) { - hb_retptr( new QBrush( hbqt_par_QPalette( 1 )->alternateBase() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QPalette( 1 )->alternateBase() ) ) ); } /* @@ -125,7 +125,7 @@ HB_FUNC( QT_QPALETTE_ALTERNATEBASE ) */ HB_FUNC( QT_QPALETTE_BASE ) { - hb_retptr( new QBrush( hbqt_par_QPalette( 1 )->base() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QPalette( 1 )->base() ) ) ); } /* @@ -133,7 +133,7 @@ HB_FUNC( QT_QPALETTE_BASE ) */ HB_FUNC( QT_QPALETTE_BRIGHTTEXT ) { - hb_retptr( new QBrush( hbqt_par_QPalette( 1 )->brightText() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QPalette( 1 )->brightText() ) ) ); } /* @@ -141,7 +141,7 @@ HB_FUNC( QT_QPALETTE_BRIGHTTEXT ) */ HB_FUNC( QT_QPALETTE_BRUSH ) { - hb_retptr( new QBrush( hbqt_par_QPalette( 1 )->brush( ( QPalette::ColorGroup ) hb_parni( 2 ), ( QPalette::ColorRole ) hb_parni( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QPalette( 1 )->brush( ( QPalette::ColorGroup ) hb_parni( 2 ), ( QPalette::ColorRole ) hb_parni( 3 ) ) ) ) ); } /* @@ -149,7 +149,7 @@ HB_FUNC( QT_QPALETTE_BRUSH ) */ HB_FUNC( QT_QPALETTE_BRUSH_1 ) { - hb_retptr( new QBrush( hbqt_par_QPalette( 1 )->brush( ( QPalette::ColorRole ) hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QPalette( 1 )->brush( ( QPalette::ColorRole ) hb_parni( 2 ) ) ) ) ); } /* @@ -157,7 +157,7 @@ HB_FUNC( QT_QPALETTE_BRUSH_1 ) */ HB_FUNC( QT_QPALETTE_BUTTON ) { - hb_retptr( new QBrush( hbqt_par_QPalette( 1 )->button() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QPalette( 1 )->button() ) ) ); } /* @@ -165,7 +165,7 @@ HB_FUNC( QT_QPALETTE_BUTTON ) */ HB_FUNC( QT_QPALETTE_BUTTONTEXT ) { - hb_retptr( new QBrush( hbqt_par_QPalette( 1 )->buttonText() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QPalette( 1 )->buttonText() ) ) ); } /* @@ -181,7 +181,7 @@ HB_FUNC( QT_QPALETTE_CACHEKEY ) */ HB_FUNC( QT_QPALETTE_COLOR ) { - hb_retptr( new QColor( hbqt_par_QPalette( 1 )->color( ( QPalette::ColorGroup ) hb_parni( 2 ), ( QPalette::ColorRole ) hb_parni( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QPalette( 1 )->color( ( QPalette::ColorGroup ) hb_parni( 2 ), ( QPalette::ColorRole ) hb_parni( 3 ) ) ) ) ); } /* @@ -189,7 +189,7 @@ HB_FUNC( QT_QPALETTE_COLOR ) */ HB_FUNC( QT_QPALETTE_COLOR_1 ) { - hb_retptr( new QColor( hbqt_par_QPalette( 1 )->color( ( QPalette::ColorRole ) hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QPalette( 1 )->color( ( QPalette::ColorRole ) hb_parni( 2 ) ) ) ) ); } /* @@ -205,7 +205,7 @@ HB_FUNC( QT_QPALETTE_CURRENTCOLORGROUP ) */ HB_FUNC( QT_QPALETTE_DARK ) { - hb_retptr( new QBrush( hbqt_par_QPalette( 1 )->dark() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QPalette( 1 )->dark() ) ) ); } /* @@ -213,7 +213,7 @@ HB_FUNC( QT_QPALETTE_DARK ) */ HB_FUNC( QT_QPALETTE_HIGHLIGHT ) { - hb_retptr( new QBrush( hbqt_par_QPalette( 1 )->highlight() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QPalette( 1 )->highlight() ) ) ); } /* @@ -221,7 +221,7 @@ HB_FUNC( QT_QPALETTE_HIGHLIGHT ) */ HB_FUNC( QT_QPALETTE_HIGHLIGHTEDTEXT ) { - hb_retptr( new QBrush( hbqt_par_QPalette( 1 )->highlightedText() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QPalette( 1 )->highlightedText() ) ) ); } /* @@ -253,7 +253,7 @@ HB_FUNC( QT_QPALETTE_ISEQUAL ) */ HB_FUNC( QT_QPALETTE_LIGHT ) { - hb_retptr( new QBrush( hbqt_par_QPalette( 1 )->light() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QPalette( 1 )->light() ) ) ); } /* @@ -261,7 +261,7 @@ HB_FUNC( QT_QPALETTE_LIGHT ) */ HB_FUNC( QT_QPALETTE_LINK ) { - hb_retptr( new QBrush( hbqt_par_QPalette( 1 )->link() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QPalette( 1 )->link() ) ) ); } /* @@ -269,7 +269,7 @@ HB_FUNC( QT_QPALETTE_LINK ) */ HB_FUNC( QT_QPALETTE_LINKVISITED ) { - hb_retptr( new QBrush( hbqt_par_QPalette( 1 )->linkVisited() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QPalette( 1 )->linkVisited() ) ) ); } /* @@ -277,7 +277,7 @@ HB_FUNC( QT_QPALETTE_LINKVISITED ) */ HB_FUNC( QT_QPALETTE_MID ) { - hb_retptr( new QBrush( hbqt_par_QPalette( 1 )->mid() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QPalette( 1 )->mid() ) ) ); } /* @@ -285,7 +285,7 @@ HB_FUNC( QT_QPALETTE_MID ) */ HB_FUNC( QT_QPALETTE_MIDLIGHT ) { - hb_retptr( new QBrush( hbqt_par_QPalette( 1 )->midlight() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QPalette( 1 )->midlight() ) ) ); } /* @@ -293,7 +293,7 @@ HB_FUNC( QT_QPALETTE_MIDLIGHT ) */ HB_FUNC( QT_QPALETTE_RESOLVE ) { - hb_retptr( new QPalette( hbqt_par_QPalette( 1 )->resolve( *hbqt_par_QPalette( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPalette( hbqt_par_QPalette( 1 )->resolve( *hbqt_par_QPalette( 2 ) ) ) ) ); } /* @@ -349,7 +349,7 @@ HB_FUNC( QT_QPALETTE_SETCURRENTCOLORGROUP ) */ HB_FUNC( QT_QPALETTE_SHADOW ) { - hb_retptr( new QBrush( hbqt_par_QPalette( 1 )->shadow() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QPalette( 1 )->shadow() ) ) ); } /* @@ -357,7 +357,7 @@ HB_FUNC( QT_QPALETTE_SHADOW ) */ HB_FUNC( QT_QPALETTE_TEXT ) { - hb_retptr( new QBrush( hbqt_par_QPalette( 1 )->text() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QPalette( 1 )->text() ) ) ); } /* @@ -365,7 +365,7 @@ HB_FUNC( QT_QPALETTE_TEXT ) */ HB_FUNC( QT_QPALETTE_TOOLTIPBASE ) { - hb_retptr( new QBrush( hbqt_par_QPalette( 1 )->toolTipBase() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QPalette( 1 )->toolTipBase() ) ) ); } /* @@ -373,7 +373,7 @@ HB_FUNC( QT_QPALETTE_TOOLTIPBASE ) */ HB_FUNC( QT_QPALETTE_TOOLTIPTEXT ) { - hb_retptr( new QBrush( hbqt_par_QPalette( 1 )->toolTipText() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QPalette( 1 )->toolTipText() ) ) ); } /* @@ -381,7 +381,7 @@ HB_FUNC( QT_QPALETTE_TOOLTIPTEXT ) */ HB_FUNC( QT_QPALETTE_WINDOW ) { - hb_retptr( new QBrush( hbqt_par_QPalette( 1 )->window() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QPalette( 1 )->window() ) ) ); } /* @@ -389,7 +389,7 @@ HB_FUNC( QT_QPALETTE_WINDOW ) */ HB_FUNC( QT_QPALETTE_WINDOWTEXT ) { - hb_retptr( new QBrush( hbqt_par_QPalette( 1 )->windowText() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QPalette( 1 )->windowText() ) ) ); } diff --git a/harbour/contrib/hbqt/QPen.cpp b/harbour/contrib/hbqt/QPen.cpp index a3c36547ef..4dceca8c66 100644 --- a/harbour/contrib/hbqt/QPen.cpp +++ b/harbour/contrib/hbqt/QPen.cpp @@ -76,6 +76,7 @@ * void setDashPattern ( const QVector & pattern ) */ +#include #include @@ -88,15 +89,19 @@ * QPen ( const QPen & pen ) * ~QPen () */ + HB_FUNC( QT_QPEN ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + if( hb_pcount() == 1 && HB_ISNUM( 1 ) ) { - hb_retptr( ( QPen* ) new QPen( ( Qt::PenStyle ) hb_parni( 1 ) ) ); + pObj = ( QPen* ) new QPen( ( Qt::PenStyle ) hb_parni( 1 ) ) ; } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QPen* ) new QPen( *hbqt_par_QPen( 1 ) ) ); + pObj = ( QPen* ) new QPen( *hbqt_par_QPen( 1 ) ) ; } else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) ) { @@ -104,41 +109,36 @@ HB_FUNC( QT_QPEN ) if( objName == ( QString ) "QColor" ) { - hb_retptr( ( QPen* ) new QPen( *hbqt_par_QColor( 2 ) ) ); + pObj = ( QPen* ) new QPen( *hbqt_par_QColor( 2 ) ) ; } else { - hb_retptr( ( QPen* ) new QPen() ); + pObj = ( QPen* ) new QPen() ; } } else if( hb_pcount() >= 2 && HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( ( QPen* ) new QPen( *hbqt_par_QBrush( 1 ), hb_parnd( 2 ), - HB_ISNUM( 3 ) ? ( Qt::PenStyle ) hb_parni( 3 ) : Qt::SolidLine, - HB_ISNUM( 4 ) ? ( Qt::PenCapStyle ) hb_parni( 4 ) : Qt::SquareCap, - HB_ISNUM( 5 ) ? ( Qt::PenJoinStyle ) hb_parni( 5 ) : Qt::BevelJoin - ) ); + Qt::PenStyle iStyle = HB_ISNUM( 3 ) ? ( Qt::PenStyle ) hb_parni( 3 ) : Qt::SolidLine; + Qt::PenCapStyle iCap = HB_ISNUM( 4 ) ? ( Qt::PenCapStyle ) hb_parni( 4 ) : Qt::SquareCap; + Qt::PenJoinStyle iJoin = HB_ISNUM( 5 ) ? ( Qt::PenJoinStyle ) hb_parni( 5 ) : Qt::BevelJoin; + + pObj = ( QPen* ) new QPen( *hbqt_par_QBrush( 1 ), hb_parnd( 2 ), iStyle, iCap, iJoin ) ; } else { - hb_retptr( ( QPen* ) new QPen() ); + pObj = ( QPen* ) new QPen() ; } -} -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QPEN_DESTROY ) -{ - delete hbqt_par_QPen( 1 ); + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QPen" ); + hb_retptrGC( p ); } - /* * QBrush brush () const */ HB_FUNC( QT_QPEN_BRUSH ) { - hb_retptr( new QBrush( hbqt_par_QPen( 1 )->brush() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QPen( 1 )->brush() ) ) ); } /* @@ -154,7 +154,7 @@ HB_FUNC( QT_QPEN_CAPSTYLE ) */ HB_FUNC( QT_QPEN_COLOR ) { - hb_retptr( new QColor( hbqt_par_QPen( 1 )->color() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QPen( 1 )->color() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QPicture.cpp b/harbour/contrib/hbqt/QPicture.cpp index f334d673aa..e19c90a685 100644 --- a/harbour/contrib/hbqt/QPicture.cpp +++ b/harbour/contrib/hbqt/QPicture.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -75,36 +76,32 @@ * QPicture ( const QPicture & pic ) * ~QPicture () */ + HB_FUNC( QT_QPICTURE ) { + void * pObj = NULL; + if( hb_pcount() == 1 && HB_ISNUM( 1 ) ) { - hb_retptr( ( QPicture* ) new QPicture( hb_parni( 1 ) ) ); + pObj = new QPicture( hb_parni( 1 ) ) ; } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QPicture* ) new QPicture( *hbqt_par_QPicture( 1 ) ) ); + pObj = new QPicture( *hbqt_par_QPicture( 1 ) ) ; } else { - hb_retptr( ( QPicture* ) new QPicture() ); + pObj = new QPicture() ; } -} -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QPICTURE_DESTROY ) -{ - delete hbqt_par_QPicture( 1 ); + hb_retptr( pObj ); } - /* * QRect boundingRect () const */ HB_FUNC( QT_QPICTURE_BOUNDINGRECT ) { - hb_retptr( new QRect( hbqt_par_QPicture( 1 )->boundingRect() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QPicture( 1 )->boundingRect() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QPixmap.cpp b/harbour/contrib/hbqt/QPixmap.cpp index 04cf6c9541..2eb460c304 100644 --- a/harbour/contrib/hbqt/QPixmap.cpp +++ b/harbour/contrib/hbqt/QPixmap.cpp @@ -71,6 +71,7 @@ * enum ShareMode { ImplicitlyShared, ExplicitlyShared } */ +#include #include #include @@ -84,40 +85,39 @@ * QPixmap ( const QSize & size ) * ~QPixmap () */ + HB_FUNC( QT_QPIXMAP ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + if( hb_pcount() == 1 && HB_ISCHAR( 1 ) ) { - hb_retptr( ( QPixmap* ) new QPixmap( hbqt_par_QString( 1 ), ( const char * ) 0, Qt::AutoColor ) ); + pObj = new QPixmap( hbqt_par_QString( 1 ), ( const char * ) 0, Qt::AutoColor ) ; } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QPixmap* ) new QPixmap( *hbqt_par_QPixmap( 1 ) ) ); + pObj = new QPixmap( *hbqt_par_QPixmap( 1 ) ) ; } else if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( ( QPixmap* ) new QPixmap( hb_parni( 1 ), hb_parni( 2 ) ) ); + pObj = new QPixmap( hb_parni( 1 ), hb_parni( 2 ) ) ; } else { - hb_retptr( ( QPixmap* ) new QPixmap() ); + pObj = new QPixmap() ; } -} -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QPIXMAP_DESTROY ) -{ - delete hbqt_par_QPixmap( 1 ); + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QPixmap" ); + hb_retptrGC( p ); } - /* * QPixmap alphaChannel () const */ HB_FUNC( QT_QPIXMAP_ALPHACHANNEL ) { - hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->alphaChannel() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QPixmap( 1 )->alphaChannel() ) ) ); } /* @@ -133,7 +133,7 @@ HB_FUNC( QT_QPIXMAP_CACHEKEY ) */ HB_FUNC( QT_QPIXMAP_COPY ) { - hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->copy( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QRect( 2 ) : QRect() ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QPixmap( 1 )->copy( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QRect( 2 ) : QRect() ) ) ) ) ); } /* @@ -141,7 +141,7 @@ HB_FUNC( QT_QPIXMAP_COPY ) */ HB_FUNC( QT_QPIXMAP_COPY_1 ) { - hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->copy( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QPixmap( 1 )->copy( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ) ) ) ); } /* @@ -149,7 +149,7 @@ HB_FUNC( QT_QPIXMAP_COPY_1 ) */ HB_FUNC( QT_QPIXMAP_CREATEHEURISTICMASK ) { - hb_retptr( new QBitmap( hbqt_par_QPixmap( 1 )->createHeuristicMask( hb_parl( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBitmap( hbqt_par_QPixmap( 1 )->createHeuristicMask( hb_parl( 2 ) ) ) ) ); } /* @@ -157,7 +157,7 @@ HB_FUNC( QT_QPIXMAP_CREATEHEURISTICMASK ) */ HB_FUNC( QT_QPIXMAP_CREATEMASKFROMCOLOR ) { - hb_retptr( new QBitmap( hbqt_par_QPixmap( 1 )->createMaskFromColor( *hbqt_par_QColor( 2 ), ( Qt::MaskMode ) hb_parni( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBitmap( hbqt_par_QPixmap( 1 )->createMaskFromColor( *hbqt_par_QColor( 2 ), ( Qt::MaskMode ) hb_parni( 3 ) ) ) ) ); } /* @@ -165,7 +165,7 @@ HB_FUNC( QT_QPIXMAP_CREATEMASKFROMCOLOR ) */ HB_FUNC( QT_QPIXMAP_CREATEMASKFROMCOLOR_1 ) { - hb_retptr( new QBitmap( hbqt_par_QPixmap( 1 )->createMaskFromColor( *hbqt_par_QColor( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBitmap( hbqt_par_QPixmap( 1 )->createMaskFromColor( *hbqt_par_QColor( 2 ) ) ) ) ); } /* @@ -269,7 +269,7 @@ HB_FUNC( QT_QPIXMAP_LOADFROMDATA ) */ HB_FUNC( QT_QPIXMAP_MASK ) { - hb_retptr( new QBitmap( hbqt_par_QPixmap( 1 )->mask() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBitmap( hbqt_par_QPixmap( 1 )->mask() ) ) ); } /* @@ -277,7 +277,7 @@ HB_FUNC( QT_QPIXMAP_MASK ) */ HB_FUNC( QT_QPIXMAP_RECT ) { - hb_retptr( new QRect( hbqt_par_QPixmap( 1 )->rect() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QPixmap( 1 )->rect() ) ) ); } /* @@ -301,7 +301,7 @@ HB_FUNC( QT_QPIXMAP_SAVE_1 ) */ HB_FUNC( QT_QPIXMAP_SCALED ) { - hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->scaled( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISNUM( 4 ) ? ( Qt::AspectRatioMode ) hb_parni( 4 ) : ( Qt::AspectRatioMode ) Qt::IgnoreAspectRatio ), ( HB_ISNUM( 5 ) ? ( Qt::TransformationMode ) hb_parni( 5 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QPixmap( 1 )->scaled( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISNUM( 4 ) ? ( Qt::AspectRatioMode ) hb_parni( 4 ) : ( Qt::AspectRatioMode ) Qt::IgnoreAspectRatio ), ( HB_ISNUM( 5 ) ? ( Qt::TransformationMode ) hb_parni( 5 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); } /* @@ -309,7 +309,7 @@ HB_FUNC( QT_QPIXMAP_SCALED ) */ HB_FUNC( QT_QPIXMAP_SCALED_1 ) { - hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->scaled( *hbqt_par_QSize( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::AspectRatioMode ) hb_parni( 3 ) : ( Qt::AspectRatioMode ) Qt::IgnoreAspectRatio ), ( HB_ISNUM( 4 ) ? ( Qt::TransformationMode ) hb_parni( 4 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QPixmap( 1 )->scaled( *hbqt_par_QSize( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::AspectRatioMode ) hb_parni( 3 ) : ( Qt::AspectRatioMode ) Qt::IgnoreAspectRatio ), ( HB_ISNUM( 4 ) ? ( Qt::TransformationMode ) hb_parni( 4 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); } /* @@ -317,7 +317,7 @@ HB_FUNC( QT_QPIXMAP_SCALED_1 ) */ HB_FUNC( QT_QPIXMAP_SCALEDTOHEIGHT ) { - hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->scaledToHeight( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QPixmap( 1 )->scaledToHeight( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); } /* @@ -325,7 +325,7 @@ HB_FUNC( QT_QPIXMAP_SCALEDTOHEIGHT ) */ HB_FUNC( QT_QPIXMAP_SCALEDTOWIDTH ) { - hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->scaledToWidth( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QPixmap( 1 )->scaledToWidth( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); } /* @@ -349,7 +349,7 @@ HB_FUNC( QT_QPIXMAP_SETMASK ) */ HB_FUNC( QT_QPIXMAP_SIZE ) { - hb_retptr( new QSize( hbqt_par_QPixmap( 1 )->size() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QPixmap( 1 )->size() ) ) ); } /* @@ -357,7 +357,7 @@ HB_FUNC( QT_QPIXMAP_SIZE ) */ HB_FUNC( QT_QPIXMAP_TOIMAGE ) { - hb_retptr( new QImage( hbqt_par_QPixmap( 1 )->toImage() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QImage( hbqt_par_QPixmap( 1 )->toImage() ) ) ); } /* @@ -365,7 +365,7 @@ HB_FUNC( QT_QPIXMAP_TOIMAGE ) */ HB_FUNC( QT_QPIXMAP_TRANSFORMED ) { - hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->transformed( *hbqt_par_QTransform( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QPixmap( 1 )->transformed( *hbqt_par_QTransform( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); } /* @@ -373,7 +373,7 @@ HB_FUNC( QT_QPIXMAP_TRANSFORMED ) */ HB_FUNC( QT_QPIXMAP_TRANSFORMED_1 ) { - hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->transformed( *hbqt_par_QMatrix( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QPixmap( 1 )->transformed( *hbqt_par_QMatrix( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); } /* @@ -397,7 +397,7 @@ HB_FUNC( QT_QPIXMAP_DEFAULTDEPTH ) */ HB_FUNC( QT_QPIXMAP_FROMIMAGE ) { - hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->fromImage( *hbqt_par_QImage( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::ImageConversionFlags ) hb_parni( 3 ) : ( Qt::ImageConversionFlags ) Qt::AutoColor ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QPixmap( 1 )->fromImage( *hbqt_par_QImage( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::ImageConversionFlags ) hb_parni( 3 ) : ( Qt::ImageConversionFlags ) Qt::AutoColor ) ) ) ) ); } /* @@ -405,7 +405,7 @@ HB_FUNC( QT_QPIXMAP_FROMIMAGE ) */ HB_FUNC( QT_QPIXMAP_GRABWIDGET ) { - hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->grabWidget( hbqt_par_QWidget( 2 ), *hbqt_par_QRect( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QPixmap( 1 )->grabWidget( hbqt_par_QWidget( 2 ), *hbqt_par_QRect( 3 ) ) ) ) ); } /* @@ -413,7 +413,7 @@ HB_FUNC( QT_QPIXMAP_GRABWIDGET ) */ HB_FUNC( QT_QPIXMAP_GRABWIDGET_1 ) { - hb_retptr( new QPixmap( hbqt_par_QPixmap( 1 )->grabWidget( hbqt_par_QWidget( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : -1 ), ( HB_ISNUM( 6 ) ? hb_parni( 6 ) : -1 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QPixmap( 1 )->grabWidget( hbqt_par_QWidget( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : -1 ), ( HB_ISNUM( 6 ) ? hb_parni( 6 ) : -1 ) ) ) ) ); } /* @@ -421,7 +421,7 @@ HB_FUNC( QT_QPIXMAP_GRABWIDGET_1 ) */ HB_FUNC( QT_QPIXMAP_TRUEMATRIX ) { - hb_retptr( new QTransform( hbqt_par_QPixmap( 1 )->trueMatrix( *hbqt_par_QTransform( 2 ), hb_parni( 3 ), hb_parni( 4 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTransform( hbqt_par_QPixmap( 1 )->trueMatrix( *hbqt_par_QTransform( 2 ), hb_parni( 3 ), hb_parni( 4 ) ) ) ) ); } /* @@ -429,7 +429,7 @@ HB_FUNC( QT_QPIXMAP_TRUEMATRIX ) */ HB_FUNC( QT_QPIXMAP_TRUEMATRIX_1 ) { - hb_retptr( new QMatrix( hbqt_par_QPixmap( 1 )->trueMatrix( *hbqt_par_QMatrix( 2 ), hb_parni( 3 ), hb_parni( 4 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QMatrix( hbqt_par_QPixmap( 1 )->trueMatrix( *hbqt_par_QMatrix( 2 ), hb_parni( 3 ), hb_parni( 4 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/QPoint.cpp b/harbour/contrib/hbqt/QPoint.cpp index 23b21a2ada..2e821eaff6 100644 --- a/harbour/contrib/hbqt/QPoint.cpp +++ b/harbour/contrib/hbqt/QPoint.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -75,30 +76,26 @@ * QPoint ( int x, int y ) * ~QPoint () */ + HB_FUNC( QT_QPOINT ) { + void * pObj = NULL; + if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( ( QPoint* ) new QPoint( hb_parni( 1 ), hb_parni( 2 ) ) ); + pObj = ( QPoint* ) new QPoint( hb_parni( 1 ), hb_parni( 2 ) ) ; } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QPoint* ) new QPoint( *hbqt_par_QPoint( 1 ) ) ); + pObj = ( QPoint* ) new QPoint( *hbqt_par_QPoint( 1 ) ) ; } else { - hb_retptr( ( QPoint* ) new QPoint() ); + pObj = ( QPoint* ) new QPoint() ; } -} -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QPOINT_DESTROY ) -{ - delete hbqt_par_QPoint( 1 ); + hb_retptr( pObj ); } - /* * bool isNull () const */ diff --git a/harbour/contrib/hbqt/QPointF.cpp b/harbour/contrib/hbqt/QPointF.cpp index d67f67d2fb..6e15623690 100644 --- a/harbour/contrib/hbqt/QPointF.cpp +++ b/harbour/contrib/hbqt/QPointF.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -75,30 +76,29 @@ * QPointF ( const QPoint & point ) * QPointF ( qreal x, qreal y ) */ + HB_FUNC( QT_QPOINTF ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( ( QPointF* ) new QPointF( ( qreal ) hb_parnd( 1 ), ( qreal ) hb_parnd( 2 ) ) ); + pObj = ( QPointF* ) new QPointF( ( qreal ) hb_parnd( 1 ), ( qreal ) hb_parnd( 2 ) ) ; } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QPointF* ) new QPointF( *hbqt_par_QPoint( 1 ) ) ); + pObj = ( QPointF* ) new QPointF( *hbqt_par_QPoint( 1 ) ) ; } else { - hb_retptr( ( QPointF* ) new QPointF() ); + pObj = ( QPointF* ) new QPointF() ; } + + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QPointF" ); + hb_retptrGC( p ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QPOINTF_DESTROY ) -{ - -} - /* * bool isNull () const */ @@ -144,7 +144,7 @@ HB_FUNC( QT_QPOINTF_SETY ) */ HB_FUNC( QT_QPOINTF_TOPOINT ) { - hb_retptr( new QPoint( hbqt_par_QPointF( 1 )->toPoint() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QPointF( 1 )->toPoint() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QPrintDialog.cpp b/harbour/contrib/hbqt/QPrintDialog.cpp index 5b5d125f74..5f407f307d 100644 --- a/harbour/contrib/hbqt/QPrintDialog.cpp +++ b/harbour/contrib/hbqt/QPrintDialog.cpp @@ -71,6 +71,7 @@ * flags PrintDialogOptions */ +#include #include @@ -80,19 +81,18 @@ * QPrintDialog ( QWidget * parent = 0 ) * ~QPrintDialog () */ + HB_FUNC( QT_QPRINTDIALOG ) { - hb_retptr( ( QPrintDialog* ) new QPrintDialog ( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QPrintDialog > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QPRINTDIALOG_DESTROY ) -{ - delete hbqt_par_QPrintDialog( 1 ); -} + pObj = ( QPrintDialog* ) new QPrintDialog ( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * virtual void done ( int result ) */ diff --git a/harbour/contrib/hbqt/QPrintEngine.cpp b/harbour/contrib/hbqt/QPrintEngine.cpp index 792f6e682f..f376f54dc6 100644 --- a/harbour/contrib/hbqt/QPrintEngine.cpp +++ b/harbour/contrib/hbqt/QPrintEngine.cpp @@ -70,6 +70,7 @@ * enum PrintEnginePropertyKey { PPK_CollateCopies, PPK_ColorMode, PPK_Creator, PPK_Duplex, ..., PPK_CustomBase } */ +#include #include @@ -77,19 +78,10 @@ /* * virtual ~QPrintEngine () */ + HB_FUNC( QT_QPRINTENGINE ) { - } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QPRINTENGINE_DESTROY ) -{ - delete hbqt_par_QPrintEngine( 1 ); -} - /* * virtual bool abort () */ @@ -127,7 +119,7 @@ HB_FUNC( QT_QPRINTENGINE_PRINTERSTATE ) */ HB_FUNC( QT_QPRINTENGINE_PROPERTY ) { - hb_retptr( new QVariant( hbqt_par_QPrintEngine( 1 )->property( ( QPrintEngine::PrintEnginePropertyKey ) hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QPrintEngine( 1 )->property( ( QPrintEngine::PrintEnginePropertyKey ) hb_parni( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QPrintPreviewDialog.cpp b/harbour/contrib/hbqt/QPrintPreviewDialog.cpp index c0b78e3930..147ebc71d6 100644 --- a/harbour/contrib/hbqt/QPrintPreviewDialog.cpp +++ b/harbour/contrib/hbqt/QPrintPreviewDialog.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -75,24 +76,21 @@ * QPrintPreviewDialog ( QWidget * parent = 0, Qt::WindowFlags flags = 0 ) * ~QPrintPreviewDialog () */ + HB_FUNC( QT_QPRINTPREVIEWDIALOG ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QPrintPreviewDialog > pObj = NULL; + if( hb_pcount() >= 2 && HB_ISPOINTER( 2 ) ) - hb_retptr( ( QPrintPreviewDialog* ) new QPrintPreviewDialog( hbqt_par_QPrinter( 1 ), - hbqt_par_QWidget( 2 ), ( Qt::WindowFlags ) hb_parni( 3 ) ) ); + pObj = new QPrintPreviewDialog( hbqt_par_QPrinter( 1 ), hbqt_par_QWidget( 2 ), ( Qt::WindowFlags ) hb_parni( 3 ) ) ; else - hb_retptr( ( QPrintPreviewDialog* ) new QPrintPreviewDialog( hbqt_par_QWidget( 1 ), - ( Qt::WindowFlags ) hb_parni( 2 ) ) ); -} + pObj = new QPrintPreviewDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QPRINTPREVIEWDIALOG_DESTROY ) -{ - delete hbqt_par_QPrintPreviewDialog( 1 ); + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } - /* * void open ( QObject * receiver, const char * member ) */ diff --git a/harbour/contrib/hbqt/QPrinter.cpp b/harbour/contrib/hbqt/QPrinter.cpp index 282d707a4f..7de44d494c 100644 --- a/harbour/contrib/hbqt/QPrinter.cpp +++ b/harbour/contrib/hbqt/QPrinter.cpp @@ -97,6 +97,7 @@ * // int winPageSize () const */ +#include #include @@ -106,19 +107,15 @@ * QPrinter ( const QPrinterInfo & printer, PrinterMode mode = ScreenResolution ) * ~QPrinter () */ + HB_FUNC( QT_QPRINTER ) { - hb_retptr( ( QPrinter* ) new QPrinter() ); -} + void * pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QPRINTER_DESTROY ) -{ - delete hbqt_par_QPrinter( 1 ); -} + pObj = ( QPrinter* ) new QPrinter() ; + hb_retptr( pObj ); +} /* * bool abort () */ @@ -278,7 +275,7 @@ HB_FUNC( QT_QPRINTER_PAGEORDER ) */ HB_FUNC( QT_QPRINTER_PAGERECT ) { - hb_retptr( new QRect( hbqt_par_QPrinter( 1 )->pageRect() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QPrinter( 1 )->pageRect() ) ) ); } /* @@ -286,7 +283,7 @@ HB_FUNC( QT_QPRINTER_PAGERECT ) */ HB_FUNC( QT_QPRINTER_PAGERECT_1 ) { - hb_retptr( new QRectF( hbqt_par_QPrinter( 1 )->pageRect( ( QPrinter::Unit ) hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QPrinter( 1 )->pageRect( ( QPrinter::Unit ) hb_parni( 2 ) ) ) ) ); } /* @@ -302,7 +299,7 @@ HB_FUNC( QT_QPRINTER_PAINTENGINE ) */ HB_FUNC( QT_QPRINTER_PAPERRECT ) { - hb_retptr( new QRect( hbqt_par_QPrinter( 1 )->paperRect() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QPrinter( 1 )->paperRect() ) ) ); } /* @@ -310,7 +307,7 @@ HB_FUNC( QT_QPRINTER_PAPERRECT ) */ HB_FUNC( QT_QPRINTER_PAPERRECT_1 ) { - hb_retptr( new QRectF( hbqt_par_QPrinter( 1 )->paperRect( ( QPrinter::Unit ) hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QPrinter( 1 )->paperRect( ( QPrinter::Unit ) hb_parni( 2 ) ) ) ) ); } /* @@ -326,7 +323,7 @@ HB_FUNC( QT_QPRINTER_PAPERSIZE ) */ HB_FUNC( QT_QPRINTER_PAPERSIZE_1 ) { - hb_retptr( new QSizeF( hbqt_par_QPrinter( 1 )->paperSize( ( QPrinter::Unit ) hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSizeF( hbqt_par_QPrinter( 1 )->paperSize( ( QPrinter::Unit ) hb_parni( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QProcess.cpp b/harbour/contrib/hbqt/QProcess.cpp index f61c8d5a8a..ab22b33ef5 100644 --- a/harbour/contrib/hbqt/QProcess.cpp +++ b/harbour/contrib/hbqt/QProcess.cpp @@ -77,6 +77,7 @@ * enum ProcessState { NotRunning, Starting, Running } */ +#include #include @@ -85,26 +86,25 @@ * QProcess ( QObject * parent = 0 ) * virtual ~QProcess () */ + HB_FUNC( QT_QPROCESS ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QProcess > pObj = NULL; + if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QProcess* ) new QProcess( hbqt_par_QObject( 1 ) ) ); + pObj = ( QProcess* ) new QProcess( hbqt_par_QObject( 1 ) ) ; } else { - hb_retptr( ( QProcess* ) new QProcess() ); + pObj = ( QProcess* ) new QProcess() ; } -} -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QPROCESS_DESTROY ) -{ - delete hbqt_par_QProcess( 1 ); + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } - /* * virtual void close () */ @@ -134,7 +134,7 @@ HB_FUNC( QT_QPROCESS_CLOSEWRITECHANNEL ) */ HB_FUNC( QT_QPROCESS_ENVIRONMENT ) { - hb_retptr( new QStringList( hbqt_par_QProcess( 1 )->environment() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QProcess( 1 )->environment() ) ) ); } /* @@ -166,7 +166,7 @@ HB_FUNC( QT_QPROCESS_EXITSTATUS ) */ HB_FUNC( QT_QPROCESS_PID ) { - hb_retptr( new Q_PID( hbqt_par_QProcess( 1 )->pid() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new Q_PID( hbqt_par_QProcess( 1 )->pid() ) ) ); } /* @@ -182,7 +182,7 @@ HB_FUNC( QT_QPROCESS_PROCESSCHANNELMODE ) */ HB_FUNC( QT_QPROCESS_READALLSTANDARDERROR ) { - hb_retptr( new QByteArray( hbqt_par_QProcess( 1 )->readAllStandardError() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QProcess( 1 )->readAllStandardError() ) ) ); } /* @@ -190,7 +190,7 @@ HB_FUNC( QT_QPROCESS_READALLSTANDARDERROR ) */ HB_FUNC( QT_QPROCESS_READALLSTANDARDOUTPUT ) { - hb_retptr( new QByteArray( hbqt_par_QProcess( 1 )->readAllStandardOutput() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QProcess( 1 )->readAllStandardOutput() ) ) ); } /* @@ -362,7 +362,7 @@ HB_FUNC( QT_QPROCESS_STARTDETACHED_2 ) */ HB_FUNC( QT_QPROCESS_SYSTEMENVIRONMENT ) { - hb_retptr( new QStringList( hbqt_par_QProcess( 1 )->systemEnvironment() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QProcess( 1 )->systemEnvironment() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QProgressBar.cpp b/harbour/contrib/hbqt/QProgressBar.cpp index 7938ba6513..7cf0dec157 100644 --- a/harbour/contrib/hbqt/QProgressBar.cpp +++ b/harbour/contrib/hbqt/QProgressBar.cpp @@ -70,6 +70,7 @@ * enum Direction { TopToBottom, BottomToTop } */ +#include #include @@ -77,19 +78,18 @@ /* * QProgressBar ( QWidget * parent = 0 ) */ + HB_FUNC( QT_QPROGRESSBAR ) { - hb_retptr( ( QProgressBar* ) new QProgressBar( hbqt_par_QWidget( 1 ) ) ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QProgressBar > pObj = NULL; + + pObj = ( QProgressBar* ) new QProgressBar( hbqt_par_QWidget( 1 ) ) ; + + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QPROGRESSBAR_DESTROY ) -{ - -} - /* * Qt::Alignment alignment () const */ diff --git a/harbour/contrib/hbqt/QProgressDialog.cpp b/harbour/contrib/hbqt/QProgressDialog.cpp index a728f1e31a..ce4e9aa21a 100644 --- a/harbour/contrib/hbqt/QProgressDialog.cpp +++ b/harbour/contrib/hbqt/QProgressDialog.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -75,19 +76,18 @@ * QProgressDialog ( const QString & labelText, const QString & cancelButtonText, int minimum, int maximum, QWidget * parent = 0, Qt::WindowFlags f = 0 ) * ~QProgressDialog () */ + HB_FUNC( QT_QPROGRESSDIALOG ) { - hb_retptr( new QProgressDialog( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QProgressDialog > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QPROGRESSDIALOG_DESTROY ) -{ - delete hbqt_par_QProgressDialog( 1 ); -} + pObj = new QProgressDialog( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * bool autoClose () const */ @@ -189,7 +189,7 @@ HB_FUNC( QT_QPROGRESSDIALOG_SETLABEL ) */ HB_FUNC( QT_QPROGRESSDIALOG_SIZEHINT ) { - hb_retptr( new QSize( hbqt_par_QProgressDialog( 1 )->sizeHint() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QProgressDialog( 1 )->sizeHint() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QPushButton.cpp b/harbour/contrib/hbqt/QPushButton.cpp index d56b2a0af0..c08e0c7228 100644 --- a/harbour/contrib/hbqt/QPushButton.cpp +++ b/harbour/contrib/hbqt/QPushButton.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -76,19 +77,18 @@ * QPushButton ( const QIcon & icon, const QString & text, QWidget * parent = 0 ) * ~QPushButton () */ + HB_FUNC( QT_QPUSHBUTTON ) { - hb_retptr( ( QPushButton* ) new QPushButton( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QPushButton > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QPUSHBUTTON_DESTROY ) -{ - delete hbqt_par_QPushButton( 1 ); -} + pObj = ( QPushButton* ) new QPushButton( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * bool autoDefault () const */ diff --git a/harbour/contrib/hbqt/QRadialGradient.cpp b/harbour/contrib/hbqt/QRadialGradient.cpp index 191ca8a58f..e552aeb623 100644 --- a/harbour/contrib/hbqt/QRadialGradient.cpp +++ b/harbour/contrib/hbqt/QRadialGradient.cpp @@ -72,6 +72,7 @@ * enum Type { LinearGradient, RadialGradient, ConicalGradient, NoGradient } */ +#include #include @@ -83,44 +84,40 @@ * QRadialGradient ( const QPointF & center, qreal radius ) * QRadialGradient ( qreal cx, qreal cy, qreal radius ) */ + HB_FUNC( QT_QRADIALGRADIENT ) { + void * pObj = NULL; + if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QRadialGradient* ) new QRadialGradient( *hbqt_par_QRadialGradient( 1 ) ) ); + pObj = ( QRadialGradient* ) new QRadialGradient( *hbqt_par_QRadialGradient( 1 ) ) ; } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( ( QRadialGradient* ) new QRadialGradient( *hbqt_par_QPointF( 1 ), hb_parnd( 2 ) ) ); + pObj = ( QRadialGradient* ) new QRadialGradient( *hbqt_par_QPointF( 1 ), hb_parnd( 2 ) ) ; } else if( hb_pcount() == 3 && HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) && HB_ISPOINTER( 3 ) ) { - hb_retptr( ( QRadialGradient* ) new QRadialGradient( *hbqt_par_QPointF( 1 ), hb_parnd( 2 ), *hbqt_par_QPointF( 3 ) ) ); + pObj = ( QRadialGradient* ) new QRadialGradient( *hbqt_par_QPointF( 1 ), hb_parnd( 2 ), *hbqt_par_QPointF( 3 ) ) ; } else if( hb_pcount() == 5 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) && HB_ISNUM( 5 ) ) { - hb_retptr( ( QRadialGradient* ) new QRadialGradient( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ) ); + pObj = ( QRadialGradient* ) new QRadialGradient( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ) ; } else { - hb_retptr( ( QRadialGradient* ) new QRadialGradient() ); + pObj = ( QRadialGradient* ) new QRadialGradient() ; } + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QRADIALGRADIENT_DESTROY ) -{ - -} - /* * QPointF center () const */ HB_FUNC( QT_QRADIALGRADIENT_CENTER ) { - hb_retptr( new QPointF( hbqt_par_QRadialGradient( 1 )->center() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPointF( hbqt_par_QRadialGradient( 1 )->center() ) ) ); } /* @@ -128,7 +125,7 @@ HB_FUNC( QT_QRADIALGRADIENT_CENTER ) */ HB_FUNC( QT_QRADIALGRADIENT_FOCALPOINT ) { - hb_retptr( new QPointF( hbqt_par_QRadialGradient( 1 )->focalPoint() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPointF( hbqt_par_QRadialGradient( 1 )->focalPoint() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QRadioButton.cpp b/harbour/contrib/hbqt/QRadioButton.cpp index 993c9a442a..bd02eb9358 100644 --- a/harbour/contrib/hbqt/QRadioButton.cpp +++ b/harbour/contrib/hbqt/QRadioButton.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,23 +75,22 @@ * QRadioButton ( QWidget * parent = 0 ) * QRadioButton ( const QString & text, QWidget * parent = 0 ) */ + HB_FUNC( QT_QRADIOBUTTON ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QRadioButton > pObj = NULL; + if( HB_ISCHAR( 1 ) ) - hb_retptr( ( QRadioButton* ) new QRadioButton( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) ); + pObj = ( QRadioButton* ) new QRadioButton( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) ; else - hb_retptr( ( QRadioButton* ) new QRadioButton( hbqt_par_QWidget( 1 ) ) ); + pObj = ( QRadioButton* ) new QRadioButton( hbqt_par_QWidget( 1 ) ) ; + + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QRADIOBUTTON_DESTROY ) -{ - -} - - /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/QRect.cpp b/harbour/contrib/hbqt/QRect.cpp index d1f130e230..04dccbf250 100644 --- a/harbour/contrib/hbqt/QRect.cpp +++ b/harbour/contrib/hbqt/QRect.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -77,34 +78,33 @@ * QRect ( int x, int y, int width, int height ) * ~QRect () */ + HB_FUNC( QT_QRECT ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QRect* ) new QRect( *hbqt_par_QRect( 1 ) ) ); + pObj = ( QRect* ) new QRect( *hbqt_par_QRect( 1 ) ) ; } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( ( QRect* ) new QRect( *hbqt_par_QPoint( 1 ), *hbqt_par_QPoint( 2 ) ) ); + pObj = ( QRect* ) new QRect( *hbqt_par_QPoint( 1 ), *hbqt_par_QPoint( 2 ) ) ; } else if( hb_pcount() == 4 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) ) { - hb_retptr( ( QRect* ) new QRect( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ) ) ); + pObj = ( QRect* ) new QRect( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ) ) ; } else { - hb_retptr( ( QRect* ) new QRect() ); + pObj = ( QRect* ) new QRect() ; } -} -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QRECT_DESTROY ) -{ - delete hbqt_par_QRect( 1 ); + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QRect" ); + hb_retptrGC( p ); } - /* * void adjust ( int dx1, int dy1, int dx2, int dy2 ) */ @@ -118,7 +118,7 @@ HB_FUNC( QT_QRECT_ADJUST ) */ HB_FUNC( QT_QRECT_ADJUSTED ) { - hb_retptr( new QRect( hbqt_par_QRect( 1 )->adjusted( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QRect( 1 )->adjusted( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ) ) ) ); } /* @@ -134,7 +134,7 @@ HB_FUNC( QT_QRECT_BOTTOM ) */ HB_FUNC( QT_QRECT_BOTTOMLEFT ) { - hb_retptr( new QPoint( hbqt_par_QRect( 1 )->bottomLeft() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QRect( 1 )->bottomLeft() ) ) ); } /* @@ -142,7 +142,7 @@ HB_FUNC( QT_QRECT_BOTTOMLEFT ) */ HB_FUNC( QT_QRECT_BOTTOMRIGHT ) { - hb_retptr( new QPoint( hbqt_par_QRect( 1 )->bottomRight() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QRect( 1 )->bottomRight() ) ) ); } /* @@ -150,7 +150,7 @@ HB_FUNC( QT_QRECT_BOTTOMRIGHT ) */ HB_FUNC( QT_QRECT_CENTER ) { - hb_retptr( new QPoint( hbqt_par_QRect( 1 )->center() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QRect( 1 )->center() ) ) ); } /* @@ -234,7 +234,7 @@ HB_FUNC( QT_QRECT_HEIGHT ) */ HB_FUNC( QT_QRECT_INTERSECTED ) { - hb_retptr( new QRect( hbqt_par_QRect( 1 )->intersected( *hbqt_par_QRect( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QRect( 1 )->intersected( *hbqt_par_QRect( 2 ) ) ) ) ); } /* @@ -370,7 +370,7 @@ HB_FUNC( QT_QRECT_MOVETOPRIGHT ) */ HB_FUNC( QT_QRECT_NORMALIZED ) { - hb_retptr( new QRect( hbqt_par_QRect( 1 )->normalized() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QRect( 1 )->normalized() ) ) ); } /* @@ -506,7 +506,7 @@ HB_FUNC( QT_QRECT_SETY ) */ HB_FUNC( QT_QRECT_SIZE ) { - hb_retptr( new QSize( hbqt_par_QRect( 1 )->size() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QRect( 1 )->size() ) ) ); } /* @@ -522,7 +522,7 @@ HB_FUNC( QT_QRECT_TOP ) */ HB_FUNC( QT_QRECT_TOPLEFT ) { - hb_retptr( new QPoint( hbqt_par_QRect( 1 )->topLeft() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QRect( 1 )->topLeft() ) ) ); } /* @@ -530,7 +530,7 @@ HB_FUNC( QT_QRECT_TOPLEFT ) */ HB_FUNC( QT_QRECT_TOPRIGHT ) { - hb_retptr( new QPoint( hbqt_par_QRect( 1 )->topRight() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QRect( 1 )->topRight() ) ) ); } /* @@ -554,7 +554,7 @@ HB_FUNC( QT_QRECT_TRANSLATE_1 ) */ HB_FUNC( QT_QRECT_TRANSLATED ) { - hb_retptr( new QRect( hbqt_par_QRect( 1 )->translated( hb_parni( 2 ), hb_parni( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QRect( 1 )->translated( hb_parni( 2 ), hb_parni( 3 ) ) ) ) ); } /* @@ -562,7 +562,7 @@ HB_FUNC( QT_QRECT_TRANSLATED ) */ HB_FUNC( QT_QRECT_TRANSLATED_1 ) { - hb_retptr( new QRect( hbqt_par_QRect( 1 )->translated( *hbqt_par_QPoint( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QRect( 1 )->translated( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* @@ -570,7 +570,7 @@ HB_FUNC( QT_QRECT_TRANSLATED_1 ) */ HB_FUNC( QT_QRECT_UNITED ) { - hb_retptr( new QRect( hbqt_par_QRect( 1 )->united( *hbqt_par_QRect( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QRect( 1 )->united( *hbqt_par_QRect( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QRectF.cpp b/harbour/contrib/hbqt/QRectF.cpp index 4c343c93c1..b5dbabb45d 100644 --- a/harbour/contrib/hbqt/QRectF.cpp +++ b/harbour/contrib/hbqt/QRectF.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -78,34 +79,33 @@ * QRectF ( const QRect & rectangle ) * ~QRectF () */ + HB_FUNC( QT_QRECTF ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QRectF* ) new QRectF( *hbqt_par_QRectF( 1 ) ) ); + pObj = ( QRectF* ) new QRectF( *hbqt_par_QRectF( 1 ) ) ; } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISPOINTER( 2 ) ) { - hb_retptr( ( QRectF* ) new QRectF( *hbqt_par_QPoint( 1 ), *hbqt_par_QPoint( 2 ) ) ); + pObj = ( QRectF* ) new QRectF( *hbqt_par_QPoint( 1 ), *hbqt_par_QPoint( 2 ) ) ; } else if( hb_pcount() == 4 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) ) { - hb_retptr( ( QRectF* ) new QRectF( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ) ) ); + pObj = ( QRectF* ) new QRectF( hb_parnd( 1 ), hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ) ) ; } else { - hb_retptr( ( QRectF* ) new QRectF() ); + pObj = ( QRectF* ) new QRectF() ; } -} -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QRECTF_DESTROY ) -{ - delete hbqt_par_QRectF( 1 ); + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QRectF" ); + hb_retptrGC( p ); } - /* * void adjust ( qreal dx1, qreal dy1, qreal dx2, qreal dy2 ) */ @@ -119,7 +119,7 @@ HB_FUNC( QT_QRECTF_ADJUST ) */ HB_FUNC( QT_QRECTF_ADJUSTED ) { - hb_retptr( new QRectF( hbqt_par_QRectF( 1 )->adjusted( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QRectF( 1 )->adjusted( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ) ) ) ); } /* @@ -135,7 +135,7 @@ HB_FUNC( QT_QRECTF_BOTTOM ) */ HB_FUNC( QT_QRECTF_BOTTOMLEFT ) { - hb_retptr( new QPointF( hbqt_par_QRectF( 1 )->bottomLeft() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPointF( hbqt_par_QRectF( 1 )->bottomLeft() ) ) ); } /* @@ -143,7 +143,7 @@ HB_FUNC( QT_QRECTF_BOTTOMLEFT ) */ HB_FUNC( QT_QRECTF_BOTTOMRIGHT ) { - hb_retptr( new QPointF( hbqt_par_QRectF( 1 )->bottomRight() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPointF( hbqt_par_QRectF( 1 )->bottomRight() ) ) ); } /* @@ -151,7 +151,7 @@ HB_FUNC( QT_QRECTF_BOTTOMRIGHT ) */ HB_FUNC( QT_QRECTF_CENTER ) { - hb_retptr( new QPointF( hbqt_par_QRectF( 1 )->center() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPointF( hbqt_par_QRectF( 1 )->center() ) ) ); } /* @@ -227,7 +227,7 @@ HB_FUNC( QT_QRECTF_HEIGHT ) */ HB_FUNC( QT_QRECTF_INTERSECTED ) { - hb_retptr( new QRectF( hbqt_par_QRectF( 1 )->intersected( *hbqt_par_QRectF( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QRectF( 1 )->intersected( *hbqt_par_QRectF( 2 ) ) ) ) ); } /* @@ -363,7 +363,7 @@ HB_FUNC( QT_QRECTF_MOVETOPRIGHT ) */ HB_FUNC( QT_QRECTF_NORMALIZED ) { - hb_retptr( new QRectF( hbqt_par_QRectF( 1 )->normalized() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QRectF( 1 )->normalized() ) ) ); } /* @@ -499,7 +499,7 @@ HB_FUNC( QT_QRECTF_SETY ) */ HB_FUNC( QT_QRECTF_SIZE ) { - hb_retptr( new QSizeF( hbqt_par_QRectF( 1 )->size() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSizeF( hbqt_par_QRectF( 1 )->size() ) ) ); } /* @@ -507,7 +507,7 @@ HB_FUNC( QT_QRECTF_SIZE ) */ HB_FUNC( QT_QRECTF_TOALIGNEDRECT ) { - hb_retptr( new QRect( hbqt_par_QRectF( 1 )->toAlignedRect() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QRectF( 1 )->toAlignedRect() ) ) ); } /* @@ -515,7 +515,7 @@ HB_FUNC( QT_QRECTF_TOALIGNEDRECT ) */ HB_FUNC( QT_QRECTF_TORECT ) { - hb_retptr( new QRect( hbqt_par_QRectF( 1 )->toRect() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QRectF( 1 )->toRect() ) ) ); } /* @@ -531,7 +531,7 @@ HB_FUNC( QT_QRECTF_TOP ) */ HB_FUNC( QT_QRECTF_TOPLEFT ) { - hb_retptr( new QPointF( hbqt_par_QRectF( 1 )->topLeft() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPointF( hbqt_par_QRectF( 1 )->topLeft() ) ) ); } /* @@ -539,7 +539,7 @@ HB_FUNC( QT_QRECTF_TOPLEFT ) */ HB_FUNC( QT_QRECTF_TOPRIGHT ) { - hb_retptr( new QPointF( hbqt_par_QRectF( 1 )->topRight() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPointF( hbqt_par_QRectF( 1 )->topRight() ) ) ); } /* @@ -563,7 +563,7 @@ HB_FUNC( QT_QRECTF_TRANSLATE_1 ) */ HB_FUNC( QT_QRECTF_TRANSLATED ) { - hb_retptr( new QRectF( hbqt_par_QRectF( 1 )->translated( hb_parnd( 2 ), hb_parnd( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QRectF( 1 )->translated( hb_parnd( 2 ), hb_parnd( 3 ) ) ) ) ); } /* @@ -571,7 +571,7 @@ HB_FUNC( QT_QRECTF_TRANSLATED ) */ HB_FUNC( QT_QRECTF_TRANSLATED_1 ) { - hb_retptr( new QRectF( hbqt_par_QRectF( 1 )->translated( *hbqt_par_QPointF( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QRectF( 1 )->translated( *hbqt_par_QPointF( 2 ) ) ) ) ); } /* @@ -579,7 +579,7 @@ HB_FUNC( QT_QRECTF_TRANSLATED_1 ) */ HB_FUNC( QT_QRECTF_UNITED ) { - hb_retptr( new QRectF( hbqt_par_QRectF( 1 )->united( *hbqt_par_QRectF( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QRectF( 1 )->united( *hbqt_par_QRectF( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QRegion.cpp b/harbour/contrib/hbqt/QRegion.cpp index 66018c13ee..3d30eab328 100644 --- a/harbour/contrib/hbqt/QRegion.cpp +++ b/harbour/contrib/hbqt/QRegion.cpp @@ -83,6 +83,7 @@ * // Handle handle () const */ +#include #include @@ -96,62 +97,58 @@ * QRegion ( const QRect & r, RegionType t = Rectangle ) * ~QRegion () */ + HB_FUNC( QT_QREGION ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QRegion* ) new QRegion( *hbqt_par_QRegion( 1 ) ) ); + pObj = ( QRegion* ) new QRegion( *hbqt_par_QRegion( 1 ) ) ; } else if( hb_pcount() >= 4 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) && HB_ISNUM( 3 ) && HB_ISNUM( 4 ) ) { - hb_retptr( ( QRegion* ) new QRegion( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), - HB_ISNUM( 5 ) ? ( QRegion::RegionType ) hb_parni( 5 ) : QRegion::Rectangle ) ); + pObj = ( QRegion* ) new QRegion( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), HB_ISNUM( 5 ) ? ( QRegion::RegionType ) hb_parni( 5 ) : QRegion::Rectangle ) ; } else if( hb_pcount() >= 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) ) { if( ( QString ) "QPolygon" == hbqt_par_QString( 1 ) ) { - hb_retptr( ( QRegion* ) new QRegion( *hbqt_par_QPolygon( 2 ), - HB_ISNUM( 3 ) ? ( Qt::FillRule ) hb_parni( 3 ) : Qt::OddEvenFill ) ); + pObj = ( QRegion* ) new QRegion( *hbqt_par_QPolygon( 2 ), HB_ISNUM( 3 ) ? ( Qt::FillRule ) hb_parni( 3 ) : Qt::OddEvenFill ) ; } else if( ( QString ) "QBitmap" == hbqt_par_QString( 1 ) ) { - hb_retptr( ( QRegion* ) new QRegion( *hbqt_par_QBitmap( 2 ) ) ); + pObj = ( QRegion* ) new QRegion( *hbqt_par_QBitmap( 2 ) ) ; } else if( ( QString ) "QRect" == hbqt_par_QString( 1 ) ) { - hb_retptr( ( QRegion* ) new QRegion( *hbqt_par_QRect( 2 ), - HB_ISNUM( 3 ) ? ( QRegion::RegionType ) hb_parni( 3 ) : QRegion::Rectangle ) ); + pObj = ( QRegion* ) new QRegion( *hbqt_par_QRect( 2 ), HB_ISNUM( 3 ) ? ( QRegion::RegionType ) hb_parni( 3 ) : QRegion::Rectangle ) ; } else { - hb_retptr( ( QRegion* ) new QRegion() ); + pObj = ( QRegion* ) new QRegion() ; } } else if( hb_pcount() == 2 && HB_ISPOINTER( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( ( QRegion* ) new QRegion( *hbqt_par_QRect( 1 ), ( QRegion::RegionType ) hb_parni( 2 ) ) ); + pObj = ( QRegion* ) new QRegion( *hbqt_par_QRect( 1 ), ( QRegion::RegionType ) hb_parni( 2 ) ) ; } else { - hb_retptr( ( QRegion* ) new QRegion() ); + pObj = ( QRegion* ) new QRegion() ; } -} -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QREGION_DESTROY ) -{ - delete hbqt_par_QRegion( 1 ); + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QRegion" ); + hb_retptrGC( p ); } - /* * QRect boundingRect () const */ HB_FUNC( QT_QREGION_BOUNDINGRECT ) { - hb_retptr( new QRect( hbqt_par_QRegion( 1 )->boundingRect() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QRegion( 1 )->boundingRect() ) ) ); } /* @@ -175,7 +172,7 @@ HB_FUNC( QT_QREGION_CONTAINS_1 ) */ HB_FUNC( QT_QREGION_INTERSECTED ) { - hb_retptr( new QRegion( hbqt_par_QRegion( 1 )->intersected( *hbqt_par_QRegion( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRegion( hbqt_par_QRegion( 1 )->intersected( *hbqt_par_QRegion( 2 ) ) ) ) ); } /* @@ -183,7 +180,7 @@ HB_FUNC( QT_QREGION_INTERSECTED ) */ HB_FUNC( QT_QREGION_INTERSECTED_1 ) { - hb_retptr( new QRegion( hbqt_par_QRegion( 1 )->intersected( *hbqt_par_QRect( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRegion( hbqt_par_QRegion( 1 )->intersected( *hbqt_par_QRect( 2 ) ) ) ) ); } /* @@ -231,7 +228,7 @@ HB_FUNC( QT_QREGION_SETRECTS ) */ HB_FUNC( QT_QREGION_SUBTRACTED ) { - hb_retptr( new QRegion( hbqt_par_QRegion( 1 )->subtracted( *hbqt_par_QRegion( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRegion( hbqt_par_QRegion( 1 )->subtracted( *hbqt_par_QRegion( 2 ) ) ) ) ); } /* @@ -255,7 +252,7 @@ HB_FUNC( QT_QREGION_TRANSLATE_1 ) */ HB_FUNC( QT_QREGION_TRANSLATED ) { - hb_retptr( new QRegion( hbqt_par_QRegion( 1 )->translated( hb_parni( 2 ), hb_parni( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRegion( hbqt_par_QRegion( 1 )->translated( hb_parni( 2 ), hb_parni( 3 ) ) ) ) ); } /* @@ -263,7 +260,7 @@ HB_FUNC( QT_QREGION_TRANSLATED ) */ HB_FUNC( QT_QREGION_TRANSLATED_1 ) { - hb_retptr( new QRegion( hbqt_par_QRegion( 1 )->translated( *hbqt_par_QPoint( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRegion( hbqt_par_QRegion( 1 )->translated( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* @@ -271,7 +268,7 @@ HB_FUNC( QT_QREGION_TRANSLATED_1 ) */ HB_FUNC( QT_QREGION_UNITED ) { - hb_retptr( new QRegion( hbqt_par_QRegion( 1 )->united( *hbqt_par_QRegion( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRegion( hbqt_par_QRegion( 1 )->united( *hbqt_par_QRegion( 2 ) ) ) ) ); } /* @@ -279,7 +276,7 @@ HB_FUNC( QT_QREGION_UNITED ) */ HB_FUNC( QT_QREGION_UNITED_1 ) { - hb_retptr( new QRegion( hbqt_par_QRegion( 1 )->united( *hbqt_par_QRect( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRegion( hbqt_par_QRegion( 1 )->united( *hbqt_par_QRect( 2 ) ) ) ) ); } /* @@ -287,7 +284,7 @@ HB_FUNC( QT_QREGION_UNITED_1 ) */ HB_FUNC( QT_QREGION_XORED ) { - hb_retptr( new QRegion( hbqt_par_QRegion( 1 )->xored( *hbqt_par_QRegion( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRegion( hbqt_par_QRegion( 1 )->xored( *hbqt_par_QRegion( 2 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/QResizeEvent.cpp b/harbour/contrib/hbqt/QResizeEvent.cpp index 965e0baa76..802d2a67ca 100644 --- a/harbour/contrib/hbqt/QResizeEvent.cpp +++ b/harbour/contrib/hbqt/QResizeEvent.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -73,25 +74,16 @@ /* * QResizeEvent ( const QSize & size, const QSize & oldSize ) */ + HB_FUNC( QT_QRESIZEEVENT ) { - // hb_retptr( ( QResizeEvent* ) new QResizeEvent() ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QRESIZEEVENT_DESTROY ) -{ - -} - /* * const QSize & oldSize () const */ HB_FUNC( QT_QRESIZEEVENT_OLDSIZE ) { - hb_retptr( new QSize( hbqt_par_QResizeEvent( 1 )->oldSize() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QResizeEvent( 1 )->oldSize() ) ) ); } /* @@ -99,7 +91,7 @@ HB_FUNC( QT_QRESIZEEVENT_OLDSIZE ) */ HB_FUNC( QT_QRESIZEEVENT_SIZE ) { - hb_retptr( new QSize( hbqt_par_QResizeEvent( 1 )->size() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QResizeEvent( 1 )->size() ) ) ); } diff --git a/harbour/contrib/hbqt/QResource.cpp b/harbour/contrib/hbqt/QResource.cpp index 3750893d3b..3ecee0bef0 100644 --- a/harbour/contrib/hbqt/QResource.cpp +++ b/harbour/contrib/hbqt/QResource.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,19 +75,15 @@ * QResource ( const QString & file = QString(), const QLocale & locale = QLocale() ) * ~QResource () */ + HB_FUNC( QT_QRESOURCE ) { - hb_retptr( ( QResource* ) new QResource() ); -} + void * pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QRESOURCE_DESTROY ) -{ - delete hbqt_par_QResource( 1 ); -} + pObj = ( QResource* ) new QResource() ; + hb_retptr( pObj ); +} /* * QString absoluteFilePath () const */ @@ -132,7 +129,7 @@ HB_FUNC( QT_QRESOURCE_ISVALID ) */ HB_FUNC( QT_QRESOURCE_LOCALE ) { - hb_retptr( new QLocale( hbqt_par_QResource( 1 )->locale() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QLocale( hbqt_par_QResource( 1 )->locale() ) ) ); } /* @@ -172,7 +169,7 @@ HB_FUNC( QT_QRESOURCE_REGISTERRESOURCE ) */ HB_FUNC( QT_QRESOURCE_SEARCHPATHS ) { - hb_retptr( new QStringList( hbqt_par_QResource( 1 )->searchPaths() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QResource( 1 )->searchPaths() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QScrollArea.cpp b/harbour/contrib/hbqt/QScrollArea.cpp index c598ce7e15..ce891e8dae 100644 --- a/harbour/contrib/hbqt/QScrollArea.cpp +++ b/harbour/contrib/hbqt/QScrollArea.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,19 +75,18 @@ * QScrollArea ( QWidget * parent = 0 ) * ~QScrollArea () */ + HB_FUNC( QT_QSCROLLAREA ) { - hb_retptr( ( QScrollArea* ) new QScrollArea( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QScrollArea > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSCROLLAREA_DESTROY ) -{ - delete hbqt_par_QScrollArea( 1 ); -} + pObj = ( QScrollArea* ) new QScrollArea( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * Qt::Alignment alignment () const */ diff --git a/harbour/contrib/hbqt/QScrollBar.cpp b/harbour/contrib/hbqt/QScrollBar.cpp index 3f04513ef7..1841fb09c4 100644 --- a/harbour/contrib/hbqt/QScrollBar.cpp +++ b/harbour/contrib/hbqt/QScrollBar.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -75,19 +76,18 @@ * QScrollBar ( Qt::Orientation orientation, QWidget * parent = 0 ) * ~QScrollBar () */ + HB_FUNC( QT_QSCROLLBAR ) { - hb_retptr( ( QScrollBar* ) new QScrollBar( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QScrollBar > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSCROLLBAR_DESTROY ) -{ - delete hbqt_par_QScrollBar( 1 ); -} + pObj = ( QScrollBar* ) new QScrollBar( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ diff --git a/harbour/contrib/hbqt/QSignalMapper.cpp b/harbour/contrib/hbqt/QSignalMapper.cpp index 3c8a2ea1d2..da9aa82c26 100644 --- a/harbour/contrib/hbqt/QSignalMapper.cpp +++ b/harbour/contrib/hbqt/QSignalMapper.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,19 +75,18 @@ * QSignalMapper ( QObject * parent = 0 ) * ~QSignalMapper () */ + HB_FUNC( QT_QSIGNALMAPPER ) { - hb_retptr( new QSignalMapper( hbqt_par_QObject( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QSignalMapper > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSIGNALMAPPER_DESTROY ) -{ - delete hbqt_par_QSignalMapper( 1 ); -} + pObj = new QSignalMapper( hbqt_par_QObject( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * QObject * mapping ( int id ) const */ diff --git a/harbour/contrib/hbqt/QSize.cpp b/harbour/contrib/hbqt/QSize.cpp index 16ead12a05..38c6b9f9ba 100644 --- a/harbour/contrib/hbqt/QSize.cpp +++ b/harbour/contrib/hbqt/QSize.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -75,30 +76,29 @@ * QSize ( int width, int height ) * ~QSize () */ + HB_FUNC( QT_QSIZE ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( ( QSize* ) new QSize( hb_parni( 1 ), hb_parni( 2 ) ) ); + pObj = ( QSize* ) new QSize( hb_parni( 1 ), hb_parni( 2 ) ) ; } else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QSize* ) new QSize( *hbqt_par_QSize( 1 ) ) ); + pObj = ( QSize* ) new QSize( *hbqt_par_QSize( 1 ) ) ; } else { - hb_retptr( ( QSize* ) new QSize() ); + pObj = ( QSize* ) new QSize() ; } -} -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSIZE_DESTROY ) -{ - delete hbqt_par_QSize( 1 ); + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QSize" ); + hb_retptrGC( p ); } - /* * int height () const */ @@ -200,7 +200,7 @@ HB_FUNC( QT_QSIZE_WIDTH ) */ HB_FUNC( QT_QSIZE_BOUNDEDTO ) { - hb_retptr( new QSize( hbqt_par_QSize( 1 )->boundedTo( *hbqt_par_QSize( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QSize( 1 )->boundedTo( *hbqt_par_QSize( 2 ) ) ) ) ); } /* @@ -208,7 +208,7 @@ HB_FUNC( QT_QSIZE_BOUNDEDTO ) */ HB_FUNC( QT_QSIZE_EXPANDEDTO ) { - hb_retptr( new QSize( hbqt_par_QSize( 1 )->expandedTo( *hbqt_par_QSize( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QSize( 1 )->expandedTo( *hbqt_par_QSize( 2 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/QSizeF.cpp b/harbour/contrib/hbqt/QSizeF.cpp index 8f5c7bbc6a..2dc6d3eba5 100644 --- a/harbour/contrib/hbqt/QSizeF.cpp +++ b/harbour/contrib/hbqt/QSizeF.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -76,32 +77,31 @@ * QSizeF ( qreal width, qreal height ) * ~QSizeF () */ + HB_FUNC( QT_QSIZEF ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( ( QSizeF* ) new QSizeF( hb_parnd( 1 ), hb_parnd( 2 ) ) ); + pObj = ( QSizeF* ) new QSizeF( hb_parnd( 1 ), hb_parnd( 2 ) ) ; } else { - hb_retptr( ( QSizeF* ) new QSizeF() ); - } + pObj = ( QSizeF* ) new QSizeF() ; } -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSIZEF_DESTROY ) -{ - delete hbqt_par_QSizeF( 1 ); + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QSizeF" ); + hb_retptrGC( p ); } - /* * QSizeF boundedTo ( const QSizeF & otherSize ) const */ HB_FUNC( QT_QSIZEF_BOUNDEDTO ) { - hb_retptr( new QSizeF( hbqt_par_QSizeF( 1 )->boundedTo( *hbqt_par_QSizeF( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSizeF( hbqt_par_QSizeF( 1 )->boundedTo( *hbqt_par_QSizeF( 2 ) ) ) ) ); } /* @@ -109,7 +109,7 @@ HB_FUNC( QT_QSIZEF_BOUNDEDTO ) */ HB_FUNC( QT_QSIZEF_EXPANDEDTO ) { - hb_retptr( new QSizeF( hbqt_par_QSizeF( 1 )->expandedTo( *hbqt_par_QSizeF( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSizeF( hbqt_par_QSizeF( 1 )->expandedTo( *hbqt_par_QSizeF( 2 ) ) ) ) ); } /* @@ -197,7 +197,7 @@ HB_FUNC( QT_QSIZEF_SETWIDTH ) */ HB_FUNC( QT_QSIZEF_TOSIZE ) { - hb_retptr( new QSize( hbqt_par_QSizeF( 1 )->toSize() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QSizeF( 1 )->toSize() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QSizeGrip.cpp b/harbour/contrib/hbqt/QSizeGrip.cpp index 39ddf30011..353647b032 100644 --- a/harbour/contrib/hbqt/QSizeGrip.cpp +++ b/harbour/contrib/hbqt/QSizeGrip.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,19 +75,18 @@ * QSizeGrip ( QWidget * parent ) * ~QSizeGrip () */ + HB_FUNC( QT_QSIZEGRIP ) { - hb_retptr( ( QSizeGrip* ) new QSizeGrip( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QSizeGrip > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSIZEGRIP_DESTROY ) -{ - delete hbqt_par_QSizeGrip( 1 ); -} + pObj = ( QSizeGrip* ) new QSizeGrip( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ diff --git a/harbour/contrib/hbqt/QSizePolicy.cpp b/harbour/contrib/hbqt/QSizePolicy.cpp index dfdbdd963b..7bc4a46624 100644 --- a/harbour/contrib/hbqt/QSizePolicy.cpp +++ b/harbour/contrib/hbqt/QSizePolicy.cpp @@ -73,6 +73,7 @@ * flags ControlTypes */ +#include #include @@ -82,19 +83,18 @@ * QSizePolicy ( Policy horizontal, Policy vertical ) * QSizePolicy ( Policy horizontal, Policy vertical, ControlType type ) */ + HB_FUNC( QT_QSIZEPOLICY ) { - hb_retptr( ( QSizePolicy* ) new QSizePolicy() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + + pObj = ( QSizePolicy* ) new QSizePolicy() ; + + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QSizePolicy" ); + hb_retptrGC( p ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSIZEPOLICY_DESTROY ) -{ - -} - /* * ControlType controlType () const */ diff --git a/harbour/contrib/hbqt/QSlider.cpp b/harbour/contrib/hbqt/QSlider.cpp index 2c45398d86..b881310dc6 100644 --- a/harbour/contrib/hbqt/QSlider.cpp +++ b/harbour/contrib/hbqt/QSlider.cpp @@ -70,6 +70,7 @@ * enum TickPosition { NoTicks, TicksBothSides, TicksAbove, TicksBelow, TicksLeft, TicksRight } */ +#include #include @@ -79,22 +80,21 @@ * QSlider ( Qt::Orientation orientation, QWidget * parent = 0 ) * ~QSlider () */ + HB_FUNC( QT_QSLIDER ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QSlider > pObj = NULL; + if( hb_pcount() >= 1 && HB_ISNUM( 1 ) ) - hb_retptr( ( QSlider* ) new QSlider( ( Qt::Orientation ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) ); + pObj = ( QSlider* ) new QSlider( ( Qt::Orientation ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) ; else - hb_retptr( ( QSlider* ) new QSlider( hbqt_par_QWidget( 1 ) ) ); -} + pObj = ( QSlider* ) new QSlider( hbqt_par_QWidget( 1 ) ) ; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSLIDER_DESTROY ) -{ - delete hbqt_par_QSlider( 1 ); + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } - /* * void setTickInterval ( int ti ) */ diff --git a/harbour/contrib/hbqt/QSound.cpp b/harbour/contrib/hbqt/QSound.cpp index dae493ce72..525c48b89d 100644 --- a/harbour/contrib/hbqt/QSound.cpp +++ b/harbour/contrib/hbqt/QSound.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,19 +75,18 @@ * QSound ( const QString & filename, QObject * parent = 0 ) * ~QSound () */ + HB_FUNC( QT_QSOUND ) { - hb_retptr( ( QSound* ) new QSound( hbqt_par_QString( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QSound > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSOUND_DESTROY ) -{ - delete hbqt_par_QSound( 1 ); -} + pObj = ( QSound* ) new QSound( hbqt_par_QString( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * QString fileName () const */ diff --git a/harbour/contrib/hbqt/QSpinBox.cpp b/harbour/contrib/hbqt/QSpinBox.cpp index 566a7eaeb1..439c1912e8 100644 --- a/harbour/contrib/hbqt/QSpinBox.cpp +++ b/harbour/contrib/hbqt/QSpinBox.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -73,19 +74,18 @@ /* * QSpinBox ( QWidget * parent = 0 ) */ + HB_FUNC( QT_QSPINBOX ) { - hb_retptr( ( QSpinBox* ) new QSpinBox( hbqt_par_QWidget( 1 ) ) ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QSpinBox > pObj = NULL; + + pObj = ( QSpinBox* ) new QSpinBox( hbqt_par_QWidget( 1 ) ) ; + + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSPINBOX_DESTROY ) -{ - -} - /* * QString cleanText () const */ diff --git a/harbour/contrib/hbqt/QSplashScreen.cpp b/harbour/contrib/hbqt/QSplashScreen.cpp index 3d22b20ddc..4ae33e6d91 100644 --- a/harbour/contrib/hbqt/QSplashScreen.cpp +++ b/harbour/contrib/hbqt/QSplashScreen.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -75,19 +76,18 @@ * QSplashScreen ( QWidget * parent, const QPixmap & pixmap = QPixmap(), Qt::WindowFlags f = 0 ) * virtual ~QSplashScreen () */ + HB_FUNC( QT_QSPLASHSCREEN ) { - hb_retptr( new QSplashScreen( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QSplashScreen > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSPLASHSCREEN_DESTROY ) -{ - delete hbqt_par_QSplashScreen( 1 ); -} + pObj = new QSplashScreen( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * void finish ( QWidget * mainWin ) */ @@ -101,7 +101,7 @@ HB_FUNC( QT_QSPLASHSCREEN_FINISH ) */ HB_FUNC( QT_QSPLASHSCREEN_PIXMAP ) { - hb_retptr( new QPixmap( hbqt_par_QSplashScreen( 1 )->pixmap() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QSplashScreen( 1 )->pixmap() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QSplitter.cpp b/harbour/contrib/hbqt/QSplitter.cpp index ed6f51d114..a42a6f733f 100644 --- a/harbour/contrib/hbqt/QSplitter.cpp +++ b/harbour/contrib/hbqt/QSplitter.cpp @@ -76,6 +76,7 @@ * QList sizes () const */ +#include #include @@ -85,22 +86,21 @@ * QSplitter ( Qt::Orientation orientation, QWidget * parent = 0 ) * ~QSplitter () */ + HB_FUNC( QT_QSPLITTER ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QSplitter > pObj = NULL; + if( hb_pcount() >= 1 && HB_ISNUM( 1 ) ) - hb_retptr( ( QSplitter* ) new QSplitter( ( Qt::Orientation ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) ); + pObj = ( QSplitter* ) new QSplitter( ( Qt::Orientation ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) ; else - hb_retptr( ( QSplitter* ) new QSplitter( hbqt_par_QWidget( 1 ) ) ); -} + pObj = ( QSplitter* ) new QSplitter( hbqt_par_QWidget( 1 ) ) ; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSPLITTER_DESTROY ) -{ - delete hbqt_par_QSplitter( 1 ); + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } - /* * void addWidget ( QWidget * widget ) */ @@ -216,7 +216,7 @@ HB_FUNC( QT_QSPLITTER_RESTORESTATE ) */ HB_FUNC( QT_QSPLITTER_SAVESTATE ) { - hb_retptr( new QByteArray( hbqt_par_QSplitter( 1 )->saveState() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QSplitter( 1 )->saveState() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QStandardItem.cpp b/harbour/contrib/hbqt/QStandardItem.cpp index 509235a5fa..7e15033dc7 100644 --- a/harbour/contrib/hbqt/QStandardItem.cpp +++ b/harbour/contrib/hbqt/QStandardItem.cpp @@ -86,6 +86,7 @@ * QList takeRow ( int row ) */ +#include #include @@ -97,19 +98,15 @@ * QStandardItem ( int rows, int columns = 1 ) * virtual ~QStandardItem () */ + HB_FUNC( QT_QSTANDARDITEM ) { - hb_retptr( ( QStandardItem* ) new QStandardItem() ); -} + void * pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTANDARDITEM_DESTROY ) -{ - delete hbqt_par_QStandardItem( 1 ); -} + pObj = ( QStandardItem* ) new QStandardItem() ; + hb_retptr( pObj ); +} /* * QString accessibleDescription () const */ @@ -139,7 +136,7 @@ HB_FUNC( QT_QSTANDARDITEM_APPENDROW ) */ HB_FUNC( QT_QSTANDARDITEM_BACKGROUND ) { - hb_retptr( new QBrush( hbqt_par_QStandardItem( 1 )->background() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QStandardItem( 1 )->background() ) ) ); } /* @@ -187,7 +184,7 @@ HB_FUNC( QT_QSTANDARDITEM_COLUMNCOUNT ) */ HB_FUNC( QT_QSTANDARDITEM_DATA ) { - hb_retptr( new QVariant( hbqt_par_QStandardItem( 1 )->data( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : Qt::UserRole + 1 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QStandardItem( 1 )->data( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : Qt::UserRole + 1 ) ) ) ) ); } /* @@ -203,7 +200,7 @@ HB_FUNC( QT_QSTANDARDITEM_FLAGS ) */ HB_FUNC( QT_QSTANDARDITEM_FONT ) { - hb_retptr( new QFont( hbqt_par_QStandardItem( 1 )->font() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QStandardItem( 1 )->font() ) ) ); } /* @@ -211,7 +208,7 @@ HB_FUNC( QT_QSTANDARDITEM_FONT ) */ HB_FUNC( QT_QSTANDARDITEM_FOREGROUND ) { - hb_retptr( new QBrush( hbqt_par_QStandardItem( 1 )->foreground() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QStandardItem( 1 )->foreground() ) ) ); } /* @@ -227,7 +224,7 @@ HB_FUNC( QT_QSTANDARDITEM_HASCHILDREN ) */ HB_FUNC( QT_QSTANDARDITEM_ICON ) { - hb_retptr( new QIcon( hbqt_par_QStandardItem( 1 )->icon() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QStandardItem( 1 )->icon() ) ) ); } /* @@ -235,7 +232,7 @@ HB_FUNC( QT_QSTANDARDITEM_ICON ) */ HB_FUNC( QT_QSTANDARDITEM_INDEX ) { - hb_retptr( new QModelIndex( hbqt_par_QStandardItem( 1 )->index() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QStandardItem( 1 )->index() ) ) ); } /* @@ -603,7 +600,7 @@ HB_FUNC( QT_QSTANDARDITEM_SETWHATSTHIS ) */ HB_FUNC( QT_QSTANDARDITEM_SIZEHINT ) { - hb_retptr( new QSize( hbqt_par_QStandardItem( 1 )->sizeHint() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QStandardItem( 1 )->sizeHint() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QStandardItemModel.cpp b/harbour/contrib/hbqt/QStandardItemModel.cpp index 070c6b80e9..bae740841e 100644 --- a/harbour/contrib/hbqt/QStandardItemModel.cpp +++ b/harbour/contrib/hbqt/QStandardItemModel.cpp @@ -81,6 +81,7 @@ * QList takeRow ( int row ) */ +#include #include @@ -90,19 +91,18 @@ * QStandardItemModel ( int rows, int columns, QObject * parent = 0 ) * ~QStandardItemModel () */ + HB_FUNC( QT_QSTANDARDITEMMODEL ) { - hb_retptr( ( QStandardItemModel* ) new QStandardItemModel( hbqt_par_QObject( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QStandardItemModel > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTANDARDITEMMODEL_DESTROY ) -{ - delete hbqt_par_QStandardItemModel( 1 ); -} + pObj = ( QStandardItemModel* ) new QStandardItemModel( hbqt_par_QObject( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * void appendRow ( QStandardItem * item ) */ @@ -132,7 +132,7 @@ HB_FUNC( QT_QSTANDARDITEMMODEL_HORIZONTALHEADERITEM ) */ HB_FUNC( QT_QSTANDARDITEMMODEL_INDEXFROMITEM ) { - hb_retptr( new QModelIndex( hbqt_par_QStandardItemModel( 1 )->indexFromItem( hbqt_par_QStandardItem( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QStandardItemModel( 1 )->indexFromItem( hbqt_par_QStandardItem( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QStatusBar.cpp b/harbour/contrib/hbqt/QStatusBar.cpp index 51356435c5..491d60d243 100644 --- a/harbour/contrib/hbqt/QStatusBar.cpp +++ b/harbour/contrib/hbqt/QStatusBar.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,19 +75,18 @@ * QStatusBar ( QWidget * parent = 0 ) * virtual ~QStatusBar () */ + HB_FUNC( QT_QSTATUSBAR ) { - hb_retptr( ( QStatusBar* ) new QStatusBar( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QStatusBar > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTATUSBAR_DESTROY ) -{ - delete hbqt_par_QStatusBar( 1 ); -} + pObj = ( QStatusBar* ) new QStatusBar( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * void addPermanentWidget ( QWidget * widget, int stretch = 0 ) */ diff --git a/harbour/contrib/hbqt/QStringList.cpp b/harbour/contrib/hbqt/QStringList.cpp index e3b3631af5..4b3b36ddc3 100644 --- a/harbour/contrib/hbqt/QStringList.cpp +++ b/harbour/contrib/hbqt/QStringList.cpp @@ -84,6 +84,7 @@ * // QStringList & replaceInStrings ( const QRegExp & rx, const QString & after ) */ +#include #include @@ -94,19 +95,18 @@ * QStringList ( const QStringList & other ) * QStringList ( const QList & other ) */ + HB_FUNC( QT_QSTRINGLIST ) { - hb_retptr( ( QStringList* ) new QStringList() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + + pObj = ( QStringList* ) new QStringList() ; + + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QStringList" ); + hb_retptrGC( p ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTRINGLIST_DESTROY ) -{ - -} - /* * void append ( const QString & value ) */ @@ -120,7 +120,7 @@ HB_FUNC( QT_QSTRINGLIST_APPEND ) */ HB_FUNC( QT_QSTRINGLIST_FILTER ) { - hb_retptr( new QStringList( hbqt_par_QStringList( 1 )->filter( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::CaseSensitivity ) hb_parni( 3 ) : ( Qt::CaseSensitivity ) Qt::CaseSensitive ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QStringList( 1 )->filter( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::CaseSensitivity ) hb_parni( 3 ) : ( Qt::CaseSensitivity ) Qt::CaseSensitive ) ) ) ) ); } /* @@ -128,7 +128,7 @@ HB_FUNC( QT_QSTRINGLIST_FILTER ) */ HB_FUNC( QT_QSTRINGLIST_FILTER_1 ) { - hb_retptr( new QStringList( hbqt_par_QStringList( 1 )->filter( *hbqt_par_QRegExp( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QStringList( 1 )->filter( *hbqt_par_QRegExp( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QStringListModel.cpp b/harbour/contrib/hbqt/QStringListModel.cpp index 94c0d70138..995be557b6 100644 --- a/harbour/contrib/hbqt/QStringListModel.cpp +++ b/harbour/contrib/hbqt/QStringListModel.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,25 +75,24 @@ * QStringListModel ( QObject * parent = 0 ) * QStringListModel ( const QStringList & strings, QObject * parent = 0 ) */ + HB_FUNC( QT_QSTRINGLISTMODEL ) { - hb_retptr( ( QStringListModel* ) new QStringListModel() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QStringListModel > pObj = NULL; + + pObj = ( QStringListModel* ) new QStringListModel() ; + + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTRINGLISTMODEL_DESTROY ) -{ - -} - /* * virtual QVariant data ( const QModelIndex & index, int role ) const */ HB_FUNC( QT_QSTRINGLISTMODEL_DATA ) { - hb_retptr( new QVariant( hbqt_par_QStringListModel( 1 )->data( *hbqt_par_QModelIndex( 2 ), hb_parni( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QStringListModel( 1 )->data( *hbqt_par_QModelIndex( 2 ), hb_parni( 3 ) ) ) ) ); } /* @@ -148,7 +148,7 @@ HB_FUNC( QT_QSTRINGLISTMODEL_SETSTRINGLIST ) */ HB_FUNC( QT_QSTRINGLISTMODEL_STRINGLIST ) { - hb_retptr( new QStringList( hbqt_par_QStringListModel( 1 )->stringList() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QStringListModel( 1 )->stringList() ) ) ); } diff --git a/harbour/contrib/hbqt/QStyle.cpp b/harbour/contrib/hbqt/QStyle.cpp index f3070ffe75..3ef552171b 100644 --- a/harbour/contrib/hbqt/QStyle.cpp +++ b/harbour/contrib/hbqt/QStyle.cpp @@ -81,6 +81,7 @@ * enum SubElement { SE_PushButtonContents, SE_PushButtonFocusRect, SE_PushButtonLayoutItem, SE_CheckBoxIndicator, ..., SE_TabBarTabText } */ +#include #include @@ -89,19 +90,10 @@ * QStyle () * virtual ~QStyle () */ + HB_FUNC( QT_QSTYLE ) { - } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLE_DESTROY ) -{ - delete hbqt_par_QStyle( 1 ); -} - /* * int combinedLayoutSpacing ( QSizePolicy::ControlTypes controls1, QSizePolicy::ControlTypes controls2, Qt::Orientation orientation, QStyleOption * option = 0, QWidget * widget = 0 ) const */ @@ -155,7 +147,7 @@ HB_FUNC( QT_QSTYLE_DRAWPRIMITIVE ) */ HB_FUNC( QT_QSTYLE_GENERATEDICONPIXMAP ) { - hb_retptr( new QPixmap( hbqt_par_QStyle( 1 )->generatedIconPixmap( ( QIcon::Mode ) hb_parni( 2 ), *hbqt_par_QPixmap( 3 ), hbqt_par_QStyleOption( 4 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QStyle( 1 )->generatedIconPixmap( ( QIcon::Mode ) hb_parni( 2 ), *hbqt_par_QPixmap( 3 ), hbqt_par_QStyleOption( 4 ) ) ) ) ); } /* @@ -171,7 +163,7 @@ HB_FUNC( QT_QSTYLE_HITTESTCOMPLEXCONTROL ) */ HB_FUNC( QT_QSTYLE_ITEMPIXMAPRECT ) { - hb_retptr( new QRect( hbqt_par_QStyle( 1 )->itemPixmapRect( *hbqt_par_QRect( 2 ), hb_parni( 3 ), *hbqt_par_QPixmap( 4 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QStyle( 1 )->itemPixmapRect( *hbqt_par_QRect( 2 ), hb_parni( 3 ), *hbqt_par_QPixmap( 4 ) ) ) ) ); } /* @@ -179,7 +171,7 @@ HB_FUNC( QT_QSTYLE_ITEMPIXMAPRECT ) */ HB_FUNC( QT_QSTYLE_ITEMTEXTRECT ) { - hb_retptr( new QRect( hbqt_par_QStyle( 1 )->itemTextRect( *hbqt_par_QFontMetrics( 2 ), *hbqt_par_QRect( 3 ), hb_parni( 4 ), hb_parl( 5 ), hbqt_par_QString( 6 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QStyle( 1 )->itemTextRect( *hbqt_par_QFontMetrics( 2 ), *hbqt_par_QRect( 3 ), hb_parni( 4 ), hb_parl( 5 ), hbqt_par_QString( 6 ) ) ) ) ); } /* @@ -227,7 +219,7 @@ HB_FUNC( QT_QSTYLE_POLISH_2 ) */ HB_FUNC( QT_QSTYLE_SIZEFROMCONTENTS ) { - hb_retptr( new QSize( hbqt_par_QStyle( 1 )->sizeFromContents( ( QStyle::ContentsType ) hb_parni( 2 ), hbqt_par_QStyleOption( 3 ), *hbqt_par_QSize( 4 ), hbqt_par_QWidget( 5 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QStyle( 1 )->sizeFromContents( ( QStyle::ContentsType ) hb_parni( 2 ), hbqt_par_QStyleOption( 3 ), *hbqt_par_QSize( 4 ), hbqt_par_QWidget( 5 ) ) ) ) ); } /* @@ -235,7 +227,7 @@ HB_FUNC( QT_QSTYLE_SIZEFROMCONTENTS ) */ HB_FUNC( QT_QSTYLE_STANDARDICON ) { - hb_retptr( new QIcon( hbqt_par_QStyle( 1 )->standardIcon( ( QStyle::StandardPixmap ) hb_parni( 2 ), hbqt_par_QStyleOption( 3 ), hbqt_par_QWidget( 4 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QStyle( 1 )->standardIcon( ( QStyle::StandardPixmap ) hb_parni( 2 ), hbqt_par_QStyleOption( 3 ), hbqt_par_QWidget( 4 ) ) ) ) ); } /* @@ -243,7 +235,7 @@ HB_FUNC( QT_QSTYLE_STANDARDICON ) */ HB_FUNC( QT_QSTYLE_STANDARDPALETTE ) { - hb_retptr( new QPalette( hbqt_par_QStyle( 1 )->standardPalette() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPalette( hbqt_par_QStyle( 1 )->standardPalette() ) ) ); } /* @@ -259,7 +251,7 @@ HB_FUNC( QT_QSTYLE_STYLEHINT ) */ HB_FUNC( QT_QSTYLE_SUBCONTROLRECT ) { - hb_retptr( new QRect( hbqt_par_QStyle( 1 )->subControlRect( ( QStyle::ComplexControl ) hb_parni( 2 ), hbqt_par_QStyleOptionComplex( 3 ), ( QStyle::SubControl ) hb_parni( 4 ), hbqt_par_QWidget( 5 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QStyle( 1 )->subControlRect( ( QStyle::ComplexControl ) hb_parni( 2 ), hbqt_par_QStyleOptionComplex( 3 ), ( QStyle::SubControl ) hb_parni( 4 ), hbqt_par_QWidget( 5 ) ) ) ) ); } /* @@ -267,7 +259,7 @@ HB_FUNC( QT_QSTYLE_SUBCONTROLRECT ) */ HB_FUNC( QT_QSTYLE_SUBELEMENTRECT ) { - hb_retptr( new QRect( hbqt_par_QStyle( 1 )->subElementRect( ( QStyle::SubElement ) hb_parni( 2 ), hbqt_par_QStyleOption( 3 ), hbqt_par_QWidget( 4 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QStyle( 1 )->subElementRect( ( QStyle::SubElement ) hb_parni( 2 ), hbqt_par_QStyleOption( 3 ), hbqt_par_QWidget( 4 ) ) ) ) ); } /* @@ -291,7 +283,7 @@ HB_FUNC( QT_QSTYLE_UNPOLISH_1 ) */ HB_FUNC( QT_QSTYLE_ALIGNEDRECT ) { - hb_retptr( new QRect( hbqt_par_QStyle( 1 )->alignedRect( ( Qt::LayoutDirection ) hb_parni( 2 ), ( Qt::Alignment ) hb_parni( 3 ), *hbqt_par_QSize( 4 ), *hbqt_par_QRect( 5 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QStyle( 1 )->alignedRect( ( Qt::LayoutDirection ) hb_parni( 2 ), ( Qt::Alignment ) hb_parni( 3 ), *hbqt_par_QSize( 4 ), *hbqt_par_QRect( 5 ) ) ) ) ); } /* @@ -323,7 +315,7 @@ HB_FUNC( QT_QSTYLE_VISUALALIGNMENT ) */ HB_FUNC( QT_QSTYLE_VISUALPOS ) { - hb_retptr( new QPoint( hbqt_par_QStyle( 1 )->visualPos( ( Qt::LayoutDirection ) hb_parni( 2 ), *hbqt_par_QRect( 3 ), *hbqt_par_QPoint( 4 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QStyle( 1 )->visualPos( ( Qt::LayoutDirection ) hb_parni( 2 ), *hbqt_par_QRect( 3 ), *hbqt_par_QPoint( 4 ) ) ) ) ); } /* @@ -331,7 +323,7 @@ HB_FUNC( QT_QSTYLE_VISUALPOS ) */ HB_FUNC( QT_QSTYLE_VISUALRECT ) { - hb_retptr( new QRect( hbqt_par_QStyle( 1 )->visualRect( ( Qt::LayoutDirection ) hb_parni( 2 ), *hbqt_par_QRect( 3 ), *hbqt_par_QRect( 4 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QStyle( 1 )->visualRect( ( Qt::LayoutDirection ) hb_parni( 2 ), *hbqt_par_QRect( 3 ), *hbqt_par_QRect( 4 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/QStyleFactory.cpp b/harbour/contrib/hbqt/QStyleFactory.cpp index 20d2192df6..d1bf328368 100644 --- a/harbour/contrib/hbqt/QStyleFactory.cpp +++ b/harbour/contrib/hbqt/QStyleFactory.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -73,19 +74,15 @@ /* * */ + HB_FUNC( QT_QSTYLEFACTORY ) { - hb_retptr( new QStyleFactory() ); + void * pObj = NULL; + + pObj = new QStyleFactory() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEFACTORY_DESTROY ) -{ - -} - /* * QStyle * create ( const QString & key ) */ @@ -99,7 +96,7 @@ HB_FUNC( QT_QSTYLEFACTORY_CREATE ) */ HB_FUNC( QT_QSTYLEFACTORY_KEYS ) { - hb_retptr( new QStringList( hbqt_par_QStyleFactory( 1 )->keys() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QStyleFactory( 1 )->keys() ) ) ); } diff --git a/harbour/contrib/hbqt/QStyleHintReturn.cpp b/harbour/contrib/hbqt/QStyleHintReturn.cpp index fa4212139e..4ad6e995f3 100644 --- a/harbour/contrib/hbqt/QStyleHintReturn.cpp +++ b/harbour/contrib/hbqt/QStyleHintReturn.cpp @@ -72,6 +72,7 @@ * enum StyleOptionVersion { Version } */ +#include #include @@ -79,20 +80,11 @@ /* * QStyleHintReturn ( int version = QStyleOption::Version, int type = SH_Default ) */ + HB_FUNC( QT_QSTYLEHINTRETURN ) { - } -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEHINTRETURN_DESTROY ) -{ - -} - - /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/QStyleHintReturnMask.cpp b/harbour/contrib/hbqt/QStyleHintReturnMask.cpp index 873881d718..201e23a658 100644 --- a/harbour/contrib/hbqt/QStyleHintReturnMask.cpp +++ b/harbour/contrib/hbqt/QStyleHintReturnMask.cpp @@ -72,6 +72,7 @@ * Public Functions */ +#include #include @@ -79,20 +80,11 @@ /* * QStyleHintReturnMask () */ + HB_FUNC( QT_QSTYLEHINTRETURNMASK ) { - } -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEHINTRETURNMASK_DESTROY ) -{ - -} - - /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/QStyleHintReturnVariant.cpp b/harbour/contrib/hbqt/QStyleHintReturnVariant.cpp index b213b2014e..dacf2dded9 100644 --- a/harbour/contrib/hbqt/QStyleHintReturnVariant.cpp +++ b/harbour/contrib/hbqt/QStyleHintReturnVariant.cpp @@ -72,6 +72,7 @@ * Public Functions */ +#include #include @@ -79,20 +80,11 @@ /* * QStyleHintReturnVariant () */ + HB_FUNC( QT_QSTYLEHINTRETURNVARIANT ) { - } -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEHINTRETURNVARIANT_DESTROY ) -{ - -} - - /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/QStyleOption.cpp b/harbour/contrib/hbqt/QStyleOption.cpp index 738b96007c..1572d8a36e 100644 --- a/harbour/contrib/hbqt/QStyleOption.cpp +++ b/harbour/contrib/hbqt/QStyleOption.cpp @@ -72,6 +72,7 @@ * enum StyleOptionVersion { Version } */ +#include #include @@ -81,19 +82,15 @@ * QStyleOption ( const QStyleOption & other ) * ~QStyleOption () */ + HB_FUNC( QT_QSTYLEOPTION ) { - hb_retptr( ( QStyleOption* ) new QStyleOption() ); -} + void * pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEOPTION_DESTROY ) -{ - delete hbqt_par_QStyleOption( 1 ); -} + pObj = ( QStyleOption* ) new QStyleOption() ; + hb_retptr( pObj ); +} /* * void initFrom ( const QWidget * widget ) */ @@ -115,7 +112,7 @@ HB_FUNC( QT_QSTYLEOPTION_DIRECTION ) */ HB_FUNC( QT_QSTYLEOPTION_FONTMETRICS ) { - hb_retptr( new QFontMetrics( hbqt_par_QStyleOption( 1 )->fontMetrics ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFontMetrics( hbqt_par_QStyleOption( 1 )->fontMetrics ) ) ); } /* @@ -123,7 +120,7 @@ HB_FUNC( QT_QSTYLEOPTION_FONTMETRICS ) */ HB_FUNC( QT_QSTYLEOPTION_PALETTE ) { - hb_retptr( new QPalette( hbqt_par_QStyleOption( 1 )->palette ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPalette( hbqt_par_QStyleOption( 1 )->palette ) ) ); } /* @@ -131,7 +128,7 @@ HB_FUNC( QT_QSTYLEOPTION_PALETTE ) */ HB_FUNC( QT_QSTYLEOPTION_RECT ) { - hb_retptr( new QRect( hbqt_par_QStyleOption( 1 )->rect ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QStyleOption( 1 )->rect ) ) ); } /* diff --git a/harbour/contrib/hbqt/QStyleOptionButton.cpp b/harbour/contrib/hbqt/QStyleOptionButton.cpp index 1c03a74bdd..9d2f8c86ab 100644 --- a/harbour/contrib/hbqt/QStyleOptionButton.cpp +++ b/harbour/contrib/hbqt/QStyleOptionButton.cpp @@ -73,6 +73,7 @@ * enum StyleOptionVersion { Version } */ +#include #include @@ -81,19 +82,15 @@ * QStyleOptionButton () * QStyleOptionButton ( const QStyleOptionButton & other ) */ + HB_FUNC( QT_QSTYLEOPTIONBUTTON ) { - hb_retptr( ( QStyleOptionButton* ) new QStyleOptionButton() ); + void * pObj = NULL; + + pObj = ( QStyleOptionButton* ) new QStyleOptionButton() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEOPTIONBUTTON_DESTROY ) -{ - -} - /* * ButtonFeatures features */ @@ -107,7 +104,7 @@ HB_FUNC( QT_QSTYLEOPTIONBUTTON_FEATURES ) */ HB_FUNC( QT_QSTYLEOPTIONBUTTON_ICON ) { - hb_retptr( new QIcon( hbqt_par_QStyleOptionButton( 1 )->icon ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QStyleOptionButton( 1 )->icon ) ) ); } /* @@ -115,7 +112,7 @@ HB_FUNC( QT_QSTYLEOPTIONBUTTON_ICON ) */ HB_FUNC( QT_QSTYLEOPTIONBUTTON_ICONSIZE ) { - hb_retptr( new QSize( hbqt_par_QStyleOptionButton( 1 )->iconSize ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QStyleOptionButton( 1 )->iconSize ) ) ); } /* diff --git a/harbour/contrib/hbqt/QStyleOptionComboBox.cpp b/harbour/contrib/hbqt/QStyleOptionComboBox.cpp index a718e6f10e..1c59ba4248 100644 --- a/harbour/contrib/hbqt/QStyleOptionComboBox.cpp +++ b/harbour/contrib/hbqt/QStyleOptionComboBox.cpp @@ -71,6 +71,7 @@ * enum StyleOptionVersion { Version } */ +#include #include @@ -79,25 +80,21 @@ * QStyleOptionComboBox () * QStyleOptionComboBox ( const QStyleOptionComboBox & other ) */ + HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX ) { - hb_retptr( ( QStyleOptionComboBox* ) new QStyleOptionComboBox() ); + void * pObj = NULL; + + pObj = ( QStyleOptionComboBox* ) new QStyleOptionComboBox() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX_DESTROY ) -{ - -} - /* * QIcon currentIcon */ HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX_CURRENTICON ) { - hb_retptr( new QIcon( hbqt_par_QStyleOptionComboBox( 1 )->currentIcon ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QStyleOptionComboBox( 1 )->currentIcon ) ) ); } /* @@ -129,7 +126,7 @@ HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX_FRAME ) */ HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX_ICONSIZE ) { - hb_retptr( new QSize( hbqt_par_QStyleOptionComboBox( 1 )->iconSize ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QStyleOptionComboBox( 1 )->iconSize ) ) ); } /* @@ -137,7 +134,7 @@ HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX_ICONSIZE ) */ HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX_POPUPRECT ) { - hb_retptr( new QRect( hbqt_par_QStyleOptionComboBox( 1 )->popupRect ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QStyleOptionComboBox( 1 )->popupRect ) ) ); } diff --git a/harbour/contrib/hbqt/QStyleOptionComplex.cpp b/harbour/contrib/hbqt/QStyleOptionComplex.cpp index 76cd269cc4..40ca98b796 100644 --- a/harbour/contrib/hbqt/QStyleOptionComplex.cpp +++ b/harbour/contrib/hbqt/QStyleOptionComplex.cpp @@ -71,6 +71,7 @@ * enum StyleOptionVersion { Version } */ +#include #include @@ -79,19 +80,15 @@ * QStyleOptionComplex ( int version = QStyleOptionComplex::Version, int type = SO_Complex ) * QStyleOptionComplex ( const QStyleOptionComplex & other ) */ + HB_FUNC( QT_QSTYLEOPTIONCOMPLEX ) { - hb_retptr( ( QStyleOptionComplex* ) new QStyleOptionComplex() ); + void * pObj = NULL; + + pObj = ( QStyleOptionComplex* ) new QStyleOptionComplex() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEOPTIONCOMPLEX_DESTROY ) -{ - -} - /* * QStyle::SubControls activeSubControls */ diff --git a/harbour/contrib/hbqt/QStyleOptionDockWidget.cpp b/harbour/contrib/hbqt/QStyleOptionDockWidget.cpp index a89638c7f0..3f8698b5db 100644 --- a/harbour/contrib/hbqt/QStyleOptionDockWidget.cpp +++ b/harbour/contrib/hbqt/QStyleOptionDockWidget.cpp @@ -71,6 +71,7 @@ * enum StyleOptionVersion { Version } */ +#include #include @@ -79,19 +80,15 @@ * QStyleOptionDockWidget () * QStyleOptionDockWidget ( const QStyleOptionDockWidget & other ) */ + HB_FUNC( QT_QSTYLEOPTIONDOCKWIDGET ) { - hb_retptr( ( QStyleOptionDockWidget* ) new QStyleOptionDockWidget() ); + void * pObj = NULL; + + pObj = ( QStyleOptionDockWidget* ) new QStyleOptionDockWidget() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEOPTIONDOCKWIDGET_DESTROY ) -{ - -} - /* * bool closable */ diff --git a/harbour/contrib/hbqt/QStyleOptionFocusRect.cpp b/harbour/contrib/hbqt/QStyleOptionFocusRect.cpp index 05c5abe384..aab439316a 100644 --- a/harbour/contrib/hbqt/QStyleOptionFocusRect.cpp +++ b/harbour/contrib/hbqt/QStyleOptionFocusRect.cpp @@ -71,6 +71,7 @@ * enum StyleOptionVersion { Version } */ +#include #include @@ -79,25 +80,21 @@ * QStyleOptionFocusRect () * QStyleOptionFocusRect ( const QStyleOptionFocusRect & other ) */ + HB_FUNC( QT_QSTYLEOPTIONFOCUSRECT ) { - hb_retptr( ( QStyleOptionFocusRect* ) new QStyleOptionFocusRect() ); + void * pObj = NULL; + + pObj = ( QStyleOptionFocusRect* ) new QStyleOptionFocusRect() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEOPTIONFOCUSRECT_DESTROY ) -{ - -} - /* * QColor backgroundColor */ HB_FUNC( QT_QSTYLEOPTIONFOCUSRECT_BACKGROUNDCOLOR ) { - hb_retptr( new QColor( hbqt_par_QStyleOptionFocusRect( 1 )->backgroundColor ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QStyleOptionFocusRect( 1 )->backgroundColor ) ) ); } diff --git a/harbour/contrib/hbqt/QStyleOptionFrame.cpp b/harbour/contrib/hbqt/QStyleOptionFrame.cpp index 66485336f6..e8bb9f0924 100644 --- a/harbour/contrib/hbqt/QStyleOptionFrame.cpp +++ b/harbour/contrib/hbqt/QStyleOptionFrame.cpp @@ -71,6 +71,7 @@ * enum StyleOptionVersion { Version } */ +#include #include @@ -79,19 +80,15 @@ * QStyleOptionFrame () * QStyleOptionFrame ( const QStyleOptionFrame & other ) */ + HB_FUNC( QT_QSTYLEOPTIONFRAME ) { - hb_retptr( ( QStyleOptionFrame* ) new QStyleOptionFrame() ); + void * pObj = NULL; + + pObj = ( QStyleOptionFrame* ) new QStyleOptionFrame() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEOPTIONFRAME_DESTROY ) -{ - -} - /* * int lineWidth */ diff --git a/harbour/contrib/hbqt/QStyleOptionGroupBox.cpp b/harbour/contrib/hbqt/QStyleOptionGroupBox.cpp index c00a8c38db..b691b5c706 100644 --- a/harbour/contrib/hbqt/QStyleOptionGroupBox.cpp +++ b/harbour/contrib/hbqt/QStyleOptionGroupBox.cpp @@ -71,6 +71,7 @@ * enum StyleOptionVersion { Version } */ +#include #include @@ -79,19 +80,15 @@ * QStyleOptionGroupBox () * QStyleOptionGroupBox ( const QStyleOptionGroupBox & other ) */ + HB_FUNC( QT_QSTYLEOPTIONGROUPBOX ) { - hb_retptr( ( QStyleOptionGroupBox* ) new QStyleOptionGroupBox() ); + void * pObj = NULL; + + pObj = ( QStyleOptionGroupBox* ) new QStyleOptionGroupBox() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEOPTIONGROUPBOX_DESTROY ) -{ - -} - /* * QStyleOptionFrameV2::FrameFeatures features */ @@ -137,7 +134,7 @@ HB_FUNC( QT_QSTYLEOPTIONGROUPBOX_TEXTALIGNMENT ) */ HB_FUNC( QT_QSTYLEOPTIONGROUPBOX_TEXTCOLOR ) { - hb_retptr( new QColor( hbqt_par_QStyleOptionGroupBox( 1 )->textColor ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QStyleOptionGroupBox( 1 )->textColor ) ) ); } diff --git a/harbour/contrib/hbqt/QStyleOptionHeader.cpp b/harbour/contrib/hbqt/QStyleOptionHeader.cpp index 2aab9a41a1..16853f5d4f 100644 --- a/harbour/contrib/hbqt/QStyleOptionHeader.cpp +++ b/harbour/contrib/hbqt/QStyleOptionHeader.cpp @@ -74,6 +74,7 @@ * enum StyleOptionVersion { Version } */ +#include #include @@ -82,25 +83,21 @@ * QStyleOptionHeader () * QStyleOptionHeader ( const QStyleOptionHeader & other ) */ + HB_FUNC( QT_QSTYLEOPTIONHEADER ) { - hb_retptr( ( QStyleOptionHeader* ) new QStyleOptionHeader() ); + void * pObj = NULL; + + pObj = ( QStyleOptionHeader* ) new QStyleOptionHeader() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEOPTIONHEADER_DESTROY ) -{ - -} - /* * QIcon icon */ HB_FUNC( QT_QSTYLEOPTIONHEADER_ICON ) { - hb_retptr( new QIcon( hbqt_par_QStyleOptionHeader( 1 )->icon ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QStyleOptionHeader( 1 )->icon ) ) ); } /* diff --git a/harbour/contrib/hbqt/QStyleOptionMenuItem.cpp b/harbour/contrib/hbqt/QStyleOptionMenuItem.cpp index 81fb9aed71..1a99da7d78 100644 --- a/harbour/contrib/hbqt/QStyleOptionMenuItem.cpp +++ b/harbour/contrib/hbqt/QStyleOptionMenuItem.cpp @@ -73,6 +73,7 @@ * enum StyleOptionVersion { Version } */ +#include #include @@ -81,19 +82,15 @@ * QStyleOptionMenuItem () * QStyleOptionMenuItem ( const QStyleOptionMenuItem & other ) */ + HB_FUNC( QT_QSTYLEOPTIONMENUITEM ) { - hb_retptr( ( QStyleOptionMenuItem* ) new QStyleOptionMenuItem() ); + void * pObj = NULL; + + pObj = ( QStyleOptionMenuItem* ) new QStyleOptionMenuItem() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEOPTIONMENUITEM_DESTROY ) -{ - -} - /* * CheckType checkType */ @@ -115,7 +112,7 @@ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_CHECKED ) */ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_FONT ) { - hb_retptr( new QFont( hbqt_par_QStyleOptionMenuItem( 1 )->font ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QStyleOptionMenuItem( 1 )->font ) ) ); } /* @@ -123,7 +120,7 @@ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_FONT ) */ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_ICON ) { - hb_retptr( new QIcon( hbqt_par_QStyleOptionMenuItem( 1 )->icon ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QStyleOptionMenuItem( 1 )->icon ) ) ); } /* @@ -155,7 +152,7 @@ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_MENUITEMTYPE ) */ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_MENURECT ) { - hb_retptr( new QRect( hbqt_par_QStyleOptionMenuItem( 1 )->menuRect ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QStyleOptionMenuItem( 1 )->menuRect ) ) ); } /* diff --git a/harbour/contrib/hbqt/QStyleOptionProgressBar.cpp b/harbour/contrib/hbqt/QStyleOptionProgressBar.cpp index 393d033b41..fd78caf729 100644 --- a/harbour/contrib/hbqt/QStyleOptionProgressBar.cpp +++ b/harbour/contrib/hbqt/QStyleOptionProgressBar.cpp @@ -72,6 +72,7 @@ * Public Functions */ +#include #include @@ -80,19 +81,15 @@ * QStyleOptionProgressBar () * QStyleOptionProgressBar ( const QStyleOptionProgressBar & other ) */ + HB_FUNC( QT_QSTYLEOPTIONPROGRESSBAR ) { - hb_retptr( ( QStyleOptionProgressBar* ) new QStyleOptionProgressBar() ); + void * pObj = NULL; + + pObj = ( QStyleOptionProgressBar* ) new QStyleOptionProgressBar() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEOPTIONPROGRESSBAR_DESTROY ) -{ - -} - /* * int maximum */ diff --git a/harbour/contrib/hbqt/QStyleOptionSizeGrip.cpp b/harbour/contrib/hbqt/QStyleOptionSizeGrip.cpp index aefb0d1c3c..aa04cc7802 100644 --- a/harbour/contrib/hbqt/QStyleOptionSizeGrip.cpp +++ b/harbour/contrib/hbqt/QStyleOptionSizeGrip.cpp @@ -71,6 +71,7 @@ * enum StyleOptionVersion { Version } */ +#include #include @@ -79,19 +80,15 @@ * QStyleOptionSizeGrip () * QStyleOptionSizeGrip ( const QStyleOptionSizeGrip & other ) */ + HB_FUNC( QT_QSTYLEOPTIONSIZEGRIP ) { - hb_retptr( ( QStyleOptionSizeGrip* ) new QStyleOptionSizeGrip() ); + void * pObj = NULL; + + pObj = ( QStyleOptionSizeGrip* ) new QStyleOptionSizeGrip() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEOPTIONSIZEGRIP_DESTROY ) -{ - -} - /* * Qt::Corner corner */ diff --git a/harbour/contrib/hbqt/QStyleOptionSlider.cpp b/harbour/contrib/hbqt/QStyleOptionSlider.cpp index 5974fc31fa..67e6386ce4 100644 --- a/harbour/contrib/hbqt/QStyleOptionSlider.cpp +++ b/harbour/contrib/hbqt/QStyleOptionSlider.cpp @@ -71,6 +71,7 @@ * enum StyleOptionVersion { Version } */ +#include #include @@ -79,19 +80,15 @@ * QStyleOptionSlider () * QStyleOptionSlider ( const QStyleOptionSlider & other ) */ + HB_FUNC( QT_QSTYLEOPTIONSLIDER ) { - hb_retptr( ( QStyleOptionSlider* ) new QStyleOptionSlider() ); + void * pObj = NULL; + + pObj = ( QStyleOptionSlider* ) new QStyleOptionSlider() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEOPTIONSLIDER_DESTROY ) -{ - -} - /* * bool dialWrapping */ diff --git a/harbour/contrib/hbqt/QStyleOptionSpinBox.cpp b/harbour/contrib/hbqt/QStyleOptionSpinBox.cpp index 5ee96a773d..7497d99f0a 100644 --- a/harbour/contrib/hbqt/QStyleOptionSpinBox.cpp +++ b/harbour/contrib/hbqt/QStyleOptionSpinBox.cpp @@ -71,6 +71,7 @@ * enum StyleOptionVersion { Version } */ +#include #include @@ -79,19 +80,15 @@ * QStyleOptionSpinBox () * QStyleOptionSpinBox ( const QStyleOptionSpinBox & other ) */ + HB_FUNC( QT_QSTYLEOPTIONSPINBOX ) { - hb_retptr( ( QStyleOptionSpinBox* ) new QStyleOptionSpinBox() ); + void * pObj = NULL; + + pObj = ( QStyleOptionSpinBox* ) new QStyleOptionSpinBox() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEOPTIONSPINBOX_DESTROY ) -{ - -} - /* * QAbstractSpinBox::ButtonSymbols buttonSymbols */ diff --git a/harbour/contrib/hbqt/QStyleOptionTab.cpp b/harbour/contrib/hbqt/QStyleOptionTab.cpp index d13be77b95..39aff3ae32 100644 --- a/harbour/contrib/hbqt/QStyleOptionTab.cpp +++ b/harbour/contrib/hbqt/QStyleOptionTab.cpp @@ -75,6 +75,7 @@ * enum TabPosition { Beginning, Middle, End, OnlyOneTab } */ +#include #include @@ -83,19 +84,15 @@ * QStyleOptionTab () * QStyleOptionTab ( const QStyleOptionTab & other ) */ + HB_FUNC( QT_QSTYLEOPTIONTAB ) { - hb_retptr( ( QStyleOptionTab* ) new QStyleOptionTab() ); + void * pObj = NULL; + + pObj = ( QStyleOptionTab* ) new QStyleOptionTab() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEOPTIONTAB_DESTROY ) -{ - -} - /* * CornerWidgets cornerWidgets */ @@ -109,7 +106,7 @@ HB_FUNC( QT_QSTYLEOPTIONTAB_CORNERWIDGETS ) */ HB_FUNC( QT_QSTYLEOPTIONTAB_ICON ) { - hb_retptr( new QIcon( hbqt_par_QStyleOptionTab( 1 )->icon ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QStyleOptionTab( 1 )->icon ) ) ); } /* diff --git a/harbour/contrib/hbqt/QStyleOptionTabBarBase.cpp b/harbour/contrib/hbqt/QStyleOptionTabBarBase.cpp index 0d4a04642a..084fe17882 100644 --- a/harbour/contrib/hbqt/QStyleOptionTabBarBase.cpp +++ b/harbour/contrib/hbqt/QStyleOptionTabBarBase.cpp @@ -71,6 +71,7 @@ * enum StyleOptionVersion { Version } */ +#include #include @@ -79,25 +80,21 @@ * QStyleOptionTabBarBase () * QStyleOptionTabBarBase ( const QStyleOptionTabBarBase & other ) */ + HB_FUNC( QT_QSTYLEOPTIONTABBARBASE ) { - hb_retptr( ( QStyleOptionTabBarBase* ) new QStyleOptionTabBarBase() ); + void * pObj = NULL; + + pObj = ( QStyleOptionTabBarBase* ) new QStyleOptionTabBarBase() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEOPTIONTABBARBASE_DESTROY ) -{ - -} - /* * QRect selectedTabRect */ HB_FUNC( QT_QSTYLEOPTIONTABBARBASE_SELECTEDTABRECT ) { - hb_retptr( new QRect( hbqt_par_QStyleOptionTabBarBase( 1 )->selectedTabRect ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QStyleOptionTabBarBase( 1 )->selectedTabRect ) ) ); } /* @@ -113,7 +110,7 @@ HB_FUNC( QT_QSTYLEOPTIONTABBARBASE_SHAPE ) */ HB_FUNC( QT_QSTYLEOPTIONTABBARBASE_TABBARRECT ) { - hb_retptr( new QRect( hbqt_par_QStyleOptionTabBarBase( 1 )->tabBarRect ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QStyleOptionTabBarBase( 1 )->tabBarRect ) ) ); } diff --git a/harbour/contrib/hbqt/QStyleOptionTabWidgetFrame.cpp b/harbour/contrib/hbqt/QStyleOptionTabWidgetFrame.cpp index bfe218cf76..f13cbdf5ca 100644 --- a/harbour/contrib/hbqt/QStyleOptionTabWidgetFrame.cpp +++ b/harbour/contrib/hbqt/QStyleOptionTabWidgetFrame.cpp @@ -71,6 +71,7 @@ * enum StyleOptionVersion { Version } */ +#include #include @@ -79,25 +80,21 @@ * QStyleOptionTabWidgetFrame () * QStyleOptionTabWidgetFrame ( const QStyleOptionTabWidgetFrame & other ) */ + HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME ) { - hb_retptr( ( QStyleOptionTabWidgetFrame* ) new QStyleOptionTabWidgetFrame() ); + void * pObj = NULL; + + pObj = ( QStyleOptionTabWidgetFrame* ) new QStyleOptionTabWidgetFrame() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME_DESTROY ) -{ - -} - /* * QSize leftCornerWidgetSize */ HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME_LEFTCORNERWIDGETSIZE ) { - hb_retptr( new QSize( hbqt_par_QStyleOptionTabWidgetFrame( 1 )->leftCornerWidgetSize ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QStyleOptionTabWidgetFrame( 1 )->leftCornerWidgetSize ) ) ); } /* @@ -121,7 +118,7 @@ HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME_MIDLINEWIDTH ) */ HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME_RIGHTCORNERWIDGETSIZE ) { - hb_retptr( new QSize( hbqt_par_QStyleOptionTabWidgetFrame( 1 )->rightCornerWidgetSize ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QStyleOptionTabWidgetFrame( 1 )->rightCornerWidgetSize ) ) ); } /* @@ -137,7 +134,7 @@ HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME_SHAPE ) */ HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME_TABBARSIZE ) { - hb_retptr( new QSize( hbqt_par_QStyleOptionTabWidgetFrame( 1 )->tabBarSize ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QStyleOptionTabWidgetFrame( 1 )->tabBarSize ) ) ); } diff --git a/harbour/contrib/hbqt/QStyleOptionTitleBar.cpp b/harbour/contrib/hbqt/QStyleOptionTitleBar.cpp index 6685009469..4859107b9a 100644 --- a/harbour/contrib/hbqt/QStyleOptionTitleBar.cpp +++ b/harbour/contrib/hbqt/QStyleOptionTitleBar.cpp @@ -71,6 +71,7 @@ * enum StyleOptionVersion { Version } */ +#include #include @@ -79,25 +80,21 @@ * QStyleOptionTitleBar () * QStyleOptionTitleBar ( const QStyleOptionTitleBar & other ) */ + HB_FUNC( QT_QSTYLEOPTIONTITLEBAR ) { - hb_retptr( ( QStyleOptionTitleBar* ) new QStyleOptionTitleBar() ); + void * pObj = NULL; + + pObj = ( QStyleOptionTitleBar* ) new QStyleOptionTitleBar() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEOPTIONTITLEBAR_DESTROY ) -{ - -} - /* * QIcon icon */ HB_FUNC( QT_QSTYLEOPTIONTITLEBAR_ICON ) { - hb_retptr( new QIcon( hbqt_par_QStyleOptionTitleBar( 1 )->icon ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QStyleOptionTitleBar( 1 )->icon ) ) ); } /* diff --git a/harbour/contrib/hbqt/QStyleOptionToolBar.cpp b/harbour/contrib/hbqt/QStyleOptionToolBar.cpp index 2f3cbb7fe3..bc92266f00 100644 --- a/harbour/contrib/hbqt/QStyleOptionToolBar.cpp +++ b/harbour/contrib/hbqt/QStyleOptionToolBar.cpp @@ -74,6 +74,7 @@ * enum ToolBarPosition { Beginning, Middle, End, OnlyOne } */ +#include #include @@ -82,19 +83,15 @@ * QStyleOptionToolBar () * QStyleOptionToolBar ( const QStyleOptionToolBar & other ) */ + HB_FUNC( QT_QSTYLEOPTIONTOOLBAR ) { - hb_retptr( ( QStyleOptionToolBar* ) new QStyleOptionToolBar() ); + void * pObj = NULL; + + pObj = ( QStyleOptionToolBar* ) new QStyleOptionToolBar() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEOPTIONTOOLBAR_DESTROY ) -{ - -} - /* * ToolBarFeatures features */ diff --git a/harbour/contrib/hbqt/QStyleOptionToolBox.cpp b/harbour/contrib/hbqt/QStyleOptionToolBox.cpp index 42841a39bb..d77a0d69cb 100644 --- a/harbour/contrib/hbqt/QStyleOptionToolBox.cpp +++ b/harbour/contrib/hbqt/QStyleOptionToolBox.cpp @@ -71,6 +71,7 @@ * enum StyleOptionVersion { Version } */ +#include #include @@ -79,25 +80,21 @@ * QStyleOptionToolBox () * QStyleOptionToolBox ( const QStyleOptionToolBox & other ) */ + HB_FUNC( QT_QSTYLEOPTIONTOOLBOX ) { - hb_retptr( ( QStyleOptionToolBox* ) new QStyleOptionToolBox() ); + void * pObj = NULL; + + pObj = ( QStyleOptionToolBox* ) new QStyleOptionToolBox() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEOPTIONTOOLBOX_DESTROY ) -{ - -} - /* * QIcon icon */ HB_FUNC( QT_QSTYLEOPTIONTOOLBOX_ICON ) { - hb_retptr( new QIcon( hbqt_par_QStyleOptionToolBox( 1 )->icon ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QStyleOptionToolBox( 1 )->icon ) ) ); } /* diff --git a/harbour/contrib/hbqt/QStyleOptionToolButton.cpp b/harbour/contrib/hbqt/QStyleOptionToolButton.cpp index 982bcded2d..06517d8a3a 100644 --- a/harbour/contrib/hbqt/QStyleOptionToolButton.cpp +++ b/harbour/contrib/hbqt/QStyleOptionToolButton.cpp @@ -73,6 +73,7 @@ * flags ToolButtonFeatures */ +#include #include @@ -81,19 +82,15 @@ * QStyleOptionToolButton () * QStyleOptionToolButton ( const QStyleOptionToolButton & other ) */ + HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON ) { - hb_retptr( ( QStyleOptionToolButton* ) new QStyleOptionToolButton() ); + void * pObj = NULL; + + pObj = ( QStyleOptionToolButton* ) new QStyleOptionToolButton() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_DESTROY ) -{ - -} - /* * Qt::ArrowType arrowType */ @@ -115,7 +112,7 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_FEATURES ) */ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_FONT ) { - hb_retptr( new QFont( hbqt_par_QStyleOptionToolButton( 1 )->font ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QStyleOptionToolButton( 1 )->font ) ) ); } /* @@ -123,7 +120,7 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_FONT ) */ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_ICON ) { - hb_retptr( new QIcon( hbqt_par_QStyleOptionToolButton( 1 )->icon ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QStyleOptionToolButton( 1 )->icon ) ) ); } /* @@ -131,7 +128,7 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_ICON ) */ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_ICONSIZE ) { - hb_retptr( new QSize( hbqt_par_QStyleOptionToolButton( 1 )->iconSize ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QStyleOptionToolButton( 1 )->iconSize ) ) ); } /* @@ -139,7 +136,7 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_ICONSIZE ) */ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_POS ) { - hb_retptr( new QPoint( hbqt_par_QStyleOptionToolButton( 1 )->pos ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QStyleOptionToolButton( 1 )->pos ) ) ); } /* diff --git a/harbour/contrib/hbqt/QStyleOptionViewItem.cpp b/harbour/contrib/hbqt/QStyleOptionViewItem.cpp index ef32b86732..3a50f0f5e7 100644 --- a/harbour/contrib/hbqt/QStyleOptionViewItem.cpp +++ b/harbour/contrib/hbqt/QStyleOptionViewItem.cpp @@ -72,6 +72,7 @@ * enum StyleOptionVersion { Version } */ +#include #include @@ -80,19 +81,15 @@ * QStyleOptionViewItem () * QStyleOptionViewItem ( const QStyleOptionViewItem & other ) */ + HB_FUNC( QT_QSTYLEOPTIONVIEWITEM ) { - hb_retptr( ( QStyleOptionViewItem* ) new QStyleOptionViewItem() ); + void * pObj = NULL; + + pObj = ( QStyleOptionViewItem* ) new QStyleOptionViewItem() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEOPTIONVIEWITEM_DESTROY ) -{ - -} - /* * Qt::Alignment decorationAlignment */ @@ -114,7 +111,7 @@ HB_FUNC( QT_QSTYLEOPTIONVIEWITEM_DECORATIONPOSITION ) */ HB_FUNC( QT_QSTYLEOPTIONVIEWITEM_DECORATIONSIZE ) { - hb_retptr( new QSize( hbqt_par_QStyleOptionViewItem( 1 )->decorationSize ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QStyleOptionViewItem( 1 )->decorationSize ) ) ); } /* @@ -130,7 +127,7 @@ HB_FUNC( QT_QSTYLEOPTIONVIEWITEM_DISPLAYALIGNMENT ) */ HB_FUNC( QT_QSTYLEOPTIONVIEWITEM_FONT ) { - hb_retptr( new QFont( hbqt_par_QStyleOptionViewItem( 1 )->font ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QStyleOptionViewItem( 1 )->font ) ) ); } /* diff --git a/harbour/contrib/hbqt/QStylePainter.cpp b/harbour/contrib/hbqt/QStylePainter.cpp index c3a2930d62..3d4d6d0b76 100644 --- a/harbour/contrib/hbqt/QStylePainter.cpp +++ b/harbour/contrib/hbqt/QStylePainter.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -75,19 +76,15 @@ * QStylePainter ( QWidget * widget ) * QStylePainter ( QPaintDevice * pd, QWidget * widget ) */ + HB_FUNC( QT_QSTYLEPAINTER ) { - hb_retptr( ( QStylePainter* ) new QStylePainter() ); + void * pObj = NULL; + + pObj = ( QStylePainter* ) new QStylePainter() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEPAINTER_DESTROY ) -{ - -} - /* * bool begin ( QWidget * widget ) */ diff --git a/harbour/contrib/hbqt/QStyledItemDelegate.cpp b/harbour/contrib/hbqt/QStyledItemDelegate.cpp index 4abc86ce38..a6bda7e304 100644 --- a/harbour/contrib/hbqt/QStyledItemDelegate.cpp +++ b/harbour/contrib/hbqt/QStyledItemDelegate.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,19 +75,18 @@ * QStyledItemDelegate ( QObject * parent = 0 ) * ~QStyledItemDelegate () */ + HB_FUNC( QT_QSTYLEDITEMDELEGATE ) { - hb_retptr( ( QStyledItemDelegate* ) new QStyledItemDelegate( hbqt_par_QObject( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QStyledItemDelegate > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSTYLEDITEMDELEGATE_DESTROY ) -{ - delete hbqt_par_QStyledItemDelegate( 1 ); -} + pObj = ( QStyledItemDelegate* ) new QStyledItemDelegate( hbqt_par_QObject( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * virtual QWidget * createEditor ( QWidget * parent, const QStyleOptionViewItem & option, const QModelIndex & index ) const */ @@ -148,7 +148,7 @@ HB_FUNC( QT_QSTYLEDITEMDELEGATE_SETMODELDATA ) */ HB_FUNC( QT_QSTYLEDITEMDELEGATE_SIZEHINT ) { - hb_retptr( new QSize( hbqt_par_QStyledItemDelegate( 1 )->sizeHint( *hbqt_par_QStyleOptionViewItem( 2 ), *hbqt_par_QModelIndex( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QStyledItemDelegate( 1 )->sizeHint( *hbqt_par_QStyleOptionViewItem( 2 ), *hbqt_par_QModelIndex( 3 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QSystemTrayIcon.cpp b/harbour/contrib/hbqt/QSystemTrayIcon.cpp index 98e673c1b0..7eba4a7e73 100644 --- a/harbour/contrib/hbqt/QSystemTrayIcon.cpp +++ b/harbour/contrib/hbqt/QSystemTrayIcon.cpp @@ -71,6 +71,7 @@ * enum MessageIcon { NoIcon, Information, Warning, Critical } */ +#include #include @@ -80,19 +81,18 @@ * QSystemTrayIcon ( const QIcon & icon, QObject * parent = 0 ) * ~QSystemTrayIcon () */ + HB_FUNC( QT_QSYSTEMTRAYICON ) { - hb_retptr( ( QSystemTrayIcon* ) new QSystemTrayIcon( hbqt_par_QObject( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QSystemTrayIcon > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QSYSTEMTRAYICON_DESTROY ) -{ - delete hbqt_par_QSystemTrayIcon( 1 ); -} + pObj = ( QSystemTrayIcon* ) new QSystemTrayIcon( hbqt_par_QObject( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * QMenu * contextMenu () const */ @@ -106,7 +106,7 @@ HB_FUNC( QT_QSYSTEMTRAYICON_CONTEXTMENU ) */ HB_FUNC( QT_QSYSTEMTRAYICON_GEOMETRY ) { - hb_retptr( new QRect( hbqt_par_QSystemTrayIcon( 1 )->geometry() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QSystemTrayIcon( 1 )->geometry() ) ) ); } /* @@ -114,7 +114,7 @@ HB_FUNC( QT_QSYSTEMTRAYICON_GEOMETRY ) */ HB_FUNC( QT_QSYSTEMTRAYICON_ICON ) { - hb_retptr( new QIcon( hbqt_par_QSystemTrayIcon( 1 )->icon() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QSystemTrayIcon( 1 )->icon() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QTabBar.cpp b/harbour/contrib/hbqt/QTabBar.cpp index fb3ef02ac0..8dcaa9a6be 100644 --- a/harbour/contrib/hbqt/QTabBar.cpp +++ b/harbour/contrib/hbqt/QTabBar.cpp @@ -72,6 +72,7 @@ * enum Shape { RoundedNorth, RoundedSouth, RoundedWest, RoundedEast, ..., TriangularEast } */ +#include #include #include @@ -81,19 +82,18 @@ * QTabBar ( QWidget * parent = 0 ) * ~QTabBar () */ + HB_FUNC( QT_QTABBAR ) { - hb_retptr( ( QTabBar* ) new QTabBar( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QTabBar > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTABBAR_DESTROY ) -{ - delete hbqt_par_QTabBar( 1 ); -} + pObj = ( QTabBar* ) new QTabBar( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * int addTab ( const QString & text ) */ @@ -155,7 +155,7 @@ HB_FUNC( QT_QTABBAR_EXPANDING ) */ HB_FUNC( QT_QTABBAR_ICONSIZE ) { - hb_retptr( new QSize( hbqt_par_QTabBar( 1 )->iconSize() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QTabBar( 1 )->iconSize() ) ) ); } /* @@ -371,7 +371,7 @@ HB_FUNC( QT_QTABBAR_TABBUTTON ) */ HB_FUNC( QT_QTABBAR_TABDATA ) { - hb_retptr( new QVariant( hbqt_par_QTabBar( 1 )->tabData( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QTabBar( 1 )->tabData( hb_parni( 2 ) ) ) ) ); } /* @@ -379,7 +379,7 @@ HB_FUNC( QT_QTABBAR_TABDATA ) */ HB_FUNC( QT_QTABBAR_TABICON ) { - hb_retptr( new QIcon( hbqt_par_QTabBar( 1 )->tabIcon( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QTabBar( 1 )->tabIcon( hb_parni( 2 ) ) ) ) ); } /* @@ -387,7 +387,7 @@ HB_FUNC( QT_QTABBAR_TABICON ) */ HB_FUNC( QT_QTABBAR_TABRECT ) { - hb_retptr( new QRect( hbqt_par_QTabBar( 1 )->tabRect( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QTabBar( 1 )->tabRect( hb_parni( 2 ) ) ) ) ); } /* @@ -403,7 +403,7 @@ HB_FUNC( QT_QTABBAR_TABTEXT ) */ HB_FUNC( QT_QTABBAR_TABTEXTCOLOR ) { - hb_retptr( new QColor( hbqt_par_QTabBar( 1 )->tabTextColor( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QTabBar( 1 )->tabTextColor( hb_parni( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QTabWidget.cpp b/harbour/contrib/hbqt/QTabWidget.cpp index 66d98047f4..eaaa7143ef 100644 --- a/harbour/contrib/hbqt/QTabWidget.cpp +++ b/harbour/contrib/hbqt/QTabWidget.cpp @@ -71,6 +71,7 @@ * enum TabShape { Rounded, Triangular } */ +#include #include @@ -79,19 +80,18 @@ * QTabWidget ( QWidget * parent = 0 ) * ~QTabWidget () */ + HB_FUNC( QT_QTABWIDGET ) { - hb_retptr( ( QTabWidget* ) new QTabWidget( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QTabWidget > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTABWIDGET_DESTROY ) -{ - delete hbqt_par_QTabWidget( 1 ); -} + pObj = ( QTabWidget* ) new QTabWidget( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * int addTab ( QWidget * page, const QString & label ) */ @@ -169,7 +169,7 @@ HB_FUNC( QT_QTABWIDGET_ELIDEMODE ) */ HB_FUNC( QT_QTABWIDGET_ICONSIZE ) { - hb_retptr( new QSize( hbqt_par_QTabWidget( 1 )->iconSize() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QTabWidget( 1 )->iconSize() ) ) ); } /* @@ -337,7 +337,7 @@ HB_FUNC( QT_QTABWIDGET_SETUSESSCROLLBUTTONS ) */ HB_FUNC( QT_QTABWIDGET_TABICON ) { - hb_retptr( new QIcon( hbqt_par_QTabWidget( 1 )->tabIcon( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QTabWidget( 1 )->tabIcon( hb_parni( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QTableView.cpp b/harbour/contrib/hbqt/QTableView.cpp index cb97178f89..fe9196675e 100644 --- a/harbour/contrib/hbqt/QTableView.cpp +++ b/harbour/contrib/hbqt/QTableView.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -75,10 +76,6 @@ * QTableView ( QWidget * parent = 0 ) * ~QTableView () */ -HB_FUNC( QT_QTABLEVIEW ) -{ - hb_retptr( ( QTableView* ) new QTableView( hbqt_par_QWidget( 1 ) ) ); -} HB_FUNC( QT_HBTABLEVIEW ) { @@ -90,14 +87,17 @@ HB_FUNC( QT_HBTABLEVIEW_NAVIGATE ) hb_retptr( new QModelIndex( hbqt_par_HbTableView( 1 )->navigate( hb_parni( 2 ) ) ) ); } -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTABLEVIEW_DESTROY ) +HB_FUNC( QT_QTABLEVIEW ) { - delete hbqt_par_QTableView( 1 ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QTableView > pObj = NULL; + pObj = ( QTableView* ) new QTableView( hbqt_par_QWidget( 1 ) ) ; + + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * void clearSpans () */ @@ -159,7 +159,7 @@ HB_FUNC( QT_QTABLEVIEW_HORIZONTALHEADER ) */ HB_FUNC( QT_QTABLEVIEW_INDEXAT ) { - hb_retptr( new QModelIndex( hbqt_par_QTableView( 1 )->indexAt( *hbqt_par_QPoint( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QTableView( 1 )->indexAt( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QTableWidget.cpp b/harbour/contrib/hbqt/QTableWidget.cpp index 7eb3e580f5..dd2d5c6f7d 100644 --- a/harbour/contrib/hbqt/QTableWidget.cpp +++ b/harbour/contrib/hbqt/QTableWidget.cpp @@ -77,6 +77,7 @@ * QList selectedRanges () const */ +#include #include @@ -86,22 +87,21 @@ * QTableWidget ( int rows, int columns, QWidget * parent = 0 ) * ~QTableWidget () */ + HB_FUNC( QT_QTABLEWIDGET ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QTableWidget > pObj = NULL; + if( hb_pcount() >= 2 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) ) - hb_retptr( ( QTableWidget* ) new QTableWidget( hb_parni( 1 ), hb_parni( 2 ), hbqt_par_QWidget( 3 ) ) ); + pObj = ( QTableWidget* ) new QTableWidget( hb_parni( 1 ), hb_parni( 2 ), hbqt_par_QWidget( 3 ) ) ; else - hb_retptr( ( QTableWidget* ) new QTableWidget( hbqt_par_QWidget( 1 ) ) ); -} + pObj = ( QTableWidget* ) new QTableWidget( hbqt_par_QWidget( 1 ) ) ; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTABLEWIDGET_DESTROY ) -{ - delete hbqt_par_QTableWidget( 1 ); + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } - /* * QWidget * cellWidget ( int row, int column ) const */ @@ -403,7 +403,7 @@ HB_FUNC( QT_QTABLEWIDGET_VISUALCOLUMN ) */ HB_FUNC( QT_QTABLEWIDGET_VISUALITEMRECT ) { - hb_retptr( new QRect( hbqt_par_QTableWidget( 1 )->visualItemRect( hbqt_par_QTableWidgetItem( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QTableWidget( 1 )->visualItemRect( hbqt_par_QTableWidgetItem( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QTableWidgetItem.cpp b/harbour/contrib/hbqt/QTableWidgetItem.cpp index 02f03e2f7c..97af0f3683 100644 --- a/harbour/contrib/hbqt/QTableWidgetItem.cpp +++ b/harbour/contrib/hbqt/QTableWidgetItem.cpp @@ -70,6 +70,7 @@ * enum ItemType { Type, UserType } */ +#include #include @@ -81,37 +82,36 @@ * QTableWidgetItem ( const QTableWidgetItem & other ) * virtual ~QTableWidgetItem () */ + HB_FUNC( QT_QTABLEWIDGETITEM ) { - if( hb_pcount() >= 2 && HB_ISCHAR( 1 ) ) + void * pObj = NULL; + + if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISNUM( 2 ) ) { - hb_retptr( ( QTableWidgetItem* ) new QTableWidgetItem( hbqt_par_QString( 1 ), hb_parni( 2 ) ) ); + pObj = new QTableWidgetItem( hbqt_par_QString( 1 ), hb_parni( 2 ) ) ; + } + else if( hb_pcount() == 1 && HB_ISNUM( 1 ) ) + { + pObj = new QTableWidgetItem( hb_parni( 1 ) ) ; + } + else if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) + { + pObj = new QTableWidgetItem( *hbqt_par_QTableWidgetItem( 1 ) ) ; } else { - hb_retptr( ( QTableWidgetItem* ) new QTableWidgetItem( hb_parni( 1 ) ) ); + pObj = new QTableWidgetItem( 0 ) ; } - #if 0 - hb_retptr( ( QTableWidgetItem* ) new QTableWidgetItem( QIcon( hbqt_par_QString( 1 ) ),hbqt_par_QString( 2 ), hb_parni( 3 ) ) ); - hb_retptr( ( QTableWidgetItem* ) new QTableWidgetItem( hbqt_par_QTableWidgetItem( 1 ) ) ); - #endif + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTABLEWIDGETITEM_DESTROY ) -{ - delete hbqt_par_QTableWidgetItem( 1 ); -} - /* * QBrush background () const */ HB_FUNC( QT_QTABLEWIDGETITEM_BACKGROUND ) { - hb_retptr( new QBrush( hbqt_par_QTableWidgetItem( 1 )->background() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QTableWidgetItem( 1 )->background() ) ) ); } /* @@ -143,7 +143,7 @@ HB_FUNC( QT_QTABLEWIDGETITEM_COLUMN ) */ HB_FUNC( QT_QTABLEWIDGETITEM_DATA ) { - hb_retptr( new QVariant( hbqt_par_QTableWidgetItem( 1 )->data( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QTableWidgetItem( 1 )->data( hb_parni( 2 ) ) ) ) ); } /* @@ -159,7 +159,7 @@ HB_FUNC( QT_QTABLEWIDGETITEM_FLAGS ) */ HB_FUNC( QT_QTABLEWIDGETITEM_FONT ) { - hb_retptr( new QFont( hbqt_par_QTableWidgetItem( 1 )->font() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QTableWidgetItem( 1 )->font() ) ) ); } /* @@ -167,7 +167,7 @@ HB_FUNC( QT_QTABLEWIDGETITEM_FONT ) */ HB_FUNC( QT_QTABLEWIDGETITEM_FOREGROUND ) { - hb_retptr( new QBrush( hbqt_par_QTableWidgetItem( 1 )->foreground() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QTableWidgetItem( 1 )->foreground() ) ) ); } /* @@ -175,7 +175,7 @@ HB_FUNC( QT_QTABLEWIDGETITEM_FOREGROUND ) */ HB_FUNC( QT_QTABLEWIDGETITEM_ICON ) { - hb_retptr( new QIcon( hbqt_par_QTableWidgetItem( 1 )->icon() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QTableWidgetItem( 1 )->icon() ) ) ); } /* @@ -319,7 +319,7 @@ HB_FUNC( QT_QTABLEWIDGETITEM_SETWHATSTHIS ) */ HB_FUNC( QT_QTABLEWIDGETITEM_SIZEHINT ) { - hb_retptr( new QSize( hbqt_par_QTableWidgetItem( 1 )->sizeHint() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QTableWidgetItem( 1 )->sizeHint() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QTextBlock.cpp b/harbour/contrib/hbqt/QTextBlock.cpp index 17a6efd4eb..8fc4952e50 100644 --- a/harbour/contrib/hbqt/QTextBlock.cpp +++ b/harbour/contrib/hbqt/QTextBlock.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -73,25 +74,28 @@ /* * QTextBlock ( const QTextBlock & other ) */ + HB_FUNC( QT_QTEXTBLOCK ) { - hb_retptr( ( QTextBlock* ) new QTextBlock( *hbqt_par_QTextBlock( 1 ) ) ); + void * pObj = NULL; + + if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) + { + pObj = new QTextBlock( *hbqt_par_QTextBlock( 1 ) ) ; + } + else + { + pObj = new QTextBlock() ; + } + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTEXTBLOCK_DESTROY ) -{ - -} - /* * QTextBlockFormat blockFormat () const */ HB_FUNC( QT_QTEXTBLOCK_BLOCKFORMAT ) { - hb_retptr( new QTextBlockFormat( hbqt_par_QTextBlock( 1 )->blockFormat() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextBlockFormat( hbqt_par_QTextBlock( 1 )->blockFormat() ) ) ); } /* @@ -115,7 +119,7 @@ HB_FUNC( QT_QTEXTBLOCK_BLOCKNUMBER ) */ HB_FUNC( QT_QTEXTBLOCK_CHARFORMAT ) { - hb_retptr( new QTextCharFormat( hbqt_par_QTextBlock( 1 )->charFormat() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextCharFormat( hbqt_par_QTextBlock( 1 )->charFormat() ) ) ); } /* @@ -203,7 +207,7 @@ HB_FUNC( QT_QTEXTBLOCK_LINECOUNT ) */ HB_FUNC( QT_QTEXTBLOCK_NEXT ) { - hb_retptr( new QTextBlock( hbqt_par_QTextBlock( 1 )->next() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextBlock( hbqt_par_QTextBlock( 1 )->next() ) ) ); } /* @@ -219,7 +223,7 @@ HB_FUNC( QT_QTEXTBLOCK_POSITION ) */ HB_FUNC( QT_QTEXTBLOCK_PREVIOUS ) { - hb_retptr( new QTextBlock( hbqt_par_QTextBlock( 1 )->previous() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextBlock( hbqt_par_QTextBlock( 1 )->previous() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QTextBlockFormat.cpp b/harbour/contrib/hbqt/QTextBlockFormat.cpp index 3074316517..d8c4acc2ff 100644 --- a/harbour/contrib/hbqt/QTextBlockFormat.cpp +++ b/harbour/contrib/hbqt/QTextBlockFormat.cpp @@ -84,6 +84,7 @@ * QList tabPositions () const */ +#include #include @@ -92,26 +93,25 @@ * QTextBlockFormat () * */ + HB_FUNC( QT_QTEXTBLOCKFORMAT ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QTextBlockFormat* ) new QTextBlockFormat( *hbqt_par_QTextBlockFormat( 1 ) ) ); + pObj = ( QTextBlockFormat* ) new QTextBlockFormat( *hbqt_par_QTextBlockFormat( 1 ) ) ; } else { - hb_retptr( ( QTextBlockFormat* ) new QTextBlockFormat() ); + pObj = ( QTextBlockFormat* ) new QTextBlockFormat() ; } + + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QTextBlockFormat" ); + hb_retptrGC( p ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTEXTBLOCKFORMAT_DESTROY ) -{ - -} - /* * Qt::Alignment alignment () const */ diff --git a/harbour/contrib/hbqt/QTextBlockGroup.cpp b/harbour/contrib/hbqt/QTextBlockGroup.cpp index c67359d981..979a8ad3c4 100644 --- a/harbour/contrib/hbqt/QTextBlockGroup.cpp +++ b/harbour/contrib/hbqt/QTextBlockGroup.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -73,20 +74,11 @@ /* * QTextBlockGroup ( QTextDocument * document ) */ + HB_FUNC( QT_QTEXTBLOCKGROUP ) { - //hb_retptr( ( QTextBlockGroup* ) new QTextBlockGroup( hbqt_par_QTextDocument( 1 ) ) ); } -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTEXTBLOCKGROUP_DESTROY ) -{ - -} - - /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/QTextBoundaryFinder.cpp b/harbour/contrib/hbqt/QTextBoundaryFinder.cpp index 78a2a12d1b..f804037887 100644 --- a/harbour/contrib/hbqt/QTextBoundaryFinder.cpp +++ b/harbour/contrib/hbqt/QTextBoundaryFinder.cpp @@ -72,6 +72,7 @@ * enum BoundaryType { Grapheme, Word, Line, Sentence } */ +#include #include @@ -83,19 +84,15 @@ * QTextBoundaryFinder ( BoundaryType type, const QChar * chars, int length, unsigned char * buffer = 0, int bufferSize = 0 ) * ~QTextBoundaryFinder () */ + HB_FUNC( QT_QTEXTBOUNDARYFINDER ) { - hb_retptr( ( QTextBoundaryFinder* ) new QTextBoundaryFinder() ); -} + void * pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTEXTBOUNDARYFINDER_DESTROY ) -{ - delete hbqt_par_QTextBoundaryFinder( 1 ); -} + pObj = ( QTextBoundaryFinder* ) new QTextBoundaryFinder() ; + hb_retptr( pObj ); +} /* * BoundaryReasons boundaryReasons () const */ diff --git a/harbour/contrib/hbqt/QTextBrowser.cpp b/harbour/contrib/hbqt/QTextBrowser.cpp index 5e40c1efcc..53f7a2774c 100644 --- a/harbour/contrib/hbqt/QTextBrowser.cpp +++ b/harbour/contrib/hbqt/QTextBrowser.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -73,19 +74,18 @@ /* * QTextBrowser ( QWidget * parent = 0 ) */ + HB_FUNC( QT_QTEXTBROWSER ) { - hb_retptr( ( QTextBrowser* ) new QTextBrowser( hbqt_par_QWidget( 1 ) ) ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QTextBrowser > pObj = NULL; + + pObj = ( QTextBrowser* ) new QTextBrowser( hbqt_par_QWidget( 1 ) ) ; + + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTEXTBROWSER_DESTROY ) -{ - -} - /* * int backwardHistoryCount () const */ @@ -123,7 +123,7 @@ HB_FUNC( QT_QTEXTBROWSER_HISTORYTITLE ) */ HB_FUNC( QT_QTEXTBROWSER_HISTORYURL ) { - hb_retptr( new QUrl( hbqt_par_QTextBrowser( 1 )->historyUrl( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QUrl( hbqt_par_QTextBrowser( 1 )->historyUrl( hb_parni( 2 ) ) ) ) ); } /* @@ -147,7 +147,7 @@ HB_FUNC( QT_QTEXTBROWSER_ISFORWARDAVAILABLE ) */ HB_FUNC( QT_QTEXTBROWSER_LOADRESOURCE ) { - hb_retptr( new QVariant( hbqt_par_QTextBrowser( 1 )->loadResource( hb_parni( 2 ), *hbqt_par_QUrl( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QTextBrowser( 1 )->loadResource( hb_parni( 2 ), *hbqt_par_QUrl( 3 ) ) ) ) ); } /* @@ -171,7 +171,7 @@ HB_FUNC( QT_QTEXTBROWSER_OPENLINKS ) */ HB_FUNC( QT_QTEXTBROWSER_SEARCHPATHS ) { - hb_retptr( new QStringList( hbqt_par_QTextBrowser( 1 )->searchPaths() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QTextBrowser( 1 )->searchPaths() ) ) ); } /* @@ -203,7 +203,7 @@ HB_FUNC( QT_QTEXTBROWSER_SETSEARCHPATHS ) */ HB_FUNC( QT_QTEXTBROWSER_SOURCE ) { - hb_retptr( new QUrl( hbqt_par_QTextBrowser( 1 )->source() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QUrl( hbqt_par_QTextBrowser( 1 )->source() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QTextCharFormat.cpp b/harbour/contrib/hbqt/QTextCharFormat.cpp index f9bbf68004..ecb5d17dbb 100644 --- a/harbour/contrib/hbqt/QTextCharFormat.cpp +++ b/harbour/contrib/hbqt/QTextCharFormat.cpp @@ -71,6 +71,7 @@ * enum VerticalAlignment { AlignNormal, AlignSuperScript, AlignSubScript, AlignMiddle, AlignBottom, AlignTop } */ +#include #include @@ -79,19 +80,18 @@ * QTextCharFormat () * */ + HB_FUNC( QT_QTEXTCHARFORMAT ) { - hb_retptr( ( QTextCharFormat* ) new QTextCharFormat() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + + pObj = ( QTextCharFormat* ) new QTextCharFormat() ; + + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QTextCharFormat" ); + hb_retptrGC( p ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTEXTCHARFORMAT_DESTROY ) -{ - -} - /* * QString anchorHref () const */ @@ -105,7 +105,7 @@ HB_FUNC( QT_QTEXTCHARFORMAT_ANCHORHREF ) */ HB_FUNC( QT_QTEXTCHARFORMAT_ANCHORNAMES ) { - hb_retptr( new QStringList( hbqt_par_QTextCharFormat( 1 )->anchorNames() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QTextCharFormat( 1 )->anchorNames() ) ) ); } /* @@ -113,7 +113,7 @@ HB_FUNC( QT_QTEXTCHARFORMAT_ANCHORNAMES ) */ HB_FUNC( QT_QTEXTCHARFORMAT_FONT ) { - hb_retptr( new QFont( hbqt_par_QTextCharFormat( 1 )->font() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QTextCharFormat( 1 )->font() ) ) ); } /* @@ -433,7 +433,7 @@ HB_FUNC( QT_QTEXTCHARFORMAT_SETVERTICALALIGNMENT ) */ HB_FUNC( QT_QTEXTCHARFORMAT_TEXTOUTLINE ) { - hb_retptr( new QPen( hbqt_par_QTextCharFormat( 1 )->textOutline() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPen( hbqt_par_QTextCharFormat( 1 )->textOutline() ) ) ); } /* @@ -449,7 +449,7 @@ HB_FUNC( QT_QTEXTCHARFORMAT_TOOLTIP ) */ HB_FUNC( QT_QTEXTCHARFORMAT_UNDERLINECOLOR ) { - hb_retptr( new QColor( hbqt_par_QTextCharFormat( 1 )->underlineColor() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QTextCharFormat( 1 )->underlineColor() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QTextCodec.cpp b/harbour/contrib/hbqt/QTextCodec.cpp index 548ab494d6..3446c92af2 100644 --- a/harbour/contrib/hbqt/QTextCodec.cpp +++ b/harbour/contrib/hbqt/QTextCodec.cpp @@ -85,6 +85,7 @@ * // QString toUnicode ( const char * input, int size, ConverterState * state = 0 ) const */ +#include #include @@ -93,19 +94,10 @@ * * */ + HB_FUNC( QT_QTEXTCODEC ) { - //hb_retptr( ( QTextCodec* ) new QTextCodec() ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTEXTCODEC_DESTROY ) -{ - -} - /* * bool canEncode ( QChar ch ) const */ @@ -127,7 +119,7 @@ HB_FUNC( QT_QTEXTCODEC_CANENCODE_1 ) */ HB_FUNC( QT_QTEXTCODEC_FROMUNICODE ) { - hb_retptr( new QByteArray( hbqt_par_QTextCodec( 1 )->fromUnicode( hbqt_par_QString( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QTextCodec( 1 )->fromUnicode( hbqt_par_QString( 2 ) ) ) ) ); } /* @@ -159,7 +151,7 @@ HB_FUNC( QT_QTEXTCODEC_MIBENUM ) */ HB_FUNC( QT_QTEXTCODEC_NAME ) { - hb_retptr( new QByteArray( hbqt_par_QTextCodec( 1 )->name() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QTextCodec( 1 )->name() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QTextCursor.cpp b/harbour/contrib/hbqt/QTextCursor.cpp index 23c975fdec..3d6bc96037 100644 --- a/harbour/contrib/hbqt/QTextCursor.cpp +++ b/harbour/contrib/hbqt/QTextCursor.cpp @@ -72,6 +72,7 @@ * enum SelectionType { Document, BlockUnderCursor, LineUnderCursor, WordUnderCursor } */ +#include #include #include @@ -85,11 +86,15 @@ * QTextCursor ( const QTextCursor & cursor ) * ~QTextCursor () */ + HB_FUNC( QT_QTEXTCURSOR ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) { - hb_retptr( ( QTextCursor* ) new QTextCursor( *hbqt_par_QTextCursor( 1 ) ) ); + pObj = ( QTextCursor* ) new QTextCursor( *hbqt_par_QTextCursor( 1 ) ) ; } else if( hb_pcount() == 2 && HB_ISCHAR( 1 ) && HB_ISPOINTER( 2 ) ) { @@ -97,35 +102,30 @@ HB_FUNC( QT_QTEXTCURSOR ) if( object == ( QString ) "QTextDocument" ) { - hb_retptr( ( QTextCursor* ) new QTextCursor( hbqt_par_QTextDocument( 2 ) ) ); + pObj = ( QTextCursor* ) new QTextCursor( hbqt_par_QTextDocument( 2 ) ) ; } if( object == ( QString ) "QTextBlock" ) { - hb_retptr( ( QTextCursor* ) new QTextCursor( *hbqt_par_QTextBlock( 2 ) ) ); + pObj = ( QTextCursor* ) new QTextCursor( *hbqt_par_QTextBlock( 2 ) ) ; } if( object == ( QString ) "QTextFrame" ) { - hb_retptr( ( QTextCursor* ) new QTextCursor( hbqt_par_QTextFrame( 2 ) ) ); + pObj = ( QTextCursor* ) new QTextCursor( hbqt_par_QTextFrame( 2 ) ) ; } else { - hb_retptr( ( QTextCursor* ) new QTextCursor() ); + pObj = ( QTextCursor* ) new QTextCursor() ; } } else { - hb_retptr( ( QTextCursor* ) new QTextCursor() ); + pObj = ( QTextCursor* ) new QTextCursor() ; } -} -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTEXTCURSOR_DESTROY ) -{ - delete hbqt_par_QTextCursor( 1 ); + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QTextCursor" ); + hb_retptrGC( p ); } - /* * int anchor () const */ @@ -179,7 +179,7 @@ HB_FUNC( QT_QTEXTCURSOR_BEGINEDITBLOCK ) */ HB_FUNC( QT_QTEXTCURSOR_BLOCKCHARFORMAT ) { - hb_retptr( new QTextCharFormat( hbqt_par_QTextCursor( 1 )->blockCharFormat() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextCharFormat( hbqt_par_QTextCursor( 1 )->blockCharFormat() ) ) ); } /* @@ -187,7 +187,7 @@ HB_FUNC( QT_QTEXTCURSOR_BLOCKCHARFORMAT ) */ HB_FUNC( QT_QTEXTCURSOR_BLOCKFORMAT ) { - hb_retptr( new QTextBlockFormat( hbqt_par_QTextCursor( 1 )->blockFormat() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextBlockFormat( hbqt_par_QTextCursor( 1 )->blockFormat() ) ) ); } /* @@ -203,7 +203,7 @@ HB_FUNC( QT_QTEXTCURSOR_BLOCKNUMBER ) */ HB_FUNC( QT_QTEXTCURSOR_CHARFORMAT ) { - hb_retptr( new QTextCharFormat( hbqt_par_QTextCursor( 1 )->charFormat() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextCharFormat( hbqt_par_QTextCursor( 1 )->charFormat() ) ) ); } /* @@ -549,7 +549,7 @@ HB_FUNC( QT_QTEXTCURSOR_SELECTEDTEXT ) */ HB_FUNC( QT_QTEXTCURSOR_SELECTION ) { - hb_retptr( new QTextDocumentFragment( hbqt_par_QTextCursor( 1 )->selection() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextDocumentFragment( hbqt_par_QTextCursor( 1 )->selection() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QTextDecoder.cpp b/harbour/contrib/hbqt/QTextDecoder.cpp index b60c649896..5cf1e84cc0 100644 --- a/harbour/contrib/hbqt/QTextDecoder.cpp +++ b/harbour/contrib/hbqt/QTextDecoder.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,19 +75,15 @@ * QTextDecoder ( const QTextCodec * codec ) * ~QTextDecoder () */ + HB_FUNC( QT_QTEXTDECODER ) { - hb_retptr( ( QTextDecoder* ) new QTextDecoder( hbqt_par_QTextCodec( 1 ) ) ); -} + void * pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTEXTDECODER_DESTROY ) -{ - delete hbqt_par_QTextDecoder( 1 ); -} + pObj = ( QTextDecoder* ) new QTextDecoder( hbqt_par_QTextCodec( 1 ) ) ; + hb_retptr( pObj ); +} /* * QString toUnicode ( const char * chars, int len ) */ diff --git a/harbour/contrib/hbqt/QTextDocument.cpp b/harbour/contrib/hbqt/QTextDocument.cpp index 7fd3b0afc8..2a8833c4ea 100644 --- a/harbour/contrib/hbqt/QTextDocument.cpp +++ b/harbour/contrib/hbqt/QTextDocument.cpp @@ -86,6 +86,7 @@ * // QChar characterAt ( int pos ) const */ +#include #include #include @@ -97,19 +98,18 @@ * QTextDocument ( const QString & text, QObject * parent = 0 ) * ~QTextDocument () */ + HB_FUNC( QT_QTEXTDOCUMENT ) { - hb_retptr( ( QTextDocument* ) new QTextDocument( hbqt_par_QObject( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QTextDocument > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTEXTDOCUMENT_DESTROY ) -{ - delete hbqt_par_QTextDocument( 1 ); -} + pObj = ( QTextDocument* ) new QTextDocument( hbqt_par_QObject( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * void addResource ( int type, const QUrl & name, const QVariant & resource ) */ @@ -131,7 +131,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_ADJUSTSIZE ) */ HB_FUNC( QT_QTEXTDOCUMENT_BEGIN ) { - hb_retptr( new QTextBlock( hbqt_par_QTextDocument( 1 )->begin() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextBlock( hbqt_par_QTextDocument( 1 )->begin() ) ) ); } /* @@ -171,7 +171,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_CLONE ) */ HB_FUNC( QT_QTEXTDOCUMENT_DEFAULTFONT ) { - hb_retptr( new QFont( hbqt_par_QTextDocument( 1 )->defaultFont() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QTextDocument( 1 )->defaultFont() ) ) ); } /* @@ -187,7 +187,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_DEFAULTSTYLESHEET ) */ HB_FUNC( QT_QTEXTDOCUMENT_DEFAULTTEXTOPTION ) { - hb_retptr( new QTextOption( hbqt_par_QTextDocument( 1 )->defaultTextOption() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextOption( hbqt_par_QTextDocument( 1 )->defaultTextOption() ) ) ); } /* @@ -219,7 +219,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_DRAWCONTENTS ) */ HB_FUNC( QT_QTEXTDOCUMENT_END ) { - hb_retptr( new QTextBlock( hbqt_par_QTextDocument( 1 )->end() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextBlock( hbqt_par_QTextDocument( 1 )->end() ) ) ); } /* @@ -227,7 +227,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_END ) */ HB_FUNC( QT_QTEXTDOCUMENT_FIND ) { - hb_retptr( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( hbqt_par_QString( 2 ), *hbqt_par_QTextCursor( 3 ), ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( hbqt_par_QString( 2 ), *hbqt_par_QTextCursor( 3 ), ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ) ); } /* @@ -235,7 +235,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_FIND ) */ HB_FUNC( QT_QTEXTDOCUMENT_FIND_1 ) { - hb_retptr( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( *hbqt_par_QRegExp( 2 ), *hbqt_par_QTextCursor( 3 ), ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( *hbqt_par_QRegExp( 2 ), *hbqt_par_QTextCursor( 3 ), ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ) ); } /* @@ -243,7 +243,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_FIND_1 ) */ HB_FUNC( QT_QTEXTDOCUMENT_FIND_2 ) { - hb_retptr( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( hbqt_par_QString( 2 ), hb_parni( 3 ), ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( hbqt_par_QString( 2 ), hb_parni( 3 ), ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ) ); } /* @@ -251,7 +251,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_FIND_2 ) */ HB_FUNC( QT_QTEXTDOCUMENT_FIND_3 ) { - hb_retptr( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( *hbqt_par_QRegExp( 2 ), hb_parni( 3 ), ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( *hbqt_par_QRegExp( 2 ), hb_parni( 3 ), ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ) ); } /* @@ -259,7 +259,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_FIND_3 ) */ HB_FUNC( QT_QTEXTDOCUMENT_FINDBLOCK ) { - hb_retptr( new QTextBlock( hbqt_par_QTextDocument( 1 )->findBlock( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextBlock( hbqt_par_QTextDocument( 1 )->findBlock( hb_parni( 2 ) ) ) ) ); } /* @@ -267,7 +267,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_FINDBLOCK ) */ HB_FUNC( QT_QTEXTDOCUMENT_FINDBLOCKBYLINENUMBER ) { - hb_retptr( new QTextBlock( hbqt_par_QTextDocument( 1 )->findBlockByLineNumber( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextBlock( hbqt_par_QTextDocument( 1 )->findBlockByLineNumber( hb_parni( 2 ) ) ) ) ); } /* @@ -275,7 +275,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_FINDBLOCKBYLINENUMBER ) */ HB_FUNC( QT_QTEXTDOCUMENT_FINDBLOCKBYNUMBER ) { - hb_retptr( new QTextBlock( hbqt_par_QTextDocument( 1 )->findBlockByNumber( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextBlock( hbqt_par_QTextDocument( 1 )->findBlockByNumber( hb_parni( 2 ) ) ) ) ); } /* @@ -283,7 +283,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_FINDBLOCKBYNUMBER ) */ HB_FUNC( QT_QTEXTDOCUMENT_FIRSTBLOCK ) { - hb_retptr( new QTextBlock( hbqt_par_QTextDocument( 1 )->firstBlock() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextBlock( hbqt_par_QTextDocument( 1 )->firstBlock() ) ) ); } /* @@ -347,7 +347,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_ISUNDOREDOENABLED ) */ HB_FUNC( QT_QTEXTDOCUMENT_LASTBLOCK ) { - hb_retptr( new QTextBlock( hbqt_par_QTextDocument( 1 )->lastBlock() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextBlock( hbqt_par_QTextDocument( 1 )->lastBlock() ) ) ); } /* @@ -411,7 +411,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_PAGECOUNT ) */ HB_FUNC( QT_QTEXTDOCUMENT_PAGESIZE ) { - hb_retptr( new QSizeF( hbqt_par_QTextDocument( 1 )->pageSize() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSizeF( hbqt_par_QTextDocument( 1 )->pageSize() ) ) ); } /* @@ -435,7 +435,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_REDO ) */ HB_FUNC( QT_QTEXTDOCUMENT_RESOURCE ) { - hb_retptr( new QVariant( hbqt_par_QTextDocument( 1 )->resource( hb_parni( 2 ), *hbqt_par_QUrl( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QTextDocument( 1 )->resource( hb_parni( 2 ), *hbqt_par_QUrl( 3 ) ) ) ) ); } /* @@ -571,7 +571,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_SETUSEDESIGNMETRICS ) */ HB_FUNC( QT_QTEXTDOCUMENT_SIZE ) { - hb_retptr( new QSizeF( hbqt_par_QTextDocument( 1 )->size() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSizeF( hbqt_par_QTextDocument( 1 )->size() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QTextDocumentFragment.cpp b/harbour/contrib/hbqt/QTextDocumentFragment.cpp index c6b6b14c41..d560622fce 100644 --- a/harbour/contrib/hbqt/QTextDocumentFragment.cpp +++ b/harbour/contrib/hbqt/QTextDocumentFragment.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -77,19 +78,18 @@ * QTextDocumentFragment ( const QTextDocumentFragment & other ) * ~QTextDocumentFragment () */ + HB_FUNC( QT_QTEXTDOCUMENTFRAGMENT ) { - hb_retptr( ( QTextDocumentFragment* ) new QTextDocumentFragment() ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTEXTDOCUMENTFRAGMENT_DESTROY ) -{ - delete hbqt_par_QTextDocumentFragment( 1 ); -} + pObj = ( QTextDocumentFragment* ) new QTextDocumentFragment() ; + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QTextDocumentFragment" ); + hb_retptrGC( p ); +} /* * bool isEmpty () const */ @@ -127,7 +127,7 @@ HB_FUNC( QT_QTEXTDOCUMENTFRAGMENT_TOPLAINTEXT ) */ HB_FUNC( QT_QTEXTDOCUMENTFRAGMENT_FROMHTML ) { - hb_retptr( new QTextDocumentFragment( hbqt_par_QTextDocumentFragment( 1 )->fromHtml( hbqt_par_QString( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextDocumentFragment( hbqt_par_QTextDocumentFragment( 1 )->fromHtml( hbqt_par_QString( 2 ) ) ) ) ); } /* @@ -135,7 +135,7 @@ HB_FUNC( QT_QTEXTDOCUMENTFRAGMENT_FROMHTML ) */ HB_FUNC( QT_QTEXTDOCUMENTFRAGMENT_FROMHTML_1 ) { - hb_retptr( new QTextDocumentFragment( hbqt_par_QTextDocumentFragment( 1 )->fromHtml( hbqt_par_QString( 2 ), hbqt_par_QTextDocument( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextDocumentFragment( hbqt_par_QTextDocumentFragment( 1 )->fromHtml( hbqt_par_QString( 2 ), hbqt_par_QTextDocument( 3 ) ) ) ) ); } /* @@ -143,7 +143,7 @@ HB_FUNC( QT_QTEXTDOCUMENTFRAGMENT_FROMHTML_1 ) */ HB_FUNC( QT_QTEXTDOCUMENTFRAGMENT_FROMPLAINTEXT ) { - hb_retptr( new QTextDocumentFragment( hbqt_par_QTextDocumentFragment( 1 )->fromPlainText( hbqt_par_QString( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextDocumentFragment( hbqt_par_QTextDocumentFragment( 1 )->fromPlainText( hbqt_par_QString( 2 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/QTextDocumentWriter.cpp b/harbour/contrib/hbqt/QTextDocumentWriter.cpp index 8aea70e3e4..c0d9f99c51 100644 --- a/harbour/contrib/hbqt/QTextDocumentWriter.cpp +++ b/harbour/contrib/hbqt/QTextDocumentWriter.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -76,19 +77,15 @@ * QTextDocumentWriter ( const QString & fileName, const QByteArray & format = QByteArray() ) * ~QTextDocumentWriter () */ + HB_FUNC( QT_QTEXTDOCUMENTWRITER ) { - hb_retptr( ( QTextDocumentWriter* ) new QTextDocumentWriter() ); -} + void * pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTEXTDOCUMENTWRITER_DESTROY ) -{ - delete hbqt_par_QTextDocumentWriter( 1 ); -} + pObj = ( QTextDocumentWriter* ) new QTextDocumentWriter() ; + hb_retptr( pObj ); +} /* * QTextCodec * codec () const */ @@ -118,7 +115,7 @@ HB_FUNC( QT_QTEXTDOCUMENTWRITER_FILENAME ) */ HB_FUNC( QT_QTEXTDOCUMENTWRITER_FORMAT ) { - hb_retptr( new QByteArray( hbqt_par_QTextDocumentWriter( 1 )->format() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QTextDocumentWriter( 1 )->format() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QTextEdit.cpp b/harbour/contrib/hbqt/QTextEdit.cpp index cffe5f4654..cdbecc99f0 100644 --- a/harbour/contrib/hbqt/QTextEdit.cpp +++ b/harbour/contrib/hbqt/QTextEdit.cpp @@ -85,6 +85,7 @@ * void setExtraSelections ( const QList & selections ) */ +#include #include @@ -92,22 +93,21 @@ /* */ + HB_FUNC( QT_QTEXTEDIT ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QTextEdit > pObj = NULL; + if( hb_pcount() >= 1 && HB_ISCHAR( 1 ) ) - hb_retptr( ( QTextEdit* ) new QTextEdit( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) ); + pObj = ( QTextEdit* ) new QTextEdit( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) ; else - hb_retptr( ( QTextEdit* ) new QTextEdit( hbqt_par_QWidget( 1 ) ) ); -} + pObj = ( QTextEdit* ) new QTextEdit( hbqt_par_QWidget( 1 ) ) ; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTEXTEDIT_DESTROY ) -{ - delete hbqt_par_QTextEdit( 1 ); + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } - /* * bool acceptRichText () const */ @@ -169,7 +169,7 @@ HB_FUNC( QT_QTEXTEDIT_CREATESTANDARDCONTEXTMENU_1 ) */ HB_FUNC( QT_QTEXTEDIT_CURRENTCHARFORMAT ) { - hb_retptr( new QTextCharFormat( hbqt_par_QTextEdit( 1 )->currentCharFormat() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextCharFormat( hbqt_par_QTextEdit( 1 )->currentCharFormat() ) ) ); } /* @@ -177,7 +177,7 @@ HB_FUNC( QT_QTEXTEDIT_CURRENTCHARFORMAT ) */ HB_FUNC( QT_QTEXTEDIT_CURRENTFONT ) { - hb_retptr( new QFont( hbqt_par_QTextEdit( 1 )->currentFont() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QTextEdit( 1 )->currentFont() ) ) ); } /* @@ -185,7 +185,7 @@ HB_FUNC( QT_QTEXTEDIT_CURRENTFONT ) */ HB_FUNC( QT_QTEXTEDIT_CURSORFORPOSITION ) { - hb_retptr( new QTextCursor( hbqt_par_QTextEdit( 1 )->cursorForPosition( *hbqt_par_QPoint( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextCursor( hbqt_par_QTextEdit( 1 )->cursorForPosition( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* @@ -193,7 +193,7 @@ HB_FUNC( QT_QTEXTEDIT_CURSORFORPOSITION ) */ HB_FUNC( QT_QTEXTEDIT_CURSORRECT ) { - hb_retptr( new QRect( hbqt_par_QTextEdit( 1 )->cursorRect( *hbqt_par_QTextCursor( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QTextEdit( 1 )->cursorRect( *hbqt_par_QTextCursor( 2 ) ) ) ) ); } /* @@ -201,7 +201,7 @@ HB_FUNC( QT_QTEXTEDIT_CURSORRECT ) */ HB_FUNC( QT_QTEXTEDIT_CURSORRECT_1 ) { - hb_retptr( new QRect( hbqt_par_QTextEdit( 1 )->cursorRect() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QTextEdit( 1 )->cursorRect() ) ) ); } /* @@ -321,7 +321,7 @@ HB_FUNC( QT_QTEXTEDIT_LINEWRAPMODE ) */ HB_FUNC( QT_QTEXTEDIT_LOADRESOURCE ) { - hb_retptr( new QVariant( hbqt_par_QTextEdit( 1 )->loadResource( hb_parni( 2 ), *hbqt_par_QUrl( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QTextEdit( 1 )->loadResource( hb_parni( 2 ), *hbqt_par_QUrl( 3 ) ) ) ) ); } /* @@ -505,7 +505,7 @@ HB_FUNC( QT_QTEXTEDIT_TABSTOPWIDTH ) */ HB_FUNC( QT_QTEXTEDIT_TEXTBACKGROUNDCOLOR ) { - hb_retptr( new QColor( hbqt_par_QTextEdit( 1 )->textBackgroundColor() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QTextEdit( 1 )->textBackgroundColor() ) ) ); } /* @@ -513,7 +513,7 @@ HB_FUNC( QT_QTEXTEDIT_TEXTBACKGROUNDCOLOR ) */ HB_FUNC( QT_QTEXTEDIT_TEXTCOLOR ) { - hb_retptr( new QColor( hbqt_par_QTextEdit( 1 )->textColor() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QTextEdit( 1 )->textColor() ) ) ); } /* @@ -521,7 +521,7 @@ HB_FUNC( QT_QTEXTEDIT_TEXTCOLOR ) */ HB_FUNC( QT_QTEXTEDIT_TEXTCURSOR ) { - hb_retptr( new QTextCursor( hbqt_par_QTextEdit( 1 )->textCursor() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextCursor( hbqt_par_QTextEdit( 1 )->textCursor() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QTextEncoder.cpp b/harbour/contrib/hbqt/QTextEncoder.cpp index 54f546f77b..99dd94504a 100644 --- a/harbour/contrib/hbqt/QTextEncoder.cpp +++ b/harbour/contrib/hbqt/QTextEncoder.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,25 +75,21 @@ * QTextEncoder ( const QTextCodec * codec ) * ~QTextEncoder () */ + HB_FUNC( QT_QTEXTENCODER ) { - hb_retptr( ( QTextEncoder* ) new QTextEncoder( hbqt_par_QTextCodec( 1 ) ) ); -} + void * pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTEXTENCODER_DESTROY ) -{ - delete hbqt_par_QTextEncoder( 1 ); -} + pObj = ( QTextEncoder* ) new QTextEncoder( hbqt_par_QTextCodec( 1 ) ) ; + hb_retptr( pObj ); +} /* * QByteArray fromUnicode ( const QString & str ) */ HB_FUNC( QT_QTEXTENCODER_FROMUNICODE ) { - hb_retptr( new QByteArray( hbqt_par_QTextEncoder( 1 )->fromUnicode( hbqt_par_QString( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QTextEncoder( 1 )->fromUnicode( hbqt_par_QString( 2 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/QTextFormat.cpp b/harbour/contrib/hbqt/QTextFormat.cpp index ef721315d2..6e4b066e0c 100644 --- a/harbour/contrib/hbqt/QTextFormat.cpp +++ b/harbour/contrib/hbqt/QTextFormat.cpp @@ -85,6 +85,7 @@ * void setProperty ( int propertyId, const QVector & value ) */ +#include #include @@ -95,25 +96,24 @@ * QTextFormat ( const QTextFormat & other ) * ~QTextFormat () */ + HB_FUNC( QT_QTEXTFORMAT ) { - hb_retptr( ( QTextFormat* ) new QTextFormat() ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTEXTFORMAT_DESTROY ) -{ - delete hbqt_par_QTextFormat( 1 ); -} + pObj = ( QTextFormat* ) new QTextFormat() ; + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QTextFormat" ); + hb_retptrGC( p ); +} /* * QBrush background () const */ HB_FUNC( QT_QTEXTFORMAT_BACKGROUND ) { - hb_retptr( new QBrush( hbqt_par_QTextFormat( 1 )->background() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QTextFormat( 1 )->background() ) ) ); } /* @@ -129,7 +129,7 @@ HB_FUNC( QT_QTEXTFORMAT_BOOLPROPERTY ) */ HB_FUNC( QT_QTEXTFORMAT_BRUSHPROPERTY ) { - hb_retptr( new QBrush( hbqt_par_QTextFormat( 1 )->brushProperty( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QTextFormat( 1 )->brushProperty( hb_parni( 2 ) ) ) ) ); } /* @@ -161,7 +161,7 @@ HB_FUNC( QT_QTEXTFORMAT_CLEARPROPERTY ) */ HB_FUNC( QT_QTEXTFORMAT_COLORPROPERTY ) { - hb_retptr( new QColor( hbqt_par_QTextFormat( 1 )->colorProperty( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QTextFormat( 1 )->colorProperty( hb_parni( 2 ) ) ) ) ); } /* @@ -177,7 +177,7 @@ HB_FUNC( QT_QTEXTFORMAT_DOUBLEPROPERTY ) */ HB_FUNC( QT_QTEXTFORMAT_FOREGROUND ) { - hb_retptr( new QBrush( hbqt_par_QTextFormat( 1 )->foreground() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QTextFormat( 1 )->foreground() ) ) ); } /* @@ -273,7 +273,7 @@ HB_FUNC( QT_QTEXTFORMAT_LAYOUTDIRECTION ) */ HB_FUNC( QT_QTEXTFORMAT_LENGTHPROPERTY ) { - hb_retptr( new QTextLength( hbqt_par_QTextFormat( 1 )->lengthProperty( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextLength( hbqt_par_QTextFormat( 1 )->lengthProperty( hb_parni( 2 ) ) ) ) ); } /* @@ -305,7 +305,7 @@ HB_FUNC( QT_QTEXTFORMAT_OBJECTTYPE ) */ HB_FUNC( QT_QTEXTFORMAT_PENPROPERTY ) { - hb_retptr( new QPen( hbqt_par_QTextFormat( 1 )->penProperty( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPen( hbqt_par_QTextFormat( 1 )->penProperty( hb_parni( 2 ) ) ) ) ); } /* @@ -313,7 +313,7 @@ HB_FUNC( QT_QTEXTFORMAT_PENPROPERTY ) */ HB_FUNC( QT_QTEXTFORMAT_PROPERTY ) { - hb_retptr( new QVariant( hbqt_par_QTextFormat( 1 )->property( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QTextFormat( 1 )->property( hb_parni( 2 ) ) ) ) ); } /* @@ -385,7 +385,7 @@ HB_FUNC( QT_QTEXTFORMAT_STRINGPROPERTY ) */ HB_FUNC( QT_QTEXTFORMAT_TOBLOCKFORMAT ) { - hb_retptr( new QTextBlockFormat( hbqt_par_QTextFormat( 1 )->toBlockFormat() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextBlockFormat( hbqt_par_QTextFormat( 1 )->toBlockFormat() ) ) ); } /* @@ -393,7 +393,7 @@ HB_FUNC( QT_QTEXTFORMAT_TOBLOCKFORMAT ) */ HB_FUNC( QT_QTEXTFORMAT_TOCHARFORMAT ) { - hb_retptr( new QTextCharFormat( hbqt_par_QTextFormat( 1 )->toCharFormat() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextCharFormat( hbqt_par_QTextFormat( 1 )->toCharFormat() ) ) ); } /* @@ -401,7 +401,7 @@ HB_FUNC( QT_QTEXTFORMAT_TOCHARFORMAT ) */ HB_FUNC( QT_QTEXTFORMAT_TOFRAMEFORMAT ) { - hb_retptr( new QTextFrameFormat( hbqt_par_QTextFormat( 1 )->toFrameFormat() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextFrameFormat( hbqt_par_QTextFormat( 1 )->toFrameFormat() ) ) ); } /* @@ -409,7 +409,7 @@ HB_FUNC( QT_QTEXTFORMAT_TOFRAMEFORMAT ) */ HB_FUNC( QT_QTEXTFORMAT_TOIMAGEFORMAT ) { - hb_retptr( new QTextImageFormat( hbqt_par_QTextFormat( 1 )->toImageFormat() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextImageFormat( hbqt_par_QTextFormat( 1 )->toImageFormat() ) ) ); } /* @@ -417,7 +417,7 @@ HB_FUNC( QT_QTEXTFORMAT_TOIMAGEFORMAT ) */ HB_FUNC( QT_QTEXTFORMAT_TOLISTFORMAT ) { - hb_retptr( new QTextListFormat( hbqt_par_QTextFormat( 1 )->toListFormat() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextListFormat( hbqt_par_QTextFormat( 1 )->toListFormat() ) ) ); } /* @@ -425,7 +425,7 @@ HB_FUNC( QT_QTEXTFORMAT_TOLISTFORMAT ) */ HB_FUNC( QT_QTEXTFORMAT_TOTABLECELLFORMAT ) { - hb_retptr( new QTextTableCellFormat( hbqt_par_QTextFormat( 1 )->toTableCellFormat() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextTableCellFormat( hbqt_par_QTextFormat( 1 )->toTableCellFormat() ) ) ); } /* @@ -433,7 +433,7 @@ HB_FUNC( QT_QTEXTFORMAT_TOTABLECELLFORMAT ) */ HB_FUNC( QT_QTEXTFORMAT_TOTABLEFORMAT ) { - hb_retptr( new QTextTableFormat( hbqt_par_QTextFormat( 1 )->toTableFormat() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextTableFormat( hbqt_par_QTextFormat( 1 )->toTableFormat() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QTextFragment.cpp b/harbour/contrib/hbqt/QTextFragment.cpp index 6964313dcf..54146f2f2a 100644 --- a/harbour/contrib/hbqt/QTextFragment.cpp +++ b/harbour/contrib/hbqt/QTextFragment.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,25 +75,21 @@ * QTextFragment () * QTextFragment ( const QTextFragment & other ) */ + HB_FUNC( QT_QTEXTFRAGMENT ) { - hb_retptr( ( QTextFragment* ) new QTextFragment() ); + void * pObj = NULL; + + pObj = ( QTextFragment* ) new QTextFragment() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTEXTFRAGMENT_DESTROY ) -{ - -} - /* * QTextCharFormat charFormat () const */ HB_FUNC( QT_QTEXTFRAGMENT_CHARFORMAT ) { - hb_retptr( new QTextCharFormat( hbqt_par_QTextFragment( 1 )->charFormat() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextCharFormat( hbqt_par_QTextFragment( 1 )->charFormat() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QTextFrame.cpp b/harbour/contrib/hbqt/QTextFrame.cpp index 1f7181686f..25157d476c 100644 --- a/harbour/contrib/hbqt/QTextFrame.cpp +++ b/harbour/contrib/hbqt/QTextFrame.cpp @@ -80,6 +80,7 @@ * //iterator end () const */ +#include #include #include @@ -89,25 +90,24 @@ * QTextFrame ( QTextDocument * document ) * ~QTextFrame () */ + HB_FUNC( QT_QTEXTFRAME ) { - hb_retptr( ( QTextFrame* ) new QTextFrame( hbqt_par_QTextDocument( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QTextFrame > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTEXTFRAME_DESTROY ) -{ - delete hbqt_par_QTextFrame( 1 ); -} + pObj = ( QTextFrame* ) new QTextFrame( hbqt_par_QTextDocument( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * QTextCursor firstCursorPosition () const */ HB_FUNC( QT_QTEXTFRAME_FIRSTCURSORPOSITION ) { - hb_retptr( new QTextCursor( hbqt_par_QTextFrame( 1 )->firstCursorPosition() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextCursor( hbqt_par_QTextFrame( 1 )->firstCursorPosition() ) ) ); } /* @@ -123,7 +123,7 @@ HB_FUNC( QT_QTEXTFRAME_FIRSTPOSITION ) */ HB_FUNC( QT_QTEXTFRAME_FRAMEFORMAT ) { - hb_retptr( new QTextFrameFormat( hbqt_par_QTextFrame( 1 )->frameFormat() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextFrameFormat( hbqt_par_QTextFrame( 1 )->frameFormat() ) ) ); } /* @@ -131,7 +131,7 @@ HB_FUNC( QT_QTEXTFRAME_FRAMEFORMAT ) */ HB_FUNC( QT_QTEXTFRAME_LASTCURSORPOSITION ) { - hb_retptr( new QTextCursor( hbqt_par_QTextFrame( 1 )->lastCursorPosition() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextCursor( hbqt_par_QTextFrame( 1 )->lastCursorPosition() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QTextFrameFormat.cpp b/harbour/contrib/hbqt/QTextFrameFormat.cpp index 500e656263..a0616c96e6 100644 --- a/harbour/contrib/hbqt/QTextFrameFormat.cpp +++ b/harbour/contrib/hbqt/QTextFrameFormat.cpp @@ -76,6 +76,7 @@ * enum Position { InFlow, FloatLeft, FloatRight } */ +#include #include @@ -83,19 +84,18 @@ /* * QTextFrameFormat () */ + HB_FUNC( QT_QTEXTFRAMEFORMAT ) { - hb_retptr( ( QTextFrameFormat* ) new QTextFrameFormat() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + + pObj = ( QTextFrameFormat* ) new QTextFrameFormat() ; + + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QTextFrameFormat" ); + hb_retptrGC( p ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTEXTFRAMEFORMAT_DESTROY ) -{ - -} - /* * qreal border () const */ @@ -109,7 +109,7 @@ HB_FUNC( QT_QTEXTFRAMEFORMAT_BORDER ) */ HB_FUNC( QT_QTEXTFRAMEFORMAT_BORDERBRUSH ) { - hb_retptr( new QBrush( hbqt_par_QTextFrameFormat( 1 )->borderBrush() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QTextFrameFormat( 1 )->borderBrush() ) ) ); } /* @@ -133,7 +133,7 @@ HB_FUNC( QT_QTEXTFRAMEFORMAT_BOTTOMMARGIN ) */ HB_FUNC( QT_QTEXTFRAMEFORMAT_HEIGHT ) { - hb_retptr( new QTextLength( hbqt_par_QTextFrameFormat( 1 )->height() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextLength( hbqt_par_QTextFrameFormat( 1 )->height() ) ) ); } /* @@ -325,7 +325,7 @@ HB_FUNC( QT_QTEXTFRAMEFORMAT_TOPMARGIN ) */ HB_FUNC( QT_QTEXTFRAMEFORMAT_WIDTH ) { - hb_retptr( new QTextLength( hbqt_par_QTextFrameFormat( 1 )->width() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextLength( hbqt_par_QTextFrameFormat( 1 )->width() ) ) ); } diff --git a/harbour/contrib/hbqt/QTextImageFormat.cpp b/harbour/contrib/hbqt/QTextImageFormat.cpp index be1fc044b9..8cb6750e7e 100644 --- a/harbour/contrib/hbqt/QTextImageFormat.cpp +++ b/harbour/contrib/hbqt/QTextImageFormat.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,19 +75,18 @@ * QTextImageFormat () * */ + HB_FUNC( QT_QTEXTIMAGEFORMAT ) { - hb_retptr( ( QTextImageFormat* ) new QTextImageFormat() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + + pObj = ( QTextImageFormat* ) new QTextImageFormat() ; + + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QTextImageFormat" ); + hb_retptrGC( p ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTEXTIMAGEFORMAT_DESTROY ) -{ - -} - /* * qreal height () const */ diff --git a/harbour/contrib/hbqt/QTextInlineObject.cpp b/harbour/contrib/hbqt/QTextInlineObject.cpp index fa2bb0ebd5..de5f8ffc41 100644 --- a/harbour/contrib/hbqt/QTextInlineObject.cpp +++ b/harbour/contrib/hbqt/QTextInlineObject.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,19 +75,15 @@ * QTextInlineObject ( int i, QTextEngine * e ) * */ + HB_FUNC( QT_QTEXTINLINEOBJECT ) { - hb_retptr( ( QTextInlineObject* ) new QTextInlineObject( hb_parni( 1 ), hbqt_par_QTextEngine( 2 ) ) ); + void * pObj = NULL; + + pObj = ( QTextInlineObject* ) new QTextInlineObject( hb_parni( 1 ), hbqt_par_QTextEngine( 2 ) ) ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTEXTINLINEOBJECT_DESTROY ) -{ - -} - /* * qreal ascent () const */ @@ -108,7 +105,7 @@ HB_FUNC( QT_QTEXTINLINEOBJECT_DESCENT ) */ HB_FUNC( QT_QTEXTINLINEOBJECT_FORMAT ) { - hb_retptr( new QTextFormat( hbqt_par_QTextInlineObject( 1 )->format() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextFormat( hbqt_par_QTextInlineObject( 1 )->format() ) ) ); } /* @@ -140,7 +137,7 @@ HB_FUNC( QT_QTEXTINLINEOBJECT_ISVALID ) */ HB_FUNC( QT_QTEXTINLINEOBJECT_RECT ) { - hb_retptr( new QRectF( hbqt_par_QTextInlineObject( 1 )->rect() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QTextInlineObject( 1 )->rect() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QTextItem.cpp b/harbour/contrib/hbqt/QTextItem.cpp index 9d519fda65..48c6f431dc 100644 --- a/harbour/contrib/hbqt/QTextItem.cpp +++ b/harbour/contrib/hbqt/QTextItem.cpp @@ -71,6 +71,7 @@ * flags RenderFlags */ +#include #include @@ -79,19 +80,15 @@ * * */ + HB_FUNC( QT_QTEXTITEM ) { - hb_retptr( ( QTextItem* ) new QTextItem() ); + void * pObj = NULL; + + pObj = ( QTextItem* ) new QTextItem() ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTEXTITEM_DESTROY ) -{ - -} - /* * qreal ascent () const */ @@ -113,7 +110,7 @@ HB_FUNC( QT_QTEXTITEM_DESCENT ) */ HB_FUNC( QT_QTEXTITEM_FONT ) { - hb_retptr( new QFont( hbqt_par_QTextItem( 1 )->font() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QTextItem( 1 )->font() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QTextLayout.cpp b/harbour/contrib/hbqt/QTextLayout.cpp index 35d1146a25..35a538633e 100644 --- a/harbour/contrib/hbqt/QTextLayout.cpp +++ b/harbour/contrib/hbqt/QTextLayout.cpp @@ -81,6 +81,7 @@ * void setAdditionalFormats ( const QList & formatList ) */ +#include #include @@ -91,19 +92,15 @@ * QTextLayout ( const QString & text, const QFont & font, QPaintDevice * paintdevice = 0 ) * ~QTextLayout () */ + HB_FUNC( QT_QTEXTLAYOUT ) { - hb_retptr( ( QTextLayout* ) new QTextLayout() ); -} + void * pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTEXTLAYOUT_DESTROY ) -{ - delete hbqt_par_QTextLayout( 1 ); -} + pObj = ( QTextLayout* ) new QTextLayout() ; + hb_retptr( pObj ); +} /* * void beginLayout () */ @@ -117,7 +114,7 @@ HB_FUNC( QT_QTEXTLAYOUT_BEGINLAYOUT ) */ HB_FUNC( QT_QTEXTLAYOUT_BOUNDINGRECT ) { - hb_retptr( new QRectF( hbqt_par_QTextLayout( 1 )->boundingRect() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QTextLayout( 1 )->boundingRect() ) ) ); } /* @@ -149,7 +146,7 @@ HB_FUNC( QT_QTEXTLAYOUT_CLEARLAYOUT ) */ HB_FUNC( QT_QTEXTLAYOUT_CREATELINE ) { - hb_retptr( new QTextLine( hbqt_par_QTextLayout( 1 )->createLine() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextLine( hbqt_par_QTextLayout( 1 )->createLine() ) ) ); } /* @@ -181,7 +178,7 @@ HB_FUNC( QT_QTEXTLAYOUT_ENDLAYOUT ) */ HB_FUNC( QT_QTEXTLAYOUT_FONT ) { - hb_retptr( new QFont( hbqt_par_QTextLayout( 1 )->font() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QTextLayout( 1 )->font() ) ) ); } /* @@ -197,7 +194,7 @@ HB_FUNC( QT_QTEXTLAYOUT_ISVALIDCURSORPOSITION ) */ HB_FUNC( QT_QTEXTLAYOUT_LINEAT ) { - hb_retptr( new QTextLine( hbqt_par_QTextLayout( 1 )->lineAt( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextLine( hbqt_par_QTextLayout( 1 )->lineAt( hb_parni( 2 ) ) ) ) ); } /* @@ -213,7 +210,7 @@ HB_FUNC( QT_QTEXTLAYOUT_LINECOUNT ) */ HB_FUNC( QT_QTEXTLAYOUT_LINEFORTEXTPOSITION ) { - hb_retptr( new QTextLine( hbqt_par_QTextLayout( 1 )->lineForTextPosition( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextLine( hbqt_par_QTextLayout( 1 )->lineForTextPosition( hb_parni( 2 ) ) ) ) ); } /* @@ -245,7 +242,7 @@ HB_FUNC( QT_QTEXTLAYOUT_NEXTCURSORPOSITION ) */ HB_FUNC( QT_QTEXTLAYOUT_POSITION ) { - hb_retptr( new QPointF( hbqt_par_QTextLayout( 1 )->position() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPointF( hbqt_par_QTextLayout( 1 )->position() ) ) ); } /* @@ -333,7 +330,7 @@ HB_FUNC( QT_QTEXTLAYOUT_TEXT ) */ HB_FUNC( QT_QTEXTLAYOUT_TEXTOPTION ) { - hb_retptr( new QTextOption( hbqt_par_QTextLayout( 1 )->textOption() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextOption( hbqt_par_QTextLayout( 1 )->textOption() ) ) ); } diff --git a/harbour/contrib/hbqt/QTextLength.cpp b/harbour/contrib/hbqt/QTextLength.cpp index 81db86d1fc..c5b7907bf9 100644 --- a/harbour/contrib/hbqt/QTextLength.cpp +++ b/harbour/contrib/hbqt/QTextLength.cpp @@ -70,6 +70,7 @@ * enum Type { VariableLength, FixedLength, PercentageLength } */ +#include #include @@ -78,19 +79,18 @@ * QTextLength () * QTextLength ( Type type, qreal value ) */ + HB_FUNC( QT_QTEXTLENGTH ) { - hb_retptr( ( QTextLength* ) new QTextLength() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + + pObj = ( QTextLength* ) new QTextLength() ; + + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QTextLength" ); + hb_retptrGC( p ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTEXTLENGTH_DESTROY ) -{ - -} - /* * qreal rawValue () const */ diff --git a/harbour/contrib/hbqt/QTextLine.cpp b/harbour/contrib/hbqt/QTextLine.cpp index 7c4d505ef4..ff106f2e06 100644 --- a/harbour/contrib/hbqt/QTextLine.cpp +++ b/harbour/contrib/hbqt/QTextLine.cpp @@ -71,6 +71,7 @@ * enum Edge { Leading, Trailing } */ +#include #include @@ -78,19 +79,18 @@ /* * QTextLine () */ + HB_FUNC( QT_QTEXTLINE ) { - hb_retptr( ( QTextLine* ) new QTextLine() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + + pObj = ( QTextLine* ) new QTextLine() ; + + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QTextLine" ); + hb_retptrGC( p ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTEXTLINE_DESTROY ) -{ - -} - /* * qreal ascent () const */ @@ -156,7 +156,7 @@ HB_FUNC( QT_QTEXTLINE_LINENUMBER ) */ HB_FUNC( QT_QTEXTLINE_NATURALTEXTRECT ) { - hb_retptr( new QRectF( hbqt_par_QTextLine( 1 )->naturalTextRect() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QTextLine( 1 )->naturalTextRect() ) ) ); } /* @@ -172,7 +172,7 @@ HB_FUNC( QT_QTEXTLINE_NATURALTEXTWIDTH ) */ HB_FUNC( QT_QTEXTLINE_POSITION ) { - hb_retptr( new QPointF( hbqt_par_QTextLine( 1 )->position() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPointF( hbqt_par_QTextLine( 1 )->position() ) ) ); } /* @@ -180,7 +180,7 @@ HB_FUNC( QT_QTEXTLINE_POSITION ) */ HB_FUNC( QT_QTEXTLINE_RECT ) { - hb_retptr( new QRectF( hbqt_par_QTextLine( 1 )->rect() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QTextLine( 1 )->rect() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QTextObject.cpp b/harbour/contrib/hbqt/QTextObject.cpp index 62d2458010..51bade4e20 100644 --- a/harbour/contrib/hbqt/QTextObject.cpp +++ b/harbour/contrib/hbqt/QTextObject.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -73,19 +74,10 @@ /* * */ + HB_FUNC( QT_QTEXTOBJECT ) { - } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTEXTOBJECT_DESTROY ) -{ - -} - /* * QTextDocument * document () const */ @@ -99,7 +91,7 @@ HB_FUNC( QT_QTEXTOBJECT_DOCUMENT ) */ HB_FUNC( QT_QTEXTOBJECT_FORMAT ) { - hb_retptr( new QTextFormat( hbqt_par_QTextObject( 1 )->format() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTextFormat( hbqt_par_QTextObject( 1 )->format() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QTextStream.cpp b/harbour/contrib/hbqt/QTextStream.cpp index aeb6495d5b..ef086ca287 100644 --- a/harbour/contrib/hbqt/QTextStream.cpp +++ b/harbour/contrib/hbqt/QTextStream.cpp @@ -74,6 +74,7 @@ * enum Status { Ok, ReadPastEnd, ReadCorruptData } */ +#include #include @@ -87,11 +88,6 @@ * QTextStream ( const QByteArray & array, QIODevice::OpenMode openMode = QIODevice::ReadOnly ) * virtual ~QTextStream () */ -HB_FUNC( QT_QTEXTSTREAM ) -{ - hb_retptr( ( QTextStream* ) new QTextStream( hb_parcx( 1 ), - ( QIODevice::OpenMode ) ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : QIODevice::ReadWrite ) ) ); -} /* * QChar padChar () const */ @@ -100,14 +96,14 @@ HB_FUNC( QT_QTEXTSTREAM_PADCHAR ) } -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTEXTSTREAM_DESTROY ) +HB_FUNC( QT_QTEXTSTREAM ) { - delete hbqt_par_QTextStream( 1 ); -} + void * pObj = NULL; + pObj = new QTextStream( hb_parcx( 1 ), ( QIODevice::OpenMode ) ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : QIODevice::ReadWrite ) ) ; + + hb_retptr( pObj ); +} /* * bool atEnd () const */ @@ -185,7 +181,7 @@ HB_FUNC( QT_QTEXTSTREAM_INTEGERBASE ) */ HB_FUNC( QT_QTEXTSTREAM_LOCALE ) { - hb_retptr( new QLocale( hbqt_par_QTextStream( 1 )->locale() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QLocale( hbqt_par_QTextStream( 1 )->locale() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QTimeEdit.cpp b/harbour/contrib/hbqt/QTimeEdit.cpp index ae82f0d12e..a0aa196b0c 100644 --- a/harbour/contrib/hbqt/QTimeEdit.cpp +++ b/harbour/contrib/hbqt/QTimeEdit.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,23 +75,22 @@ * QTimeEdit ( QWidget * parent = 0 ) * QTimeEdit ( const QTime & time, QWidget * parent = 0 ) */ + HB_FUNC( QT_QTIMEEDIT ) { - hb_retptr( ( QTimeEdit* ) new QTimeEdit( hbqt_par_QWidget( 1 ) ) ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QTimeEdit > pObj = NULL; + + pObj = ( QTimeEdit* ) new QTimeEdit( hbqt_par_QWidget( 1 ) ) ; #if 0 - hb_retptr( (QTimeEdit *) new QTimeEdit( QTime( hbqt_par_QString( 1 ) ), hbqt_par_QWidget( 2 ) ) ); + pObj = (QTimeEdit *) new QTimeEdit( QTime( hbqt_par_QString( 1 ) ), hbqt_par_QWidget( 2 ) ) ; #endif + + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTIMEEDIT_DESTROY ) -{ - -} - - /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/QTimer.cpp b/harbour/contrib/hbqt/QTimer.cpp index b50eac41c0..25b133db15 100644 --- a/harbour/contrib/hbqt/QTimer.cpp +++ b/harbour/contrib/hbqt/QTimer.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,19 +75,18 @@ * QTimer ( QObject * parent = 0 ) * ~QTimer () */ + HB_FUNC( QT_QTIMER ) { - hb_retptr( new QTimer( hbqt_par_QObject( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QTimer > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTIMER_DESTROY ) -{ - delete hbqt_par_QTimer( 1 ); -} + pObj = new QTimer( hbqt_par_QObject( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * int interval () const */ diff --git a/harbour/contrib/hbqt/QToolBar.cpp b/harbour/contrib/hbqt/QToolBar.cpp index 5b53ebe1e5..0b32f7d1b4 100644 --- a/harbour/contrib/hbqt/QToolBar.cpp +++ b/harbour/contrib/hbqt/QToolBar.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include #include @@ -75,22 +76,21 @@ * QToolBar ( QWidget * parent = 0 ) * ~QToolBar () */ + HB_FUNC( QT_QTOOLBAR ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QToolBar > pObj = NULL; + if( hb_param( 1, HB_IT_STRING ) ) - hb_retptr( ( QToolBar* ) new QToolBar( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) ); + pObj = ( QToolBar* ) new QToolBar( hbqt_par_QString( 1 ), hbqt_par_QWidget( 2 ) ) ; else - hb_retptr( ( QToolBar* ) new QToolBar( hbqt_par_QWidget( 1 ) ) ); -} + pObj = ( QToolBar* ) new QToolBar( hbqt_par_QWidget( 1 ) ) ; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTOOLBAR_DESTROY ) -{ - delete hbqt_par_QToolBar( 1 ); + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } - /* * QAction * actionAt ( const QPoint & p ) const */ @@ -184,7 +184,7 @@ HB_FUNC( QT_QTOOLBAR_CLEAR ) */ HB_FUNC( QT_QTOOLBAR_ICONSIZE ) { - hb_retptr( new QSize( hbqt_par_QToolBar( 1 )->iconSize() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QToolBar( 1 )->iconSize() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QToolBox.cpp b/harbour/contrib/hbqt/QToolBox.cpp index 3221f688f5..c374ba2ee1 100644 --- a/harbour/contrib/hbqt/QToolBox.cpp +++ b/harbour/contrib/hbqt/QToolBox.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,19 +75,18 @@ * QToolBox ( QWidget * parent = 0, Qt::WindowFlags f = 0 ) * ~QToolBox () */ + HB_FUNC( QT_QTOOLBOX ) { - hb_retptr( ( QToolBox* ) new QToolBox( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QToolBox > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTOOLBOX_DESTROY ) -{ - delete hbqt_par_QToolBox( 1 ); -} + pObj = ( QToolBox* ) new QToolBox( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * int addItem ( QWidget * widget, const QIcon & iconSet, const QString & text ) */ @@ -164,7 +164,7 @@ HB_FUNC( QT_QTOOLBOX_ISITEMENABLED ) */ HB_FUNC( QT_QTOOLBOX_ITEMICON ) { - hb_retptr( new QIcon( hbqt_par_QToolBox( 1 )->itemIcon( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QToolBox( 1 )->itemIcon( hb_parni( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QToolButton.cpp b/harbour/contrib/hbqt/QToolButton.cpp index dcedefb2e1..c0e6e55cf2 100644 --- a/harbour/contrib/hbqt/QToolButton.cpp +++ b/harbour/contrib/hbqt/QToolButton.cpp @@ -70,6 +70,7 @@ * enum ToolButtonPopupMode { DelayedPopup, MenuButtonPopup, InstantPopup } */ +#include #include @@ -78,19 +79,18 @@ * QToolButton ( QWidget * parent = 0 ) * ~QToolButton () */ + HB_FUNC( QT_QTOOLBUTTON ) { - hb_retptr( ( QToolButton* ) new QToolButton( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QToolButton > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTOOLBUTTON_DESTROY ) -{ - delete hbqt_par_QToolButton( 1 ); -} + pObj = ( QToolButton* ) new QToolButton( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * Qt::ArrowType arrowType () const */ diff --git a/harbour/contrib/hbqt/QTreeView.cpp b/harbour/contrib/hbqt/QTreeView.cpp index a07900adb7..4894315cee 100644 --- a/harbour/contrib/hbqt/QTreeView.cpp +++ b/harbour/contrib/hbqt/QTreeView.cpp @@ -78,6 +78,7 @@ * flags EditTriggers */ +#include #include @@ -86,19 +87,18 @@ * QTreeView ( QWidget * parent = 0 ) * ~QTreeView () */ + HB_FUNC( QT_QTREEVIEW ) { - hb_retptr( ( QTreeView* ) new QTreeView( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QTreeView > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTREEVIEW_DESTROY ) -{ - delete hbqt_par_QTreeView( 1 ); -} + pObj = ( QTreeView* ) new QTreeView( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * bool allColumnsShowFocus () const */ @@ -168,7 +168,7 @@ HB_FUNC( QT_QTREEVIEW_INDENTATION ) */ HB_FUNC( QT_QTREEVIEW_INDEXABOVE ) { - hb_retptr( new QModelIndex( hbqt_par_QTreeView( 1 )->indexAbove( *hbqt_par_QModelIndex( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QTreeView( 1 )->indexAbove( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* @@ -176,7 +176,7 @@ HB_FUNC( QT_QTREEVIEW_INDEXABOVE ) */ HB_FUNC( QT_QTREEVIEW_INDEXBELOW ) { - hb_retptr( new QModelIndex( hbqt_par_QTreeView( 1 )->indexBelow( *hbqt_par_QModelIndex( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QTreeView( 1 )->indexBelow( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* @@ -416,7 +416,7 @@ HB_FUNC( QT_QTREEVIEW_UNIFORMROWHEIGHTS ) */ HB_FUNC( QT_QTREEVIEW_VISUALRECT ) { - hb_retptr( new QRect( hbqt_par_QTreeView( 1 )->visualRect( *hbqt_par_QModelIndex( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QTreeView( 1 )->visualRect( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QTreeWidget.cpp b/harbour/contrib/hbqt/QTreeWidget.cpp index aaa53a02a9..90cc22b2da 100644 --- a/harbour/contrib/hbqt/QTreeWidget.cpp +++ b/harbour/contrib/hbqt/QTreeWidget.cpp @@ -78,6 +78,7 @@ * QList selectedItems () const */ +#include #include @@ -86,19 +87,18 @@ * QTreeWidget ( QWidget * parent = 0 ) * ~QTreeWidget () */ + HB_FUNC( QT_QTREEWIDGET ) { - hb_retptr( ( QTreeWidget* ) new QTreeWidget( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QTreeWidget > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTREEWIDGET_DESTROY ) -{ - delete hbqt_par_QTreeWidget( 1 ); -} + pObj = ( QTreeWidget* ) new QTreeWidget( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * void addTopLevelItem ( QTreeWidgetItem * item ) */ @@ -360,7 +360,7 @@ HB_FUNC( QT_QTREEWIDGET_TOPLEVELITEMCOUNT ) */ HB_FUNC( QT_QTREEWIDGET_VISUALITEMRECT ) { - hb_retptr( new QRect( hbqt_par_QTreeWidget( 1 )->visualItemRect( hbqt_par_QTreeWidgetItem( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QTreeWidget( 1 )->visualItemRect( hbqt_par_QTreeWidgetItem( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QTreeWidgetItem.cpp b/harbour/contrib/hbqt/QTreeWidgetItem.cpp index 2104caa3b9..a8d07eea3d 100644 --- a/harbour/contrib/hbqt/QTreeWidgetItem.cpp +++ b/harbour/contrib/hbqt/QTreeWidgetItem.cpp @@ -82,6 +82,7 @@ * QList takeChildren () */ +#include #include @@ -98,26 +99,22 @@ * QTreeWidgetItem ( const QTreeWidgetItem & other ) * virtual ~QTreeWidgetItem () */ + HB_FUNC( QT_QTREEWIDGETITEM ) { + void * pObj = NULL; + if( hb_pcount() >= 1 && HB_ISNUM( 1 ) ) { - hb_retptr( ( QTreeWidgetItem* ) new QTreeWidgetItem( hb_parni( 1 ) ) ); + pObj = ( QTreeWidgetItem* ) new QTreeWidgetItem( hb_parni( 1 ) ) ; } else { - hb_retptr( ( QTreeWidgetItem* ) new QTreeWidgetItem( hbqt_par_QTreeWidget( 1 ), hb_parni( 2 ) ) ); + pObj = ( QTreeWidgetItem* ) new QTreeWidgetItem( hbqt_par_QTreeWidget( 1 ), hb_parni( 2 ) ) ; } -} -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QTREEWIDGETITEM_DESTROY ) -{ - delete hbqt_par_QTreeWidgetItem( 1 ); + hb_retptr( pObj ); } - /* * void addChild ( QTreeWidgetItem * child ) */ @@ -131,7 +128,7 @@ HB_FUNC( QT_QTREEWIDGETITEM_ADDCHILD ) */ HB_FUNC( QT_QTREEWIDGETITEM_BACKGROUND ) { - hb_retptr( new QBrush( hbqt_par_QTreeWidgetItem( 1 )->background( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QTreeWidgetItem( 1 )->background( hb_parni( 2 ) ) ) ) ); } /* @@ -187,7 +184,7 @@ HB_FUNC( QT_QTREEWIDGETITEM_COLUMNCOUNT ) */ HB_FUNC( QT_QTREEWIDGETITEM_DATA ) { - hb_retptr( new QVariant( hbqt_par_QTreeWidgetItem( 1 )->data( hb_parni( 2 ), hb_parni( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QTreeWidgetItem( 1 )->data( hb_parni( 2 ), hb_parni( 3 ) ) ) ) ); } /* @@ -203,7 +200,7 @@ HB_FUNC( QT_QTREEWIDGETITEM_FLAGS ) */ HB_FUNC( QT_QTREEWIDGETITEM_FONT ) { - hb_retptr( new QFont( hbqt_par_QTreeWidgetItem( 1 )->font( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QTreeWidgetItem( 1 )->font( hb_parni( 2 ) ) ) ) ); } /* @@ -211,7 +208,7 @@ HB_FUNC( QT_QTREEWIDGETITEM_FONT ) */ HB_FUNC( QT_QTREEWIDGETITEM_FOREGROUND ) { - hb_retptr( new QBrush( hbqt_par_QTreeWidgetItem( 1 )->foreground( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBrush( hbqt_par_QTreeWidgetItem( 1 )->foreground( hb_parni( 2 ) ) ) ) ); } /* @@ -219,7 +216,7 @@ HB_FUNC( QT_QTREEWIDGETITEM_FOREGROUND ) */ HB_FUNC( QT_QTREEWIDGETITEM_ICON ) { - hb_retptr( new QIcon( hbqt_par_QTreeWidgetItem( 1 )->icon( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QTreeWidgetItem( 1 )->icon( hb_parni( 2 ) ) ) ) ); } /* @@ -459,7 +456,7 @@ HB_FUNC( QT_QTREEWIDGETITEM_SETWHATSTHIS ) */ HB_FUNC( QT_QTREEWIDGETITEM_SIZEHINT ) { - hb_retptr( new QSize( hbqt_par_QTreeWidgetItem( 1 )->sizeHint( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QTreeWidgetItem( 1 )->sizeHint( hb_parni( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QUrl.cpp b/harbour/contrib/hbqt/QUrl.cpp index 8fb6af0616..5b50eea2ec 100644 --- a/harbour/contrib/hbqt/QUrl.cpp +++ b/harbour/contrib/hbqt/QUrl.cpp @@ -89,6 +89,7 @@ * //void setQueryDelimiters ( char valueDelimiter, char pairDelimiter ) */ +#include #include #include @@ -101,10 +102,6 @@ * QUrl ( const QString & url, ParsingMode parsingMode ) * ~QUrl () */ -HB_FUNC( QT_QURL ) -{ - hb_retptr( new QUrl( hbqt_par_QString( 1 ) ) ); -} /* * void setQueryDelimiters ( char valueDelimiter, char pairDelimiter ) */ @@ -113,14 +110,17 @@ HB_FUNC( QT_QURL_SETQUERYDELIMITERS ) hbqt_par_QUrl( 1 )->setQueryDelimiters( ( char ) hb_parni( 2 ), ( char ) hb_parni( 3 ) ); } -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QURL_DESTROY ) +HB_FUNC( QT_QURL ) { - delete hbqt_par_QUrl( 1 ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; + pObj = new QUrl( hbqt_par_QString( 1 ) ) ; + + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QUrl" ); + hb_retptrGC( p ); +} /* * void addEncodedQueryItem ( const QByteArray & key, const QByteArray & value ) */ @@ -142,7 +142,7 @@ HB_FUNC( QT_QURL_ADDQUERYITEM ) */ HB_FUNC( QT_QURL_ALLQUERYITEMVALUES ) { - hb_retptr( new QStringList( hbqt_par_QUrl( 1 )->allQueryItemValues( hbqt_par_QString( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QUrl( 1 )->allQueryItemValues( hbqt_par_QString( 2 ) ) ) ) ); } /* @@ -166,7 +166,7 @@ HB_FUNC( QT_QURL_CLEAR ) */ HB_FUNC( QT_QURL_ENCODEDFRAGMENT ) { - hb_retptr( new QByteArray( hbqt_par_QUrl( 1 )->encodedFragment() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QUrl( 1 )->encodedFragment() ) ) ); } /* @@ -174,7 +174,7 @@ HB_FUNC( QT_QURL_ENCODEDFRAGMENT ) */ HB_FUNC( QT_QURL_ENCODEDHOST ) { - hb_retptr( new QByteArray( hbqt_par_QUrl( 1 )->encodedHost() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QUrl( 1 )->encodedHost() ) ) ); } /* @@ -182,7 +182,7 @@ HB_FUNC( QT_QURL_ENCODEDHOST ) */ HB_FUNC( QT_QURL_ENCODEDPASSWORD ) { - hb_retptr( new QByteArray( hbqt_par_QUrl( 1 )->encodedPassword() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QUrl( 1 )->encodedPassword() ) ) ); } /* @@ -190,7 +190,7 @@ HB_FUNC( QT_QURL_ENCODEDPASSWORD ) */ HB_FUNC( QT_QURL_ENCODEDPATH ) { - hb_retptr( new QByteArray( hbqt_par_QUrl( 1 )->encodedPath() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QUrl( 1 )->encodedPath() ) ) ); } /* @@ -198,7 +198,7 @@ HB_FUNC( QT_QURL_ENCODEDPATH ) */ HB_FUNC( QT_QURL_ENCODEDQUERY ) { - hb_retptr( new QByteArray( hbqt_par_QUrl( 1 )->encodedQuery() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QUrl( 1 )->encodedQuery() ) ) ); } /* @@ -206,7 +206,7 @@ HB_FUNC( QT_QURL_ENCODEDQUERY ) */ HB_FUNC( QT_QURL_ENCODEDQUERYITEMVALUE ) { - hb_retptr( new QByteArray( hbqt_par_QUrl( 1 )->encodedQueryItemValue( *hbqt_par_QByteArray( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QUrl( 1 )->encodedQueryItemValue( *hbqt_par_QByteArray( 2 ) ) ) ) ); } /* @@ -214,7 +214,7 @@ HB_FUNC( QT_QURL_ENCODEDQUERYITEMVALUE ) */ HB_FUNC( QT_QURL_ENCODEDUSERNAME ) { - hb_retptr( new QByteArray( hbqt_par_QUrl( 1 )->encodedUserName() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QUrl( 1 )->encodedUserName() ) ) ); } /* @@ -398,7 +398,7 @@ HB_FUNC( QT_QURL_REMOVEQUERYITEM ) */ HB_FUNC( QT_QURL_RESOLVED ) { - hb_retptr( new QUrl( hbqt_par_QUrl( 1 )->resolved( *hbqt_par_QUrl( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QUrl( hbqt_par_QUrl( 1 )->resolved( *hbqt_par_QUrl( 2 ) ) ) ) ); } /* @@ -566,7 +566,7 @@ HB_FUNC( QT_QURL_SETUSERNAME ) */ HB_FUNC( QT_QURL_TOENCODED ) { - hb_retptr( new QByteArray( hbqt_par_QUrl( 1 )->toEncoded( ( HB_ISNUM( 2 ) ? ( QUrl::FormattingOptions ) hb_parni( 2 ) : ( QUrl::FormattingOptions ) QUrl::None ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QUrl( 1 )->toEncoded( ( HB_ISNUM( 2 ) ? ( QUrl::FormattingOptions ) hb_parni( 2 ) : ( QUrl::FormattingOptions ) QUrl::None ) ) ) ) ); } /* @@ -614,7 +614,7 @@ HB_FUNC( QT_QURL_FROMACE ) */ HB_FUNC( QT_QURL_FROMENCODED ) { - hb_retptr( new QUrl( hbqt_par_QUrl( 1 )->fromEncoded( *hbqt_par_QByteArray( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QUrl( hbqt_par_QUrl( 1 )->fromEncoded( *hbqt_par_QByteArray( 2 ) ) ) ) ); } /* @@ -622,7 +622,7 @@ HB_FUNC( QT_QURL_FROMENCODED ) */ HB_FUNC( QT_QURL_FROMENCODED_1 ) { - hb_retptr( new QUrl( hbqt_par_QUrl( 1 )->fromEncoded( *hbqt_par_QByteArray( 2 ), ( QUrl::ParsingMode ) hb_parni( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QUrl( hbqt_par_QUrl( 1 )->fromEncoded( *hbqt_par_QByteArray( 2 ), ( QUrl::ParsingMode ) hb_parni( 3 ) ) ) ) ); } /* @@ -630,7 +630,7 @@ HB_FUNC( QT_QURL_FROMENCODED_1 ) */ HB_FUNC( QT_QURL_FROMLOCALFILE ) { - hb_retptr( new QUrl( hbqt_par_QUrl( 1 )->fromLocalFile( hbqt_par_QString( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QUrl( hbqt_par_QUrl( 1 )->fromLocalFile( hbqt_par_QString( 2 ) ) ) ) ); } /* @@ -646,7 +646,7 @@ HB_FUNC( QT_QURL_FROMPERCENTENCODING ) */ HB_FUNC( QT_QURL_IDNWHITELIST ) { - hb_retptr( new QStringList( hbqt_par_QUrl( 1 )->idnWhitelist() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QUrl( 1 )->idnWhitelist() ) ) ); } /* @@ -662,7 +662,7 @@ HB_FUNC( QT_QURL_SETIDNWHITELIST ) */ HB_FUNC( QT_QURL_TOACE ) { - hb_retptr( new QByteArray( hbqt_par_QUrl( 1 )->toAce( hbqt_par_QString( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QUrl( 1 )->toAce( hbqt_par_QString( 2 ) ) ) ) ); } /* @@ -670,7 +670,7 @@ HB_FUNC( QT_QURL_TOACE ) */ HB_FUNC( QT_QURL_TOPERCENTENCODING ) { - hb_retptr( new QByteArray( hbqt_par_QUrl( 1 )->toPercentEncoding( hbqt_par_QString( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QByteArray( 3 ) : QByteArray() ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QByteArray( 4 ) : QByteArray() ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QUrl( 1 )->toPercentEncoding( hbqt_par_QString( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QByteArray( 3 ) : QByteArray() ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QByteArray( 4 ) : QByteArray() ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/QVBoxLayout.cpp b/harbour/contrib/hbqt/QVBoxLayout.cpp index 25cf9e4552..c4f2b506af 100644 --- a/harbour/contrib/hbqt/QVBoxLayout.cpp +++ b/harbour/contrib/hbqt/QVBoxLayout.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -75,19 +76,18 @@ * QVBoxLayout ( QWidget * parent ) * ~QVBoxLayout () */ + HB_FUNC( QT_QVBOXLAYOUT ) { - hb_retptr( ( QVBoxLayout* ) new QVBoxLayout( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QVBoxLayout > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QVBOXLAYOUT_DESTROY ) -{ - delete hbqt_par_QVBoxLayout( 1 ); -} + pObj = ( QVBoxLayout* ) new QVBoxLayout( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ diff --git a/harbour/contrib/hbqt/QVariant.cpp b/harbour/contrib/hbqt/QVariant.cpp index 37d64e7d95..89c9918dc7 100644 --- a/harbour/contrib/hbqt/QVariant.cpp +++ b/harbour/contrib/hbqt/QVariant.cpp @@ -87,6 +87,7 @@ * //T value () const */ +#include #include #include @@ -137,19 +138,18 @@ QVariant ( const QLocale & l ) QVariant ( const QRegExp & regExp ) ~QVariant () */ + HB_FUNC( QT_QVARIANT ) { - hb_retptr( ( QVariant* ) new QVariant() ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QVARIANT_DESTROY ) -{ - delete hbqt_par_QVariant( 1 ); -} + pObj = ( QVariant* ) new QVariant() ; + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QVariant" ); + hb_retptrGC( p ); +} /* * bool canConvert ( Type t ) const */ @@ -211,7 +211,7 @@ HB_FUNC( QT_QVARIANT_SETVALUE ) */ HB_FUNC( QT_QVARIANT_TOBITARRAY ) { - hb_retptr( new QBitArray( hbqt_par_QVariant( 1 )->toBitArray() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QBitArray( hbqt_par_QVariant( 1 )->toBitArray() ) ) ); } /* @@ -227,7 +227,7 @@ HB_FUNC( QT_QVARIANT_TOBOOL ) */ HB_FUNC( QT_QVARIANT_TOBYTEARRAY ) { - hb_retptr( new QByteArray( hbqt_par_QVariant( 1 )->toByteArray() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QVariant( 1 )->toByteArray() ) ) ); } /* @@ -235,7 +235,7 @@ HB_FUNC( QT_QVARIANT_TOBYTEARRAY ) */ HB_FUNC( QT_QVARIANT_TODATE ) { - hb_retptr( new QDate( hbqt_par_QVariant( 1 )->toDate() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDate( hbqt_par_QVariant( 1 )->toDate() ) ) ); } /* @@ -243,7 +243,7 @@ HB_FUNC( QT_QVARIANT_TODATE ) */ HB_FUNC( QT_QVARIANT_TODATETIME ) { - hb_retptr( new QDateTime( hbqt_par_QVariant( 1 )->toDateTime() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QVariant( 1 )->toDateTime() ) ) ); } /* @@ -275,7 +275,7 @@ HB_FUNC( QT_QVARIANT_TOINT ) */ HB_FUNC( QT_QVARIANT_TOLINE ) { - hb_retptr( new QLine( hbqt_par_QVariant( 1 )->toLine() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QLine( hbqt_par_QVariant( 1 )->toLine() ) ) ); } /* @@ -283,7 +283,7 @@ HB_FUNC( QT_QVARIANT_TOLINE ) */ HB_FUNC( QT_QVARIANT_TOLINEF ) { - hb_retptr( new QLineF( hbqt_par_QVariant( 1 )->toLineF() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QLineF( hbqt_par_QVariant( 1 )->toLineF() ) ) ); } /* @@ -291,7 +291,7 @@ HB_FUNC( QT_QVARIANT_TOLINEF ) */ HB_FUNC( QT_QVARIANT_TOLOCALE ) { - hb_retptr( new QLocale( hbqt_par_QVariant( 1 )->toLocale() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QLocale( hbqt_par_QVariant( 1 )->toLocale() ) ) ); } /* @@ -311,7 +311,7 @@ HB_FUNC( QT_QVARIANT_TOLONGLONG ) */ HB_FUNC( QT_QVARIANT_TOPOINT ) { - hb_retptr( new QPoint( hbqt_par_QVariant( 1 )->toPoint() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QVariant( 1 )->toPoint() ) ) ); } /* @@ -319,7 +319,7 @@ HB_FUNC( QT_QVARIANT_TOPOINT ) */ HB_FUNC( QT_QVARIANT_TOPOINTF ) { - hb_retptr( new QPointF( hbqt_par_QVariant( 1 )->toPointF() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPointF( hbqt_par_QVariant( 1 )->toPointF() ) ) ); } /* @@ -327,7 +327,7 @@ HB_FUNC( QT_QVARIANT_TOPOINTF ) */ HB_FUNC( QT_QVARIANT_TORECT ) { - hb_retptr( new QRect( hbqt_par_QVariant( 1 )->toRect() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QVariant( 1 )->toRect() ) ) ); } /* @@ -335,7 +335,7 @@ HB_FUNC( QT_QVARIANT_TORECT ) */ HB_FUNC( QT_QVARIANT_TORECTF ) { - hb_retptr( new QRectF( hbqt_par_QVariant( 1 )->toRectF() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QVariant( 1 )->toRectF() ) ) ); } /* @@ -343,7 +343,7 @@ HB_FUNC( QT_QVARIANT_TORECTF ) */ HB_FUNC( QT_QVARIANT_TOREGEXP ) { - hb_retptr( new QRegExp( hbqt_par_QVariant( 1 )->toRegExp() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRegExp( hbqt_par_QVariant( 1 )->toRegExp() ) ) ); } /* @@ -351,7 +351,7 @@ HB_FUNC( QT_QVARIANT_TOREGEXP ) */ HB_FUNC( QT_QVARIANT_TOSIZE ) { - hb_retptr( new QSize( hbqt_par_QVariant( 1 )->toSize() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QVariant( 1 )->toSize() ) ) ); } /* @@ -359,7 +359,7 @@ HB_FUNC( QT_QVARIANT_TOSIZE ) */ HB_FUNC( QT_QVARIANT_TOSIZEF ) { - hb_retptr( new QSizeF( hbqt_par_QVariant( 1 )->toSizeF() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSizeF( hbqt_par_QVariant( 1 )->toSizeF() ) ) ); } /* @@ -375,7 +375,7 @@ HB_FUNC( QT_QVARIANT_TOSTRING ) */ HB_FUNC( QT_QVARIANT_TOSTRINGLIST ) { - hb_retptr( new QStringList( hbqt_par_QVariant( 1 )->toStringList() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QVariant( 1 )->toStringList() ) ) ); } /* @@ -383,7 +383,7 @@ HB_FUNC( QT_QVARIANT_TOSTRINGLIST ) */ HB_FUNC( QT_QVARIANT_TOTIME ) { - hb_retptr( new QTime( hbqt_par_QVariant( 1 )->toTime() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QTime( hbqt_par_QVariant( 1 )->toTime() ) ) ); } /* @@ -415,7 +415,7 @@ HB_FUNC( QT_QVARIANT_TOULONGLONG ) */ HB_FUNC( QT_QVARIANT_TOURL ) { - hb_retptr( new QUrl( hbqt_par_QVariant( 1 )->toUrl() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QUrl( hbqt_par_QVariant( 1 )->toUrl() ) ) ); } /* @@ -439,7 +439,7 @@ HB_FUNC( QT_QVARIANT_USERTYPE ) */ HB_FUNC( QT_QVARIANT_FROMVALUE ) { - hb_retptr( new QVariant( hbqt_par_QVariant( 1 )->fromValue( hb_param( 2, HB_IT_ANY ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QVariant( 1 )->fromValue( hb_param( 2, HB_IT_ANY ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QWebFrame.cpp b/harbour/contrib/hbqt/QWebFrame.cpp index ebce50e16e..9dd60c25e2 100644 --- a/harbour/contrib/hbqt/QWebFrame.cpp +++ b/harbour/contrib/hbqt/QWebFrame.cpp @@ -80,6 +80,7 @@ * // void load ( const QWebNetworkRequest & req ) */ +#include #include #include @@ -87,19 +88,10 @@ /* * */ + HB_FUNC( QT_QWEBFRAME ) { - // hb_retptr( ( QWebFrame* ) new QWebFrame() ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QWEBFRAME_DESTROY ) -{ - -} - /* * void addToJavaScriptWindowObject ( const QString & name, QObject * object ) */ @@ -121,7 +113,7 @@ HB_FUNC( QT_QWEBFRAME_ADDTOJAVASCRIPTWINDOWOBJECT_1 ) */ HB_FUNC( QT_QWEBFRAME_CONTENTSSIZE ) { - hb_retptr( new QSize( hbqt_par_QWebFrame( 1 )->contentsSize() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QWebFrame( 1 )->contentsSize() ) ) ); } /* @@ -137,7 +129,7 @@ HB_FUNC( QT_QWEBFRAME_FRAMENAME ) */ HB_FUNC( QT_QWEBFRAME_GEOMETRY ) { - hb_retptr( new QRect( hbqt_par_QWebFrame( 1 )->geometry() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QWebFrame( 1 )->geometry() ) ) ); } /* @@ -145,7 +137,7 @@ HB_FUNC( QT_QWEBFRAME_GEOMETRY ) */ HB_FUNC( QT_QWEBFRAME_HITTESTCONTENT ) { - hb_retptr( new QWebHitTestResult( hbqt_par_QWebFrame( 1 )->hitTestContent( *hbqt_par_QPoint( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QWebHitTestResult( hbqt_par_QWebFrame( 1 )->hitTestContent( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* @@ -153,7 +145,7 @@ HB_FUNC( QT_QWEBFRAME_HITTESTCONTENT ) */ HB_FUNC( QT_QWEBFRAME_ICON ) { - hb_retptr( new QIcon( hbqt_par_QWebFrame( 1 )->icon() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QWebFrame( 1 )->icon() ) ) ); } /* @@ -185,7 +177,7 @@ HB_FUNC( QT_QWEBFRAME_PARENTFRAME ) */ HB_FUNC( QT_QWEBFRAME_POS ) { - hb_retptr( new QPoint( hbqt_par_QWebFrame( 1 )->pos() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QWebFrame( 1 )->pos() ) ) ); } /* @@ -257,7 +249,7 @@ HB_FUNC( QT_QWEBFRAME_SCROLLBARVALUE ) */ HB_FUNC( QT_QWEBFRAME_SCROLLPOSITION ) { - hb_retptr( new QPoint( hbqt_par_QWebFrame( 1 )->scrollPosition() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QWebFrame( 1 )->scrollPosition() ) ) ); } /* @@ -265,7 +257,7 @@ HB_FUNC( QT_QWEBFRAME_SCROLLPOSITION ) */ HB_FUNC( QT_QWEBFRAME_SECURITYORIGIN ) { - hb_retptr( new QWebSecurityOrigin( hbqt_par_QWebFrame( 1 )->securityOrigin() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QWebSecurityOrigin( hbqt_par_QWebFrame( 1 )->securityOrigin() ) ) ); } /* @@ -369,7 +361,7 @@ HB_FUNC( QT_QWEBFRAME_TOPLAINTEXT ) */ HB_FUNC( QT_QWEBFRAME_URL ) { - hb_retptr( new QUrl( hbqt_par_QWebFrame( 1 )->url() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QUrl( hbqt_par_QWebFrame( 1 )->url() ) ) ); } /* @@ -385,7 +377,7 @@ HB_FUNC( QT_QWEBFRAME_ZOOMFACTOR ) */ HB_FUNC( QT_QWEBFRAME_EVALUATEJAVASCRIPT ) { - hb_retptr( new QVariant( hbqt_par_QWebFrame( 1 )->evaluateJavaScript( hbqt_par_QString( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QWebFrame( 1 )->evaluateJavaScript( hbqt_par_QString( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QWebHistory.cpp b/harbour/contrib/hbqt/QWebHistory.cpp index c9dfb8ab5f..50661285db 100644 --- a/harbour/contrib/hbqt/QWebHistory.cpp +++ b/harbour/contrib/hbqt/QWebHistory.cpp @@ -77,6 +77,7 @@ * QList items () const */ +#include #include @@ -84,19 +85,10 @@ /* * */ + HB_FUNC( QT_QWEBHISTORY ) { - //hb_retptr( ( * ) new () ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QWEBHISTORY_DESTROY ) -{ - -} - /* * void back () */ @@ -110,7 +102,7 @@ HB_FUNC( QT_QWEBHISTORY_BACK ) */ HB_FUNC( QT_QWEBHISTORY_BACKITEM ) { - hb_retptr( new QWebHistoryItem( hbqt_par_QWebHistory( 1 )->backItem() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QWebHistoryItem( hbqt_par_QWebHistory( 1 )->backItem() ) ) ); } /* @@ -150,7 +142,7 @@ HB_FUNC( QT_QWEBHISTORY_COUNT ) */ HB_FUNC( QT_QWEBHISTORY_CURRENTITEM ) { - hb_retptr( new QWebHistoryItem( hbqt_par_QWebHistory( 1 )->currentItem() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QWebHistoryItem( hbqt_par_QWebHistory( 1 )->currentItem() ) ) ); } /* @@ -174,7 +166,7 @@ HB_FUNC( QT_QWEBHISTORY_FORWARD ) */ HB_FUNC( QT_QWEBHISTORY_FORWARDITEM ) { - hb_retptr( new QWebHistoryItem( hbqt_par_QWebHistory( 1 )->forwardItem() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QWebHistoryItem( hbqt_par_QWebHistory( 1 )->forwardItem() ) ) ); } /* @@ -190,7 +182,7 @@ HB_FUNC( QT_QWEBHISTORY_GOTOITEM ) */ HB_FUNC( QT_QWEBHISTORY_ITEMAT ) { - hb_retptr( new QWebHistoryItem( hbqt_par_QWebHistory( 1 )->itemAt( hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QWebHistoryItem( hbqt_par_QWebHistory( 1 )->itemAt( hb_parni( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/QWebHistoryInterface.cpp b/harbour/contrib/hbqt/QWebHistoryInterface.cpp index bf964402d0..5a74bebba4 100644 --- a/harbour/contrib/hbqt/QWebHistoryInterface.cpp +++ b/harbour/contrib/hbqt/QWebHistoryInterface.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,19 +75,10 @@ * QWebHistoryInterface ( QObject * parent = 0 ) * ~QWebHistoryInterface () */ + HB_FUNC( QT_QWEBHISTORYINTERFACE ) { - //hb_retptr( ( QWebHistoryInterface* ) new QWebHistoryInterface( hbqt_par_QObject( 1 ) ) ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QWEBHISTORYINTERFACE_DESTROY ) -{ - delete hbqt_par_QWebHistoryInterface( 1 ); -} - /* * virtual void addHistoryEntry ( const QString & url ) = 0 */ diff --git a/harbour/contrib/hbqt/QWebHistoryItem.cpp b/harbour/contrib/hbqt/QWebHistoryItem.cpp index d86aeee0f4..525f352eb9 100644 --- a/harbour/contrib/hbqt/QWebHistoryItem.cpp +++ b/harbour/contrib/hbqt/QWebHistoryItem.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -76,25 +77,27 @@ * QWebHistoryItem ( const QWebHistoryItem & other ) * ~QWebHistoryItem () */ + HB_FUNC( QT_QWEBHISTORYITEM ) { - hb_retptr( ( QWebHistoryItem* ) new QWebHistoryItem( *hbqt_par_QWebHistoryItem( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QWEBHISTORYITEM_DESTROY ) -{ - delete hbqt_par_QWebHistoryItem( 1 ); -} + if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) + { + pObj = new QWebHistoryItem( *hbqt_par_QWebHistoryItem( 1 ) ) ; + } + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QWebHistoryItem" ); + hb_retptrGC( p ); +} /* * QIcon icon () const */ HB_FUNC( QT_QWEBHISTORYITEM_ICON ) { - hb_retptr( new QIcon( hbqt_par_QWebHistoryItem( 1 )->icon() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QWebHistoryItem( 1 )->icon() ) ) ); } /* @@ -110,7 +113,7 @@ HB_FUNC( QT_QWEBHISTORYITEM_ISVALID ) */ HB_FUNC( QT_QWEBHISTORYITEM_LASTVISITED ) { - hb_retptr( new QDateTime( hbqt_par_QWebHistoryItem( 1 )->lastVisited() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QWebHistoryItem( 1 )->lastVisited() ) ) ); } /* @@ -118,7 +121,7 @@ HB_FUNC( QT_QWEBHISTORYITEM_LASTVISITED ) */ HB_FUNC( QT_QWEBHISTORYITEM_ORIGINALURL ) { - hb_retptr( new QUrl( hbqt_par_QWebHistoryItem( 1 )->originalUrl() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QUrl( hbqt_par_QWebHistoryItem( 1 )->originalUrl() ) ) ); } /* @@ -142,7 +145,7 @@ HB_FUNC( QT_QWEBHISTORYITEM_TITLE ) */ HB_FUNC( QT_QWEBHISTORYITEM_URL ) { - hb_retptr( new QUrl( hbqt_par_QWebHistoryItem( 1 )->url() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QUrl( hbqt_par_QWebHistoryItem( 1 )->url() ) ) ); } /* @@ -150,7 +153,7 @@ HB_FUNC( QT_QWEBHISTORYITEM_URL ) */ HB_FUNC( QT_QWEBHISTORYITEM_USERDATA ) { - hb_retptr( new QVariant( hbqt_par_QWebHistoryItem( 1 )->userData() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QWebHistoryItem( 1 )->userData() ) ) ); } diff --git a/harbour/contrib/hbqt/QWebHitTestResult.cpp b/harbour/contrib/hbqt/QWebHitTestResult.cpp index c3960e3117..d889876606 100644 --- a/harbour/contrib/hbqt/QWebHitTestResult.cpp +++ b/harbour/contrib/hbqt/QWebHitTestResult.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -75,19 +76,18 @@ * QWebHitTestResult ( const QWebHitTestResult & other ) * ~QWebHitTestResult () */ + HB_FUNC( QT_QWEBHITTESTRESULT ) { - hb_retptr( ( QWebHitTestResult* ) new QWebHitTestResult() ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QWEBHITTESTRESULT_DESTROY ) -{ - delete hbqt_par_QWebHitTestResult( 1 ); -} + pObj = ( QWebHitTestResult* ) new QWebHitTestResult() ; + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QWebHitTestResult" ); + hb_retptrGC( p ); +} /* * QString alternateText () const */ @@ -101,7 +101,7 @@ HB_FUNC( QT_QWEBHITTESTRESULT_ALTERNATETEXT ) */ HB_FUNC( QT_QWEBHITTESTRESULT_BOUNDINGRECT ) { - hb_retptr( new QRect( hbqt_par_QWebHitTestResult( 1 )->boundingRect() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QWebHitTestResult( 1 )->boundingRect() ) ) ); } /* @@ -117,7 +117,7 @@ HB_FUNC( QT_QWEBHITTESTRESULT_FRAME ) */ HB_FUNC( QT_QWEBHITTESTRESULT_IMAGEURL ) { - hb_retptr( new QUrl( hbqt_par_QWebHitTestResult( 1 )->imageUrl() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QUrl( hbqt_par_QWebHitTestResult( 1 )->imageUrl() ) ) ); } /* @@ -165,7 +165,7 @@ HB_FUNC( QT_QWEBHITTESTRESULT_LINKTEXT ) */ HB_FUNC( QT_QWEBHITTESTRESULT_LINKTITLE ) { - hb_retptr( new QUrl( hbqt_par_QWebHitTestResult( 1 )->linkTitle() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QUrl( hbqt_par_QWebHitTestResult( 1 )->linkTitle() ) ) ); } /* @@ -173,7 +173,7 @@ HB_FUNC( QT_QWEBHITTESTRESULT_LINKTITLE ) */ HB_FUNC( QT_QWEBHITTESTRESULT_LINKURL ) { - hb_retptr( new QUrl( hbqt_par_QWebHitTestResult( 1 )->linkUrl() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QUrl( hbqt_par_QWebHitTestResult( 1 )->linkUrl() ) ) ); } /* @@ -181,7 +181,7 @@ HB_FUNC( QT_QWEBHITTESTRESULT_LINKURL ) */ HB_FUNC( QT_QWEBHITTESTRESULT_PIXMAP ) { - hb_retptr( new QPixmap( hbqt_par_QWebHitTestResult( 1 )->pixmap() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QWebHitTestResult( 1 )->pixmap() ) ) ); } /* @@ -189,7 +189,7 @@ HB_FUNC( QT_QWEBHITTESTRESULT_PIXMAP ) */ HB_FUNC( QT_QWEBHITTESTRESULT_POS ) { - hb_retptr( new QPoint( hbqt_par_QWebHitTestResult( 1 )->pos() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QWebHitTestResult( 1 )->pos() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QWebPage.cpp b/harbour/contrib/hbqt/QWebPage.cpp index 250eb33606..0802ba661a 100644 --- a/harbour/contrib/hbqt/QWebPage.cpp +++ b/harbour/contrib/hbqt/QWebPage.cpp @@ -76,6 +76,7 @@ * flags FindFlags */ +#include #include #include @@ -85,19 +86,18 @@ * QWebPage ( QObject * parent = 0 ) * ~QWebPage () */ + HB_FUNC( QT_QWEBPAGE ) { - hb_retptr( new QWebPage( hbqt_par_QWidget( 2 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QWebPage > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QWEBPAGE_DESTROY ) -{ - delete hbqt_par_QWebPage( 1 ); -} + pObj = new QWebPage( hbqt_par_QWidget( 2 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * QAction * action ( WebAction action ) const */ @@ -167,7 +167,7 @@ HB_FUNC( QT_QWEBPAGE_HISTORY ) */ HB_FUNC( QT_QWEBPAGE_INPUTMETHODQUERY ) { - hb_retptr( new QVariant( hbqt_par_QWebPage( 1 )->inputMethodQuery( ( Qt::InputMethodQuery ) hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QWebPage( 1 )->inputMethodQuery( ( Qt::InputMethodQuery ) hb_parni( 2 ) ) ) ) ); } /* @@ -215,7 +215,7 @@ HB_FUNC( QT_QWEBPAGE_NETWORKACCESSMANAGER ) */ HB_FUNC( QT_QWEBPAGE_PALETTE ) { - hb_retptr( new QPalette( hbqt_par_QWebPage( 1 )->palette() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPalette( hbqt_par_QWebPage( 1 )->palette() ) ) ); } /* @@ -367,7 +367,7 @@ HB_FUNC( QT_QWEBPAGE_VIEW ) */ HB_FUNC( QT_QWEBPAGE_VIEWPORTSIZE ) { - hb_retptr( new QSize( hbqt_par_QWebPage( 1 )->viewportSize() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QWebPage( 1 )->viewportSize() ) ) ); } diff --git a/harbour/contrib/hbqt/QWebPluginFactory.cpp b/harbour/contrib/hbqt/QWebPluginFactory.cpp index 2041871da7..f6f938ba99 100644 --- a/harbour/contrib/hbqt/QWebPluginFactory.cpp +++ b/harbour/contrib/hbqt/QWebPluginFactory.cpp @@ -84,6 +84,7 @@ * // virtual bool extension ( Extension extension, const ExtensionOption * option = 0, ExtensionReturn * output = 0 ) */ +#include #include @@ -92,19 +93,10 @@ * QWebPluginFactory ( QObject * parent = 0 ) * virtual ~QWebPluginFactory () */ + HB_FUNC( QT_QWEBPLUGINFACTORY ) { - //hb_retptr( ( QWebPluginFactory* ) new QWebPluginFactory() ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QWEBPLUGINFACTORY_DESTROY ) -{ - delete hbqt_par_QWebPluginFactory( 1 ); -} - /* * virtual QObject * create ( const QString & mimeType, const QUrl & url, const QStringList & argumentNames, const QStringList & argumentValues ) const = 0 */ diff --git a/harbour/contrib/hbqt/QWebSecurityOrigin.cpp b/harbour/contrib/hbqt/QWebSecurityOrigin.cpp index 5af82a940b..902aee1a44 100644 --- a/harbour/contrib/hbqt/QWebSecurityOrigin.cpp +++ b/harbour/contrib/hbqt/QWebSecurityOrigin.cpp @@ -76,6 +76,7 @@ * QList allOrigins () */ +#include #include @@ -84,19 +85,21 @@ * QWebSecurityOrigin ( const QWebSecurityOrigin & other ) * ~QWebSecurityOrigin () */ + HB_FUNC( QT_QWEBSECURITYORIGIN ) { - hb_retptr( ( QWebSecurityOrigin* ) new QWebSecurityOrigin( *hbqt_par_QWebSecurityOrigin( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + void * pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QWEBSECURITYORIGIN_DESTROY ) -{ - delete hbqt_par_QWebSecurityOrigin( 1 ); -} + if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) ) + { + pObj = new QWebSecurityOrigin( *hbqt_par_QWebSecurityOrigin( 1 ) ) ; + } + p->ph = pObj; + p->type = hbqt_getIdByName( ( QString ) "QWebSecurityOrigin" ); + hb_retptrGC( p ); +} /* * qint64 databaseQuota () const */ diff --git a/harbour/contrib/hbqt/QWebSettings.cpp b/harbour/contrib/hbqt/QWebSettings.cpp index d8bd8b32ed..1f9e28feea 100644 --- a/harbour/contrib/hbqt/QWebSettings.cpp +++ b/harbour/contrib/hbqt/QWebSettings.cpp @@ -73,6 +73,7 @@ * enum WebGraphic { MissingImageGraphic, MissingPluginGraphic, DefaultFrameIconGraphic, TextAreaSizeGripCornerGraphic } */ +#include #include #include @@ -81,19 +82,10 @@ /* * */ + HB_FUNC( QT_QWEBSETTINGS ) { - //hb_retptr( ( QWebSettings* ) new QWebSettings() ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QWEBSETTINGS_DESTROY ) -{ - -} - /* * QString fontFamily ( FontFamily which ) const */ @@ -179,7 +171,7 @@ HB_FUNC( QT_QWEBSETTINGS_TESTATTRIBUTE ) */ HB_FUNC( QT_QWEBSETTINGS_USERSTYLESHEETURL ) { - hb_retptr( new QUrl( hbqt_par_QWebSettings( 1 )->userStyleSheetUrl() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QUrl( hbqt_par_QWebSettings( 1 )->userStyleSheetUrl() ) ) ); } /* @@ -211,7 +203,7 @@ HB_FUNC( QT_QWEBSETTINGS_ICONDATABASEPATH ) */ HB_FUNC( QT_QWEBSETTINGS_ICONFORURL ) { - hb_retptr( new QIcon( hbqt_par_QWebSettings( 1 )->iconForUrl( *hbqt_par_QUrl( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QWebSettings( 1 )->iconForUrl( *hbqt_par_QUrl( 2 ) ) ) ) ); } /* @@ -291,7 +283,7 @@ HB_FUNC( QT_QWEBSETTINGS_SETWEBGRAPHIC ) */ HB_FUNC( QT_QWEBSETTINGS_WEBGRAPHIC ) { - hb_retptr( new QPixmap( hbqt_par_QWebSettings( 1 )->webGraphic( ( QWebSettings::WebGraphic ) hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QWebSettings( 1 )->webGraphic( ( QWebSettings::WebGraphic ) hb_parni( 2 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/QWebView.cpp b/harbour/contrib/hbqt/QWebView.cpp index 81df99d026..96036bc7fd 100644 --- a/harbour/contrib/hbqt/QWebView.cpp +++ b/harbour/contrib/hbqt/QWebView.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -75,19 +76,18 @@ * QWebView ( QWidget * parent = 0 ) * virtual ~QWebView () */ + HB_FUNC( QT_QWEBVIEW ) { - hb_retptr( new QWebView( hbqt_par_QWidget( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QWebView > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QWEBVIEW_DESTROY ) -{ - delete hbqt_par_QWebView( 1 ); -} + pObj = new QWebView( hbqt_par_QWidget( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * bool findText ( const QString & subString, QWebPage::FindFlags options = 0 ) */ @@ -109,7 +109,7 @@ HB_FUNC( QT_QWEBVIEW_HISTORY ) */ HB_FUNC( QT_QWEBVIEW_ICON ) { - hb_retptr( new QIcon( hbqt_par_QWebView( 1 )->icon() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QWebView( 1 )->icon() ) ) ); } /* @@ -245,7 +245,7 @@ HB_FUNC( QT_QWEBVIEW_TRIGGERPAGEACTION ) */ HB_FUNC( QT_QWEBVIEW_URL ) { - hb_retptr( new QUrl( hbqt_par_QWebView( 1 )->url() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QUrl( hbqt_par_QWebView( 1 )->url() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QWheelEvent.cpp b/harbour/contrib/hbqt/QWheelEvent.cpp index 061f61b07f..6d0aff6ecf 100644 --- a/harbour/contrib/hbqt/QWheelEvent.cpp +++ b/harbour/contrib/hbqt/QWheelEvent.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,19 +75,10 @@ * QWheelEvent ( const QPoint & pos, int delta, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Qt::Orientation orient = Qt::Vertical ) * QWheelEvent ( const QPoint & pos, const QPoint & globalPos, int delta, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Qt::Orientation orient = Qt::Vertical ) */ + HB_FUNC( QT_QWHEELEVENT ) { - // hb_retptr( ( QWheelEvent* ) new QWheelEvent() ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QWHEELEVENT_DESTROY ) -{ - -} - /* * Qt::MouseButtons buttons () const */ @@ -108,7 +100,7 @@ HB_FUNC( QT_QWHEELEVENT_DELTA ) */ HB_FUNC( QT_QWHEELEVENT_GLOBALPOS ) { - hb_retptr( new QPoint( hbqt_par_QWheelEvent( 1 )->globalPos() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QWheelEvent( 1 )->globalPos() ) ) ); } /* @@ -140,7 +132,7 @@ HB_FUNC( QT_QWHEELEVENT_ORIENTATION ) */ HB_FUNC( QT_QWHEELEVENT_POS ) { - hb_retptr( new QPoint( hbqt_par_QWheelEvent( 1 )->pos() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QWheelEvent( 1 )->pos() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QWidget.cpp b/harbour/contrib/hbqt/QWidget.cpp index e731f5b18f..e9aa91150d 100644 --- a/harbour/contrib/hbqt/QWidget.cpp +++ b/harbour/contrib/hbqt/QWidget.cpp @@ -73,7 +73,7 @@ */ /* - * Constructed[ 214/229 [ 93.45% ] ] + * Constructed[ 213/229 [ 93.01% ] ] * * *** Unconvered Prototypes *** * ----------------------------- @@ -94,10 +94,12 @@ * //void render ( QPainter * painter, const QPoint & targetOffset = QPoint(), const QRegion & sourceRegion = QRegion(), RenderFlags renderFlags = RenderFlags( DrawWindowBackground | DrawChildren ) ) * // void setEditFocus ( bool enable ) * //void setSizePolicy ( QSizePolicy ) + * //WId winId () const * //Qt::HANDLE x11PictureHandle () const * //QWidget * find ( WId id ) */ +#include #include #include @@ -109,19 +111,18 @@ * QWidget( QWidget * parent = 0, Qt::WindowFlags f = 0 ) * ~QWidget () */ + HB_FUNC( QT_QWIDGET ) { - hb_retptr( new QWidget( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QWidget > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QWIDGET_DESTROY ) -{ - delete hbqt_par_QWidget( 1 ); -} + pObj = new QWidget( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * bool acceptDrops () const */ @@ -191,7 +192,7 @@ HB_FUNC( QT_QWIDGET_BACKGROUNDROLE ) */ HB_FUNC( QT_QWIDGET_BASESIZE ) { - hb_retptr( new QSize( hbqt_par_QWidget( 1 )->baseSize() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QWidget( 1 )->baseSize() ) ) ); } /* @@ -215,7 +216,7 @@ HB_FUNC( QT_QWIDGET_CHILDAT_1 ) */ HB_FUNC( QT_QWIDGET_CHILDRENRECT ) { - hb_retptr( new QRect( hbqt_par_QWidget( 1 )->childrenRect() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QWidget( 1 )->childrenRect() ) ) ); } /* @@ -223,7 +224,7 @@ HB_FUNC( QT_QWIDGET_CHILDRENRECT ) */ HB_FUNC( QT_QWIDGET_CHILDRENREGION ) { - hb_retptr( new QRegion( hbqt_par_QWidget( 1 )->childrenRegion() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRegion( hbqt_par_QWidget( 1 )->childrenRegion() ) ) ); } /* @@ -247,7 +248,7 @@ HB_FUNC( QT_QWIDGET_CLEARMASK ) */ HB_FUNC( QT_QWIDGET_CONTENTSRECT ) { - hb_retptr( new QRect( hbqt_par_QWidget( 1 )->contentsRect() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QWidget( 1 )->contentsRect() ) ) ); } /* @@ -263,7 +264,7 @@ HB_FUNC( QT_QWIDGET_CONTEXTMENUPOLICY ) */ HB_FUNC( QT_QWIDGET_CURSOR ) { - hb_retptr( new QCursor( hbqt_par_QWidget( 1 )->cursor() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QCursor( hbqt_par_QWidget( 1 )->cursor() ) ) ); } /* @@ -303,7 +304,7 @@ HB_FUNC( QT_QWIDGET_FOCUSWIDGET ) */ HB_FUNC( QT_QWIDGET_FONT ) { - hb_retptr( new QFont( hbqt_par_QWidget( 1 )->font() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QWidget( 1 )->font() ) ) ); } /* @@ -311,7 +312,7 @@ HB_FUNC( QT_QWIDGET_FONT ) */ HB_FUNC( QT_QWIDGET_FONTINFO ) { - hb_retptr( new QFontInfo( hbqt_par_QWidget( 1 )->fontInfo() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFontInfo( hbqt_par_QWidget( 1 )->fontInfo() ) ) ); } /* @@ -319,7 +320,7 @@ HB_FUNC( QT_QWIDGET_FONTINFO ) */ HB_FUNC( QT_QWIDGET_FONTMETRICS ) { - hb_retptr( new QFontMetrics( hbqt_par_QWidget( 1 )->fontMetrics() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QFontMetrics( hbqt_par_QWidget( 1 )->fontMetrics() ) ) ); } /* @@ -335,7 +336,7 @@ HB_FUNC( QT_QWIDGET_FOREGROUNDROLE ) */ HB_FUNC( QT_QWIDGET_FRAMEGEOMETRY ) { - hb_retptr( new QRect( hbqt_par_QWidget( 1 )->frameGeometry() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QWidget( 1 )->frameGeometry() ) ) ); } /* @@ -343,7 +344,7 @@ HB_FUNC( QT_QWIDGET_FRAMEGEOMETRY ) */ HB_FUNC( QT_QWIDGET_FRAMESIZE ) { - hb_retptr( new QSize( hbqt_par_QWidget( 1 )->frameSize() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QWidget( 1 )->frameSize() ) ) ); } /* @@ -351,7 +352,7 @@ HB_FUNC( QT_QWIDGET_FRAMESIZE ) */ HB_FUNC( QT_QWIDGET_GEOMETRY ) { - hb_retptr( new QRect( hbqt_par_QWidget( 1 )->geometry() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QWidget( 1 )->geometry() ) ) ); } /* @@ -457,7 +458,7 @@ HB_FUNC( QT_QWIDGET_INPUTCONTEXT ) */ HB_FUNC( QT_QWIDGET_INPUTMETHODQUERY ) { - hb_retptr( new QVariant( hbqt_par_QWidget( 1 )->inputMethodQuery( ( Qt::InputMethodQuery ) hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QWidget( 1 )->inputMethodQuery( ( Qt::InputMethodQuery ) hb_parni( 2 ) ) ) ) ); } /* @@ -593,7 +594,7 @@ HB_FUNC( QT_QWIDGET_LAYOUTDIRECTION ) */ HB_FUNC( QT_QWIDGET_LOCALE ) { - hb_retptr( new QLocale( hbqt_par_QWidget( 1 )->locale() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QLocale( hbqt_par_QWidget( 1 )->locale() ) ) ); } /* @@ -601,7 +602,7 @@ HB_FUNC( QT_QWIDGET_LOCALE ) */ HB_FUNC( QT_QWIDGET_MAPFROM ) { - hb_retptr( new QPoint( hbqt_par_QWidget( 1 )->mapFrom( hbqt_par_QWidget( 2 ), *hbqt_par_QPoint( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QWidget( 1 )->mapFrom( hbqt_par_QWidget( 2 ), *hbqt_par_QPoint( 3 ) ) ) ) ); } /* @@ -609,7 +610,7 @@ HB_FUNC( QT_QWIDGET_MAPFROM ) */ HB_FUNC( QT_QWIDGET_MAPFROMGLOBAL ) { - hb_retptr( new QPoint( hbqt_par_QWidget( 1 )->mapFromGlobal( *hbqt_par_QPoint( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QWidget( 1 )->mapFromGlobal( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* @@ -617,7 +618,7 @@ HB_FUNC( QT_QWIDGET_MAPFROMGLOBAL ) */ HB_FUNC( QT_QWIDGET_MAPFROMPARENT ) { - hb_retptr( new QPoint( hbqt_par_QWidget( 1 )->mapFromParent( *hbqt_par_QPoint( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QWidget( 1 )->mapFromParent( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* @@ -625,7 +626,7 @@ HB_FUNC( QT_QWIDGET_MAPFROMPARENT ) */ HB_FUNC( QT_QWIDGET_MAPTO ) { - hb_retptr( new QPoint( hbqt_par_QWidget( 1 )->mapTo( hbqt_par_QWidget( 2 ), *hbqt_par_QPoint( 3 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QWidget( 1 )->mapTo( hbqt_par_QWidget( 2 ), *hbqt_par_QPoint( 3 ) ) ) ) ); } /* @@ -633,7 +634,7 @@ HB_FUNC( QT_QWIDGET_MAPTO ) */ HB_FUNC( QT_QWIDGET_MAPTOGLOBAL ) { - hb_retptr( new QPoint( hbqt_par_QWidget( 1 )->mapToGlobal( *hbqt_par_QPoint( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QWidget( 1 )->mapToGlobal( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* @@ -641,7 +642,7 @@ HB_FUNC( QT_QWIDGET_MAPTOGLOBAL ) */ HB_FUNC( QT_QWIDGET_MAPTOPARENT ) { - hb_retptr( new QPoint( hbqt_par_QWidget( 1 )->mapToParent( *hbqt_par_QPoint( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QWidget( 1 )->mapToParent( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* @@ -649,7 +650,7 @@ HB_FUNC( QT_QWIDGET_MAPTOPARENT ) */ HB_FUNC( QT_QWIDGET_MASK ) { - hb_retptr( new QRegion( hbqt_par_QWidget( 1 )->mask() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRegion( hbqt_par_QWidget( 1 )->mask() ) ) ); } /* @@ -665,7 +666,7 @@ HB_FUNC( QT_QWIDGET_MAXIMUMHEIGHT ) */ HB_FUNC( QT_QWIDGET_MAXIMUMSIZE ) { - hb_retptr( new QSize( hbqt_par_QWidget( 1 )->maximumSize() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QWidget( 1 )->maximumSize() ) ) ); } /* @@ -689,7 +690,7 @@ HB_FUNC( QT_QWIDGET_MINIMUMHEIGHT ) */ HB_FUNC( QT_QWIDGET_MINIMUMSIZE ) { - hb_retptr( new QSize( hbqt_par_QWidget( 1 )->minimumSize() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QWidget( 1 )->minimumSize() ) ) ); } /* @@ -697,7 +698,7 @@ HB_FUNC( QT_QWIDGET_MINIMUMSIZE ) */ HB_FUNC( QT_QWIDGET_MINIMUMSIZEHINT ) { - hb_retptr( new QSize( hbqt_par_QWidget( 1 )->minimumSizeHint() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QWidget( 1 )->minimumSizeHint() ) ) ); } /* @@ -745,7 +746,7 @@ HB_FUNC( QT_QWIDGET_NEXTINFOCUSCHAIN ) */ HB_FUNC( QT_QWIDGET_NORMALGEOMETRY ) { - hb_retptr( new QRect( hbqt_par_QWidget( 1 )->normalGeometry() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QWidget( 1 )->normalGeometry() ) ) ); } /* @@ -769,7 +770,7 @@ HB_FUNC( QT_QWIDGET_PAINTENGINE ) */ HB_FUNC( QT_QWIDGET_PALETTE ) { - hb_retptr( new QPalette( hbqt_par_QWidget( 1 )->palette() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPalette( hbqt_par_QWidget( 1 )->palette() ) ) ); } /* @@ -785,7 +786,7 @@ HB_FUNC( QT_QWIDGET_PARENTWIDGET ) */ HB_FUNC( QT_QWIDGET_POS ) { - hb_retptr( new QPoint( hbqt_par_QWidget( 1 )->pos() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QWidget( 1 )->pos() ) ) ); } /* @@ -793,7 +794,7 @@ HB_FUNC( QT_QWIDGET_POS ) */ HB_FUNC( QT_QWIDGET_RECT ) { - hb_retptr( new QRect( hbqt_par_QWidget( 1 )->rect() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QWidget( 1 )->rect() ) ) ); } /* @@ -881,7 +882,7 @@ HB_FUNC( QT_QWIDGET_RESTOREGEOMETRY ) */ HB_FUNC( QT_QWIDGET_SAVEGEOMETRY ) { - hb_retptr( new QByteArray( hbqt_par_QWidget( 1 )->saveGeometry() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QWidget( 1 )->saveGeometry() ) ) ); } /* @@ -1377,7 +1378,7 @@ HB_FUNC( QT_QWIDGET_SETWINDOWSURFACE ) */ HB_FUNC( QT_QWIDGET_SIZE ) { - hb_retptr( new QSize( hbqt_par_QWidget( 1 )->size() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QWidget( 1 )->size() ) ) ); } /* @@ -1385,7 +1386,7 @@ HB_FUNC( QT_QWIDGET_SIZE ) */ HB_FUNC( QT_QWIDGET_SIZEHINT ) { - hb_retptr( new QSize( hbqt_par_QWidget( 1 )->sizeHint() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QWidget( 1 )->sizeHint() ) ) ); } /* @@ -1393,7 +1394,7 @@ HB_FUNC( QT_QWIDGET_SIZEHINT ) */ HB_FUNC( QT_QWIDGET_SIZEINCREMENT ) { - hb_retptr( new QSize( hbqt_par_QWidget( 1 )->sizeIncrement() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QWidget( 1 )->sizeIncrement() ) ) ); } /* @@ -1401,7 +1402,7 @@ HB_FUNC( QT_QWIDGET_SIZEINCREMENT ) */ HB_FUNC( QT_QWIDGET_SIZEPOLICY ) { - hb_retptr( new QSizePolicy( hbqt_par_QWidget( 1 )->sizePolicy() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QSizePolicy( hbqt_par_QWidget( 1 )->sizePolicy() ) ) ); } /* @@ -1529,7 +1530,7 @@ HB_FUNC( QT_QWIDGET_UPDATESENABLED ) */ HB_FUNC( QT_QWIDGET_VISIBLEREGION ) { - hb_retptr( new QRegion( hbqt_par_QWidget( 1 )->visibleRegion() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QRegion( hbqt_par_QWidget( 1 )->visibleRegion() ) ) ); } /* @@ -1548,14 +1549,6 @@ HB_FUNC( QT_QWIDGET_WIDTH ) hb_retni( hbqt_par_QWidget( 1 )->width() ); } -/* - * WId winId () const - */ -HB_FUNC( QT_QWIDGET_WINID ) -{ - hb_retptr( new WId( hbqt_par_QWidget( 1 )->winId() ) ); -} - /* * QWidget * window () const */ @@ -1585,7 +1578,7 @@ HB_FUNC( QT_QWIDGET_WINDOWFLAGS ) */ HB_FUNC( QT_QWIDGET_WINDOWICON ) { - hb_retptr( new QIcon( hbqt_par_QWidget( 1 )->windowIcon() ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QWidget( 1 )->windowIcon() ) ) ); } /* diff --git a/harbour/contrib/hbqt/QWidgetAction.cpp b/harbour/contrib/hbqt/QWidgetAction.cpp index bbc6a9c4cc..7f6927dd9d 100644 --- a/harbour/contrib/hbqt/QWidgetAction.cpp +++ b/harbour/contrib/hbqt/QWidgetAction.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -74,19 +75,18 @@ * QWidgetAction ( QObject * parent ) * virtual ~QWidgetAction () */ + HB_FUNC( QT_QWIDGETACTION ) { - hb_retptr( ( QWidgetAction* ) new QWidgetAction( hbqt_par_QObject( 1 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QWidgetAction > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QWIDGETACTION_DESTROY ) -{ - delete hbqt_par_QWidgetAction( 1 ); -} + pObj = ( QWidgetAction* ) new QWidgetAction( hbqt_par_QObject( 1 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * QWidget * defaultWidget () const */ diff --git a/harbour/contrib/hbqt/QWidgetItem.cpp b/harbour/contrib/hbqt/QWidgetItem.cpp index c35eff8b23..dedb48ce87 100644 --- a/harbour/contrib/hbqt/QWidgetItem.cpp +++ b/harbour/contrib/hbqt/QWidgetItem.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -73,19 +74,15 @@ /* * QWidgetItem ( QWidget * widget ) */ + HB_FUNC( QT_QWIDGETITEM ) { - hb_retptr( ( QWidgetItem* ) new QWidgetItem( hbqt_par_QWidget( 1 ) ) ); + void * pObj = NULL; + + pObj = ( QWidgetItem* ) new QWidgetItem( hbqt_par_QWidget( 1 ) ) ; + + hb_retptr( pObj ); } - -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QWIDGETITEM_DESTROY ) -{ - -} - /* * virtual bool isEmpty () const */ diff --git a/harbour/contrib/hbqt/QWindowsStyle.cpp b/harbour/contrib/hbqt/QWindowsStyle.cpp index e3faa500d9..aa1689f2b7 100644 --- a/harbour/contrib/hbqt/QWindowsStyle.cpp +++ b/harbour/contrib/hbqt/QWindowsStyle.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -75,19 +76,18 @@ * ~QWindowsStyle () * */ + HB_FUNC( QT_QWINDOWSSTYLE ) { - hb_retptr( ( QWindowsStyle* ) new QWindowsStyle() ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QWindowsStyle > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QWINDOWSSTYLE_DESTROY ) -{ - delete hbqt_par_QWindowsStyle( 1 ); -} + pObj = ( QWindowsStyle* ) new QWindowsStyle() ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ diff --git a/harbour/contrib/hbqt/QWindowsXPStyle.cpp b/harbour/contrib/hbqt/QWindowsXPStyle.cpp index c6ea1bde81..0da2721b94 100644 --- a/harbour/contrib/hbqt/QWindowsXPStyle.cpp +++ b/harbour/contrib/hbqt/QWindowsXPStyle.cpp @@ -66,6 +66,7 @@ #if QT_VERSION >= 0x040500 /*----------------------------------------------------------------------*/ +#include #include @@ -75,24 +76,23 @@ * ~QWindowsXPStyle () * */ + HB_FUNC( QT_QWINDOWSXPSTYLE ) { + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QWindowsXPStyle > pObj = NULL; + #if defined( HB_OS_WIN ) - hb_retptr( ( QWindowsXPStyle* ) new QWindowsXPStyle() ); + pObj = ( QWindowsXPStyle* ) new QWindowsXPStyle() ; #else - hb_retptr( NULL ); + pObj = NULL ; #endif -} -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QWINDOWSXPSTYLE_DESTROY ) -{ - delete hbqt_par_QWindowsXPStyle( 1 ); + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); } - /*----------------------------------------------------------------------*/ #endif /* #if QT_VERSION >= 0x040500 */ /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/QWizard.cpp b/harbour/contrib/hbqt/QWizard.cpp index 0f7911d243..85e47b7215 100644 --- a/harbour/contrib/hbqt/QWizard.cpp +++ b/harbour/contrib/hbqt/QWizard.cpp @@ -85,6 +85,7 @@ * QList visitedPages () const */ +#include #include #include @@ -94,19 +95,18 @@ * QWizard ( QWidget * parent = 0, Qt::WindowFlags flags = 0 ) * ~QWizard () */ + HB_FUNC( QT_QWIZARD ) { - hb_retptr( new QWizard( hbqt_par_QWidget( 2 ) ) ); -} + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + QPointer< QWizard > pObj = NULL; -/* - * DESTRUCTOR - */ -HB_FUNC( QT_QWIZARD_DESTROY ) -{ - delete hbqt_par_QWizard( 1 ); -} + pObj = new QWizard( hbqt_par_QWidget( 2 ) ) ; + p->ph = pObj; + p->type = 1001; + hb_retptrGC( p ); +} /* * int addPage ( QWizardPage * page ) */ @@ -152,7 +152,7 @@ HB_FUNC( QT_QWIZARD_CURRENTPAGE ) */ HB_FUNC( QT_QWIZARD_FIELD ) { - hb_retptr( new QVariant( hbqt_par_QWizard( 1 )->field( hbqt_par_QString( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QWizard( 1 )->field( hbqt_par_QString( 2 ) ) ) ) ); } /* @@ -192,7 +192,7 @@ HB_FUNC( QT_QWIZARD_PAGE ) */ HB_FUNC( QT_QWIZARD_PIXMAP ) { - hb_retptr( new QPixmap( hbqt_par_QWizard( 1 )->pixmap( ( QWizard::WizardPixmap ) hb_parni( 2 ) ) ) ); + hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QWizard( 1 )->pixmap( ( QWizard::WizardPixmap ) hb_parni( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/TQAbstractButton.prg b/harbour/contrib/hbqt/TQAbstractButton.prg index bcf411694f..6674ee2396 100644 --- a/harbour/contrib/hbqt/TQAbstractButton.prg +++ b/harbour/contrib/hbqt/TQAbstractButton.prg @@ -70,7 +70,6 @@ CREATE CLASS QAbstractButton INHERIT QWidget METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QAbstractButton_destroy( ::pPtr ) METHOD autoExclusive() INLINE Qt_QAbstractButton_autoExclusive( ::pPtr ) METHOD autoRepeat() INLINE Qt_QAbstractButton_autoRepeat( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQAbstractItemModel.prg b/harbour/contrib/hbqt/TQAbstractItemModel.prg index eba4353b89..b8764a0398 100644 --- a/harbour/contrib/hbqt/TQAbstractItemModel.prg +++ b/harbour/contrib/hbqt/TQAbstractItemModel.prg @@ -70,7 +70,6 @@ CREATE CLASS QAbstractItemModel INHERIT QObject METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QAbstractItemModel_destroy( ::pPtr ) METHOD buddy( pIndex ) INLINE Qt_QAbstractItemModel_buddy( ::pPtr, pIndex ) METHOD canFetchMore( pParent ) INLINE Qt_QAbstractItemModel_canFetchMore( ::pPtr, pParent ) diff --git a/harbour/contrib/hbqt/TQAbstractItemView.prg b/harbour/contrib/hbqt/TQAbstractItemView.prg index f862a67f5e..baeb5fce0c 100644 --- a/harbour/contrib/hbqt/TQAbstractItemView.prg +++ b/harbour/contrib/hbqt/TQAbstractItemView.prg @@ -70,7 +70,6 @@ CREATE CLASS QAbstractItemView INHERIT QAbstractScrollArea METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QAbstractItemView_destroy( ::pPtr ) METHOD alternatingRowColors() INLINE Qt_QAbstractItemView_alternatingRowColors( ::pPtr ) METHOD autoScrollMargin() INLINE Qt_QAbstractItemView_autoScrollMargin( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQAbstractListModel.prg b/harbour/contrib/hbqt/TQAbstractListModel.prg index 5c1e0e6b48..cf06c14b0a 100644 --- a/harbour/contrib/hbqt/TQAbstractListModel.prg +++ b/harbour/contrib/hbqt/TQAbstractListModel.prg @@ -70,7 +70,6 @@ CREATE CLASS QAbstractListModel INHERIT QAbstractItemModel METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QAbstractListModel_destroy( ::pPtr ) METHOD index( nRow, nColumn, pParent ) INLINE Qt_QAbstractListModel_index( ::pPtr, nRow, nColumn, pParent ) diff --git a/harbour/contrib/hbqt/TQAbstractPrintDialog.prg b/harbour/contrib/hbqt/TQAbstractPrintDialog.prg index cb93974ed9..14b45abc44 100644 --- a/harbour/contrib/hbqt/TQAbstractPrintDialog.prg +++ b/harbour/contrib/hbqt/TQAbstractPrintDialog.prg @@ -70,7 +70,6 @@ CREATE CLASS QAbstractPrintDialog INHERIT QDialog METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QAbstractPrintDialog_destroy( ::pPtr ) METHOD exec() INLINE Qt_QAbstractPrintDialog_exec( ::pPtr ) METHOD fromPage() INLINE Qt_QAbstractPrintDialog_fromPage( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQAbstractScrollArea.prg b/harbour/contrib/hbqt/TQAbstractScrollArea.prg index e73beb7820..ed207b045a 100644 --- a/harbour/contrib/hbqt/TQAbstractScrollArea.prg +++ b/harbour/contrib/hbqt/TQAbstractScrollArea.prg @@ -70,7 +70,6 @@ CREATE CLASS QAbstractScrollArea INHERIT QFrame METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QAbstractScrollArea_destroy( ::pPtr ) METHOD addScrollBarWidget( pWidget, nAlignment ) INLINE Qt_QAbstractScrollArea_addScrollBarWidget( ::pPtr, pWidget, nAlignment ) METHOD cornerWidget() INLINE Qt_QAbstractScrollArea_cornerWidget( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQAbstractSlider.prg b/harbour/contrib/hbqt/TQAbstractSlider.prg index a7343cbb08..55bb23358f 100644 --- a/harbour/contrib/hbqt/TQAbstractSlider.prg +++ b/harbour/contrib/hbqt/TQAbstractSlider.prg @@ -70,7 +70,6 @@ CREATE CLASS QAbstractSlider INHERIT QWidget METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QAbstractSlider_destroy( ::pPtr ) METHOD hasTracking() INLINE Qt_QAbstractSlider_hasTracking( ::pPtr ) METHOD invertedAppearance() INLINE Qt_QAbstractSlider_invertedAppearance( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQAbstractSpinBox.prg b/harbour/contrib/hbqt/TQAbstractSpinBox.prg index 61756b18a4..4a4f96023f 100644 --- a/harbour/contrib/hbqt/TQAbstractSpinBox.prg +++ b/harbour/contrib/hbqt/TQAbstractSpinBox.prg @@ -70,7 +70,6 @@ CREATE CLASS QAbstractSpinBox INHERIT QWidget METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QAbstractSpinBox_destroy( ::pPtr ) METHOD alignment() INLINE Qt_QAbstractSpinBox_alignment( ::pPtr ) METHOD buttonSymbols() INLINE Qt_QAbstractSpinBox_buttonSymbols( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQAbstractTableModel.prg b/harbour/contrib/hbqt/TQAbstractTableModel.prg index 5dc044069b..fbca1f2c99 100644 --- a/harbour/contrib/hbqt/TQAbstractTableModel.prg +++ b/harbour/contrib/hbqt/TQAbstractTableModel.prg @@ -70,7 +70,6 @@ CREATE CLASS QAbstractTableModel INHERIT QAbstractItemModel METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QAbstractTableModel_destroy( ::pPtr ) METHOD index( nRow, nColumn, pParent ) INLINE Qt_QAbstractTableModel_index( ::pPtr, nRow, nColumn, pParent ) diff --git a/harbour/contrib/hbqt/TQAction.prg b/harbour/contrib/hbqt/TQAction.prg index cdbefcd268..32a06b25f3 100644 --- a/harbour/contrib/hbqt/TQAction.prg +++ b/harbour/contrib/hbqt/TQAction.prg @@ -70,7 +70,6 @@ CREATE CLASS QAction INHERIT QObject METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QAction_destroy( ::pPtr ) METHOD actionGroup() INLINE Qt_QAction_actionGroup( ::pPtr ) METHOD activate( nEvent ) INLINE Qt_QAction_activate( ::pPtr, nEvent ) diff --git a/harbour/contrib/hbqt/TQApplication.prg b/harbour/contrib/hbqt/TQApplication.prg index 795d86f373..c4ad22c310 100644 --- a/harbour/contrib/hbqt/TQApplication.prg +++ b/harbour/contrib/hbqt/TQApplication.prg @@ -70,7 +70,6 @@ CREATE CLASS QApplication INHERIT QCoreApplication METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QApplication_destroy( ::pPtr ) METHOD commitData( pManager ) INLINE Qt_QApplication_commitData( ::pPtr, pManager ) METHOD inputContext() INLINE Qt_QApplication_inputContext( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQBitmap.prg b/harbour/contrib/hbqt/TQBitmap.prg index 20b038794d..388b031bfe 100644 --- a/harbour/contrib/hbqt/TQBitmap.prg +++ b/harbour/contrib/hbqt/TQBitmap.prg @@ -70,7 +70,6 @@ CREATE CLASS QBitmap INHERIT QPixmap METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QBitmap_destroy( ::pPtr ) METHOD clear() INLINE Qt_QBitmap_clear( ::pPtr ) METHOD transformed( pMatrix ) INLINE Qt_QBitmap_transformed( ::pPtr, pMatrix ) diff --git a/harbour/contrib/hbqt/TQBoxLayout.prg b/harbour/contrib/hbqt/TQBoxLayout.prg index f489dc3582..dc1956c2ce 100644 --- a/harbour/contrib/hbqt/TQBoxLayout.prg +++ b/harbour/contrib/hbqt/TQBoxLayout.prg @@ -70,7 +70,6 @@ CREATE CLASS QBoxLayout INHERIT QLayout METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QBoxLayout_destroy( ::pPtr ) METHOD addLayout( pLayout, nStretch ) INLINE Qt_QBoxLayout_addLayout( ::pPtr, pLayout, nStretch ) METHOD addSpacerItem( pSpacerItem ) INLINE Qt_QBoxLayout_addSpacerItem( ::pPtr, pSpacerItem ) diff --git a/harbour/contrib/hbqt/TQBrush.prg b/harbour/contrib/hbqt/TQBrush.prg index 9099b994a9..adae594576 100644 --- a/harbour/contrib/hbqt/TQBrush.prg +++ b/harbour/contrib/hbqt/TQBrush.prg @@ -70,7 +70,6 @@ CREATE CLASS QBrush METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QBrush_destroy( ::pPtr ) METHOD color() INLINE Qt_QBrush_color( ::pPtr ) METHOD isOpaque() INLINE Qt_QBrush_isOpaque( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQButtonGroup.prg b/harbour/contrib/hbqt/TQButtonGroup.prg index d23c292946..063cee8072 100644 --- a/harbour/contrib/hbqt/TQButtonGroup.prg +++ b/harbour/contrib/hbqt/TQButtonGroup.prg @@ -70,7 +70,6 @@ CREATE CLASS QButtonGroup INHERIT QObject METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QButtonGroup_destroy( ::pPtr ) METHOD addButton( pButton ) INLINE Qt_QButtonGroup_addButton( ::pPtr, pButton ) METHOD addButton_1( pButton, nId ) INLINE Qt_QButtonGroup_addButton_1( ::pPtr, pButton, nId ) diff --git a/harbour/contrib/hbqt/TQCalendarWidget.prg b/harbour/contrib/hbqt/TQCalendarWidget.prg index ba58b123d8..a834df2938 100644 --- a/harbour/contrib/hbqt/TQCalendarWidget.prg +++ b/harbour/contrib/hbqt/TQCalendarWidget.prg @@ -70,7 +70,6 @@ CREATE CLASS QCalendarWidget INHERIT QWidget METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QCalendarWidget_destroy( ::pPtr ) METHOD dateEditAcceptDelay() INLINE Qt_QCalendarWidget_dateEditAcceptDelay( ::pPtr ) METHOD dateTextFormat( pDate ) INLINE Qt_QCalendarWidget_dateTextFormat( ::pPtr, pDate ) diff --git a/harbour/contrib/hbqt/TQCheckBox.prg b/harbour/contrib/hbqt/TQCheckBox.prg index a2d80617b0..4c1550f38d 100644 --- a/harbour/contrib/hbqt/TQCheckBox.prg +++ b/harbour/contrib/hbqt/TQCheckBox.prg @@ -70,7 +70,6 @@ CREATE CLASS QCheckBox INHERIT QAbstractButton METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QCheckBox_destroy( ::pPtr ) METHOD checkState() INLINE Qt_QCheckBox_checkState( ::pPtr ) METHOD isTristate() INLINE Qt_QCheckBox_isTristate( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQClipboard.prg b/harbour/contrib/hbqt/TQClipboard.prg index cb8813fac9..74a7fe52e5 100644 --- a/harbour/contrib/hbqt/TQClipboard.prg +++ b/harbour/contrib/hbqt/TQClipboard.prg @@ -70,7 +70,6 @@ CREATE CLASS QClipboard INHERIT QObject METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QClipboard_destroy( ::pPtr ) METHOD clear( nMode ) INLINE Qt_QClipboard_clear( ::pPtr, nMode ) METHOD image( nMode ) INLINE Qt_QClipboard_image( ::pPtr, nMode ) diff --git a/harbour/contrib/hbqt/TQColor.prg b/harbour/contrib/hbqt/TQColor.prg index 69e88b8a40..4bdc325715 100644 --- a/harbour/contrib/hbqt/TQColor.prg +++ b/harbour/contrib/hbqt/TQColor.prg @@ -70,7 +70,6 @@ CREATE CLASS QColor METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QColor_destroy( ::pPtr ) METHOD alpha() INLINE Qt_QColor_alpha( ::pPtr ) METHOD alphaF() INLINE Qt_QColor_alphaF( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQColorDialog.prg b/harbour/contrib/hbqt/TQColorDialog.prg index 797b92a1e7..20b5fa603d 100644 --- a/harbour/contrib/hbqt/TQColorDialog.prg +++ b/harbour/contrib/hbqt/TQColorDialog.prg @@ -70,7 +70,6 @@ CREATE CLASS QColorDialog INHERIT QDialog METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QColorDialog_destroy( ::pPtr ) METHOD currentColor() INLINE Qt_QColorDialog_currentColor( ::pPtr ) METHOD open() INLINE Qt_QColorDialog_open( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQComboBox.prg b/harbour/contrib/hbqt/TQComboBox.prg index 0268e687b9..62cb76b9a0 100644 --- a/harbour/contrib/hbqt/TQComboBox.prg +++ b/harbour/contrib/hbqt/TQComboBox.prg @@ -70,7 +70,6 @@ CREATE CLASS QComboBox INHERIT QWidget METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QComboBox_destroy( ::pPtr ) METHOD addItem( cText, pUserData ) INLINE Qt_QComboBox_addItem( ::pPtr, cText, pUserData ) METHOD addItem_1( cIcon, cText, pUserData ) INLINE Qt_QComboBox_addItem_1( ::pPtr, cIcon, cText, pUserData ) diff --git a/harbour/contrib/hbqt/TQCommandLinkButton.prg b/harbour/contrib/hbqt/TQCommandLinkButton.prg index 03d911777f..dba050016b 100644 --- a/harbour/contrib/hbqt/TQCommandLinkButton.prg +++ b/harbour/contrib/hbqt/TQCommandLinkButton.prg @@ -70,7 +70,6 @@ CREATE CLASS QCommandLinkButton INHERIT QPushButton METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QCommandLinkButton_destroy( ::pPtr ) METHOD description() INLINE Qt_QCommandLinkButton_description( ::pPtr ) METHOD setDescription( cDescription ) INLINE Qt_QCommandLinkButton_setDescription( ::pPtr, cDescription ) diff --git a/harbour/contrib/hbqt/TQCommonStyle.prg b/harbour/contrib/hbqt/TQCommonStyle.prg index 5b8ccf17ab..98667b859e 100644 --- a/harbour/contrib/hbqt/TQCommonStyle.prg +++ b/harbour/contrib/hbqt/TQCommonStyle.prg @@ -70,7 +70,6 @@ CREATE CLASS QCommonStyle INHERIT QStyle METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QCommonStyle_destroy( ::pPtr ) ENDCLASS diff --git a/harbour/contrib/hbqt/TQConicalGradient.prg b/harbour/contrib/hbqt/TQConicalGradient.prg index 20d7bac5e6..c59d7a633a 100644 --- a/harbour/contrib/hbqt/TQConicalGradient.prg +++ b/harbour/contrib/hbqt/TQConicalGradient.prg @@ -70,7 +70,6 @@ CREATE CLASS QConicalGradient INHERIT QGradient METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QConicalGradient_destroy( ::pPtr ) METHOD angle() INLINE Qt_QConicalGradient_angle( ::pPtr ) METHOD center() INLINE Qt_QConicalGradient_center( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQCoreApplication.prg b/harbour/contrib/hbqt/TQCoreApplication.prg index ed1e087caa..128e6b209e 100644 --- a/harbour/contrib/hbqt/TQCoreApplication.prg +++ b/harbour/contrib/hbqt/TQCoreApplication.prg @@ -70,7 +70,6 @@ CREATE CLASS QCoreApplication INHERIT QObject METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QCoreApplication_destroy( ::pPtr ) METHOD notify( pReceiver, pEvent ) INLINE Qt_QCoreApplication_notify( ::pPtr, pReceiver, pEvent ) METHOD addLibraryPath( cPath ) INLINE Qt_QCoreApplication_addLibraryPath( ::pPtr, cPath ) diff --git a/harbour/contrib/hbqt/TQCursor.prg b/harbour/contrib/hbqt/TQCursor.prg index bf9a2502e8..06f270f5aa 100644 --- a/harbour/contrib/hbqt/TQCursor.prg +++ b/harbour/contrib/hbqt/TQCursor.prg @@ -70,7 +70,6 @@ CREATE CLASS QCursor METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QCursor_destroy( ::pPtr ) METHOD bitmap() INLINE Qt_QCursor_bitmap( ::pPtr ) METHOD hotSpot() INLINE Qt_QCursor_hotSpot( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQDateEdit.prg b/harbour/contrib/hbqt/TQDateEdit.prg index 1c3ea59e7a..043926354b 100644 --- a/harbour/contrib/hbqt/TQDateEdit.prg +++ b/harbour/contrib/hbqt/TQDateEdit.prg @@ -70,7 +70,6 @@ CREATE CLASS QDateEdit INHERIT QDateTimeEdit METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QDateEdit_destroy( ::pPtr ) ENDCLASS diff --git a/harbour/contrib/hbqt/TQDateTime.prg b/harbour/contrib/hbqt/TQDateTime.prg index 0109c6220b..fa62abcc42 100644 --- a/harbour/contrib/hbqt/TQDateTime.prg +++ b/harbour/contrib/hbqt/TQDateTime.prg @@ -70,7 +70,6 @@ CREATE CLASS QDateTime METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QDateTime_destroy( ::pPtr ) METHOD addDays( nNdays ) INLINE Qt_QDateTime_addDays( ::pPtr, nNdays ) METHOD addMSecs( nMsecs ) INLINE Qt_QDateTime_addMSecs( ::pPtr, nMsecs ) diff --git a/harbour/contrib/hbqt/TQDateTimeEdit.prg b/harbour/contrib/hbqt/TQDateTimeEdit.prg index 9a2e22448f..b5acf82e73 100644 --- a/harbour/contrib/hbqt/TQDateTimeEdit.prg +++ b/harbour/contrib/hbqt/TQDateTimeEdit.prg @@ -70,7 +70,6 @@ CREATE CLASS QDateTimeEdit INHERIT QAbstractSpinBox METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QDateTimeEdit_destroy( ::pPtr ) METHOD calendarPopup() INLINE Qt_QDateTimeEdit_calendarPopup( ::pPtr ) METHOD calendarWidget() INLINE Qt_QDateTimeEdit_calendarWidget( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQDesktopWidget.prg b/harbour/contrib/hbqt/TQDesktopWidget.prg index 88908b613f..d4179bead2 100644 --- a/harbour/contrib/hbqt/TQDesktopWidget.prg +++ b/harbour/contrib/hbqt/TQDesktopWidget.prg @@ -70,7 +70,6 @@ CREATE CLASS QDesktopWidget INHERIT QWidget METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QDesktopWidget_destroy( ::pPtr ) METHOD availableGeometry( nScreen ) INLINE Qt_QDesktopWidget_availableGeometry( ::pPtr, nScreen ) METHOD availableGeometry_1( pWidget ) INLINE Qt_QDesktopWidget_availableGeometry_1( ::pPtr, pWidget ) diff --git a/harbour/contrib/hbqt/TQDial.prg b/harbour/contrib/hbqt/TQDial.prg index 184898ee0e..a5e6a5cf76 100644 --- a/harbour/contrib/hbqt/TQDial.prg +++ b/harbour/contrib/hbqt/TQDial.prg @@ -70,7 +70,6 @@ CREATE CLASS QDial INHERIT QAbstractSlider METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QDial_destroy( ::pPtr ) METHOD notchSize() INLINE Qt_QDial_notchSize( ::pPtr ) METHOD notchTarget() INLINE Qt_QDial_notchTarget( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQDialog.prg b/harbour/contrib/hbqt/TQDialog.prg index 5e4a933170..c3c14cbf3f 100644 --- a/harbour/contrib/hbqt/TQDialog.prg +++ b/harbour/contrib/hbqt/TQDialog.prg @@ -70,7 +70,6 @@ CREATE CLASS QDialog INHERIT QWidget METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QDialog_destroy( ::pPtr ) METHOD isSizeGripEnabled() INLINE Qt_QDialog_isSizeGripEnabled( ::pPtr ) METHOD result() INLINE Qt_QDialog_result( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQDir.prg b/harbour/contrib/hbqt/TQDir.prg index 8b91e6be81..bd5eb8bdf7 100644 --- a/harbour/contrib/hbqt/TQDir.prg +++ b/harbour/contrib/hbqt/TQDir.prg @@ -70,7 +70,6 @@ CREATE CLASS QDir METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QDir_destroy( ::pPtr ) METHOD absoluteFilePath( cFileName ) INLINE Qt_QDir_absoluteFilePath( ::pPtr, cFileName ) METHOD absolutePath() INLINE Qt_QDir_absolutePath( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQDirModel.prg b/harbour/contrib/hbqt/TQDirModel.prg index b2e3d07040..22ccb3238e 100644 --- a/harbour/contrib/hbqt/TQDirModel.prg +++ b/harbour/contrib/hbqt/TQDirModel.prg @@ -70,7 +70,6 @@ CREATE CLASS QDirModel INHERIT QAbstractItemModel METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QDirModel_destroy( ::pPtr ) METHOD columnCount( pParent ) INLINE Qt_QDirModel_columnCount( ::pPtr, pParent ) METHOD data( pIndex, nRole ) INLINE Qt_QDirModel_data( ::pPtr, pIndex, nRole ) diff --git a/harbour/contrib/hbqt/TQDockWidget.prg b/harbour/contrib/hbqt/TQDockWidget.prg index b7a4950d42..13f096ac3f 100644 --- a/harbour/contrib/hbqt/TQDockWidget.prg +++ b/harbour/contrib/hbqt/TQDockWidget.prg @@ -70,7 +70,6 @@ CREATE CLASS QDockWidget INHERIT QWidget METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QDockWidget_destroy( ::pPtr ) METHOD allowedAreas() INLINE Qt_QDockWidget_allowedAreas( ::pPtr ) METHOD features() INLINE Qt_QDockWidget_features( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQDoubleSpinBox.prg b/harbour/contrib/hbqt/TQDoubleSpinBox.prg index bc5fe40ccc..cc4713903c 100644 --- a/harbour/contrib/hbqt/TQDoubleSpinBox.prg +++ b/harbour/contrib/hbqt/TQDoubleSpinBox.prg @@ -70,7 +70,6 @@ CREATE CLASS QDoubleSpinBox INHERIT QAbstractSpinBox METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QDoubleSpinBox_destroy( ::pPtr ) METHOD cleanText() INLINE Qt_QDoubleSpinBox_cleanText( ::pPtr ) METHOD decimals() INLINE Qt_QDoubleSpinBox_decimals( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQDragEnterEvent.prg b/harbour/contrib/hbqt/TQDragEnterEvent.prg index 7da79152cf..97fc10210d 100644 --- a/harbour/contrib/hbqt/TQDragEnterEvent.prg +++ b/harbour/contrib/hbqt/TQDragEnterEvent.prg @@ -70,7 +70,6 @@ CREATE CLASS QDragEnterEvent INHERIT QDragMoveEvent METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QDragEnterEvent_destroy( ::pPtr ) ENDCLASS diff --git a/harbour/contrib/hbqt/TQDragLeaveEvent.prg b/harbour/contrib/hbqt/TQDragLeaveEvent.prg index 06adba39b6..d732e1ca64 100644 --- a/harbour/contrib/hbqt/TQDragLeaveEvent.prg +++ b/harbour/contrib/hbqt/TQDragLeaveEvent.prg @@ -70,7 +70,6 @@ CREATE CLASS QDragLeaveEvent INHERIT QEvent METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QDragLeaveEvent_destroy( ::pPtr ) ENDCLASS diff --git a/harbour/contrib/hbqt/TQDragMoveEvent.prg b/harbour/contrib/hbqt/TQDragMoveEvent.prg index 1977c24591..2165827c31 100644 --- a/harbour/contrib/hbqt/TQDragMoveEvent.prg +++ b/harbour/contrib/hbqt/TQDragMoveEvent.prg @@ -70,7 +70,6 @@ CREATE CLASS QDragMoveEvent INHERIT QDropEvent METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QDragMoveEvent_destroy( ::pPtr ) METHOD accept( pRectangle ) INLINE Qt_QDragMoveEvent_accept( ::pPtr, pRectangle ) METHOD accept_1() INLINE Qt_QDragMoveEvent_accept_1( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQDropEvent.prg b/harbour/contrib/hbqt/TQDropEvent.prg index fb59ecea78..83f83bef61 100644 --- a/harbour/contrib/hbqt/TQDropEvent.prg +++ b/harbour/contrib/hbqt/TQDropEvent.prg @@ -70,7 +70,6 @@ CREATE CLASS QDropEvent INHERIT QEvent METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QDropEvent_destroy( ::pPtr ) METHOD acceptProposedAction() INLINE Qt_QDropEvent_acceptProposedAction( ::pPtr ) METHOD dropAction() INLINE Qt_QDropEvent_dropAction( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQErrorMessage.prg b/harbour/contrib/hbqt/TQErrorMessage.prg index 7206b94940..c334289dff 100644 --- a/harbour/contrib/hbqt/TQErrorMessage.prg +++ b/harbour/contrib/hbqt/TQErrorMessage.prg @@ -70,7 +70,6 @@ CREATE CLASS QErrorMessage INHERIT QDialog METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QErrorMessage_destroy( ::pPtr ) METHOD showMessage( cMessage, cType ) INLINE Qt_QErrorMessage_showMessage( ::pPtr, cMessage, cType ) diff --git a/harbour/contrib/hbqt/TQEvent.prg b/harbour/contrib/hbqt/TQEvent.prg index fabda73f9f..a8563a9176 100644 --- a/harbour/contrib/hbqt/TQEvent.prg +++ b/harbour/contrib/hbqt/TQEvent.prg @@ -70,7 +70,6 @@ CREATE CLASS QEvent METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QEvent_destroy( ::pPtr ) METHOD accept() INLINE Qt_QEvent_accept( ::pPtr ) METHOD ignore() INLINE Qt_QEvent_ignore( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQEventLoop.prg b/harbour/contrib/hbqt/TQEventLoop.prg index bb70facb44..5fd648a689 100644 --- a/harbour/contrib/hbqt/TQEventLoop.prg +++ b/harbour/contrib/hbqt/TQEventLoop.prg @@ -70,7 +70,6 @@ CREATE CLASS QEventLoop INHERIT QObject METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QEventLoop_destroy( ::pPtr ) METHOD exec( nFlags ) INLINE Qt_QEventLoop_exec( ::pPtr, nFlags ) METHOD exit( nReturnCode ) INLINE Qt_QEventLoop_exit( ::pPtr, nReturnCode ) diff --git a/harbour/contrib/hbqt/TQFileDialog.prg b/harbour/contrib/hbqt/TQFileDialog.prg index 5d822b27bc..e5c8835da1 100644 --- a/harbour/contrib/hbqt/TQFileDialog.prg +++ b/harbour/contrib/hbqt/TQFileDialog.prg @@ -70,7 +70,6 @@ CREATE CLASS QFileDialog INHERIT QDialog METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QFileDialog_destroy( ::pPtr ) METHOD acceptMode() INLINE Qt_QFileDialog_acceptMode( ::pPtr ) METHOD confirmOverwrite() INLINE Qt_QFileDialog_confirmOverwrite( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQFileSystemModel.prg b/harbour/contrib/hbqt/TQFileSystemModel.prg index cebb32dff4..1a7c652eec 100644 --- a/harbour/contrib/hbqt/TQFileSystemModel.prg +++ b/harbour/contrib/hbqt/TQFileSystemModel.prg @@ -70,7 +70,6 @@ CREATE CLASS QFileSystemModel INHERIT QAbstractItemModel METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QFileSystemModel_destroy( ::pPtr ) METHOD dropMimeData( pData, nAction, nRow, nColumn, pParent ) INLINE Qt_QFileSystemModel_dropMimeData( ::pPtr, pData, nAction, nRow, nColumn, pParent ) METHOD fileIcon( pIndex ) INLINE Qt_QFileSystemModel_fileIcon( ::pPtr, pIndex ) diff --git a/harbour/contrib/hbqt/TQFocusEvent.prg b/harbour/contrib/hbqt/TQFocusEvent.prg index e211367985..aad3a52560 100644 --- a/harbour/contrib/hbqt/TQFocusEvent.prg +++ b/harbour/contrib/hbqt/TQFocusEvent.prg @@ -70,7 +70,6 @@ CREATE CLASS QFocusEvent INHERIT QEvent METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QFocusEvent_destroy( ::pPtr ) METHOD gotFocus() INLINE Qt_QFocusEvent_gotFocus( ::pPtr ) METHOD lostFocus() INLINE Qt_QFocusEvent_lostFocus( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQFocusFrame.prg b/harbour/contrib/hbqt/TQFocusFrame.prg index 0114043ca8..080814de3e 100644 --- a/harbour/contrib/hbqt/TQFocusFrame.prg +++ b/harbour/contrib/hbqt/TQFocusFrame.prg @@ -70,7 +70,6 @@ CREATE CLASS QFocusFrame INHERIT QWidget METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QFocusFrame_destroy( ::pPtr ) METHOD setWidget( pWidget ) INLINE Qt_QFocusFrame_setWidget( ::pPtr, pWidget ) METHOD widget() INLINE Qt_QFocusFrame_widget( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQFont.prg b/harbour/contrib/hbqt/TQFont.prg index f69bfc3629..3d092761a5 100644 --- a/harbour/contrib/hbqt/TQFont.prg +++ b/harbour/contrib/hbqt/TQFont.prg @@ -70,7 +70,6 @@ CREATE CLASS QFont METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QFont_destroy( ::pPtr ) METHOD bold() INLINE Qt_QFont_bold( ::pPtr ) METHOD capitalization() INLINE Qt_QFont_capitalization( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQFontComboBox.prg b/harbour/contrib/hbqt/TQFontComboBox.prg index 7a59a2037f..b4a69cc201 100644 --- a/harbour/contrib/hbqt/TQFontComboBox.prg +++ b/harbour/contrib/hbqt/TQFontComboBox.prg @@ -70,7 +70,6 @@ CREATE CLASS QFontComboBox INHERIT QComboBox METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QFontComboBox_destroy( ::pPtr ) METHOD currentFont() INLINE Qt_QFontComboBox_currentFont( ::pPtr ) METHOD fontFilters() INLINE Qt_QFontComboBox_fontFilters( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQFontDatabase.prg b/harbour/contrib/hbqt/TQFontDatabase.prg index fc5326bd97..b9b8606503 100644 --- a/harbour/contrib/hbqt/TQFontDatabase.prg +++ b/harbour/contrib/hbqt/TQFontDatabase.prg @@ -70,7 +70,6 @@ CREATE CLASS QFontDatabase METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QFontDatabase_destroy( ::pPtr ) METHOD bold( cFamily, cStyle ) INLINE Qt_QFontDatabase_bold( ::pPtr, cFamily, cStyle ) METHOD families( nWritingSystem ) INLINE Qt_QFontDatabase_families( ::pPtr, nWritingSystem ) diff --git a/harbour/contrib/hbqt/TQFontDialog.prg b/harbour/contrib/hbqt/TQFontDialog.prg index 17684e12d6..3c1b3b2c7b 100644 --- a/harbour/contrib/hbqt/TQFontDialog.prg +++ b/harbour/contrib/hbqt/TQFontDialog.prg @@ -70,7 +70,6 @@ CREATE CLASS QFontDialog INHERIT QDialog METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QFontDialog_destroy( ::pPtr ) METHOD currentFont() INLINE Qt_QFontDialog_currentFont( ::pPtr ) METHOD options() INLINE Qt_QFontDialog_options( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQFontInfo.prg b/harbour/contrib/hbqt/TQFontInfo.prg index 0275f4d7fb..56f583be31 100644 --- a/harbour/contrib/hbqt/TQFontInfo.prg +++ b/harbour/contrib/hbqt/TQFontInfo.prg @@ -70,7 +70,6 @@ CREATE CLASS QFontInfo METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QFontInfo_destroy( ::pPtr ) METHOD bold() INLINE Qt_QFontInfo_bold( ::pPtr ) METHOD exactMatch() INLINE Qt_QFontInfo_exactMatch( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQFontMetrics.prg b/harbour/contrib/hbqt/TQFontMetrics.prg index 5fd9f23db0..cc20c53d9d 100644 --- a/harbour/contrib/hbqt/TQFontMetrics.prg +++ b/harbour/contrib/hbqt/TQFontMetrics.prg @@ -70,7 +70,6 @@ CREATE CLASS QFontMetrics METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QFontMetrics_destroy( ::pPtr ) METHOD ascent() INLINE Qt_QFontMetrics_ascent( ::pPtr ) METHOD averageCharWidth() INLINE Qt_QFontMetrics_averageCharWidth( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQFontMetricsF.prg b/harbour/contrib/hbqt/TQFontMetricsF.prg index 8517530109..295a3dca34 100644 --- a/harbour/contrib/hbqt/TQFontMetricsF.prg +++ b/harbour/contrib/hbqt/TQFontMetricsF.prg @@ -70,7 +70,6 @@ CREATE CLASS QFontMetricsF METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QFontMetricsF_destroy( ::pPtr ) METHOD ascent() INLINE Qt_QFontMetricsF_ascent( ::pPtr ) METHOD averageCharWidth() INLINE Qt_QFontMetricsF_averageCharWidth( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQFormLayout.prg b/harbour/contrib/hbqt/TQFormLayout.prg index f592fb1797..60fd384f3c 100644 --- a/harbour/contrib/hbqt/TQFormLayout.prg +++ b/harbour/contrib/hbqt/TQFormLayout.prg @@ -70,7 +70,6 @@ CREATE CLASS QFormLayout INHERIT QLayout METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QFormLayout_destroy( ::pPtr ) METHOD addRow( pLabel, pField ) INLINE Qt_QFormLayout_addRow( ::pPtr, pLabel, pField ) METHOD addRow_1( pLabel, pField ) INLINE Qt_QFormLayout_addRow_1( ::pPtr, pLabel, pField ) diff --git a/harbour/contrib/hbqt/TQFrame.prg b/harbour/contrib/hbqt/TQFrame.prg index 1428e3d9fe..5842caf710 100644 --- a/harbour/contrib/hbqt/TQFrame.prg +++ b/harbour/contrib/hbqt/TQFrame.prg @@ -70,7 +70,6 @@ CREATE CLASS QFrame INHERIT QWidget METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QFrame_destroy( ::pPtr ) METHOD frameRect() INLINE Qt_QFrame_frameRect( ::pPtr ) METHOD frameShadow() INLINE Qt_QFrame_frameShadow( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQFtp.prg b/harbour/contrib/hbqt/TQFtp.prg index 5639144f9e..cd4a2f5bdb 100644 --- a/harbour/contrib/hbqt/TQFtp.prg +++ b/harbour/contrib/hbqt/TQFtp.prg @@ -70,7 +70,6 @@ CREATE CLASS QFtp INHERIT QObject METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QFtp_destroy( ::pPtr ) METHOD bytesAvailable() INLINE Qt_QFtp_bytesAvailable( ::pPtr ) METHOD cd( cDir ) INLINE Qt_QFtp_cd( ::pPtr, cDir ) diff --git a/harbour/contrib/hbqt/TQGradient.prg b/harbour/contrib/hbqt/TQGradient.prg index 6366c235aa..8e97718ec7 100644 --- a/harbour/contrib/hbqt/TQGradient.prg +++ b/harbour/contrib/hbqt/TQGradient.prg @@ -70,7 +70,6 @@ CREATE CLASS QGradient METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QGradient_destroy( ::pPtr ) METHOD coordinateMode() INLINE Qt_QGradient_coordinateMode( ::pPtr ) METHOD setColorAt( nPosition, pColor ) INLINE Qt_QGradient_setColorAt( ::pPtr, nPosition, pColor ) diff --git a/harbour/contrib/hbqt/TQGridLayout.prg b/harbour/contrib/hbqt/TQGridLayout.prg index bd0fcab690..e75cac7e52 100644 --- a/harbour/contrib/hbqt/TQGridLayout.prg +++ b/harbour/contrib/hbqt/TQGridLayout.prg @@ -70,7 +70,6 @@ CREATE CLASS QGridLayout INHERIT QLayout METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QGridLayout_destroy( ::pPtr ) METHOD addItem( pItem, nRow, nColumn, nRowSpan, nColumnSpan, nAlignment ) INLINE Qt_QGridLayout_addItem( ::pPtr, pItem, nRow, nColumn, nRowSpan, nColumnSpan, nAlignment ) METHOD addLayout( pLayout, nRow, nColumn, nAlignment ) INLINE Qt_QGridLayout_addLayout( ::pPtr, pLayout, nRow, nColumn, nAlignment ) diff --git a/harbour/contrib/hbqt/TQGroupBox.prg b/harbour/contrib/hbqt/TQGroupBox.prg index 6fd944dbba..33bb49a6d1 100644 --- a/harbour/contrib/hbqt/TQGroupBox.prg +++ b/harbour/contrib/hbqt/TQGroupBox.prg @@ -70,7 +70,6 @@ CREATE CLASS QGroupBox INHERIT QWidget METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QGroupBox_destroy( ::pPtr ) METHOD alignment() INLINE Qt_QGroupBox_alignment( ::pPtr ) METHOD isCheckable() INLINE Qt_QGroupBox_isCheckable( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQHBoxLayout.prg b/harbour/contrib/hbqt/TQHBoxLayout.prg index b58795e301..2f08296b0a 100644 --- a/harbour/contrib/hbqt/TQHBoxLayout.prg +++ b/harbour/contrib/hbqt/TQHBoxLayout.prg @@ -70,7 +70,6 @@ CREATE CLASS QHBoxLayout INHERIT QBoxLayout METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QHBoxLayout_destroy( ::pPtr ) ENDCLASS diff --git a/harbour/contrib/hbqt/TQHeaderView.prg b/harbour/contrib/hbqt/TQHeaderView.prg index 256c996953..8e5c4c298c 100644 --- a/harbour/contrib/hbqt/TQHeaderView.prg +++ b/harbour/contrib/hbqt/TQHeaderView.prg @@ -70,7 +70,6 @@ CREATE CLASS QHeaderView INHERIT QAbstractItemView METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QHeaderView_destroy( ::pPtr ) METHOD cascadingSectionResizes() INLINE Qt_QHeaderView_cascadingSectionResizes( ::pPtr ) METHOD count() INLINE Qt_QHeaderView_count( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQHttp.prg b/harbour/contrib/hbqt/TQHttp.prg index f32a849d6f..959b0c338d 100644 --- a/harbour/contrib/hbqt/TQHttp.prg +++ b/harbour/contrib/hbqt/TQHttp.prg @@ -70,7 +70,6 @@ CREATE CLASS QHttp INHERIT QObject METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QHttp_destroy( ::pPtr ) METHOD bytesAvailable() INLINE Qt_QHttp_bytesAvailable( ::pPtr ) METHOD clearPendingRequests() INLINE Qt_QHttp_clearPendingRequests( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQIODevice.prg b/harbour/contrib/hbqt/TQIODevice.prg index a72e5155de..c4859ed331 100644 --- a/harbour/contrib/hbqt/TQIODevice.prg +++ b/harbour/contrib/hbqt/TQIODevice.prg @@ -70,7 +70,6 @@ CREATE CLASS QIODevice INHERIT QObject METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QIODevice_destroy( ::pPtr ) METHOD atEnd() INLINE Qt_QIODevice_atEnd( ::pPtr ) METHOD bytesAvailable() INLINE Qt_QIODevice_bytesAvailable( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQIcon.prg b/harbour/contrib/hbqt/TQIcon.prg index 5bf6312402..7943c69c47 100644 --- a/harbour/contrib/hbqt/TQIcon.prg +++ b/harbour/contrib/hbqt/TQIcon.prg @@ -70,7 +70,6 @@ CREATE CLASS QIcon METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QIcon_destroy( ::pPtr ) METHOD actualSize( pSize, nMode, nState ) INLINE Qt_QIcon_actualSize( ::pPtr, pSize, nMode, nState ) METHOD addFile( cFileName, pSize, nMode, nState ) INLINE Qt_QIcon_addFile( ::pPtr, cFileName, pSize, nMode, nState ) diff --git a/harbour/contrib/hbqt/TQImage.prg b/harbour/contrib/hbqt/TQImage.prg index 65478127d9..bbf75a7211 100644 --- a/harbour/contrib/hbqt/TQImage.prg +++ b/harbour/contrib/hbqt/TQImage.prg @@ -70,7 +70,6 @@ CREATE CLASS QImage METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QImage_destroy( ::pPtr ) METHOD allGray() INLINE Qt_QImage_allGray( ::pPtr ) METHOD alphaChannel() INLINE Qt_QImage_alphaChannel( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQImageReader.prg b/harbour/contrib/hbqt/TQImageReader.prg index 7c381f564d..5bf3503ca4 100644 --- a/harbour/contrib/hbqt/TQImageReader.prg +++ b/harbour/contrib/hbqt/TQImageReader.prg @@ -70,7 +70,6 @@ CREATE CLASS QImageReader METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QImageReader_destroy( ::pPtr ) METHOD autoDetectImageFormat() INLINE Qt_QImageReader_autoDetectImageFormat( ::pPtr ) METHOD backgroundColor() INLINE Qt_QImageReader_backgroundColor( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQImageWriter.prg b/harbour/contrib/hbqt/TQImageWriter.prg index 00da127923..19f1458900 100644 --- a/harbour/contrib/hbqt/TQImageWriter.prg +++ b/harbour/contrib/hbqt/TQImageWriter.prg @@ -70,7 +70,6 @@ CREATE CLASS QImageWriter METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QImageWriter_destroy( ::pPtr ) METHOD canWrite() INLINE Qt_QImageWriter_canWrite( ::pPtr ) METHOD compression() INLINE Qt_QImageWriter_compression( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQInputDialog.prg b/harbour/contrib/hbqt/TQInputDialog.prg index 4f65853ca7..0f36628929 100644 --- a/harbour/contrib/hbqt/TQInputDialog.prg +++ b/harbour/contrib/hbqt/TQInputDialog.prg @@ -70,7 +70,6 @@ CREATE CLASS QInputDialog INHERIT QDialog METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QInputDialog_destroy( ::pPtr ) METHOD cancelButtonText() INLINE Qt_QInputDialog_cancelButtonText( ::pPtr ) METHOD comboBoxItems() INLINE Qt_QInputDialog_comboBoxItems( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQInputEvent.prg b/harbour/contrib/hbqt/TQInputEvent.prg index 58c6077526..e976cd6d98 100644 --- a/harbour/contrib/hbqt/TQInputEvent.prg +++ b/harbour/contrib/hbqt/TQInputEvent.prg @@ -70,7 +70,6 @@ CREATE CLASS QInputEvent INHERIT QEvent METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QInputEvent_destroy( ::pPtr ) METHOD modifiers() INLINE Qt_QInputEvent_modifiers( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQKeyEvent.prg b/harbour/contrib/hbqt/TQKeyEvent.prg index 38f746348b..51c87a1564 100644 --- a/harbour/contrib/hbqt/TQKeyEvent.prg +++ b/harbour/contrib/hbqt/TQKeyEvent.prg @@ -70,7 +70,6 @@ CREATE CLASS QKeyEvent INHERIT QInputEvent METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QKeyEvent_destroy( ::pPtr ) METHOD count() INLINE Qt_QKeyEvent_count( ::pPtr ) METHOD isAutoRepeat() INLINE Qt_QKeyEvent_isAutoRepeat( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQKeySequence.prg b/harbour/contrib/hbqt/TQKeySequence.prg index 03171b543f..c838c5b9c0 100644 --- a/harbour/contrib/hbqt/TQKeySequence.prg +++ b/harbour/contrib/hbqt/TQKeySequence.prg @@ -70,7 +70,6 @@ CREATE CLASS QKeySequence METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QKeySequence_destroy( ::pPtr ) METHOD count() INLINE Qt_QKeySequence_count( ::pPtr ) METHOD isEmpty() INLINE Qt_QKeySequence_isEmpty( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQLCDNumber.prg b/harbour/contrib/hbqt/TQLCDNumber.prg index 9bd57aeae3..e427a83c85 100644 --- a/harbour/contrib/hbqt/TQLCDNumber.prg +++ b/harbour/contrib/hbqt/TQLCDNumber.prg @@ -70,7 +70,6 @@ CREATE CLASS QLCDNumber INHERIT QFrame METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QLCDNumber_destroy( ::pPtr ) METHOD checkOverflow( nNum ) INLINE Qt_QLCDNumber_checkOverflow( ::pPtr, nNum ) METHOD checkOverflow_1( nNum ) INLINE Qt_QLCDNumber_checkOverflow_1( ::pPtr, nNum ) diff --git a/harbour/contrib/hbqt/TQLabel.prg b/harbour/contrib/hbqt/TQLabel.prg index ac93dca7dd..4cc2aceb01 100644 --- a/harbour/contrib/hbqt/TQLabel.prg +++ b/harbour/contrib/hbqt/TQLabel.prg @@ -70,7 +70,6 @@ CREATE CLASS QLabel INHERIT QFrame METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QLabel_destroy( ::pPtr ) METHOD alignment() INLINE Qt_QLabel_alignment( ::pPtr ) METHOD buddy() INLINE Qt_QLabel_buddy( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQLatin1Char.prg b/harbour/contrib/hbqt/TQLatin1Char.prg index 79a498b725..5a1750f04c 100644 --- a/harbour/contrib/hbqt/TQLatin1Char.prg +++ b/harbour/contrib/hbqt/TQLatin1Char.prg @@ -70,7 +70,6 @@ CREATE CLASS QLatin1Char METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QLatin1Char_destroy( ::pPtr ) METHOD toLatin1() INLINE Qt_QLatin1Char_toLatin1( ::pPtr ) METHOD unicode() INLINE Qt_QLatin1Char_unicode( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQLatin1String.prg b/harbour/contrib/hbqt/TQLatin1String.prg index c28d21bf32..dc2f6f9062 100644 --- a/harbour/contrib/hbqt/TQLatin1String.prg +++ b/harbour/contrib/hbqt/TQLatin1String.prg @@ -70,7 +70,6 @@ CREATE CLASS QLatin1String METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QLatin1String_destroy( ::pPtr ) METHOD latin1() INLINE Qt_QLatin1String_latin1( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQLayout.prg b/harbour/contrib/hbqt/TQLayout.prg index 2f00279f83..d505d9f254 100644 --- a/harbour/contrib/hbqt/TQLayout.prg +++ b/harbour/contrib/hbqt/TQLayout.prg @@ -70,7 +70,6 @@ CREATE CLASS QLayout INHERIT QObject, QLayoutItem METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QLayout_destroy( ::pPtr ) METHOD activate() INLINE Qt_QLayout_activate( ::pPtr ) METHOD addItem( pItem ) INLINE Qt_QLayout_addItem( ::pPtr, pItem ) diff --git a/harbour/contrib/hbqt/TQLayoutItem.prg b/harbour/contrib/hbqt/TQLayoutItem.prg index 35475dddd9..800d6106cd 100644 --- a/harbour/contrib/hbqt/TQLayoutItem.prg +++ b/harbour/contrib/hbqt/TQLayoutItem.prg @@ -70,7 +70,6 @@ CREATE CLASS QLayoutItem METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QLayoutItem_destroy( ::pPtr ) METHOD alignment() INLINE Qt_QLayoutItem_alignment( ::pPtr ) METHOD controlTypes() INLINE Qt_QLayoutItem_controlTypes( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQLine.prg b/harbour/contrib/hbqt/TQLine.prg index 0a612451f2..8ba63857cd 100644 --- a/harbour/contrib/hbqt/TQLine.prg +++ b/harbour/contrib/hbqt/TQLine.prg @@ -70,7 +70,6 @@ CREATE CLASS QLine METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QLine_destroy( ::pPtr ) METHOD p1() INLINE Qt_QLine_p1( ::pPtr ) METHOD p2() INLINE Qt_QLine_p2( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQLineEdit.prg b/harbour/contrib/hbqt/TQLineEdit.prg index e825212bdf..4cc0033548 100644 --- a/harbour/contrib/hbqt/TQLineEdit.prg +++ b/harbour/contrib/hbqt/TQLineEdit.prg @@ -70,7 +70,6 @@ CREATE CLASS QLineEdit INHERIT QWidget METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QLineEdit_destroy( ::pPtr ) METHOD alignment() INLINE Qt_QLineEdit_alignment( ::pPtr ) METHOD backspace() INLINE Qt_QLineEdit_backspace( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQLinearGradient.prg b/harbour/contrib/hbqt/TQLinearGradient.prg index 7027a0a3f8..d989aad4e1 100644 --- a/harbour/contrib/hbqt/TQLinearGradient.prg +++ b/harbour/contrib/hbqt/TQLinearGradient.prg @@ -70,7 +70,6 @@ CREATE CLASS QLinearGradient INHERIT QGradient METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QLinearGradient_destroy( ::pPtr ) METHOD finalStop() INLINE Qt_QLinearGradient_finalStop( ::pPtr ) METHOD setFinalStop( pStop ) INLINE Qt_QLinearGradient_setFinalStop( ::pPtr, pStop ) diff --git a/harbour/contrib/hbqt/TQList.prg b/harbour/contrib/hbqt/TQList.prg index 9bed627e57..a763591d2d 100644 --- a/harbour/contrib/hbqt/TQList.prg +++ b/harbour/contrib/hbqt/TQList.prg @@ -70,7 +70,6 @@ CREATE CLASS QList METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QList_destroy( ::pPtr ) METHOD append( xValue ) INLINE Qt_QList_append( ::pPtr, xValue ) METHOD at( nI ) INLINE Qt_QList_at( ::pPtr, nI ) diff --git a/harbour/contrib/hbqt/TQListView.prg b/harbour/contrib/hbqt/TQListView.prg index 0e1ee1f7af..2bc910a00c 100644 --- a/harbour/contrib/hbqt/TQListView.prg +++ b/harbour/contrib/hbqt/TQListView.prg @@ -70,7 +70,6 @@ CREATE CLASS QListView INHERIT QAbstractItemView METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QListView_destroy( ::pPtr ) METHOD batchSize() INLINE Qt_QListView_batchSize( ::pPtr ) METHOD clearPropertyFlags() INLINE Qt_QListView_clearPropertyFlags( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQListWidget.prg b/harbour/contrib/hbqt/TQListWidget.prg index cfb3b03dc5..a8a8d3d836 100644 --- a/harbour/contrib/hbqt/TQListWidget.prg +++ b/harbour/contrib/hbqt/TQListWidget.prg @@ -70,7 +70,6 @@ CREATE CLASS QListWidget INHERIT QListView METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QListWidget_destroy( ::pPtr ) METHOD addItem( cLabel ) INLINE Qt_QListWidget_addItem( ::pPtr, cLabel ) METHOD addItem_1( pItem ) INLINE Qt_QListWidget_addItem_1( ::pPtr, pItem ) diff --git a/harbour/contrib/hbqt/TQListWidgetItem.prg b/harbour/contrib/hbqt/TQListWidgetItem.prg index a50174c839..7a424ec7c4 100644 --- a/harbour/contrib/hbqt/TQListWidgetItem.prg +++ b/harbour/contrib/hbqt/TQListWidgetItem.prg @@ -70,7 +70,6 @@ CREATE CLASS QListWidgetItem INHERIT QWidget METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QListWidgetItem_destroy( ::pPtr ) METHOD background() INLINE Qt_QListWidgetItem_background( ::pPtr ) METHOD checkState() INLINE Qt_QListWidgetItem_checkState( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQMainWindow.prg b/harbour/contrib/hbqt/TQMainWindow.prg index 07d126d9a2..6c31093777 100644 --- a/harbour/contrib/hbqt/TQMainWindow.prg +++ b/harbour/contrib/hbqt/TQMainWindow.prg @@ -70,7 +70,6 @@ CREATE CLASS QMainWindow INHERIT QWidget METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QMainWindow_destroy( ::pPtr ) METHOD addDockWidget( nArea, pDockwidget ) INLINE Qt_QMainWindow_addDockWidget( ::pPtr, nArea, pDockwidget ) METHOD addDockWidget_1( nArea, pDockwidget, nOrientation ) INLINE Qt_QMainWindow_addDockWidget_1( ::pPtr, nArea, pDockwidget, nOrientation ) diff --git a/harbour/contrib/hbqt/TQMenu.prg b/harbour/contrib/hbqt/TQMenu.prg index fee119652b..6753c9c906 100644 --- a/harbour/contrib/hbqt/TQMenu.prg +++ b/harbour/contrib/hbqt/TQMenu.prg @@ -70,7 +70,6 @@ CREATE CLASS QMenu INHERIT QWidget METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QMenu_destroy( ::pPtr ) METHOD actionAt( pPt ) INLINE Qt_QMenu_actionAt( ::pPtr, pPt ) METHOD actionGeometry( pAct ) INLINE Qt_QMenu_actionGeometry( ::pPtr, pAct ) diff --git a/harbour/contrib/hbqt/TQMenuBar.prg b/harbour/contrib/hbqt/TQMenuBar.prg index 035d463391..93f0f229c2 100644 --- a/harbour/contrib/hbqt/TQMenuBar.prg +++ b/harbour/contrib/hbqt/TQMenuBar.prg @@ -70,7 +70,6 @@ CREATE CLASS QMenuBar INHERIT QWidget METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QMenuBar_destroy( ::pPtr ) METHOD activeAction() INLINE Qt_QMenuBar_activeAction( ::pPtr ) METHOD addAction( cText ) INLINE Qt_QMenuBar_addAction( ::pPtr, cText ) diff --git a/harbour/contrib/hbqt/TQMessageBox.prg b/harbour/contrib/hbqt/TQMessageBox.prg index a5d3b1d161..3b53d42712 100644 --- a/harbour/contrib/hbqt/TQMessageBox.prg +++ b/harbour/contrib/hbqt/TQMessageBox.prg @@ -70,7 +70,6 @@ CREATE CLASS QMessageBox INHERIT QDialog METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QMessageBox_destroy( ::pPtr ) METHOD addButton( pButton, nRole ) INLINE Qt_QMessageBox_addButton( ::pPtr, pButton, nRole ) METHOD addButton_1( cText, nRole ) INLINE Qt_QMessageBox_addButton_1( ::pPtr, cText, nRole ) diff --git a/harbour/contrib/hbqt/TQModelIndex.prg b/harbour/contrib/hbqt/TQModelIndex.prg index cb4c2f7bb7..11fdaef8a4 100644 --- a/harbour/contrib/hbqt/TQModelIndex.prg +++ b/harbour/contrib/hbqt/TQModelIndex.prg @@ -70,7 +70,6 @@ CREATE CLASS QModelIndex METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QModelIndex_destroy( ::pPtr ) METHOD child( nRow, nColumn ) INLINE Qt_QModelIndex_child( ::pPtr, nRow, nColumn ) METHOD column() INLINE Qt_QModelIndex_column( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQMouseEvent.prg b/harbour/contrib/hbqt/TQMouseEvent.prg index 996e52d584..114e676416 100644 --- a/harbour/contrib/hbqt/TQMouseEvent.prg +++ b/harbour/contrib/hbqt/TQMouseEvent.prg @@ -70,7 +70,6 @@ CREATE CLASS QMouseEvent INHERIT QInputEvent METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QMouseEvent_destroy( ::pPtr ) METHOD button() INLINE Qt_QMouseEvent_button( ::pPtr ) METHOD buttons() INLINE Qt_QMouseEvent_buttons( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQMoveEvent.prg b/harbour/contrib/hbqt/TQMoveEvent.prg index 00112e90ce..6ed33320bd 100644 --- a/harbour/contrib/hbqt/TQMoveEvent.prg +++ b/harbour/contrib/hbqt/TQMoveEvent.prg @@ -70,7 +70,6 @@ CREATE CLASS QMoveEvent INHERIT QEvent METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QMoveEvent_destroy( ::pPtr ) METHOD oldPos() INLINE Qt_QMoveEvent_oldPos( ::pPtr ) METHOD pos() INLINE Qt_QMoveEvent_pos( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQObject.prg b/harbour/contrib/hbqt/TQObject.prg index 663a860672..377f6fa6fd 100644 --- a/harbour/contrib/hbqt/TQObject.prg +++ b/harbour/contrib/hbqt/TQObject.prg @@ -70,7 +70,6 @@ CREATE CLASS QObject METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QObject_destroy( ::pPtr ) METHOD blockSignals( lBlock ) INLINE Qt_QObject_blockSignals( ::pPtr, lBlock ) METHOD children() INLINE Qt_QObject_children( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQPageSetupDialog.prg b/harbour/contrib/hbqt/TQPageSetupDialog.prg index 7868a0ca2a..5b08a9269c 100644 --- a/harbour/contrib/hbqt/TQPageSetupDialog.prg +++ b/harbour/contrib/hbqt/TQPageSetupDialog.prg @@ -70,7 +70,6 @@ CREATE CLASS QPageSetupDialog INHERIT QDialog METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QPageSetupDialog_destroy( ::pPtr ) METHOD exec() INLINE Qt_QPageSetupDialog_exec( ::pPtr ) METHOD open( pReceiver, pMember ) INLINE Qt_QPageSetupDialog_open( ::pPtr, pReceiver, pMember ) diff --git a/harbour/contrib/hbqt/TQPaintDevice.prg b/harbour/contrib/hbqt/TQPaintDevice.prg index 9855169331..13103dd9ce 100644 --- a/harbour/contrib/hbqt/TQPaintDevice.prg +++ b/harbour/contrib/hbqt/TQPaintDevice.prg @@ -70,7 +70,6 @@ CREATE CLASS QPaintDevice METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QPaintDevice_destroy( ::pPtr ) METHOD depth() INLINE Qt_QPaintDevice_depth( ::pPtr ) METHOD height() INLINE Qt_QPaintDevice_height( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQPaintEvent.prg b/harbour/contrib/hbqt/TQPaintEvent.prg index 82bbf048ff..c071e05fb4 100644 --- a/harbour/contrib/hbqt/TQPaintEvent.prg +++ b/harbour/contrib/hbqt/TQPaintEvent.prg @@ -70,7 +70,6 @@ CREATE CLASS QPaintEvent INHERIT QEvent METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QPaintEvent_destroy( ::pPtr ) METHOD rect() INLINE Qt_QPaintEvent_rect( ::pPtr ) METHOD region() INLINE Qt_QPaintEvent_region( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQPainter.prg b/harbour/contrib/hbqt/TQPainter.prg index d8db0d0694..a86b88d280 100644 --- a/harbour/contrib/hbqt/TQPainter.prg +++ b/harbour/contrib/hbqt/TQPainter.prg @@ -70,7 +70,6 @@ CREATE CLASS QPainter METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QPainter_destroy( ::pPtr ) METHOD background() INLINE Qt_QPainter_background( ::pPtr ) METHOD backgroundMode() INLINE Qt_QPainter_backgroundMode( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQPalette.prg b/harbour/contrib/hbqt/TQPalette.prg index 09c620f371..8e613fdd09 100644 --- a/harbour/contrib/hbqt/TQPalette.prg +++ b/harbour/contrib/hbqt/TQPalette.prg @@ -70,7 +70,6 @@ CREATE CLASS QPalette METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QPalette_destroy( ::pPtr ) METHOD alternateBase() INLINE Qt_QPalette_alternateBase( ::pPtr ) METHOD base() INLINE Qt_QPalette_base( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQPen.prg b/harbour/contrib/hbqt/TQPen.prg index 7df339cef1..cd975b43cb 100644 --- a/harbour/contrib/hbqt/TQPen.prg +++ b/harbour/contrib/hbqt/TQPen.prg @@ -70,7 +70,6 @@ CREATE CLASS QPen METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QPen_destroy( ::pPtr ) METHOD brush() INLINE Qt_QPen_brush( ::pPtr ) METHOD capStyle() INLINE Qt_QPen_capStyle( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQPicture.prg b/harbour/contrib/hbqt/TQPicture.prg index 103c438b1e..81f876060b 100644 --- a/harbour/contrib/hbqt/TQPicture.prg +++ b/harbour/contrib/hbqt/TQPicture.prg @@ -70,7 +70,6 @@ CREATE CLASS QPicture INHERIT QPaintDevice METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QPicture_destroy( ::pPtr ) METHOD boundingRect() INLINE Qt_QPicture_boundingRect( ::pPtr ) METHOD data() INLINE Qt_QPicture_data( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQPixmap.prg b/harbour/contrib/hbqt/TQPixmap.prg index 5fc4ec26ce..c309cb6fa0 100644 --- a/harbour/contrib/hbqt/TQPixmap.prg +++ b/harbour/contrib/hbqt/TQPixmap.prg @@ -70,7 +70,6 @@ CREATE CLASS QPixmap INHERIT QPaintDevice METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QPixmap_destroy( ::pPtr ) METHOD alphaChannel() INLINE Qt_QPixmap_alphaChannel( ::pPtr ) METHOD cacheKey() INLINE Qt_QPixmap_cacheKey( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQPoint.prg b/harbour/contrib/hbqt/TQPoint.prg index 176cd1dc2d..aa38d20a9c 100644 --- a/harbour/contrib/hbqt/TQPoint.prg +++ b/harbour/contrib/hbqt/TQPoint.prg @@ -70,7 +70,6 @@ CREATE CLASS QPoint METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QPoint_destroy( ::pPtr ) METHOD isNull() INLINE Qt_QPoint_isNull( ::pPtr ) METHOD manhattanLength() INLINE Qt_QPoint_manhattanLength( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQPointF.prg b/harbour/contrib/hbqt/TQPointF.prg index 5d1531655d..a7018d3f36 100644 --- a/harbour/contrib/hbqt/TQPointF.prg +++ b/harbour/contrib/hbqt/TQPointF.prg @@ -70,7 +70,6 @@ CREATE CLASS QPointF METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QPointF_destroy( ::pPtr ) METHOD isNull() INLINE Qt_QPointF_isNull( ::pPtr ) METHOD rx() INLINE Qt_QPointF_rx( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQPrintDialog.prg b/harbour/contrib/hbqt/TQPrintDialog.prg index fc1016493f..50ddaa4eae 100644 --- a/harbour/contrib/hbqt/TQPrintDialog.prg +++ b/harbour/contrib/hbqt/TQPrintDialog.prg @@ -70,7 +70,6 @@ CREATE CLASS QPrintDialog INHERIT QAbstractPrintDialog METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QPrintDialog_destroy( ::pPtr ) METHOD done( nResult ) INLINE Qt_QPrintDialog_done( ::pPtr, nResult ) METHOD open( pReceiver, pMember ) INLINE Qt_QPrintDialog_open( ::pPtr, pReceiver, pMember ) diff --git a/harbour/contrib/hbqt/TQPrintEngine.prg b/harbour/contrib/hbqt/TQPrintEngine.prg index 62daad431a..9af16b311e 100644 --- a/harbour/contrib/hbqt/TQPrintEngine.prg +++ b/harbour/contrib/hbqt/TQPrintEngine.prg @@ -70,7 +70,6 @@ CREATE CLASS QPrintEngine METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QPrintEngine_destroy( ::pPtr ) METHOD abort() INLINE Qt_QPrintEngine_abort( ::pPtr ) METHOD metric( nId ) INLINE Qt_QPrintEngine_metric( ::pPtr, nId ) diff --git a/harbour/contrib/hbqt/TQPrintPreviewDialog.prg b/harbour/contrib/hbqt/TQPrintPreviewDialog.prg index 3d265315a4..ed98172e64 100644 --- a/harbour/contrib/hbqt/TQPrintPreviewDialog.prg +++ b/harbour/contrib/hbqt/TQPrintPreviewDialog.prg @@ -70,7 +70,6 @@ CREATE CLASS QPrintPreviewDialog INHERIT QDialog METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QPrintPreviewDialog_destroy( ::pPtr ) METHOD open( pReceiver, pMember ) INLINE Qt_QPrintPreviewDialog_open( ::pPtr, pReceiver, pMember ) METHOD printer() INLINE Qt_QPrintPreviewDialog_printer( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQPrinter.prg b/harbour/contrib/hbqt/TQPrinter.prg index 57b38f2213..80f0400f33 100644 --- a/harbour/contrib/hbqt/TQPrinter.prg +++ b/harbour/contrib/hbqt/TQPrinter.prg @@ -70,7 +70,6 @@ CREATE CLASS QPrinter INHERIT QPaintDevice METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QPrinter_destroy( ::pPtr ) METHOD abort() INLINE Qt_QPrinter_abort( ::pPtr ) METHOD collateCopies() INLINE Qt_QPrinter_collateCopies( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQProcess.prg b/harbour/contrib/hbqt/TQProcess.prg index 3619a83b13..43ced2c7fa 100644 --- a/harbour/contrib/hbqt/TQProcess.prg +++ b/harbour/contrib/hbqt/TQProcess.prg @@ -70,7 +70,6 @@ CREATE CLASS QProcess INHERIT QIODevice METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QProcess_destroy( ::pPtr ) METHOD close() INLINE Qt_QProcess_close( ::pPtr ) METHOD closeReadChannel( nChannel ) INLINE Qt_QProcess_closeReadChannel( ::pPtr, nChannel ) diff --git a/harbour/contrib/hbqt/TQProgressBar.prg b/harbour/contrib/hbqt/TQProgressBar.prg index e83e56a512..bd35143ee7 100644 --- a/harbour/contrib/hbqt/TQProgressBar.prg +++ b/harbour/contrib/hbqt/TQProgressBar.prg @@ -70,7 +70,6 @@ CREATE CLASS QProgressBar INHERIT QWidget METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QProgressBar_destroy( ::pPtr ) METHOD alignment() INLINE Qt_QProgressBar_alignment( ::pPtr ) METHOD format() INLINE Qt_QProgressBar_format( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQProgressDialog.prg b/harbour/contrib/hbqt/TQProgressDialog.prg index 3fd371f773..12eff9d3c2 100644 --- a/harbour/contrib/hbqt/TQProgressDialog.prg +++ b/harbour/contrib/hbqt/TQProgressDialog.prg @@ -70,7 +70,6 @@ CREATE CLASS QProgressDialog INHERIT QDialog METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QProgressDialog_destroy( ::pPtr ) METHOD autoClose() INLINE Qt_QProgressDialog_autoClose( ::pPtr ) METHOD autoReset() INLINE Qt_QProgressDialog_autoReset( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQPushButton.prg b/harbour/contrib/hbqt/TQPushButton.prg index f2df382230..28fc70c1d8 100644 --- a/harbour/contrib/hbqt/TQPushButton.prg +++ b/harbour/contrib/hbqt/TQPushButton.prg @@ -70,7 +70,6 @@ CREATE CLASS QPushButton INHERIT QAbstractButton METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QPushButton_destroy( ::pPtr ) METHOD autoDefault() INLINE Qt_QPushButton_autoDefault( ::pPtr ) METHOD isDefault() INLINE Qt_QPushButton_isDefault( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQRadialGradient.prg b/harbour/contrib/hbqt/TQRadialGradient.prg index a6209933a8..442621f999 100644 --- a/harbour/contrib/hbqt/TQRadialGradient.prg +++ b/harbour/contrib/hbqt/TQRadialGradient.prg @@ -70,7 +70,6 @@ CREATE CLASS QRadialGradient INHERIT QGradient METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QRadialGradient_destroy( ::pPtr ) METHOD center() INLINE Qt_QRadialGradient_center( ::pPtr ) METHOD focalPoint() INLINE Qt_QRadialGradient_focalPoint( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQRadioButton.prg b/harbour/contrib/hbqt/TQRadioButton.prg index 25d8454a49..1567fcd1ef 100644 --- a/harbour/contrib/hbqt/TQRadioButton.prg +++ b/harbour/contrib/hbqt/TQRadioButton.prg @@ -70,7 +70,6 @@ CREATE CLASS QRadioButton INHERIT QAbstractButton METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QRadioButton_destroy( ::pPtr ) ENDCLASS diff --git a/harbour/contrib/hbqt/TQRect.prg b/harbour/contrib/hbqt/TQRect.prg index 83f9c87499..493029751c 100644 --- a/harbour/contrib/hbqt/TQRect.prg +++ b/harbour/contrib/hbqt/TQRect.prg @@ -70,7 +70,6 @@ CREATE CLASS QRect METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QRect_destroy( ::pPtr ) METHOD adjust( nDx1, nDy1, nDx2, nDy2 ) INLINE Qt_QRect_adjust( ::pPtr, nDx1, nDy1, nDx2, nDy2 ) METHOD adjusted( nDx1, nDy1, nDx2, nDy2 ) INLINE Qt_QRect_adjusted( ::pPtr, nDx1, nDy1, nDx2, nDy2 ) diff --git a/harbour/contrib/hbqt/TQRectF.prg b/harbour/contrib/hbqt/TQRectF.prg index e2fbfb5a18..8118743c11 100644 --- a/harbour/contrib/hbqt/TQRectF.prg +++ b/harbour/contrib/hbqt/TQRectF.prg @@ -70,7 +70,6 @@ CREATE CLASS QRectF METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QRectF_destroy( ::pPtr ) METHOD adjust( nDx1, nDy1, nDx2, nDy2 ) INLINE Qt_QRectF_adjust( ::pPtr, nDx1, nDy1, nDx2, nDy2 ) METHOD adjusted( nDx1, nDy1, nDx2, nDy2 ) INLINE Qt_QRectF_adjusted( ::pPtr, nDx1, nDy1, nDx2, nDy2 ) diff --git a/harbour/contrib/hbqt/TQRegion.prg b/harbour/contrib/hbqt/TQRegion.prg index 66f0a13105..76d37e36e6 100644 --- a/harbour/contrib/hbqt/TQRegion.prg +++ b/harbour/contrib/hbqt/TQRegion.prg @@ -70,7 +70,6 @@ CREATE CLASS QRegion METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QRegion_destroy( ::pPtr ) METHOD boundingRect() INLINE Qt_QRegion_boundingRect( ::pPtr ) METHOD contains( pP ) INLINE Qt_QRegion_contains( ::pPtr, pP ) diff --git a/harbour/contrib/hbqt/TQResizeEvent.prg b/harbour/contrib/hbqt/TQResizeEvent.prg index 7b3ad49a52..0b56451ca4 100644 --- a/harbour/contrib/hbqt/TQResizeEvent.prg +++ b/harbour/contrib/hbqt/TQResizeEvent.prg @@ -70,7 +70,6 @@ CREATE CLASS QResizeEvent INHERIT QEvent METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QResizeEvent_destroy( ::pPtr ) METHOD oldSize() INLINE Qt_QResizeEvent_oldSize( ::pPtr ) METHOD size() INLINE Qt_QResizeEvent_size( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQResource.prg b/harbour/contrib/hbqt/TQResource.prg index cfbc99cf36..962e521484 100644 --- a/harbour/contrib/hbqt/TQResource.prg +++ b/harbour/contrib/hbqt/TQResource.prg @@ -70,7 +70,6 @@ CREATE CLASS QResource METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QResource_destroy( ::pPtr ) METHOD absoluteFilePath() INLINE Qt_QResource_absoluteFilePath( ::pPtr ) METHOD data() INLINE Qt_QResource_data( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQScrollArea.prg b/harbour/contrib/hbqt/TQScrollArea.prg index e6532ac724..55fe09348a 100644 --- a/harbour/contrib/hbqt/TQScrollArea.prg +++ b/harbour/contrib/hbqt/TQScrollArea.prg @@ -70,7 +70,6 @@ CREATE CLASS QScrollArea INHERIT QAbstractScrollArea METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QScrollArea_destroy( ::pPtr ) METHOD alignment() INLINE Qt_QScrollArea_alignment( ::pPtr ) METHOD ensureVisible( nX, nY, nXmargin, nYmargin ) INLINE Qt_QScrollArea_ensureVisible( ::pPtr, nX, nY, nXmargin, nYmargin ) diff --git a/harbour/contrib/hbqt/TQScrollBar.prg b/harbour/contrib/hbqt/TQScrollBar.prg index 85279555fb..7d22347bb2 100644 --- a/harbour/contrib/hbqt/TQScrollBar.prg +++ b/harbour/contrib/hbqt/TQScrollBar.prg @@ -70,7 +70,6 @@ CREATE CLASS QScrollBar INHERIT QAbstractSlider METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QScrollBar_destroy( ::pPtr ) ENDCLASS diff --git a/harbour/contrib/hbqt/TQSignalMapper.prg b/harbour/contrib/hbqt/TQSignalMapper.prg index 4da4d05fad..8cbdcfe831 100644 --- a/harbour/contrib/hbqt/TQSignalMapper.prg +++ b/harbour/contrib/hbqt/TQSignalMapper.prg @@ -70,7 +70,6 @@ CREATE CLASS QSignalMapper INHERIT QObject METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QSignalMapper_destroy( ::pPtr ) METHOD mapping( nId ) INLINE Qt_QSignalMapper_mapping( ::pPtr, nId ) METHOD mapping_1( cId ) INLINE Qt_QSignalMapper_mapping_1( ::pPtr, cId ) diff --git a/harbour/contrib/hbqt/TQSize.prg b/harbour/contrib/hbqt/TQSize.prg index 0005f2c0a4..40585343ef 100644 --- a/harbour/contrib/hbqt/TQSize.prg +++ b/harbour/contrib/hbqt/TQSize.prg @@ -70,7 +70,6 @@ CREATE CLASS QSize METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QSize_destroy( ::pPtr ) METHOD height() INLINE Qt_QSize_height( ::pPtr ) METHOD isEmpty() INLINE Qt_QSize_isEmpty( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQSizeF.prg b/harbour/contrib/hbqt/TQSizeF.prg index 32e784d87a..aa20aad9b9 100644 --- a/harbour/contrib/hbqt/TQSizeF.prg +++ b/harbour/contrib/hbqt/TQSizeF.prg @@ -70,7 +70,6 @@ CREATE CLASS QSizeF METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QSizeF_destroy( ::pPtr ) METHOD boundedTo( pOtherSize ) INLINE Qt_QSizeF_boundedTo( ::pPtr, pOtherSize ) METHOD expandedTo( pOtherSize ) INLINE Qt_QSizeF_expandedTo( ::pPtr, pOtherSize ) diff --git a/harbour/contrib/hbqt/TQSizeGrip.prg b/harbour/contrib/hbqt/TQSizeGrip.prg index 8a4740990a..34bc8f4e29 100644 --- a/harbour/contrib/hbqt/TQSizeGrip.prg +++ b/harbour/contrib/hbqt/TQSizeGrip.prg @@ -70,7 +70,6 @@ CREATE CLASS QSizeGrip INHERIT QWidget METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QSizeGrip_destroy( ::pPtr ) ENDCLASS diff --git a/harbour/contrib/hbqt/TQSizePolicy.prg b/harbour/contrib/hbqt/TQSizePolicy.prg index 0c5ead13b6..1473391c6e 100644 --- a/harbour/contrib/hbqt/TQSizePolicy.prg +++ b/harbour/contrib/hbqt/TQSizePolicy.prg @@ -70,7 +70,6 @@ CREATE CLASS QSizePolicy METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QSizePolicy_destroy( ::pPtr ) METHOD controlType() INLINE Qt_QSizePolicy_controlType( ::pPtr ) METHOD expandingDirections() INLINE Qt_QSizePolicy_expandingDirections( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQSlider.prg b/harbour/contrib/hbqt/TQSlider.prg index eee5c1ac60..5fceacc8ba 100644 --- a/harbour/contrib/hbqt/TQSlider.prg +++ b/harbour/contrib/hbqt/TQSlider.prg @@ -70,7 +70,6 @@ CREATE CLASS QSlider INHERIT QAbstractSlider METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QSlider_destroy( ::pPtr ) METHOD setTickInterval( nTi ) INLINE Qt_QSlider_setTickInterval( ::pPtr, nTi ) METHOD setTickPosition( nPosition ) INLINE Qt_QSlider_setTickPosition( ::pPtr, nPosition ) diff --git a/harbour/contrib/hbqt/TQSound.prg b/harbour/contrib/hbqt/TQSound.prg index 09d2b27219..99d5018532 100644 --- a/harbour/contrib/hbqt/TQSound.prg +++ b/harbour/contrib/hbqt/TQSound.prg @@ -70,7 +70,6 @@ CREATE CLASS QSound METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QSound_destroy( ::pPtr ) METHOD fileName() INLINE Qt_QSound_fileName( ::pPtr ) METHOD isFinished() INLINE Qt_QSound_isFinished( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQSpinBox.prg b/harbour/contrib/hbqt/TQSpinBox.prg index 07c491c96a..3055aa6460 100644 --- a/harbour/contrib/hbqt/TQSpinBox.prg +++ b/harbour/contrib/hbqt/TQSpinBox.prg @@ -70,7 +70,6 @@ CREATE CLASS QSpinBox INHERIT QAbstractSpinBox METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QSpinBox_destroy( ::pPtr ) METHOD cleanText() INLINE Qt_QSpinBox_cleanText( ::pPtr ) METHOD maximum() INLINE Qt_QSpinBox_maximum( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQSplashScreen.prg b/harbour/contrib/hbqt/TQSplashScreen.prg index 90db139219..ffe3b774f7 100644 --- a/harbour/contrib/hbqt/TQSplashScreen.prg +++ b/harbour/contrib/hbqt/TQSplashScreen.prg @@ -70,7 +70,6 @@ CREATE CLASS QSplashScreen INHERIT QWidget METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QSplashScreen_destroy( ::pPtr ) METHOD finish( pMainWin ) INLINE Qt_QSplashScreen_finish( ::pPtr, pMainWin ) METHOD pixmap() INLINE Qt_QSplashScreen_pixmap( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQSplitter.prg b/harbour/contrib/hbqt/TQSplitter.prg index f1ae92dd04..95d61c0b7f 100644 --- a/harbour/contrib/hbqt/TQSplitter.prg +++ b/harbour/contrib/hbqt/TQSplitter.prg @@ -70,7 +70,6 @@ CREATE CLASS QSplitter INHERIT QFrame METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QSplitter_destroy( ::pPtr ) METHOD addWidget( pWidget ) INLINE Qt_QSplitter_addWidget( ::pPtr, pWidget ) METHOD childrenCollapsible() INLINE Qt_QSplitter_childrenCollapsible( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQStandardItem.prg b/harbour/contrib/hbqt/TQStandardItem.prg index 981fa99bf1..ac9bfa2fbd 100644 --- a/harbour/contrib/hbqt/TQStandardItem.prg +++ b/harbour/contrib/hbqt/TQStandardItem.prg @@ -70,7 +70,6 @@ CREATE CLASS QStandardItem METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStandardItem_destroy( ::pPtr ) METHOD accessibleDescription() INLINE Qt_QStandardItem_accessibleDescription( ::pPtr ) METHOD accessibleText() INLINE Qt_QStandardItem_accessibleText( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQStandardItemModel.prg b/harbour/contrib/hbqt/TQStandardItemModel.prg index f09b18fa06..fa536eaab3 100644 --- a/harbour/contrib/hbqt/TQStandardItemModel.prg +++ b/harbour/contrib/hbqt/TQStandardItemModel.prg @@ -70,7 +70,6 @@ CREATE CLASS QStandardItemModel INHERIT QAbstractItemModeL METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStandardItemModel_destroy( ::pPtr ) METHOD appendRow( pItem ) INLINE Qt_QStandardItemModel_appendRow( ::pPtr, pItem ) METHOD clear() INLINE Qt_QStandardItemModel_clear( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQStatusBar.prg b/harbour/contrib/hbqt/TQStatusBar.prg index 8804b3a94e..170a43e935 100644 --- a/harbour/contrib/hbqt/TQStatusBar.prg +++ b/harbour/contrib/hbqt/TQStatusBar.prg @@ -70,7 +70,6 @@ CREATE CLASS QStatusBar INHERIT QWidget METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStatusBar_destroy( ::pPtr ) METHOD addPermanentWidget( pWidget, nStretch ) INLINE Qt_QStatusBar_addPermanentWidget( ::pPtr, pWidget, nStretch ) METHOD addWidget( pWidget, nStretch ) INLINE Qt_QStatusBar_addWidget( ::pPtr, pWidget, nStretch ) diff --git a/harbour/contrib/hbqt/TQStringList.prg b/harbour/contrib/hbqt/TQStringList.prg index 9af93b4288..9e4ae8d1db 100644 --- a/harbour/contrib/hbqt/TQStringList.prg +++ b/harbour/contrib/hbqt/TQStringList.prg @@ -70,7 +70,6 @@ CREATE CLASS QStringList INHERIT QList METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStringList_destroy( ::pPtr ) METHOD append( cValue ) INLINE Qt_QStringList_append( ::pPtr, cValue ) METHOD filter( cStr, nCs ) INLINE Qt_QStringList_filter( ::pPtr, cStr, nCs ) diff --git a/harbour/contrib/hbqt/TQStringListModel.prg b/harbour/contrib/hbqt/TQStringListModel.prg index 2cd21e3baf..08ee26bb4f 100644 --- a/harbour/contrib/hbqt/TQStringListModel.prg +++ b/harbour/contrib/hbqt/TQStringListModel.prg @@ -70,7 +70,6 @@ CREATE CLASS QStringListModel INHERIT QAbstractListModel METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStringListModel_destroy( ::pPtr ) METHOD data( pIndex, nRole ) INLINE Qt_QStringListModel_data( ::pPtr, pIndex, nRole ) METHOD flags( pIndex ) INLINE Qt_QStringListModel_flags( ::pPtr, pIndex ) diff --git a/harbour/contrib/hbqt/TQStyle.prg b/harbour/contrib/hbqt/TQStyle.prg index f1a9c777cb..a8c05001c3 100644 --- a/harbour/contrib/hbqt/TQStyle.prg +++ b/harbour/contrib/hbqt/TQStyle.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyle INHERIT QObject METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyle_destroy( ::pPtr ) METHOD combinedLayoutSpacing( nControls1, nControls2, nOrientation, pOption, pWidget ) INLINE Qt_QStyle_combinedLayoutSpacing( ::pPtr, nControls1, nControls2, nOrientation, pOption, pWidget ) METHOD drawComplexControl( nControl, pOption, pPainter, pWidget ) INLINE Qt_QStyle_drawComplexControl( ::pPtr, nControl, pOption, pPainter, pWidget ) diff --git a/harbour/contrib/hbqt/TQStyleFactory.prg b/harbour/contrib/hbqt/TQStyleFactory.prg index 34d476aac3..3339297bb3 100644 --- a/harbour/contrib/hbqt/TQStyleFactory.prg +++ b/harbour/contrib/hbqt/TQStyleFactory.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyleFactory METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyleFactory_destroy( ::pPtr ) METHOD create( cKey ) INLINE Qt_QStyleFactory_create( ::pPtr, cKey ) METHOD keys() INLINE Qt_QStyleFactory_keys( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQStyleHintReturn.prg b/harbour/contrib/hbqt/TQStyleHintReturn.prg index 1f7915d59b..32ef97565f 100644 --- a/harbour/contrib/hbqt/TQStyleHintReturn.prg +++ b/harbour/contrib/hbqt/TQStyleHintReturn.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyleHintReturn METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyleHintReturn_destroy( ::pPtr ) ENDCLASS diff --git a/harbour/contrib/hbqt/TQStyleHintReturnMask.prg b/harbour/contrib/hbqt/TQStyleHintReturnMask.prg index d05a1172f4..96b90f552f 100644 --- a/harbour/contrib/hbqt/TQStyleHintReturnMask.prg +++ b/harbour/contrib/hbqt/TQStyleHintReturnMask.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyleHintReturnMask INHERIT QStyleHintReturn METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyleHintReturnMask_destroy( ::pPtr ) ENDCLASS diff --git a/harbour/contrib/hbqt/TQStyleHintReturnVariant.prg b/harbour/contrib/hbqt/TQStyleHintReturnVariant.prg index fd1be6e804..76f3d8a383 100644 --- a/harbour/contrib/hbqt/TQStyleHintReturnVariant.prg +++ b/harbour/contrib/hbqt/TQStyleHintReturnVariant.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyleHintReturnVariant INHERIT QStyleHintReturn METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyleHintReturnVariant_destroy( ::pPtr ) ENDCLASS diff --git a/harbour/contrib/hbqt/TQStyleOption.prg b/harbour/contrib/hbqt/TQStyleOption.prg index a41852aeae..57e33d9386 100644 --- a/harbour/contrib/hbqt/TQStyleOption.prg +++ b/harbour/contrib/hbqt/TQStyleOption.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyleOption METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyleOption_destroy( ::pPtr ) METHOD initFrom( pWidget ) INLINE Qt_QStyleOption_initFrom( ::pPtr, pWidget ) METHOD direction() INLINE Qt_QStyleOption_direction( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQStyleOptionButton.prg b/harbour/contrib/hbqt/TQStyleOptionButton.prg index 708387c7e0..2db8d9e722 100644 --- a/harbour/contrib/hbqt/TQStyleOptionButton.prg +++ b/harbour/contrib/hbqt/TQStyleOptionButton.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyleOptionButton INHERIT QStyleOption METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyleOptionButton_destroy( ::pPtr ) METHOD features() INLINE Qt_QStyleOptionButton_features( ::pPtr ) METHOD icon() INLINE Qt_QStyleOptionButton_icon( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQStyleOptionComboBox.prg b/harbour/contrib/hbqt/TQStyleOptionComboBox.prg index 7169d56a10..1741dd2b76 100644 --- a/harbour/contrib/hbqt/TQStyleOptionComboBox.prg +++ b/harbour/contrib/hbqt/TQStyleOptionComboBox.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyleOptionComboBox INHERIT QStyleOption METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyleOptionComboBox_destroy( ::pPtr ) METHOD currentIcon() INLINE Qt_QStyleOptionComboBox_currentIcon( ::pPtr ) METHOD currentText() INLINE Qt_QStyleOptionComboBox_currentText( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQStyleOptionComplex.prg b/harbour/contrib/hbqt/TQStyleOptionComplex.prg index 1ec7c5b6b3..7dd6200cea 100644 --- a/harbour/contrib/hbqt/TQStyleOptionComplex.prg +++ b/harbour/contrib/hbqt/TQStyleOptionComplex.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyleOptionComplex INHERIT QStyleOption METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyleOptionComplex_destroy( ::pPtr ) METHOD activeSubControls() INLINE Qt_QStyleOptionComplex_activeSubControls( ::pPtr ) METHOD subControls() INLINE Qt_QStyleOptionComplex_subControls( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQStyleOptionDockWidget.prg b/harbour/contrib/hbqt/TQStyleOptionDockWidget.prg index 71eeb0e023..0c738db4b6 100644 --- a/harbour/contrib/hbqt/TQStyleOptionDockWidget.prg +++ b/harbour/contrib/hbqt/TQStyleOptionDockWidget.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyleOptionDockWidget INHERIT QStyleOption METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyleOptionDockWidget_destroy( ::pPtr ) METHOD closable() INLINE Qt_QStyleOptionDockWidget_closable( ::pPtr ) METHOD floatable() INLINE Qt_QStyleOptionDockWidget_floatable( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQStyleOptionFocusRect.prg b/harbour/contrib/hbqt/TQStyleOptionFocusRect.prg index de479287e5..444314e532 100644 --- a/harbour/contrib/hbqt/TQStyleOptionFocusRect.prg +++ b/harbour/contrib/hbqt/TQStyleOptionFocusRect.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyleOptionFocusRect INHERIT QStyleOption METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyleOptionFocusRect_destroy( ::pPtr ) METHOD backgroundColor() INLINE Qt_QStyleOptionFocusRect_backgroundColor( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQStyleOptionFrame.prg b/harbour/contrib/hbqt/TQStyleOptionFrame.prg index 28b4a5519c..b537c80e1f 100644 --- a/harbour/contrib/hbqt/TQStyleOptionFrame.prg +++ b/harbour/contrib/hbqt/TQStyleOptionFrame.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyleOptionFrame INHERIT qStyleOption METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyleOptionFrame_destroy( ::pPtr ) METHOD lineWidth() INLINE Qt_QStyleOptionFrame_lineWidth( ::pPtr ) METHOD midLineWidth() INLINE Qt_QStyleOptionFrame_midLineWidth( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQStyleOptionGroupBox.prg b/harbour/contrib/hbqt/TQStyleOptionGroupBox.prg index a86416cfc1..0b614393dc 100644 --- a/harbour/contrib/hbqt/TQStyleOptionGroupBox.prg +++ b/harbour/contrib/hbqt/TQStyleOptionGroupBox.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyleOptionGroupBox INHERIT QStyleOptionComplex METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyleOptionGroupBox_destroy( ::pPtr ) METHOD features() INLINE Qt_QStyleOptionGroupBox_features( ::pPtr ) METHOD lineWidth() INLINE Qt_QStyleOptionGroupBox_lineWidth( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQStyleOptionHeader.prg b/harbour/contrib/hbqt/TQStyleOptionHeader.prg index 372083d175..f7e8c8a269 100644 --- a/harbour/contrib/hbqt/TQStyleOptionHeader.prg +++ b/harbour/contrib/hbqt/TQStyleOptionHeader.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyleOptionHeader INHERIT QStyleOption METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyleOptionHeader_destroy( ::pPtr ) METHOD icon() INLINE Qt_QStyleOptionHeader_icon( ::pPtr ) METHOD iconAlignment() INLINE Qt_QStyleOptionHeader_iconAlignment( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQStyleOptionMenuItem.prg b/harbour/contrib/hbqt/TQStyleOptionMenuItem.prg index 25fe4f1ebf..f5a49cb610 100644 --- a/harbour/contrib/hbqt/TQStyleOptionMenuItem.prg +++ b/harbour/contrib/hbqt/TQStyleOptionMenuItem.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyleOptionMenuItem INHERIT QStyleOption METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyleOptionMenuItem_destroy( ::pPtr ) METHOD checkType() INLINE Qt_QStyleOptionMenuItem_checkType( ::pPtr ) METHOD checked() INLINE Qt_QStyleOptionMenuItem_checked( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQStyleOptionProgressBar.prg b/harbour/contrib/hbqt/TQStyleOptionProgressBar.prg index d679425125..77ad73b831 100644 --- a/harbour/contrib/hbqt/TQStyleOptionProgressBar.prg +++ b/harbour/contrib/hbqt/TQStyleOptionProgressBar.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyleOptionProgressBar INHERIT QStyleOption METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyleOptionProgressBar_destroy( ::pPtr ) METHOD maximum() INLINE Qt_QStyleOptionProgressBar_maximum( ::pPtr ) METHOD minimum() INLINE Qt_QStyleOptionProgressBar_minimum( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQStyleOptionSizeGrip.prg b/harbour/contrib/hbqt/TQStyleOptionSizeGrip.prg index 5af0e1db3b..cd52484637 100644 --- a/harbour/contrib/hbqt/TQStyleOptionSizeGrip.prg +++ b/harbour/contrib/hbqt/TQStyleOptionSizeGrip.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyleOptionSizeGrip INHERIT QStyleOptionComplex METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyleOptionSizeGrip_destroy( ::pPtr ) METHOD corner() INLINE Qt_QStyleOptionSizeGrip_corner( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQStyleOptionSlider.prg b/harbour/contrib/hbqt/TQStyleOptionSlider.prg index 0fc8a60ca0..2606261b30 100644 --- a/harbour/contrib/hbqt/TQStyleOptionSlider.prg +++ b/harbour/contrib/hbqt/TQStyleOptionSlider.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyleOptionSlider INHERIT QStyleOptionComplex METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyleOptionSlider_destroy( ::pPtr ) METHOD dialWrapping() INLINE Qt_QStyleOptionSlider_dialWrapping( ::pPtr ) METHOD maximum() INLINE Qt_QStyleOptionSlider_maximum( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQStyleOptionSpinBox.prg b/harbour/contrib/hbqt/TQStyleOptionSpinBox.prg index a6054a9835..c7de1f40ee 100644 --- a/harbour/contrib/hbqt/TQStyleOptionSpinBox.prg +++ b/harbour/contrib/hbqt/TQStyleOptionSpinBox.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyleOptionSpinBox INHERIT QStyleOptionComplex METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyleOptionSpinBox_destroy( ::pPtr ) METHOD buttonSymbols() INLINE Qt_QStyleOptionSpinBox_buttonSymbols( ::pPtr ) METHOD frame() INLINE Qt_QStyleOptionSpinBox_frame( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQStyleOptionTab.prg b/harbour/contrib/hbqt/TQStyleOptionTab.prg index 35d73eba59..af9c860c33 100644 --- a/harbour/contrib/hbqt/TQStyleOptionTab.prg +++ b/harbour/contrib/hbqt/TQStyleOptionTab.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyleOptionTab INHERIT QStyleOption METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyleOptionTab_destroy( ::pPtr ) METHOD cornerWidgets() INLINE Qt_QStyleOptionTab_cornerWidgets( ::pPtr ) METHOD icon() INLINE Qt_QStyleOptionTab_icon( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQStyleOptionTabBarBase.prg b/harbour/contrib/hbqt/TQStyleOptionTabBarBase.prg index af06b4f639..0dfe1c2304 100644 --- a/harbour/contrib/hbqt/TQStyleOptionTabBarBase.prg +++ b/harbour/contrib/hbqt/TQStyleOptionTabBarBase.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyleOptionTabBarBase INHERIT QStyleOption METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyleOptionTabBarBase_destroy( ::pPtr ) METHOD selectedTabRect() INLINE Qt_QStyleOptionTabBarBase_selectedTabRect( ::pPtr ) METHOD shape() INLINE Qt_QStyleOptionTabBarBase_shape( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQStyleOptionTabWidgetFrame.prg b/harbour/contrib/hbqt/TQStyleOptionTabWidgetFrame.prg index aaf5cc54d9..8e121e27ec 100644 --- a/harbour/contrib/hbqt/TQStyleOptionTabWidgetFrame.prg +++ b/harbour/contrib/hbqt/TQStyleOptionTabWidgetFrame.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyleOptionTabWidgetFrame INHERIT QStyleOption METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyleOptionTabWidgetFrame_destroy( ::pPtr ) METHOD leftCornerWidgetSize() INLINE Qt_QStyleOptionTabWidgetFrame_leftCornerWidgetSize( ::pPtr ) METHOD lineWidth() INLINE Qt_QStyleOptionTabWidgetFrame_lineWidth( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQStyleOptionTitleBar.prg b/harbour/contrib/hbqt/TQStyleOptionTitleBar.prg index 32d4aa478e..9f9cc8b5b4 100644 --- a/harbour/contrib/hbqt/TQStyleOptionTitleBar.prg +++ b/harbour/contrib/hbqt/TQStyleOptionTitleBar.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyleOptionTitleBar INHERIT QStyleOptionComplex METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyleOptionTitleBar_destroy( ::pPtr ) METHOD icon() INLINE Qt_QStyleOptionTitleBar_icon( ::pPtr ) METHOD text() INLINE Qt_QStyleOptionTitleBar_text( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQStyleOptionToolBar.prg b/harbour/contrib/hbqt/TQStyleOptionToolBar.prg index 759d255ad0..318c3a5a2c 100644 --- a/harbour/contrib/hbqt/TQStyleOptionToolBar.prg +++ b/harbour/contrib/hbqt/TQStyleOptionToolBar.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyleOptionToolBar INHERIT QStyleOption METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyleOptionToolBar_destroy( ::pPtr ) METHOD features() INLINE Qt_QStyleOptionToolBar_features( ::pPtr ) METHOD lineWidth() INLINE Qt_QStyleOptionToolBar_lineWidth( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQStyleOptionToolBox.prg b/harbour/contrib/hbqt/TQStyleOptionToolBox.prg index bdf4ce9d4c..230411eef9 100644 --- a/harbour/contrib/hbqt/TQStyleOptionToolBox.prg +++ b/harbour/contrib/hbqt/TQStyleOptionToolBox.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyleOptionToolBox INHERIT QStyleOption METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyleOptionToolBox_destroy( ::pPtr ) METHOD icon() INLINE Qt_QStyleOptionToolBox_icon( ::pPtr ) METHOD text() INLINE Qt_QStyleOptionToolBox_text( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQStyleOptionToolButton.prg b/harbour/contrib/hbqt/TQStyleOptionToolButton.prg index 809d1bcb06..30803906fc 100644 --- a/harbour/contrib/hbqt/TQStyleOptionToolButton.prg +++ b/harbour/contrib/hbqt/TQStyleOptionToolButton.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyleOptionToolButton INHERIT QStyleOptionComplex METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyleOptionToolButton_destroy( ::pPtr ) METHOD arrowType() INLINE Qt_QStyleOptionToolButton_arrowType( ::pPtr ) METHOD features() INLINE Qt_QStyleOptionToolButton_features( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQStyleOptionViewItem.prg b/harbour/contrib/hbqt/TQStyleOptionViewItem.prg index d6b25c157e..b704607faf 100644 --- a/harbour/contrib/hbqt/TQStyleOptionViewItem.prg +++ b/harbour/contrib/hbqt/TQStyleOptionViewItem.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyleOptionViewItem INHERIT QStyleOption METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyleOptionViewItem_destroy( ::pPtr ) METHOD decorationAlignment() INLINE Qt_QStyleOptionViewItem_decorationAlignment( ::pPtr ) METHOD decorationPosition() INLINE Qt_QStyleOptionViewItem_decorationPosition( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQStylePainter.prg b/harbour/contrib/hbqt/TQStylePainter.prg index 7dffc13276..8be2192e35 100644 --- a/harbour/contrib/hbqt/TQStylePainter.prg +++ b/harbour/contrib/hbqt/TQStylePainter.prg @@ -70,7 +70,6 @@ CREATE CLASS QStylePainter INHERIT QPainter METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStylePainter_destroy( ::pPtr ) METHOD begin( pWidget ) INLINE Qt_QStylePainter_begin( ::pPtr, pWidget ) METHOD begin_1( pPd, pWidget ) INLINE Qt_QStylePainter_begin_1( ::pPtr, pPd, pWidget ) diff --git a/harbour/contrib/hbqt/TQStyledItemDelegate.prg b/harbour/contrib/hbqt/TQStyledItemDelegate.prg index 43eba92a62..3610d2703c 100644 --- a/harbour/contrib/hbqt/TQStyledItemDelegate.prg +++ b/harbour/contrib/hbqt/TQStyledItemDelegate.prg @@ -70,7 +70,6 @@ CREATE CLASS QStyledItemDelegate METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QStyledItemDelegate_destroy( ::pPtr ) METHOD createEditor( pParent, pOption, pIndex ) INLINE Qt_QStyledItemDelegate_createEditor( ::pPtr, pParent, pOption, pIndex ) METHOD displayText( pValue, pLocale ) INLINE Qt_QStyledItemDelegate_displayText( ::pPtr, pValue, pLocale ) diff --git a/harbour/contrib/hbqt/TQSystemTrayIcon.prg b/harbour/contrib/hbqt/TQSystemTrayIcon.prg index 8fc8f66540..89feb1e872 100644 --- a/harbour/contrib/hbqt/TQSystemTrayIcon.prg +++ b/harbour/contrib/hbqt/TQSystemTrayIcon.prg @@ -70,7 +70,6 @@ CREATE CLASS QSystemTrayIcon INHERIT QObject METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QSystemTrayIcon_destroy( ::pPtr ) METHOD contextMenu() INLINE Qt_QSystemTrayIcon_contextMenu( ::pPtr ) METHOD geometry() INLINE Qt_QSystemTrayIcon_geometry( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQTabBar.prg b/harbour/contrib/hbqt/TQTabBar.prg index c11fb45e07..8bbb472410 100644 --- a/harbour/contrib/hbqt/TQTabBar.prg +++ b/harbour/contrib/hbqt/TQTabBar.prg @@ -70,7 +70,6 @@ CREATE CLASS QTabBar INHERIT QWidget METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTabBar_destroy( ::pPtr ) METHOD addTab( cText ) INLINE Qt_QTabBar_addTab( ::pPtr, cText ) METHOD count() INLINE Qt_QTabBar_count( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQTabWidget.prg b/harbour/contrib/hbqt/TQTabWidget.prg index 90b7ffb17f..9fef3c7321 100644 --- a/harbour/contrib/hbqt/TQTabWidget.prg +++ b/harbour/contrib/hbqt/TQTabWidget.prg @@ -70,7 +70,6 @@ CREATE CLASS QTabWidget INHERIT QWidget METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTabWidget_destroy( ::pPtr ) METHOD addTab( pPage, cLabel ) INLINE Qt_QTabWidget_addTab( ::pPtr, pPage, cLabel ) METHOD addTab_1( pPage, cIcon, cLabel ) INLINE Qt_QTabWidget_addTab_1( ::pPtr, pPage, cIcon, cLabel ) diff --git a/harbour/contrib/hbqt/TQTableView.prg b/harbour/contrib/hbqt/TQTableView.prg index 5f0cf058a9..817cec12ee 100644 --- a/harbour/contrib/hbqt/TQTableView.prg +++ b/harbour/contrib/hbqt/TQTableView.prg @@ -70,7 +70,6 @@ CREATE CLASS QTableView INHERIT QAbstractItemView METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTableView_destroy( ::pPtr ) METHOD clearSpans() INLINE Qt_QTableView_clearSpans( ::pPtr ) METHOD columnAt( nX ) INLINE Qt_QTableView_columnAt( ::pPtr, nX ) diff --git a/harbour/contrib/hbqt/TQTableWidget.prg b/harbour/contrib/hbqt/TQTableWidget.prg index 7382a0db67..801425c31d 100644 --- a/harbour/contrib/hbqt/TQTableWidget.prg +++ b/harbour/contrib/hbqt/TQTableWidget.prg @@ -70,7 +70,6 @@ CREATE CLASS QTableWidget INHERIT QTableView METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTableWidget_destroy( ::pPtr ) METHOD cellWidget( nRow, nColumn ) INLINE Qt_QTableWidget_cellWidget( ::pPtr, nRow, nColumn ) METHOD closePersistentEditor( pItem ) INLINE Qt_QTableWidget_closePersistentEditor( ::pPtr, pItem ) diff --git a/harbour/contrib/hbqt/TQTableWidgetItem.prg b/harbour/contrib/hbqt/TQTableWidgetItem.prg index a5fcdbcbe8..456f7d9f9f 100644 --- a/harbour/contrib/hbqt/TQTableWidgetItem.prg +++ b/harbour/contrib/hbqt/TQTableWidgetItem.prg @@ -70,7 +70,6 @@ CREATE CLASS QTableWidgetItem METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTableWidgetItem_destroy( ::pPtr ) METHOD background() INLINE Qt_QTableWidgetItem_background( ::pPtr ) METHOD checkState() INLINE Qt_QTableWidgetItem_checkState( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQTextBlock.prg b/harbour/contrib/hbqt/TQTextBlock.prg index a89eef33b9..21474293c4 100644 --- a/harbour/contrib/hbqt/TQTextBlock.prg +++ b/harbour/contrib/hbqt/TQTextBlock.prg @@ -70,7 +70,6 @@ CREATE CLASS QTextBlock METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTextBlock_destroy( ::pPtr ) METHOD blockFormat() INLINE Qt_QTextBlock_blockFormat( ::pPtr ) METHOD blockFormatIndex() INLINE Qt_QTextBlock_blockFormatIndex( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQTextBlockFormat.prg b/harbour/contrib/hbqt/TQTextBlockFormat.prg index 5c5b6acd23..0377ded54c 100644 --- a/harbour/contrib/hbqt/TQTextBlockFormat.prg +++ b/harbour/contrib/hbqt/TQTextBlockFormat.prg @@ -70,7 +70,6 @@ CREATE CLASS QTextBlockFormat INHERIT QTextFormat METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTextBlockFormat_destroy( ::pPtr ) METHOD alignment() INLINE Qt_QTextBlockFormat_alignment( ::pPtr ) METHOD bottomMargin() INLINE Qt_QTextBlockFormat_bottomMargin( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQTextBlockGroup.prg b/harbour/contrib/hbqt/TQTextBlockGroup.prg index cf9b302953..ef9c1bf5a4 100644 --- a/harbour/contrib/hbqt/TQTextBlockGroup.prg +++ b/harbour/contrib/hbqt/TQTextBlockGroup.prg @@ -70,7 +70,6 @@ CREATE CLASS QTextBlockGroup INHERIT QTextObject METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTextBlockGroup_destroy( ::pPtr ) ENDCLASS diff --git a/harbour/contrib/hbqt/TQTextBoundaryFinder.prg b/harbour/contrib/hbqt/TQTextBoundaryFinder.prg index 716303256c..031b720f47 100644 --- a/harbour/contrib/hbqt/TQTextBoundaryFinder.prg +++ b/harbour/contrib/hbqt/TQTextBoundaryFinder.prg @@ -70,7 +70,6 @@ CREATE CLASS QTextBoundaryFinder METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTextBoundaryFinder_destroy( ::pPtr ) METHOD boundaryReasons() INLINE Qt_QTextBoundaryFinder_boundaryReasons( ::pPtr ) METHOD isAtBoundary() INLINE Qt_QTextBoundaryFinder_isAtBoundary( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQTextBrowser.prg b/harbour/contrib/hbqt/TQTextBrowser.prg index bd10e45b07..d794060035 100644 --- a/harbour/contrib/hbqt/TQTextBrowser.prg +++ b/harbour/contrib/hbqt/TQTextBrowser.prg @@ -70,7 +70,6 @@ CREATE CLASS QTextBrowser INHERIT QTextEdit METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTextBrowser_destroy( ::pPtr ) METHOD backwardHistoryCount() INLINE Qt_QTextBrowser_backwardHistoryCount( ::pPtr ) METHOD clearHistory() INLINE Qt_QTextBrowser_clearHistory( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQTextCharFormat.prg b/harbour/contrib/hbqt/TQTextCharFormat.prg index 07be64208d..c8a56a7ead 100644 --- a/harbour/contrib/hbqt/TQTextCharFormat.prg +++ b/harbour/contrib/hbqt/TQTextCharFormat.prg @@ -70,7 +70,6 @@ CREATE CLASS QTextCharFormat INHERIT QTextFormat METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTextCharFormat_destroy( ::pPtr ) METHOD anchorHref() INLINE Qt_QTextCharFormat_anchorHref( ::pPtr ) METHOD anchorNames() INLINE Qt_QTextCharFormat_anchorNames( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQTextCodec.prg b/harbour/contrib/hbqt/TQTextCodec.prg index 213b2fec2f..af8ffa56b3 100644 --- a/harbour/contrib/hbqt/TQTextCodec.prg +++ b/harbour/contrib/hbqt/TQTextCodec.prg @@ -70,7 +70,6 @@ CREATE CLASS QTextCodec METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTextCodec_destroy( ::pPtr ) METHOD canEncode( nCh ) INLINE Qt_QTextCodec_canEncode( ::pPtr, nCh ) METHOD canEncode_1( cS ) INLINE Qt_QTextCodec_canEncode_1( ::pPtr, cS ) diff --git a/harbour/contrib/hbqt/TQTextCursor.prg b/harbour/contrib/hbqt/TQTextCursor.prg index 3682d1612f..f1d15ff7de 100644 --- a/harbour/contrib/hbqt/TQTextCursor.prg +++ b/harbour/contrib/hbqt/TQTextCursor.prg @@ -70,7 +70,6 @@ CREATE CLASS QTextCursor METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTextCursor_destroy( ::pPtr ) METHOD anchor() INLINE Qt_QTextCursor_anchor( ::pPtr ) METHOD atBlockEnd() INLINE Qt_QTextCursor_atBlockEnd( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQTextDecoder.prg b/harbour/contrib/hbqt/TQTextDecoder.prg index 90a28bcb35..b4d89f5a97 100644 --- a/harbour/contrib/hbqt/TQTextDecoder.prg +++ b/harbour/contrib/hbqt/TQTextDecoder.prg @@ -70,7 +70,6 @@ CREATE CLASS QTextDecoder METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTextDecoder_destroy( ::pPtr ) METHOD toUnicode( pChars, nLen ) INLINE Qt_QTextDecoder_toUnicode( ::pPtr, pChars, nLen ) diff --git a/harbour/contrib/hbqt/TQTextDocument.prg b/harbour/contrib/hbqt/TQTextDocument.prg index 6069e2645e..36a98a59c7 100644 --- a/harbour/contrib/hbqt/TQTextDocument.prg +++ b/harbour/contrib/hbqt/TQTextDocument.prg @@ -70,7 +70,6 @@ CREATE CLASS QTextDocument INHERIT QObject METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTextDocument_destroy( ::pPtr ) METHOD addResource( nType, pName, pResource ) INLINE Qt_QTextDocument_addResource( ::pPtr, nType, pName, pResource ) METHOD adjustSize() INLINE Qt_QTextDocument_adjustSize( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQTextDocumentFragment.prg b/harbour/contrib/hbqt/TQTextDocumentFragment.prg index 9efb3e760a..ea5e6f5993 100644 --- a/harbour/contrib/hbqt/TQTextDocumentFragment.prg +++ b/harbour/contrib/hbqt/TQTextDocumentFragment.prg @@ -70,7 +70,6 @@ CREATE CLASS QTextDocumentFragment METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTextDocumentFragment_destroy( ::pPtr ) METHOD isEmpty() INLINE Qt_QTextDocumentFragment_isEmpty( ::pPtr ) METHOD toHtml( pEncoding ) INLINE Qt_QTextDocumentFragment_toHtml( ::pPtr, pEncoding ) diff --git a/harbour/contrib/hbqt/TQTextDocumentWriter.prg b/harbour/contrib/hbqt/TQTextDocumentWriter.prg index ec44a65c73..caa6512e21 100644 --- a/harbour/contrib/hbqt/TQTextDocumentWriter.prg +++ b/harbour/contrib/hbqt/TQTextDocumentWriter.prg @@ -70,7 +70,6 @@ CREATE CLASS QTextDocumentWriter METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTextDocumentWriter_destroy( ::pPtr ) METHOD codec() INLINE Qt_QTextDocumentWriter_codec( ::pPtr ) METHOD device() INLINE Qt_QTextDocumentWriter_device( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQTextEdit.prg b/harbour/contrib/hbqt/TQTextEdit.prg index 828b183da6..5a7ce038da 100644 --- a/harbour/contrib/hbqt/TQTextEdit.prg +++ b/harbour/contrib/hbqt/TQTextEdit.prg @@ -70,7 +70,6 @@ CREATE CLASS QTextEdit INHERIT QAbstractScrollArea METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTextEdit_destroy( ::pPtr ) METHOD acceptRichText() INLINE Qt_QTextEdit_acceptRichText( ::pPtr ) METHOD alignment() INLINE Qt_QTextEdit_alignment( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQTextEncoder.prg b/harbour/contrib/hbqt/TQTextEncoder.prg index 4fc3910b2b..0179c6e623 100644 --- a/harbour/contrib/hbqt/TQTextEncoder.prg +++ b/harbour/contrib/hbqt/TQTextEncoder.prg @@ -70,7 +70,6 @@ CREATE CLASS QTextEncoder METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTextEncoder_destroy( ::pPtr ) METHOD fromUnicode( cStr ) INLINE Qt_QTextEncoder_fromUnicode( ::pPtr, cStr ) diff --git a/harbour/contrib/hbqt/TQTextFormat.prg b/harbour/contrib/hbqt/TQTextFormat.prg index ccd2526b4b..c36342db5a 100644 --- a/harbour/contrib/hbqt/TQTextFormat.prg +++ b/harbour/contrib/hbqt/TQTextFormat.prg @@ -70,7 +70,6 @@ CREATE CLASS QTextFormat METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTextFormat_destroy( ::pPtr ) METHOD background() INLINE Qt_QTextFormat_background( ::pPtr ) METHOD boolProperty( nPropertyId ) INLINE Qt_QTextFormat_boolProperty( ::pPtr, nPropertyId ) diff --git a/harbour/contrib/hbqt/TQTextFragment.prg b/harbour/contrib/hbqt/TQTextFragment.prg index 3a44ec3954..032a05f40e 100644 --- a/harbour/contrib/hbqt/TQTextFragment.prg +++ b/harbour/contrib/hbqt/TQTextFragment.prg @@ -70,7 +70,6 @@ CREATE CLASS QTextFragment METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTextFragment_destroy( ::pPtr ) METHOD charFormat() INLINE Qt_QTextFragment_charFormat( ::pPtr ) METHOD charFormatIndex() INLINE Qt_QTextFragment_charFormatIndex( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQTextFrame.prg b/harbour/contrib/hbqt/TQTextFrame.prg index 37342df373..fda1dcbe4a 100644 --- a/harbour/contrib/hbqt/TQTextFrame.prg +++ b/harbour/contrib/hbqt/TQTextFrame.prg @@ -70,7 +70,6 @@ CREATE CLASS QTextFrame INHERIT QTextObject METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTextFrame_destroy( ::pPtr ) METHOD firstCursorPosition() INLINE Qt_QTextFrame_firstCursorPosition( ::pPtr ) METHOD firstPosition() INLINE Qt_QTextFrame_firstPosition( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQTextFrameFormat.prg b/harbour/contrib/hbqt/TQTextFrameFormat.prg index 1be6869c65..a0e2ce0b88 100644 --- a/harbour/contrib/hbqt/TQTextFrameFormat.prg +++ b/harbour/contrib/hbqt/TQTextFrameFormat.prg @@ -70,7 +70,6 @@ CREATE CLASS QTextFrameFormat INHERIT QTextFormat METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTextFrameFormat_destroy( ::pPtr ) METHOD border() INLINE Qt_QTextFrameFormat_border( ::pPtr ) METHOD borderBrush() INLINE Qt_QTextFrameFormat_borderBrush( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQTextImageFormat.prg b/harbour/contrib/hbqt/TQTextImageFormat.prg index f481c3ea23..2ac186976c 100644 --- a/harbour/contrib/hbqt/TQTextImageFormat.prg +++ b/harbour/contrib/hbqt/TQTextImageFormat.prg @@ -70,7 +70,6 @@ CREATE CLASS QTextImageFormat INHERIT QTextCharFormat METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTextImageFormat_destroy( ::pPtr ) METHOD height() INLINE Qt_QTextImageFormat_height( ::pPtr ) METHOD isValid() INLINE Qt_QTextImageFormat_isValid( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQTextInlineObject.prg b/harbour/contrib/hbqt/TQTextInlineObject.prg index f61c63fb6a..f3946d890b 100644 --- a/harbour/contrib/hbqt/TQTextInlineObject.prg +++ b/harbour/contrib/hbqt/TQTextInlineObject.prg @@ -70,7 +70,6 @@ CREATE CLASS QTextInlineObject METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTextInlineObject_destroy( ::pPtr ) METHOD ascent() INLINE Qt_QTextInlineObject_ascent( ::pPtr ) METHOD descent() INLINE Qt_QTextInlineObject_descent( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQTextItem.prg b/harbour/contrib/hbqt/TQTextItem.prg index fa1eaeee98..bd049e545a 100644 --- a/harbour/contrib/hbqt/TQTextItem.prg +++ b/harbour/contrib/hbqt/TQTextItem.prg @@ -70,7 +70,6 @@ CREATE CLASS QTextItem METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTextItem_destroy( ::pPtr ) METHOD ascent() INLINE Qt_QTextItem_ascent( ::pPtr ) METHOD descent() INLINE Qt_QTextItem_descent( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQTextLayout.prg b/harbour/contrib/hbqt/TQTextLayout.prg index d51eced3fe..f1242e8752 100644 --- a/harbour/contrib/hbqt/TQTextLayout.prg +++ b/harbour/contrib/hbqt/TQTextLayout.prg @@ -70,7 +70,6 @@ CREATE CLASS QTextLayout METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTextLayout_destroy( ::pPtr ) METHOD beginLayout() INLINE Qt_QTextLayout_beginLayout( ::pPtr ) METHOD boundingRect() INLINE Qt_QTextLayout_boundingRect( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQTextLength.prg b/harbour/contrib/hbqt/TQTextLength.prg index 4fc97562e8..aaafed87f8 100644 --- a/harbour/contrib/hbqt/TQTextLength.prg +++ b/harbour/contrib/hbqt/TQTextLength.prg @@ -70,7 +70,6 @@ CREATE CLASS QTextLength METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTextLength_destroy( ::pPtr ) METHOD rawValue() INLINE Qt_QTextLength_rawValue( ::pPtr ) METHOD type() INLINE Qt_QTextLength_type( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQTextLine.prg b/harbour/contrib/hbqt/TQTextLine.prg index 9e29deddb3..3c43b0cf73 100644 --- a/harbour/contrib/hbqt/TQTextLine.prg +++ b/harbour/contrib/hbqt/TQTextLine.prg @@ -70,7 +70,6 @@ CREATE CLASS QTextLine METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTextLine_destroy( ::pPtr ) METHOD ascent() INLINE Qt_QTextLine_ascent( ::pPtr ) METHOD cursorToX( nCursorPos, nEdge ) INLINE Qt_QTextLine_cursorToX( ::pPtr, nCursorPos, nEdge ) diff --git a/harbour/contrib/hbqt/TQTextObject.prg b/harbour/contrib/hbqt/TQTextObject.prg index 78da98becd..35fe1b550f 100644 --- a/harbour/contrib/hbqt/TQTextObject.prg +++ b/harbour/contrib/hbqt/TQTextObject.prg @@ -70,7 +70,6 @@ CREATE CLASS QTextObject INHERIT QObject METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTextObject_destroy( ::pPtr ) METHOD document() INLINE Qt_QTextObject_document( ::pPtr ) METHOD format() INLINE Qt_QTextObject_format( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQTextStream.prg b/harbour/contrib/hbqt/TQTextStream.prg index 6f3247c0ec..968a42aeff 100644 --- a/harbour/contrib/hbqt/TQTextStream.prg +++ b/harbour/contrib/hbqt/TQTextStream.prg @@ -70,7 +70,6 @@ CREATE CLASS QTextStream METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTextStream_destroy( ::pPtr ) METHOD atEnd() INLINE Qt_QTextStream_atEnd( ::pPtr ) METHOD autoDetectUnicode() INLINE Qt_QTextStream_autoDetectUnicode( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQTimeEdit.prg b/harbour/contrib/hbqt/TQTimeEdit.prg index 0d8285cfa3..db06bc1707 100644 --- a/harbour/contrib/hbqt/TQTimeEdit.prg +++ b/harbour/contrib/hbqt/TQTimeEdit.prg @@ -70,7 +70,6 @@ CREATE CLASS QTimeEdit INHERIT QDateTimeEdit METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTimeEdit_destroy( ::pPtr ) ENDCLASS diff --git a/harbour/contrib/hbqt/TQTimer.prg b/harbour/contrib/hbqt/TQTimer.prg index 12bac347bf..28dbbf5c81 100644 --- a/harbour/contrib/hbqt/TQTimer.prg +++ b/harbour/contrib/hbqt/TQTimer.prg @@ -70,7 +70,6 @@ CREATE CLASS QTimer INHERIT QObject METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTimer_destroy( ::pPtr ) METHOD interval() INLINE Qt_QTimer_interval( ::pPtr ) METHOD isActive() INLINE Qt_QTimer_isActive( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQToolBar.prg b/harbour/contrib/hbqt/TQToolBar.prg index f274ba9bb2..ecd00ac28e 100644 --- a/harbour/contrib/hbqt/TQToolBar.prg +++ b/harbour/contrib/hbqt/TQToolBar.prg @@ -70,7 +70,6 @@ CREATE CLASS QToolBar INHERIT QWidget METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QToolBar_destroy( ::pPtr ) METHOD actionAt( pP ) INLINE Qt_QToolBar_actionAt( ::pPtr, pP ) METHOD actionAt_1( nX, nY ) INLINE Qt_QToolBar_actionAt_1( ::pPtr, nX, nY ) diff --git a/harbour/contrib/hbqt/TQToolBox.prg b/harbour/contrib/hbqt/TQToolBox.prg index ebc63fbc98..e7ad7bb3dd 100644 --- a/harbour/contrib/hbqt/TQToolBox.prg +++ b/harbour/contrib/hbqt/TQToolBox.prg @@ -70,7 +70,6 @@ CREATE CLASS QToolBox INHERIT QFrame METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QToolBox_destroy( ::pPtr ) METHOD addItem( pWidget, cIconSet, cText ) INLINE Qt_QToolBox_addItem( ::pPtr, pWidget, cIconSet, cText ) METHOD addItem_1( pW, cText ) INLINE Qt_QToolBox_addItem_1( ::pPtr, pW, cText ) diff --git a/harbour/contrib/hbqt/TQToolButton.prg b/harbour/contrib/hbqt/TQToolButton.prg index ccc2b785ae..39607effaa 100644 --- a/harbour/contrib/hbqt/TQToolButton.prg +++ b/harbour/contrib/hbqt/TQToolButton.prg @@ -70,7 +70,6 @@ CREATE CLASS QToolButton INHERIT QAbstractButton METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QToolButton_destroy( ::pPtr ) METHOD arrowType() INLINE Qt_QToolButton_arrowType( ::pPtr ) METHOD autoRaise() INLINE Qt_QToolButton_autoRaise( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQTreeView.prg b/harbour/contrib/hbqt/TQTreeView.prg index 5a01ec9450..ab69f90e73 100644 --- a/harbour/contrib/hbqt/TQTreeView.prg +++ b/harbour/contrib/hbqt/TQTreeView.prg @@ -70,7 +70,6 @@ CREATE CLASS QTreeView INHERIT QAbstractItemView METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTreeView_destroy( ::pPtr ) METHOD allColumnsShowFocus() INLINE Qt_QTreeView_allColumnsShowFocus( ::pPtr ) METHOD autoExpandDelay() INLINE Qt_QTreeView_autoExpandDelay( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQTreeWidget.prg b/harbour/contrib/hbqt/TQTreeWidget.prg index f21b29eecd..2db3c876e5 100644 --- a/harbour/contrib/hbqt/TQTreeWidget.prg +++ b/harbour/contrib/hbqt/TQTreeWidget.prg @@ -70,7 +70,6 @@ CREATE CLASS QTreeWidget INHERIT QTreeView METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTreeWidget_destroy( ::pPtr ) METHOD addTopLevelItem( pItem ) INLINE Qt_QTreeWidget_addTopLevelItem( ::pPtr, pItem ) METHOD closePersistentEditor( pItem, nColumn ) INLINE Qt_QTreeWidget_closePersistentEditor( ::pPtr, pItem, nColumn ) diff --git a/harbour/contrib/hbqt/TQTreeWidgetItem.prg b/harbour/contrib/hbqt/TQTreeWidgetItem.prg index 3ff3d24a96..bf266bef6f 100644 --- a/harbour/contrib/hbqt/TQTreeWidgetItem.prg +++ b/harbour/contrib/hbqt/TQTreeWidgetItem.prg @@ -70,7 +70,6 @@ CREATE CLASS QTreeWidgetItem METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QTreeWidgetItem_destroy( ::pPtr ) METHOD addChild( pChild ) INLINE Qt_QTreeWidgetItem_addChild( ::pPtr, pChild ) METHOD background( nColumn ) INLINE Qt_QTreeWidgetItem_background( ::pPtr, nColumn ) diff --git a/harbour/contrib/hbqt/TQUrl.prg b/harbour/contrib/hbqt/TQUrl.prg index 64c9787fa4..af22d95421 100644 --- a/harbour/contrib/hbqt/TQUrl.prg +++ b/harbour/contrib/hbqt/TQUrl.prg @@ -70,7 +70,6 @@ CREATE CLASS QUrl INHERIT QWidget METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QUrl_destroy( ::pPtr ) METHOD addEncodedQueryItem( pKey, pValue ) INLINE Qt_QUrl_addEncodedQueryItem( ::pPtr, pKey, pValue ) METHOD addQueryItem( cKey, cValue ) INLINE Qt_QUrl_addQueryItem( ::pPtr, cKey, cValue ) diff --git a/harbour/contrib/hbqt/TQVBoxLayout.prg b/harbour/contrib/hbqt/TQVBoxLayout.prg index c0350304e4..994d582277 100644 --- a/harbour/contrib/hbqt/TQVBoxLayout.prg +++ b/harbour/contrib/hbqt/TQVBoxLayout.prg @@ -70,7 +70,6 @@ CREATE CLASS QVBoxLayout INHERIT QBoxLayout METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QVBoxLayout_destroy( ::pPtr ) ENDCLASS diff --git a/harbour/contrib/hbqt/TQVariant.prg b/harbour/contrib/hbqt/TQVariant.prg index 658fda7339..c163dff92c 100644 --- a/harbour/contrib/hbqt/TQVariant.prg +++ b/harbour/contrib/hbqt/TQVariant.prg @@ -70,7 +70,6 @@ CREATE CLASS QVariant METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QVariant_destroy( ::pPtr ) METHOD canConvert( nT ) INLINE Qt_QVariant_canConvert( ::pPtr, nT ) METHOD canConvert_1( nT ) INLINE Qt_QVariant_canConvert_1( ::pPtr, nT ) diff --git a/harbour/contrib/hbqt/TQWebFrame.prg b/harbour/contrib/hbqt/TQWebFrame.prg index e442e0d11e..3df45e3f05 100644 --- a/harbour/contrib/hbqt/TQWebFrame.prg +++ b/harbour/contrib/hbqt/TQWebFrame.prg @@ -70,7 +70,6 @@ CREATE CLASS QWebFrame INHERIT QObject METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QWebFrame_destroy( ::pPtr ) METHOD addToJavaScriptWindowObject( cName, pObject ) INLINE Qt_QWebFrame_addToJavaScriptWindowObject( ::pPtr, cName, pObject ) METHOD addToJavaScriptWindowObject_1( cName, pObject, nOwn ) INLINE Qt_QWebFrame_addToJavaScriptWindowObject_1( ::pPtr, cName, pObject, nOwn ) diff --git a/harbour/contrib/hbqt/TQWebHistory.prg b/harbour/contrib/hbqt/TQWebHistory.prg index 4fa04e7d42..6383f86482 100644 --- a/harbour/contrib/hbqt/TQWebHistory.prg +++ b/harbour/contrib/hbqt/TQWebHistory.prg @@ -70,7 +70,6 @@ CREATE CLASS QWebHistory METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QWebHistory_destroy( ::pPtr ) METHOD back() INLINE Qt_QWebHistory_back( ::pPtr ) METHOD backItem() INLINE Qt_QWebHistory_backItem( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQWebHistoryInterface.prg b/harbour/contrib/hbqt/TQWebHistoryInterface.prg index ef26ba6dcb..864fd96b39 100644 --- a/harbour/contrib/hbqt/TQWebHistoryInterface.prg +++ b/harbour/contrib/hbqt/TQWebHistoryInterface.prg @@ -70,7 +70,6 @@ CREATE CLASS QWebHistoryInterface INHERIT QObject METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QWebHistoryInterface_destroy( ::pPtr ) METHOD addHistoryEntry( cUrl ) INLINE Qt_QWebHistoryInterface_addHistoryEntry( ::pPtr, cUrl ) METHOD historyContains( cUrl ) INLINE Qt_QWebHistoryInterface_historyContains( ::pPtr, cUrl ) diff --git a/harbour/contrib/hbqt/TQWebHistoryItem.prg b/harbour/contrib/hbqt/TQWebHistoryItem.prg index c6cc31862b..2961891b17 100644 --- a/harbour/contrib/hbqt/TQWebHistoryItem.prg +++ b/harbour/contrib/hbqt/TQWebHistoryItem.prg @@ -70,7 +70,6 @@ CREATE CLASS QWebHistoryItem METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QWebHistoryItem_destroy( ::pPtr ) METHOD icon() INLINE Qt_QWebHistoryItem_icon( ::pPtr ) METHOD isValid() INLINE Qt_QWebHistoryItem_isValid( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQWebHitTestResult.prg b/harbour/contrib/hbqt/TQWebHitTestResult.prg index 477b9b3627..7ebc1beef7 100644 --- a/harbour/contrib/hbqt/TQWebHitTestResult.prg +++ b/harbour/contrib/hbqt/TQWebHitTestResult.prg @@ -70,7 +70,6 @@ CREATE CLASS QWebHitTestResult METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QWebHitTestResult_destroy( ::pPtr ) METHOD alternateText() INLINE Qt_QWebHitTestResult_alternateText( ::pPtr ) METHOD boundingRect() INLINE Qt_QWebHitTestResult_boundingRect( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQWebPage.prg b/harbour/contrib/hbqt/TQWebPage.prg index 43767c2eef..bdce31968a 100644 --- a/harbour/contrib/hbqt/TQWebPage.prg +++ b/harbour/contrib/hbqt/TQWebPage.prg @@ -70,7 +70,6 @@ CREATE CLASS QWebPage INHERIT QObject METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QWebPage_destroy( ::pPtr ) METHOD action( nAction ) INLINE Qt_QWebPage_action( ::pPtr, nAction ) METHOD bytesReceived() INLINE Qt_QWebPage_bytesReceived( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQWebPluginFactory.prg b/harbour/contrib/hbqt/TQWebPluginFactory.prg index d9c491a52f..5c2d0876cc 100644 --- a/harbour/contrib/hbqt/TQWebPluginFactory.prg +++ b/harbour/contrib/hbqt/TQWebPluginFactory.prg @@ -70,7 +70,6 @@ CREATE CLASS QWebPluginFactory INHERIT QObject METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QWebPluginFactory_destroy( ::pPtr ) METHOD create( cMimeType, pUrl, pArgumentNames, pArgumentValues ) INLINE Qt_QWebPluginFactory_create( ::pPtr, cMimeType, pUrl, pArgumentNames, pArgumentValues ) METHOD refreshPlugins() INLINE Qt_QWebPluginFactory_refreshPlugins( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQWebSecurityOrigin.prg b/harbour/contrib/hbqt/TQWebSecurityOrigin.prg index b5822e1073..ff11d33fb1 100644 --- a/harbour/contrib/hbqt/TQWebSecurityOrigin.prg +++ b/harbour/contrib/hbqt/TQWebSecurityOrigin.prg @@ -70,7 +70,6 @@ CREATE CLASS QWebSecurityOrigin METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QWebSecurityOrigin_destroy( ::pPtr ) METHOD databaseQuota() INLINE Qt_QWebSecurityOrigin_databaseQuota( ::pPtr ) METHOD databaseUsage() INLINE Qt_QWebSecurityOrigin_databaseUsage( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQWebSettings.prg b/harbour/contrib/hbqt/TQWebSettings.prg index e19627afaf..5f89b7c9be 100644 --- a/harbour/contrib/hbqt/TQWebSettings.prg +++ b/harbour/contrib/hbqt/TQWebSettings.prg @@ -70,7 +70,6 @@ CREATE CLASS QWebSettings METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QWebSettings_destroy( ::pPtr ) METHOD fontFamily( nWhich ) INLINE Qt_QWebSettings_fontFamily( ::pPtr, nWhich ) METHOD fontSize( nType ) INLINE Qt_QWebSettings_fontSize( ::pPtr, nType ) diff --git a/harbour/contrib/hbqt/TQWebView.prg b/harbour/contrib/hbqt/TQWebView.prg index c313492f8b..9d542e008c 100644 --- a/harbour/contrib/hbqt/TQWebView.prg +++ b/harbour/contrib/hbqt/TQWebView.prg @@ -70,7 +70,6 @@ CREATE CLASS QWebView INHERIT QWidget METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QWebView_destroy( ::pPtr ) METHOD findText( cSubString, nOptions ) INLINE Qt_QWebView_findText( ::pPtr, cSubString, nOptions ) METHOD history() INLINE Qt_QWebView_history( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQWheelEvent.prg b/harbour/contrib/hbqt/TQWheelEvent.prg index b12dcb3519..9057009c13 100644 --- a/harbour/contrib/hbqt/TQWheelEvent.prg +++ b/harbour/contrib/hbqt/TQWheelEvent.prg @@ -70,7 +70,6 @@ CREATE CLASS QWheelEvent INHERIT QInputEvent METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QWheelEvent_destroy( ::pPtr ) METHOD buttons() INLINE Qt_QWheelEvent_buttons( ::pPtr ) METHOD delta() INLINE Qt_QWheelEvent_delta( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQWidget.prg b/harbour/contrib/hbqt/TQWidget.prg index b4716d047c..6a358f0d7b 100644 --- a/harbour/contrib/hbqt/TQWidget.prg +++ b/harbour/contrib/hbqt/TQWidget.prg @@ -70,7 +70,6 @@ CREATE CLASS QWidget INHERIT QObject, QPaintDevice METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QWidget_destroy( ::pPtr ) METHOD acceptDrops() INLINE Qt_QWidget_acceptDrops( ::pPtr ) METHOD accessibleDescription() INLINE Qt_QWidget_accessibleDescription( ::pPtr ) @@ -249,7 +248,6 @@ CREATE CLASS QWidget INHERIT QObject, QPaintDevice METHOD visibleRegion() INLINE Qt_QWidget_visibleRegion( ::pPtr ) METHOD whatsThis() INLINE Qt_QWidget_whatsThis( ::pPtr ) METHOD width() INLINE Qt_QWidget_width( ::pPtr ) - METHOD winId() INLINE Qt_QWidget_winId( ::pPtr ) METHOD window() INLINE Qt_QWidget_window( ::pPtr ) METHOD windowFilePath() INLINE Qt_QWidget_windowFilePath( ::pPtr ) METHOD windowFlags() INLINE Qt_QWidget_windowFlags( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQWidgetAction.prg b/harbour/contrib/hbqt/TQWidgetAction.prg index 5eb930571c..c685ff685f 100644 --- a/harbour/contrib/hbqt/TQWidgetAction.prg +++ b/harbour/contrib/hbqt/TQWidgetAction.prg @@ -70,7 +70,6 @@ CREATE CLASS QWidgetAction INHERIT QAction METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QWidgetAction_destroy( ::pPtr ) METHOD defaultWidget() INLINE Qt_QWidgetAction_defaultWidget( ::pPtr ) METHOD releaseWidget( pWidget ) INLINE Qt_QWidgetAction_releaseWidget( ::pPtr, pWidget ) diff --git a/harbour/contrib/hbqt/TQWidgetItem.prg b/harbour/contrib/hbqt/TQWidgetItem.prg index be62ae883e..9eb461d951 100644 --- a/harbour/contrib/hbqt/TQWidgetItem.prg +++ b/harbour/contrib/hbqt/TQWidgetItem.prg @@ -70,7 +70,6 @@ CREATE CLASS QWidgetItem INHERIT QLayoutItem METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QWidgetItem_destroy( ::pPtr ) METHOD isEmpty() INLINE Qt_QWidgetItem_isEmpty( ::pPtr ) METHOD widget() INLINE Qt_QWidgetItem_widget( ::pPtr ) diff --git a/harbour/contrib/hbqt/TQWindowsStyle.prg b/harbour/contrib/hbqt/TQWindowsStyle.prg index b64e8b49c8..f8f506e3d3 100644 --- a/harbour/contrib/hbqt/TQWindowsStyle.prg +++ b/harbour/contrib/hbqt/TQWindowsStyle.prg @@ -70,7 +70,6 @@ CREATE CLASS QWindowsStyle INHERIT QCommonStyle METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QWindowsStyle_destroy( ::pPtr ) ENDCLASS diff --git a/harbour/contrib/hbqt/TQWindowsXPStyle.prg b/harbour/contrib/hbqt/TQWindowsXPStyle.prg index 675a96e9b8..4be3e2002f 100644 --- a/harbour/contrib/hbqt/TQWindowsXPStyle.prg +++ b/harbour/contrib/hbqt/TQWindowsXPStyle.prg @@ -70,7 +70,6 @@ CREATE CLASS QWindowsXPStyle INHERIT QWindowsStyle METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QWindowsXPStyle_destroy( ::pPtr ) ENDCLASS diff --git a/harbour/contrib/hbqt/TQWizard.prg b/harbour/contrib/hbqt/TQWizard.prg index c64ee1218e..21b09a915c 100644 --- a/harbour/contrib/hbqt/TQWizard.prg +++ b/harbour/contrib/hbqt/TQWizard.prg @@ -70,7 +70,6 @@ CREATE CLASS QWizard INHERIT QDialog METHOD New() METHOD Configure( xObject ) - METHOD Destroy() INLINE Qt_QWizard_destroy( ::pPtr ) METHOD addPage( pPage ) INLINE Qt_QWizard_addPage( ::pPtr, pPage ) METHOD button( nWhich ) INLINE Qt_QWizard_button( ::pPtr, nWhich ) diff --git a/harbour/contrib/hbqt/filelist.mk b/harbour/contrib/hbqt/filelist.mk index 0177caca2a..86f7b195a9 100644 --- a/harbour/contrib/hbqt/filelist.mk +++ b/harbour/contrib/hbqt/filelist.mk @@ -13,6 +13,7 @@ CPP_SOURCES := \ hbqt_base.cpp \ hbqt_utils.cpp \ hbqt_slots.cpp \ + hbqt_destruct.cpp \ QAbstractButton.cpp \ QAbstractItemModel.cpp \ QAbstractItemView.cpp \ diff --git a/harbour/contrib/hbqt/generator/hbqtgen.prg b/harbour/contrib/hbqt/generator/hbqtgen.prg index 08de6ef396..8a87d746ae 100644 --- a/harbour/contrib/hbqt/generator/hbqtgen.prg +++ b/harbour/contrib/hbqt/generator/hbqtgen.prg @@ -1,56 +1,3 @@ -/* - * $Id$ - */ - -/* - * Harbour Project source code: - * QT Source Generator for Harbour - * - * Copyright 2009 Pritpal Bedi - * www - http://www.harbour-project.org - * - * 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, 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 software; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). - * - * As a special exception, the Harbour Project gives permission for - * additional uses of the text contained in its release of Harbour. - * - * The exception is that, if you link the Harbour libraries with other - * files to produce an executable, this does not by itself cause the - * resulting executable to be covered by the GNU General Public License. - * Your use of that executable is in no way restricted on account of - * linking the Harbour library code into it. - * - * This exception does not however invalidate any other reasons why - * the executable file might be covered by the GNU General Public License. - * - * This exception applies only to the code released by the Harbour - * Project under the name Harbour. If you copy code from other - * Harbour Project or Free Software Foundation releases into a copy of - * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading - * anyone as to the status of such modified files, you must delete - * this exception notice from them. - * - * If you write modifications of your own for Harbour, it is your choice - * whether to permit this exception to apply to your modifications. - * If you do not wish that, delete this exception notice. - * - */ -/*----------------------------------------------------------------------*/ - #include "common.ch" #include "fileio.ch" @@ -58,6 +5,8 @@ STATIC s_NewLine STATIC s_PathSep +STATIC isClassObject +STATIC zWidget /*----------------------------------------------------------------------*/ @@ -269,14 +218,16 @@ STATIC FUNCTION PullOutSection( cQth, cSec ) /*----------------------------------------------------------------------*/ STATIC FUNCTION GenSource( cProFile, cPathIn, cPathOut, cPathDoc ) - LOCAL cFile, cWidget, cExt, cPath, cOrg, cCPP, cPRG - LOCAL cQth, cFileCpp - LOCAL s, n, nFuncs, nCnvrtd + LOCAL cFile, cWidget, cExt, cPath, cOrg, cCPP, cPRG, lConst //, lList, cWgt, lDestructor + LOCAL cQth, cFileCpp, s, n, nFuncs, nCnvrtd, n1, i, cFunc, lObject LOCAL b_, txt_, enum_, code_, func_, dummy_, cpp_, cmntd_, doc_, varbls_ - LOCAL class_, cls_, protos_, slots_, enums_, docum_, subCls_ + LOCAL class_, cls_, protos_, slots_, enums_, docum_, subCls_, new_, old_ hb_fNameSplit( cProFile, @cPath, @cWidget, @cExt ) + isClassObject := IsQObject( cWidget ) + zWidget := cWidget + IF empty( cPath ) cFile := cPathIn + s_PathSep + cProFile ELSE @@ -321,6 +272,25 @@ STATIC FUNCTION GenSource( cProFile, cPathIn, cPathOut, cPathDoc ) /* Pull out Code Section */ code_ := PullOutSection( @cQth, 'CODE' ) + /* Separate constructor function */ + new_:={} + cFunc := "HB_FUNC( QT_" + upper( cWidget ) + " )" + n := ascan( code_, {|e| cFunc $ e } ) + FOR i := n TO len( code_ ) + aadd( new_, code_[ i ] ) + IF trim( code_[ i ] ) == "}" + n1 := i + EXIT + endif + NEXT + old_:={} + FOR i := 1 TO len( code_ ) + IF i < n .or. i > n1 + aadd( old_, code_[ i ] ) + ENDIF + NEXT + code_:= old_ + /* Pull out Enumerators */ enums_ := PullOutSection( @cQth, 'ENUMS' ) enum_:={} @@ -462,26 +432,66 @@ STATIC FUNCTION GenSource( cProFile, cPathIn, cPathOut, cPathDoc ) aadd( cpp_, '' ) ENDIF - /* Insert user defined code */ + /* Insert user defined code - INCLUDEs */ + aadd( cpp_, "#include " ) IF !empty( code_ ) aeval( code_, {|e| aadd( cpp_, strtran( e, chr( 13 ), '' ) ) } ) aadd( cpp_, "" ) ENDIF - /* Generate Destructor */ - aadd( cpp_, '/*' ) - aadd( cpp_, ' * DESTRUCTOR ' ) - aadd( cpp_, ' */' ) - aadd( cpp_, 'HB_FUNC( QT_' + upper( cWidget ) + '_DESTROY )' ) - aadd( cpp_, '{ ' ) - IF ( '~'+cWidget $ cQth ) - aadd( cpp_, ' delete hbqt_par_' + cWidget + '( 1 );' ) - //aadd( cpp_, ' hbqt_par_' + cWidget + '( 1 )->~' + cWidget + '();' ) - ELSE - aadd( cpp_, ' ' ) + //lList := ascan( cls_, {|e_| lower( e_[ 1 ] ) == "list" .and. lower( e_[ 2 ] ) == "yes" } ) > 0 + //cWgt := IF( lList, cWidget +"< void * >", cWidget ) + //lDestructor := ascan( cls_, {|e_| lower( e_[ 1 ] ) == "destructor" .and. lower( e_[ 2 ] ) == "no"} ) == 0 + lObject := ascan( cls_, {|e_| lower( e_[ 1 ] ) == "qobject" .and. lower( e_[ 2 ] ) == "no"} ) == 0 + + /* Insert CONSTRUCTOR - if defined */ + lConst := .f. + FOR i := 3 TO len( new_ ) - 1 + IF left( ltrim( new_[ i ] ), 2 ) != "//" + IF "hb_retptr(" $ new_[ i ] + lConst := .t. + EXIT + ENDIF + ENDIF + NEXT + aadd( cpp_, new_[ 1 ] ) // Func definition + aadd( cpp_, new_[ 2 ] ) // { + IF lConst + // lObject := IsQObject( cWidget ) .or. lObject + IF lObject .or. IsMemObject( cWidget ) + aadd( cpp_, " QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release );" ) + ENDIF + IF lObject + aadd( cpp_, " QPointer< "+ cWidget +" > pObj = NULL;" ) + ELSE + aadd( cpp_, " void * pObj = NULL;" ) + ENDIF + aadd( cpp_, "" ) + FOR i := 3 TO len( new_ ) - 1 + IF left( ltrim( new_[ i ] ), 2 ) != "//" + IF "hb_retptr(" $ new_[ i ] + s := trim( strtran( new_[ i ], "hb_retptr(", "pObj =" ) ) + s := strtran( s, ");", ";" ) + aadd( cpp_, s ) + ELSE + aadd( cpp_, new_[ i ] ) + ENDIF + ENDIF + NEXT + aadd( cpp_, "" ) + IF lObject .or. IsMemObject( cWidget ) + aadd( cpp_, " p->ph = pObj;" ) + IF lObject + aadd( cpp_, " p->type = 1001;" ) + ELSE + aadd( cpp_, ' p->type = hbqt_getIdByName( ( QString ) "' + cWidget + '" );' ) + ENDIF + aadd( cpp_, " hb_retptrGC( p );" ) + ELSE + aadd( cpp_, " hb_retptr( pObj );" ) + ENDIF ENDIF - aadd( cpp_, '} ' ) - aadd( cpp_, ' ' ) + aadd( cpp_, new_[ len( new_ ) ] ) // } /* Insert Functions */ aeval( txt_, {|e| aadd( cpp_, strtran( e, chr( 13 ), '' ) ) } ) @@ -851,7 +861,6 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_ ) cPrgRet := 'c' + cDocNM CASE aA[ PRT_CAST ] == 'QString' - //cCmd := 'hb_retc( ' + cCmn + '.toLatin1().data()' + ' )' cCmd := 'hb_retc( ' + cCmn + '.toAscii().data()' + ' )' cPrgRet := 'c' + cDocNM @@ -864,11 +873,15 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_ ) cPrgRet := 'p' + cDocNM CASE aA[ PRT_L_AND ] .AND. aA[ PRT_L_CONST ] - cCmd := 'hb_retptr( new ' + aA[ PRT_CAST ] + '( ' + cCmn + ' ) )' +// cCmd := 'hb_retptr( new ' + aA[ PRT_CAST ] + '( ' + cCmn + ' ) )' +// cCmd := 'hb_retptrGC( hbqt_pToGCPointer( new ' + aA[ PRT_CAST ] + '( ' + cCmn + ' ) ) )' + cCmd := Get_Command( aA[ PRT_CAST ], cCmn ) cPrgRet := 'p' + cDocNM CASE aA[ PRT_L_CONST ] - cCmd := 'hb_retptr( new ' + aA[ PRT_CAST ] + '( ' + cCmn + ' ) )' +// cCmd := 'hb_retptr( new ' + aA[ PRT_CAST ] + '( ' + cCmn + ' ) )' +// cCmd := 'hb_retptrGC( hbqt_pToGCPointer( new ' + aA[ PRT_CAST ] + '( ' + cCmn + ' ) ) )' + cCmd := Get_Command( aA[ PRT_CAST ], cCmn ) cPrgRet := 'p' + cDocNM CASE aA[ PRT_L_AND ] @@ -878,7 +891,9 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_ ) OTHERWISE /* No attribute is attached to return value */ IF left( aA[ PRT_CAST ], 1 ) == 'Q' - cCmd := 'hb_retptr( new ' + aA[ PRT_CAST ] + '( ' + cCmn + ' ) )' +// cCmd := 'hb_retptr( new ' + aA[ PRT_CAST ] + '( ' + cCmn + ' ) )' +// cCmd := 'hb_retptrGC( hbqt_pToGCPointer( new ' + aA[ PRT_CAST ] + '( ' + cCmn + ' ) ) )' + cCmd := Get_Command( aA[ PRT_CAST ], cCmn ) cPrgRet := 'p' + cDocNM ELSE @@ -1041,7 +1056,9 @@ STATIC FUNCTION ParseVariables( cProto, cWidget, txt_, doc_, aEnum, func_ ) OTHERWISE /* No attribute is attached to return value */ IF left( aA[ PRT_CAST ], 1 ) == 'Q' - cCmd := 'hb_retptr( new ' + aA[ PRT_CAST ] + '( ' + cCmn + ' ) )' +// cCmd := 'hb_retptr( new ' + aA[ PRT_CAST ] + '( ' + cCmn + ' ) )' +// cCmd := 'hb_retptrGC( hbqt_pToGCPointer( new ' + aA[ PRT_CAST ] + '( ' + cCmn + ' ) ) )' + cCmd := Get_Command( aA[ PRT_CAST ], cCmn ) cPrgRet := 'p' + cDocNM ELSE @@ -1279,7 +1296,7 @@ STATIC FUNCTION Build_Class( cWidget, cls_, doc_, cPathOut, subCls_ ) aadd( txt_, '' ) aadd( txt_, ' METHOD New()' ) aadd( txt_, ' METHOD Configure( xObject )' ) - aadd( txt_, ' METHOD Destroy() INLINE Qt_' + cWidget + '_destroy( ::pPtr )' ) +// aadd( txt_, ' METHOD Destroy() INLINE Qt_' + cWidget + '_destroy( ::pPtr )' ) aadd( txt_, '' ) /* Populate METHODS */ @@ -1390,6 +1407,7 @@ STATIC FUNCTION Build_MakeFile( cpp_, prg_, cPathOut ) aadd( txt_, " " + "hbqt_base.cpp \" ) aadd( txt_, " " + "hbqt_utils.cpp \" ) aadd( txt_, " " + "hbqt_slots.cpp \" ) + aadd( txt_, " " + "hbqt_destruct.cpp \" ) FOR EACH s IN cpp_ aadd( txt_, " " + s + ".cpp \" ) NEXT @@ -1679,3 +1697,342 @@ FUNCTION Build_HtmlHeader( aHTML ) RETURN Nil /*----------------------------------------------------------------------*/ + +FUNCTION IsQObject( cWidget ) + STATIC aTree := {} + + IF empty( aTree ) + aadd( aTree, "QObject " ) + aadd( aTree, " QAbstractEventDispatcher " ) + aadd( aTree, " QAbstractItemDelegate " ) + aadd( aTree, " QItemDelegate " ) + aadd( aTree, " QSqlRelationalDelegate " ) + aadd( aTree, " QStyledItemDelegate " ) + aadd( aTree, " QAbstractItemModel " ) + aadd( aTree, " QAbstractListModel " ) + aadd( aTree, " QStringListModel " ) + aadd( aTree, " QHelpIndexModel " ) + aadd( aTree, " QAbstractProxyModel " ) + aadd( aTree, " QSortFilterProxyModel " ) + aadd( aTree, " QAbstractTableModel " ) + aadd( aTree, " QSqlQueryModel " ) + aadd( aTree, " QSqlTableModel " ) + aadd( aTree, " QSqlRelationalTableModel " ) + aadd( aTree, " QDirModel " ) + aadd( aTree, " QFileSystemModel " ) + aadd( aTree, " QHelpContentModel " ) + aadd( aTree, " QProxyModel " ) + aadd( aTree, " QStandardItemModel " ) + aadd( aTree, " QAbstractMessageHandler " ) + aadd( aTree, " QAbstractNetworkCache " ) + aadd( aTree, " QNetworkDiskCache " ) + aadd( aTree, " QAbstractTextDocumentLayout " ) + aadd( aTree, " QPlainTextDocumentLayout " ) + aadd( aTree, " QAbstractUriResolver " ) + aadd( aTree, " QAccessibleBridgePlugin " ) + aadd( aTree, " QAccessiblePlugin " ) + aadd( aTree, " QAction " ) + aadd( aTree, " QMenuItem " ) + aadd( aTree, " QWidgetAction " ) + aadd( aTree, " QActionGroup " ) + aadd( aTree, " QAssistantClient " ) + aadd( aTree, " QAxFactory " ) + aadd( aTree, " QAxObject " ) + aadd( aTree, " QAxScript " ) + aadd( aTree, " QAxScriptManager " ) + aadd( aTree, " QButtonGroup " ) + aadd( aTree, " QClipboard " ) + aadd( aTree, " QCompleter " ) + aadd( aTree, " QCoreApplication " ) + aadd( aTree, " QApplication " ) + aadd( aTree, " QDataWidgetMapper " ) + aadd( aTree, " QDBusAbstractAdaptor " ) + aadd( aTree, " QDBusAbstractInterface " ) + aadd( aTree, " QDBusConnectionInterface " ) + aadd( aTree, " QDBusInterface " ) + aadd( aTree, " QDBusPendingCallWatcher " ) + aadd( aTree, " QDBusServer " ) + aadd( aTree, " QDesignerFormEditorInterface " ) + aadd( aTree, " QDesignerFormWindowManagerInterface " ) + aadd( aTree, " QDrag " ) + aadd( aTree, " QEventLoop " ) + aadd( aTree, " QExtensionFactory " ) + aadd( aTree, " QExtensionManager " ) + aadd( aTree, " QFileSystemWatcher " ) + aadd( aTree, " QFtp " ) + aadd( aTree, " QFutureWatcher " ) + aadd( aTree, " QGraphicsItemAnimation " ) + aadd( aTree, " QGraphicsScene " ) + aadd( aTree, " QGraphicsSvgItem " ) + aadd( aTree, " QGraphicsTextItem " ) + aadd( aTree, " QGraphicsWidget " ) + aadd( aTree, " QHelpEngineCore " ) + aadd( aTree, " QHelpEngine " ) + aadd( aTree, " QHelpSearchEngine " ) + aadd( aTree, " QHttp " ) + aadd( aTree, " QIconEnginePlugin " ) + aadd( aTree, " QIconEnginePluginV2 " ) + aadd( aTree, " QImageIOPlugin " ) + aadd( aTree, " QInputContext " ) + aadd( aTree, " QInputContextPlugin " ) + aadd( aTree, " QIODevice " ) + aadd( aTree, " Q3Socket " ) + aadd( aTree, " Q3SocketDevice " ) + aadd( aTree, " QAbstractSocket " ) + aadd( aTree, " QTcpSocket " ) + aadd( aTree, " QSslSocket " ) + aadd( aTree, " QUdpSocket " ) + aadd( aTree, " QBuffer " ) + aadd( aTree, " QTemporaryFile " ) + aadd( aTree, " QFile " ) + aadd( aTree, " QLocalSocket " ) + aadd( aTree, " QNetworkReply " ) + aadd( aTree, " QProcess " ) + aadd( aTree, " QItemSelectionModel " ) + aadd( aTree, " QLayout " ) + aadd( aTree, " QBoxLayout " ) + aadd( aTree, " Q3HBoxLayout " ) + aadd( aTree, " Q3VBoxLayout " ) + aadd( aTree, " QHBoxLayout " ) + aadd( aTree, " QVBoxLayout " ) + aadd( aTree, " QFormLayout " ) + aadd( aTree, " QGridLayout " ) + aadd( aTree, " QStackedLayout " ) + aadd( aTree, " QLibrary " ) + aadd( aTree, " QLocalServer " ) + aadd( aTree, " QMimeData " ) + aadd( aTree, " QMovie " ) + aadd( aTree, " QNetworkAccessManager " ) + aadd( aTree, " QNetworkCookieJar " ) + aadd( aTree, " QObjectCleanupHandler " ) + aadd( aTree, " QPictureFormatPlugin " ) + aadd( aTree, " QPluginLoader " ) + aadd( aTree, " QScriptEngine " ) + aadd( aTree, " QScriptEngineDebugger " ) + aadd( aTree, " QScriptExtensionPlugin " ) + aadd( aTree, " QSessionManager " ) + aadd( aTree, " QSettings " ) + aadd( aTree, " QSharedMemory " ) + aadd( aTree, " QShortcut " ) + aadd( aTree, " QSignalMapper " ) + aadd( aTree, " QSignalSpy " ) + aadd( aTree, " QSocketNotifier " ) + aadd( aTree, " QSound " ) + aadd( aTree, " QSqlDriver " ) + aadd( aTree, " QSqlDriverPlugin " ) + aadd( aTree, " QStyle " ) + aadd( aTree, " QCommonStyle " ) + aadd( aTree, " QMotifStyle " ) + aadd( aTree, " QCDEStyle " ) + aadd( aTree, " QWindowsStyle " ) + aadd( aTree, " QCleanlooksStyle " ) + aadd( aTree, " QGtkStyle " ) + aadd( aTree, " QPlastiqueStyle " ) + aadd( aTree, " QWindowsXPStyle " ) + aadd( aTree, " QWindowsVistaStyle " ) + aadd( aTree, " QStylePlugin " ) + aadd( aTree, " QSvgRenderer " ) + aadd( aTree, " QSyntaxHighlighter " ) + aadd( aTree, " QSystemTrayIcon " ) + aadd( aTree, " QTcpServer " ) + aadd( aTree, " QTextCodecPlugin " ) + aadd( aTree, " QTextDocument " ) + aadd( aTree, " QTextObject " ) + aadd( aTree, " QTextBlockGroup " ) + aadd( aTree, " QTextList " ) + aadd( aTree, " QTextFrame " ) + aadd( aTree, " QTextTable " ) + aadd( aTree, " QThread " ) + aadd( aTree, " QThreadPool " ) + aadd( aTree, " QTimeLine " ) + aadd( aTree, " QTimer " ) + aadd( aTree, " QTranslator " ) + aadd( aTree, " QUiLoader " ) + aadd( aTree, " QUndoGroup " ) + aadd( aTree, " QUndoStack " ) + aadd( aTree, " QValidator " ) + aadd( aTree, " QWebFrame " ) + aadd( aTree, " QWebHistoryInterface " ) + aadd( aTree, " QWebPage " ) + aadd( aTree, " QWebPluginFactory " ) + aadd( aTree, " QWidget " ) + aadd( aTree, " QAbstractButton " ) + aadd( aTree, " Q3Button " ) + aadd( aTree, " QCheckBox " ) + aadd( aTree, " QPushButton " ) + aadd( aTree, " QCommandLinkButton " ) + aadd( aTree, " QRadioButton " ) + aadd( aTree, " QToolButton " ) + aadd( aTree, " QAbstractSlider " ) + aadd( aTree, " QDial " ) + aadd( aTree, " QScrollBar " ) + aadd( aTree, " QSlider " ) + aadd( aTree, " QAbstractSpinBox " ) + aadd( aTree, " QDateTimeEdit " ) + aadd( aTree, " QDateEdit " ) + aadd( aTree, " QTimeEdit " ) + aadd( aTree, " QDoubleSpinBox " ) + aadd( aTree, " QSpinBox " ) + aadd( aTree, " QAxWidget " ) + aadd( aTree, " QCalendarWidget " ) + aadd( aTree, " QComboBox " ) + aadd( aTree, " QFontComboBox " ) + aadd( aTree, " QDesignerActionEditorInterface " ) + aadd( aTree, " QDesignerFormWindowInterface " ) + aadd( aTree, " QDesignerObjectInspectorInterface " ) + aadd( aTree, " QDesignerPropertyEditorInterface " ) + aadd( aTree, " QDesignerWidgetBoxInterface " ) + aadd( aTree, " QDesktopWidget " ) + aadd( aTree, " QDialog " ) + aadd( aTree, " QAbstractPrintDialog " ) + aadd( aTree, " QPrintDialog " ) + aadd( aTree, " QColorDialog " ) + aadd( aTree, " QErrorMessage " ) + aadd( aTree, " QFileDialog " ) + aadd( aTree, " QFontDialog " ) + aadd( aTree, " QInputDialog " ) + aadd( aTree, " QMessageBox " ) + aadd( aTree, " QPageSetupDialog " ) + aadd( aTree, " QPrintPreviewDialog " ) + aadd( aTree, " QProgressDialog " ) + aadd( aTree, " QWizard " ) + aadd( aTree, " QDialogButtonBox " ) + aadd( aTree, " QDockWidget " ) + aadd( aTree, " QFocusFrame " ) + aadd( aTree, " QFrame " ) + aadd( aTree, " QAbstractScrollArea " ) + aadd( aTree, " QAbstractItemView " ) + aadd( aTree, " QColumnView " ) + aadd( aTree, " QHeaderView " ) + aadd( aTree, " QListView " ) + aadd( aTree, " QHelpIndexWidget " ) + aadd( aTree, " QListWidget " ) + aadd( aTree, " QUndoView " ) + aadd( aTree, " QTableView " ) + aadd( aTree, " QTableWidget " ) + aadd( aTree, " QTreeView " ) + aadd( aTree, " QHelpContentWidget " ) + aadd( aTree, " QTreeWidget " ) + aadd( aTree, " QGraphicsView " ) + aadd( aTree, " QMdiArea " ) + aadd( aTree, " QPlainTextEdit " ) + aadd( aTree, " QScrollArea " ) + aadd( aTree, " QTextEdit " ) + aadd( aTree, " QTextBrowser " ) + aadd( aTree, " QLabel " ) + aadd( aTree, " QLCDNumber " ) + aadd( aTree, " QSplitter " ) + aadd( aTree, " QStackedWidget " ) + aadd( aTree, " QToolBox " ) + aadd( aTree, " QGLWidget " ) + aadd( aTree, " QGroupBox " ) + aadd( aTree, " QHelpSearchQueryWidget " ) + aadd( aTree, " QHelpSearchResultWidget " ) + aadd( aTree, " QLineEdit " ) + aadd( aTree, " QMainWindow " ) + aadd( aTree, " QMdiSubWindow " ) + aadd( aTree, " QMenu " ) + aadd( aTree, " QMenuBar " ) + aadd( aTree, " QPrintPreviewWidget " ) + aadd( aTree, " QProgressBar " ) + aadd( aTree, " QRubberBand " ) + aadd( aTree, " QSizeGrip " ) + aadd( aTree, " QSplashScreen " ) + aadd( aTree, " QSplitterHandle " ) + aadd( aTree, " QStatusBar " ) + aadd( aTree, " QSvgWidget " ) + aadd( aTree, " QTabBar " ) + aadd( aTree, " QTabWidget " ) + aadd( aTree, " QToolBar " ) + aadd( aTree, " QWebView " ) + aadd( aTree, " QWizardPage " ) + aadd( aTree, " QWorkspace " ) + + aeval( aTree, {| e,i | aTree[ i ] := alltrim( e ) } ) + ENDIF + + RETURN ascan( aTree, {|e| e == cWidget } ) > 0 + +/*----------------------------------------------------------------------*/ + +FUNCTION IsMemObject( cWidget ) + STATIC aObj := {} + + IF empty( aObj ) + aadd( aObj, "QBitArray " ) + aadd( aObj, "QBitmap " ) + aadd( aObj, "QBrush " ) + aadd( aObj, "QByteArray " ) + aadd( aObj, "QColor " ) + aadd( aObj, "QCursor " ) + aadd( aObj, "QDate " ) + aadd( aObj, "QDateTime " ) + aadd( aObj, "QDir " ) + aadd( aObj, "QFileInfoList " ) + aadd( aObj, "QFont " ) + aadd( aObj, "QFontInfo " ) + aadd( aObj, "QFontMetrics " ) + aadd( aObj, "QGradientStops " ) + aadd( aObj, "QHttpRequestHeader " ) + aadd( aObj, "QHttpResponseHeader " ) + aadd( aObj, "QIcon " ) + aadd( aObj, "QImage " ) + aadd( aObj, "QKeySequence " ) + aadd( aObj, "QLine " ) + aadd( aObj, "QLineF " ) + aadd( aObj, "QLocale " ) + aadd( aObj, "QMatrix " ) + aadd( aObj, "QModelIndex " ) + aadd( aObj, "QObjectList " ) + aadd( aObj, "QPainterPath " ) + aadd( aObj, "QPalette " ) + aadd( aObj, "QPen " ) + aadd( aObj, "QPixmap " ) + aadd( aObj, "QPointF " ) + aadd( aObj, "QRect " ) + aadd( aObj, "QRectF " ) + aadd( aObj, "QRegExp " ) + aadd( aObj, "QRegion " ) + aadd( aObj, "QSize " ) + aadd( aObj, "QSizeF " ) + aadd( aObj, "QSizePolicy " ) + aadd( aObj, "QStringList " ) + aadd( aObj, "QTextBlockFormat " ) + aadd( aObj, "QTextCharFormat " ) + aadd( aObj, "QTextCursor " ) + aadd( aObj, "QTextDocumentFragment " ) + aadd( aObj, "QTextFormat " ) + aadd( aObj, "QTextFrameFormat " ) + aadd( aObj, "QTextImageFormat " ) + aadd( aObj, "QTextLength " ) + aadd( aObj, "QTextLine " ) + aadd( aObj, "QTextListFormat " ) + aadd( aObj, "QTextOption " ) + aadd( aObj, "QTextTableCellFormat " ) + aadd( aObj, "QTextTableFormat " ) + aadd( aObj, "QTime " ) + aadd( aObj, "QTransform " ) + aadd( aObj, "QUrl " ) + aadd( aObj, "QVariant " ) + aadd( aObj, "QWebHistoryItem " ) + aadd( aObj, "QWebHitTestResult " ) + aadd( aObj, "QWebSecurityOrigin " ) + aadd( aObj, "QWidgetList " ) + + aeval( aObj, {| e,i | aObj[ i ] := alltrim( e ) } ) + ENDIF + + RETURN ascan( aObj, {| e | e == cWidget } ) > 0 + +/*----------------------------------------------------------------------*/ + +FUNCTION Get_Command( cWgt, cCmn ) + STATIC a_:={} + + IF ascan( a_, cWgt ) == 0 + aadd( a_, cWgt ) +//hb_ToOutDebug( pad( cWgt,30 ) + "No " + zWidget ) + ENDIF + RETURN 'hb_retptrGC( hbqt_ptrTOgcpointer( new ' + cWgt + '( ' + cCmn + ' ) ) )' + +/*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/hbqt.h b/harbour/contrib/hbqt/hbqt.h index 9d4a4d1bf7..209ee578fb 100644 --- a/harbour/contrib/hbqt/hbqt.h +++ b/harbour/contrib/hbqt/hbqt.h @@ -61,296 +61,600 @@ #if QT_VERSION >= 0x040500 -#define hbqt_par_HbDbfModel( n ) ( ( HbDbfModel* ) hb_parptr( n ) ) -#define hbqt_par_HbTableView( n ) ( ( HbTableView* ) hb_parptr( n ) ) -#define hbqt_par_MyMainWindow( n ) ( ( MyMainWindow* ) hb_parptr( n ) ) +#define hbqt_par_HbDbfModel( n ) ( ( HbDbfModel* ) hb_parptr( n ) ) +#define hbqt_par_HbTableView( n ) ( ( HbTableView* ) hb_parptr( n ) ) +#define hbqt_par_MyMainWindow( n ) ( ( MyMainWindow* ) hb_parptr( n ) ) -#define hbqt_par_ExtensionOption( n ) ( ( ExtensionOption* ) hb_parptr( n ) ) -#define hbqt_par_IUnknown( n ) ( ( IUnknown* ) hb_parptr( n ) ) -#define hbqt_par_QAbstractButton( n ) ( ( QAbstractButton* ) hb_parptr( n ) ) -#define hbqt_par_QAbstractEventDispatcher( n ) ( ( QAbstractEventDispatcher* ) hb_parptr( n ) ) -#define hbqt_par_QAbstractItemDelegate( n ) ( ( QAbstractItemDelegate* ) hb_parptr( n ) ) -#define hbqt_par_QAbstractItemModel( n ) ( ( QAbstractItemModel* ) hb_parptr( n ) ) -#define hbqt_par_QAbstractItemView( n ) ( ( QAbstractItemView* ) hb_parptr( n ) ) -#define hbqt_par_QAbstractListModel( n ) ( ( QAbstractListModel* ) hb_parptr( n ) ) -#define hbqt_par_QAbstractPrintDialog( n ) ( ( QAbstractPrintDialog* ) hb_parptr( n ) ) -#define hbqt_par_QAbstractProxyModel( n ) ( ( QAbstractProxyModel* ) hb_parptr( n ) ) -#define hbqt_par_QAbstractScrollArea( n ) ( ( QAbstractScrollArea* ) hb_parptr( n ) ) -#define hbqt_par_QAbstractSlider( n ) ( ( QAbstractSlider* ) hb_parptr( n ) ) -#define hbqt_par_QAbstractSpinBox( n ) ( ( QAbstractSpinBox* ) hb_parptr( n ) ) -#define hbqt_par_QAbstractTableModel( n ) ( ( QAbstractTableModel* ) hb_parptr( n ) ) +#if 0 +#define hbqt_par_ExtensionOption( n ) ( ( ExtensionOption* ) hb_parptr( n ) ) +#define hbqt_par_IUnknown( n ) ( ( IUnknown* ) hb_parptr( n ) ) +#define hbqt_par_QAbstractButton( n ) ( ( QAbstractButton* ) hb_parptr( n ) ) +#define hbqt_par_QAbstractEventDispatcher( n ) ( ( QAbstractEventDispatcher* ) hb_parptr( n ) ) +#define hbqt_par_QAbstractItemDelegate( n ) ( ( QAbstractItemDelegate* ) hb_parptr( n ) ) +#define hbqt_par_QAbstractItemModel( n ) ( ( QAbstractItemModel* ) hb_parptr( n ) ) +#define hbqt_par_QAbstractItemView( n ) ( ( QAbstractItemView* ) hb_parptr( n ) ) +#define hbqt_par_QAbstractListModel( n ) ( ( QAbstractListModel* ) hb_parptr( n ) ) +#define hbqt_par_QAbstractPrintDialog( n ) ( ( QAbstractPrintDialog* ) hb_parptr( n ) ) +#define hbqt_par_QAbstractProxyModel( n ) ( ( QAbstractProxyModel* ) hb_parptr( n ) ) +#define hbqt_par_QAbstractScrollArea( n ) ( ( QAbstractScrollArea* ) hb_parptr( n ) ) +#define hbqt_par_QAbstractSlider( n ) ( ( QAbstractSlider* ) hb_parptr( n ) ) +#define hbqt_par_QAbstractSpinBox( n ) ( ( QAbstractSpinBox* ) hb_parptr( n ) ) +#define hbqt_par_QAbstractTableModel( n ) ( ( QAbstractTableModel* ) hb_parptr( n ) ) #define hbqt_par_QAbstractTextDocumentLayout( n ) ( ( QAbstractTextDocumentLayout* ) hb_parptr( n ) ) -#define hbqt_par_QAction( n ) ( ( QAction* ) hb_parptr( n ) ) -#define hbqt_par_QActionGroup( n ) ( ( QActionGroup* ) hb_parptr( n ) ) -#define hbqt_par_QApplication( n ) ( ( QApplication* ) hb_parptr( n ) ) -#define hbqt_par_QAxBase( n ) ( ( QAxBase* ) hb_parptr( n ) ) -#define hbqt_par_QBitmap( n ) ( ( QBitmap* ) hb_parptr( n ) ) -#define hbqt_par_QBoxLayout( n ) ( ( QBoxLayout* ) hb_parptr( n ) ) -#define hbqt_par_QBrush( n ) ( ( QBrush* ) hb_parptr( n ) ) -#define hbqt_par_QButtonGroup( n ) ( ( QButtonGroup* ) hb_parptr( n ) ) -#define hbqt_par_QByteArray( n ) ( ( QByteArray* ) hb_parptr( n ) ) -#define hbqt_par_QCalendarWidget( n ) ( ( QCalendarWidget* ) hb_parptr( n ) ) -#define hbqt_par_QCheckBox( n ) ( ( QCheckBox* ) hb_parptr( n ) ) -#define hbqt_par_QClipboard( n ) ( ( QClipboard* ) hb_parptr( n ) ) -#define hbqt_par_QColor( n ) ( ( QColor* ) hb_parptr( n ) ) -#define hbqt_par_QColorDialog( n ) ( ( QColorDialog* ) hb_parptr( n ) ) -#define hbqt_par_QComboBox( n ) ( ( QComboBox* ) hb_parptr( n ) ) -#define hbqt_par_QCommandLinkButton( n ) ( ( QCommandLinkButton* ) hb_parptr( n ) ) -#define hbqt_par_QCompleter( n ) ( ( QCompleter* ) hb_parptr( n ) ) -#define hbqt_par_QConicalGradient( n ) ( ( QConicalGradient* ) hb_parptr( n ) ) -#define hbqt_par_QContextMenuEvent( n ) ( ( QContextMenuEvent* ) hb_parptr( n ) ) -#define hbqt_par_QCoreApplication( n ) ( ( QCoreApplication* ) hb_parptr( n ) ) -#define hbqt_par_QCursor( n ) ( ( QCursor* ) hb_parptr( n ) ) -#define hbqt_par_QDataStream( n ) ( ( QDataStream* ) hb_parptr( n ) ) -#define hbqt_par_QDate( n ) ( ( QDate* ) hb_parptr( n ) ) -#define hbqt_par_QDateTime( n ) ( ( QDateTime* ) hb_parptr( n ) ) -#define hbqt_par_QDateTimeEdit( n ) ( ( QDateTimeEdit* ) hb_parptr( n ) ) -#define hbqt_par_QDesktopWidget( n ) ( ( QDesktopWidget* ) hb_parptr( n ) ) -#define hbqt_par_QDial( n ) ( ( QDial* ) hb_parptr( n ) ) -#define hbqt_par_QDialog( n ) ( ( QDialog* ) hb_parptr( n ) ) -#define hbqt_par_QDir( n ) ( ( QDir* ) hb_parptr( n ) ) -#define hbqt_par_QDirModel( n ) ( ( QDirModel* ) hb_parptr( n ) ) -#define hbqt_par_QDockWidget( n ) ( ( QDockWidget* ) hb_parptr( n ) ) -#define hbqt_par_QDockWidget( n ) ( ( QDockWidget* ) hb_parptr( n ) ) -#define hbqt_par_QDoubleSpinBox( n ) ( ( QDoubleSpinBox* ) hb_parptr( n ) ) -#define hbqt_par_QDragEnterEvent( n ) ( ( QDragEnterEvent* ) hb_parptr( n ) ) -#define hbqt_par_QDragLeaveEvent( n ) ( ( QDragLeaveEvent* ) hb_parptr( n ) ) -#define hbqt_par_QDragMoveEvent( n ) ( ( QDragMoveEvent* ) hb_parptr( n ) ) -#define hbqt_par_QDropEvent( n ) ( ( QDropEvent* ) hb_parptr( n ) ) -#define hbqt_par_QErrorMessage( n ) ( ( QErrorMessage* ) hb_parptr( n ) ) -#define hbqt_par_QEvent( n ) ( ( QEvent* ) hb_parptr( n ) ) -#define hbqt_par_QEventLoop( n ) ( ( QEventLoop* ) hb_parptr( n ) ) -#define hbqt_par_QFileDialog( n ) ( ( QFileDialog* ) hb_parptr( n ) ) -#define hbqt_par_QFileIconProvider( n ) ( ( QFileIconProvider* ) hb_parptr( n ) ) -#define hbqt_par_QFileSystemModel( n ) ( ( QFileSystemModel* ) hb_parptr( n ) ) -#define hbqt_par_QFocusEvent( n ) ( ( QFocusEvent* ) hb_parptr( n ) ) -#define hbqt_par_QFocusFrame( n ) ( ( QFocusFrame* ) hb_parptr( n ) ) -#define hbqt_par_QFont( n ) ( ( QFont* ) hb_parptr( n ) ) -#define hbqt_par_QFontComboBox( n ) ( ( QFontComboBox* ) hb_parptr( n ) ) -#define hbqt_par_QFontDatabase( n ) ( ( QFontDatabase* ) hb_parptr( n ) ) -#define hbqt_par_QFontDialog( n ) ( ( QFontDialog* ) hb_parptr( n ) ) -#define hbqt_par_QFontInfo( n ) ( ( QFontInfo* ) hb_parptr( n ) ) -#define hbqt_par_QFontMetrics( n ) ( ( QFontMetrics* ) hb_parptr( n ) ) -#define hbqt_par_QFontMetricsF( n ) ( ( QFontMetricsF* ) hb_parptr( n ) ) -#define hbqt_par_QFormLayout( n ) ( ( QFormLayout* ) hb_parptr( n ) ) -#define hbqt_par_QFrame( n ) ( ( QFrame* ) hb_parptr( n ) ) -#define hbqt_par_QFtp( n ) ( ( QFtp* ) hb_parptr( n ) ) -#define hbqt_par_QGradient( n ) ( ( QGradient* ) hb_parptr( n ) ) -#define hbqt_par_QGradientStops( n ) ( ( QGradientStops* ) hb_parptr( n ) ) -#define hbqt_par_QGridLayout( n ) ( ( QGridLayout* ) hb_parptr( n ) ) -#define hbqt_par_QGroupBox( n ) ( ( QGroupBox* ) hb_parptr( n ) ) -#define hbqt_par_QHBoxLayout( n ) ( ( QHBoxLayout* ) hb_parptr( n ) ) -#define hbqt_par_QHeaderView( n ) ( ( QHeaderView* ) hb_parptr( n ) ) -#define hbqt_par_QHttp( n ) ( ( QHttp* ) hb_parptr( n ) ) -#define hbqt_par_QHttpRequestHeader( n ) ( ( QHttpRequestHeader* ) hb_parptr( n ) ) -#define hbqt_par_QIcon( n ) ( ( QIcon* ) hb_parptr( n ) ) -#define hbqt_par_QImage( n ) ( ( QImage* ) hb_parptr( n ) ) -#define hbqt_par_QImageReader( n ) ( ( QImageReader* ) hb_parptr( n ) ) -#define hbqt_par_QImageWriter( n ) ( ( QImageWriter* ) hb_parptr( n ) ) -#define hbqt_par_QInputContext( n ) ( ( QInputContext* ) hb_parptr( n ) ) -#define hbqt_par_QInputDialog( n ) ( ( QInputDialog* ) hb_parptr( n ) ) -#define hbqt_par_QInputEvent( n ) ( ( QInputEvent* ) hb_parptr( n ) ) -#define hbqt_par_QIODevice( n ) ( ( QIODevice* ) hb_parptr( n ) ) -#define hbqt_par_QItemEditorFactory( n ) ( ( QItemEditorFactory* ) hb_parptr( n ) ) -#define hbqt_par_QItemSelectionModel( n ) ( ( QItemSelectionModel* ) hb_parptr( n ) ) -#define hbqt_par_QKeyEvent( n ) ( ( QKeyEvent* ) hb_parptr( n ) ) -#define hbqt_par_QKeySequence( n ) ( ( QKeySequence* ) hb_parptr( n ) ) -#define hbqt_par_QLabel( n ) ( ( QLabel* ) hb_parptr( n ) ) -#define hbqt_par_QLatin1Char( n ) ( ( QLatin1Char* ) hb_parptr( n ) ) -#define hbqt_par_QLatin1String( n ) ( ( QLatin1String* ) hb_parptr( n ) ) -#define hbqt_par_QLayout( n ) ( ( QLayout* ) hb_parptr( n ) ) -#define hbqt_par_QLayoutItem( n ) ( ( QLayoutItem* ) hb_parptr( n ) ) -#define hbqt_par_QLCDNumber( n ) ( ( QLCDNumber* ) hb_parptr( n ) ) -#define hbqt_par_QLibraryInfo( n ) ( ( QLibraryInfo* ) hb_parptr( n ) ) -#define hbqt_par_QLine( n ) ( ( QLine* ) hb_parptr( n ) ) -#define hbqt_par_QLinearGradient( n ) ( ( QLinearGradient* ) hb_parptr( n ) ) -#define hbqt_par_QLineEdit( n ) ( ( QLineEdit* ) hb_parptr( n ) ) -#define hbqt_par_QLineF( n ) ( ( QLineF* ) hb_parptr( n ) ) -#define hbqt_par_QList( n ) ( ( QList* ) hb_parptr( n ) ) -#define hbqt_par_QListView( n ) ( ( QListView* ) hb_parptr( n ) ) -#define hbqt_par_QListWidget( n ) ( ( QListWidget* ) hb_parptr( n ) ) -#define hbqt_par_QListWidgetItem( n ) ( ( QListWidgetItem* ) hb_parptr( n ) ) -#define hbqt_par_QLocale( n ) ( ( QLocale* ) hb_parptr( n ) ) -#define hbqt_par_QMainWindow( n ) ( ( QMainWindow* ) hb_parptr( n ) ) -#define hbqt_par_QMatrix( n ) ( ( QMatrix* ) hb_parptr( n ) ) -#define hbqt_par_QMenu( n ) ( ( QMenu* ) hb_parptr( n ) ) -#define hbqt_par_QMenuBar( n ) ( ( QMenuBar* ) hb_parptr( n ) ) -#define hbqt_par_QMessageBox( n ) ( ( QMessageBox* ) hb_parptr( n ) ) -#define hbqt_par_QMimeData( n ) ( ( QMimeData* ) hb_parptr( n ) ) -#define hbqt_par_QModelIndex( n ) ( ( QModelIndex* ) hb_parptr( n ) ) -#define hbqt_par_QModelIndexList( n ) ( ( QModelIndexList* ) hb_parptr( n ) ) -#define hbqt_par_QMouseEvent( n ) ( ( QMouseEvent* ) hb_parptr( n ) ) -#define hbqt_par_QMoveEvent( n ) ( ( QMoveEvent* ) hb_parptr( n ) ) -#define hbqt_par_QMovie( n ) ( ( QMovie* ) hb_parptr( n ) ) -#define hbqt_par_QNetworkAccessManager( n ) ( ( QNetworkAccessManager* ) hb_parptr( n ) ) -#define hbqt_par_QNetworkProxy( n ) ( ( QNetworkProxy* ) hb_parptr( n ) ) -#define hbqt_par_QNetworkRequest( n ) ( ( QNetworkRequest* ) hb_parptr( n ) ) -#define hbqt_par_QObject( n ) ( ( QObject* ) hb_parptr( n ) ) -#define hbqt_par_QPageSetupDialog( n ) ( ( QPageSetupDialog* ) hb_parptr( n ) ) -#define hbqt_par_QPaintDevice( n ) ( ( QPaintDevice* ) hb_parptr( n ) ) -#define hbqt_par_QPainter( n ) ( ( QPainter* ) hb_parptr( n ) ) -#define hbqt_par_QPainterPath( n ) ( ( QPainterPath* ) hb_parptr( n ) ) -#define hbqt_par_QPaintEvent( n ) ( ( QPaintEvent* ) hb_parptr( n ) ) -#define hbqt_par_QPalette( n ) ( ( QPalette* ) hb_parptr( n ) ) -#define hbqt_par_QPen( n ) ( ( QPen* ) hb_parptr( n ) ) -#define hbqt_par_QPicture( n ) ( ( QPicture* ) hb_parptr( n ) ) -#define hbqt_par_QPixmap( n ) ( ( QPixmap* ) hb_parptr( n ) ) -#define hbqt_par_QPoint( n ) ( ( QPoint* ) hb_parptr( n ) ) -#define hbqt_par_QPointF( n ) ( ( QPointF* ) hb_parptr( n ) ) -#define hbqt_par_QPolygon( n ) ( ( QPolygon* ) hb_parptr( n ) ) -#define hbqt_par_QPolygonF( n ) ( ( QPolygonF* ) hb_parptr( n ) ) -#define hbqt_par_QPrintDialog( n ) ( ( QPrintDialog* ) hb_parptr( n ) ) -#define hbqt_par_QPrintEngine( n ) ( ( QPrintEngine* ) hb_parptr( n ) ) -#define hbqt_par_QPrinter( n ) ( ( QPrinter* ) hb_parptr( n ) ) -#define hbqt_par_QPrintPreviewDialog( n ) ( ( QPrintPreviewDialog* ) hb_parptr( n ) ) -#define hbqt_par_QProcess( n ) ( ( QProcess* ) hb_parptr( n ) ) -#define hbqt_par_QProgressBar( n ) ( ( QProgressBar* ) hb_parptr( n ) ) -#define hbqt_par_QProgressDialog( n ) ( ( QProgressDialog* ) hb_parptr( n ) ) -#define hbqt_par_QPushButton( n ) ( ( QPushButton* ) hb_parptr( n ) ) -#define hbqt_par_QRadialGradient( n ) ( ( QRadialGradient* ) hb_parptr( n ) ) -#define hbqt_par_QRect( n ) ( ( QRect* ) hb_parptr( n ) ) -#define hbqt_par_QRectF( n ) ( ( QRectF* ) hb_parptr( n ) ) -#define hbqt_par_QRegExp( n ) ( ( QRegExp* ) hb_parptr( n ) ) -#define hbqt_par_QRegion( n ) ( ( QRegion* ) hb_parptr( n ) ) -#define hbqt_par_QResizeEvent( n ) ( ( QResizeEvent* ) hb_parptr( n ) ) -#define hbqt_par_QResource( n ) ( ( QResource* ) hb_parptr( n ) ) -#define hbqt_par_QScrollArea( n ) ( ( QScrollArea* ) hb_parptr( n ) ) -#define hbqt_par_QScrollBar( n ) ( ( QScrollBar* ) hb_parptr( n ) ) -#define hbqt_par_QSessionManager( n ) ( ( QSessionManager* ) hb_parptr( n ) ) -#define hbqt_par_QSignalMapper( n ) ( ( QSignalMapper* ) hb_parptr( n ) ) -#define hbqt_par_QSize( n ) ( ( QSize* ) hb_parptr( n ) ) -#define hbqt_par_QSizeF( n ) ( ( QSizeF* ) hb_parptr( n ) ) -#define hbqt_par_QSizeGrip( n ) ( ( QSizeGrip* ) hb_parptr( n ) ) -#define hbqt_par_QSizePolicy( n ) ( ( QSizePolicy* ) hb_parptr( n ) ) -#define hbqt_par_QSlider( n ) ( ( QSlider* ) hb_parptr( n ) ) -#define hbqt_par_QSound( n ) ( ( QSound* ) hb_parptr( n ) ) -#define hbqt_par_QSpacerItem( n ) ( ( QSpacerItem* ) hb_parptr( n ) ) -#define hbqt_par_QSpinBox( n ) ( ( QSpinBox* ) hb_parptr( n ) ) -#define hbqt_par_QSplashScreen( n ) ( ( QSplashScreen* ) hb_parptr( n ) ) -#define hbqt_par_QSplitter( n ) ( ( QSplitter* ) hb_parptr( n ) ) -#define hbqt_par_QStandardItem( n ) ( ( QStandardItem* ) hb_parptr( n ) ) -#define hbqt_par_QStandardItemModel( n ) ( ( QStandardItemModel* ) hb_parptr( n ) ) -#define hbqt_par_QStatusBar( n ) ( ( QStatusBar* ) hb_parptr( n ) ) -#define hbqt_par_QStringList( n ) ( ( QStringList* ) hb_parptr( n ) ) -#define hbqt_par_QStringListModel( n ) ( ( QStringListModel* ) hb_parptr( n ) ) -#define hbqt_par_QStyle( n ) ( ( QStyle* ) hb_parptr( n ) ) -#define hbqt_par_QStyledItemDelegate( n ) ( ( QStyledItemDelegate* ) hb_parptr( n ) ) -#define hbqt_par_QStyleFactory( n ) ( ( QStyleFactory* ) hb_parptr( n ) ) -#define hbqt_par_QStyleHintReturn( n ) ( ( QStyleHintReturn* ) hb_parptr( n ) ) -#define hbqt_par_QStyleOption( n ) ( ( QStyleOption* ) hb_parptr( n ) ) -#define hbqt_par_QStyleOptionButton( n ) ( ( QStyleOptionButton* ) hb_parptr( n ) ) -#define hbqt_par_QStyleOptionComboBox( n ) ( ( QStyleOptionComboBox* ) hb_parptr( n ) ) -#define hbqt_par_QStyleOptionComplex( n ) ( ( QStyleOptionComplex* ) hb_parptr( n ) ) -#define hbqt_par_QStyleOptionDockWidget( n ) ( ( QStyleOptionDockWidget* ) hb_parptr( n ) ) -#define hbqt_par_QStyleOptionFocusRect( n ) ( ( QStyleOptionFocusRect* ) hb_parptr( n ) ) -#define hbqt_par_QStyleOptionFrame( n ) ( ( QStyleOptionFrame* ) hb_parptr( n ) ) -#define hbqt_par_QStyleOptionGroupBox( n ) ( ( QStyleOptionGroupBox* ) hb_parptr( n ) ) -#define hbqt_par_QStyleOptionHeader( n ) ( ( QStyleOptionHeader* ) hb_parptr( n ) ) -#define hbqt_par_QStyleOptionMenuItem( n ) ( ( QStyleOptionMenuItem* ) hb_parptr( n ) ) -#define hbqt_par_QStyleOptionProgressBar( n )( ( QStyleOptionProgressBar* ) hb_parptr( n ) ) -#define hbqt_par_QStyleOptionSizeGrip( n ) ( ( QStyleOptionSizeGrip* ) hb_parptr( n ) ) -#define hbqt_par_QStyleOptionSlider( n ) ( ( QStyleOptionSlider* ) hb_parptr( n ) ) -#define hbqt_par_QStyleOptionSpinBox( n ) ( ( QStyleOptionSpinBox* ) hb_parptr( n ) ) -#define hbqt_par_QStyleOptionTab( n ) ( ( QStyleOptionTab* ) hb_parptr( n ) ) -#define hbqt_par_QStyleOptionTabBarBase( n ) ( ( QStyleOptionTabBarBase* ) hb_parptr( n ) ) -#define hbqt_par_QStyleOptionTabWidgetFrame( n ) ( ( QStyleOptionTabWidgetFrame* ) hb_parptr( n ) ) -#define hbqt_par_QStyleOptionTitleBar( n ) ( ( QStyleOptionTitleBar* ) hb_parptr( n ) ) -#define hbqt_par_QStyleOptionToolBar( n ) ( ( QStyleOptionToolBar* ) hb_parptr( n ) ) -#define hbqt_par_QStyleOptionToolBox( n ) ( ( QStyleOptionToolBox* ) hb_parptr( n ) ) -#define hbqt_par_QStyleOptionToolButton( n ) ( ( QStyleOptionToolButton* ) hb_parptr( n ) ) -#define hbqt_par_QStyleOptionViewItem( n ) ( ( QStyleOptionViewItem* ) hb_parptr( n ) ) -#define hbqt_par_QStyleOptionViewItem( n ) ( ( QStyleOptionViewItem* ) hb_parptr( n ) ) -#define hbqt_par_QStylePainter( n ) ( ( QStylePainter* ) hb_parptr( n ) ) -#define hbqt_par_QSystemTrayIcon( n ) ( ( QSystemTrayIcon* ) hb_parptr( n ) ) -#define hbqt_par_QTabBar( n ) ( ( QTabBar* ) hb_parptr( n ) ) -#define hbqt_par_QTableView( n ) ( ( QTableView* ) hb_parptr( n ) ) -#define hbqt_par_HbTableView( n ) ( ( HbTableView* ) hb_parptr( n ) ) -#define hbqt_par_QTableWidget( n ) ( ( QTableWidget* ) hb_parptr( n ) ) -#define hbqt_par_QTableWidgetItem( n ) ( ( QTableWidgetItem* ) hb_parptr( n ) ) -#define hbqt_par_QTableWidgetSelectionRange( n ) ( ( QTableWidgetSelectionRange* ) hb_parptr( n ) ) -#define hbqt_par_QTabWidget( n ) ( ( QTabWidget* ) hb_parptr( n ) ) -#define hbqt_par_QTcpSocket( n ) ( ( QTcpSocket* ) hb_parptr( n ) ) -#define hbqt_par_QTextBlock( n ) ( ( QTextBlock* ) hb_parptr( n ) ) -#define hbqt_par_QTextBlockFormat( n ) ( ( QTextBlockFormat* ) hb_parptr( n ) ) -#define hbqt_par_QTextBlockGroup( n ) ( ( QTextBlockGroup* ) hb_parptr( n ) ) -#define hbqt_par_QTextBlockUserData( n ) ( ( QTextBlockUserData* ) hb_parptr( n ) ) -#define hbqt_par_QTextBoundaryFinder( n ) ( ( QTextBoundaryFinder* ) hb_parptr( n ) ) -#define hbqt_par_QTextBrowser( n ) ( ( QTextBrowser* ) hb_parptr( n ) ) -#define hbqt_par_QTextCharFormat( n ) ( ( QTextCharFormat* ) hb_parptr( n ) ) -#define hbqt_par_QTextCodec( n ) ( ( QTextCodec* ) hb_parptr( n ) ) -#define hbqt_par_QTextCodec( n ) ( ( QTextCodec* ) hb_parptr( n ) ) -#define hbqt_par_QTextCursor( n ) ( ( QTextCursor* ) hb_parptr( n ) ) -#define hbqt_par_QTextCursor( n ) ( ( QTextCursor* ) hb_parptr( n ) ) -#define hbqt_par_QTextDecoder( n ) ( ( QTextDecoder* ) hb_parptr( n ) ) -#define hbqt_par_QTextDocument( n ) ( ( QTextDocument* ) hb_parptr( n ) ) -#define hbqt_par_QTextDocumentFragment( n ) ( ( QTextDocumentFragment* ) hb_parptr( n ) ) -#define hbqt_par_QTextDocumentWriter( n ) ( ( QTextDocumentWriter* ) hb_parptr( n ) ) -#define hbqt_par_QTextEdit( n ) ( ( QTextEdit* ) hb_parptr( n ) ) -#define hbqt_par_QTextEncoder( n ) ( ( QTextEncoder* ) hb_parptr( n ) ) -#define hbqt_par_QTextEngine( n ) ( ( QTextEngine* ) hb_parptr( n ) ) -#define hbqt_par_QTextFormat( n ) ( ( QTextFormat* ) hb_parptr( n ) ) -#define hbqt_par_QTextFragment( n ) ( ( QTextFragment* ) hb_parptr( n ) ) -#define hbqt_par_QTextFrame( n ) ( ( QTextFrame* ) hb_parptr( n ) ) -#define hbqt_par_QTextFrameFormat( n ) ( ( QTextFrameFormat* ) hb_parptr( n ) ) -#define hbqt_par_QTextImageFormat( n ) ( ( QTextImageFormat* ) hb_parptr( n ) ) -#define hbqt_par_QTextInlineObject( n ) ( ( QTextInlineObject* ) hb_parptr( n ) ) -#define hbqt_par_QTextItem( n ) ( ( QTextItem* ) hb_parptr( n ) ) -#define hbqt_par_QTextLayout( n ) ( ( QTextLayout* ) hb_parptr( n ) ) -#define hbqt_par_QTextLength( n ) ( ( QTextLength* ) hb_parptr( n ) ) -#define hbqt_par_QTextLine( n ) ( ( QTextLine* ) hb_parptr( n ) ) -#define hbqt_par_QTextListFormat( n ) ( ( QTextListFormat* ) hb_parptr( n ) ) -#define hbqt_par_QTextObject( n ) ( ( QTextObject* ) hb_parptr( n ) ) -#define hbqt_par_QTextOption( n ) ( ( QTextOption* ) hb_parptr( n ) ) -#define hbqt_par_QTextStream( n ) ( ( QTextStream* ) hb_parptr( n ) ) -#define hbqt_par_QTextTableFormat( n ) ( ( QTextTableFormat* ) hb_parptr( n ) ) -#define hbqt_par_QThread( n ) ( ( QThread* ) hb_parptr( n ) ) -#define hbqt_par_QTime( n ) ( ( QTime* ) hb_parptr( n ) ) -#define hbqt_par_QTimer( n ) ( ( QTimer* ) hb_parptr( n ) ) -#define hbqt_par_QToolBar( n ) ( ( QToolBar* ) hb_parptr( n ) ) -#define hbqt_par_QToolBox( n ) ( ( QToolBox* ) hb_parptr( n ) ) -#define hbqt_par_QToolButton( n ) ( ( QToolButton* ) hb_parptr( n ) ) -#define hbqt_par_QTransform( n ) ( ( QTransform* ) hb_parptr( n ) ) -#define hbqt_par_QTranslator( n ) ( ( QTranslator* ) hb_parptr( n ) ) -#define hbqt_par_QTreeView( n ) ( ( QTreeView* ) hb_parptr( n ) ) -#define hbqt_par_QTreeWidget( n ) ( ( QTreeWidget* ) hb_parptr( n ) ) -#define hbqt_par_QTreeWidgetItem( n ) ( ( QTreeWidgetItem* ) hb_parptr( n ) ) -#define hbqt_par_QUrl( n ) ( ( QUrl* ) hb_parptr( n ) ) -#define hbqt_par_QValidator( n ) ( ( QValidator* ) hb_parptr( n ) ) -#define hbqt_par_QVariant( n ) ( ( QVariant* ) hb_parptr( n ) ) -#define hbqt_par_QVBoxLayout( n ) ( ( QVBoxLayout* ) hb_parptr( n ) ) -#define hbqt_par_QVector( n ) ( ( QVector* ) hb_parptr( n ) ) -#define hbqt_par_QWebFrame( n ) ( ( QWebFrame* ) hb_parptr( n ) ) -#define hbqt_par_QWebHistory( n ) ( ( QWebHistory* ) hb_parptr( n ) ) -#define hbqt_par_QWebHistoryInterface( n ) ( ( QWebHistoryInterface* ) hb_parptr( n ) ) -#define hbqt_par_QWebHistoryItem( n ) ( ( QWebHistoryItem* ) hb_parptr( n ) ) -#define hbqt_par_QWebHitTestResult( n ) ( ( QWebHitTestResult* ) hb_parptr( n ) ) -#define hbqt_par_QWebNetworkRequest( n ) ( ( QWebNetworkRequest* ) hb_parptr( n ) ) -#define hbqt_par_QWebPage( n ) ( ( QWebPage* ) hb_parptr( n ) ) -#define hbqt_par_QWebPage( n ) ( ( QWebPage* ) hb_parptr( n ) ) -#define hbqt_par_QWebPluginFactory( n ) ( ( QWebPluginFactory* ) hb_parptr( n ) ) -#define hbqt_par_QWebSecurityOrigin( n ) ( ( QWebSecurityOrigin* ) hb_parptr( n ) ) -#define hbqt_par_QWebSettings( n ) ( ( QWebSettings* ) hb_parptr( n ) ) -#define hbqt_par_QWebView( n ) ( ( QWebView* ) hb_parptr( n ) ) -#define hbqt_par_QWheelEvent( n ) ( ( QWheelEvent* ) hb_parptr( n ) ) -#define hbqt_par_QWidget( n ) ( ( QWidget* ) hb_parptr( n ) ) -#define hbqt_par_QWidgetAction( n ) ( ( QWidgetAction* ) hb_parptr( n ) ) -#define hbqt_par_QWidgetItem( n ) ( ( QWidgetItem* ) hb_parptr( n ) ) -#define hbqt_par_QWindowsStyle( n ) ( ( QWindowsStyle* ) hb_parptr( n ) ) -#define hbqt_par_QWindowSurface( n ) ( ( QWindowSurface* ) hb_parptr( n ) ) -#define hbqt_par_QWindowsXPStyle( n ) ( ( QWindowsXPStyle* ) hb_parptr( n ) ) -#define hbqt_par_QWizard( n ) ( ( QWizard* ) hb_parptr( n ) ) -#define hbqt_par_QWizardPage( n ) ( ( QWizardPage* ) hb_parptr( n ) ) -#define hbqt_par_QWSEvent( n ) ( ( QWSEvent* ) hb_parptr( n ) ) +#define hbqt_par_QAction( n ) ( ( QAction* ) hb_parptr( n ) ) +#define hbqt_par_QActionGroup( n ) ( ( QActionGroup* ) hb_parptr( n ) ) +#define hbqt_par_QApplication( n ) ( ( QApplication* ) hb_parptr( n ) ) +#define hbqt_par_QAxBase( n ) ( ( QAxBase* ) hb_parptr( n ) ) +#define hbqt_par_QBitmap( n ) ( ( QBitmap* ) hb_parptr( n ) ) +#define hbqt_par_QBoxLayout( n ) ( ( QBoxLayout* ) hb_parptr( n ) ) +#define hbqt_par_QBrush( n ) ( ( QBrush* ) hb_parptr( n ) ) +#define hbqt_par_QButtonGroup( n ) ( ( QButtonGroup* ) hb_parptr( n ) ) +#define hbqt_par_QByteArray( n ) ( ( QByteArray* ) hb_parptr( n ) ) +#define hbqt_par_QCalendarWidget( n ) ( ( QCalendarWidget* ) hb_parptr( n ) ) +#define hbqt_par_QCheckBox( n ) ( ( QCheckBox* ) hb_parptr( n ) ) +#define hbqt_par_QClipboard( n ) ( ( QClipboard* ) hb_parptr( n ) ) +#define hbqt_par_QColor( n ) ( ( QColor* ) hb_parptr( n ) ) +#define hbqt_par_QColorDialog( n ) ( ( QColorDialog* ) hb_parptr( n ) ) +#define hbqt_par_QComboBox( n ) ( ( QComboBox* ) hb_parptr( n ) ) +#define hbqt_par_QCommandLinkButton( n ) ( ( QCommandLinkButton* ) hb_parptr( n ) ) +#define hbqt_par_QCommonStyle( n ) ( ( QCommonStyle* ) hb_parptr( n ) ) +#define hbqt_par_QCompleter( n ) ( ( QCompleter* ) hb_parptr( n ) ) +#define hbqt_par_QConicalGradient( n ) ( ( QConicalGradient* ) hb_parptr( n ) ) +#define hbqt_par_QContextMenuEvent( n ) ( ( QContextMenuEvent* ) hb_parptr( n ) ) +#define hbqt_par_QCoreApplication( n ) ( ( QCoreApplication* ) hb_parptr( n ) ) +#define hbqt_par_QCursor( n ) ( ( QCursor* ) hb_parptr( n ) ) +#define hbqt_par_QDateEdit( n ) ( ( QDateEdit* ) hb_parptr( n ) ) +#define hbqt_par_QDataStream( n ) ( ( QDataStream* ) hb_parptr( n ) ) +#define hbqt_par_QDate( n ) ( ( QDate* ) hb_parptr( n ) ) +#define hbqt_par_QDateTime( n ) ( ( QDateTime* ) hb_parptr( n ) ) +#define hbqt_par_QDateTimeEdit( n ) ( ( QDateTimeEdit* ) hb_parptr( n ) ) +#define hbqt_par_QDesktopWidget( n ) ( ( QDesktopWidget* ) hb_parptr( n ) ) +#define hbqt_par_QDial( n ) ( ( QDial* ) hb_parptr( n ) ) +#define hbqt_par_QDialog( n ) ( ( QDialog* ) hb_parptr( n ) ) +#define hbqt_par_QDir( n ) ( ( QDir* ) hb_parptr( n ) ) +#define hbqt_par_QDirModel( n ) ( ( QDirModel* ) hb_parptr( n ) ) +#define hbqt_par_QDockWidget( n ) ( ( QDockWidget* ) hb_parptr( n ) ) +#define hbqt_par_QDockWidget( n ) ( ( QDockWidget* ) hb_parptr( n ) ) +#define hbqt_par_QDoubleSpinBox( n ) ( ( QDoubleSpinBox* ) hb_parptr( n ) ) +#define hbqt_par_QDragEnterEvent( n ) ( ( QDragEnterEvent* ) hb_parptr( n ) ) +#define hbqt_par_QDragLeaveEvent( n ) ( ( QDragLeaveEvent* ) hb_parptr( n ) ) +#define hbqt_par_QDragMoveEvent( n ) ( ( QDragMoveEvent* ) hb_parptr( n ) ) +#define hbqt_par_QDropEvent( n ) ( ( QDropEvent* ) hb_parptr( n ) ) +#define hbqt_par_QErrorMessage( n ) ( ( QErrorMessage* ) hb_parptr( n ) ) +#define hbqt_par_QEvent( n ) ( ( QEvent* ) hb_parptr( n ) ) +#define hbqt_par_QEventLoop( n ) ( ( QEventLoop* ) hb_parptr( n ) ) +#define hbqt_par_QFileDialog( n ) ( ( QFileDialog* ) hb_parptr( n ) ) +#define hbqt_par_QFileIconProvider( n ) ( ( QFileIconProvider* ) hb_parptr( n ) ) +#define hbqt_par_QFileSystemModel( n ) ( ( QFileSystemModel* ) hb_parptr( n ) ) +#define hbqt_par_QFocusEvent( n ) ( ( QFocusEvent* ) hb_parptr( n ) ) +#define hbqt_par_QFocusFrame( n ) ( ( QFocusFrame* ) hb_parptr( n ) ) +#define hbqt_par_QFont( n ) ( ( QFont* ) hb_parptr( n ) ) +#define hbqt_par_QFontComboBox( n ) ( ( QFontComboBox* ) hb_parptr( n ) ) +#define hbqt_par_QFontDatabase( n ) ( ( QFontDatabase* ) hb_parptr( n ) ) +#define hbqt_par_QFontDialog( n ) ( ( QFontDialog* ) hb_parptr( n ) ) +#define hbqt_par_QFontInfo( n ) ( ( QFontInfo* ) hb_parptr( n ) ) +#define hbqt_par_QFontMetrics( n ) ( ( QFontMetrics* ) hb_parptr( n ) ) +#define hbqt_par_QFontMetricsF( n ) ( ( QFontMetricsF* ) hb_parptr( n ) ) +#define hbqt_par_QFormLayout( n ) ( ( QFormLayout* ) hb_parptr( n ) ) +#define hbqt_par_QFrame( n ) ( ( QFrame* ) hb_parptr( n ) ) +#define hbqt_par_QFtp( n ) ( ( QFtp* ) hb_parptr( n ) ) +#define hbqt_par_QGradient( n ) ( ( QGradient* ) hb_parptr( n ) ) +#define hbqt_par_QGradientStops( n ) ( ( QGradientStops* ) hb_parptr( n ) ) +#define hbqt_par_QGridLayout( n ) ( ( QGridLayout* ) hb_parptr( n ) ) +#define hbqt_par_QGroupBox( n ) ( ( QGroupBox* ) hb_parptr( n ) ) +#define hbqt_par_QHBoxLayout( n ) ( ( QHBoxLayout* ) hb_parptr( n ) ) +#define hbqt_par_QHeaderView( n ) ( ( QHeaderView* ) hb_parptr( n ) ) +#define hbqt_par_QHttp( n ) ( ( QHttp* ) hb_parptr( n ) ) +#define hbqt_par_QHttpRequestHeader( n ) ( ( QHttpRequestHeader* ) hb_parptr( n ) ) +#define hbqt_par_QIcon( n ) ( ( QIcon* ) hb_parptr( n ) ) +#define hbqt_par_QImage( n ) ( ( QImage* ) hb_parptr( n ) ) +#define hbqt_par_QImageReader( n ) ( ( QImageReader* ) hb_parptr( n ) ) +#define hbqt_par_QImageWriter( n ) ( ( QImageWriter* ) hb_parptr( n ) ) +#define hbqt_par_QInputContext( n ) ( ( QInputContext* ) hb_parptr( n ) ) +#define hbqt_par_QInputDialog( n ) ( ( QInputDialog* ) hb_parptr( n ) ) +#define hbqt_par_QInputEvent( n ) ( ( QInputEvent* ) hb_parptr( n ) ) +#define hbqt_par_QIODevice( n ) ( ( QIODevice* ) hb_parptr( n ) ) +#define hbqt_par_QItemEditorFactory( n ) ( ( QItemEditorFactory* ) hb_parptr( n ) ) +#define hbqt_par_QItemSelectionModel( n ) ( ( QItemSelectionModel* ) hb_parptr( n ) ) +#define hbqt_par_QKeyEvent( n ) ( ( QKeyEvent* ) hb_parptr( n ) ) +#define hbqt_par_QKeySequence( n ) ( ( QKeySequence* ) hb_parptr( n ) ) +#define hbqt_par_QLabel( n ) ( ( QLabel* ) hb_parptr( n ) ) +#define hbqt_par_QLatin1Char( n ) ( ( QLatin1Char* ) hb_parptr( n ) ) +#define hbqt_par_QLatin1String( n ) ( ( QLatin1String* ) hb_parptr( n ) ) +#define hbqt_par_QLayout( n ) ( ( QLayout* ) hb_parptr( n ) ) +#define hbqt_par_QLayoutItem( n ) ( ( QLayoutItem* ) hb_parptr( n ) ) +#define hbqt_par_QLCDNumber( n ) ( ( QLCDNumber* ) hb_parptr( n ) ) +#define hbqt_par_QLibraryInfo( n ) ( ( QLibraryInfo* ) hb_parptr( n ) ) +#define hbqt_par_QLine( n ) ( ( QLine* ) hb_parptr( n ) ) +#define hbqt_par_QLinearGradient( n ) ( ( QLinearGradient* ) hb_parptr( n ) ) +#define hbqt_par_QLineEdit( n ) ( ( QLineEdit* ) hb_parptr( n ) ) +#define hbqt_par_QLineF( n ) ( ( QLineF* ) hb_parptr( n ) ) +#define hbqt_par_QList( n ) ( ( QList* ) hb_parptr( n ) ) +#define hbqt_par_QListView( n ) ( ( QListView* ) hb_parptr( n ) ) +#define hbqt_par_QListWidget( n ) ( ( QListWidget* ) hb_parptr( n ) ) +#define hbqt_par_QListWidgetItem( n ) ( ( QListWidgetItem* ) hb_parptr( n ) ) +#define hbqt_par_QLocale( n ) ( ( QLocale* ) hb_parptr( n ) ) +#define hbqt_par_QMainWindow( n ) ( ( QMainWindow* ) hb_parptr( n ) ) +#define hbqt_par_QMatrix( n ) ( ( QMatrix* ) hb_parptr( n ) ) +#define hbqt_par_QMenu( n ) ( ( QMenu* ) hb_parptr( n ) ) +#define hbqt_par_QMenuBar( n ) ( ( QMenuBar* ) hb_parptr( n ) ) +#define hbqt_par_QMessageBox( n ) ( ( QMessageBox* ) hb_parptr( n ) ) +#define hbqt_par_QMimeData( n ) ( ( QMimeData* ) hb_parptr( n ) ) +#define hbqt_par_QModelIndex( n ) ( ( QModelIndex* ) hb_parptr( n ) ) +#define hbqt_par_QModelIndexList( n ) ( ( QModelIndexList* ) hb_parptr( n ) ) +#define hbqt_par_QMouseEvent( n ) ( ( QMouseEvent* ) hb_parptr( n ) ) +#define hbqt_par_QMoveEvent( n ) ( ( QMoveEvent* ) hb_parptr( n ) ) +#define hbqt_par_QMovie( n ) ( ( QMovie* ) hb_parptr( n ) ) +#define hbqt_par_QNetworkAccessManager( n ) ( ( QNetworkAccessManager* ) hb_parptr( n ) ) +#define hbqt_par_QNetworkProxy( n ) ( ( QNetworkProxy* ) hb_parptr( n ) ) +#define hbqt_par_QNetworkRequest( n ) ( ( QNetworkRequest* ) hb_parptr( n ) ) +#define hbqt_par_QObject( n ) ( ( QObject* ) hb_parptr( n ) ) +#define hbqt_par_QPageSetupDialog( n ) ( ( QPageSetupDialog* ) hb_parptr( n ) ) +#define hbqt_par_QPaintDevice( n ) ( ( QPaintDevice* ) hb_parptr( n ) ) +#define hbqt_par_QPainter( n ) ( ( QPainter* ) hb_parptr( n ) ) +#define hbqt_par_QPainterPath( n ) ( ( QPainterPath* ) hb_parptr( n ) ) +#define hbqt_par_QPaintEvent( n ) ( ( QPaintEvent* ) hb_parptr( n ) ) +#define hbqt_par_QPalette( n ) ( ( QPalette* ) hb_parptr( n ) ) +#define hbqt_par_QPen( n ) ( ( QPen* ) hb_parptr( n ) ) +#define hbqt_par_QPicture( n ) ( ( QPicture* ) hb_parptr( n ) ) +#define hbqt_par_QPixmap( n ) ( ( QPixmap* ) hb_parptr( n ) ) +#define hbqt_par_QPoint( n ) ( ( QPoint* ) hb_parptr( n ) ) +#define hbqt_par_QPointF( n ) ( ( QPointF* ) hb_parptr( n ) ) +#define hbqt_par_QPolygon( n ) ( ( QPolygon* ) hb_parptr( n ) ) +#define hbqt_par_QPolygonF( n ) ( ( QPolygonF* ) hb_parptr( n ) ) +#define hbqt_par_QPrintDialog( n ) ( ( QPrintDialog* ) hb_parptr( n ) ) +#define hbqt_par_QPrintEngine( n ) ( ( QPrintEngine* ) hb_parptr( n ) ) +#define hbqt_par_QPrinter( n ) ( ( QPrinter* ) hb_parptr( n ) ) +#define hbqt_par_QPrintPreviewDialog( n ) ( ( QPrintPreviewDialog* ) hb_parptr( n ) ) +#define hbqt_par_QProcess( n ) ( ( QProcess* ) hb_parptr( n ) ) +#define hbqt_par_QProgressBar( n ) ( ( QProgressBar* ) hb_parptr( n ) ) +#define hbqt_par_QProgressDialog( n ) ( ( QProgressDialog* ) hb_parptr( n ) ) +#define hbqt_par_QPushButton( n ) ( ( QPushButton* ) hb_parptr( n ) ) +#define hbqt_par_QRadialGradient( n ) ( ( QRadialGradient* ) hb_parptr( n ) ) +#define hbqt_par_QRadioButton( n ) ( ( QRadioButton* ) hb_parptr( n ) ) +#define hbqt_par_QRect( n ) ( ( QRect* ) hb_parptr( n ) ) +#define hbqt_par_QRectF( n ) ( ( QRectF* ) hb_parptr( n ) ) +#define hbqt_par_QRegExp( n ) ( ( QRegExp* ) hb_parptr( n ) ) +#define hbqt_par_QRegion( n ) ( ( QRegion* ) hb_parptr( n ) ) +#define hbqt_par_QResizeEvent( n ) ( ( QResizeEvent* ) hb_parptr( n ) ) +#define hbqt_par_QResource( n ) ( ( QResource* ) hb_parptr( n ) ) +#define hbqt_par_QScrollArea( n ) ( ( QScrollArea* ) hb_parptr( n ) ) +#define hbqt_par_QScrollBar( n ) ( ( QScrollBar* ) hb_parptr( n ) ) +#define hbqt_par_QSessionManager( n ) ( ( QSessionManager* ) hb_parptr( n ) ) +#define hbqt_par_QSignalMapper( n ) ( ( QSignalMapper* ) hb_parptr( n ) ) +#define hbqt_par_QSize( n ) ( ( QSize* ) hb_parptr( n ) ) +#define hbqt_par_QSizeF( n ) ( ( QSizeF* ) hb_parptr( n ) ) +#define hbqt_par_QSizeGrip( n ) ( ( QSizeGrip* ) hb_parptr( n ) ) +#define hbqt_par_QSizePolicy( n ) ( ( QSizePolicy* ) hb_parptr( n ) ) +#define hbqt_par_QSlider( n ) ( ( QSlider* ) hb_parptr( n ) ) +#define hbqt_par_QSound( n ) ( ( QSound* ) hb_parptr( n ) ) +#define hbqt_par_QSpacerItem( n ) ( ( QSpacerItem* ) hb_parptr( n ) ) +#define hbqt_par_QSpinBox( n ) ( ( QSpinBox* ) hb_parptr( n ) ) +#define hbqt_par_QSplashScreen( n ) ( ( QSplashScreen* ) hb_parptr( n ) ) +#define hbqt_par_QSplitter( n ) ( ( QSplitter* ) hb_parptr( n ) ) +#define hbqt_par_QStandardItem( n ) ( ( QStandardItem* ) hb_parptr( n ) ) +#define hbqt_par_QStandardItemModel( n ) ( ( QStandardItemModel* ) hb_parptr( n ) ) +#define hbqt_par_QStatusBar( n ) ( ( QStatusBar* ) hb_parptr( n ) ) +#define hbqt_par_QStringList( n ) ( ( QStringList* ) hb_parptr( n ) ) +#define hbqt_par_QStringListModel( n ) ( ( QStringListModel* ) hb_parptr( n ) ) +#define hbqt_par_QStyle( n ) ( ( QStyle* ) hb_parptr( n ) ) +#define hbqt_par_QStyledItemDelegate( n ) ( ( QStyledItemDelegate* ) hb_parptr( n ) ) +#define hbqt_par_QStyleFactory( n ) ( ( QStyleFactory* ) hb_parptr( n ) ) +#define hbqt_par_QStyleHintReturn( n ) ( ( QStyleHintReturn* ) hb_parptr( n ) ) +#define hbqt_par_QStyleHintReturnMask( n ) ( ( QStyleHintReturnMask* ) hb_parptr( n ) ) +#define hbqt_par_QStyleHintReturnVariant( n ) ( ( QStyleHintReturnVariant* ) hb_parptr( n ) ) +#define hbqt_par_QStyleOption( n ) ( ( QStyleOption* ) hb_parptr( n ) ) +#define hbqt_par_QStyleOptionButton( n ) ( ( QStyleOptionButton* ) hb_parptr( n ) ) +#define hbqt_par_QStyleOptionComboBox( n ) ( ( QStyleOptionComboBox* ) hb_parptr( n ) ) +#define hbqt_par_QStyleOptionComplex( n ) ( ( QStyleOptionComplex* ) hb_parptr( n ) ) +#define hbqt_par_QStyleOptionDockWidget( n ) ( ( QStyleOptionDockWidget* ) hb_parptr( n ) ) +#define hbqt_par_QStyleOptionFocusRect( n ) ( ( QStyleOptionFocusRect* ) hb_parptr( n ) ) +#define hbqt_par_QStyleOptionFrame( n ) ( ( QStyleOptionFrame* ) hb_parptr( n ) ) +#define hbqt_par_QStyleOptionGroupBox( n ) ( ( QStyleOptionGroupBox* ) hb_parptr( n ) ) +#define hbqt_par_QStyleOptionHeader( n ) ( ( QStyleOptionHeader* ) hb_parptr( n ) ) +#define hbqt_par_QStyleOptionMenuItem( n ) ( ( QStyleOptionMenuItem* ) hb_parptr( n ) ) +#define hbqt_par_QStyleOptionProgressBar( n ) ( ( QStyleOptionProgressBar* ) hb_parptr( n ) ) +#define hbqt_par_QStyleOptionSizeGrip( n ) ( ( QStyleOptionSizeGrip* ) hb_parptr( n ) ) +#define hbqt_par_QStyleOptionSlider( n ) ( ( QStyleOptionSlider* ) hb_parptr( n ) ) +#define hbqt_par_QStyleOptionSpinBox( n ) ( ( QStyleOptionSpinBox* ) hb_parptr( n ) ) +#define hbqt_par_QStyleOptionTab( n ) ( ( QStyleOptionTab* ) hb_parptr( n ) ) +#define hbqt_par_QStyleOptionTabBarBase( n ) ( ( QStyleOptionTabBarBase* ) hb_parptr( n ) ) +#define hbqt_par_QStyleOptionTabWidgetFrame( n ) ( ( QStyleOptionTabWidgetFrame* ) hb_parptr( n ) ) +#define hbqt_par_QStyleOptionTitleBar( n ) ( ( QStyleOptionTitleBar* ) hb_parptr( n ) ) +#define hbqt_par_QStyleOptionToolBar( n ) ( ( QStyleOptionToolBar* ) hb_parptr( n ) ) +#define hbqt_par_QStyleOptionToolBox( n ) ( ( QStyleOptionToolBox* ) hb_parptr( n ) ) +#define hbqt_par_QStyleOptionToolButton( n ) ( ( QStyleOptionToolButton* ) hb_parptr( n ) ) +#define hbqt_par_QStyleOptionViewItem( n ) ( ( QStyleOptionViewItem* ) hb_parptr( n ) ) +#define hbqt_par_QStyleOptionViewItem( n ) ( ( QStyleOptionViewItem* ) hb_parptr( n ) ) +#define hbqt_par_QStylePainter( n ) ( ( QStylePainter* ) hb_parptr( n ) ) +#define hbqt_par_QSystemTrayIcon( n ) ( ( QSystemTrayIcon* ) hb_parptr( n ) ) +#define hbqt_par_QTabBar( n ) ( ( QTabBar* ) hb_parptr( n ) ) +#define hbqt_par_QTableView( n ) ( ( QTableView* ) hb_parptr( n ) ) +#define hbqt_par_HbTableView( n ) ( ( HbTableView* ) hb_parptr( n ) ) +#define hbqt_par_QTableWidget( n ) ( ( QTableWidget* ) hb_parptr( n ) ) +#define hbqt_par_QTableWidgetItem( n ) ( ( QTableWidgetItem* ) hb_parptr( n ) ) +#define hbqt_par_QTableWidgetSelectionRange( n ) ( ( QTableWidgetSelectionRange* ) hb_parptr( n ) ) +#define hbqt_par_QTabWidget( n ) ( ( QTabWidget* ) hb_parptr( n ) ) +#define hbqt_par_QTcpSocket( n ) ( ( QTcpSocket* ) hb_parptr( n ) ) +#define hbqt_par_QTextBlock( n ) ( ( QTextBlock* ) hb_parptr( n ) ) +#define hbqt_par_QTextBlockFormat( n ) ( ( QTextBlockFormat* ) hb_parptr( n ) ) +#define hbqt_par_QTextBlockGroup( n ) ( ( QTextBlockGroup* ) hb_parptr( n ) ) +#define hbqt_par_QTextBlockUserData( n ) ( ( QTextBlockUserData* ) hb_parptr( n ) ) +#define hbqt_par_QTextBoundaryFinder( n ) ( ( QTextBoundaryFinder* ) hb_parptr( n ) ) +#define hbqt_par_QTextBrowser( n ) ( ( QTextBrowser* ) hb_parptr( n ) ) +#define hbqt_par_QTextCharFormat( n ) ( ( QTextCharFormat* ) hb_parptr( n ) ) +#define hbqt_par_QTextCodec( n ) ( ( QTextCodec* ) hb_parptr( n ) ) +#define hbqt_par_QTextCodec( n ) ( ( QTextCodec* ) hb_parptr( n ) ) +#define hbqt_par_QTextCursor( n ) ( ( QTextCursor* ) hb_parptr( n ) ) +#define hbqt_par_QTextCursor( n ) ( ( QTextCursor* ) hb_parptr( n ) ) +#define hbqt_par_QTextDecoder( n ) ( ( QTextDecoder* ) hb_parptr( n ) ) +#define hbqt_par_QTextDocument( n ) ( ( QTextDocument* ) hb_parptr( n ) ) +#define hbqt_par_QTextDocumentFragment( n ) ( ( QTextDocumentFragment* ) hb_parptr( n ) ) +#define hbqt_par_QTextDocumentWriter( n ) ( ( QTextDocumentWriter* ) hb_parptr( n ) ) +#define hbqt_par_QTextEdit( n ) ( ( QTextEdit* ) hb_parptr( n ) ) +#define hbqt_par_QTextEncoder( n ) ( ( QTextEncoder* ) hb_parptr( n ) ) +#define hbqt_par_QTextEngine( n ) ( ( QTextEngine* ) hb_parptr( n ) ) +#define hbqt_par_QTextFormat( n ) ( ( QTextFormat* ) hb_parptr( n ) ) +#define hbqt_par_QTextFragment( n ) ( ( QTextFragment* ) hb_parptr( n ) ) +#define hbqt_par_QTextFrame( n ) ( ( QTextFrame* ) hb_parptr( n ) ) +#define hbqt_par_QTextFrameFormat( n ) ( ( QTextFrameFormat* ) hb_parptr( n ) ) +#define hbqt_par_QTextImageFormat( n ) ( ( QTextImageFormat* ) hb_parptr( n ) ) +#define hbqt_par_QTextInlineObject( n ) ( ( QTextInlineObject* ) hb_parptr( n ) ) +#define hbqt_par_QTextItem( n ) ( ( QTextItem* ) hb_parptr( n ) ) +#define hbqt_par_QTextLayout( n ) ( ( QTextLayout* ) hb_parptr( n ) ) +#define hbqt_par_QTextLength( n ) ( ( QTextLength* ) hb_parptr( n ) ) +#define hbqt_par_QTextLine( n ) ( ( QTextLine* ) hb_parptr( n ) ) +#define hbqt_par_QTextListFormat( n ) ( ( QTextListFormat* ) hb_parptr( n ) ) +#define hbqt_par_QTextObject( n ) ( ( QTextObject* ) hb_parptr( n ) ) +#define hbqt_par_QTextOption( n ) ( ( QTextOption* ) hb_parptr( n ) ) +#define hbqt_par_QTextStream( n ) ( ( QTextStream* ) hb_parptr( n ) ) +#define hbqt_par_QTextTableFormat( n ) ( ( QTextTableFormat* ) hb_parptr( n ) ) +#define hbqt_par_QThread( n ) ( ( QThread* ) hb_parptr( n ) ) +#define hbqt_par_QTime( n ) ( ( QTime* ) hb_parptr( n ) ) +#define hbqt_par_QTimeEdit( n ) ( ( QTimeEdit* ) hb_parptr( n ) ) +#define hbqt_par_QTimer( n ) ( ( QTimer* ) hb_parptr( n ) ) +#define hbqt_par_QToolBar( n ) ( ( QToolBar* ) hb_parptr( n ) ) +#define hbqt_par_QToolBox( n ) ( ( QToolBox* ) hb_parptr( n ) ) +#define hbqt_par_QToolButton( n ) ( ( QToolButton* ) hb_parptr( n ) ) +#define hbqt_par_QTransform( n ) ( ( QTransform* ) hb_parptr( n ) ) +#define hbqt_par_QTranslator( n ) ( ( QTranslator* ) hb_parptr( n ) ) +#define hbqt_par_QTreeView( n ) ( ( QTreeView* ) hb_parptr( n ) ) +#define hbqt_par_QTreeWidget( n ) ( ( QTreeWidget* ) hb_parptr( n ) ) +#define hbqt_par_QTreeWidgetItem( n ) ( ( QTreeWidgetItem* ) hb_parptr( n ) ) +#define hbqt_par_QUrl( n ) ( ( QUrl* ) hb_parptr( n ) ) +#define hbqt_par_QValidator( n ) ( ( QValidator* ) hb_parptr( n ) ) +#define hbqt_par_QVariant( n ) ( ( QVariant* ) hb_parptr( n ) ) +#define hbqt_par_QVBoxLayout( n ) ( ( QVBoxLayout* ) hb_parptr( n ) ) +#define hbqt_par_QVector( n ) ( ( QVector* ) hb_parptr( n ) ) +#define hbqt_par_QWebFrame( n ) ( ( QWebFrame* ) hb_parptr( n ) ) +#define hbqt_par_QWebHistory( n ) ( ( QWebHistory* ) hb_parptr( n ) ) +#define hbqt_par_QWebHistoryInterface( n ) ( ( QWebHistoryInterface* ) hb_parptr( n ) ) +#define hbqt_par_QWebHistoryItem( n ) ( ( QWebHistoryItem* ) hb_parptr( n ) ) +#define hbqt_par_QWebHitTestResult( n ) ( ( QWebHitTestResult* ) hb_parptr( n ) ) +#define hbqt_par_QWebNetworkRequest( n ) ( ( QWebNetworkRequest* ) hb_parptr( n ) ) +#define hbqt_par_QWebPage( n ) ( ( QWebPage* ) hb_parptr( n ) ) +#define hbqt_par_QWebPage( n ) ( ( QWebPage* ) hb_parptr( n ) ) +#define hbqt_par_QWebPluginFactory( n ) ( ( QWebPluginFactory* ) hb_parptr( n ) ) +#define hbqt_par_QWebSecurityOrigin( n ) ( ( QWebSecurityOrigin* ) hb_parptr( n ) ) +#define hbqt_par_QWebSettings( n ) ( ( QWebSettings* ) hb_parptr( n ) ) +#define hbqt_par_QWebView( n ) ( ( QWebView* ) hb_parptr( n ) ) +#define hbqt_par_QWheelEvent( n ) ( ( QWheelEvent* ) hb_parptr( n ) ) +#define hbqt_par_QWidget( n ) ( ( QWidget* ) hb_parptr( n ) ) +#define hbqt_par_QWidgetAction( n ) ( ( QWidgetAction* ) hb_parptr( n ) ) +#define hbqt_par_QWidgetItem( n ) ( ( QWidgetItem* ) hb_parptr( n ) ) +#define hbqt_par_QWindowsStyle( n ) ( ( QWindowsStyle* ) hb_parptr( n ) ) +#define hbqt_par_QWindowSurface( n ) ( ( QWindowSurface* ) hb_parptr( n ) ) +#define hbqt_par_QWindowsXPStyle( n ) ( ( QWindowsXPStyle* ) hb_parptr( n ) ) +#define hbqt_par_QWizard( n ) ( ( QWizard* ) hb_parptr( n ) ) +#define hbqt_par_QWizardPage( n ) ( ( QWizardPage* ) hb_parptr( n ) ) +#define hbqt_par_QWSEvent( n ) ( ( QWSEvent* ) hb_parptr( n ) ) +#endif -#define hbqt_par_QString( n ) ( ( QString ) hb_parcx( n ) ) -#define hbqt_par_QRgb( n ) ( hb_parnint( n ) ) -#define hbqt_par_Bool( n ) ( hb_parl( n ) ) -#define hbqt_par_char( n ) ( hb_parcx( n ) ) +#define hbqt_par_QString( n ) ( ( QString ) hb_parcx( n ) ) +#define hbqt_par_QRgb( n ) ( hb_parnint( n ) ) +#define hbqt_par_Bool( n ) ( hb_parl( n ) ) +#define hbqt_par_char( n ) ( hb_parcx( n ) ) -#define hbqt_ret_QWidget( p ) ( hb_retptr( ( QWidget* ) p ) ) -#define hbqt_ret_QAbstractItemDelegate( p ) ( hb_retptr( ( QAbstractItemDelegate* ) p ) ) -#define hbqt_ret_QAbstractItemModel( p ) ( hb_retptr( ( QAbstractItemModel* ) p ) ) -#define hbqt_ret_QPrinter( p ) ( hb_retptr( ( QPrinter* ) p ) ) +#define hbqt_ret_QWidget( p ) ( hb_retptr( ( QWidget* ) p ) ) +#define hbqt_ret_QAbstractItemDelegate( p ) ( hb_retptr( ( QAbstractItemDelegate* ) p ) ) +#define hbqt_ret_QAbstractItemModel( p ) ( hb_retptr( ( QAbstractItemModel* ) p ) ) +#define hbqt_ret_QPrinter( p ) ( hb_retptr( ( QPrinter* ) p ) ) + + +/* For GC Pointers */ + +typedef struct +{ + void * ph; + int type; +} QGC_POINTER; + +HB_GARBAGE_FUNC( Q_release ); +void * hbqt_gcpointer( int iParam ); +void * hbqt_ptrTOgcpointer( void * p ); +int hbqt_getIdByName( QString obj ); + +#define hbqt_par_ExtensionOption( n ) ( ( ExtensionOption * ) hbqt_gcpointer( n ) ) +#define hbqt_par_IUnknown( n ) ( ( IUnknown * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAbstractButton( n ) ( ( QAbstractButton * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAbstractEventDispatcher( n ) ( ( QAbstractEventDispatcher * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAbstractItemDelegate( n ) ( ( QAbstractItemDelegate * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAbstractItemModel( n ) ( ( QAbstractItemModel * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAbstractItemView( n ) ( ( QAbstractItemView * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAbstractListModel( n ) ( ( QAbstractListModel * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAbstractPrintDialog( n ) ( ( QAbstractPrintDialog * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAbstractProxyModel( n ) ( ( QAbstractProxyModel * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAbstractScrollArea( n ) ( ( QAbstractScrollArea * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAbstractSlider( n ) ( ( QAbstractSlider * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAbstractSpinBox( n ) ( ( QAbstractSpinBox * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAbstractTableModel( n ) ( ( QAbstractTableModel * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAbstractTextDocumentLayout( n ) ( ( QAbstractTextDocumentLayout * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAction( n ) ( ( QAction * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QActionGroup( n ) ( ( QActionGroup * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QApplication( n ) ( ( QApplication * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QAxBase( n ) ( ( QAxBase * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QBitmap( n ) ( ( QBitmap * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QBoxLayout( n ) ( ( QBoxLayout * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QBrush( n ) ( ( QBrush * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QButtonGroup( n ) ( ( QButtonGroup * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QByteArray( n ) ( ( QByteArray * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QCalendarWidget( n ) ( ( QCalendarWidget * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QCheckBox( n ) ( ( QCheckBox * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QClipboard( n ) ( ( QClipboard * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QColor( n ) ( ( QColor * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QColorDialog( n ) ( ( QColorDialog * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QComboBox( n ) ( ( QComboBox * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QCommandLinkButton( n ) ( ( QCommandLinkButton * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QCommonStyle( n ) ( ( QCommonStyle * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QCompleter( n ) ( ( QCompleter * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QConicalGradient( n ) ( ( QConicalGradient * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QContextMenuEvent( n ) ( ( QContextMenuEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QCoreApplication( n ) ( ( QCoreApplication * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QCursor( n ) ( ( QCursor * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDateEdit( n ) ( ( QDateEdit * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDataStream( n ) ( ( QDataStream * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDate( n ) ( ( QDate * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDateTime( n ) ( ( QDateTime * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDateTimeEdit( n ) ( ( QDateTimeEdit * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDesktopWidget( n ) ( ( QDesktopWidget * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDial( n ) ( ( QDial * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDialog( n ) ( ( QDialog * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDir( n ) ( ( QDir * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDirModel( n ) ( ( QDirModel * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDockWidget( n ) ( ( QDockWidget * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDockWidget( n ) ( ( QDockWidget * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDoubleSpinBox( n ) ( ( QDoubleSpinBox * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDragEnterEvent( n ) ( ( QDragEnterEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDragLeaveEvent( n ) ( ( QDragLeaveEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDragMoveEvent( n ) ( ( QDragMoveEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QDropEvent( n ) ( ( QDropEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QErrorMessage( n ) ( ( QErrorMessage * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QEvent( n ) ( ( QEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QEventLoop( n ) ( ( QEventLoop * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFileDialog( n ) ( ( QFileDialog * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFileIconProvider( n ) ( ( QFileIconProvider * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFileSystemModel( n ) ( ( QFileSystemModel * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFocusEvent( n ) ( ( QFocusEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFocusFrame( n ) ( ( QFocusFrame * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFont( n ) ( ( QFont * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFontComboBox( n ) ( ( QFontComboBox * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFontDatabase( n ) ( ( QFontDatabase * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFontDialog( n ) ( ( QFontDialog * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFontInfo( n ) ( ( QFontInfo * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFontMetrics( n ) ( ( QFontMetrics * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFontMetricsF( n ) ( ( QFontMetricsF * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFormLayout( n ) ( ( QFormLayout * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFrame( n ) ( ( QFrame * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QFtp( n ) ( ( QFtp * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QGradient( n ) ( ( QGradient * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QGradientStops( n ) ( ( QGradientStops * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QGridLayout( n ) ( ( QGridLayout * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QGroupBox( n ) ( ( QGroupBox * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QHBoxLayout( n ) ( ( QHBoxLayout * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QHeaderView( n ) ( ( QHeaderView * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QHttp( n ) ( ( QHttp * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QHttpRequestHeader( n ) ( ( QHttpRequestHeader * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QIcon( n ) ( ( QIcon * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QImage( n ) ( ( QImage * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QImageReader( n ) ( ( QImageReader * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QImageWriter( n ) ( ( QImageWriter * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QInputContext( n ) ( ( QInputContext * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QInputDialog( n ) ( ( QInputDialog * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QInputEvent( n ) ( ( QInputEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QIODevice( n ) ( ( QIODevice * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QItemEditorFactory( n ) ( ( QItemEditorFactory * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QItemSelectionModel( n ) ( ( QItemSelectionModel * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QKeyEvent( n ) ( ( QKeyEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QKeySequence( n ) ( ( QKeySequence * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QLabel( n ) ( ( QLabel * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QLatin1Char( n ) ( ( QLatin1Char * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QLatin1String( n ) ( ( QLatin1String * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QLayout( n ) ( ( QLayout * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QLayoutItem( n ) ( ( QLayoutItem * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QLCDNumber( n ) ( ( QLCDNumber * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QLibraryInfo( n ) ( ( QLibraryInfo * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QLine( n ) ( ( QLine * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QLinearGradient( n ) ( ( QLinearGradient * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QLineEdit( n ) ( ( QLineEdit * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QLineF( n ) ( ( QLineF * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QList( n ) ( ( QList< void * > * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QListView( n ) ( ( QListView * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QListWidget( n ) ( ( QListWidget * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QListWidgetItem( n ) ( ( QListWidgetItem * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QLocale( n ) ( ( QLocale * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QMainWindow( n ) ( ( QMainWindow * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QMatrix( n ) ( ( QMatrix * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QMenu( n ) ( ( QMenu * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QMenuBar( n ) ( ( QMenuBar * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QMessageBox( n ) ( ( QMessageBox * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QMimeData( n ) ( ( QMimeData * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QModelIndex( n ) ( ( QModelIndex * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QModelIndexList( n ) ( ( QModelIndexList * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QMouseEvent( n ) ( ( QMouseEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QMoveEvent( n ) ( ( QMoveEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QMovie( n ) ( ( QMovie * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QNetworkAccessManager( n ) ( ( QNetworkAccessManager * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QNetworkProxy( n ) ( ( QNetworkProxy * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QNetworkRequest( n ) ( ( QNetworkRequest * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QObject( n ) ( ( QObject * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPageSetupDialog( n ) ( ( QPageSetupDialog * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPaintDevice( n ) ( ( QPaintDevice * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPainter( n ) ( ( QPainter * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPainterPath( n ) ( ( QPainterPath * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPaintEvent( n ) ( ( QPaintEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPalette( n ) ( ( QPalette * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPen( n ) ( ( QPen * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPicture( n ) ( ( QPicture * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPixmap( n ) ( ( QPixmap * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPoint( n ) ( ( QPoint * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPointF( n ) ( ( QPointF * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPolygon( n ) ( ( QPolygon * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPolygonF( n ) ( ( QPolygonF * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPrintDialog( n ) ( ( QPrintDialog * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPrintEngine( n ) ( ( QPrintEngine * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPrinter( n ) ( ( QPrinter * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPrintPreviewDialog( n ) ( ( QPrintPreviewDialog * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QProcess( n ) ( ( QProcess * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QProgressBar( n ) ( ( QProgressBar * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QProgressDialog( n ) ( ( QProgressDialog * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QPushButton( n ) ( ( QPushButton * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QRadialGradient( n ) ( ( QRadialGradient * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QRadioButton( n ) ( ( QRadioButton * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QRect( n ) ( ( QRect * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QRectF( n ) ( ( QRectF * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QRegExp( n ) ( ( QRegExp * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QRegion( n ) ( ( QRegion * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QResizeEvent( n ) ( ( QResizeEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QResource( n ) ( ( QResource * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QScrollArea( n ) ( ( QScrollArea * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QScrollBar( n ) ( ( QScrollBar * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSessionManager( n ) ( ( QSessionManager * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSignalMapper( n ) ( ( QSignalMapper * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSize( n ) ( ( QSize * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSizeF( n ) ( ( QSizeF * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSizeGrip( n ) ( ( QSizeGrip * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSizePolicy( n ) ( ( QSizePolicy * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSlider( n ) ( ( QSlider * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSound( n ) ( ( QSound * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSpacerItem( n ) ( ( QSpacerItem * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSpinBox( n ) ( ( QSpinBox * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSplashScreen( n ) ( ( QSplashScreen * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSplitter( n ) ( ( QSplitter * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStandardItem( n ) ( ( QStandardItem * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStandardItemModel( n ) ( ( QStandardItemModel * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStatusBar( n ) ( ( QStatusBar * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStringList( n ) ( ( QStringList * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStringListModel( n ) ( ( QStringListModel * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyle( n ) ( ( QStyle * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyledItemDelegate( n ) ( ( QStyledItemDelegate * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleFactory( n ) ( ( QStyleFactory * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleHintReturn( n ) ( ( QStyleHintReturn * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleHintReturnMask( n ) ( ( QStyleHintReturnMask * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleHintReturnVariant( n ) ( ( QStyleHintReturnVariant * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOption( n ) ( ( QStyleOption * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionButton( n ) ( ( QStyleOptionButton * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionComboBox( n ) ( ( QStyleOptionComboBox * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionComplex( n ) ( ( QStyleOptionComplex * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionDockWidget( n ) ( ( QStyleOptionDockWidget * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionFocusRect( n ) ( ( QStyleOptionFocusRect * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionFrame( n ) ( ( QStyleOptionFrame * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionGroupBox( n ) ( ( QStyleOptionGroupBox * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionHeader( n ) ( ( QStyleOptionHeader * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionMenuItem( n ) ( ( QStyleOptionMenuItem * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionProgressBar( n ) ( ( QStyleOptionProgressBar * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionSizeGrip( n ) ( ( QStyleOptionSizeGrip * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionSlider( n ) ( ( QStyleOptionSlider * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionSpinBox( n ) ( ( QStyleOptionSpinBox * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionTab( n ) ( ( QStyleOptionTab * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionTabBarBase( n ) ( ( QStyleOptionTabBarBase * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionTabWidgetFrame( n ) ( ( QStyleOptionTabWidgetFrame * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionTitleBar( n ) ( ( QStyleOptionTitleBar * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionToolBar( n ) ( ( QStyleOptionToolBar * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionToolBox( n ) ( ( QStyleOptionToolBox * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionToolButton( n ) ( ( QStyleOptionToolButton * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionViewItem( n ) ( ( QStyleOptionViewItem * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStyleOptionViewItem( n ) ( ( QStyleOptionViewItem * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QStylePainter( n ) ( ( QStylePainter * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QSystemTrayIcon( n ) ( ( QSystemTrayIcon * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTabBar( n ) ( ( QTabBar * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTableView( n ) ( ( QTableView * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTableWidget( n ) ( ( QTableWidget * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTableWidgetItem( n ) ( ( QTableWidgetItem * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTableWidgetSelectionRange( n ) ( ( QTableWidgetSelectionRange * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTabWidget( n ) ( ( QTabWidget * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTcpSocket( n ) ( ( QTcpSocket * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextBlock( n ) ( ( QTextBlock * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextBlockFormat( n ) ( ( QTextBlockFormat * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextBlockGroup( n ) ( ( QTextBlockGroup * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextBlockUserData( n ) ( ( QTextBlockUserData * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextBoundaryFinder( n ) ( ( QTextBoundaryFinder * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextBrowser( n ) ( ( QTextBrowser * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextCharFormat( n ) ( ( QTextCharFormat * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextCodec( n ) ( ( QTextCodec * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextCodec( n ) ( ( QTextCodec * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextCursor( n ) ( ( QTextCursor * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextCursor( n ) ( ( QTextCursor * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextDecoder( n ) ( ( QTextDecoder * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextDocument( n ) ( ( QTextDocument * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextDocumentFragment( n ) ( ( QTextDocumentFragment * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextDocumentWriter( n ) ( ( QTextDocumentWriter * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextEdit( n ) ( ( QTextEdit * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextEncoder( n ) ( ( QTextEncoder * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextEngine( n ) ( ( QTextEngine * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextFormat( n ) ( ( QTextFormat * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextFragment( n ) ( ( QTextFragment * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextFrame( n ) ( ( QTextFrame * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextFrameFormat( n ) ( ( QTextFrameFormat * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextImageFormat( n ) ( ( QTextImageFormat * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextInlineObject( n ) ( ( QTextInlineObject * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextItem( n ) ( ( QTextItem * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextLayout( n ) ( ( QTextLayout * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextLength( n ) ( ( QTextLength * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextLine( n ) ( ( QTextLine * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextListFormat( n ) ( ( QTextListFormat * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextObject( n ) ( ( QTextObject * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextOption( n ) ( ( QTextOption * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextStream( n ) ( ( QTextStream * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTextTableFormat( n ) ( ( QTextTableFormat * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QThread( n ) ( ( QThread * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTime( n ) ( ( QTime * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTimeEdit( n ) ( ( QTimeEdit * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTimer( n ) ( ( QTimer * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QToolBar( n ) ( ( QToolBar * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QToolBox( n ) ( ( QToolBox * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QToolButton( n ) ( ( QToolButton * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTransform( n ) ( ( QTransform * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTranslator( n ) ( ( QTranslator * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTreeView( n ) ( ( QTreeView * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTreeWidget( n ) ( ( QTreeWidget * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QTreeWidgetItem( n ) ( ( QTreeWidgetItem * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QUrl( n ) ( ( QUrl * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QValidator( n ) ( ( QValidator * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QVariant( n ) ( ( QVariant * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QVBoxLayout( n ) ( ( QVBoxLayout * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QVector( n ) ( ( QVector * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebFrame( n ) ( ( QWebFrame * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebHistory( n ) ( ( QWebHistory * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebHistoryInterface( n ) ( ( QWebHistoryInterface * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebHistoryItem( n ) ( ( QWebHistoryItem * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebHitTestResult( n ) ( ( QWebHitTestResult * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebNetworkRequest( n ) ( ( QWebNetworkRequest * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebPage( n ) ( ( QWebPage * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebPage( n ) ( ( QWebPage * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebPluginFactory( n ) ( ( QWebPluginFactory * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebSecurityOrigin( n ) ( ( QWebSecurityOrigin * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebSettings( n ) ( ( QWebSettings * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWebView( n ) ( ( QWebView * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWheelEvent( n ) ( ( QWheelEvent * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWidget( n ) ( ( QWidget * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWidgetAction( n ) ( ( QWidgetAction * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWidgetItem( n ) ( ( QWidgetItem * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWindowsStyle( n ) ( ( QWindowsStyle * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWindowSurface( n ) ( ( QWindowSurface * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWindowsXPStyle( n ) ( ( QWindowsXPStyle * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWizard( n ) ( ( QWizard * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWizardPage( n ) ( ( QWizardPage * ) hbqt_gcpointer( n ) ) +#define hbqt_par_QWSEvent( n ) ( ( QWSEvent * ) hbqt_gcpointer( n ) ) #endif diff --git a/harbour/contrib/hbqt/hbqt_destruct.cpp b/harbour/contrib/hbqt/hbqt_destruct.cpp new file mode 100644 index 0000000000..cf92e5235b --- /dev/null +++ b/harbour/contrib/hbqt/hbqt_destruct.cpp @@ -0,0 +1,453 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * QT wrapper main header + * + * Copyright 2009 Pritpal Bedi + * www - http://www.harbour-project.org + * + * 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, 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 software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ +/*----------------------------------------------------------------------*/ + +#include "hbapi.h" +#include "hbvm.h" +#include "hbapiitm.h" +#include "hbstack.h" +#include "hbthread.h" + +#include "hbqt.h" + +#if QT_VERSION >= 0x040500 + +//#define __debug__ +#if defined(__debug__) + #include ////////////////////////////////////////// + static char str[50]; ////////////////////////////////////////// +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/*----------------------------------------------------------------------*/ + +int hbqt_getIdByName( QString obj ) +{ + if( obj == ( QString ) "QBitArray" ) + return 1; + else if( obj == ( QString ) "QBitmap" ) + return 2; + else if( obj == ( QString ) "QBrush" ) + return 3; + else if( obj == ( QString ) "QByteArray" ) + return 4; + else if( obj == ( QString ) "QColor" ) + return 5; + else if( obj == ( QString ) "QCursor" ) + return 6; + else if( obj == ( QString ) "QDate" ) + return 7; + else if( obj == ( QString ) "QDateTime" ) + return 8; + else if( obj == ( QString ) "QDir" ) + return 9; + else if( obj == ( QString ) "QFileInfoList" ) + return 10; + else if( obj == ( QString ) "QFont" ) + return 11; + else if( obj == ( QString ) "QFontInfo" ) + return 12; + else if( obj == ( QString ) "QFontMetrics" ) + return 13; + else if( obj == ( QString ) "QGradientStops" ) + return 14; + else if( obj == ( QString ) "QHttpRequestHeader" ) + return 15; + else if( obj == ( QString ) "QHttpResponseHeader" ) + return 16; + else if( obj == ( QString ) "QIcon" ) + return 17; + else if( obj == ( QString ) "QImage" ) + return 18; + else if( obj == ( QString ) "QKeySequence" ) + return 19; + else if( obj == ( QString ) "QLine" ) + return 20; + else if( obj == ( QString ) "QLineF" ) + return 21; + else if( obj == ( QString ) "QLocale" ) + return 22; + else if( obj == ( QString ) "QMatrix" ) + return 23; + else if( obj == ( QString ) "QModelIndex" ) + return 24; + else if( obj == ( QString ) "QObjectList" ) + return 25; + else if( obj == ( QString ) "QPainterPath" ) + return 26; + else if( obj == ( QString ) "QPalette" ) + return 27; + else if( obj == ( QString ) "QPen" ) + return 28; + else if( obj == ( QString ) "QPixmap" ) + return 29; + else if( obj == ( QString ) "QPointF" ) + return 30; + else if( obj == ( QString ) "QRect" ) + return 31; + else if( obj == ( QString ) "QRectF" ) + return 32; + else if( obj == ( QString ) "QRegExp" ) + return 33; + else if( obj == ( QString ) "QRegion" ) + return 34; + else if( obj == ( QString ) "QSize" ) + return 35; + else if( obj == ( QString ) "QSizeF" ) + return 36; + else if( obj == ( QString ) "QSizePolicy" ) + return 37; + else if( obj == ( QString ) "QStringList" ) + return 38; + else if( obj == ( QString ) "QTextBlockFormat" ) + return 39; + else if( obj == ( QString ) "QTextCharFormat" ) + return 40; + else if( obj == ( QString ) "QTextCursor" ) + return 41; + else if( obj == ( QString ) "QTextDocumentFragment" ) + return 42; + else if( obj == ( QString ) "QTextFormat" ) + return 43; + else if( obj == ( QString ) "QTextFrameFormat" ) + return 44; + else if( obj == ( QString ) "QTextImageFormat" ) + return 45; + else if( obj == ( QString ) "QTextLength" ) + return 46; + else if( obj == ( QString ) "QTextLine" ) + return 47; + else if( obj == ( QString ) "QTextListFormat" ) + return 48; + else if( obj == ( QString ) "QTextOption" ) + return 49; + else if( obj == ( QString ) "QTextTableCellFormat" ) + return 50; + else if( obj == ( QString ) "QTextTableFormat" ) + return 51; + else if( obj == ( QString ) "QTime" ) + return 52; + else if( obj == ( QString ) "QTransform" ) + return 53; + else if( obj == ( QString ) "QUrl" ) + return 54; + else if( obj == ( QString ) "QVariant" ) + return 55; + else if( obj == ( QString ) "QWebHistoryItem" ) + return 56; + else if( obj == ( QString ) "QWebHitTestResult" ) + return 57; + else if( obj == ( QString ) "QWebSecurityOrigin" ) + return 58; + else if( obj == ( QString ) "QWidgetList" ) + return 59; + else + return 0; +} + +HB_GARBAGE_FUNC( Q_release ) +{ + QGC_POINTER * p = ( QGC_POINTER * ) Cargo; + if( p && p->ph ) + { + +#if defined(__debug__) + hb_snprintf( str, sizeof( str ), "Q_release 0 %i", p->type ); OutputDebugString( str ); +#endif + + switch( p->type ) + { + case 1001: + { + const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject(); + +#if defined(__debug__) + hb_snprintf( str, sizeof( str ), "Q_release 1 %s", m->className() ); OutputDebugString( str ); +#endif + /* It is strange that I receive some objects with className as "QObject", + * which in-fact are never created as such in .prg code. And releasing + * such object is + */ + if( ( QString ) m->className() != ( QString ) "QObject" ) + { + delete ( ( QObject * ) p->ph ) ; + } + break; + } + case 1: + delete ( ( QBitArray * ) p->ph ) ; + break; + case 2: + delete ( ( QBitmap * ) p->ph ) ; + break; + case 3: + delete ( ( QBrush * ) p->ph ) ; + break; + case 4: + delete ( ( QByteArray * ) p->ph ) ; + break; + case 5: + delete ( ( QColor * ) p->ph ) ; + break; + case 6: + delete ( ( QCursor * ) p->ph ) ; + break; + case 7: + delete ( ( QDate * ) p->ph ) ; + break; + case 8: + delete ( ( QDateTime * ) p->ph ) ; + break; + case 9: + delete ( ( QDir * ) p->ph ) ; + break; + case 10: + delete ( ( QFileInfoList * ) p->ph ) ; + break; + case 11: + delete ( ( QFont * ) p->ph ) ; + break; + case 12: + delete ( ( QFontInfo * ) p->ph ) ; + break; + case 13: + delete ( ( QFontMetrics * ) p->ph ) ; + break; + case 14: + delete ( ( QGradientStops * ) p->ph ) ; + break; + case 15: + delete ( ( QHttpRequestHeader * ) p->ph ) ; + break; + case 16: + delete ( ( QHttpResponseHeader * ) p->ph ) ; + break; + case 17: + delete ( ( QIcon * ) p->ph ) ; + break; + case 18: + delete ( ( QImage * ) p->ph ) ; + break; + case 19: + delete ( ( QKeySequence * ) p->ph ) ; + break; + case 20: + delete ( ( QLine * ) p->ph ) ; + break; + case 21: + delete ( ( QLineF * ) p->ph ) ; + break; + case 22: + delete ( ( QLocale * ) p->ph ) ; + break; + case 23: + delete ( ( QMatrix * ) p->ph ) ; + break; + case 24: + delete ( ( QModelIndex * ) p->ph ) ; + break; + case 25: + delete ( ( QObjectList * ) p->ph ) ; + break; + case 26: + delete ( ( QPainterPath * ) p->ph ) ; + break; + case 27: + delete ( ( QPalette * ) p->ph ) ; + break; + case 28: + delete ( ( QPen * ) p->ph ) ; + break; + case 29: + delete ( ( QPixmap * ) p->ph ) ; + break; + case 30: + delete ( ( QPointF * ) p->ph ) ; + break; + case 31: + delete ( ( QRect * ) p->ph ) ; + break; + case 32: + delete ( ( QRectF * ) p->ph ) ; + break; + case 33: + delete ( ( QRegExp * ) p->ph ) ; + break; + case 34: + delete ( ( QRegion * ) p->ph ) ; + break; + case 35: + delete ( ( QSize * ) p->ph ) ; + break; + case 36: + delete ( ( QSizeF * ) p->ph ) ; + break; + case 37: + delete ( ( QSizePolicy * ) p->ph ) ; + break; + case 38: + delete ( ( QStringList * ) p->ph ) ; + break; + case 39: + delete ( ( QTextBlockFormat * ) p->ph ) ; + break; + case 40: + delete ( ( QTextCharFormat * ) p->ph ) ; + break; + case 41: + delete ( ( QTextCursor * ) p->ph ) ; + break; + case 42: + delete ( ( QTextDocumentFragment * ) p->ph ) ; + break; + case 43: + delete ( ( QTextFormat * ) p->ph ) ; + break; + case 44: + delete ( ( QTextFrameFormat * ) p->ph ) ; + break; + case 45: + delete ( ( QTextImageFormat * ) p->ph ) ; + break; + case 46: + delete ( ( QTextLength * ) p->ph ) ; + break; + case 47: + delete ( ( QTextLine * ) p->ph ) ; + break; + case 48: + delete ( ( QTextListFormat * ) p->ph ) ; + break; + case 49: + delete ( ( QTextOption * ) p->ph ) ; + break; + case 50: + delete ( ( QTextTableCellFormat * ) p->ph ) ; + break; + case 51: + delete ( ( QTextTableFormat * ) p->ph ) ; + break; + case 52: + delete ( ( QTime * ) p->ph ) ; + break; + case 53: + delete ( ( QTransform * ) p->ph ) ; + break; + case 54: + delete ( ( QUrl * ) p->ph ) ; + break; + case 55: + delete ( ( QVariant * ) p->ph ) ; + break; + case 56: + delete ( ( QWebHistoryItem * ) p->ph ) ; + break; + case 57: + delete ( ( QWebHitTestResult * ) p->ph ) ; + break; + case 58: + delete ( ( QWebSecurityOrigin * ) p->ph ) ; + break; + case 59: + delete ( ( QWidgetList * ) p->ph ) ; + break; + } + p->ph = NULL; + p = NULL; + } +#if defined(__debug__) + hb_snprintf( str, sizeof( str ), "======================" ); OutputDebugString( str ); +#endif +} + +void * hbqt_gcpointer( int iParam ) +{ + QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( Q_release, iParam ); + + return ( p && p->ph ? p->ph : hb_parptr( iParam ) ); +} + +void * hbqt_ptrTOgcpointer( void * ptr ) +{ + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAlloc( sizeof( QGC_POINTER ), Q_release ); + p->ph = ptr; + return p; +} + +/*----------------------------------------------------------------------*/ + +#endif // #if QT_VERSION >= 0x040500 + + + diff --git a/harbour/contrib/hbqt/hbqt_slots.cpp b/harbour/contrib/hbqt/hbqt_slots.cpp index bab5771494..d82eca854c 100644 --- a/harbour/contrib/hbqt/hbqt_slots.cpp +++ b/harbour/contrib/hbqt/hbqt_slots.cpp @@ -65,7 +65,8 @@ #include "hbqt_slots.h" -// #include //////////////////////////////////////////////////// +// #include ////////////////////////////////////////// +// static char str[50]; ////////////////////////////////////////// #include #include @@ -74,6 +75,8 @@ #include #include #include +#include +#include static PHB_ITEM s_mutex = NULL; @@ -88,8 +91,6 @@ static HB_TSD_NEW( s_events, sizeof( HB_EVENTS ), NULL, NULL ); #define hb_getQtEventFilter() ( ( PHB_EVENTS ) hb_stackGetTSD( &s_events ) ) - - typedef struct { Slots * slot; @@ -1110,10 +1111,15 @@ void Slots::currentCellChanged( int currentRow, int currentColumn, int previousR */ HB_FUNC( QT_CONNECT_SIGNAL ) { - QObject * object = ( QObject* ) hb_parptr( 1 ); /* get sender */ QString signal = hb_parcx( 2 ); /* get signal */ PHB_ITEM codeblock = hb_itemNew( hb_param( 3, HB_IT_BLOCK ) ); /* get codeblock */ bool ret = false; /* return value */ + QObject * object = ( QObject* ) hbqt_gcpointer( 1 ); /* get sender */ + + if( !object ) + { + object = ( QObject* ) hb_parptr( 1 ); + } qt_setEventSlots(); Slots * s_s = qt_getEventSlots(); diff --git a/harbour/contrib/hbqt/tests/demoqt.prg b/harbour/contrib/hbqt/tests/demoqt.prg index 9dc087748c..93fc8bae02 100644 --- a/harbour/contrib/hbqt/tests/demoqt.prg +++ b/harbour/contrib/hbqt/tests/demoqt.prg @@ -83,137 +83,214 @@ */ /*----------------------------------------------------------------------*/ +#include "common.ch" + +STATIC qApp + +/*----------------------------------------------------------------------*/ + INIT PROCEDURE Qt_Start() - qt_qapplication() + qApp := QApplication():new() RETURN EXIT PROCEDURE Qt_End() - qt_qapplication_quit() + qApp:quit() RETURN /*----------------------------------------------------------------------*/ PROCEDURE Main() - Local oLabel, oBtn, oDA, oTabBar - Local oWnd, oSize - Local oMenuBar, pIcon - Local oMenuA, pAction - LOCAL oPS, oPPrv, oMB, oWZ, oCD, oWP, oSBar, oStyle + LOCAL nLoops := 500 + Local oLabel, oBtn, oDA, oWnd, oProg, oSBar, oStyle, i, oSize, n + LOCAL aMenu, aTool, aGrid, aTabs, aList, aObj := array( nLoops ) - oWnd := QMainWindow():new() +hb_toOutDebug( "---b---" ) + + FOR i := 1 TO 1 //10 + oWnd := QMainWindow():new() + NEXT + oWnd:show() oWnd:setMouseTracking( .t. ) - oWnd:setWindowTitle( "Testing - QMainWindow, QMenu, QMenuBar and QAction " ) + oWnd:setWindowTitle( "Harbour-Qt Implementation Test Dialog" ) oWnd:setWindowIcon( "test" ) - pIcon := oWnd:windowIcon() - /* The method 2 */ oWnd:resize( 900, 500 ) - oDA := QWidget():new( oWnd ) +#if 0 +hb_toOutDebug( "///////////////////////" ) +hb_idleSleep( 5 ) + FOR i := 1 TO nLoops + n := 1 + aObj[n] := QFont():new( "Arial", 12, 0, .f. ); hb_toOutDebug( "Main 0 %s %i", aObj[n]:defaultFamily(), aObj[n]:pointSize() ) + NEXT + oSize := 3 +hb_toOutDebug( "///////////////////////" ) +hb_idlesleep( 5 ) +#endif + + oDA := QWidget():new( oWnd ) oWnd:setCentralWidget( QT_PTROF( oDA ) ) - Build_MenuBar( oWnd ) - Build_ToolBar( oWnd ) + aMenu := Build_MenuBar( oWnd ) - oSBar := QStatusBar():new( QT_PTROF( oWnd ) ) + aTool := Build_ToolBar( oWnd ) + + oSBar := QStatusBar():new( QT_PTROF( oWnd ) ) oWnd:setStatusBar( QT_PTROF( oSBar ) ) oSBar:showMessage( "Harbour-QT Statusbar Ready!" ) - oStyle := QWindowsXPStyle() + oStyle := QWindowsXPStyle():new() oStyle:standardIcon( 2 ) oWnd:setStyle( QT_PTROF( oStyle ) ) - Build_Label( oDA, { 30,190 }, { 300, 30 } ) - Build_PushButton( oDA, { 30,240 }, { 100,50 } ) - Build_Grid( oDA, { 30, 30 }, { 450,150 } ) - Build_Tabs( oDA, { 510, 5 }, { 360, 400 } ) - Build_ProgressBar( oDA, { 30,300 }, { 200,30 } ) - Build_ListBox( oDA, { 310,240 }, { 150, 100 } ) + oLabel := Build_Label( oDA, { 30,190 }, { 300, 30 } ) + oBtn := Build_PushButton( oDA, { 30,240 }, { 100,50 } ) + aGrid := Build_Grid( oDA, { 30, 30 }, { 450,150 } ) + aTabs := Build_Tabs( oDA, { 510, 5 }, { 360, 400 } ) + oProg := Build_ProgressBar( oDA, { 30,300 }, { 200,30 } ) + aList := Build_ListBox( oDA, { 310,240 }, { 150, 100 } ) oWnd:Show() - qt_qapplication_exec() + /* Cooment out the following line to see the label going off the dialog and memory is released */ + //oLabel := 2 + + /* Uncomment the following line to see in the debugger how objects are released properly */ + //Dummies() + + qApp:exec() + +hb_toOutDebug( "---e---" ) + + RETURN + +/*----------------------------------------------------------------------*/ + +PROCEDURE ExecOneMore() + Local oLabel, oBtn, oDA, oWnd, oProg, oSBar, oStyle, i, oSize, n + LOCAL aMenu, aTool, aGrid, aTabs, aList, oEventLoop, nStart + LOCAL lExit := .f. + + oWnd := QMainWindow():new() + oWnd:setMouseTracking( .t. ) + oWnd:setWindowTitle( "Harbour-Qt Implementation Test Dialog" ) + oWnd:setWindowIcon( "test" ) + oWnd:resize( 900, 500 ) + + oDA := QWidget():new( oWnd ) + oWnd:setCentralWidget( QT_PTROF( oDA ) ) + + oWnd:show() + + aMenu := Build_MenuBar( oWnd ) + + aTool := Build_ToolBar( oWnd ) + + oSBar := QStatusBar():new( QT_PTROF( oWnd ) ) + oWnd:setStatusBar( QT_PTROF( oSBar ) ) + oSBar:showMessage( "Harbour-QT Statusbar Ready!" ) + + oLabel := Build_Label( oDA, { 30,190 }, { 300, 30 } ) + oBtn := Build_PushButton( oDA, { 30,240 }, { 100,50 }, ; + "CLOSE", "This dialog will be closed now!", @lExit ) + aGrid := Build_Grid( oDA, { 30, 30 }, { 450,150 } ) + aTabs := Build_Tabs( oDA, { 510, 5 }, { 360, 400 } ) + oProg := Build_ProgressBar( oDA, { 30,300 }, { 200,30 } ) + aList := Build_ListBox( oDA, { 310,240 }, { 150, 100 } ) + + oEventLoop := QEventLoop():new( QT_PTROF( oWnd ) ) + + nStart := seconds() + DO WHILE .t. + oEventLoop:processEvents() + IF lExit + EXIT + ENDIF + ENDDO + RETURN /*----------------------------------------------------------------------*/ STATIC FUNCTION Build_MenuBar( oWnd ) - LOCAL oMenuBar, oMenu + LOCAL oMenuBar, oMenu1, oMenu2, oActNew, oActOpen, oActSave oMenuBar := QMenuBar():new( QT_PTROF( oWnd ) ) oMenuBar:resize( oWnd:width(), 25 ) - oMenu := QMenu():new( QT_PTROF( oMenuBar ) ) - oMenu:setTitle( "&File" ) - Qt_Connect_Signal( oMenu:addAction_1( "new.png" , "&New" ), QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "New" , w, l ) } ) - Qt_Connect_Signal( oMenu:addAction_1( "open.png", "&Open" ), QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "Open", w, l ) } ) - oMenu:addSeparator() - Qt_Connect_Signal( oMenu:addAction_1( "save.png", "&Save" ), QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "Save", w, l ) } ) - oMenu:addSeparator() - Qt_Connect_Signal( oMenu:addAction( "E&xit" ), QT_EVE_TRIGGERED_B, {|w,l| MsgInfo( "Exit ?" ) } ) - oMenuBar:addMenu( QT_PTROF( oMenu ) ) + oMenu1 := QMenu():new( QT_PTROF( oMenuBar ) ) + oMenu1:setTitle( "&File" ) + Qt_Connect_Signal( oMenu1:addAction_1( "new.png" , "&New" ), QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "New" , w, l ) } ) + Qt_Connect_Signal( oMenu1:addAction_1( "open.png", "&Open" ), QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "Open", w, l ) } ) + oMenu1:addSeparator() + Qt_Connect_Signal( oMenu1:addAction_1( "save.png", "&Save" ), QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "Save", w, l ) } ) + oMenu1:addSeparator() + Qt_Connect_Signal( oMenu1:addAction( "E&xit" ), QT_EVE_TRIGGERED_B, {|w,l| MsgInfo( "Exit ?" ) } ) + oMenuBar:addMenu( QT_PTROF( oMenu1 ) ) - oMenu := QMenu():new( QT_PTROF( oMenuBar ) ) - oMenu:setTitle( "&Dialogs" ) - Qt_Connect_Signal( oMenu:addAction( "&Colors" ), QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "Colors" , w, l ) } ) - Qt_Connect_Signal( oMenu:addAction( "&Fonts" ), QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "Fonts" , w, l ) } ) - oMenu:addSeparator() - Qt_Connect_Signal( oMenu:addAction( "&PageSetup" ), QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "PageSetup", w, l ) } ) - Qt_Connect_Signal( oMenu:addAction( "P&review" ), QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "Preview" , w, l ) } ) - oMenu:addSeparator() - Qt_Connect_Signal( oMenu:addAction( "&Wizard" ), QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "Wizard" , w, l ) } ) - Qt_Connect_Signal( oMenu:addAction( "W&ebPage" ), QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "WebPage" , w, l ) } ) - oMenuBar:addMenu( QT_PTROF( oMenu ) ) + oMenu2 := QMenu():new( QT_PTROF( oMenuBar ) ) + oMenu2:setTitle( "&Dialogs" ) + Qt_Connect_Signal( oMenu2:addAction( "&Colors" ), QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "Colors" , w, l ) } ) + Qt_Connect_Signal( oMenu2:addAction( "&Fonts" ), QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "Fonts" , w, l ) } ) + oMenu2:addSeparator() + Qt_Connect_Signal( oMenu2:addAction( "&PageSetup" ), QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "PageSetup", w, l ) } ) + Qt_Connect_Signal( oMenu2:addAction( "P&review" ), QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "Preview" , w, l ) } ) + oMenu2:addSeparator() + Qt_Connect_Signal( oMenu2:addAction( "&Wizard" ), QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "Wizard" , w, l ) } ) + Qt_Connect_Signal( oMenu2:addAction( "W&ebPage" ), QT_EVE_TRIGGERED_B, {|w,l| Dialogs( "WebPage" , w, l ) } ) + oMenu2:addSeparator() + Qt_Connect_Signal( oMenu2:addAction( "&Another Dialog" ), QT_EVE_TRIGGERED_B, {|w,l| ExecOneMore() } ) + oMenuBar:addMenu( QT_PTROF( oMenu2 ) ) oWnd:setMenuBar( QT_PTROF( oMenuBar ) ) - RETURN nil + RETURN { oMenu1, oMenu2, oMenuBar } /*----------------------------------------------------------------------*/ STATIC FUNCTION Build_ToolBar( oWnd ) - LOCAL oTB, oAct + LOCAL oTB, oActNew, oActOpen, oActSave /* Create a Toolbar Object */ oTB := QToolBar():new( QT_PTROF( oWnd ) ) /* Create an action */ - oAct := QAction():new( QT_PTROF( oWnd ) ) - oAct:setText( "&New" ) - oAct:setIcon( "new.png" ) - oAct:setToolTip( "A New File" ) + oActNew := QAction():new( QT_PTROF( oWnd ) ) + oActNew:setText( "&New" ) + oActNew:setIcon( "new.png" ) + oActNew:setToolTip( "A New File" ) /* Attach codeblock to be triggered */ - Qt_Connect_Signal( QT_PTROF( oAct ), QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "New" , w, l ) } ) + Qt_Connect_Signal( QT_PTROF( oActNew ), QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "New" , w, l ) } ) /* Attach Action with Toolbar */ - oTB:addAction( QT_PTROF( oAct ) ) + oTB:addAction( QT_PTROF( oActNew ) ) /* Create another action */ - oAct := QAction():new( QT_PTROF( oWnd ) ) - oAct:setText( "&Open" ) - oAct:setIcon( "open.png" ) - oAct:setToolTip( "Select a file to be opened!" ) + oActOpen := QAction():new( QT_PTROF( oWnd ) ) + oActOpen:setText( "&Open" ) + oActOpen:setIcon( "open.png" ) + oActOpen:setToolTip( "Select a file to be opened!" ) /* Attach codeblock to be triggered */ - Qt_Connect_Signal( QT_PTROF( oAct ), QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "Open" , w, l ) } ) + Qt_Connect_Signal( QT_PTROF( oActOpen ), QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "Open" , w, l ) } ) /* Attach Action with Toolbar */ - oTB:addAction( QT_PTROF( oAct ) ) + oTB:addAction( QT_PTROF( oActOpen ) ) oTB:addSeparator() /* Create another action */ - oAct := QAction():new( QT_PTROF( oWnd ) ) - oAct:setText( "&Save" ) - oAct:setIcon( "save.png" ) - oAct:setToolTip( "Save this file!" ) + oActSave := QAction():new( QT_PTROF( oWnd ) ) + oActSave:setText( "&Save" ) + oActSave:setIcon( "save.png" ) + oActSave:setToolTip( "Save this file!" ) /* Attach codeblock to be triggered */ - Qt_Connect_Signal( QT_PTROF( oAct ), QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "Save" , w, l ) } ) + Qt_Connect_Signal( QT_PTROF( oActSave ), QT_EVE_TRIGGERED_B, {|w,l| FileDialog( "Save" , w, l ) } ) /* Attach Action with Toolbar */ - oTB:addAction( QT_PTROF( oAct ) ) + oTB:addAction( QT_PTROF( oActSave ) ) /* Add this toolbar with main window */ oWnd:addToolBar_1( QT_PTROF( oTB ) ) /////////////////////////////////////////////////////////// - +#if 0 /* Build another toolbar - we will have two toolbats now */ oTB := QToolBar():new( QT_PTROF( oWnd ) ) @@ -265,22 +342,25 @@ STATIC FUNCTION Build_ToolBar( oWnd ) /* Add this toolbar with main window */ oWnd:addToolBar_1( QT_PTROF( oTB ) ) - - RETURN nil +#endif + RETURN { oActNew, oActOpen, oActSave, oTB } /*----------------------------------------------------------------------*/ -STATIC FUNCTION Build_PushButton( oWnd, aPos, aSize ) +STATIC FUNCTION Build_PushButton( oWnd, aPos, aSize, cLabel, cMsg, lExit ) LOCAL oBtn + DEFAULT cLabel TO "Push Button" + DEFAULT cMsg TO "Push Button Pressed" + oBtn := QPushButton():new( QT_PTROF( oWnd ) ) - oBtn:setText( "Push Button" ) + oBtn:setText( cLabel ) oBtn:move( aPos[ 1 ],aPos[ 2 ] ) oBtn:resize( aSize[ 1 ],aSize[ 2 ] ) oBtn:show() - Qt_Connect_Signal( QT_PTROF( oBtn ), QT_EVE_CLICKED, {|| MsgInfo( "Push Button Pressed" ) } ) + Qt_Connect_Signal( QT_PTROF( oBtn ), QT_EVE_CLICKED, {|| MsgInfo( cMsg ), lExit := .t. } ) - RETURN nil + RETURN oBtn /*----------------------------------------------------------------------*/ @@ -310,12 +390,12 @@ STATIC FUNCTION Build_Grid( oWnd, aPos, aSize ) // oGrid:Show() - RETURN nil + RETURN { oBrushBackItem0x0, oBrushForeItem0x0, oGridItem0x0, oGrid } /*----------------------------------------------------------------------*/ STATIC FUNCTION Build_Tabs( oWnd, aPos, aSize ) - LOCAL oTabWidget, oTab1, oTab2, oTab3 + LOCAL oTabWidget, oTab1, oTab2, oTab3, aTree, aCntl, aText oTabWidget := QTabWidget():new( QT_PTROF( oWnd ) ) @@ -331,11 +411,11 @@ STATIC FUNCTION Build_Tabs( oWnd, aPos, aSize ) oTabWidget:ReSize( aSize[ 1 ], aSize[ 2 ] ) oTabWidget:show() - Build_Treeview( oTab1 ) - Build_Controls( oTab2 ) - Build_TextBox( oTab3 ) + aTree := Build_Treeview( oTab1 ) + aCntl := Build_Controls( oTab2 ) + aText := Build_TextBox( oTab3 ) - RETURN { oTab1, oTab2, oTab3 } + RETURN { oTab1, oTab2, oTab3, oTabWidget, aTree, aCntl, aText } /*----------------------------------------------------------------------*/ @@ -351,12 +431,12 @@ STATIC FUNCTION Build_TreeView( oWnd ) oTV:resize( 345, 365 ) OTV:show() - RETURN nil + RETURN { oDirModel, oTV } /*----------------------------------------------------------------------*/ STATIC FUNCTION Build_ListBox( oWnd, aPos, aSize ) - LOCAL oListBox, oStrList, oStrModel, oAct + LOCAL oListBox, oStrList, oStrModel oListBox := QListView():New( QT_PTROF( oWnd ) ) oListBox:setMouseTracking( .t. ) @@ -381,7 +461,7 @@ STATIC FUNCTION Build_ListBox( oWnd, aPos, aSize ) oListBox:ReSize( aSize[ 1 ], aSize[ 2 ] ) oListBox:Show() - RETURN nil + RETURN { oStrList, oStrModel, oListBox } /*----------------------------------------------------------------------*/ @@ -395,7 +475,7 @@ STATIC FUNCTION Build_TextBox( oWnd ) oTextBox:setPlainText( "This is Harbour QT implementation" ) oTextBox:Show() - RETURN nil + RETURN oTextBox /*----------------------------------------------------------------------*/ @@ -439,7 +519,7 @@ STATIC FUNCTION Build_Controls( oWnd ) oRadioButton:ReSize( 345, 30 ) oRadioButton:Show() - RETURN nil + RETURN { oEdit, oCheckBox, oComboBox, oSpinBox, oRadioButton } /*----------------------------------------------------------------------*/ @@ -453,7 +533,7 @@ STATIC FUNCTION Build_ProgressBar( oWnd, aPos, aSize ) oProgressBar:ReSize( aSize[ 1 ], aSize[ 2 ] ) oProgressBar:Show() - RETURN nil + RETURN oProgressBar /*----------------------------------------------------------------------*/ @@ -467,7 +547,7 @@ STATIC FUNCTION Build_Label( oWnd, aPos, aSize ) oLabel:ReSize( aSize[ 1 ], aSize[ 2 ] ) oLabel:Show() - RETURN nil + RETURN oLabel /*----------------------------------------------------------------------*/ @@ -477,17 +557,18 @@ STATIC FUNCTION MsgInfo( cMsg ) oMB := QMessageBox():new() oMB:setInformativeText( cMsg ) oMB:setWindowTitle( "Harbour-QT" ) - oMB:show() + oMB:exec() RETURN nil /*----------------------------------------------------------------------*/ STATIC FUNCTION FileDialog( cType, w, l ) - LOCAL oFD := QFileDialog():new() + LOCAL oFD + oFD := QFileDialog():new() oFD:setWindowTitle( "Select a File" ) - oFD:show() + oFD:exec() RETURN nil @@ -500,30 +581,30 @@ STATIC FUNCTION Dialogs( cType, w, l ) CASE cType == "PageSetup" oDlg := QPageSetupDialog():new() oDlg:setWindowTitle( "Harbour-QT PageSetup Dialog" ) - oDlg:show() + oDlg:exec() CASE cType == "Preview" oDlg := QPrintPreviewDialog():new() oDlg:setWindowTitle( "Harbour-QT Preview Dialog" ) - oDlg:show() + oDlg:exec() CASE cType == "Wizard" oDlg := QWizard():new() oDlg:setWindowTitle( "Harbour-QT Wizard to Show Slides etc." ) - oDlg:show() + oDlg:exec() CASE cType == "Colors" oDlg := QColorDialog():new() oDlg:setWindowTitle( "Harbour-QT Color Selection Dialog" ) - oDlg:show() + oDlg:exec() CASE cType == "WebPage" oDlg := QWebView():new() oUrl := QUrl():new() oUrl:setUrl( "http://www.harbour.vouch.info" ) QT_QWebView_SetUrl( QT_PTROF( oDlg ), QT_PTROF( oUrl ) ) oDlg:setWindowTitle( "Harbour-QT Web Page Navigator" ) - oDlg:show() + oDlg:exec() CASE cType == "Fonts" oDlg := QFontDialog():new() oDlg:setWindowTitle( "Harbour-QT Font Selector" ) - oDlg:show() + oDlg:exec() ENDCASE RETURN nil @@ -544,16 +625,20 @@ STATIC FUNCTION Dummies() LOCAL oSome oSome := QAbstractButton():new() + oSome := QAbstractItemModel():new() oSome := QAbstractItemView():new() + oSome := QAbstractListModel():new() oSome := QAbstractPrintDialog():new() oSome := QAbstractScrollArea():new() oSome := QAbstractSlider():new() oSome := QAbstractSpinBox():new() + oSome := QAbstractTableModel():new() oSome := QAction():new() - //oSome := QApplication():new() +// oSome := QApplication():new() oSome := QBitmap():new() oSome := QBoxLayout():new() oSome := QBrush():new() + oSome := QButtonGroup():new() oSome := QCalendarWidget():new() oSome := QCheckBox():new() oSome := QClipboard():new() @@ -563,24 +648,36 @@ STATIC FUNCTION Dummies() oSome := QCommandLinkButton():new() oSome := QCommonStyle():new() oSome := QConicalGradient():new() - //oSome := QCoreApplication():new() +// oSome := QCoreApplication():new() + oSome := QCursor():new() oSome := QDateEdit():new() + oSome := QDateTime():new() oSome := QDateTimeEdit():new() oSome := QDesktopWidget():new() oSome := QDial():new() oSome := QDialog():new() oSome := QDir():new() + oSome := QDirModel():new() oSome := QDockWidget():new() oSome := QDoubleSpinBox():new() + oSome := QDropEvent():new() + oSome := QDragMoveEvent():new() + oSome := QDragEnterEvent():new() + oSome := QDragLeaveEvent():new() oSome := QErrorMessage():new() oSome := QEvent():new() oSome := QEventLoop():new() oSome := QFileDialog():new() + oSome := QFileSystemModel():new() + oSome := QFocusEvent():new() oSome := QFocusFrame():new() oSome := QFont():new() oSome := QFontComboBox():new() + oSome := QFontDatabase():new() oSome := QFontDialog():new() oSome := QFontInfo():new() + oSome := QFontMetrics():new() + oSome := QFontMetricsF():new() oSome := QFormLayout():new() oSome := QFrame():new() oSome := QFtp():new() @@ -596,13 +693,19 @@ STATIC FUNCTION Dummies() oSome := QImageWriter():new() oSome := QInputDialog():new() oSome := QInputEvent():new() + oSome := QIODevice():new() + oSome := QKeyEvent():new() + oSome := QKeySequence():new() oSome := QLabel():new() + oSome := QLatin1Char():new() + oSome := QLatin1String():new() oSome := QLayout():new() oSome := QLayoutItem():new() oSome := QLCDNumber():new() oSome := QLine():new() oSome := QLinearGradient():new() oSome := QLineEdit():new() + oSome := QList():new() oSome := QListView():new() oSome := QListWidget():new() oSome := QListWidgetItem():new() @@ -610,6 +713,9 @@ STATIC FUNCTION Dummies() oSome := QMenu():new() oSome := QMenuBar():new() oSome := QMessageBox():new() + oSome := QModelIndex():new() + oSome := QMouseEvent():new() + oSome := QMoveEvent():new() oSome := QObject():new() oSome := QPaintDevice():new() oSome := QPageSetupDialog():new() @@ -622,15 +728,19 @@ STATIC FUNCTION Dummies() oSome := QPoint():new() oSome := QPointF():new() oSome := QPrintDialog():new() + oSome := QPrintEngine():new() + oSome := QPrinter():new() oSome := QPrintPreviewDialog():new() + oSome := QProcess():new() oSome := QProgressBar():new() oSome := QProgressDialog():new() oSome := QPushButton():new() oSome := QRadialGradient():new() + oSome := QRadioButton():new() oSome := QRect():new() oSome := QRectF():new() - oSome := QRadioButton():new() oSome := QRegion():new() + oSome := QResizeEvent():new() oSome := QResource():new() oSome := QScrollArea():new() oSome := QScrollBar():new() @@ -647,8 +757,11 @@ STATIC FUNCTION Dummies() oSome := QStandardItem():new() oSome := QStandardItemModel():new() oSome := QStatusBar():new() + oSome := QStringList():new() + oSome := QStringListModel():new() oSome := QStyle():new() oSome := QStyledItemDelegate():new() + oSome := QStyleFactory():new() oSome := QStyleHintReturn():new() oSome := QStyleHintReturnMask():new() oSome := QStyleHintReturnVariant():new() @@ -675,6 +788,7 @@ STATIC FUNCTION Dummies() oSome := QStyleOptionToolButton():new() oSome := QStyleOptionViewItem():new() oSome := QStylePainter():new() + oSome := QSystemTrayIcon():new() oSome := QTabBar():new() oSome := QTableView():new() oSome := QTableWidget():new() @@ -717,13 +831,26 @@ STATIC FUNCTION Dummies() oSome := QUrl():new() oSome := QVariant():new() oSome := QVBoxLayout():new() + oSome := QWebFrame():new() + oSome := QWebHistory():new() + oSome := QWebHistoryInterface():new() + oSome := QWebHistoryItem():new() + oSome := QWebHitTestResult():new() oSome := QWebPage():new() - oSome := QWidget():new() + oSome := QWebPluginFactory():new() + oSome := QWebSecurityOrigin():new() + oSome := QWebSettings():new() oSome := QWebView():new() + oSome := QWheelEvent():new() + oSome := QWidget():new() + oSome := QWidgetAction():new() + oSome := QWidgetItem():new() oSome := QWindowsStyle():new() oSome := QWindowsXPStyle():new() oSome := QWizard():new() + oSome := 1 + RETURN nil /*----------------------------------------------------------------------*/ @@ -748,3 +875,4 @@ FUNCTION ShowInSystemTray( oWnd ) RETURN nil /*----------------------------------------------------------------------*/ +