From 0937c773fbfe7acb9bc0e495a93c9ad1d1ca9bf2 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Mon, 12 Jul 2010 05:48:44 +0000 Subject: [PATCH] 2010-07-11 22:35 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/filelist.mk * contrib/hbqt/generator/hbqtgen.prg * contrib/hbqt/generator/qt45.qtp * contrib/hbqt/hbqt.ch * contrib/hbqt/hbqt.h * contrib/hbqt/hbqt.hbp * contrib/hbqt/hbqt_garbage.h + contrib/hbqt/hbqt_hbqabstractitemmodel.cpp + contrib/hbqt/hbqt_hbqabstractitemmodel.h * contrib/hbqt/qtcore/filelist.hbm * contrib/hbqt/qtcore/filelist.mk + contrib/hbqt/qth/HBQAbstractItemModel.qth * contrib/hbxbp/xbpbrowse.prg + Applied patch provided by Bacco, thanks. This implements one more member to the structure which will help simplifying many complex structures in hbQT. * Regenerated: *.cpp --- harbour/ChangeLog | 21 ++ harbour/contrib/hbqt/filelist.mk | 2 + harbour/contrib/hbqt/generator/hbqtgen.prg | 2 + harbour/contrib/hbqt/generator/qt45.qtp | 2 + harbour/contrib/hbqt/hbqt.ch | 14 + harbour/contrib/hbqt/hbqt.h | 325 ++++++++++++++++++ harbour/contrib/hbqt/hbqt.hbp | 2 + harbour/contrib/hbqt/hbqt_garbage.h | 2 + .../hbqt/hbqt_hbqabstractitemmodel.cpp | 170 +++++++++ .../contrib/hbqt/hbqt_hbqabstractitemmodel.h | 34 ++ harbour/contrib/hbqt/qtcore/HBDbfModel.cpp | 2 + harbour/contrib/hbqt/qtcore/HBEvents.cpp | 2 + harbour/contrib/hbqt/qtcore/HBSlots.cpp | 2 + .../hbqt/qtcore/QAbstractItemModel.cpp | 2 + .../hbqt/qtcore/QAbstractListModel.cpp | 2 + .../hbqt/qtcore/QAbstractTableModel.cpp | 2 + harbour/contrib/hbqt/qtcore/QBitArray.cpp | 2 + harbour/contrib/hbqt/qtcore/QBuffer.cpp | 2 + harbour/contrib/hbqt/qtcore/QByteArray.cpp | 2 + harbour/contrib/hbqt/qtcore/QChar.cpp | 2 + .../contrib/hbqt/qtcore/QCoreApplication.cpp | 2 + harbour/contrib/hbqt/qtcore/QDataStream.cpp | 2 + harbour/contrib/hbqt/qtcore/QDate.cpp | 2 + harbour/contrib/hbqt/qtcore/QDateTime.cpp | 2 + harbour/contrib/hbqt/qtcore/QDir.cpp | 2 + harbour/contrib/hbqt/qtcore/QEvent.cpp | 2 + harbour/contrib/hbqt/qtcore/QEventLoop.cpp | 2 + harbour/contrib/hbqt/qtcore/QFile.cpp | 2 + harbour/contrib/hbqt/qtcore/QFileInfo.cpp | 2 + harbour/contrib/hbqt/qtcore/QIODevice.cpp | 2 + harbour/contrib/hbqt/qtcore/QLatin1Char.cpp | 2 + harbour/contrib/hbqt/qtcore/QLatin1String.cpp | 2 + harbour/contrib/hbqt/qtcore/QLine.cpp | 2 + harbour/contrib/hbqt/qtcore/QLineF.cpp | 2 + harbour/contrib/hbqt/qtcore/QList.cpp | 2 + harbour/contrib/hbqt/qtcore/QLocale.cpp | 2 + harbour/contrib/hbqt/qtcore/QMimeData.cpp | 2 + harbour/contrib/hbqt/qtcore/QModelIndex.cpp | 2 + harbour/contrib/hbqt/qtcore/QObject.cpp | 2 + harbour/contrib/hbqt/qtcore/QPoint.cpp | 2 + harbour/contrib/hbqt/qtcore/QPointF.cpp | 2 + harbour/contrib/hbqt/qtcore/QProcess.cpp | 2 + harbour/contrib/hbqt/qtcore/QRect.cpp | 2 + harbour/contrib/hbqt/qtcore/QRectF.cpp | 2 + harbour/contrib/hbqt/qtcore/QRegExp.cpp | 2 + harbour/contrib/hbqt/qtcore/QResource.cpp | 2 + harbour/contrib/hbqt/qtcore/QSettings.cpp | 2 + harbour/contrib/hbqt/qtcore/QSignalMapper.cpp | 2 + harbour/contrib/hbqt/qtcore/QSize.cpp | 2 + harbour/contrib/hbqt/qtcore/QSizeF.cpp | 2 + harbour/contrib/hbqt/qtcore/QStringList.cpp | 2 + .../hbqt/qtcore/QTextBoundaryFinder.cpp | 2 + harbour/contrib/hbqt/qtcore/QTextCodec.cpp | 2 + harbour/contrib/hbqt/qtcore/QTextDecoder.cpp | 2 + harbour/contrib/hbqt/qtcore/QTextEncoder.cpp | 2 + harbour/contrib/hbqt/qtcore/QTextStream.cpp | 2 + harbour/contrib/hbqt/qtcore/QThread.cpp | 2 + harbour/contrib/hbqt/qtcore/QTime.cpp | 2 + harbour/contrib/hbqt/qtcore/QTimer.cpp | 2 + harbour/contrib/hbqt/qtcore/QTranslator.cpp | 2 + harbour/contrib/hbqt/qtcore/QUiLoader.cpp | 2 + harbour/contrib/hbqt/qtcore/QUrl.cpp | 2 + harbour/contrib/hbqt/qtcore/QVariant.cpp | 2 + harbour/contrib/hbqt/qtcore/filelist.hbm | 2 + harbour/contrib/hbqt/qtcore/filelist.mk | 2 + harbour/contrib/hbqt/qtgui/HBQMainWindow.cpp | 2 + .../contrib/hbqt/qtgui/HBQPlainTextEdit.cpp | 2 + .../hbqt/qtgui/HBQSyntaxHighlighter.cpp | 2 + harbour/contrib/hbqt/qtgui/HBQTableView.cpp | 2 + .../hbqt/qtgui/HBQTextBlockUserData.cpp | 2 + .../contrib/hbqt/qtgui/QAbstractButton.cpp | 2 + .../hbqt/qtgui/QAbstractItemDelegate.cpp | 2 + .../contrib/hbqt/qtgui/QAbstractItemView.cpp | 2 + .../hbqt/qtgui/QAbstractPrintDialog.cpp | 2 + .../hbqt/qtgui/QAbstractProxyModel.cpp | 2 + .../hbqt/qtgui/QAbstractScrollArea.cpp | 2 + .../contrib/hbqt/qtgui/QAbstractSlider.cpp | 2 + .../contrib/hbqt/qtgui/QAbstractSpinBox.cpp | 2 + .../qtgui/QAbstractTextDocumentLayout.cpp | 2 + harbour/contrib/hbqt/qtgui/QAction.cpp | 2 + harbour/contrib/hbqt/qtgui/QActionGroup.cpp | 2 + harbour/contrib/hbqt/qtgui/QApplication.cpp | 2 + harbour/contrib/hbqt/qtgui/QBitmap.cpp | 2 + harbour/contrib/hbqt/qtgui/QBoxLayout.cpp | 2 + harbour/contrib/hbqt/qtgui/QBrush.cpp | 2 + harbour/contrib/hbqt/qtgui/QButtonGroup.cpp | 2 + .../contrib/hbqt/qtgui/QCalendarWidget.cpp | 2 + harbour/contrib/hbqt/qtgui/QCheckBox.cpp | 2 + harbour/contrib/hbqt/qtgui/QClipboard.cpp | 2 + harbour/contrib/hbqt/qtgui/QColor.cpp | 2 + harbour/contrib/hbqt/qtgui/QColorDialog.cpp | 2 + harbour/contrib/hbqt/qtgui/QComboBox.cpp | 2 + .../contrib/hbqt/qtgui/QCommandLinkButton.cpp | 2 + harbour/contrib/hbqt/qtgui/QCommonStyle.cpp | 2 + harbour/contrib/hbqt/qtgui/QCompleter.cpp | 2 + .../contrib/hbqt/qtgui/QConicalGradient.cpp | 2 + .../contrib/hbqt/qtgui/QContextMenuEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/QCursor.cpp | 2 + harbour/contrib/hbqt/qtgui/QDateEdit.cpp | 2 + harbour/contrib/hbqt/qtgui/QDateTimeEdit.cpp | 2 + harbour/contrib/hbqt/qtgui/QDesktopWidget.cpp | 2 + harbour/contrib/hbqt/qtgui/QDial.cpp | 2 + harbour/contrib/hbqt/qtgui/QDialog.cpp | 2 + harbour/contrib/hbqt/qtgui/QDirModel.cpp | 2 + harbour/contrib/hbqt/qtgui/QDockWidget.cpp | 2 + harbour/contrib/hbqt/qtgui/QDoubleSpinBox.cpp | 2 + .../contrib/hbqt/qtgui/QDragEnterEvent.cpp | 2 + .../contrib/hbqt/qtgui/QDragLeaveEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/QDragMoveEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/QDropEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/QErrorMessage.cpp | 2 + harbour/contrib/hbqt/qtgui/QFileDialog.cpp | 2 + .../contrib/hbqt/qtgui/QFileIconProvider.cpp | 2 + .../contrib/hbqt/qtgui/QFileSystemModel.cpp | 2 + harbour/contrib/hbqt/qtgui/QFocusEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/QFocusFrame.cpp | 2 + harbour/contrib/hbqt/qtgui/QFont.cpp | 2 + harbour/contrib/hbqt/qtgui/QFontComboBox.cpp | 2 + harbour/contrib/hbqt/qtgui/QFontDatabase.cpp | 2 + harbour/contrib/hbqt/qtgui/QFontDialog.cpp | 2 + harbour/contrib/hbqt/qtgui/QFontInfo.cpp | 2 + harbour/contrib/hbqt/qtgui/QFontMetrics.cpp | 2 + harbour/contrib/hbqt/qtgui/QFontMetricsF.cpp | 2 + harbour/contrib/hbqt/qtgui/QFormLayout.cpp | 2 + harbour/contrib/hbqt/qtgui/QFrame.cpp | 2 + harbour/contrib/hbqt/qtgui/QGradient.cpp | 2 + harbour/contrib/hbqt/qtgui/QGridLayout.cpp | 2 + harbour/contrib/hbqt/qtgui/QGroupBox.cpp | 2 + harbour/contrib/hbqt/qtgui/QHBoxLayout.cpp | 2 + harbour/contrib/hbqt/qtgui/QHeaderView.cpp | 2 + harbour/contrib/hbqt/qtgui/QHelpEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/QHideEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/QIcon.cpp | 2 + harbour/contrib/hbqt/qtgui/QImage.cpp | 2 + harbour/contrib/hbqt/qtgui/QImageReader.cpp | 2 + harbour/contrib/hbqt/qtgui/QImageWriter.cpp | 2 + harbour/contrib/hbqt/qtgui/QInputDialog.cpp | 2 + harbour/contrib/hbqt/qtgui/QInputEvent.cpp | 2 + .../contrib/hbqt/qtgui/QInputMethodEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/QItemDelegate.cpp | 2 + .../hbqt/qtgui/QItemEditorCreatorBase.cpp | 2 + .../contrib/hbqt/qtgui/QItemEditorFactory.cpp | 2 + harbour/contrib/hbqt/qtgui/QItemSelection.cpp | 2 + .../hbqt/qtgui/QItemSelectionModel.cpp | 2 + harbour/contrib/hbqt/qtgui/QKeyEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/QKeySequence.cpp | 2 + harbour/contrib/hbqt/qtgui/QLCDNumber.cpp | 2 + harbour/contrib/hbqt/qtgui/QLabel.cpp | 2 + harbour/contrib/hbqt/qtgui/QLayout.cpp | 2 + harbour/contrib/hbqt/qtgui/QLayoutItem.cpp | 2 + harbour/contrib/hbqt/qtgui/QLineEdit.cpp | 2 + .../contrib/hbqt/qtgui/QLinearGradient.cpp | 2 + harbour/contrib/hbqt/qtgui/QListView.cpp | 2 + harbour/contrib/hbqt/qtgui/QListWidget.cpp | 2 + .../contrib/hbqt/qtgui/QListWidgetItem.cpp | 2 + harbour/contrib/hbqt/qtgui/QMainWindow.cpp | 2 + harbour/contrib/hbqt/qtgui/QMatrix.cpp | 2 + harbour/contrib/hbqt/qtgui/QMdiArea.cpp | 2 + harbour/contrib/hbqt/qtgui/QMdiSubWindow.cpp | 2 + harbour/contrib/hbqt/qtgui/QMenu.cpp | 2 + harbour/contrib/hbqt/qtgui/QMenuBar.cpp | 2 + harbour/contrib/hbqt/qtgui/QMessageBox.cpp | 2 + harbour/contrib/hbqt/qtgui/QMouseEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/QMoveEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/QMovie.cpp | 2 + .../contrib/hbqt/qtgui/QPageSetupDialog.cpp | 2 + harbour/contrib/hbqt/qtgui/QPaintDevice.cpp | 2 + harbour/contrib/hbqt/qtgui/QPaintEngine.cpp | 2 + harbour/contrib/hbqt/qtgui/QPaintEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/QPainter.cpp | 2 + harbour/contrib/hbqt/qtgui/QPainterPath.cpp | 2 + harbour/contrib/hbqt/qtgui/QPalette.cpp | 2 + harbour/contrib/hbqt/qtgui/QPen.cpp | 2 + harbour/contrib/hbqt/qtgui/QPicture.cpp | 2 + harbour/contrib/hbqt/qtgui/QPixmap.cpp | 2 + .../hbqt/qtgui/QPlainTextDocumentLayout.cpp | 2 + harbour/contrib/hbqt/qtgui/QPlainTextEdit.cpp | 2 + harbour/contrib/hbqt/qtgui/QPolygon.cpp | 2 + harbour/contrib/hbqt/qtgui/QPolygonF.cpp | 2 + harbour/contrib/hbqt/qtgui/QPrintDialog.cpp | 2 + harbour/contrib/hbqt/qtgui/QPrintEngine.cpp | 2 + .../hbqt/qtgui/QPrintPreviewDialog.cpp | 2 + harbour/contrib/hbqt/qtgui/QPrinter.cpp | 2 + harbour/contrib/hbqt/qtgui/QProgressBar.cpp | 2 + .../contrib/hbqt/qtgui/QProgressDialog.cpp | 2 + harbour/contrib/hbqt/qtgui/QPushButton.cpp | 2 + .../contrib/hbqt/qtgui/QRadialGradient.cpp | 2 + harbour/contrib/hbqt/qtgui/QRadioButton.cpp | 2 + harbour/contrib/hbqt/qtgui/QRegion.cpp | 2 + harbour/contrib/hbqt/qtgui/QResizeEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/QScrollArea.cpp | 2 + harbour/contrib/hbqt/qtgui/QScrollBar.cpp | 2 + .../contrib/hbqt/qtgui/QSessionManager.cpp | 2 + harbour/contrib/hbqt/qtgui/QShowEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/QSizeGrip.cpp | 2 + harbour/contrib/hbqt/qtgui/QSizePolicy.cpp | 2 + harbour/contrib/hbqt/qtgui/QSlider.cpp | 2 + harbour/contrib/hbqt/qtgui/QSound.cpp | 2 + harbour/contrib/hbqt/qtgui/QSpacerItem.cpp | 2 + harbour/contrib/hbqt/qtgui/QSpinBox.cpp | 2 + harbour/contrib/hbqt/qtgui/QSplashScreen.cpp | 2 + harbour/contrib/hbqt/qtgui/QSplitter.cpp | 2 + harbour/contrib/hbqt/qtgui/QStackedWidget.cpp | 2 + harbour/contrib/hbqt/qtgui/QStandardItem.cpp | 2 + .../contrib/hbqt/qtgui/QStandardItemModel.cpp | 2 + harbour/contrib/hbqt/qtgui/QStatusBar.cpp | 2 + .../contrib/hbqt/qtgui/QStringListModel.cpp | 2 + harbour/contrib/hbqt/qtgui/QStyle.cpp | 2 + harbour/contrib/hbqt/qtgui/QStyleFactory.cpp | 2 + .../contrib/hbqt/qtgui/QStyleHintReturn.cpp | 2 + .../hbqt/qtgui/QStyleHintReturnMask.cpp | 2 + .../hbqt/qtgui/QStyleHintReturnVariant.cpp | 2 + harbour/contrib/hbqt/qtgui/QStyleOption.cpp | 2 + .../contrib/hbqt/qtgui/QStyleOptionButton.cpp | 2 + .../hbqt/qtgui/QStyleOptionComboBox.cpp | 2 + .../hbqt/qtgui/QStyleOptionComplex.cpp | 2 + .../hbqt/qtgui/QStyleOptionDockWidget.cpp | 2 + .../hbqt/qtgui/QStyleOptionFocusRect.cpp | 2 + .../contrib/hbqt/qtgui/QStyleOptionFrame.cpp | 2 + .../hbqt/qtgui/QStyleOptionGroupBox.cpp | 2 + .../contrib/hbqt/qtgui/QStyleOptionHeader.cpp | 2 + .../hbqt/qtgui/QStyleOptionMenuItem.cpp | 2 + .../hbqt/qtgui/QStyleOptionProgressBar.cpp | 2 + .../hbqt/qtgui/QStyleOptionSizeGrip.cpp | 2 + .../contrib/hbqt/qtgui/QStyleOptionSlider.cpp | 2 + .../hbqt/qtgui/QStyleOptionSpinBox.cpp | 2 + .../contrib/hbqt/qtgui/QStyleOptionTab.cpp | 2 + .../hbqt/qtgui/QStyleOptionTabBarBase.cpp | 2 + .../hbqt/qtgui/QStyleOptionTabWidgetFrame.cpp | 2 + .../hbqt/qtgui/QStyleOptionTitleBar.cpp | 2 + .../hbqt/qtgui/QStyleOptionToolBar.cpp | 2 + .../hbqt/qtgui/QStyleOptionToolBox.cpp | 2 + .../hbqt/qtgui/QStyleOptionToolButton.cpp | 2 + .../hbqt/qtgui/QStyleOptionViewItem.cpp | 2 + harbour/contrib/hbqt/qtgui/QStylePainter.cpp | 2 + .../hbqt/qtgui/QStyledItemDelegate.cpp | 2 + .../contrib/hbqt/qtgui/QSyntaxHighlighter.cpp | 2 + .../contrib/hbqt/qtgui/QSystemTrayIcon.cpp | 2 + harbour/contrib/hbqt/qtgui/QTabBar.cpp | 2 + harbour/contrib/hbqt/qtgui/QTabWidget.cpp | 2 + harbour/contrib/hbqt/qtgui/QTableView.cpp | 2 + harbour/contrib/hbqt/qtgui/QTableWidget.cpp | 2 + .../contrib/hbqt/qtgui/QTableWidgetItem.cpp | 2 + .../hbqt/qtgui/QTableWidgetSelectionRange.cpp | 2 + harbour/contrib/hbqt/qtgui/QTextBlock.cpp | 2 + .../contrib/hbqt/qtgui/QTextBlockFormat.cpp | 2 + .../contrib/hbqt/qtgui/QTextBlockGroup.cpp | 2 + harbour/contrib/hbqt/qtgui/QTextBrowser.cpp | 2 + .../contrib/hbqt/qtgui/QTextCharFormat.cpp | 2 + harbour/contrib/hbqt/qtgui/QTextCursor.cpp | 2 + harbour/contrib/hbqt/qtgui/QTextDocument.cpp | 2 + .../hbqt/qtgui/QTextDocumentFragment.cpp | 2 + .../hbqt/qtgui/QTextDocumentWriter.cpp | 2 + harbour/contrib/hbqt/qtgui/QTextEdit.cpp | 2 + harbour/contrib/hbqt/qtgui/QTextFormat.cpp | 2 + harbour/contrib/hbqt/qtgui/QTextFragment.cpp | 2 + harbour/contrib/hbqt/qtgui/QTextFrame.cpp | 2 + .../contrib/hbqt/qtgui/QTextFrameFormat.cpp | 2 + .../contrib/hbqt/qtgui/QTextImageFormat.cpp | 2 + .../contrib/hbqt/qtgui/QTextInlineObject.cpp | 2 + harbour/contrib/hbqt/qtgui/QTextItem.cpp | 2 + harbour/contrib/hbqt/qtgui/QTextLayout.cpp | 2 + harbour/contrib/hbqt/qtgui/QTextLength.cpp | 2 + harbour/contrib/hbqt/qtgui/QTextLine.cpp | 2 + harbour/contrib/hbqt/qtgui/QTextList.cpp | 2 + .../contrib/hbqt/qtgui/QTextListFormat.cpp | 2 + harbour/contrib/hbqt/qtgui/QTextObject.cpp | 2 + harbour/contrib/hbqt/qtgui/QTextOption.cpp | 2 + .../contrib/hbqt/qtgui/QTextTableFormat.cpp | 2 + harbour/contrib/hbqt/qtgui/QTimeEdit.cpp | 2 + harbour/contrib/hbqt/qtgui/QToolBar.cpp | 2 + harbour/contrib/hbqt/qtgui/QToolBox.cpp | 2 + harbour/contrib/hbqt/qtgui/QToolButton.cpp | 2 + harbour/contrib/hbqt/qtgui/QTransform.cpp | 2 + harbour/contrib/hbqt/qtgui/QTreeView.cpp | 2 + harbour/contrib/hbqt/qtgui/QTreeWidget.cpp | 2 + .../contrib/hbqt/qtgui/QTreeWidgetItem.cpp | 2 + harbour/contrib/hbqt/qtgui/QVBoxLayout.cpp | 2 + harbour/contrib/hbqt/qtgui/QValidator.cpp | 2 + harbour/contrib/hbqt/qtgui/QWheelEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/QWidget.cpp | 2 + harbour/contrib/hbqt/qtgui/QWidgetAction.cpp | 2 + harbour/contrib/hbqt/qtgui/QWidgetItem.cpp | 2 + .../hbqt/qtgui/QWindowStateChangeEvent.cpp | 2 + harbour/contrib/hbqt/qtgui/QWindowsStyle.cpp | 2 + harbour/contrib/hbqt/qtgui/QWizard.cpp | 2 + harbour/contrib/hbqt/qtgui/QWizardPage.cpp | 2 + .../contrib/hbqt/qth/HBQAbstractItemModel.qth | 97 ++++++ harbour/contrib/hbqt/qtnetwork/QFtp.cpp | 2 + harbour/contrib/hbqt/qtnetwork/QHttp.cpp | 2 + .../contrib/hbqt/qtnetwork/QHttpHeader.cpp | 2 + .../hbqt/qtnetwork/QHttpRequestHeader.cpp | 2 + .../hbqt/qtnetwork/QHttpResponseHeader.cpp | 2 + .../hbqt/qtnetwork/QNetworkRequest.cpp | 2 + harbour/contrib/hbxbp/xbpbrowse.prg | 282 ++++++++------- 295 files changed, 1390 insertions(+), 129 deletions(-) create mode 100644 harbour/contrib/hbqt/hbqt_hbqabstractitemmodel.cpp create mode 100644 harbour/contrib/hbqt/hbqt_hbqabstractitemmodel.h create mode 100644 harbour/contrib/hbqt/qth/HBQAbstractItemModel.qth diff --git a/harbour/ChangeLog b/harbour/ChangeLog index d9d69ab610..76c5668158 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,27 @@ The license applies to all entries newer than 2009-04-28. */ +2010-07-11 22:35 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbqt/filelist.mk + * contrib/hbqt/generator/hbqtgen.prg + * contrib/hbqt/generator/qt45.qtp + * contrib/hbqt/hbqt.ch + * contrib/hbqt/hbqt.h + * contrib/hbqt/hbqt.hbp + * contrib/hbqt/hbqt_garbage.h + + contrib/hbqt/hbqt_hbqabstractitemmodel.cpp + + contrib/hbqt/hbqt_hbqabstractitemmodel.h + * contrib/hbqt/qtcore/filelist.hbm + * contrib/hbqt/qtcore/filelist.mk + + contrib/hbqt/qth/HBQAbstractItemModel.qth + * contrib/hbxbp/xbpbrowse.prg + + + Applied patch provided by Bacco, thanks. + This implements one more member to the structure + which will help simplifying many complex structures in hbQT. + + * Regenerated: *.cpp + 2010-07-11 19:29 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/hbide.hbp - Deleted: ideprotos.prg diff --git a/harbour/contrib/hbqt/filelist.mk b/harbour/contrib/hbqt/filelist.mk index 4c458ec06f..3deb902957 100644 --- a/harbour/contrib/hbqt/filelist.mk +++ b/harbour/contrib/hbqt/filelist.mk @@ -3,6 +3,7 @@ # MOC_HEADERS := \ + hbqt_hbqabstractitemmodel.h \ hbqt_hbdbfmodel.h \ hbqt_hbevents.h \ hbqt_hbqmainwindow.h \ @@ -15,6 +16,7 @@ CPP_SOURCES := \ hbqt_base.cpp \ hbqt_utils.cpp \ hbqt_destruct.cpp \ + hbqt_hbqabstractitemmodel.cpp \ hbqt_hbdbfmodel.cpp \ hbqt_hbevents.cpp \ hbqt_hbqmainwindow.cpp \ diff --git a/harbour/contrib/hbqt/generator/hbqtgen.prg b/harbour/contrib/hbqt/generator/hbqtgen.prg index 442e9c166f..fba46b23fa 100644 --- a/harbour/contrib/hbqt/generator/hbqtgen.prg +++ b/harbour/contrib/hbqt/generator/hbqtgen.prg @@ -595,6 +595,7 @@ STATIC FUNCTION GenSource( cProFile, cPathIn, cPathOut, cPathDoc ) ENDIF aadd( cpp_, " bool bNew;" ) aadd( cpp_, " QT_G_FUNC_PTR func;" ) + aadd( cpp_, " int type;" ) aadd( cpp_, "} QGC_POINTER_" + cWidget + ";" ) aadd( cpp_, " " ) @@ -689,6 +690,7 @@ STATIC FUNCTION GenSource( cProFile, cPathIn, cPathOut, cPathDoc ) ENDIF aadd( cpp_, " p->bNew = bNew;" ) aadd( cpp_, " p->func = hbqt_gcRelease_" + cWidget + ";" ) + aadd( cpp_, " p->type = QT_TYPE_"+cWidget+";" ) aadd( cpp_, "" ) aadd( cpp_, " if( bNew )" ) aadd( cpp_, " {" ) diff --git a/harbour/contrib/hbqt/generator/qt45.qtp b/harbour/contrib/hbqt/generator/qt45.qtp index e79d39f5c8..7519067651 100644 --- a/harbour/contrib/hbqt/generator/qt45.qtp +++ b/harbour/contrib/hbqt/generator/qt45.qtp @@ -14,6 +14,7 @@ -D=../doc +HBQAbstractItemModel.qth HBDbfModel.qth HBEvents.qth HBQMainWindow.qth @@ -299,3 +300,4 @@ QWindowStateChangeEvent.qth QWizard.qth QWizardPage.qth + diff --git a/harbour/contrib/hbqt/hbqt.ch b/harbour/contrib/hbqt/hbqt.ch index 413702e85b..f0bf8a7874 100644 --- a/harbour/contrib/hbqt/hbqt.ch +++ b/harbour/contrib/hbqt/hbqt.ch @@ -2243,5 +2243,19 @@ /*----------------------------------------------------------------------*/ +/* + * DEFINES HBQt CODEBLOCKs + * + * Format: + * QT_(Qt class initials)_(Qt overloaded member) + */ + +#define QT_QAIM_data 1001 +#define QT_QAIM_flags 1003 +#define QT_QAIM_headerData 2001 +#define QT_QAIM_rowCount 3001 +#define QT_QAIM_columnCount 3002 + + #define _HBQT_CH #endif diff --git a/harbour/contrib/hbqt/hbqt.h b/harbour/contrib/hbqt/hbqt.h index 9cb35f8876..f6d5a98ce2 100644 --- a/harbour/contrib/hbqt/hbqt.h +++ b/harbour/contrib/hbqt/hbqt.h @@ -81,6 +81,7 @@ typedef struct void * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER; HB_GARBAGE_FUNC( Q_release ); @@ -393,6 +394,7 @@ extern void * hbqt_pPtrFromItem( PHB_ITEM pObj ); #define hbqt_par_QWSEvent( n ) ( ( QWSEvent * ) hbqt_gcpointer( n ) ) #define hbqt_par_HBDbfModel( n ) ( ( HBDbfModel * ) hbqt_gcpointer( n ) ) +#define hbqt_par_HBQAbstractItemModel( n ) ( ( HBQAbstractItemModel * ) hbqt_gcpointer( n ) ) #define hbqt_par_HBEvents( n ) ( ( HBEvents * ) hbqt_gcpointer( n ) ) #define hbqt_par_HBQMainWindow( n ) ( ( HBQMainWindow * ) hbqt_gcpointer( n ) ) #define hbqt_par_HBQPlainTextEdit( n ) ( ( HBQPlainTextEdit * ) hbqt_gcpointer( n ) ) @@ -407,4 +409,327 @@ extern void * hbqt_pPtrFromItem( PHB_ITEM pObj ); #define hbqt_par_Bool( n ) ( hb_parl( n ) ) #define hbqt_par_char( n ) ( hb_parcx( n ) ) +/* + * DEFINES FOR HBQt PSEUDO-CASTING + * + * Format: + * QT_TYPE_(Qt class) + */ + +#define QT_TYPE_ExtensionOption 1001 +#define QT_TYPE_IUnknown 1002 +#define QT_TYPE_QAbstractButton 1003 +#define QT_TYPE_QAbstractEventDispatcher 1004 +#define QT_TYPE_QAbstractItemDelegate 1005 +#define QT_TYPE_QAbstractItemModel 1006 +#define QT_TYPE_QAbstractItemView 1007 +#define QT_TYPE_QAbstractListModel 1008 +#define QT_TYPE_QAbstractPrintDialog 1009 +#define QT_TYPE_QAbstractProxyModel 1010 +#define QT_TYPE_QAbstractScrollArea 1011 +#define QT_TYPE_QAbstractSlider 1012 +#define QT_TYPE_QAbstractSpinBox 1013 +#define QT_TYPE_QAbstractTableModel 1014 +#define QT_TYPE_QAbstractTextDocumentLayout 1015 +#define QT_TYPE_QAction 1016 +#define QT_TYPE_QActionGroup 1017 +#define QT_TYPE_QApplication 1018 +#define QT_TYPE_QAxBase 1019 +#define QT_TYPE_QBitArray 1020 +#define QT_TYPE_QBitmap 1021 +#define QT_TYPE_QBoxLayout 1022 +#define QT_TYPE_QBrush 1023 +#define QT_TYPE_QBuffer 1024 +#define QT_TYPE_QButtonGroup 1025 +#define QT_TYPE_QByteArray 1026 +#define QT_TYPE_QCalendarWidget 1027 +#define QT_TYPE_QChar 1028 +#define QT_TYPE_QCheckBox 1029 +#define QT_TYPE_QClipboard 1030 +#define QT_TYPE_QColor 1031 +#define QT_TYPE_QColorDialog 1032 +#define QT_TYPE_QComboBox 1033 +#define QT_TYPE_QCommandLinkButton 1034 +#define QT_TYPE_QCommonStyle 1035 +#define QT_TYPE_QCompleter 1036 +#define QT_TYPE_QConicalGradient 1037 +#define QT_TYPE_QContextMenuEvent 1038 +#define QT_TYPE_QCoreApplication 1039 +#define QT_TYPE_QCursor 1040 +#define QT_TYPE_QDateEdit 1041 +#define QT_TYPE_QDataStream 1042 +#define QT_TYPE_QDate 1043 +#define QT_TYPE_QDateTime 1044 +#define QT_TYPE_QDateTimeEdit 1045 +#define QT_TYPE_QDesktopWidget 1046 +#define QT_TYPE_QDial 1047 +#define QT_TYPE_QDialog 1048 +#define QT_TYPE_QDir 1049 +#define QT_TYPE_QDirModel 1050 +#define QT_TYPE_QDockWidget 1051 +#define QT_TYPE_QDoubleSpinBox 1053 +#define QT_TYPE_QDragEnterEvent 1054 +#define QT_TYPE_QDragLeaveEvent 1055 +#define QT_TYPE_QDragMoveEvent 1056 +#define QT_TYPE_QDropEvent 1057 +#define QT_TYPE_QErrorMessage 1058 +#define QT_TYPE_QEvent 1059 +#define QT_TYPE_QEventLoop 1060 +#define QT_TYPE_QFile 1061 +#define QT_TYPE_QFileDialog 1062 +#define QT_TYPE_QFileIconProvider 1063 +#define QT_TYPE_QFileInfo 1064 +#define QT_TYPE_QFileSystemModel 1065 +#define QT_TYPE_QFocusEvent 1066 +#define QT_TYPE_QFocusFrame 1067 +#define QT_TYPE_QFont 1068 +#define QT_TYPE_QFontComboBox 1069 +#define QT_TYPE_QFontDatabase 1070 +#define QT_TYPE_QFontDialog 1071 +#define QT_TYPE_QFontInfo 1072 +#define QT_TYPE_QFontMetrics 1073 +#define QT_TYPE_QFontMetricsF 1074 +#define QT_TYPE_QFormLayout 1075 +#define QT_TYPE_QFrame 1076 +#define QT_TYPE_QFtp 1077 +#define QT_TYPE_QGradient 1078 +#define QT_TYPE_QGradientStops 1079 +#define QT_TYPE_QGridLayout 1080 +#define QT_TYPE_QGroupBox 1081 +#define QT_TYPE_QHBoxLayout 1082 +#define QT_TYPE_QHeaderView 1083 +#define QT_TYPE_QHelpEvent 1084 +#define QT_TYPE_QHideEvent 1085 +#define QT_TYPE_QHttp 1086 +#define QT_TYPE_QHttpHeader 1087 +#define QT_TYPE_QHttpResponseHeader 1088 +#define QT_TYPE_QHttpRequestHeader 1089 +#define QT_TYPE_QIcon 1090 +#define QT_TYPE_QImage 1091 +#define QT_TYPE_QImageReader 1092 +#define QT_TYPE_QImageWriter 1093 +#define QT_TYPE_QInputContext 1094 +#define QT_TYPE_QInputDialog 1095 +#define QT_TYPE_QInputEvent 1096 +#define QT_TYPE_QInputMethodEvent 1097 +#define QT_TYPE_QIODevice 1098 +#define QT_TYPE_QItemDelegate 1099 +#define QT_TYPE_QItemEditorCreator 1100 +#define QT_TYPE_QItemEditorCreatorBase 1101 +#define QT_TYPE_QItemEditorFactory 1102 +#define QT_TYPE_QItemSelection 1103 +#define QT_TYPE_QItemSelectionModel 1104 +#define QT_TYPE_QKeyEvent 1105 +#define QT_TYPE_QKeySequence 1106 +#define QT_TYPE_QLabel 1107 +#define QT_TYPE_QLatin1Char 1108 +#define QT_TYPE_QLatin1String 1109 +#define QT_TYPE_QLayout 1110 +#define QT_TYPE_QLayoutItem 1111 +#define QT_TYPE_QLCDNumber 1112 +#define QT_TYPE_QLibraryInfo 1113 +#define QT_TYPE_QLine 1114 +#define QT_TYPE_QLinearGradient 1115 +#define QT_TYPE_QLineEdit 1116 +#define QT_TYPE_QLineF 1117 +#define QT_TYPE_QList 1118 +#define QT_TYPE_QListView 1119 +#define QT_TYPE_QListWidget 1120 +#define QT_TYPE_QListWidgetItem 1121 +#define QT_TYPE_QLocale 1122 +#define QT_TYPE_QMainWindow 1123 +#define QT_TYPE_QMatrix 1124 +#define QT_TYPE_QMdiArea 1125 +#define QT_TYPE_QMdiSubWindow 1126 +#define QT_TYPE_QMenu 1127 +#define QT_TYPE_QMenuBar 1128 +#define QT_TYPE_QMessageBox 1129 +#define QT_TYPE_QMimeData 1130 +#define QT_TYPE_QModelIndex 1131 +#define QT_TYPE_QModelIndexList 1132 +#define QT_TYPE_QMouseEvent 1133 +#define QT_TYPE_QMoveEvent 1134 +#define QT_TYPE_QMovie 1135 +#define QT_TYPE_QNetworkAccessManager 1136 +#define QT_TYPE_QNetworkProxy 1137 +#define QT_TYPE_QNetworkRequest 1138 +#define QT_TYPE_QObject 1139 +#define QT_TYPE_QPageSetupDialog 1140 +#define QT_TYPE_QPaintDevice 1141 +#define QT_TYPE_QPaintEngine 1142 +#define QT_TYPE_QPaintEngineState 1143 +#define QT_TYPE_QPainter 1144 +#define QT_TYPE_QPainterPath 1145 +#define QT_TYPE_QPaintEvent 1146 +#define QT_TYPE_QPalette 1147 +#define QT_TYPE_QPen 1148 +#define QT_TYPE_QPicture 1149 +#define QT_TYPE_QPixmap 1150 +#define QT_TYPE_QPlainTextDocumentLayout 1151 +#define QT_TYPE_QPlainTextEdit 1152 +#define QT_TYPE_QPoint 1153 +#define QT_TYPE_QPointF 1154 +#define QT_TYPE_QPolygon 1155 +#define QT_TYPE_QPolygonF 1156 +#define QT_TYPE_QPrintDialog 1157 +#define QT_TYPE_QPrintEngine 1158 +#define QT_TYPE_QPrinter 1159 +#define QT_TYPE_QPrintPreviewDialog 1160 +#define QT_TYPE_QProcess 1161 +#define QT_TYPE_QProgressBar 1162 +#define QT_TYPE_QProgressDialog 1163 +#define QT_TYPE_QPushButton 1164 +#define QT_TYPE_QRadialGradient 1165 +#define QT_TYPE_QRadioButton 1166 +#define QT_TYPE_QRect 1167 +#define QT_TYPE_QRectF 1168 +#define QT_TYPE_QRegExp 1169 +#define QT_TYPE_QRegion 1170 +#define QT_TYPE_QResizeEvent 1171 +#define QT_TYPE_QResource 1172 +#define QT_TYPE_QScrollArea 1173 +#define QT_TYPE_QScrollBar 1174 +#define QT_TYPE_QSessionManager 1175 +#define QT_TYPE_QSettings 1176 +#define QT_TYPE_QShowEvent 1177 +#define QT_TYPE_QSignalMapper 1178 +#define QT_TYPE_QSize 1179 +#define QT_TYPE_QSizeF 1180 +#define QT_TYPE_QSizeGrip 1181 +#define QT_TYPE_QSizePolicy 1182 +#define QT_TYPE_QSlider 1183 +#define QT_TYPE_QSound 1184 +#define QT_TYPE_QSpacerItem 1185 +#define QT_TYPE_QSpinBox 1186 +#define QT_TYPE_QSplashScreen 1187 +#define QT_TYPE_QSplitter 1188 +#define QT_TYPE_QStackedWidget 1189 +#define QT_TYPE_QStandardItem 1190 +#define QT_TYPE_QStandardItemModel 1191 +#define QT_TYPE_QStatusBar 1192 +#define QT_TYPE_QStringList 1193 +#define QT_TYPE_QStringListModel 1194 +#define QT_TYPE_QStyle 1195 +#define QT_TYPE_QStyledItemDelegate 1196 +#define QT_TYPE_QStyleFactory 1197 +#define QT_TYPE_QStyleHintReturn 1198 +#define QT_TYPE_QStyleHintReturnMask 1199 +#define QT_TYPE_QStyleHintReturnVariant 1200 +#define QT_TYPE_QStyleOption 1201 +#define QT_TYPE_QStyleOptionButton 1202 +#define QT_TYPE_QStyleOptionComboBox 1203 +#define QT_TYPE_QStyleOptionComplex 1204 +#define QT_TYPE_QStyleOptionDockWidget 1205 +#define QT_TYPE_QStyleOptionFocusRect 1206 +#define QT_TYPE_QStyleOptionFrame 1207 +#define QT_TYPE_QStyleOptionGroupBox 1208 +#define QT_TYPE_QStyleOptionHeader 1209 +#define QT_TYPE_QStyleOptionMenuItem 1210 +#define QT_TYPE_QStyleOptionProgressBar 1211 +#define QT_TYPE_QStyleOptionSizeGrip 1212 +#define QT_TYPE_QStyleOptionSlider 1213 +#define QT_TYPE_QStyleOptionSpinBox 1214 +#define QT_TYPE_QStyleOptionTab 1215 +#define QT_TYPE_QStyleOptionTabBarBase 1216 +#define QT_TYPE_QStyleOptionTabWidgetFrame 1217 +#define QT_TYPE_QStyleOptionTitleBar 1218 +#define QT_TYPE_QStyleOptionToolBar 1219 +#define QT_TYPE_QStyleOptionToolBox 1220 +#define QT_TYPE_QStyleOptionToolButton 1221 +#define QT_TYPE_QStyleOptionViewItem 1222 +#define QT_TYPE_QStylePainter 1224 +#define QT_TYPE_QSyntaxHighlighter 1225 +#define QT_TYPE_QSystemTrayIcon 1226 +#define QT_TYPE_QTabBar 1227 +#define QT_TYPE_QTableView 1228 +#define QT_TYPE_QTableWidget 1229 +#define QT_TYPE_QTableWidgetItem 1230 +#define QT_TYPE_QTableWidgetSelectionRange 1231 +#define QT_TYPE_QTabWidget 1232 +#define QT_TYPE_QTcpSocket 1233 +#define QT_TYPE_QTextBlock 1234 +#define QT_TYPE_QTextBlockFormat 1235 +#define QT_TYPE_QTextBlockGroup 1236 +#define QT_TYPE_QTextBlockUserData 1237 +#define QT_TYPE_QTextBoundaryFinder 1238 +#define QT_TYPE_QTextBrowser 1239 +#define QT_TYPE_QTextCharFormat 1240 +#define QT_TYPE_QTextCodec 1241 +#define QT_TYPE_QTextCursor 1244 +#define QT_TYPE_QTextDecoder 1245 +#define QT_TYPE_QTextDocument 1246 +#define QT_TYPE_QTextDocumentFragment 1247 +#define QT_TYPE_QTextDocumentWriter 1248 +#define QT_TYPE_QTextEdit 1249 +#define QT_TYPE_QTextEncoder 1250 +#define QT_TYPE_QTextEngine 1251 +#define QT_TYPE_QTextFormat 1252 +#define QT_TYPE_QTextFragment 1253 +#define QT_TYPE_QTextFrame 1254 +#define QT_TYPE_QTextFrameFormat 1255 +#define QT_TYPE_QTextImageFormat 1256 +#define QT_TYPE_QTextInlineObject 1257 +#define QT_TYPE_QTextItem 1258 +#define QT_TYPE_QTextList 1259 +#define QT_TYPE_QTextLayout 1260 +#define QT_TYPE_QTextLength 1261 +#define QT_TYPE_QTextLine 1262 +#define QT_TYPE_QTextListFormat 1263 +#define QT_TYPE_QTextObject 1264 +#define QT_TYPE_QTextOption 1265 +#define QT_TYPE_QTextStream 1266 +#define QT_TYPE_QTextTableFormat 1267 +#define QT_TYPE_QThread 1268 +#define QT_TYPE_QTime 1269 +#define QT_TYPE_QTimeEdit 1270 +#define QT_TYPE_QTimer 1271 +#define QT_TYPE_QToolBar 1272 +#define QT_TYPE_QToolBox 1273 +#define QT_TYPE_QToolButton 1274 +#define QT_TYPE_QTransform 1275 +#define QT_TYPE_QTranslator 1276 +#define QT_TYPE_QTreeView 1277 +#define QT_TYPE_QTreeWidget 1278 +#define QT_TYPE_QTreeWidgetItem 1279 +#define QT_TYPE_QUiLoader 1280 +#define QT_TYPE_QUrl 1281 +#define QT_TYPE_QValidator 1282 +#define QT_TYPE_QVariant 1283 +#define QT_TYPE_QVBoxLayout 1284 +#define QT_TYPE_QVector 1285 +#define QT_TYPE_QWheelEvent 1286 +#define QT_TYPE_QWidget 1287 +#define QT_TYPE_QWidgetAction 1288 +#define QT_TYPE_QWidgetItem 1289 +#define QT_TYPE_QWindowsStyle 1290 +#define QT_TYPE_QWindowSurface 1291 +#define QT_TYPE_QWindowsXPStyle 1292 +#define QT_TYPE_QWindowStateChangeEvent 1293 +#define QT_TYPE_QWizard 1294 +#define QT_TYPE_QWizardPage 1295 +#define QT_TYPE_QWSEvent 1296 + +#define QT_TYPE_HBDbfModel 1401 +#define QT_TYPE_HBQAbstractItemModel 1402 +#define QT_TYPE_HBEvents 1403 +#define QT_TYPE_HBQMainWindow 1404 +#define QT_TYPE_HBQPlainTextEdit 1405 +#define QT_TYPE_HBQTableView 1406 +#define QT_TYPE_HBQSyntaxHighlighter 1407 +#define QT_TYPE_HBQTextBlockUserData 1408 +#define QT_TYPE_HBSlots 1409 + +/* + * DEFINES HBQt CODEBLOCKs + * + * Format: + * QT_(Qt class initials)_(Qt overloaded member) + */ + +#define QT_QAIM_data 1001 +#define QT_QAIM_flags 1003 +#define QT_QAIM_headerData 2001 +#define QT_QAIM_rowCount 3001 +#define QT_QAIM_columnCount 3002 + #endif /* __HBQT_H */ diff --git a/harbour/contrib/hbqt/hbqt.hbp b/harbour/contrib/hbqt/hbqt.hbp index 0644d32a0d..21c863a43f 100644 --- a/harbour/contrib/hbqt/hbqt.hbp +++ b/harbour/contrib/hbqt/hbqt.hbp @@ -13,6 +13,7 @@ hbqt_common.hbm hbqt_base.cpp hbqt_destruct.cpp +hbqt_hbqabstractitemmodel.cpp hbqt_hbdbfmodel.cpp hbqt_hbevents.cpp hbqt_hbqmainwindow.cpp @@ -25,6 +26,7 @@ hbqt_misc.prg hbqt_errorsys.prg THbQtUI.prg +hbqt_hbqabstractitemmodel.cpp hbqt_hbdbfmodel.h hbqt_hbevents.h hbqt_hbqmainwindow.h diff --git a/harbour/contrib/hbqt/hbqt_garbage.h b/harbour/contrib/hbqt/hbqt_garbage.h index cfdefca489..fecfa5ff66 100644 --- a/harbour/contrib/hbqt/hbqt_garbage.h +++ b/harbour/contrib/hbqt/hbqt_garbage.h @@ -8,6 +8,7 @@ /* or the generator tool itself, and run regenarate. */ /* -------------------------------------------------------------------- */ +extern QT_G_FUNC( hbqt_gcRelease_HBQAbstractItemModel ); extern QT_G_FUNC( hbqt_gcRelease_HBDbfModel ); extern QT_G_FUNC( hbqt_gcRelease_HBEvents ); extern QT_G_FUNC( hbqt_gcRelease_HBQMainWindow ); @@ -290,6 +291,7 @@ extern QT_G_FUNC( hbqt_gcRelease_QWindowStateChangeEvent ); extern QT_G_FUNC( hbqt_gcRelease_QWizard ); extern QT_G_FUNC( hbqt_gcRelease_QWizardPage ); +extern void * hbqt_gcAllocate_HBQAbstractItemModel( void * pObj, bool bNew ); extern void * hbqt_gcAllocate_HBDbfModel( void * pObj, bool bNew ); extern void * hbqt_gcAllocate_HBEvents( void * pObj, bool bNew ); extern void * hbqt_gcAllocate_HBQMainWindow( void * pObj, bool bNew ); diff --git a/harbour/contrib/hbqt/hbqt_hbqabstractitemmodel.cpp b/harbour/contrib/hbqt/hbqt_hbqabstractitemmodel.cpp new file mode 100644 index 0000000000..9f13ac146d --- /dev/null +++ b/harbour/contrib/hbqt/hbqt_hbqabstractitemmodel.cpp @@ -0,0 +1,170 @@ + +/* PLEASE, SOMEONE ADD THE CORRECT HEADER */ + +/* carlosbacco@gmail.com */ + +#include "hbqt.h" + +#include "hbapiitm.h" +#include "hbvm.h" + +#if QT_VERSION >= 0x040500 + +#include "hbqt_hbqabstractitemmodel.h" + +#include +#include +#include + +using namespace std; + +QVariant hbqt_fetchData( PHB_ITEM block, int type, int role, int par1, int par2 ) +{ + QVariant vv; + + if( hb_vmRequestReenter() ) + { + PHB_ITEM p0 = hb_itemPutNI( NULL, type ); + PHB_ITEM p1 = hb_itemPutNI( NULL, role ); + PHB_ITEM p2 = hb_itemPutNI( NULL, par1 ); + PHB_ITEM p3 = hb_itemPutNI( NULL, par2 ); + + PHB_ITEM ret = hb_vmEvalBlockV( block, 4, p0, p1, p2, p3 ); + + hb_itemRelease( p0 ); + hb_itemRelease( p1 ); + hb_itemRelease( p2 ); + hb_itemRelease( p3 ); + + if( hb_itemType( ret ) & HB_IT_STRING ) + { + vv = hb_itemGetCPtr( ret ); + HB_TRACE( HB_TR_DEBUG, ( " fetchData[ s = %s ]", hb_itemGetCPtr( ret ) ) ); + } + else if( hb_itemType( ret ) & HB_IT_LOGICAL ) + { + vv = hb_itemGetL( ret ); + HB_TRACE( HB_TR_DEBUG, ( " fetchData[ l = %i ]", hb_itemGetL( ret ) ) ); + } + else if( hb_itemType( ret ) & HB_IT_DOUBLE ) + { + vv = hb_itemGetND( ret ); + HB_TRACE( HB_TR_DEBUG, ( " fetchData[ d = %f ]", hb_itemGetND( ret ) ) ); + } + else if( hb_itemType( ret ) & HB_IT_NUMERIC ) + { + vv = hb_itemGetNI( ret ); + HB_TRACE( HB_TR_DEBUG, ( " fetchData[ n = %i ]", hb_itemGetNI( ret ) ) ); + } + else if( hb_itemType( ret ) & HB_IT_OBJECT ) + { + hb_vmPushSymbol( hb_dynsymSymbol( hb_dynsymFindName( "PPTR" ) ) ); + hb_vmPush( ret ); + hb_vmSend( 0 ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_parptrGC( hbqt_gcFuncs(), -1 ); + if ( p->type == QT_TYPE_QBrush ) + vv = * ( ( QBrush * ) ( p->ph ) ); + else if ( p->type == QT_TYPE_QColor ) + vv = * ( ( QColor * ) ( p->ph ) ); + else if ( p->type == QT_TYPE_QSize ) + vv = * ( ( QSize * ) ( p->ph ) ); + else if ( p->type == QT_TYPE_QIcon ) + vv = * ( ( QIcon * ) ( p->ph ) ); + else if ( p->type == QT_TYPE_QPixmap ) + vv = * ( ( QPixmap * ) ( p->ph ) ); + else if ( p->type == QT_TYPE_QFont ) + vv = * ( ( QFont * ) ( p->ph ) ); + } + else + { + vv = NULL; + } + + hb_vmRequestRestore(); + } + + return vv; +} + +HBQAbstractItemModel::HBQAbstractItemModel( PHB_ITEM pBlock ) : QAbstractItemModel() +{ + if( pBlock) + { + block = hb_itemNew( pBlock ); + } +} + +HBQAbstractItemModel::~HBQAbstractItemModel( void ) +{ + if( block ) + { + hb_itemRelease( block ); + block = NULL; + } +} + +Qt::ItemFlags HBQAbstractItemModel::flags( const QModelIndex & index ) const +{ + if( ! index.isValid() ) + return 0; + + QVariant ret = hbqt_fetchData( block, QT_QAIM_flags, 0, index.column(), index.row() ); + if ( ret == NULL ) + return Qt::ItemIsEnabled | Qt::ItemIsSelectable; + + return Qt::ItemIsEnabled | Qt::ItemIsSelectable; + /* TODO: Fix return ret ; */ +} + +QVariant HBQAbstractItemModel::data( const QModelIndex & index, int role ) const +{ + if( !index.isValid() ) + return QVariant(); + + QVariant ret = hbqt_fetchData( block, QT_QAIM_data, role, index.column(), index.row() ); + if ( ret == NULL ) + return QVariant(); + + return ret; +} + +QVariant HBQAbstractItemModel::headerData( int section, Qt::Orientation orientation, int role ) const +{ + QVariant ret = hbqt_fetchData( block, QT_QAIM_headerData, role, orientation, section ); + if ( ret == NULL ) + return QVariant(); + + return ret; +} + +int HBQAbstractItemModel::rowCount( const QModelIndex & /*parent = QModelIndex()*/ ) const +{ + QVariant ret = hbqt_fetchData( block, QT_QAIM_rowCount , 0, 0, 0); + + return ret.toInt() ; +} + +int HBQAbstractItemModel::columnCount( const QModelIndex & /*parent = QModelIndex()*/ ) const +{ + QVariant ret = hbqt_fetchData( block, QT_QAIM_columnCount , 0, 0, 0); + + return ret.toInt() ; +} + +QModelIndex HBQAbstractItemModel::index( int row, int column, const QModelIndex & parent ) const +{ + HB_SYMBOL_UNUSED( parent ); + return createIndex( row, column, row * column ); +} + +QModelIndex HBQAbstractItemModel::parent( const QModelIndex & /* child */ ) const +{ + return QModelIndex(); +} + +void HBQAbstractItemModel::reset() +{ + QAbstractItemModel::reset(); +} + +#endif diff --git a/harbour/contrib/hbqt/hbqt_hbqabstractitemmodel.h b/harbour/contrib/hbqt/hbqt_hbqabstractitemmodel.h new file mode 100644 index 0000000000..5598d14b4b --- /dev/null +++ b/harbour/contrib/hbqt/hbqt_hbqabstractitemmodel.h @@ -0,0 +1,34 @@ + +#ifndef HBQT_HBQAbstractItemModel_H +#define HBQT_HBQAbstractItemModel_H + +#include "hbapi.h" + +/*----------------------------------------------------------------------*/ + +#include +#include + +class HBQAbstractItemModel : public QAbstractItemModel +{ + Q_OBJECT + +public: + HBQAbstractItemModel( PHB_ITEM pBlock ); + virtual ~HBQAbstractItemModel( void ); + + PHB_ITEM block; + + Qt::ItemFlags flags( const QModelIndex & index ) const; + QVariant data( const QModelIndex & index, int role = Qt::DisplayRole ) const; + QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const; + int rowCount( const QModelIndex & parent = QModelIndex() ) const; + int columnCount( const QModelIndex & parent = QModelIndex() ) const; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; + QModelIndex parent(const QModelIndex &child) const; + void reset(); +}; + +/*----------------------------------------------------------------------*/ + +#endif diff --git a/harbour/contrib/hbqt/qtcore/HBDbfModel.cpp b/harbour/contrib/hbqt/qtcore/HBDbfModel.cpp index a0e883ef27..3e25cd479f 100644 --- a/harbour/contrib/hbqt/qtcore/HBDbfModel.cpp +++ b/harbour/contrib/hbqt/qtcore/HBDbfModel.cpp @@ -81,6 +81,7 @@ typedef struct QPointer< HBDbfModel > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_HBDbfModel; QT_G_FUNC( hbqt_gcRelease_HBDbfModel ) @@ -127,6 +128,7 @@ void * hbqt_gcAllocate_HBDbfModel( void * pObj, bool bNew ) new( & p->ph ) QPointer< HBDbfModel >( ( HBDbfModel * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_HBDbfModel; + p->type = QT_TYPE_HBDbfModel; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/HBEvents.cpp b/harbour/contrib/hbqt/qtcore/HBEvents.cpp index 8777316f2e..229c4bc4da 100644 --- a/harbour/contrib/hbqt/qtcore/HBEvents.cpp +++ b/harbour/contrib/hbqt/qtcore/HBEvents.cpp @@ -82,6 +82,7 @@ typedef struct QPointer< HBEvents > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_HBEvents; QT_G_FUNC( hbqt_gcRelease_HBEvents ) @@ -128,6 +129,7 @@ void * hbqt_gcAllocate_HBEvents( void * pObj, bool bNew ) new( & p->ph ) QPointer< HBEvents >( ( HBEvents * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_HBEvents; + p->type = QT_TYPE_HBEvents; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/HBSlots.cpp b/harbour/contrib/hbqt/qtcore/HBSlots.cpp index 8915830cb2..b93e4c5ef9 100644 --- a/harbour/contrib/hbqt/qtcore/HBSlots.cpp +++ b/harbour/contrib/hbqt/qtcore/HBSlots.cpp @@ -81,6 +81,7 @@ typedef struct QPointer< HBSlots > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_HBSlots; QT_G_FUNC( hbqt_gcRelease_HBSlots ) @@ -127,6 +128,7 @@ void * hbqt_gcAllocate_HBSlots( void * pObj, bool bNew ) new( & p->ph ) QPointer< HBSlots >( ( HBSlots * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_HBSlots; + p->type = QT_TYPE_HBSlots; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QAbstractItemModel.cpp b/harbour/contrib/hbqt/qtcore/QAbstractItemModel.cpp index 9b687652ab..38d99a92ac 100644 --- a/harbour/contrib/hbqt/qtcore/QAbstractItemModel.cpp +++ b/harbour/contrib/hbqt/qtcore/QAbstractItemModel.cpp @@ -99,6 +99,7 @@ typedef struct QPointer< QAbstractItemModel > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QAbstractItemModel; QT_G_FUNC( hbqt_gcRelease_QAbstractItemModel ) @@ -119,6 +120,7 @@ void * hbqt_gcAllocate_QAbstractItemModel( void * pObj, bool bNew ) new( & p->ph ) QPointer< QAbstractItemModel >( ( QAbstractItemModel * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QAbstractItemModel; + p->type = QT_TYPE_QAbstractItemModel; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QAbstractListModel.cpp b/harbour/contrib/hbqt/qtcore/QAbstractListModel.cpp index 8412605ec5..dbd4656cbd 100644 --- a/harbour/contrib/hbqt/qtcore/QAbstractListModel.cpp +++ b/harbour/contrib/hbqt/qtcore/QAbstractListModel.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QAbstractListModel > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QAbstractListModel; QT_G_FUNC( hbqt_gcRelease_QAbstractListModel ) @@ -100,6 +101,7 @@ void * hbqt_gcAllocate_QAbstractListModel( void * pObj, bool bNew ) new( & p->ph ) QPointer< QAbstractListModel >( ( QAbstractListModel * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QAbstractListModel; + p->type = QT_TYPE_QAbstractListModel; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QAbstractTableModel.cpp b/harbour/contrib/hbqt/qtcore/QAbstractTableModel.cpp index 38c2cc53f7..701c5c9099 100644 --- a/harbour/contrib/hbqt/qtcore/QAbstractTableModel.cpp +++ b/harbour/contrib/hbqt/qtcore/QAbstractTableModel.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QAbstractTableModel > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QAbstractTableModel; QT_G_FUNC( hbqt_gcRelease_QAbstractTableModel ) @@ -100,6 +101,7 @@ void * hbqt_gcAllocate_QAbstractTableModel( void * pObj, bool bNew ) new( & p->ph ) QPointer< QAbstractTableModel >( ( QAbstractTableModel * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QAbstractTableModel; + p->type = QT_TYPE_QAbstractTableModel; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QBitArray.cpp b/harbour/contrib/hbqt/qtcore/QBitArray.cpp index fb87f41d24..970cd0ef3d 100644 --- a/harbour/contrib/hbqt/qtcore/QBitArray.cpp +++ b/harbour/contrib/hbqt/qtcore/QBitArray.cpp @@ -80,6 +80,7 @@ typedef struct QBitArray * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QBitArray; QT_G_FUNC( hbqt_gcRelease_QBitArray ) @@ -115,6 +116,7 @@ void * hbqt_gcAllocate_QBitArray( void * pObj, bool bNew ) p->ph = ( QBitArray * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QBitArray; + p->type = QT_TYPE_QBitArray; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QBuffer.cpp b/harbour/contrib/hbqt/qtcore/QBuffer.cpp index 6192f0df30..37b8827649 100644 --- a/harbour/contrib/hbqt/qtcore/QBuffer.cpp +++ b/harbour/contrib/hbqt/qtcore/QBuffer.cpp @@ -81,6 +81,7 @@ typedef struct QPointer< QBuffer > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QBuffer; QT_G_FUNC( hbqt_gcRelease_QBuffer ) @@ -127,6 +128,7 @@ void * hbqt_gcAllocate_QBuffer( void * pObj, bool bNew ) new( & p->ph ) QPointer< QBuffer >( ( QBuffer * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QBuffer; + p->type = QT_TYPE_QBuffer; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QByteArray.cpp b/harbour/contrib/hbqt/qtcore/QByteArray.cpp index 4d7bb68622..e35d0a7e74 100644 --- a/harbour/contrib/hbqt/qtcore/QByteArray.cpp +++ b/harbour/contrib/hbqt/qtcore/QByteArray.cpp @@ -83,6 +83,7 @@ typedef struct QByteArray * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QByteArray; QT_G_FUNC( hbqt_gcRelease_QByteArray ) @@ -118,6 +119,7 @@ void * hbqt_gcAllocate_QByteArray( void * pObj, bool bNew ) p->ph = ( QByteArray * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QByteArray; + p->type = QT_TYPE_QByteArray; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QChar.cpp b/harbour/contrib/hbqt/qtcore/QChar.cpp index e7ffacd93b..b8a50ce27b 100644 --- a/harbour/contrib/hbqt/qtcore/QChar.cpp +++ b/harbour/contrib/hbqt/qtcore/QChar.cpp @@ -107,6 +107,7 @@ typedef struct QChar * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QChar; QT_G_FUNC( hbqt_gcRelease_QChar ) @@ -127,6 +128,7 @@ void * hbqt_gcAllocate_QChar( void * pObj, bool bNew ) p->ph = ( QChar * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QChar; + p->type = QT_TYPE_QChar; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QCoreApplication.cpp b/harbour/contrib/hbqt/qtcore/QCoreApplication.cpp index b612aea173..003dc48f54 100644 --- a/harbour/contrib/hbqt/qtcore/QCoreApplication.cpp +++ b/harbour/contrib/hbqt/qtcore/QCoreApplication.cpp @@ -85,6 +85,7 @@ typedef struct QPointer< QCoreApplication > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QCoreApplication; QT_G_FUNC( hbqt_gcRelease_QCoreApplication ) @@ -105,6 +106,7 @@ void * hbqt_gcAllocate_QCoreApplication( void * pObj, bool bNew ) new( & p->ph ) QPointer< QCoreApplication >( ( QCoreApplication * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QCoreApplication; + p->type = QT_TYPE_QCoreApplication; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QDataStream.cpp b/harbour/contrib/hbqt/qtcore/QDataStream.cpp index 0e9419d5de..f78e0a43bb 100644 --- a/harbour/contrib/hbqt/qtcore/QDataStream.cpp +++ b/harbour/contrib/hbqt/qtcore/QDataStream.cpp @@ -88,6 +88,7 @@ typedef struct QDataStream * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QDataStream; QT_G_FUNC( hbqt_gcRelease_QDataStream ) @@ -123,6 +124,7 @@ void * hbqt_gcAllocate_QDataStream( void * pObj, bool bNew ) p->ph = ( QDataStream * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QDataStream; + p->type = QT_TYPE_QDataStream; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QDate.cpp b/harbour/contrib/hbqt/qtcore/QDate.cpp index f58f88acfa..85cabb7983 100644 --- a/harbour/contrib/hbqt/qtcore/QDate.cpp +++ b/harbour/contrib/hbqt/qtcore/QDate.cpp @@ -83,6 +83,7 @@ typedef struct QDate * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QDate; QT_G_FUNC( hbqt_gcRelease_QDate ) @@ -118,6 +119,7 @@ void * hbqt_gcAllocate_QDate( void * pObj, bool bNew ) p->ph = ( QDate * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QDate; + p->type = QT_TYPE_QDate; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QDateTime.cpp b/harbour/contrib/hbqt/qtcore/QDateTime.cpp index 51e3fc3673..422490e418 100644 --- a/harbour/contrib/hbqt/qtcore/QDateTime.cpp +++ b/harbour/contrib/hbqt/qtcore/QDateTime.cpp @@ -83,6 +83,7 @@ typedef struct QDateTime * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QDateTime; QT_G_FUNC( hbqt_gcRelease_QDateTime ) @@ -118,6 +119,7 @@ void * hbqt_gcAllocate_QDateTime( void * pObj, bool bNew ) p->ph = ( QDateTime * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QDateTime; + p->type = QT_TYPE_QDateTime; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QDir.cpp b/harbour/contrib/hbqt/qtcore/QDir.cpp index 39f3f97ffe..312d649683 100644 --- a/harbour/contrib/hbqt/qtcore/QDir.cpp +++ b/harbour/contrib/hbqt/qtcore/QDir.cpp @@ -89,6 +89,7 @@ typedef struct QDir * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QDir; QT_G_FUNC( hbqt_gcRelease_QDir ) @@ -124,6 +125,7 @@ void * hbqt_gcAllocate_QDir( void * pObj, bool bNew ) p->ph = ( QDir * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QDir; + p->type = QT_TYPE_QDir; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QEvent.cpp b/harbour/contrib/hbqt/qtcore/QEvent.cpp index 2954d85c63..791cdbdd43 100644 --- a/harbour/contrib/hbqt/qtcore/QEvent.cpp +++ b/harbour/contrib/hbqt/qtcore/QEvent.cpp @@ -84,6 +84,7 @@ typedef struct QEvent * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QEvent; QT_G_FUNC( hbqt_gcRelease_QEvent ) @@ -119,6 +120,7 @@ void * hbqt_gcAllocate_QEvent( void * pObj, bool bNew ) p->ph = ( QEvent * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QEvent; + p->type = QT_TYPE_QEvent; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QEventLoop.cpp b/harbour/contrib/hbqt/qtcore/QEventLoop.cpp index a216b2d9fe..bb767b9d0c 100644 --- a/harbour/contrib/hbqt/qtcore/QEventLoop.cpp +++ b/harbour/contrib/hbqt/qtcore/QEventLoop.cpp @@ -85,6 +85,7 @@ typedef struct QPointer< QEventLoop > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QEventLoop; QT_G_FUNC( hbqt_gcRelease_QEventLoop ) @@ -131,6 +132,7 @@ void * hbqt_gcAllocate_QEventLoop( void * pObj, bool bNew ) new( & p->ph ) QPointer< QEventLoop >( ( QEventLoop * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QEventLoop; + p->type = QT_TYPE_QEventLoop; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QFile.cpp b/harbour/contrib/hbqt/qtcore/QFile.cpp index db9bda30cc..654d00cb43 100644 --- a/harbour/contrib/hbqt/qtcore/QFile.cpp +++ b/harbour/contrib/hbqt/qtcore/QFile.cpp @@ -90,6 +90,7 @@ typedef struct QPointer< QFile > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QFile; QT_G_FUNC( hbqt_gcRelease_QFile ) @@ -136,6 +137,7 @@ void * hbqt_gcAllocate_QFile( void * pObj, bool bNew ) new( & p->ph ) QPointer< QFile >( ( QFile * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QFile; + p->type = QT_TYPE_QFile; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QFileInfo.cpp b/harbour/contrib/hbqt/qtcore/QFileInfo.cpp index 32aee3a957..785f013b47 100644 --- a/harbour/contrib/hbqt/qtcore/QFileInfo.cpp +++ b/harbour/contrib/hbqt/qtcore/QFileInfo.cpp @@ -89,6 +89,7 @@ typedef struct QFileInfo * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QFileInfo; QT_G_FUNC( hbqt_gcRelease_QFileInfo ) @@ -124,6 +125,7 @@ void * hbqt_gcAllocate_QFileInfo( void * pObj, bool bNew ) p->ph = ( QFileInfo * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QFileInfo; + p->type = QT_TYPE_QFileInfo; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QIODevice.cpp b/harbour/contrib/hbqt/qtcore/QIODevice.cpp index 270a662795..cd799ec989 100644 --- a/harbour/contrib/hbqt/qtcore/QIODevice.cpp +++ b/harbour/contrib/hbqt/qtcore/QIODevice.cpp @@ -86,6 +86,7 @@ typedef struct QPointer< QIODevice > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QIODevice; QT_G_FUNC( hbqt_gcRelease_QIODevice ) @@ -106,6 +107,7 @@ void * hbqt_gcAllocate_QIODevice( void * pObj, bool bNew ) new( & p->ph ) QPointer< QIODevice >( ( QIODevice * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QIODevice; + p->type = QT_TYPE_QIODevice; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QLatin1Char.cpp b/harbour/contrib/hbqt/qtcore/QLatin1Char.cpp index 2e5d8fcab5..54200b32a4 100644 --- a/harbour/contrib/hbqt/qtcore/QLatin1Char.cpp +++ b/harbour/contrib/hbqt/qtcore/QLatin1Char.cpp @@ -79,6 +79,7 @@ typedef struct QLatin1Char * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QLatin1Char; QT_G_FUNC( hbqt_gcRelease_QLatin1Char ) @@ -114,6 +115,7 @@ void * hbqt_gcAllocate_QLatin1Char( void * pObj, bool bNew ) p->ph = ( QLatin1Char * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QLatin1Char; + p->type = QT_TYPE_QLatin1Char; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QLatin1String.cpp b/harbour/contrib/hbqt/qtcore/QLatin1String.cpp index fed2eec8e3..6281cba13c 100644 --- a/harbour/contrib/hbqt/qtcore/QLatin1String.cpp +++ b/harbour/contrib/hbqt/qtcore/QLatin1String.cpp @@ -79,6 +79,7 @@ typedef struct QLatin1String * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QLatin1String; QT_G_FUNC( hbqt_gcRelease_QLatin1String ) @@ -114,6 +115,7 @@ void * hbqt_gcAllocate_QLatin1String( void * pObj, bool bNew ) p->ph = ( QLatin1String * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QLatin1String; + p->type = QT_TYPE_QLatin1String; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QLine.cpp b/harbour/contrib/hbqt/qtcore/QLine.cpp index f91b32bd2c..e036881dec 100644 --- a/harbour/contrib/hbqt/qtcore/QLine.cpp +++ b/harbour/contrib/hbqt/qtcore/QLine.cpp @@ -81,6 +81,7 @@ typedef struct QLine * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QLine; QT_G_FUNC( hbqt_gcRelease_QLine ) @@ -116,6 +117,7 @@ void * hbqt_gcAllocate_QLine( void * pObj, bool bNew ) p->ph = ( QLine * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QLine; + p->type = QT_TYPE_QLine; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QLineF.cpp b/harbour/contrib/hbqt/qtcore/QLineF.cpp index ec48402826..12dba89389 100644 --- a/harbour/contrib/hbqt/qtcore/QLineF.cpp +++ b/harbour/contrib/hbqt/qtcore/QLineF.cpp @@ -85,6 +85,7 @@ typedef struct QLineF * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QLineF; QT_G_FUNC( hbqt_gcRelease_QLineF ) @@ -120,6 +121,7 @@ void * hbqt_gcAllocate_QLineF( void * pObj, bool bNew ) p->ph = ( QLineF * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QLineF; + p->type = QT_TYPE_QLineF; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QList.cpp b/harbour/contrib/hbqt/qtcore/QList.cpp index 141d69947b..63e612b339 100644 --- a/harbour/contrib/hbqt/qtcore/QList.cpp +++ b/harbour/contrib/hbqt/qtcore/QList.cpp @@ -107,6 +107,7 @@ typedef struct QList< void * > * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QList; QT_G_FUNC( hbqt_gcRelease_QList ) @@ -142,6 +143,7 @@ void * hbqt_gcAllocate_QList( void * pObj, bool bNew ) p->ph = ( QList< void * > * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QList; + p->type = QT_TYPE_QList; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QLocale.cpp b/harbour/contrib/hbqt/qtcore/QLocale.cpp index dbd7013317..087338ae00 100644 --- a/harbour/contrib/hbqt/qtcore/QLocale.cpp +++ b/harbour/contrib/hbqt/qtcore/QLocale.cpp @@ -90,6 +90,7 @@ typedef struct QLocale * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QLocale; QT_G_FUNC( hbqt_gcRelease_QLocale ) @@ -125,6 +126,7 @@ void * hbqt_gcAllocate_QLocale( void * pObj, bool bNew ) p->ph = ( QLocale * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QLocale; + p->type = QT_TYPE_QLocale; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QMimeData.cpp b/harbour/contrib/hbqt/qtcore/QMimeData.cpp index ac6736bb53..dc4e972e1b 100644 --- a/harbour/contrib/hbqt/qtcore/QMimeData.cpp +++ b/harbour/contrib/hbqt/qtcore/QMimeData.cpp @@ -90,6 +90,7 @@ typedef struct QPointer< QMimeData > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QMimeData; QT_G_FUNC( hbqt_gcRelease_QMimeData ) @@ -136,6 +137,7 @@ void * hbqt_gcAllocate_QMimeData( void * pObj, bool bNew ) new( & p->ph ) QPointer< QMimeData >( ( QMimeData * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QMimeData; + p->type = QT_TYPE_QMimeData; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QModelIndex.cpp b/harbour/contrib/hbqt/qtcore/QModelIndex.cpp index b2536b7f33..a942986a1f 100644 --- a/harbour/contrib/hbqt/qtcore/QModelIndex.cpp +++ b/harbour/contrib/hbqt/qtcore/QModelIndex.cpp @@ -81,6 +81,7 @@ typedef struct QModelIndex * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QModelIndex; QT_G_FUNC( hbqt_gcRelease_QModelIndex ) @@ -116,6 +117,7 @@ void * hbqt_gcAllocate_QModelIndex( void * pObj, bool bNew ) p->ph = ( QModelIndex * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QModelIndex; + p->type = QT_TYPE_QModelIndex; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QObject.cpp b/harbour/contrib/hbqt/qtcore/QObject.cpp index bb5a287f4f..8be068a752 100644 --- a/harbour/contrib/hbqt/qtcore/QObject.cpp +++ b/harbour/contrib/hbqt/qtcore/QObject.cpp @@ -97,6 +97,7 @@ typedef struct QPointer< QObject > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QObject; QT_G_FUNC( hbqt_gcRelease_QObject ) @@ -143,6 +144,7 @@ void * hbqt_gcAllocate_QObject( void * pObj, bool bNew ) new( & p->ph ) QPointer< QObject >( ( QObject * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QObject; + p->type = QT_TYPE_QObject; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QPoint.cpp b/harbour/contrib/hbqt/qtcore/QPoint.cpp index 5c82522d15..42f1ac77a5 100644 --- a/harbour/contrib/hbqt/qtcore/QPoint.cpp +++ b/harbour/contrib/hbqt/qtcore/QPoint.cpp @@ -81,6 +81,7 @@ typedef struct QPoint * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QPoint; QT_G_FUNC( hbqt_gcRelease_QPoint ) @@ -116,6 +117,7 @@ void * hbqt_gcAllocate_QPoint( void * pObj, bool bNew ) p->ph = ( QPoint * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QPoint; + p->type = QT_TYPE_QPoint; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QPointF.cpp b/harbour/contrib/hbqt/qtcore/QPointF.cpp index d2c3f2008a..c1dbf9769a 100644 --- a/harbour/contrib/hbqt/qtcore/QPointF.cpp +++ b/harbour/contrib/hbqt/qtcore/QPointF.cpp @@ -81,6 +81,7 @@ typedef struct QPointF * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QPointF; QT_G_FUNC( hbqt_gcRelease_QPointF ) @@ -116,6 +117,7 @@ void * hbqt_gcAllocate_QPointF( void * pObj, bool bNew ) p->ph = ( QPointF * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QPointF; + p->type = QT_TYPE_QPointF; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QProcess.cpp b/harbour/contrib/hbqt/qtcore/QProcess.cpp index 404560cdb4..a40bd5686b 100644 --- a/harbour/contrib/hbqt/qtcore/QProcess.cpp +++ b/harbour/contrib/hbqt/qtcore/QProcess.cpp @@ -91,6 +91,7 @@ typedef struct QPointer< QProcess > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QProcess; QT_G_FUNC( hbqt_gcRelease_QProcess ) @@ -137,6 +138,7 @@ void * hbqt_gcAllocate_QProcess( void * pObj, bool bNew ) new( & p->ph ) QPointer< QProcess >( ( QProcess * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QProcess; + p->type = QT_TYPE_QProcess; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QRect.cpp b/harbour/contrib/hbqt/qtcore/QRect.cpp index c709446982..d48c93a9ea 100644 --- a/harbour/contrib/hbqt/qtcore/QRect.cpp +++ b/harbour/contrib/hbqt/qtcore/QRect.cpp @@ -83,6 +83,7 @@ typedef struct QRect * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QRect; QT_G_FUNC( hbqt_gcRelease_QRect ) @@ -118,6 +119,7 @@ void * hbqt_gcAllocate_QRect( void * pObj, bool bNew ) p->ph = ( QRect * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QRect; + p->type = QT_TYPE_QRect; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QRectF.cpp b/harbour/contrib/hbqt/qtcore/QRectF.cpp index b5cf8164f7..4534cd8ce1 100644 --- a/harbour/contrib/hbqt/qtcore/QRectF.cpp +++ b/harbour/contrib/hbqt/qtcore/QRectF.cpp @@ -84,6 +84,7 @@ typedef struct QRectF * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QRectF; QT_G_FUNC( hbqt_gcRelease_QRectF ) @@ -119,6 +120,7 @@ void * hbqt_gcAllocate_QRectF( void * pObj, bool bNew ) p->ph = ( QRectF * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QRectF; + p->type = QT_TYPE_QRectF; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QRegExp.cpp b/harbour/contrib/hbqt/qtcore/QRegExp.cpp index 444770f53b..8cba25459b 100644 --- a/harbour/contrib/hbqt/qtcore/QRegExp.cpp +++ b/harbour/contrib/hbqt/qtcore/QRegExp.cpp @@ -86,6 +86,7 @@ typedef struct QRegExp * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QRegExp; QT_G_FUNC( hbqt_gcRelease_QRegExp ) @@ -121,6 +122,7 @@ void * hbqt_gcAllocate_QRegExp( void * pObj, bool bNew ) p->ph = ( QRegExp * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QRegExp; + p->type = QT_TYPE_QRegExp; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QResource.cpp b/harbour/contrib/hbqt/qtcore/QResource.cpp index c9f920daee..18bce9d2cd 100644 --- a/harbour/contrib/hbqt/qtcore/QResource.cpp +++ b/harbour/contrib/hbqt/qtcore/QResource.cpp @@ -80,6 +80,7 @@ typedef struct QResource * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QResource; QT_G_FUNC( hbqt_gcRelease_QResource ) @@ -115,6 +116,7 @@ void * hbqt_gcAllocate_QResource( void * pObj, bool bNew ) p->ph = ( QResource * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QResource; + p->type = QT_TYPE_QResource; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QSettings.cpp b/harbour/contrib/hbqt/qtcore/QSettings.cpp index 63fbe8de42..3a5aa26c61 100644 --- a/harbour/contrib/hbqt/qtcore/QSettings.cpp +++ b/harbour/contrib/hbqt/qtcore/QSettings.cpp @@ -90,6 +90,7 @@ typedef struct QPointer< QSettings > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QSettings; QT_G_FUNC( hbqt_gcRelease_QSettings ) @@ -136,6 +137,7 @@ void * hbqt_gcAllocate_QSettings( void * pObj, bool bNew ) new( & p->ph ) QPointer< QSettings >( ( QSettings * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QSettings; + p->type = QT_TYPE_QSettings; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QSignalMapper.cpp b/harbour/contrib/hbqt/qtcore/QSignalMapper.cpp index bbd111821a..ec747220b8 100644 --- a/harbour/contrib/hbqt/qtcore/QSignalMapper.cpp +++ b/harbour/contrib/hbqt/qtcore/QSignalMapper.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QSignalMapper > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QSignalMapper; QT_G_FUNC( hbqt_gcRelease_QSignalMapper ) @@ -126,6 +127,7 @@ void * hbqt_gcAllocate_QSignalMapper( void * pObj, bool bNew ) new( & p->ph ) QPointer< QSignalMapper >( ( QSignalMapper * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QSignalMapper; + p->type = QT_TYPE_QSignalMapper; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QSize.cpp b/harbour/contrib/hbqt/qtcore/QSize.cpp index cf26e8f912..366546ebc4 100644 --- a/harbour/contrib/hbqt/qtcore/QSize.cpp +++ b/harbour/contrib/hbqt/qtcore/QSize.cpp @@ -81,6 +81,7 @@ typedef struct QSize * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QSize; QT_G_FUNC( hbqt_gcRelease_QSize ) @@ -116,6 +117,7 @@ void * hbqt_gcAllocate_QSize( void * pObj, bool bNew ) p->ph = ( QSize * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QSize; + p->type = QT_TYPE_QSize; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QSizeF.cpp b/harbour/contrib/hbqt/qtcore/QSizeF.cpp index bab77fab0d..6e0787cfbb 100644 --- a/harbour/contrib/hbqt/qtcore/QSizeF.cpp +++ b/harbour/contrib/hbqt/qtcore/QSizeF.cpp @@ -82,6 +82,7 @@ typedef struct QSizeF * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QSizeF; QT_G_FUNC( hbqt_gcRelease_QSizeF ) @@ -117,6 +118,7 @@ void * hbqt_gcAllocate_QSizeF( void * pObj, bool bNew ) p->ph = ( QSizeF * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QSizeF; + p->type = QT_TYPE_QSizeF; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QStringList.cpp b/harbour/contrib/hbqt/qtcore/QStringList.cpp index 501eab4b9a..ddb3443caf 100644 --- a/harbour/contrib/hbqt/qtcore/QStringList.cpp +++ b/harbour/contrib/hbqt/qtcore/QStringList.cpp @@ -99,6 +99,7 @@ typedef struct QStringList * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStringList; QT_G_FUNC( hbqt_gcRelease_QStringList ) @@ -134,6 +135,7 @@ void * hbqt_gcAllocate_QStringList( void * pObj, bool bNew ) p->ph = ( QStringList * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStringList; + p->type = QT_TYPE_QStringList; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QTextBoundaryFinder.cpp b/harbour/contrib/hbqt/qtcore/QTextBoundaryFinder.cpp index 95603cce14..3113a051cb 100644 --- a/harbour/contrib/hbqt/qtcore/QTextBoundaryFinder.cpp +++ b/harbour/contrib/hbqt/qtcore/QTextBoundaryFinder.cpp @@ -89,6 +89,7 @@ typedef struct QTextBoundaryFinder * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextBoundaryFinder; QT_G_FUNC( hbqt_gcRelease_QTextBoundaryFinder ) @@ -124,6 +125,7 @@ void * hbqt_gcAllocate_QTextBoundaryFinder( void * pObj, bool bNew ) p->ph = ( QTextBoundaryFinder * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTextBoundaryFinder; + p->type = QT_TYPE_QTextBoundaryFinder; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QTextCodec.cpp b/harbour/contrib/hbqt/qtcore/QTextCodec.cpp index f387c720e5..17b292ccb9 100644 --- a/harbour/contrib/hbqt/qtcore/QTextCodec.cpp +++ b/harbour/contrib/hbqt/qtcore/QTextCodec.cpp @@ -85,6 +85,7 @@ typedef struct QTextCodec * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextCodec; QT_G_FUNC( hbqt_gcRelease_QTextCodec ) @@ -105,6 +106,7 @@ void * hbqt_gcAllocate_QTextCodec( void * pObj, bool bNew ) p->ph = ( QTextCodec * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTextCodec; + p->type = QT_TYPE_QTextCodec; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QTextDecoder.cpp b/harbour/contrib/hbqt/qtcore/QTextDecoder.cpp index a229f6ef57..dc6f5965ef 100644 --- a/harbour/contrib/hbqt/qtcore/QTextDecoder.cpp +++ b/harbour/contrib/hbqt/qtcore/QTextDecoder.cpp @@ -80,6 +80,7 @@ typedef struct QTextDecoder * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextDecoder; QT_G_FUNC( hbqt_gcRelease_QTextDecoder ) @@ -115,6 +116,7 @@ void * hbqt_gcAllocate_QTextDecoder( void * pObj, bool bNew ) p->ph = ( QTextDecoder * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTextDecoder; + p->type = QT_TYPE_QTextDecoder; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QTextEncoder.cpp b/harbour/contrib/hbqt/qtcore/QTextEncoder.cpp index 6e65e12a42..395ce7022f 100644 --- a/harbour/contrib/hbqt/qtcore/QTextEncoder.cpp +++ b/harbour/contrib/hbqt/qtcore/QTextEncoder.cpp @@ -80,6 +80,7 @@ typedef struct QTextEncoder * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextEncoder; QT_G_FUNC( hbqt_gcRelease_QTextEncoder ) @@ -115,6 +116,7 @@ void * hbqt_gcAllocate_QTextEncoder( void * pObj, bool bNew ) p->ph = ( QTextEncoder * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTextEncoder; + p->type = QT_TYPE_QTextEncoder; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QTextStream.cpp b/harbour/contrib/hbqt/qtcore/QTextStream.cpp index 9a439e1645..d6b1bd724d 100644 --- a/harbour/contrib/hbqt/qtcore/QTextStream.cpp +++ b/harbour/contrib/hbqt/qtcore/QTextStream.cpp @@ -93,6 +93,7 @@ typedef struct QTextStream * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextStream; QT_G_FUNC( hbqt_gcRelease_QTextStream ) @@ -128,6 +129,7 @@ void * hbqt_gcAllocate_QTextStream( void * pObj, bool bNew ) p->ph = ( QTextStream * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTextStream; + p->type = QT_TYPE_QTextStream; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QThread.cpp b/harbour/contrib/hbqt/qtcore/QThread.cpp index eee205cf46..04052e4037 100644 --- a/harbour/contrib/hbqt/qtcore/QThread.cpp +++ b/harbour/contrib/hbqt/qtcore/QThread.cpp @@ -83,6 +83,7 @@ typedef struct QPointer< QThread > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QThread; QT_G_FUNC( hbqt_gcRelease_QThread ) @@ -129,6 +130,7 @@ void * hbqt_gcAllocate_QThread( void * pObj, bool bNew ) new( & p->ph ) QPointer< QThread >( ( QThread * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QThread; + p->type = QT_TYPE_QThread; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QTime.cpp b/harbour/contrib/hbqt/qtcore/QTime.cpp index 40eaffcd0a..5a936c809c 100644 --- a/harbour/contrib/hbqt/qtcore/QTime.cpp +++ b/harbour/contrib/hbqt/qtcore/QTime.cpp @@ -79,6 +79,7 @@ typedef struct QTime * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTime; QT_G_FUNC( hbqt_gcRelease_QTime ) @@ -114,6 +115,7 @@ void * hbqt_gcAllocate_QTime( void * pObj, bool bNew ) p->ph = ( QTime * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTime; + p->type = QT_TYPE_QTime; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QTimer.cpp b/harbour/contrib/hbqt/qtcore/QTimer.cpp index 2cc51e69a9..f0cb886174 100644 --- a/harbour/contrib/hbqt/qtcore/QTimer.cpp +++ b/harbour/contrib/hbqt/qtcore/QTimer.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QTimer > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTimer; QT_G_FUNC( hbqt_gcRelease_QTimer ) @@ -126,6 +127,7 @@ void * hbqt_gcAllocate_QTimer( void * pObj, bool bNew ) new( & p->ph ) QPointer< QTimer >( ( QTimer * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QTimer; + p->type = QT_TYPE_QTimer; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QTranslator.cpp b/harbour/contrib/hbqt/qtcore/QTranslator.cpp index 2fab63fed8..7f7d270c08 100644 --- a/harbour/contrib/hbqt/qtcore/QTranslator.cpp +++ b/harbour/contrib/hbqt/qtcore/QTranslator.cpp @@ -79,6 +79,7 @@ typedef struct QPointer< QTranslator > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTranslator; QT_G_FUNC( hbqt_gcRelease_QTranslator ) @@ -125,6 +126,7 @@ void * hbqt_gcAllocate_QTranslator( void * pObj, bool bNew ) new( & p->ph ) QPointer< QTranslator >( ( QTranslator * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QTranslator; + p->type = QT_TYPE_QTranslator; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QUiLoader.cpp b/harbour/contrib/hbqt/qtcore/QUiLoader.cpp index 29d4a89557..0c207f3098 100644 --- a/harbour/contrib/hbqt/qtcore/QUiLoader.cpp +++ b/harbour/contrib/hbqt/qtcore/QUiLoader.cpp @@ -81,6 +81,7 @@ typedef struct QPointer< QUiLoader > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QUiLoader; QT_G_FUNC( hbqt_gcRelease_QUiLoader ) @@ -127,6 +128,7 @@ void * hbqt_gcAllocate_QUiLoader( void * pObj, bool bNew ) new( & p->ph ) QPointer< QUiLoader >( ( QUiLoader * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QUiLoader; + p->type = QT_TYPE_QUiLoader; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QUrl.cpp b/harbour/contrib/hbqt/qtcore/QUrl.cpp index 26ae2a3966..630ed35f7a 100644 --- a/harbour/contrib/hbqt/qtcore/QUrl.cpp +++ b/harbour/contrib/hbqt/qtcore/QUrl.cpp @@ -113,6 +113,7 @@ typedef struct QUrl * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QUrl; QT_G_FUNC( hbqt_gcRelease_QUrl ) @@ -148,6 +149,7 @@ void * hbqt_gcAllocate_QUrl( void * pObj, bool bNew ) p->ph = ( QUrl * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QUrl; + p->type = QT_TYPE_QUrl; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/QVariant.cpp b/harbour/contrib/hbqt/qtcore/QVariant.cpp index b1e8f97069..770ba6ab17 100644 --- a/harbour/contrib/hbqt/qtcore/QVariant.cpp +++ b/harbour/contrib/hbqt/qtcore/QVariant.cpp @@ -141,6 +141,7 @@ typedef struct QVariant * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QVariant; QT_G_FUNC( hbqt_gcRelease_QVariant ) @@ -176,6 +177,7 @@ void * hbqt_gcAllocate_QVariant( void * pObj, bool bNew ) p->ph = ( QVariant * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QVariant; + p->type = QT_TYPE_QVariant; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtcore/filelist.hbm b/harbour/contrib/hbqt/qtcore/filelist.hbm index 5e760dd806..0ddfd5fb89 100644 --- a/harbour/contrib/hbqt/qtcore/filelist.hbm +++ b/harbour/contrib/hbqt/qtcore/filelist.hbm @@ -8,6 +8,7 @@ # or the generator tool itself, and run regenarate. # -------------------------------------------------------------------- +HBQAbstractItemModel.cpp HBDbfModel.cpp HBEvents.cpp HBSlots.cpp @@ -62,6 +63,7 @@ QUiLoader.cpp QUrl.cpp QVariant.cpp +THBQAbstractItemModel.prg THBDbfModel.prg THBEvents.prg THBSlots.prg diff --git a/harbour/contrib/hbqt/qtcore/filelist.mk b/harbour/contrib/hbqt/qtcore/filelist.mk index c77dba6824..12abfe00f4 100644 --- a/harbour/contrib/hbqt/qtcore/filelist.mk +++ b/harbour/contrib/hbqt/qtcore/filelist.mk @@ -9,6 +9,7 @@ # -------------------------------------------------------------------- CPP_SOURCES := \ + HBQAbstractItemModel.cpp \ HBDbfModel.cpp \ HBEvents.cpp \ HBSlots.cpp \ @@ -66,6 +67,7 @@ CPP_SOURCES := \ PRG_SOURCES := \ + THBQAbstractItemModel.prg \ THBDbfModel.prg \ THBEvents.prg \ THBSlots.prg \ diff --git a/harbour/contrib/hbqt/qtgui/HBQMainWindow.cpp b/harbour/contrib/hbqt/qtgui/HBQMainWindow.cpp index cb125d019e..7067b36853 100644 --- a/harbour/contrib/hbqt/qtgui/HBQMainWindow.cpp +++ b/harbour/contrib/hbqt/qtgui/HBQMainWindow.cpp @@ -81,6 +81,7 @@ typedef struct QPointer< HBQMainWindow > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_HBQMainWindow; QT_G_FUNC( hbqt_gcRelease_HBQMainWindow ) @@ -127,6 +128,7 @@ void * hbqt_gcAllocate_HBQMainWindow( void * pObj, bool bNew ) new( & p->ph ) QPointer< HBQMainWindow >( ( HBQMainWindow * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_HBQMainWindow; + p->type = QT_TYPE_HBQMainWindow; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/HBQPlainTextEdit.cpp b/harbour/contrib/hbqt/qtgui/HBQPlainTextEdit.cpp index 618f248dab..267559de96 100644 --- a/harbour/contrib/hbqt/qtgui/HBQPlainTextEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/HBQPlainTextEdit.cpp @@ -82,6 +82,7 @@ typedef struct QPointer< HBQPlainTextEdit > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_HBQPlainTextEdit; QT_G_FUNC( hbqt_gcRelease_HBQPlainTextEdit ) @@ -128,6 +129,7 @@ void * hbqt_gcAllocate_HBQPlainTextEdit( void * pObj, bool bNew ) new( & p->ph ) QPointer< HBQPlainTextEdit >( ( HBQPlainTextEdit * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_HBQPlainTextEdit; + p->type = QT_TYPE_HBQPlainTextEdit; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/HBQSyntaxHighlighter.cpp b/harbour/contrib/hbqt/qtgui/HBQSyntaxHighlighter.cpp index 697079d03a..0d697add56 100644 --- a/harbour/contrib/hbqt/qtgui/HBQSyntaxHighlighter.cpp +++ b/harbour/contrib/hbqt/qtgui/HBQSyntaxHighlighter.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< HBQSyntaxHighlighter > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_HBQSyntaxHighlighter; QT_G_FUNC( hbqt_gcRelease_HBQSyntaxHighlighter ) @@ -126,6 +127,7 @@ void * hbqt_gcAllocate_HBQSyntaxHighlighter( void * pObj, bool bNew ) new( & p->ph ) QPointer< HBQSyntaxHighlighter >( ( HBQSyntaxHighlighter * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_HBQSyntaxHighlighter; + p->type = QT_TYPE_HBQSyntaxHighlighter; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/HBQTableView.cpp b/harbour/contrib/hbqt/qtgui/HBQTableView.cpp index 96c83edbf9..4d7c3bf18f 100644 --- a/harbour/contrib/hbqt/qtgui/HBQTableView.cpp +++ b/harbour/contrib/hbqt/qtgui/HBQTableView.cpp @@ -81,6 +81,7 @@ typedef struct QPointer< HBQTableView > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_HBQTableView; QT_G_FUNC( hbqt_gcRelease_HBQTableView ) @@ -127,6 +128,7 @@ void * hbqt_gcAllocate_HBQTableView( void * pObj, bool bNew ) new( & p->ph ) QPointer< HBQTableView >( ( HBQTableView * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_HBQTableView; + p->type = QT_TYPE_HBQTableView; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/HBQTextBlockUserData.cpp b/harbour/contrib/hbqt/qtgui/HBQTextBlockUserData.cpp index d5ef0da571..7bb850ea65 100644 --- a/harbour/contrib/hbqt/qtgui/HBQTextBlockUserData.cpp +++ b/harbour/contrib/hbqt/qtgui/HBQTextBlockUserData.cpp @@ -80,6 +80,7 @@ typedef struct HBQTextBlockUserData * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_HBQTextBlockUserData; QT_G_FUNC( hbqt_gcRelease_HBQTextBlockUserData ) @@ -115,6 +116,7 @@ void * hbqt_gcAllocate_HBQTextBlockUserData( void * pObj, bool bNew ) p->ph = ( HBQTextBlockUserData * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_HBQTextBlockUserData; + p->type = QT_TYPE_HBQTextBlockUserData; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QAbstractButton.cpp b/harbour/contrib/hbqt/qtgui/QAbstractButton.cpp index 0582666316..052fc1edbd 100644 --- a/harbour/contrib/hbqt/qtgui/QAbstractButton.cpp +++ b/harbour/contrib/hbqt/qtgui/QAbstractButton.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QAbstractButton > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QAbstractButton; QT_G_FUNC( hbqt_gcRelease_QAbstractButton ) @@ -100,6 +101,7 @@ void * hbqt_gcAllocate_QAbstractButton( void * pObj, bool bNew ) new( & p->ph ) QPointer< QAbstractButton >( ( QAbstractButton * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QAbstractButton; + p->type = QT_TYPE_QAbstractButton; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QAbstractItemDelegate.cpp b/harbour/contrib/hbqt/qtgui/QAbstractItemDelegate.cpp index c93d08e11d..c96598b4a4 100644 --- a/harbour/contrib/hbqt/qtgui/QAbstractItemDelegate.cpp +++ b/harbour/contrib/hbqt/qtgui/QAbstractItemDelegate.cpp @@ -83,6 +83,7 @@ typedef struct QPointer< QAbstractItemDelegate > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QAbstractItemDelegate; QT_G_FUNC( hbqt_gcRelease_QAbstractItemDelegate ) @@ -103,6 +104,7 @@ void * hbqt_gcAllocate_QAbstractItemDelegate( void * pObj, bool bNew ) new( & p->ph ) QPointer< QAbstractItemDelegate >( ( QAbstractItemDelegate * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QAbstractItemDelegate; + p->type = QT_TYPE_QAbstractItemDelegate; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QAbstractItemView.cpp b/harbour/contrib/hbqt/qtgui/QAbstractItemView.cpp index 37f269ccbb..6175404d3d 100644 --- a/harbour/contrib/hbqt/qtgui/QAbstractItemView.cpp +++ b/harbour/contrib/hbqt/qtgui/QAbstractItemView.cpp @@ -90,6 +90,7 @@ typedef struct QPointer< QAbstractItemView > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QAbstractItemView; QT_G_FUNC( hbqt_gcRelease_QAbstractItemView ) @@ -110,6 +111,7 @@ void * hbqt_gcAllocate_QAbstractItemView( void * pObj, bool bNew ) new( & p->ph ) QPointer< QAbstractItemView >( ( QAbstractItemView * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QAbstractItemView; + p->type = QT_TYPE_QAbstractItemView; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QAbstractPrintDialog.cpp b/harbour/contrib/hbqt/qtgui/QAbstractPrintDialog.cpp index 0147150768..c13f6240c7 100644 --- a/harbour/contrib/hbqt/qtgui/QAbstractPrintDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QAbstractPrintDialog.cpp @@ -94,6 +94,7 @@ typedef struct QPointer< QAbstractPrintDialog > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QAbstractPrintDialog; QT_G_FUNC( hbqt_gcRelease_QAbstractPrintDialog ) @@ -114,6 +115,7 @@ void * hbqt_gcAllocate_QAbstractPrintDialog( void * pObj, bool bNew ) new( & p->ph ) QPointer< QAbstractPrintDialog >( ( QAbstractPrintDialog * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QAbstractPrintDialog; + p->type = QT_TYPE_QAbstractPrintDialog; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QAbstractProxyModel.cpp b/harbour/contrib/hbqt/qtgui/QAbstractProxyModel.cpp index d9251ba493..cf94b77f12 100644 --- a/harbour/contrib/hbqt/qtgui/QAbstractProxyModel.cpp +++ b/harbour/contrib/hbqt/qtgui/QAbstractProxyModel.cpp @@ -79,6 +79,7 @@ typedef struct QPointer< QAbstractProxyModel > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QAbstractProxyModel; QT_G_FUNC( hbqt_gcRelease_QAbstractProxyModel ) @@ -99,6 +100,7 @@ void * hbqt_gcAllocate_QAbstractProxyModel( void * pObj, bool bNew ) new( & p->ph ) QPointer< QAbstractProxyModel >( ( QAbstractProxyModel * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QAbstractProxyModel; + p->type = QT_TYPE_QAbstractProxyModel; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QAbstractScrollArea.cpp b/harbour/contrib/hbqt/qtgui/QAbstractScrollArea.cpp index 5ed1ff73ce..409905a364 100644 --- a/harbour/contrib/hbqt/qtgui/QAbstractScrollArea.cpp +++ b/harbour/contrib/hbqt/qtgui/QAbstractScrollArea.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QAbstractScrollArea > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QAbstractScrollArea; QT_G_FUNC( hbqt_gcRelease_QAbstractScrollArea ) @@ -100,6 +101,7 @@ void * hbqt_gcAllocate_QAbstractScrollArea( void * pObj, bool bNew ) new( & p->ph ) QPointer< QAbstractScrollArea >( ( QAbstractScrollArea * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QAbstractScrollArea; + p->type = QT_TYPE_QAbstractScrollArea; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QAbstractSlider.cpp b/harbour/contrib/hbqt/qtgui/QAbstractSlider.cpp index 6cf7bbe2a3..05210fafb6 100644 --- a/harbour/contrib/hbqt/qtgui/QAbstractSlider.cpp +++ b/harbour/contrib/hbqt/qtgui/QAbstractSlider.cpp @@ -84,6 +84,7 @@ typedef struct QPointer< QAbstractSlider > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QAbstractSlider; QT_G_FUNC( hbqt_gcRelease_QAbstractSlider ) @@ -104,6 +105,7 @@ void * hbqt_gcAllocate_QAbstractSlider( void * pObj, bool bNew ) new( & p->ph ) QPointer< QAbstractSlider >( ( QAbstractSlider * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QAbstractSlider; + p->type = QT_TYPE_QAbstractSlider; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QAbstractSpinBox.cpp b/harbour/contrib/hbqt/qtgui/QAbstractSpinBox.cpp index 9b37a353af..2373712dd1 100644 --- a/harbour/contrib/hbqt/qtgui/QAbstractSpinBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QAbstractSpinBox.cpp @@ -87,6 +87,7 @@ typedef struct QPointer< QAbstractSpinBox > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QAbstractSpinBox; QT_G_FUNC( hbqt_gcRelease_QAbstractSpinBox ) @@ -107,6 +108,7 @@ void * hbqt_gcAllocate_QAbstractSpinBox( void * pObj, bool bNew ) new( & p->ph ) QPointer< QAbstractSpinBox >( ( QAbstractSpinBox * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QAbstractSpinBox; + p->type = QT_TYPE_QAbstractSpinBox; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QAbstractTextDocumentLayout.cpp b/harbour/contrib/hbqt/qtgui/QAbstractTextDocumentLayout.cpp index d430bee45a..008b7a1d91 100644 --- a/harbour/contrib/hbqt/qtgui/QAbstractTextDocumentLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/QAbstractTextDocumentLayout.cpp @@ -79,6 +79,7 @@ typedef struct QPointer< QAbstractTextDocumentLayout > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QAbstractTextDocumentLayout; QT_G_FUNC( hbqt_gcRelease_QAbstractTextDocumentLayout ) @@ -99,6 +100,7 @@ void * hbqt_gcAllocate_QAbstractTextDocumentLayout( void * pObj, bool bNew ) new( & p->ph ) QPointer< QAbstractTextDocumentLayout >( ( QAbstractTextDocumentLayout * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QAbstractTextDocumentLayout; + p->type = QT_TYPE_QAbstractTextDocumentLayout; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QAction.cpp b/harbour/contrib/hbqt/qtgui/QAction.cpp index 2b0cb7cd96..b91f371445 100644 --- a/harbour/contrib/hbqt/qtgui/QAction.cpp +++ b/harbour/contrib/hbqt/qtgui/QAction.cpp @@ -100,6 +100,7 @@ typedef struct QPointer< QAction > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QAction; QT_G_FUNC( hbqt_gcRelease_QAction ) @@ -146,6 +147,7 @@ void * hbqt_gcAllocate_QAction( void * pObj, bool bNew ) new( & p->ph ) QPointer< QAction >( ( QAction * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QAction; + p->type = QT_TYPE_QAction; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QActionGroup.cpp b/harbour/contrib/hbqt/qtgui/QActionGroup.cpp index f7739170cc..9be46ae675 100644 --- a/harbour/contrib/hbqt/qtgui/QActionGroup.cpp +++ b/harbour/contrib/hbqt/qtgui/QActionGroup.cpp @@ -79,6 +79,7 @@ typedef struct QPointer< QActionGroup > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QActionGroup; QT_G_FUNC( hbqt_gcRelease_QActionGroup ) @@ -125,6 +126,7 @@ void * hbqt_gcAllocate_QActionGroup( void * pObj, bool bNew ) new( & p->ph ) QPointer< QActionGroup >( ( QActionGroup * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QActionGroup; + p->type = QT_TYPE_QActionGroup; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QApplication.cpp b/harbour/contrib/hbqt/qtgui/QApplication.cpp index 8f275f79e7..d9d08be69e 100644 --- a/harbour/contrib/hbqt/qtgui/QApplication.cpp +++ b/harbour/contrib/hbqt/qtgui/QApplication.cpp @@ -162,6 +162,7 @@ typedef struct QPointer< QApplication > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QApplication; QT_G_FUNC( hbqt_gcRelease_QApplication ) @@ -182,6 +183,7 @@ void * hbqt_gcAllocate_QApplication( void * pObj, bool bNew ) new( & p->ph ) QPointer< QApplication >( ( QApplication * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QApplication; + p->type = QT_TYPE_QApplication; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QBitmap.cpp b/harbour/contrib/hbqt/qtgui/QBitmap.cpp index a9b3685e86..61c8e39502 100644 --- a/harbour/contrib/hbqt/qtgui/QBitmap.cpp +++ b/harbour/contrib/hbqt/qtgui/QBitmap.cpp @@ -84,6 +84,7 @@ typedef struct QBitmap * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QBitmap; QT_G_FUNC( hbqt_gcRelease_QBitmap ) @@ -119,6 +120,7 @@ void * hbqt_gcAllocate_QBitmap( void * pObj, bool bNew ) p->ph = ( QBitmap * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QBitmap; + p->type = QT_TYPE_QBitmap; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/QBoxLayout.cpp index 72059be2d2..926433cb67 100644 --- a/harbour/contrib/hbqt/qtgui/QBoxLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/QBoxLayout.cpp @@ -95,6 +95,7 @@ typedef struct QPointer< QBoxLayout > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QBoxLayout; QT_G_FUNC( hbqt_gcRelease_QBoxLayout ) @@ -141,6 +142,7 @@ void * hbqt_gcAllocate_QBoxLayout( void * pObj, bool bNew ) new( & p->ph ) QPointer< QBoxLayout >( ( QBoxLayout * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QBoxLayout; + p->type = QT_TYPE_QBoxLayout; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QBrush.cpp b/harbour/contrib/hbqt/qtgui/QBrush.cpp index 332c0a96e5..b79981cfee 100644 --- a/harbour/contrib/hbqt/qtgui/QBrush.cpp +++ b/harbour/contrib/hbqt/qtgui/QBrush.cpp @@ -89,6 +89,7 @@ typedef struct QBrush * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QBrush; QT_G_FUNC( hbqt_gcRelease_QBrush ) @@ -124,6 +125,7 @@ void * hbqt_gcAllocate_QBrush( void * pObj, bool bNew ) p->ph = ( QBrush * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QBrush; + p->type = QT_TYPE_QBrush; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QButtonGroup.cpp b/harbour/contrib/hbqt/qtgui/QButtonGroup.cpp index 29a72ee339..0b7d521fb0 100644 --- a/harbour/contrib/hbqt/qtgui/QButtonGroup.cpp +++ b/harbour/contrib/hbqt/qtgui/QButtonGroup.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QButtonGroup > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QButtonGroup; QT_G_FUNC( hbqt_gcRelease_QButtonGroup ) @@ -126,6 +127,7 @@ void * hbqt_gcAllocate_QButtonGroup( void * pObj, bool bNew ) new( & p->ph ) QPointer< QButtonGroup >( ( QButtonGroup * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QButtonGroup; + p->type = QT_TYPE_QButtonGroup; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QCalendarWidget.cpp b/harbour/contrib/hbqt/qtgui/QCalendarWidget.cpp index fe39ce9793..38f860fae0 100644 --- a/harbour/contrib/hbqt/qtgui/QCalendarWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QCalendarWidget.cpp @@ -95,6 +95,7 @@ typedef struct QPointer< QCalendarWidget > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QCalendarWidget; QT_G_FUNC( hbqt_gcRelease_QCalendarWidget ) @@ -141,6 +142,7 @@ void * hbqt_gcAllocate_QCalendarWidget( void * pObj, bool bNew ) new( & p->ph ) QPointer< QCalendarWidget >( ( QCalendarWidget * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QCalendarWidget; + p->type = QT_TYPE_QCalendarWidget; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QCheckBox.cpp b/harbour/contrib/hbqt/qtgui/QCheckBox.cpp index 2f0c89447a..c8218c8649 100644 --- a/harbour/contrib/hbqt/qtgui/QCheckBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QCheckBox.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QCheckBox > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QCheckBox; QT_G_FUNC( hbqt_gcRelease_QCheckBox ) @@ -126,6 +127,7 @@ void * hbqt_gcAllocate_QCheckBox( void * pObj, bool bNew ) new( & p->ph ) QPointer< QCheckBox >( ( QCheckBox * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QCheckBox; + p->type = QT_TYPE_QCheckBox; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QClipboard.cpp b/harbour/contrib/hbqt/qtgui/QClipboard.cpp index a24e19fad9..41ed2f6fc4 100644 --- a/harbour/contrib/hbqt/qtgui/QClipboard.cpp +++ b/harbour/contrib/hbqt/qtgui/QClipboard.cpp @@ -86,6 +86,7 @@ typedef struct QPointer< QClipboard > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QClipboard; QT_G_FUNC( hbqt_gcRelease_QClipboard ) @@ -106,6 +107,7 @@ void * hbqt_gcAllocate_QClipboard( void * pObj, bool bNew ) new( & p->ph ) QPointer< QClipboard >( ( QClipboard * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QClipboard; + p->type = QT_TYPE_QClipboard; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QColor.cpp b/harbour/contrib/hbqt/qtgui/QColor.cpp index 650296ccfa..244d9ffdf8 100644 --- a/harbour/contrib/hbqt/qtgui/QColor.cpp +++ b/harbour/contrib/hbqt/qtgui/QColor.cpp @@ -89,6 +89,7 @@ typedef struct QColor * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QColor; QT_G_FUNC( hbqt_gcRelease_QColor ) @@ -124,6 +125,7 @@ void * hbqt_gcAllocate_QColor( void * pObj, bool bNew ) p->ph = ( QColor * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QColor; + p->type = QT_TYPE_QColor; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QColorDialog.cpp b/harbour/contrib/hbqt/qtgui/QColorDialog.cpp index 4c83d07104..b3cd473048 100644 --- a/harbour/contrib/hbqt/qtgui/QColorDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QColorDialog.cpp @@ -85,6 +85,7 @@ typedef struct QPointer< QColorDialog > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QColorDialog; QT_G_FUNC( hbqt_gcRelease_QColorDialog ) @@ -131,6 +132,7 @@ void * hbqt_gcAllocate_QColorDialog( void * pObj, bool bNew ) new( & p->ph ) QPointer< QColorDialog >( ( QColorDialog * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QColorDialog; + p->type = QT_TYPE_QColorDialog; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QComboBox.cpp b/harbour/contrib/hbqt/qtgui/QComboBox.cpp index 7f45122d1a..7e1798f778 100644 --- a/harbour/contrib/hbqt/qtgui/QComboBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QComboBox.cpp @@ -85,6 +85,7 @@ typedef struct QPointer< QComboBox > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QComboBox; QT_G_FUNC( hbqt_gcRelease_QComboBox ) @@ -131,6 +132,7 @@ void * hbqt_gcAllocate_QComboBox( void * pObj, bool bNew ) new( & p->ph ) QPointer< QComboBox >( ( QComboBox * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QComboBox; + p->type = QT_TYPE_QComboBox; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QCommandLinkButton.cpp b/harbour/contrib/hbqt/qtgui/QCommandLinkButton.cpp index 0ecd09768d..f290c1733d 100644 --- a/harbour/contrib/hbqt/qtgui/QCommandLinkButton.cpp +++ b/harbour/contrib/hbqt/qtgui/QCommandLinkButton.cpp @@ -81,6 +81,7 @@ typedef struct QPointer< QCommandLinkButton > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QCommandLinkButton; QT_G_FUNC( hbqt_gcRelease_QCommandLinkButton ) @@ -127,6 +128,7 @@ void * hbqt_gcAllocate_QCommandLinkButton( void * pObj, bool bNew ) new( & p->ph ) QPointer< QCommandLinkButton >( ( QCommandLinkButton * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QCommandLinkButton; + p->type = QT_TYPE_QCommandLinkButton; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QCommonStyle.cpp b/harbour/contrib/hbqt/qtgui/QCommonStyle.cpp index fb6e5bf767..30db54b976 100644 --- a/harbour/contrib/hbqt/qtgui/QCommonStyle.cpp +++ b/harbour/contrib/hbqt/qtgui/QCommonStyle.cpp @@ -79,6 +79,7 @@ typedef struct QPointer< QCommonStyle > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QCommonStyle; QT_G_FUNC( hbqt_gcRelease_QCommonStyle ) @@ -125,6 +126,7 @@ void * hbqt_gcAllocate_QCommonStyle( void * pObj, bool bNew ) new( & p->ph ) QPointer< QCommonStyle >( ( QCommonStyle * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QCommonStyle; + p->type = QT_TYPE_QCommonStyle; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QCompleter.cpp b/harbour/contrib/hbqt/qtgui/QCompleter.cpp index 0e0abfdb59..2a4d2ef563 100644 --- a/harbour/contrib/hbqt/qtgui/QCompleter.cpp +++ b/harbour/contrib/hbqt/qtgui/QCompleter.cpp @@ -86,6 +86,7 @@ typedef struct QPointer< QCompleter > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QCompleter; QT_G_FUNC( hbqt_gcRelease_QCompleter ) @@ -132,6 +133,7 @@ void * hbqt_gcAllocate_QCompleter( void * pObj, bool bNew ) new( & p->ph ) QPointer< QCompleter >( ( QCompleter * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QCompleter; + p->type = QT_TYPE_QCompleter; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QConicalGradient.cpp b/harbour/contrib/hbqt/qtgui/QConicalGradient.cpp index 4cf0d09485..e88068e413 100644 --- a/harbour/contrib/hbqt/qtgui/QConicalGradient.cpp +++ b/harbour/contrib/hbqt/qtgui/QConicalGradient.cpp @@ -87,6 +87,7 @@ typedef struct QConicalGradient * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QConicalGradient; QT_G_FUNC( hbqt_gcRelease_QConicalGradient ) @@ -122,6 +123,7 @@ void * hbqt_gcAllocate_QConicalGradient( void * pObj, bool bNew ) p->ph = ( QConicalGradient * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QConicalGradient; + p->type = QT_TYPE_QConicalGradient; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QContextMenuEvent.cpp b/harbour/contrib/hbqt/qtgui/QContextMenuEvent.cpp index ca48cb9b09..b0a44ed5b4 100644 --- a/harbour/contrib/hbqt/qtgui/QContextMenuEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QContextMenuEvent.cpp @@ -84,6 +84,7 @@ typedef struct QContextMenuEvent * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QContextMenuEvent; QT_G_FUNC( hbqt_gcRelease_QContextMenuEvent ) @@ -119,6 +120,7 @@ void * hbqt_gcAllocate_QContextMenuEvent( void * pObj, bool bNew ) p->ph = ( QContextMenuEvent * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QContextMenuEvent; + p->type = QT_TYPE_QContextMenuEvent; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QCursor.cpp b/harbour/contrib/hbqt/qtgui/QCursor.cpp index d2cd27aaa2..2224043d34 100644 --- a/harbour/contrib/hbqt/qtgui/QCursor.cpp +++ b/harbour/contrib/hbqt/qtgui/QCursor.cpp @@ -87,6 +87,7 @@ typedef struct QCursor * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QCursor; QT_G_FUNC( hbqt_gcRelease_QCursor ) @@ -122,6 +123,7 @@ void * hbqt_gcAllocate_QCursor( void * pObj, bool bNew ) p->ph = ( QCursor * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QCursor; + p->type = QT_TYPE_QCursor; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QDateEdit.cpp b/harbour/contrib/hbqt/qtgui/QDateEdit.cpp index 5077b116f2..41235624e8 100644 --- a/harbour/contrib/hbqt/qtgui/QDateEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/QDateEdit.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QDateEdit > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QDateEdit; QT_G_FUNC( hbqt_gcRelease_QDateEdit ) @@ -126,6 +127,7 @@ void * hbqt_gcAllocate_QDateEdit( void * pObj, bool bNew ) new( & p->ph ) QPointer< QDateEdit >( ( QDateEdit * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QDateEdit; + p->type = QT_TYPE_QDateEdit; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QDateTimeEdit.cpp b/harbour/contrib/hbqt/qtgui/QDateTimeEdit.cpp index 44d6aed2b5..304271bb06 100644 --- a/harbour/contrib/hbqt/qtgui/QDateTimeEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/QDateTimeEdit.cpp @@ -87,6 +87,7 @@ typedef struct QPointer< QDateTimeEdit > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QDateTimeEdit; QT_G_FUNC( hbqt_gcRelease_QDateTimeEdit ) @@ -133,6 +134,7 @@ void * hbqt_gcAllocate_QDateTimeEdit( void * pObj, bool bNew ) new( & p->ph ) QPointer< QDateTimeEdit >( ( QDateTimeEdit * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QDateTimeEdit; + p->type = QT_TYPE_QDateTimeEdit; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QDesktopWidget.cpp b/harbour/contrib/hbqt/qtgui/QDesktopWidget.cpp index 3b6d6fce17..571b62157b 100644 --- a/harbour/contrib/hbqt/qtgui/QDesktopWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QDesktopWidget.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QDesktopWidget > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QDesktopWidget; QT_G_FUNC( hbqt_gcRelease_QDesktopWidget ) @@ -126,6 +127,7 @@ void * hbqt_gcAllocate_QDesktopWidget( void * pObj, bool bNew ) new( & p->ph ) QPointer< QDesktopWidget >( ( QDesktopWidget * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QDesktopWidget; + p->type = QT_TYPE_QDesktopWidget; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QDial.cpp b/harbour/contrib/hbqt/qtgui/QDial.cpp index 70fd24a2ef..0b9426e10c 100644 --- a/harbour/contrib/hbqt/qtgui/QDial.cpp +++ b/harbour/contrib/hbqt/qtgui/QDial.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QDial > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QDial; QT_G_FUNC( hbqt_gcRelease_QDial ) @@ -126,6 +127,7 @@ void * hbqt_gcAllocate_QDial( void * pObj, bool bNew ) new( & p->ph ) QPointer< QDial >( ( QDial * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QDial; + p->type = QT_TYPE_QDial; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QDialog.cpp b/harbour/contrib/hbqt/qtgui/QDialog.cpp index cc623d9ebb..24177b17f2 100644 --- a/harbour/contrib/hbqt/qtgui/QDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QDialog.cpp @@ -84,6 +84,7 @@ typedef struct QPointer< QDialog > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QDialog; QT_G_FUNC( hbqt_gcRelease_QDialog ) @@ -130,6 +131,7 @@ void * hbqt_gcAllocate_QDialog( void * pObj, bool bNew ) new( & p->ph ) QPointer< QDialog >( ( QDialog * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QDialog; + p->type = QT_TYPE_QDialog; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QDirModel.cpp b/harbour/contrib/hbqt/qtgui/QDirModel.cpp index 2d467e8f14..f21c3f8f8b 100644 --- a/harbour/contrib/hbqt/qtgui/QDirModel.cpp +++ b/harbour/contrib/hbqt/qtgui/QDirModel.cpp @@ -85,6 +85,7 @@ typedef struct QPointer< QDirModel > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QDirModel; QT_G_FUNC( hbqt_gcRelease_QDirModel ) @@ -131,6 +132,7 @@ void * hbqt_gcAllocate_QDirModel( void * pObj, bool bNew ) new( & p->ph ) QPointer< QDirModel >( ( QDirModel * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QDirModel; + p->type = QT_TYPE_QDirModel; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QDockWidget.cpp b/harbour/contrib/hbqt/qtgui/QDockWidget.cpp index 2a29bfb006..5a0b15b741 100644 --- a/harbour/contrib/hbqt/qtgui/QDockWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QDockWidget.cpp @@ -86,6 +86,7 @@ typedef struct QPointer< QDockWidget > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QDockWidget; QT_G_FUNC( hbqt_gcRelease_QDockWidget ) @@ -132,6 +133,7 @@ void * hbqt_gcAllocate_QDockWidget( void * pObj, bool bNew ) new( & p->ph ) QPointer< QDockWidget >( ( QDockWidget * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QDockWidget; + p->type = QT_TYPE_QDockWidget; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QDoubleSpinBox.cpp b/harbour/contrib/hbqt/qtgui/QDoubleSpinBox.cpp index c93e79c8ac..5575723537 100644 --- a/harbour/contrib/hbqt/qtgui/QDoubleSpinBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QDoubleSpinBox.cpp @@ -79,6 +79,7 @@ typedef struct QPointer< QDoubleSpinBox > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QDoubleSpinBox; QT_G_FUNC( hbqt_gcRelease_QDoubleSpinBox ) @@ -125,6 +126,7 @@ void * hbqt_gcAllocate_QDoubleSpinBox( void * pObj, bool bNew ) new( & p->ph ) QPointer< QDoubleSpinBox >( ( QDoubleSpinBox * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QDoubleSpinBox; + p->type = QT_TYPE_QDoubleSpinBox; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QDragEnterEvent.cpp b/harbour/contrib/hbqt/qtgui/QDragEnterEvent.cpp index 603074e6d1..5013596085 100644 --- a/harbour/contrib/hbqt/qtgui/QDragEnterEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QDragEnterEvent.cpp @@ -79,6 +79,7 @@ typedef struct QDragEnterEvent * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QDragEnterEvent; QT_G_FUNC( hbqt_gcRelease_QDragEnterEvent ) @@ -99,6 +100,7 @@ void * hbqt_gcAllocate_QDragEnterEvent( void * pObj, bool bNew ) p->ph = ( QDragEnterEvent * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QDragEnterEvent; + p->type = QT_TYPE_QDragEnterEvent; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QDragLeaveEvent.cpp b/harbour/contrib/hbqt/qtgui/QDragLeaveEvent.cpp index 07b258cfff..685a6fc291 100644 --- a/harbour/contrib/hbqt/qtgui/QDragLeaveEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QDragLeaveEvent.cpp @@ -79,6 +79,7 @@ typedef struct QDragLeaveEvent * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QDragLeaveEvent; QT_G_FUNC( hbqt_gcRelease_QDragLeaveEvent ) @@ -99,6 +100,7 @@ void * hbqt_gcAllocate_QDragLeaveEvent( void * pObj, bool bNew ) p->ph = ( QDragLeaveEvent * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QDragLeaveEvent; + p->type = QT_TYPE_QDragLeaveEvent; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QDragMoveEvent.cpp b/harbour/contrib/hbqt/qtgui/QDragMoveEvent.cpp index f806d1e893..e9d3685ca3 100644 --- a/harbour/contrib/hbqt/qtgui/QDragMoveEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QDragMoveEvent.cpp @@ -80,6 +80,7 @@ typedef struct QDragMoveEvent * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QDragMoveEvent; QT_G_FUNC( hbqt_gcRelease_QDragMoveEvent ) @@ -100,6 +101,7 @@ void * hbqt_gcAllocate_QDragMoveEvent( void * pObj, bool bNew ) p->ph = ( QDragMoveEvent * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QDragMoveEvent; + p->type = QT_TYPE_QDragMoveEvent; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QDropEvent.cpp b/harbour/contrib/hbqt/qtgui/QDropEvent.cpp index 8ae6d35d3e..e559bd24fe 100644 --- a/harbour/contrib/hbqt/qtgui/QDropEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QDropEvent.cpp @@ -88,6 +88,7 @@ typedef struct QDropEvent * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QDropEvent; QT_G_FUNC( hbqt_gcRelease_QDropEvent ) @@ -108,6 +109,7 @@ void * hbqt_gcAllocate_QDropEvent( void * pObj, bool bNew ) p->ph = ( QDropEvent * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QDropEvent; + p->type = QT_TYPE_QDropEvent; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QErrorMessage.cpp b/harbour/contrib/hbqt/qtgui/QErrorMessage.cpp index f5853d2c28..6e677a63f8 100644 --- a/harbour/contrib/hbqt/qtgui/QErrorMessage.cpp +++ b/harbour/contrib/hbqt/qtgui/QErrorMessage.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QErrorMessage > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QErrorMessage; QT_G_FUNC( hbqt_gcRelease_QErrorMessage ) @@ -126,6 +127,7 @@ void * hbqt_gcAllocate_QErrorMessage( void * pObj, bool bNew ) new( & p->ph ) QPointer< QErrorMessage >( ( QErrorMessage * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QErrorMessage; + p->type = QT_TYPE_QErrorMessage; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QFileDialog.cpp b/harbour/contrib/hbqt/qtgui/QFileDialog.cpp index b745479ece..bfd9e14378 100644 --- a/harbour/contrib/hbqt/qtgui/QFileDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QFileDialog.cpp @@ -106,6 +106,7 @@ typedef struct QPointer< QFileDialog > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QFileDialog; QT_G_FUNC( hbqt_gcRelease_QFileDialog ) @@ -152,6 +153,7 @@ void * hbqt_gcAllocate_QFileDialog( void * pObj, bool bNew ) new( & p->ph ) QPointer< QFileDialog >( ( QFileDialog * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QFileDialog; + p->type = QT_TYPE_QFileDialog; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QFileIconProvider.cpp b/harbour/contrib/hbqt/qtgui/QFileIconProvider.cpp index 06f7919bab..f9e95a90e8 100644 --- a/harbour/contrib/hbqt/qtgui/QFileIconProvider.cpp +++ b/harbour/contrib/hbqt/qtgui/QFileIconProvider.cpp @@ -83,6 +83,7 @@ typedef struct QFileIconProvider * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QFileIconProvider; QT_G_FUNC( hbqt_gcRelease_QFileIconProvider ) @@ -118,6 +119,7 @@ void * hbqt_gcAllocate_QFileIconProvider( void * pObj, bool bNew ) p->ph = ( QFileIconProvider * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QFileIconProvider; + p->type = QT_TYPE_QFileIconProvider; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QFileSystemModel.cpp b/harbour/contrib/hbqt/qtgui/QFileSystemModel.cpp index 6b8038ea68..84cc0f6903 100644 --- a/harbour/contrib/hbqt/qtgui/QFileSystemModel.cpp +++ b/harbour/contrib/hbqt/qtgui/QFileSystemModel.cpp @@ -84,6 +84,7 @@ typedef struct QPointer< QFileSystemModel > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QFileSystemModel; QT_G_FUNC( hbqt_gcRelease_QFileSystemModel ) @@ -130,6 +131,7 @@ void * hbqt_gcAllocate_QFileSystemModel( void * pObj, bool bNew ) new( & p->ph ) QPointer< QFileSystemModel >( ( QFileSystemModel * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QFileSystemModel; + p->type = QT_TYPE_QFileSystemModel; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QFocusEvent.cpp b/harbour/contrib/hbqt/qtgui/QFocusEvent.cpp index 411e13c049..20a83445c3 100644 --- a/harbour/contrib/hbqt/qtgui/QFocusEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QFocusEvent.cpp @@ -79,6 +79,7 @@ typedef struct QFocusEvent * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QFocusEvent; QT_G_FUNC( hbqt_gcRelease_QFocusEvent ) @@ -99,6 +100,7 @@ void * hbqt_gcAllocate_QFocusEvent( void * pObj, bool bNew ) p->ph = ( QFocusEvent * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QFocusEvent; + p->type = QT_TYPE_QFocusEvent; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QFocusFrame.cpp b/harbour/contrib/hbqt/qtgui/QFocusFrame.cpp index bb3a921740..2d1ffa5979 100644 --- a/harbour/contrib/hbqt/qtgui/QFocusFrame.cpp +++ b/harbour/contrib/hbqt/qtgui/QFocusFrame.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QFocusFrame > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QFocusFrame; QT_G_FUNC( hbqt_gcRelease_QFocusFrame ) @@ -126,6 +127,7 @@ void * hbqt_gcAllocate_QFocusFrame( void * pObj, bool bNew ) new( & p->ph ) QPointer< QFocusFrame >( ( QFocusFrame * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QFocusFrame; + p->type = QT_TYPE_QFocusFrame; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QFont.cpp b/harbour/contrib/hbqt/qtgui/QFont.cpp index 882ee41393..959ba636fe 100644 --- a/harbour/contrib/hbqt/qtgui/QFont.cpp +++ b/harbour/contrib/hbqt/qtgui/QFont.cpp @@ -93,6 +93,7 @@ typedef struct QFont * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QFont; QT_G_FUNC( hbqt_gcRelease_QFont ) @@ -128,6 +129,7 @@ void * hbqt_gcAllocate_QFont( void * pObj, bool bNew ) p->ph = ( QFont * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QFont; + p->type = QT_TYPE_QFont; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QFontComboBox.cpp b/harbour/contrib/hbqt/qtgui/QFontComboBox.cpp index ee4ecd1ba5..7141d5ea15 100644 --- a/harbour/contrib/hbqt/qtgui/QFontComboBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QFontComboBox.cpp @@ -85,6 +85,7 @@ typedef struct QPointer< QFontComboBox > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QFontComboBox; QT_G_FUNC( hbqt_gcRelease_QFontComboBox ) @@ -131,6 +132,7 @@ void * hbqt_gcAllocate_QFontComboBox( void * pObj, bool bNew ) new( & p->ph ) QPointer< QFontComboBox >( ( QFontComboBox * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QFontComboBox; + p->type = QT_TYPE_QFontComboBox; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QFontDatabase.cpp b/harbour/contrib/hbqt/qtgui/QFontDatabase.cpp index 64194befe3..47c597b34c 100644 --- a/harbour/contrib/hbqt/qtgui/QFontDatabase.cpp +++ b/harbour/contrib/hbqt/qtgui/QFontDatabase.cpp @@ -84,6 +84,7 @@ typedef struct QFontDatabase * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QFontDatabase; QT_G_FUNC( hbqt_gcRelease_QFontDatabase ) @@ -119,6 +120,7 @@ void * hbqt_gcAllocate_QFontDatabase( void * pObj, bool bNew ) p->ph = ( QFontDatabase * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QFontDatabase; + p->type = QT_TYPE_QFontDatabase; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QFontDialog.cpp b/harbour/contrib/hbqt/qtgui/QFontDialog.cpp index 92dd5310e6..fe8df33307 100644 --- a/harbour/contrib/hbqt/qtgui/QFontDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QFontDialog.cpp @@ -85,6 +85,7 @@ typedef struct QPointer< QFontDialog > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QFontDialog; QT_G_FUNC( hbqt_gcRelease_QFontDialog ) @@ -131,6 +132,7 @@ void * hbqt_gcAllocate_QFontDialog( void * pObj, bool bNew ) new( & p->ph ) QPointer< QFontDialog >( ( QFontDialog * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QFontDialog; + p->type = QT_TYPE_QFontDialog; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QFontInfo.cpp b/harbour/contrib/hbqt/qtgui/QFontInfo.cpp index e9db19e701..754526f114 100644 --- a/harbour/contrib/hbqt/qtgui/QFontInfo.cpp +++ b/harbour/contrib/hbqt/qtgui/QFontInfo.cpp @@ -81,6 +81,7 @@ typedef struct QFontInfo * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QFontInfo; QT_G_FUNC( hbqt_gcRelease_QFontInfo ) @@ -116,6 +117,7 @@ void * hbqt_gcAllocate_QFontInfo( void * pObj, bool bNew ) p->ph = ( QFontInfo * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QFontInfo; + p->type = QT_TYPE_QFontInfo; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QFontMetrics.cpp b/harbour/contrib/hbqt/qtgui/QFontMetrics.cpp index e1e262c699..1aa553979f 100644 --- a/harbour/contrib/hbqt/qtgui/QFontMetrics.cpp +++ b/harbour/contrib/hbqt/qtgui/QFontMetrics.cpp @@ -82,6 +82,7 @@ typedef struct QFontMetrics * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QFontMetrics; QT_G_FUNC( hbqt_gcRelease_QFontMetrics ) @@ -117,6 +118,7 @@ void * hbqt_gcAllocate_QFontMetrics( void * pObj, bool bNew ) p->ph = ( QFontMetrics * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QFontMetrics; + p->type = QT_TYPE_QFontMetrics; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QFontMetricsF.cpp b/harbour/contrib/hbqt/qtgui/QFontMetricsF.cpp index b71e6148d3..5ec438ae1a 100644 --- a/harbour/contrib/hbqt/qtgui/QFontMetricsF.cpp +++ b/harbour/contrib/hbqt/qtgui/QFontMetricsF.cpp @@ -83,6 +83,7 @@ typedef struct QFontMetricsF * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QFontMetricsF; QT_G_FUNC( hbqt_gcRelease_QFontMetricsF ) @@ -118,6 +119,7 @@ void * hbqt_gcAllocate_QFontMetricsF( void * pObj, bool bNew ) p->ph = ( QFontMetricsF * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QFontMetricsF; + p->type = QT_TYPE_QFontMetricsF; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QFormLayout.cpp b/harbour/contrib/hbqt/qtgui/QFormLayout.cpp index 4482f9066c..5b4a66f26a 100644 --- a/harbour/contrib/hbqt/qtgui/QFormLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/QFormLayout.cpp @@ -86,6 +86,7 @@ typedef struct QPointer< QFormLayout > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QFormLayout; QT_G_FUNC( hbqt_gcRelease_QFormLayout ) @@ -132,6 +133,7 @@ void * hbqt_gcAllocate_QFormLayout( void * pObj, bool bNew ) new( & p->ph ) QPointer< QFormLayout >( ( QFormLayout * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QFormLayout; + p->type = QT_TYPE_QFormLayout; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QFrame.cpp b/harbour/contrib/hbqt/qtgui/QFrame.cpp index becbcdab14..09c7cfe1b1 100644 --- a/harbour/contrib/hbqt/qtgui/QFrame.cpp +++ b/harbour/contrib/hbqt/qtgui/QFrame.cpp @@ -86,6 +86,7 @@ typedef struct QPointer< QFrame > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QFrame; QT_G_FUNC( hbqt_gcRelease_QFrame ) @@ -132,6 +133,7 @@ void * hbqt_gcAllocate_QFrame( void * pObj, bool bNew ) new( & p->ph ) QPointer< QFrame >( ( QFrame * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QFrame; + p->type = QT_TYPE_QFrame; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QGradient.cpp b/harbour/contrib/hbqt/qtgui/QGradient.cpp index 77206fc225..58426f5cbf 100644 --- a/harbour/contrib/hbqt/qtgui/QGradient.cpp +++ b/harbour/contrib/hbqt/qtgui/QGradient.cpp @@ -85,6 +85,7 @@ typedef struct QGradient * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QGradient; QT_G_FUNC( hbqt_gcRelease_QGradient ) @@ -105,6 +106,7 @@ void * hbqt_gcAllocate_QGradient( void * pObj, bool bNew ) p->ph = ( QGradient * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QGradient; + p->type = QT_TYPE_QGradient; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QGridLayout.cpp b/harbour/contrib/hbqt/qtgui/QGridLayout.cpp index 33d9d04f99..ef80c8df3a 100644 --- a/harbour/contrib/hbqt/qtgui/QGridLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/QGridLayout.cpp @@ -94,6 +94,7 @@ typedef struct QPointer< QGridLayout > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QGridLayout; QT_G_FUNC( hbqt_gcRelease_QGridLayout ) @@ -140,6 +141,7 @@ void * hbqt_gcAllocate_QGridLayout( void * pObj, bool bNew ) new( & p->ph ) QPointer< QGridLayout >( ( QGridLayout * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QGridLayout; + p->type = QT_TYPE_QGridLayout; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QGroupBox.cpp b/harbour/contrib/hbqt/qtgui/QGroupBox.cpp index fe8333018e..1e46a1bda8 100644 --- a/harbour/contrib/hbqt/qtgui/QGroupBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QGroupBox.cpp @@ -81,6 +81,7 @@ typedef struct QPointer< QGroupBox > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QGroupBox; QT_G_FUNC( hbqt_gcRelease_QGroupBox ) @@ -127,6 +128,7 @@ void * hbqt_gcAllocate_QGroupBox( void * pObj, bool bNew ) new( & p->ph ) QPointer< QGroupBox >( ( QGroupBox * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QGroupBox; + p->type = QT_TYPE_QGroupBox; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QHBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/QHBoxLayout.cpp index f02d526f83..f1313f5a7a 100644 --- a/harbour/contrib/hbqt/qtgui/QHBoxLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/QHBoxLayout.cpp @@ -81,6 +81,7 @@ typedef struct QPointer< QHBoxLayout > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QHBoxLayout; QT_G_FUNC( hbqt_gcRelease_QHBoxLayout ) @@ -127,6 +128,7 @@ void * hbqt_gcAllocate_QHBoxLayout( void * pObj, bool bNew ) new( & p->ph ) QPointer< QHBoxLayout >( ( QHBoxLayout * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QHBoxLayout; + p->type = QT_TYPE_QHBoxLayout; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QHeaderView.cpp b/harbour/contrib/hbqt/qtgui/QHeaderView.cpp index 50d6ba0239..3e00ddaa20 100644 --- a/harbour/contrib/hbqt/qtgui/QHeaderView.cpp +++ b/harbour/contrib/hbqt/qtgui/QHeaderView.cpp @@ -84,6 +84,7 @@ typedef struct QPointer< QHeaderView > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QHeaderView; QT_G_FUNC( hbqt_gcRelease_QHeaderView ) @@ -130,6 +131,7 @@ void * hbqt_gcAllocate_QHeaderView( void * pObj, bool bNew ) new( & p->ph ) QPointer< QHeaderView >( ( QHeaderView * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QHeaderView; + p->type = QT_TYPE_QHeaderView; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QHelpEvent.cpp b/harbour/contrib/hbqt/qtgui/QHelpEvent.cpp index 5d56eea462..570974c9b2 100644 --- a/harbour/contrib/hbqt/qtgui/QHelpEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QHelpEvent.cpp @@ -79,6 +79,7 @@ typedef struct QHelpEvent * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QHelpEvent; QT_G_FUNC( hbqt_gcRelease_QHelpEvent ) @@ -99,6 +100,7 @@ void * hbqt_gcAllocate_QHelpEvent( void * pObj, bool bNew ) p->ph = ( QHelpEvent * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QHelpEvent; + p->type = QT_TYPE_QHelpEvent; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QHideEvent.cpp b/harbour/contrib/hbqt/qtgui/QHideEvent.cpp index c1c80a4d38..45106038c5 100644 --- a/harbour/contrib/hbqt/qtgui/QHideEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QHideEvent.cpp @@ -79,6 +79,7 @@ typedef struct QHideEvent * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QHideEvent; QT_G_FUNC( hbqt_gcRelease_QHideEvent ) @@ -99,6 +100,7 @@ void * hbqt_gcAllocate_QHideEvent( void * pObj, bool bNew ) p->ph = ( QHideEvent * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QHideEvent; + p->type = QT_TYPE_QHideEvent; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QIcon.cpp b/harbour/contrib/hbqt/qtgui/QIcon.cpp index 7f7acde786..8b1750b964 100644 --- a/harbour/contrib/hbqt/qtgui/QIcon.cpp +++ b/harbour/contrib/hbqt/qtgui/QIcon.cpp @@ -90,6 +90,7 @@ typedef struct QIcon * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QIcon; QT_G_FUNC( hbqt_gcRelease_QIcon ) @@ -125,6 +126,7 @@ void * hbqt_gcAllocate_QIcon( void * pObj, bool bNew ) p->ph = ( QIcon * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QIcon; + p->type = QT_TYPE_QIcon; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QImage.cpp b/harbour/contrib/hbqt/qtgui/QImage.cpp index 9c0ad55f92..2971d6e856 100644 --- a/harbour/contrib/hbqt/qtgui/QImage.cpp +++ b/harbour/contrib/hbqt/qtgui/QImage.cpp @@ -111,6 +111,7 @@ typedef struct QImage * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QImage; QT_G_FUNC( hbqt_gcRelease_QImage ) @@ -146,6 +147,7 @@ void * hbqt_gcAllocate_QImage( void * pObj, bool bNew ) p->ph = ( QImage * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QImage; + p->type = QT_TYPE_QImage; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QImageReader.cpp b/harbour/contrib/hbqt/qtgui/QImageReader.cpp index 04b272622b..29a6aecfa9 100644 --- a/harbour/contrib/hbqt/qtgui/QImageReader.cpp +++ b/harbour/contrib/hbqt/qtgui/QImageReader.cpp @@ -87,6 +87,7 @@ typedef struct QImageReader * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QImageReader; QT_G_FUNC( hbqt_gcRelease_QImageReader ) @@ -122,6 +123,7 @@ void * hbqt_gcAllocate_QImageReader( void * pObj, bool bNew ) p->ph = ( QImageReader * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QImageReader; + p->type = QT_TYPE_QImageReader; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QImageWriter.cpp b/harbour/contrib/hbqt/qtgui/QImageWriter.cpp index f054be290e..2ca0b8f45f 100644 --- a/harbour/contrib/hbqt/qtgui/QImageWriter.cpp +++ b/harbour/contrib/hbqt/qtgui/QImageWriter.cpp @@ -86,6 +86,7 @@ typedef struct QImageWriter * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QImageWriter; QT_G_FUNC( hbqt_gcRelease_QImageWriter ) @@ -121,6 +122,7 @@ void * hbqt_gcAllocate_QImageWriter( void * pObj, bool bNew ) p->ph = ( QImageWriter * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QImageWriter; + p->type = QT_TYPE_QImageWriter; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QInputDialog.cpp b/harbour/contrib/hbqt/qtgui/QInputDialog.cpp index b35012b8b1..11fdec1420 100644 --- a/harbour/contrib/hbqt/qtgui/QInputDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QInputDialog.cpp @@ -86,6 +86,7 @@ typedef struct QPointer< QInputDialog > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QInputDialog; QT_G_FUNC( hbqt_gcRelease_QInputDialog ) @@ -132,6 +133,7 @@ void * hbqt_gcAllocate_QInputDialog( void * pObj, bool bNew ) new( & p->ph ) QPointer< QInputDialog >( ( QInputDialog * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QInputDialog; + p->type = QT_TYPE_QInputDialog; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QInputEvent.cpp b/harbour/contrib/hbqt/qtgui/QInputEvent.cpp index 5243bf9d80..ac8e11f646 100644 --- a/harbour/contrib/hbqt/qtgui/QInputEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QInputEvent.cpp @@ -80,6 +80,7 @@ typedef struct QInputEvent * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QInputEvent; QT_G_FUNC( hbqt_gcRelease_QInputEvent ) @@ -115,6 +116,7 @@ void * hbqt_gcAllocate_QInputEvent( void * pObj, bool bNew ) p->ph = ( QInputEvent * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QInputEvent; + p->type = QT_TYPE_QInputEvent; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QInputMethodEvent.cpp b/harbour/contrib/hbqt/qtgui/QInputMethodEvent.cpp index 145e25e849..f4122e03ce 100644 --- a/harbour/contrib/hbqt/qtgui/QInputMethodEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QInputMethodEvent.cpp @@ -84,6 +84,7 @@ typedef struct QInputMethodEvent * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QInputMethodEvent; QT_G_FUNC( hbqt_gcRelease_QInputMethodEvent ) @@ -119,6 +120,7 @@ void * hbqt_gcAllocate_QInputMethodEvent( void * pObj, bool bNew ) p->ph = ( QInputMethodEvent * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QInputMethodEvent; + p->type = QT_TYPE_QInputMethodEvent; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QItemDelegate.cpp b/harbour/contrib/hbqt/qtgui/QItemDelegate.cpp index c2f437145d..e0a92449c2 100644 --- a/harbour/contrib/hbqt/qtgui/QItemDelegate.cpp +++ b/harbour/contrib/hbqt/qtgui/QItemDelegate.cpp @@ -84,6 +84,7 @@ typedef struct QPointer< QItemDelegate > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QItemDelegate; QT_G_FUNC( hbqt_gcRelease_QItemDelegate ) @@ -130,6 +131,7 @@ void * hbqt_gcAllocate_QItemDelegate( void * pObj, bool bNew ) new( & p->ph ) QPointer< QItemDelegate >( ( QItemDelegate * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QItemDelegate; + p->type = QT_TYPE_QItemDelegate; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QItemEditorCreatorBase.cpp b/harbour/contrib/hbqt/qtgui/QItemEditorCreatorBase.cpp index 9e5ce234ad..45fefd0e20 100644 --- a/harbour/contrib/hbqt/qtgui/QItemEditorCreatorBase.cpp +++ b/harbour/contrib/hbqt/qtgui/QItemEditorCreatorBase.cpp @@ -80,6 +80,7 @@ typedef struct QItemEditorCreatorBase * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QItemEditorCreatorBase; QT_G_FUNC( hbqt_gcRelease_QItemEditorCreatorBase ) @@ -100,6 +101,7 @@ void * hbqt_gcAllocate_QItemEditorCreatorBase( void * pObj, bool bNew ) p->ph = ( QItemEditorCreatorBase * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QItemEditorCreatorBase; + p->type = QT_TYPE_QItemEditorCreatorBase; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QItemEditorFactory.cpp b/harbour/contrib/hbqt/qtgui/QItemEditorFactory.cpp index 2457f9264e..2d64e8b8a5 100644 --- a/harbour/contrib/hbqt/qtgui/QItemEditorFactory.cpp +++ b/harbour/contrib/hbqt/qtgui/QItemEditorFactory.cpp @@ -81,6 +81,7 @@ typedef struct QItemEditorFactory * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QItemEditorFactory; QT_G_FUNC( hbqt_gcRelease_QItemEditorFactory ) @@ -116,6 +117,7 @@ void * hbqt_gcAllocate_QItemEditorFactory( void * pObj, bool bNew ) p->ph = ( QItemEditorFactory * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QItemEditorFactory; + p->type = QT_TYPE_QItemEditorFactory; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QItemSelection.cpp b/harbour/contrib/hbqt/qtgui/QItemSelection.cpp index c0eca009ca..f37f09a445 100644 --- a/harbour/contrib/hbqt/qtgui/QItemSelection.cpp +++ b/harbour/contrib/hbqt/qtgui/QItemSelection.cpp @@ -79,6 +79,7 @@ typedef struct QItemSelection * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QItemSelection; QT_G_FUNC( hbqt_gcRelease_QItemSelection ) @@ -114,6 +115,7 @@ void * hbqt_gcAllocate_QItemSelection( void * pObj, bool bNew ) p->ph = ( QItemSelection * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QItemSelection; + p->type = QT_TYPE_QItemSelection; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QItemSelectionModel.cpp b/harbour/contrib/hbqt/qtgui/QItemSelectionModel.cpp index cae7c27d7a..2f836bc381 100644 --- a/harbour/contrib/hbqt/qtgui/QItemSelectionModel.cpp +++ b/harbour/contrib/hbqt/qtgui/QItemSelectionModel.cpp @@ -85,6 +85,7 @@ typedef struct QPointer< QItemSelectionModel > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QItemSelectionModel; QT_G_FUNC( hbqt_gcRelease_QItemSelectionModel ) @@ -131,6 +132,7 @@ void * hbqt_gcAllocate_QItemSelectionModel( void * pObj, bool bNew ) new( & p->ph ) QPointer< QItemSelectionModel >( ( QItemSelectionModel * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QItemSelectionModel; + p->type = QT_TYPE_QItemSelectionModel; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QKeyEvent.cpp b/harbour/contrib/hbqt/qtgui/QKeyEvent.cpp index 82bc513691..7477f825d3 100644 --- a/harbour/contrib/hbqt/qtgui/QKeyEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QKeyEvent.cpp @@ -80,6 +80,7 @@ typedef struct QKeyEvent * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QKeyEvent; QT_G_FUNC( hbqt_gcRelease_QKeyEvent ) @@ -100,6 +101,7 @@ void * hbqt_gcAllocate_QKeyEvent( void * pObj, bool bNew ) p->ph = ( QKeyEvent * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QKeyEvent; + p->type = QT_TYPE_QKeyEvent; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QKeySequence.cpp b/harbour/contrib/hbqt/qtgui/QKeySequence.cpp index 7ea4023096..449ce6a1b1 100644 --- a/harbour/contrib/hbqt/qtgui/QKeySequence.cpp +++ b/harbour/contrib/hbqt/qtgui/QKeySequence.cpp @@ -90,6 +90,7 @@ typedef struct QKeySequence * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QKeySequence; QT_G_FUNC( hbqt_gcRelease_QKeySequence ) @@ -125,6 +126,7 @@ void * hbqt_gcAllocate_QKeySequence( void * pObj, bool bNew ) p->ph = ( QKeySequence * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QKeySequence; + p->type = QT_TYPE_QKeySequence; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QLCDNumber.cpp b/harbour/contrib/hbqt/qtgui/QLCDNumber.cpp index 6830e1e1ac..479c8dcf33 100644 --- a/harbour/contrib/hbqt/qtgui/QLCDNumber.cpp +++ b/harbour/contrib/hbqt/qtgui/QLCDNumber.cpp @@ -86,6 +86,7 @@ typedef struct QPointer< QLCDNumber > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QLCDNumber; QT_G_FUNC( hbqt_gcRelease_QLCDNumber ) @@ -132,6 +133,7 @@ void * hbqt_gcAllocate_QLCDNumber( void * pObj, bool bNew ) new( & p->ph ) QPointer< QLCDNumber >( ( QLCDNumber * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QLCDNumber; + p->type = QT_TYPE_QLCDNumber; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QLabel.cpp b/harbour/contrib/hbqt/qtgui/QLabel.cpp index fb1810adf5..54dd2dc5f2 100644 --- a/harbour/contrib/hbqt/qtgui/QLabel.cpp +++ b/harbour/contrib/hbqt/qtgui/QLabel.cpp @@ -82,6 +82,7 @@ typedef struct QPointer< QLabel > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QLabel; QT_G_FUNC( hbqt_gcRelease_QLabel ) @@ -128,6 +129,7 @@ void * hbqt_gcAllocate_QLabel( void * pObj, bool bNew ) new( & p->ph ) QPointer< QLabel >( ( QLabel * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QLabel; + p->type = QT_TYPE_QLabel; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QLayout.cpp b/harbour/contrib/hbqt/qtgui/QLayout.cpp index a0db9e07ea..86c1c8aff1 100644 --- a/harbour/contrib/hbqt/qtgui/QLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/QLayout.cpp @@ -94,6 +94,7 @@ typedef struct QPointer< QLayout > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QLayout; QT_G_FUNC( hbqt_gcRelease_QLayout ) @@ -114,6 +115,7 @@ void * hbqt_gcAllocate_QLayout( void * pObj, bool bNew ) new( & p->ph ) QPointer< QLayout >( ( QLayout * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QLayout; + p->type = QT_TYPE_QLayout; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QLayoutItem.cpp b/harbour/contrib/hbqt/qtgui/QLayoutItem.cpp index 9e56c9eea7..32d0b8a827 100644 --- a/harbour/contrib/hbqt/qtgui/QLayoutItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QLayoutItem.cpp @@ -80,6 +80,7 @@ typedef struct QLayoutItem * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QLayoutItem; QT_G_FUNC( hbqt_gcRelease_QLayoutItem ) @@ -100,6 +101,7 @@ void * hbqt_gcAllocate_QLayoutItem( void * pObj, bool bNew ) p->ph = ( QLayoutItem * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QLayoutItem; + p->type = QT_TYPE_QLayoutItem; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QLineEdit.cpp b/harbour/contrib/hbqt/qtgui/QLineEdit.cpp index 43991b0315..a6f67fc55a 100644 --- a/harbour/contrib/hbqt/qtgui/QLineEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/QLineEdit.cpp @@ -86,6 +86,7 @@ typedef struct QPointer< QLineEdit > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QLineEdit; QT_G_FUNC( hbqt_gcRelease_QLineEdit ) @@ -132,6 +133,7 @@ void * hbqt_gcAllocate_QLineEdit( void * pObj, bool bNew ) new( & p->ph ) QPointer< QLineEdit >( ( QLineEdit * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QLineEdit; + p->type = QT_TYPE_QLineEdit; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QLinearGradient.cpp b/harbour/contrib/hbqt/qtgui/QLinearGradient.cpp index 60ced3d025..b0a64a16fb 100644 --- a/harbour/contrib/hbqt/qtgui/QLinearGradient.cpp +++ b/harbour/contrib/hbqt/qtgui/QLinearGradient.cpp @@ -87,6 +87,7 @@ typedef struct QLinearGradient * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QLinearGradient; QT_G_FUNC( hbqt_gcRelease_QLinearGradient ) @@ -122,6 +123,7 @@ void * hbqt_gcAllocate_QLinearGradient( void * pObj, bool bNew ) p->ph = ( QLinearGradient * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QLinearGradient; + p->type = QT_TYPE_QLinearGradient; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QListView.cpp b/harbour/contrib/hbqt/qtgui/QListView.cpp index 069790634f..c31307ec4a 100644 --- a/harbour/contrib/hbqt/qtgui/QListView.cpp +++ b/harbour/contrib/hbqt/qtgui/QListView.cpp @@ -88,6 +88,7 @@ typedef struct QPointer< QListView > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QListView; QT_G_FUNC( hbqt_gcRelease_QListView ) @@ -134,6 +135,7 @@ void * hbqt_gcAllocate_QListView( void * pObj, bool bNew ) new( & p->ph ) QPointer< QListView >( ( QListView * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QListView; + p->type = QT_TYPE_QListView; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QListWidget.cpp b/harbour/contrib/hbqt/qtgui/QListWidget.cpp index febd9b0387..b90bc47c39 100644 --- a/harbour/contrib/hbqt/qtgui/QListWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QListWidget.cpp @@ -90,6 +90,7 @@ typedef struct QPointer< QListWidget > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QListWidget; QT_G_FUNC( hbqt_gcRelease_QListWidget ) @@ -136,6 +137,7 @@ void * hbqt_gcAllocate_QListWidget( void * pObj, bool bNew ) new( & p->ph ) QPointer< QListWidget >( ( QListWidget * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QListWidget; + p->type = QT_TYPE_QListWidget; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QListWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/QListWidgetItem.cpp index 5f58694fa1..04bbeee153 100644 --- a/harbour/contrib/hbqt/qtgui/QListWidgetItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QListWidgetItem.cpp @@ -87,6 +87,7 @@ typedef struct QListWidgetItem * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QListWidgetItem; QT_G_FUNC( hbqt_gcRelease_QListWidgetItem ) @@ -122,6 +123,7 @@ void * hbqt_gcAllocate_QListWidgetItem( void * pObj, bool bNew ) p->ph = ( QListWidgetItem * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QListWidgetItem; + p->type = QT_TYPE_QListWidgetItem; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QMainWindow.cpp b/harbour/contrib/hbqt/qtgui/QMainWindow.cpp index a05e374de1..ede0c77ceb 100644 --- a/harbour/contrib/hbqt/qtgui/QMainWindow.cpp +++ b/harbour/contrib/hbqt/qtgui/QMainWindow.cpp @@ -109,6 +109,7 @@ typedef struct QPointer< QMainWindow > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QMainWindow; QT_G_FUNC( hbqt_gcRelease_QMainWindow ) @@ -155,6 +156,7 @@ void * hbqt_gcAllocate_QMainWindow( void * pObj, bool bNew ) new( & p->ph ) QPointer< QMainWindow >( ( QMainWindow * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QMainWindow; + p->type = QT_TYPE_QMainWindow; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QMatrix.cpp b/harbour/contrib/hbqt/qtgui/QMatrix.cpp index 310f49b57c..1abd942453 100644 --- a/harbour/contrib/hbqt/qtgui/QMatrix.cpp +++ b/harbour/contrib/hbqt/qtgui/QMatrix.cpp @@ -81,6 +81,7 @@ typedef struct QMatrix * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QMatrix; QT_G_FUNC( hbqt_gcRelease_QMatrix ) @@ -116,6 +117,7 @@ void * hbqt_gcAllocate_QMatrix( void * pObj, bool bNew ) p->ph = ( QMatrix * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QMatrix; + p->type = QT_TYPE_QMatrix; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QMdiArea.cpp b/harbour/contrib/hbqt/qtgui/QMdiArea.cpp index 04edf436b6..8f6971885b 100644 --- a/harbour/contrib/hbqt/qtgui/QMdiArea.cpp +++ b/harbour/contrib/hbqt/qtgui/QMdiArea.cpp @@ -88,6 +88,7 @@ typedef struct QPointer< QMdiArea > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QMdiArea; QT_G_FUNC( hbqt_gcRelease_QMdiArea ) @@ -134,6 +135,7 @@ void * hbqt_gcAllocate_QMdiArea( void * pObj, bool bNew ) new( & p->ph ) QPointer< QMdiArea >( ( QMdiArea * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QMdiArea; + p->type = QT_TYPE_QMdiArea; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QMdiSubWindow.cpp b/harbour/contrib/hbqt/qtgui/QMdiSubWindow.cpp index 94f0bd1391..d75e9d5f87 100644 --- a/harbour/contrib/hbqt/qtgui/QMdiSubWindow.cpp +++ b/harbour/contrib/hbqt/qtgui/QMdiSubWindow.cpp @@ -86,6 +86,7 @@ typedef struct QPointer< QMdiSubWindow > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QMdiSubWindow; QT_G_FUNC( hbqt_gcRelease_QMdiSubWindow ) @@ -132,6 +133,7 @@ void * hbqt_gcAllocate_QMdiSubWindow( void * pObj, bool bNew ) new( & p->ph ) QPointer< QMdiSubWindow >( ( QMdiSubWindow * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QMdiSubWindow; + p->type = QT_TYPE_QMdiSubWindow; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QMenu.cpp b/harbour/contrib/hbqt/qtgui/QMenu.cpp index 44a18c5f05..70fb9e7b4a 100644 --- a/harbour/contrib/hbqt/qtgui/QMenu.cpp +++ b/harbour/contrib/hbqt/qtgui/QMenu.cpp @@ -95,6 +95,7 @@ typedef struct QPointer< QMenu > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QMenu; QT_G_FUNC( hbqt_gcRelease_QMenu ) @@ -141,6 +142,7 @@ void * hbqt_gcAllocate_QMenu( void * pObj, bool bNew ) new( & p->ph ) QPointer< QMenu >( ( QMenu * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QMenu; + p->type = QT_TYPE_QMenu; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QMenuBar.cpp b/harbour/contrib/hbqt/qtgui/QMenuBar.cpp index 533ef03545..6767b2bba2 100644 --- a/harbour/contrib/hbqt/qtgui/QMenuBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QMenuBar.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QMenuBar > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QMenuBar; QT_G_FUNC( hbqt_gcRelease_QMenuBar ) @@ -126,6 +127,7 @@ void * hbqt_gcAllocate_QMenuBar( void * pObj, bool bNew ) new( & p->ph ) QPointer< QMenuBar >( ( QMenuBar * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QMenuBar; + p->type = QT_TYPE_QMenuBar; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QMessageBox.cpp b/harbour/contrib/hbqt/qtgui/QMessageBox.cpp index 1015268b42..79c32a2bdc 100644 --- a/harbour/contrib/hbqt/qtgui/QMessageBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QMessageBox.cpp @@ -88,6 +88,7 @@ typedef struct QPointer< QMessageBox > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QMessageBox; QT_G_FUNC( hbqt_gcRelease_QMessageBox ) @@ -134,6 +135,7 @@ void * hbqt_gcAllocate_QMessageBox( void * pObj, bool bNew ) new( & p->ph ) QPointer< QMessageBox >( ( QMessageBox * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QMessageBox; + p->type = QT_TYPE_QMessageBox; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QMouseEvent.cpp b/harbour/contrib/hbqt/qtgui/QMouseEvent.cpp index 37a5af8a0b..36a935c9c1 100644 --- a/harbour/contrib/hbqt/qtgui/QMouseEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QMouseEvent.cpp @@ -81,6 +81,7 @@ typedef struct QMouseEvent * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QMouseEvent; QT_G_FUNC( hbqt_gcRelease_QMouseEvent ) @@ -116,6 +117,7 @@ void * hbqt_gcAllocate_QMouseEvent( void * pObj, bool bNew ) p->ph = ( QMouseEvent * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QMouseEvent; + p->type = QT_TYPE_QMouseEvent; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QMoveEvent.cpp b/harbour/contrib/hbqt/qtgui/QMoveEvent.cpp index e695b0dc54..dd6ecfe5bc 100644 --- a/harbour/contrib/hbqt/qtgui/QMoveEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QMoveEvent.cpp @@ -80,6 +80,7 @@ typedef struct QMoveEvent * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QMoveEvent; QT_G_FUNC( hbqt_gcRelease_QMoveEvent ) @@ -100,6 +101,7 @@ void * hbqt_gcAllocate_QMoveEvent( void * pObj, bool bNew ) p->ph = ( QMoveEvent * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QMoveEvent; + p->type = QT_TYPE_QMoveEvent; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QMovie.cpp b/harbour/contrib/hbqt/qtgui/QMovie.cpp index 96157358a3..8cb69ba437 100644 --- a/harbour/contrib/hbqt/qtgui/QMovie.cpp +++ b/harbour/contrib/hbqt/qtgui/QMovie.cpp @@ -88,6 +88,7 @@ typedef struct QPointer< QMovie > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QMovie; QT_G_FUNC( hbqt_gcRelease_QMovie ) @@ -134,6 +135,7 @@ void * hbqt_gcAllocate_QMovie( void * pObj, bool bNew ) new( & p->ph ) QPointer< QMovie >( ( QMovie * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QMovie; + p->type = QT_TYPE_QMovie; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QPageSetupDialog.cpp b/harbour/contrib/hbqt/qtgui/QPageSetupDialog.cpp index 5181e4e44a..755ca8000a 100644 --- a/harbour/contrib/hbqt/qtgui/QPageSetupDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QPageSetupDialog.cpp @@ -85,6 +85,7 @@ typedef struct QPointer< QPageSetupDialog > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QPageSetupDialog; QT_G_FUNC( hbqt_gcRelease_QPageSetupDialog ) @@ -131,6 +132,7 @@ void * hbqt_gcAllocate_QPageSetupDialog( void * pObj, bool bNew ) new( & p->ph ) QPointer< QPageSetupDialog >( ( QPageSetupDialog * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QPageSetupDialog; + p->type = QT_TYPE_QPageSetupDialog; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QPaintDevice.cpp b/harbour/contrib/hbqt/qtgui/QPaintDevice.cpp index 21fe08e4a4..6d31005909 100644 --- a/harbour/contrib/hbqt/qtgui/QPaintDevice.cpp +++ b/harbour/contrib/hbqt/qtgui/QPaintDevice.cpp @@ -82,6 +82,7 @@ typedef struct QPaintDevice * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QPaintDevice; QT_G_FUNC( hbqt_gcRelease_QPaintDevice ) @@ -102,6 +103,7 @@ void * hbqt_gcAllocate_QPaintDevice( void * pObj, bool bNew ) p->ph = ( QPaintDevice * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QPaintDevice; + p->type = QT_TYPE_QPaintDevice; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QPaintEngine.cpp b/harbour/contrib/hbqt/qtgui/QPaintEngine.cpp index ba33f2fc93..93da116623 100644 --- a/harbour/contrib/hbqt/qtgui/QPaintEngine.cpp +++ b/harbour/contrib/hbqt/qtgui/QPaintEngine.cpp @@ -89,6 +89,7 @@ typedef struct QPaintEngine * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QPaintEngine; QT_G_FUNC( hbqt_gcRelease_QPaintEngine ) @@ -109,6 +110,7 @@ void * hbqt_gcAllocate_QPaintEngine( void * pObj, bool bNew ) p->ph = ( QPaintEngine * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QPaintEngine; + p->type = QT_TYPE_QPaintEngine; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QPaintEvent.cpp b/harbour/contrib/hbqt/qtgui/QPaintEvent.cpp index a55f306d00..8962f45e72 100644 --- a/harbour/contrib/hbqt/qtgui/QPaintEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QPaintEvent.cpp @@ -80,6 +80,7 @@ typedef struct QPaintEvent * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QPaintEvent; QT_G_FUNC( hbqt_gcRelease_QPaintEvent ) @@ -115,6 +116,7 @@ void * hbqt_gcAllocate_QPaintEvent( void * pObj, bool bNew ) p->ph = ( QPaintEvent * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QPaintEvent; + p->type = QT_TYPE_QPaintEvent; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QPainter.cpp b/harbour/contrib/hbqt/qtgui/QPainter.cpp index 1d505fdab1..b1bef76caf 100644 --- a/harbour/contrib/hbqt/qtgui/QPainter.cpp +++ b/harbour/contrib/hbqt/qtgui/QPainter.cpp @@ -100,6 +100,7 @@ typedef struct QPainter * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QPainter; QT_G_FUNC( hbqt_gcRelease_QPainter ) @@ -135,6 +136,7 @@ void * hbqt_gcAllocate_QPainter( void * pObj, bool bNew ) p->ph = ( QPainter * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QPainter; + p->type = QT_TYPE_QPainter; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QPainterPath.cpp b/harbour/contrib/hbqt/qtgui/QPainterPath.cpp index 1a2e96f81d..dc386d14ec 100644 --- a/harbour/contrib/hbqt/qtgui/QPainterPath.cpp +++ b/harbour/contrib/hbqt/qtgui/QPainterPath.cpp @@ -85,6 +85,7 @@ typedef struct QPainterPath * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QPainterPath; QT_G_FUNC( hbqt_gcRelease_QPainterPath ) @@ -120,6 +121,7 @@ void * hbqt_gcAllocate_QPainterPath( void * pObj, bool bNew ) p->ph = ( QPainterPath * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QPainterPath; + p->type = QT_TYPE_QPainterPath; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QPalette.cpp b/harbour/contrib/hbqt/qtgui/QPalette.cpp index f719f5abfa..59045af2ab 100644 --- a/harbour/contrib/hbqt/qtgui/QPalette.cpp +++ b/harbour/contrib/hbqt/qtgui/QPalette.cpp @@ -90,6 +90,7 @@ typedef struct QPalette * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QPalette; QT_G_FUNC( hbqt_gcRelease_QPalette ) @@ -125,6 +126,7 @@ void * hbqt_gcAllocate_QPalette( void * pObj, bool bNew ) p->ph = ( QPalette * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QPalette; + p->type = QT_TYPE_QPalette; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QPen.cpp b/harbour/contrib/hbqt/qtgui/QPen.cpp index 55d54165ae..f243649007 100644 --- a/harbour/contrib/hbqt/qtgui/QPen.cpp +++ b/harbour/contrib/hbqt/qtgui/QPen.cpp @@ -94,6 +94,7 @@ typedef struct QPen * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QPen; QT_G_FUNC( hbqt_gcRelease_QPen ) @@ -129,6 +130,7 @@ void * hbqt_gcAllocate_QPen( void * pObj, bool bNew ) p->ph = ( QPen * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QPen; + p->type = QT_TYPE_QPen; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QPicture.cpp b/harbour/contrib/hbqt/qtgui/QPicture.cpp index 35c5655d2b..8398eb3bee 100644 --- a/harbour/contrib/hbqt/qtgui/QPicture.cpp +++ b/harbour/contrib/hbqt/qtgui/QPicture.cpp @@ -81,6 +81,7 @@ typedef struct QPicture * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QPicture; QT_G_FUNC( hbqt_gcRelease_QPicture ) @@ -116,6 +117,7 @@ void * hbqt_gcAllocate_QPicture( void * pObj, bool bNew ) p->ph = ( QPicture * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QPicture; + p->type = QT_TYPE_QPicture; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QPixmap.cpp b/harbour/contrib/hbqt/qtgui/QPixmap.cpp index 910bcc433d..39a2490225 100644 --- a/harbour/contrib/hbqt/qtgui/QPixmap.cpp +++ b/harbour/contrib/hbqt/qtgui/QPixmap.cpp @@ -90,6 +90,7 @@ typedef struct QPixmap * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QPixmap; QT_G_FUNC( hbqt_gcRelease_QPixmap ) @@ -125,6 +126,7 @@ void * hbqt_gcAllocate_QPixmap( void * pObj, bool bNew ) p->ph = ( QPixmap * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QPixmap; + p->type = QT_TYPE_QPixmap; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QPlainTextDocumentLayout.cpp b/harbour/contrib/hbqt/qtgui/QPlainTextDocumentLayout.cpp index 0e6c8dcd06..760c23604d 100644 --- a/harbour/contrib/hbqt/qtgui/QPlainTextDocumentLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/QPlainTextDocumentLayout.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QPlainTextDocumentLayout > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QPlainTextDocumentLayout; QT_G_FUNC( hbqt_gcRelease_QPlainTextDocumentLayout ) @@ -126,6 +127,7 @@ void * hbqt_gcAllocate_QPlainTextDocumentLayout( void * pObj, bool bNew ) new( & p->ph ) QPointer< QPlainTextDocumentLayout >( ( QPlainTextDocumentLayout * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QPlainTextDocumentLayout; + p->type = QT_TYPE_QPlainTextDocumentLayout; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QPlainTextEdit.cpp b/harbour/contrib/hbqt/qtgui/QPlainTextEdit.cpp index 3b7ec2bb49..75711cb28a 100644 --- a/harbour/contrib/hbqt/qtgui/QPlainTextEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/QPlainTextEdit.cpp @@ -95,6 +95,7 @@ typedef struct QPointer< QPlainTextEdit > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QPlainTextEdit; QT_G_FUNC( hbqt_gcRelease_QPlainTextEdit ) @@ -141,6 +142,7 @@ void * hbqt_gcAllocate_QPlainTextEdit( void * pObj, bool bNew ) new( & p->ph ) QPointer< QPlainTextEdit >( ( QPlainTextEdit * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QPlainTextEdit; + p->type = QT_TYPE_QPlainTextEdit; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QPolygon.cpp b/harbour/contrib/hbqt/qtgui/QPolygon.cpp index c5d7875014..bf2a354a9c 100644 --- a/harbour/contrib/hbqt/qtgui/QPolygon.cpp +++ b/harbour/contrib/hbqt/qtgui/QPolygon.cpp @@ -83,6 +83,7 @@ typedef struct QPolygon * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QPolygon; QT_G_FUNC( hbqt_gcRelease_QPolygon ) @@ -118,6 +119,7 @@ void * hbqt_gcAllocate_QPolygon( void * pObj, bool bNew ) p->ph = ( QPolygon * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QPolygon; + p->type = QT_TYPE_QPolygon; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QPolygonF.cpp b/harbour/contrib/hbqt/qtgui/QPolygonF.cpp index 042606f37a..092719bb64 100644 --- a/harbour/contrib/hbqt/qtgui/QPolygonF.cpp +++ b/harbour/contrib/hbqt/qtgui/QPolygonF.cpp @@ -84,6 +84,7 @@ typedef struct QPolygonF * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QPolygonF; QT_G_FUNC( hbqt_gcRelease_QPolygonF ) @@ -119,6 +120,7 @@ void * hbqt_gcAllocate_QPolygonF( void * pObj, bool bNew ) p->ph = ( QPolygonF * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QPolygonF; + p->type = QT_TYPE_QPolygonF; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QPrintDialog.cpp b/harbour/contrib/hbqt/qtgui/QPrintDialog.cpp index b49015b039..18c9b8538f 100644 --- a/harbour/contrib/hbqt/qtgui/QPrintDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QPrintDialog.cpp @@ -86,6 +86,7 @@ typedef struct QPointer< QPrintDialog > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QPrintDialog; QT_G_FUNC( hbqt_gcRelease_QPrintDialog ) @@ -132,6 +133,7 @@ void * hbqt_gcAllocate_QPrintDialog( void * pObj, bool bNew ) new( & p->ph ) QPointer< QPrintDialog >( ( QPrintDialog * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QPrintDialog; + p->type = QT_TYPE_QPrintDialog; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QPrintEngine.cpp b/harbour/contrib/hbqt/qtgui/QPrintEngine.cpp index 8f722a4fef..a1a8b60a58 100644 --- a/harbour/contrib/hbqt/qtgui/QPrintEngine.cpp +++ b/harbour/contrib/hbqt/qtgui/QPrintEngine.cpp @@ -83,6 +83,7 @@ typedef struct QPrintEngine * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QPrintEngine; QT_G_FUNC( hbqt_gcRelease_QPrintEngine ) @@ -103,6 +104,7 @@ void * hbqt_gcAllocate_QPrintEngine( void * pObj, bool bNew ) p->ph = ( QPrintEngine * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QPrintEngine; + p->type = QT_TYPE_QPrintEngine; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QPrintPreviewDialog.cpp b/harbour/contrib/hbqt/qtgui/QPrintPreviewDialog.cpp index 5fe847314f..6b70b119a5 100644 --- a/harbour/contrib/hbqt/qtgui/QPrintPreviewDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QPrintPreviewDialog.cpp @@ -81,6 +81,7 @@ typedef struct QPointer< QPrintPreviewDialog > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QPrintPreviewDialog; QT_G_FUNC( hbqt_gcRelease_QPrintPreviewDialog ) @@ -127,6 +128,7 @@ void * hbqt_gcAllocate_QPrintPreviewDialog( void * pObj, bool bNew ) new( & p->ph ) QPointer< QPrintPreviewDialog >( ( QPrintPreviewDialog * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QPrintPreviewDialog; + p->type = QT_TYPE_QPrintPreviewDialog; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QPrinter.cpp b/harbour/contrib/hbqt/qtgui/QPrinter.cpp index f47a319142..541747fac4 100644 --- a/harbour/contrib/hbqt/qtgui/QPrinter.cpp +++ b/harbour/contrib/hbqt/qtgui/QPrinter.cpp @@ -95,6 +95,7 @@ typedef struct QPrinter * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QPrinter; QT_G_FUNC( hbqt_gcRelease_QPrinter ) @@ -130,6 +131,7 @@ void * hbqt_gcAllocate_QPrinter( void * pObj, bool bNew ) p->ph = ( QPrinter * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QPrinter; + p->type = QT_TYPE_QPrinter; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QProgressBar.cpp b/harbour/contrib/hbqt/qtgui/QProgressBar.cpp index c29bed222c..8c1ea31837 100644 --- a/harbour/contrib/hbqt/qtgui/QProgressBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QProgressBar.cpp @@ -83,6 +83,7 @@ typedef struct QPointer< QProgressBar > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QProgressBar; QT_G_FUNC( hbqt_gcRelease_QProgressBar ) @@ -129,6 +130,7 @@ void * hbqt_gcAllocate_QProgressBar( void * pObj, bool bNew ) new( & p->ph ) QPointer< QProgressBar >( ( QProgressBar * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QProgressBar; + p->type = QT_TYPE_QProgressBar; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QProgressDialog.cpp b/harbour/contrib/hbqt/qtgui/QProgressDialog.cpp index 8af3b4286f..935c19bbbf 100644 --- a/harbour/contrib/hbqt/qtgui/QProgressDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QProgressDialog.cpp @@ -81,6 +81,7 @@ typedef struct QPointer< QProgressDialog > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QProgressDialog; QT_G_FUNC( hbqt_gcRelease_QProgressDialog ) @@ -127,6 +128,7 @@ void * hbqt_gcAllocate_QProgressDialog( void * pObj, bool bNew ) new( & p->ph ) QPointer< QProgressDialog >( ( QProgressDialog * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QProgressDialog; + p->type = QT_TYPE_QProgressDialog; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QPushButton.cpp b/harbour/contrib/hbqt/qtgui/QPushButton.cpp index 9646fa8f69..78b3fea479 100644 --- a/harbour/contrib/hbqt/qtgui/QPushButton.cpp +++ b/harbour/contrib/hbqt/qtgui/QPushButton.cpp @@ -82,6 +82,7 @@ typedef struct QPointer< QPushButton > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QPushButton; QT_G_FUNC( hbqt_gcRelease_QPushButton ) @@ -128,6 +129,7 @@ void * hbqt_gcAllocate_QPushButton( void * pObj, bool bNew ) new( & p->ph ) QPointer< QPushButton >( ( QPushButton * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QPushButton; + p->type = QT_TYPE_QPushButton; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QRadialGradient.cpp b/harbour/contrib/hbqt/qtgui/QRadialGradient.cpp index 5a0743270d..a91aa0330f 100644 --- a/harbour/contrib/hbqt/qtgui/QRadialGradient.cpp +++ b/harbour/contrib/hbqt/qtgui/QRadialGradient.cpp @@ -89,6 +89,7 @@ typedef struct QRadialGradient * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QRadialGradient; QT_G_FUNC( hbqt_gcRelease_QRadialGradient ) @@ -124,6 +125,7 @@ void * hbqt_gcAllocate_QRadialGradient( void * pObj, bool bNew ) p->ph = ( QRadialGradient * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QRadialGradient; + p->type = QT_TYPE_QRadialGradient; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QRadioButton.cpp b/harbour/contrib/hbqt/qtgui/QRadioButton.cpp index 988552c542..58647f5947 100644 --- a/harbour/contrib/hbqt/qtgui/QRadioButton.cpp +++ b/harbour/contrib/hbqt/qtgui/QRadioButton.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QRadioButton > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QRadioButton; QT_G_FUNC( hbqt_gcRelease_QRadioButton ) @@ -126,6 +127,7 @@ void * hbqt_gcAllocate_QRadioButton( void * pObj, bool bNew ) new( & p->ph ) QPointer< QRadioButton >( ( QRadioButton * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QRadioButton; + p->type = QT_TYPE_QRadioButton; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QRegion.cpp b/harbour/contrib/hbqt/qtgui/QRegion.cpp index 8e8d9cf7b3..759cb59365 100644 --- a/harbour/contrib/hbqt/qtgui/QRegion.cpp +++ b/harbour/contrib/hbqt/qtgui/QRegion.cpp @@ -102,6 +102,7 @@ typedef struct QRegion * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QRegion; QT_G_FUNC( hbqt_gcRelease_QRegion ) @@ -137,6 +138,7 @@ void * hbqt_gcAllocate_QRegion( void * pObj, bool bNew ) p->ph = ( QRegion * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QRegion; + p->type = QT_TYPE_QRegion; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QResizeEvent.cpp b/harbour/contrib/hbqt/qtgui/QResizeEvent.cpp index 59ecdedf8a..0bc87fed4b 100644 --- a/harbour/contrib/hbqt/qtgui/QResizeEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QResizeEvent.cpp @@ -79,6 +79,7 @@ typedef struct QResizeEvent * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QResizeEvent; QT_G_FUNC( hbqt_gcRelease_QResizeEvent ) @@ -99,6 +100,7 @@ void * hbqt_gcAllocate_QResizeEvent( void * pObj, bool bNew ) p->ph = ( QResizeEvent * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QResizeEvent; + p->type = QT_TYPE_QResizeEvent; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QScrollArea.cpp b/harbour/contrib/hbqt/qtgui/QScrollArea.cpp index ae46ff2575..f716b15a72 100644 --- a/harbour/contrib/hbqt/qtgui/QScrollArea.cpp +++ b/harbour/contrib/hbqt/qtgui/QScrollArea.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QScrollArea > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QScrollArea; QT_G_FUNC( hbqt_gcRelease_QScrollArea ) @@ -126,6 +127,7 @@ void * hbqt_gcAllocate_QScrollArea( void * pObj, bool bNew ) new( & p->ph ) QPointer< QScrollArea >( ( QScrollArea * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QScrollArea; + p->type = QT_TYPE_QScrollArea; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QScrollBar.cpp b/harbour/contrib/hbqt/qtgui/QScrollBar.cpp index 1c149563b6..2631b464e4 100644 --- a/harbour/contrib/hbqt/qtgui/QScrollBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QScrollBar.cpp @@ -81,6 +81,7 @@ typedef struct QPointer< QScrollBar > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QScrollBar; QT_G_FUNC( hbqt_gcRelease_QScrollBar ) @@ -127,6 +128,7 @@ void * hbqt_gcAllocate_QScrollBar( void * pObj, bool bNew ) new( & p->ph ) QPointer< QScrollBar >( ( QScrollBar * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QScrollBar; + p->type = QT_TYPE_QScrollBar; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QSessionManager.cpp b/harbour/contrib/hbqt/qtgui/QSessionManager.cpp index 8368fc4a01..56ca61ee89 100644 --- a/harbour/contrib/hbqt/qtgui/QSessionManager.cpp +++ b/harbour/contrib/hbqt/qtgui/QSessionManager.cpp @@ -83,6 +83,7 @@ typedef struct QPointer< QSessionManager > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QSessionManager; QT_G_FUNC( hbqt_gcRelease_QSessionManager ) @@ -103,6 +104,7 @@ void * hbqt_gcAllocate_QSessionManager( void * pObj, bool bNew ) new( & p->ph ) QPointer< QSessionManager >( ( QSessionManager * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QSessionManager; + p->type = QT_TYPE_QSessionManager; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QShowEvent.cpp b/harbour/contrib/hbqt/qtgui/QShowEvent.cpp index 61acd71245..a0019734e5 100644 --- a/harbour/contrib/hbqt/qtgui/QShowEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QShowEvent.cpp @@ -79,6 +79,7 @@ typedef struct QShowEvent * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QShowEvent; QT_G_FUNC( hbqt_gcRelease_QShowEvent ) @@ -99,6 +100,7 @@ void * hbqt_gcAllocate_QShowEvent( void * pObj, bool bNew ) p->ph = ( QShowEvent * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QShowEvent; + p->type = QT_TYPE_QShowEvent; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QSizeGrip.cpp b/harbour/contrib/hbqt/qtgui/QSizeGrip.cpp index 228de437f1..3e6161a936 100644 --- a/harbour/contrib/hbqt/qtgui/QSizeGrip.cpp +++ b/harbour/contrib/hbqt/qtgui/QSizeGrip.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QSizeGrip > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QSizeGrip; QT_G_FUNC( hbqt_gcRelease_QSizeGrip ) @@ -126,6 +127,7 @@ void * hbqt_gcAllocate_QSizeGrip( void * pObj, bool bNew ) new( & p->ph ) QPointer< QSizeGrip >( ( QSizeGrip * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QSizeGrip; + p->type = QT_TYPE_QSizeGrip; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QSizePolicy.cpp b/harbour/contrib/hbqt/qtgui/QSizePolicy.cpp index bb35d3568f..5d303a9ba4 100644 --- a/harbour/contrib/hbqt/qtgui/QSizePolicy.cpp +++ b/harbour/contrib/hbqt/qtgui/QSizePolicy.cpp @@ -88,6 +88,7 @@ typedef struct QSizePolicy * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QSizePolicy; QT_G_FUNC( hbqt_gcRelease_QSizePolicy ) @@ -123,6 +124,7 @@ void * hbqt_gcAllocate_QSizePolicy( void * pObj, bool bNew ) p->ph = ( QSizePolicy * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QSizePolicy; + p->type = QT_TYPE_QSizePolicy; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QSlider.cpp b/harbour/contrib/hbqt/qtgui/QSlider.cpp index 5bd0226c5f..4f08951656 100644 --- a/harbour/contrib/hbqt/qtgui/QSlider.cpp +++ b/harbour/contrib/hbqt/qtgui/QSlider.cpp @@ -85,6 +85,7 @@ typedef struct QPointer< QSlider > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QSlider; QT_G_FUNC( hbqt_gcRelease_QSlider ) @@ -131,6 +132,7 @@ void * hbqt_gcAllocate_QSlider( void * pObj, bool bNew ) new( & p->ph ) QPointer< QSlider >( ( QSlider * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QSlider; + p->type = QT_TYPE_QSlider; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QSound.cpp b/harbour/contrib/hbqt/qtgui/QSound.cpp index 62ac0f5a4d..672587e2da 100644 --- a/harbour/contrib/hbqt/qtgui/QSound.cpp +++ b/harbour/contrib/hbqt/qtgui/QSound.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QSound > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QSound; QT_G_FUNC( hbqt_gcRelease_QSound ) @@ -126,6 +127,7 @@ void * hbqt_gcAllocate_QSound( void * pObj, bool bNew ) new( & p->ph ) QPointer< QSound >( ( QSound * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QSound; + p->type = QT_TYPE_QSound; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QSpacerItem.cpp b/harbour/contrib/hbqt/qtgui/QSpacerItem.cpp index 17386d8571..feee1716db 100644 --- a/harbour/contrib/hbqt/qtgui/QSpacerItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QSpacerItem.cpp @@ -79,6 +79,7 @@ typedef struct QSpacerItem * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QSpacerItem; QT_G_FUNC( hbqt_gcRelease_QSpacerItem ) @@ -114,6 +115,7 @@ void * hbqt_gcAllocate_QSpacerItem( void * pObj, bool bNew ) p->ph = ( QSpacerItem * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QSpacerItem; + p->type = QT_TYPE_QSpacerItem; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QSpinBox.cpp b/harbour/contrib/hbqt/qtgui/QSpinBox.cpp index c71963e36d..356ebe0ba9 100644 --- a/harbour/contrib/hbqt/qtgui/QSpinBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QSpinBox.cpp @@ -79,6 +79,7 @@ typedef struct QPointer< QSpinBox > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QSpinBox; QT_G_FUNC( hbqt_gcRelease_QSpinBox ) @@ -125,6 +126,7 @@ void * hbqt_gcAllocate_QSpinBox( void * pObj, bool bNew ) new( & p->ph ) QPointer< QSpinBox >( ( QSpinBox * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QSpinBox; + p->type = QT_TYPE_QSpinBox; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QSplashScreen.cpp b/harbour/contrib/hbqt/qtgui/QSplashScreen.cpp index 4525c3149a..8a63dba29c 100644 --- a/harbour/contrib/hbqt/qtgui/QSplashScreen.cpp +++ b/harbour/contrib/hbqt/qtgui/QSplashScreen.cpp @@ -81,6 +81,7 @@ typedef struct QPointer< QSplashScreen > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QSplashScreen; QT_G_FUNC( hbqt_gcRelease_QSplashScreen ) @@ -127,6 +128,7 @@ void * hbqt_gcAllocate_QSplashScreen( void * pObj, bool bNew ) new( & p->ph ) QPointer< QSplashScreen >( ( QSplashScreen * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QSplashScreen; + p->type = QT_TYPE_QSplashScreen; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QSplitter.cpp b/harbour/contrib/hbqt/qtgui/QSplitter.cpp index 75a6b775e1..aec5c10f13 100644 --- a/harbour/contrib/hbqt/qtgui/QSplitter.cpp +++ b/harbour/contrib/hbqt/qtgui/QSplitter.cpp @@ -94,6 +94,7 @@ typedef struct QPointer< QSplitter > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QSplitter; QT_G_FUNC( hbqt_gcRelease_QSplitter ) @@ -140,6 +141,7 @@ void * hbqt_gcAllocate_QSplitter( void * pObj, bool bNew ) new( & p->ph ) QPointer< QSplitter >( ( QSplitter * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QSplitter; + p->type = QT_TYPE_QSplitter; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStackedWidget.cpp b/harbour/contrib/hbqt/qtgui/QStackedWidget.cpp index 27d4d974d2..b2d96743a0 100644 --- a/harbour/contrib/hbqt/qtgui/QStackedWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QStackedWidget.cpp @@ -81,6 +81,7 @@ typedef struct QPointer< QStackedWidget > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStackedWidget; QT_G_FUNC( hbqt_gcRelease_QStackedWidget ) @@ -127,6 +128,7 @@ void * hbqt_gcAllocate_QStackedWidget( void * pObj, bool bNew ) new( & p->ph ) QPointer< QStackedWidget >( ( QStackedWidget * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QStackedWidget; + p->type = QT_TYPE_QStackedWidget; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStandardItem.cpp b/harbour/contrib/hbqt/qtgui/QStandardItem.cpp index 3a9c311dd0..c9de05925c 100644 --- a/harbour/contrib/hbqt/qtgui/QStandardItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QStandardItem.cpp @@ -101,6 +101,7 @@ typedef struct QStandardItem * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStandardItem; QT_G_FUNC( hbqt_gcRelease_QStandardItem ) @@ -136,6 +137,7 @@ void * hbqt_gcAllocate_QStandardItem( void * pObj, bool bNew ) p->ph = ( QStandardItem * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStandardItem; + p->type = QT_TYPE_QStandardItem; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStandardItemModel.cpp b/harbour/contrib/hbqt/qtgui/QStandardItemModel.cpp index 9a1d447392..476c117082 100644 --- a/harbour/contrib/hbqt/qtgui/QStandardItemModel.cpp +++ b/harbour/contrib/hbqt/qtgui/QStandardItemModel.cpp @@ -97,6 +97,7 @@ typedef struct QPointer< QStandardItemModel > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStandardItemModel; QT_G_FUNC( hbqt_gcRelease_QStandardItemModel ) @@ -143,6 +144,7 @@ void * hbqt_gcAllocate_QStandardItemModel( void * pObj, bool bNew ) new( & p->ph ) QPointer< QStandardItemModel >( ( QStandardItemModel * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QStandardItemModel; + p->type = QT_TYPE_QStandardItemModel; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStatusBar.cpp b/harbour/contrib/hbqt/qtgui/QStatusBar.cpp index 3bfb34a305..2392d6299e 100644 --- a/harbour/contrib/hbqt/qtgui/QStatusBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QStatusBar.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QStatusBar > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStatusBar; QT_G_FUNC( hbqt_gcRelease_QStatusBar ) @@ -126,6 +127,7 @@ void * hbqt_gcAllocate_QStatusBar( void * pObj, bool bNew ) new( & p->ph ) QPointer< QStatusBar >( ( QStatusBar * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QStatusBar; + p->type = QT_TYPE_QStatusBar; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStringListModel.cpp b/harbour/contrib/hbqt/qtgui/QStringListModel.cpp index d05af9b63c..d191980c1f 100644 --- a/harbour/contrib/hbqt/qtgui/QStringListModel.cpp +++ b/harbour/contrib/hbqt/qtgui/QStringListModel.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QStringListModel > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStringListModel; QT_G_FUNC( hbqt_gcRelease_QStringListModel ) @@ -126,6 +127,7 @@ void * hbqt_gcAllocate_QStringListModel( void * pObj, bool bNew ) new( & p->ph ) QPointer< QStringListModel >( ( QStringListModel * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QStringListModel; + p->type = QT_TYPE_QStringListModel; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyle.cpp b/harbour/contrib/hbqt/qtgui/QStyle.cpp index 6b00065907..ae458b54d3 100644 --- a/harbour/contrib/hbqt/qtgui/QStyle.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyle.cpp @@ -95,6 +95,7 @@ typedef struct QPointer< QStyle > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyle; QT_G_FUNC( hbqt_gcRelease_QStyle ) @@ -115,6 +116,7 @@ void * hbqt_gcAllocate_QStyle( void * pObj, bool bNew ) new( & p->ph ) QPointer< QStyle >( ( QStyle * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QStyle; + p->type = QT_TYPE_QStyle; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyleFactory.cpp b/harbour/contrib/hbqt/qtgui/QStyleFactory.cpp index 8860725b8c..ff4010fb83 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleFactory.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleFactory.cpp @@ -79,6 +79,7 @@ typedef struct QStyleFactory * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyleFactory; QT_G_FUNC( hbqt_gcRelease_QStyleFactory ) @@ -114,6 +115,7 @@ void * hbqt_gcAllocate_QStyleFactory( void * pObj, bool bNew ) p->ph = ( QStyleFactory * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStyleFactory; + p->type = QT_TYPE_QStyleFactory; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyleHintReturn.cpp b/harbour/contrib/hbqt/qtgui/QStyleHintReturn.cpp index dd08dd2b66..12a6d2bb33 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleHintReturn.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleHintReturn.cpp @@ -95,6 +95,7 @@ typedef struct QStyleHintReturn * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyleHintReturn; QT_G_FUNC( hbqt_gcRelease_QStyleHintReturn ) @@ -115,6 +116,7 @@ void * hbqt_gcAllocate_QStyleHintReturn( void * pObj, bool bNew ) p->ph = ( QStyleHintReturn * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStyleHintReturn; + p->type = QT_TYPE_QStyleHintReturn; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyleHintReturnMask.cpp b/harbour/contrib/hbqt/qtgui/QStyleHintReturnMask.cpp index 80a178fd25..c4bfdd883c 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleHintReturnMask.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleHintReturnMask.cpp @@ -93,6 +93,7 @@ typedef struct QStyleHintReturnMask * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyleHintReturnMask; QT_G_FUNC( hbqt_gcRelease_QStyleHintReturnMask ) @@ -113,6 +114,7 @@ void * hbqt_gcAllocate_QStyleHintReturnMask( void * pObj, bool bNew ) p->ph = ( QStyleHintReturnMask * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStyleHintReturnMask; + p->type = QT_TYPE_QStyleHintReturnMask; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyleHintReturnVariant.cpp b/harbour/contrib/hbqt/qtgui/QStyleHintReturnVariant.cpp index 3a54932e0a..a17348781f 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleHintReturnVariant.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleHintReturnVariant.cpp @@ -94,6 +94,7 @@ typedef struct QStyleHintReturnVariant * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyleHintReturnVariant; QT_G_FUNC( hbqt_gcRelease_QStyleHintReturnVariant ) @@ -114,6 +115,7 @@ void * hbqt_gcAllocate_QStyleHintReturnVariant( void * pObj, bool bNew ) p->ph = ( QStyleHintReturnVariant * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStyleHintReturnVariant; + p->type = QT_TYPE_QStyleHintReturnVariant; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyleOption.cpp b/harbour/contrib/hbqt/qtgui/QStyleOption.cpp index e97f7a4ebe..d6812d0504 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOption.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOption.cpp @@ -87,6 +87,7 @@ typedef struct QStyleOption * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyleOption; QT_G_FUNC( hbqt_gcRelease_QStyleOption ) @@ -122,6 +123,7 @@ void * hbqt_gcAllocate_QStyleOption( void * pObj, bool bNew ) p->ph = ( QStyleOption * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStyleOption; + p->type = QT_TYPE_QStyleOption; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionButton.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionButton.cpp index 50b14b630e..b586eec9fe 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionButton.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionButton.cpp @@ -87,6 +87,7 @@ typedef struct QStyleOptionButton * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyleOptionButton; QT_G_FUNC( hbqt_gcRelease_QStyleOptionButton ) @@ -122,6 +123,7 @@ void * hbqt_gcAllocate_QStyleOptionButton( void * pObj, bool bNew ) p->ph = ( QStyleOptionButton * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStyleOptionButton; + p->type = QT_TYPE_QStyleOptionButton; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionComboBox.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionComboBox.cpp index b1e84d3f60..93ccd3c3f6 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionComboBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionComboBox.cpp @@ -85,6 +85,7 @@ typedef struct QStyleOptionComboBox * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyleOptionComboBox; QT_G_FUNC( hbqt_gcRelease_QStyleOptionComboBox ) @@ -120,6 +121,7 @@ void * hbqt_gcAllocate_QStyleOptionComboBox( void * pObj, bool bNew ) p->ph = ( QStyleOptionComboBox * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStyleOptionComboBox; + p->type = QT_TYPE_QStyleOptionComboBox; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionComplex.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionComplex.cpp index 6c3e38efdf..b70dd025f4 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionComplex.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionComplex.cpp @@ -85,6 +85,7 @@ typedef struct QStyleOptionComplex * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyleOptionComplex; QT_G_FUNC( hbqt_gcRelease_QStyleOptionComplex ) @@ -120,6 +121,7 @@ void * hbqt_gcAllocate_QStyleOptionComplex( void * pObj, bool bNew ) p->ph = ( QStyleOptionComplex * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStyleOptionComplex; + p->type = QT_TYPE_QStyleOptionComplex; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionDockWidget.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionDockWidget.cpp index 31f5405d8c..8c6b7a1ad7 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionDockWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionDockWidget.cpp @@ -85,6 +85,7 @@ typedef struct QStyleOptionDockWidget * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyleOptionDockWidget; QT_G_FUNC( hbqt_gcRelease_QStyleOptionDockWidget ) @@ -120,6 +121,7 @@ void * hbqt_gcAllocate_QStyleOptionDockWidget( void * pObj, bool bNew ) p->ph = ( QStyleOptionDockWidget * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStyleOptionDockWidget; + p->type = QT_TYPE_QStyleOptionDockWidget; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionFocusRect.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionFocusRect.cpp index 2e0e7680fa..5844300c6d 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionFocusRect.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionFocusRect.cpp @@ -85,6 +85,7 @@ typedef struct QStyleOptionFocusRect * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyleOptionFocusRect; QT_G_FUNC( hbqt_gcRelease_QStyleOptionFocusRect ) @@ -120,6 +121,7 @@ void * hbqt_gcAllocate_QStyleOptionFocusRect( void * pObj, bool bNew ) p->ph = ( QStyleOptionFocusRect * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStyleOptionFocusRect; + p->type = QT_TYPE_QStyleOptionFocusRect; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionFrame.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionFrame.cpp index ef97ec829e..e9ccb1f8b8 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionFrame.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionFrame.cpp @@ -85,6 +85,7 @@ typedef struct QStyleOptionFrame * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyleOptionFrame; QT_G_FUNC( hbqt_gcRelease_QStyleOptionFrame ) @@ -120,6 +121,7 @@ void * hbqt_gcAllocate_QStyleOptionFrame( void * pObj, bool bNew ) p->ph = ( QStyleOptionFrame * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStyleOptionFrame; + p->type = QT_TYPE_QStyleOptionFrame; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionGroupBox.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionGroupBox.cpp index ec6b725e40..d6e4af8370 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionGroupBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionGroupBox.cpp @@ -85,6 +85,7 @@ typedef struct QStyleOptionGroupBox * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyleOptionGroupBox; QT_G_FUNC( hbqt_gcRelease_QStyleOptionGroupBox ) @@ -120,6 +121,7 @@ void * hbqt_gcAllocate_QStyleOptionGroupBox( void * pObj, bool bNew ) p->ph = ( QStyleOptionGroupBox * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStyleOptionGroupBox; + p->type = QT_TYPE_QStyleOptionGroupBox; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionHeader.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionHeader.cpp index 1544eb94bb..aebe1c4ce2 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionHeader.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionHeader.cpp @@ -88,6 +88,7 @@ typedef struct QStyleOptionHeader * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyleOptionHeader; QT_G_FUNC( hbqt_gcRelease_QStyleOptionHeader ) @@ -123,6 +124,7 @@ void * hbqt_gcAllocate_QStyleOptionHeader( void * pObj, bool bNew ) p->ph = ( QStyleOptionHeader * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStyleOptionHeader; + p->type = QT_TYPE_QStyleOptionHeader; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionMenuItem.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionMenuItem.cpp index dc5861ca36..7b4b8a586c 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionMenuItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionMenuItem.cpp @@ -87,6 +87,7 @@ typedef struct QStyleOptionMenuItem * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyleOptionMenuItem; QT_G_FUNC( hbqt_gcRelease_QStyleOptionMenuItem ) @@ -122,6 +123,7 @@ void * hbqt_gcAllocate_QStyleOptionMenuItem( void * pObj, bool bNew ) p->ph = ( QStyleOptionMenuItem * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStyleOptionMenuItem; + p->type = QT_TYPE_QStyleOptionMenuItem; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionProgressBar.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionProgressBar.cpp index ab052b1475..da29f444de 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionProgressBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionProgressBar.cpp @@ -86,6 +86,7 @@ typedef struct QStyleOptionProgressBar * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyleOptionProgressBar; QT_G_FUNC( hbqt_gcRelease_QStyleOptionProgressBar ) @@ -121,6 +122,7 @@ void * hbqt_gcAllocate_QStyleOptionProgressBar( void * pObj, bool bNew ) p->ph = ( QStyleOptionProgressBar * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStyleOptionProgressBar; + p->type = QT_TYPE_QStyleOptionProgressBar; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionSizeGrip.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionSizeGrip.cpp index c0ea66ebd1..e79ab49cf3 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionSizeGrip.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionSizeGrip.cpp @@ -85,6 +85,7 @@ typedef struct QStyleOptionSizeGrip * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyleOptionSizeGrip; QT_G_FUNC( hbqt_gcRelease_QStyleOptionSizeGrip ) @@ -120,6 +121,7 @@ void * hbqt_gcAllocate_QStyleOptionSizeGrip( void * pObj, bool bNew ) p->ph = ( QStyleOptionSizeGrip * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStyleOptionSizeGrip; + p->type = QT_TYPE_QStyleOptionSizeGrip; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionSlider.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionSlider.cpp index 715d13f609..a5461e5b33 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionSlider.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionSlider.cpp @@ -85,6 +85,7 @@ typedef struct QStyleOptionSlider * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyleOptionSlider; QT_G_FUNC( hbqt_gcRelease_QStyleOptionSlider ) @@ -120,6 +121,7 @@ void * hbqt_gcAllocate_QStyleOptionSlider( void * pObj, bool bNew ) p->ph = ( QStyleOptionSlider * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStyleOptionSlider; + p->type = QT_TYPE_QStyleOptionSlider; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionSpinBox.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionSpinBox.cpp index c82a659123..1c99f3fca7 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionSpinBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionSpinBox.cpp @@ -85,6 +85,7 @@ typedef struct QStyleOptionSpinBox * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyleOptionSpinBox; QT_G_FUNC( hbqt_gcRelease_QStyleOptionSpinBox ) @@ -120,6 +121,7 @@ void * hbqt_gcAllocate_QStyleOptionSpinBox( void * pObj, bool bNew ) p->ph = ( QStyleOptionSpinBox * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStyleOptionSpinBox; + p->type = QT_TYPE_QStyleOptionSpinBox; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionTab.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionTab.cpp index 9a9edcb208..54465b0a3f 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionTab.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionTab.cpp @@ -89,6 +89,7 @@ typedef struct QStyleOptionTab * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyleOptionTab; QT_G_FUNC( hbqt_gcRelease_QStyleOptionTab ) @@ -124,6 +125,7 @@ void * hbqt_gcAllocate_QStyleOptionTab( void * pObj, bool bNew ) p->ph = ( QStyleOptionTab * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStyleOptionTab; + p->type = QT_TYPE_QStyleOptionTab; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionTabBarBase.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionTabBarBase.cpp index f9f9f8a728..005fa0bd1c 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionTabBarBase.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionTabBarBase.cpp @@ -85,6 +85,7 @@ typedef struct QStyleOptionTabBarBase * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyleOptionTabBarBase; QT_G_FUNC( hbqt_gcRelease_QStyleOptionTabBarBase ) @@ -120,6 +121,7 @@ void * hbqt_gcAllocate_QStyleOptionTabBarBase( void * pObj, bool bNew ) p->ph = ( QStyleOptionTabBarBase * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStyleOptionTabBarBase; + p->type = QT_TYPE_QStyleOptionTabBarBase; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionTabWidgetFrame.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionTabWidgetFrame.cpp index a8a9af6dc9..db5006e428 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionTabWidgetFrame.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionTabWidgetFrame.cpp @@ -85,6 +85,7 @@ typedef struct QStyleOptionTabWidgetFrame * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyleOptionTabWidgetFrame; QT_G_FUNC( hbqt_gcRelease_QStyleOptionTabWidgetFrame ) @@ -120,6 +121,7 @@ void * hbqt_gcAllocate_QStyleOptionTabWidgetFrame( void * pObj, bool bNew ) p->ph = ( QStyleOptionTabWidgetFrame * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStyleOptionTabWidgetFrame; + p->type = QT_TYPE_QStyleOptionTabWidgetFrame; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionTitleBar.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionTitleBar.cpp index a27e19efec..8a54b6ed71 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionTitleBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionTitleBar.cpp @@ -85,6 +85,7 @@ typedef struct QStyleOptionTitleBar * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyleOptionTitleBar; QT_G_FUNC( hbqt_gcRelease_QStyleOptionTitleBar ) @@ -120,6 +121,7 @@ void * hbqt_gcAllocate_QStyleOptionTitleBar( void * pObj, bool bNew ) p->ph = ( QStyleOptionTitleBar * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStyleOptionTitleBar; + p->type = QT_TYPE_QStyleOptionTitleBar; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionToolBar.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionToolBar.cpp index b99d90e85e..0eb16a6c9a 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionToolBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionToolBar.cpp @@ -88,6 +88,7 @@ typedef struct QStyleOptionToolBar * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyleOptionToolBar; QT_G_FUNC( hbqt_gcRelease_QStyleOptionToolBar ) @@ -123,6 +124,7 @@ void * hbqt_gcAllocate_QStyleOptionToolBar( void * pObj, bool bNew ) p->ph = ( QStyleOptionToolBar * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStyleOptionToolBar; + p->type = QT_TYPE_QStyleOptionToolBar; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionToolBox.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionToolBox.cpp index eb3bd92319..1eeca20161 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionToolBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionToolBox.cpp @@ -85,6 +85,7 @@ typedef struct QStyleOptionToolBox * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyleOptionToolBox; QT_G_FUNC( hbqt_gcRelease_QStyleOptionToolBox ) @@ -120,6 +121,7 @@ void * hbqt_gcAllocate_QStyleOptionToolBox( void * pObj, bool bNew ) p->ph = ( QStyleOptionToolBox * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStyleOptionToolBox; + p->type = QT_TYPE_QStyleOptionToolBox; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionToolButton.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionToolButton.cpp index 09dbcbcfd9..c9e4cf110e 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionToolButton.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionToolButton.cpp @@ -87,6 +87,7 @@ typedef struct QStyleOptionToolButton * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyleOptionToolButton; QT_G_FUNC( hbqt_gcRelease_QStyleOptionToolButton ) @@ -122,6 +123,7 @@ void * hbqt_gcAllocate_QStyleOptionToolButton( void * pObj, bool bNew ) p->ph = ( QStyleOptionToolButton * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStyleOptionToolButton; + p->type = QT_TYPE_QStyleOptionToolButton; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionViewItem.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionViewItem.cpp index 3b2f33a287..63ee1c0af2 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionViewItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionViewItem.cpp @@ -86,6 +86,7 @@ typedef struct QStyleOptionViewItem * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyleOptionViewItem; QT_G_FUNC( hbqt_gcRelease_QStyleOptionViewItem ) @@ -121,6 +122,7 @@ void * hbqt_gcAllocate_QStyleOptionViewItem( void * pObj, bool bNew ) p->ph = ( QStyleOptionViewItem * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStyleOptionViewItem; + p->type = QT_TYPE_QStyleOptionViewItem; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStylePainter.cpp b/harbour/contrib/hbqt/qtgui/QStylePainter.cpp index 1179e04b4a..4fc39eb4e9 100644 --- a/harbour/contrib/hbqt/qtgui/QStylePainter.cpp +++ b/harbour/contrib/hbqt/qtgui/QStylePainter.cpp @@ -81,6 +81,7 @@ typedef struct QStylePainter * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStylePainter; QT_G_FUNC( hbqt_gcRelease_QStylePainter ) @@ -116,6 +117,7 @@ void * hbqt_gcAllocate_QStylePainter( void * pObj, bool bNew ) p->ph = ( QStylePainter * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QStylePainter; + p->type = QT_TYPE_QStylePainter; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QStyledItemDelegate.cpp b/harbour/contrib/hbqt/qtgui/QStyledItemDelegate.cpp index d69695e265..017f05010e 100644 --- a/harbour/contrib/hbqt/qtgui/QStyledItemDelegate.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyledItemDelegate.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QStyledItemDelegate > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QStyledItemDelegate; QT_G_FUNC( hbqt_gcRelease_QStyledItemDelegate ) @@ -126,6 +127,7 @@ void * hbqt_gcAllocate_QStyledItemDelegate( void * pObj, bool bNew ) new( & p->ph ) QPointer< QStyledItemDelegate >( ( QStyledItemDelegate * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QStyledItemDelegate; + p->type = QT_TYPE_QStyledItemDelegate; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QSyntaxHighlighter.cpp b/harbour/contrib/hbqt/qtgui/QSyntaxHighlighter.cpp index e824980987..1ac9c1fa4e 100644 --- a/harbour/contrib/hbqt/qtgui/QSyntaxHighlighter.cpp +++ b/harbour/contrib/hbqt/qtgui/QSyntaxHighlighter.cpp @@ -82,6 +82,7 @@ typedef struct QPointer< QSyntaxHighlighter > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QSyntaxHighlighter; QT_G_FUNC( hbqt_gcRelease_QSyntaxHighlighter ) @@ -102,6 +103,7 @@ void * hbqt_gcAllocate_QSyntaxHighlighter( void * pObj, bool bNew ) new( & p->ph ) QPointer< QSyntaxHighlighter >( ( QSyntaxHighlighter * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QSyntaxHighlighter; + p->type = QT_TYPE_QSyntaxHighlighter; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QSystemTrayIcon.cpp b/harbour/contrib/hbqt/qtgui/QSystemTrayIcon.cpp index 15d17dff38..142a1f5177 100644 --- a/harbour/contrib/hbqt/qtgui/QSystemTrayIcon.cpp +++ b/harbour/contrib/hbqt/qtgui/QSystemTrayIcon.cpp @@ -86,6 +86,7 @@ typedef struct QPointer< QSystemTrayIcon > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QSystemTrayIcon; QT_G_FUNC( hbqt_gcRelease_QSystemTrayIcon ) @@ -132,6 +133,7 @@ void * hbqt_gcAllocate_QSystemTrayIcon( void * pObj, bool bNew ) new( & p->ph ) QPointer< QSystemTrayIcon >( ( QSystemTrayIcon * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QSystemTrayIcon; + p->type = QT_TYPE_QSystemTrayIcon; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTabBar.cpp b/harbour/contrib/hbqt/qtgui/QTabBar.cpp index cf46e01f25..5161825f0c 100644 --- a/harbour/contrib/hbqt/qtgui/QTabBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QTabBar.cpp @@ -87,6 +87,7 @@ typedef struct QPointer< QTabBar > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTabBar; QT_G_FUNC( hbqt_gcRelease_QTabBar ) @@ -133,6 +134,7 @@ void * hbqt_gcAllocate_QTabBar( void * pObj, bool bNew ) new( & p->ph ) QPointer< QTabBar >( ( QTabBar * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QTabBar; + p->type = QT_TYPE_QTabBar; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTabWidget.cpp b/harbour/contrib/hbqt/qtgui/QTabWidget.cpp index cf26914a45..f6a11917e5 100644 --- a/harbour/contrib/hbqt/qtgui/QTabWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QTabWidget.cpp @@ -94,6 +94,7 @@ typedef struct QPointer< QTabWidget > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTabWidget; QT_G_FUNC( hbqt_gcRelease_QTabWidget ) @@ -140,6 +141,7 @@ void * hbqt_gcAllocate_QTabWidget( void * pObj, bool bNew ) new( & p->ph ) QPointer< QTabWidget >( ( QTabWidget * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QTabWidget; + p->type = QT_TYPE_QTabWidget; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTableView.cpp b/harbour/contrib/hbqt/qtgui/QTableView.cpp index eccb8c540c..d1ca88ffc6 100644 --- a/harbour/contrib/hbqt/qtgui/QTableView.cpp +++ b/harbour/contrib/hbqt/qtgui/QTableView.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QTableView > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTableView; QT_G_FUNC( hbqt_gcRelease_QTableView ) @@ -126,6 +127,7 @@ void * hbqt_gcAllocate_QTableView( void * pObj, bool bNew ) new( & p->ph ) QPointer< QTableView >( ( QTableView * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QTableView; + p->type = QT_TYPE_QTableView; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTableWidget.cpp b/harbour/contrib/hbqt/qtgui/QTableWidget.cpp index 0410a93521..b7a30aab4d 100644 --- a/harbour/contrib/hbqt/qtgui/QTableWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QTableWidget.cpp @@ -94,6 +94,7 @@ typedef struct QPointer< QTableWidget > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTableWidget; QT_G_FUNC( hbqt_gcRelease_QTableWidget ) @@ -140,6 +141,7 @@ void * hbqt_gcAllocate_QTableWidget( void * pObj, bool bNew ) new( & p->ph ) QPointer< QTableWidget >( ( QTableWidget * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QTableWidget; + p->type = QT_TYPE_QTableWidget; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTableWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/QTableWidgetItem.cpp index eb48c40515..bfe0d08bce 100644 --- a/harbour/contrib/hbqt/qtgui/QTableWidgetItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QTableWidgetItem.cpp @@ -87,6 +87,7 @@ typedef struct QTableWidgetItem * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTableWidgetItem; QT_G_FUNC( hbqt_gcRelease_QTableWidgetItem ) @@ -122,6 +123,7 @@ void * hbqt_gcAllocate_QTableWidgetItem( void * pObj, bool bNew ) p->ph = ( QTableWidgetItem * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTableWidgetItem; + p->type = QT_TYPE_QTableWidgetItem; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTableWidgetSelectionRange.cpp b/harbour/contrib/hbqt/qtgui/QTableWidgetSelectionRange.cpp index d3fb4fdd7d..554d1b974e 100644 --- a/harbour/contrib/hbqt/qtgui/QTableWidgetSelectionRange.cpp +++ b/harbour/contrib/hbqt/qtgui/QTableWidgetSelectionRange.cpp @@ -81,6 +81,7 @@ typedef struct QTableWidgetSelectionRange * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTableWidgetSelectionRange; QT_G_FUNC( hbqt_gcRelease_QTableWidgetSelectionRange ) @@ -116,6 +117,7 @@ void * hbqt_gcAllocate_QTableWidgetSelectionRange( void * pObj, bool bNew ) p->ph = ( QTableWidgetSelectionRange * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTableWidgetSelectionRange; + p->type = QT_TYPE_QTableWidgetSelectionRange; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTextBlock.cpp b/harbour/contrib/hbqt/qtgui/QTextBlock.cpp index 7eb46d741a..d10b3acf9d 100644 --- a/harbour/contrib/hbqt/qtgui/QTextBlock.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextBlock.cpp @@ -80,6 +80,7 @@ typedef struct QTextBlock * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextBlock; QT_G_FUNC( hbqt_gcRelease_QTextBlock ) @@ -115,6 +116,7 @@ void * hbqt_gcAllocate_QTextBlock( void * pObj, bool bNew ) p->ph = ( QTextBlock * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTextBlock; + p->type = QT_TYPE_QTextBlock; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTextBlockFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextBlockFormat.cpp index 5dc8b94a24..cc3097db84 100644 --- a/harbour/contrib/hbqt/qtgui/QTextBlockFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextBlockFormat.cpp @@ -98,6 +98,7 @@ typedef struct QTextBlockFormat * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextBlockFormat; QT_G_FUNC( hbqt_gcRelease_QTextBlockFormat ) @@ -133,6 +134,7 @@ void * hbqt_gcAllocate_QTextBlockFormat( void * pObj, bool bNew ) p->ph = ( QTextBlockFormat * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTextBlockFormat; + p->type = QT_TYPE_QTextBlockFormat; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTextBlockGroup.cpp b/harbour/contrib/hbqt/qtgui/QTextBlockGroup.cpp index be9853930d..e0cf8ba83e 100644 --- a/harbour/contrib/hbqt/qtgui/QTextBlockGroup.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextBlockGroup.cpp @@ -79,6 +79,7 @@ typedef struct QPointer< QTextBlockGroup > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextBlockGroup; QT_G_FUNC( hbqt_gcRelease_QTextBlockGroup ) @@ -99,6 +100,7 @@ void * hbqt_gcAllocate_QTextBlockGroup( void * pObj, bool bNew ) new( & p->ph ) QPointer< QTextBlockGroup >( ( QTextBlockGroup * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QTextBlockGroup; + p->type = QT_TYPE_QTextBlockGroup; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTextBrowser.cpp b/harbour/contrib/hbqt/qtgui/QTextBrowser.cpp index d8ea0da507..6beb4a33ac 100644 --- a/harbour/contrib/hbqt/qtgui/QTextBrowser.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextBrowser.cpp @@ -79,6 +79,7 @@ typedef struct QPointer< QTextBrowser > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextBrowser; QT_G_FUNC( hbqt_gcRelease_QTextBrowser ) @@ -125,6 +126,7 @@ void * hbqt_gcAllocate_QTextBrowser( void * pObj, bool bNew ) new( & p->ph ) QPointer< QTextBrowser >( ( QTextBrowser * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QTextBrowser; + p->type = QT_TYPE_QTextBrowser; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTextCharFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextCharFormat.cpp index 27e8a0a728..1c06aa4979 100644 --- a/harbour/contrib/hbqt/qtgui/QTextCharFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextCharFormat.cpp @@ -85,6 +85,7 @@ typedef struct QTextCharFormat * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextCharFormat; QT_G_FUNC( hbqt_gcRelease_QTextCharFormat ) @@ -120,6 +121,7 @@ void * hbqt_gcAllocate_QTextCharFormat( void * pObj, bool bNew ) p->ph = ( QTextCharFormat * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTextCharFormat; + p->type = QT_TYPE_QTextCharFormat; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTextCursor.cpp b/harbour/contrib/hbqt/qtgui/QTextCursor.cpp index ad63dd283a..a44b58709d 100644 --- a/harbour/contrib/hbqt/qtgui/QTextCursor.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextCursor.cpp @@ -92,6 +92,7 @@ typedef struct QTextCursor * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextCursor; QT_G_FUNC( hbqt_gcRelease_QTextCursor ) @@ -127,6 +128,7 @@ void * hbqt_gcAllocate_QTextCursor( void * pObj, bool bNew ) p->ph = ( QTextCursor * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTextCursor; + p->type = QT_TYPE_QTextCursor; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTextDocument.cpp b/harbour/contrib/hbqt/qtgui/QTextDocument.cpp index b8ae663441..82ca68741f 100644 --- a/harbour/contrib/hbqt/qtgui/QTextDocument.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextDocument.cpp @@ -99,6 +99,7 @@ typedef struct QPointer< QTextDocument > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextDocument; QT_G_FUNC( hbqt_gcRelease_QTextDocument ) @@ -145,6 +146,7 @@ void * hbqt_gcAllocate_QTextDocument( void * pObj, bool bNew ) new( & p->ph ) QPointer< QTextDocument >( ( QTextDocument * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QTextDocument; + p->type = QT_TYPE_QTextDocument; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTextDocumentFragment.cpp b/harbour/contrib/hbqt/qtgui/QTextDocumentFragment.cpp index a3d88b8830..6ac132afa3 100644 --- a/harbour/contrib/hbqt/qtgui/QTextDocumentFragment.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextDocumentFragment.cpp @@ -83,6 +83,7 @@ typedef struct QTextDocumentFragment * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextDocumentFragment; QT_G_FUNC( hbqt_gcRelease_QTextDocumentFragment ) @@ -118,6 +119,7 @@ void * hbqt_gcAllocate_QTextDocumentFragment( void * pObj, bool bNew ) p->ph = ( QTextDocumentFragment * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTextDocumentFragment; + p->type = QT_TYPE_QTextDocumentFragment; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTextDocumentWriter.cpp b/harbour/contrib/hbqt/qtgui/QTextDocumentWriter.cpp index eda1ae4a4f..aa1187c1b9 100644 --- a/harbour/contrib/hbqt/qtgui/QTextDocumentWriter.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextDocumentWriter.cpp @@ -82,6 +82,7 @@ typedef struct QTextDocumentWriter * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextDocumentWriter; QT_G_FUNC( hbqt_gcRelease_QTextDocumentWriter ) @@ -117,6 +118,7 @@ void * hbqt_gcAllocate_QTextDocumentWriter( void * pObj, bool bNew ) p->ph = ( QTextDocumentWriter * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTextDocumentWriter; + p->type = QT_TYPE_QTextDocumentWriter; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTextEdit.cpp b/harbour/contrib/hbqt/qtgui/QTextEdit.cpp index 85ef49028c..d396a07056 100644 --- a/harbour/contrib/hbqt/qtgui/QTextEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextEdit.cpp @@ -99,6 +99,7 @@ typedef struct QPointer< QTextEdit > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextEdit; QT_G_FUNC( hbqt_gcRelease_QTextEdit ) @@ -145,6 +146,7 @@ void * hbqt_gcAllocate_QTextEdit( void * pObj, bool bNew ) new( & p->ph ) QPointer< QTextEdit >( ( QTextEdit * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QTextEdit; + p->type = QT_TYPE_QTextEdit; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTextFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextFormat.cpp index 9803619ad1..7528252e31 100644 --- a/harbour/contrib/hbqt/qtgui/QTextFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextFormat.cpp @@ -105,6 +105,7 @@ typedef struct QTextFormat * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextFormat; QT_G_FUNC( hbqt_gcRelease_QTextFormat ) @@ -140,6 +141,7 @@ void * hbqt_gcAllocate_QTextFormat( void * pObj, bool bNew ) p->ph = ( QTextFormat * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTextFormat; + p->type = QT_TYPE_QTextFormat; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTextFragment.cpp b/harbour/contrib/hbqt/qtgui/QTextFragment.cpp index 0ef2a1c7cc..b199bacffb 100644 --- a/harbour/contrib/hbqt/qtgui/QTextFragment.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextFragment.cpp @@ -80,6 +80,7 @@ typedef struct QTextFragment * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextFragment; QT_G_FUNC( hbqt_gcRelease_QTextFragment ) @@ -115,6 +116,7 @@ void * hbqt_gcAllocate_QTextFragment( void * pObj, bool bNew ) p->ph = ( QTextFragment * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTextFragment; + p->type = QT_TYPE_QTextFragment; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTextFrame.cpp b/harbour/contrib/hbqt/qtgui/QTextFrame.cpp index 3fe24c7b63..6b8de0b357 100644 --- a/harbour/contrib/hbqt/qtgui/QTextFrame.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextFrame.cpp @@ -81,6 +81,7 @@ typedef struct QPointer< QTextFrame > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextFrame; QT_G_FUNC( hbqt_gcRelease_QTextFrame ) @@ -127,6 +128,7 @@ void * hbqt_gcAllocate_QTextFrame( void * pObj, bool bNew ) new( & p->ph ) QPointer< QTextFrame >( ( QTextFrame * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QTextFrame; + p->type = QT_TYPE_QTextFrame; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTextFrameFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextFrameFormat.cpp index 3bda1397ab..d45ce1d5cd 100644 --- a/harbour/contrib/hbqt/qtgui/QTextFrameFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextFrameFormat.cpp @@ -89,6 +89,7 @@ typedef struct QTextFrameFormat * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextFrameFormat; QT_G_FUNC( hbqt_gcRelease_QTextFrameFormat ) @@ -124,6 +125,7 @@ void * hbqt_gcAllocate_QTextFrameFormat( void * pObj, bool bNew ) p->ph = ( QTextFrameFormat * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTextFrameFormat; + p->type = QT_TYPE_QTextFrameFormat; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTextImageFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextImageFormat.cpp index b388deb798..b3a5101f27 100644 --- a/harbour/contrib/hbqt/qtgui/QTextImageFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextImageFormat.cpp @@ -80,6 +80,7 @@ typedef struct QTextImageFormat * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextImageFormat; QT_G_FUNC( hbqt_gcRelease_QTextImageFormat ) @@ -115,6 +116,7 @@ void * hbqt_gcAllocate_QTextImageFormat( void * pObj, bool bNew ) p->ph = ( QTextImageFormat * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTextImageFormat; + p->type = QT_TYPE_QTextImageFormat; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTextInlineObject.cpp b/harbour/contrib/hbqt/qtgui/QTextInlineObject.cpp index 38267c5f3b..3f137f7046 100644 --- a/harbour/contrib/hbqt/qtgui/QTextInlineObject.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextInlineObject.cpp @@ -80,6 +80,7 @@ typedef struct QTextInlineObject * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextInlineObject; QT_G_FUNC( hbqt_gcRelease_QTextInlineObject ) @@ -100,6 +101,7 @@ void * hbqt_gcAllocate_QTextInlineObject( void * pObj, bool bNew ) p->ph = ( QTextInlineObject * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTextInlineObject; + p->type = QT_TYPE_QTextInlineObject; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTextItem.cpp b/harbour/contrib/hbqt/qtgui/QTextItem.cpp index c9e74b21f2..355c4bdf82 100644 --- a/harbour/contrib/hbqt/qtgui/QTextItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextItem.cpp @@ -85,6 +85,7 @@ typedef struct QTextItem * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextItem; QT_G_FUNC( hbqt_gcRelease_QTextItem ) @@ -120,6 +121,7 @@ void * hbqt_gcAllocate_QTextItem( void * pObj, bool bNew ) p->ph = ( QTextItem * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTextItem; + p->type = QT_TYPE_QTextItem; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTextLayout.cpp b/harbour/contrib/hbqt/qtgui/QTextLayout.cpp index 7672d7cea0..52163f9918 100644 --- a/harbour/contrib/hbqt/qtgui/QTextLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextLayout.cpp @@ -100,6 +100,7 @@ typedef struct QTextLayout * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextLayout; QT_G_FUNC( hbqt_gcRelease_QTextLayout ) @@ -135,6 +136,7 @@ void * hbqt_gcAllocate_QTextLayout( void * pObj, bool bNew ) p->ph = ( QTextLayout * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTextLayout; + p->type = QT_TYPE_QTextLayout; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTextLength.cpp b/harbour/contrib/hbqt/qtgui/QTextLength.cpp index d7f729592c..3e19c7bc7a 100644 --- a/harbour/contrib/hbqt/qtgui/QTextLength.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextLength.cpp @@ -84,6 +84,7 @@ typedef struct QTextLength * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextLength; QT_G_FUNC( hbqt_gcRelease_QTextLength ) @@ -119,6 +120,7 @@ void * hbqt_gcAllocate_QTextLength( void * pObj, bool bNew ) p->ph = ( QTextLength * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTextLength; + p->type = QT_TYPE_QTextLength; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTextLine.cpp b/harbour/contrib/hbqt/qtgui/QTextLine.cpp index 00197a8889..eb6478b651 100644 --- a/harbour/contrib/hbqt/qtgui/QTextLine.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextLine.cpp @@ -84,6 +84,7 @@ typedef struct QTextLine * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextLine; QT_G_FUNC( hbqt_gcRelease_QTextLine ) @@ -119,6 +120,7 @@ void * hbqt_gcAllocate_QTextLine( void * pObj, bool bNew ) p->ph = ( QTextLine * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTextLine; + p->type = QT_TYPE_QTextLine; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTextList.cpp b/harbour/contrib/hbqt/qtgui/QTextList.cpp index b6c4d69f7d..6baeecb122 100644 --- a/harbour/contrib/hbqt/qtgui/QTextList.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextList.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QTextList > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextList; QT_G_FUNC( hbqt_gcRelease_QTextList ) @@ -100,6 +101,7 @@ void * hbqt_gcAllocate_QTextList( void * pObj, bool bNew ) new( & p->ph ) QPointer< QTextList >( ( QTextList * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QTextList; + p->type = QT_TYPE_QTextList; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTextListFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextListFormat.cpp index ff438ec10a..ad6b8c0bd8 100644 --- a/harbour/contrib/hbqt/qtgui/QTextListFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextListFormat.cpp @@ -83,6 +83,7 @@ typedef struct QTextListFormat * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextListFormat; QT_G_FUNC( hbqt_gcRelease_QTextListFormat ) @@ -118,6 +119,7 @@ void * hbqt_gcAllocate_QTextListFormat( void * pObj, bool bNew ) p->ph = ( QTextListFormat * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTextListFormat; + p->type = QT_TYPE_QTextListFormat; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTextObject.cpp b/harbour/contrib/hbqt/qtgui/QTextObject.cpp index 5d0a59fabf..e5e95d0a9f 100644 --- a/harbour/contrib/hbqt/qtgui/QTextObject.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextObject.cpp @@ -79,6 +79,7 @@ typedef struct QPointer< QTextObject > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextObject; QT_G_FUNC( hbqt_gcRelease_QTextObject ) @@ -99,6 +100,7 @@ void * hbqt_gcAllocate_QTextObject( void * pObj, bool bNew ) new( & p->ph ) QPointer< QTextObject >( ( QTextObject * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QTextObject; + p->type = QT_TYPE_QTextObject; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTextOption.cpp b/harbour/contrib/hbqt/qtgui/QTextOption.cpp index a80daffb90..e5f4f40385 100644 --- a/harbour/contrib/hbqt/qtgui/QTextOption.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextOption.cpp @@ -103,6 +103,7 @@ typedef struct QTextOption * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextOption; QT_G_FUNC( hbqt_gcRelease_QTextOption ) @@ -138,6 +139,7 @@ void * hbqt_gcAllocate_QTextOption( void * pObj, bool bNew ) p->ph = ( QTextOption * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTextOption; + p->type = QT_TYPE_QTextOption; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTextTableFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextTableFormat.cpp index ff53e071e8..5b336eb7cb 100644 --- a/harbour/contrib/hbqt/qtgui/QTextTableFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextTableFormat.cpp @@ -88,6 +88,7 @@ typedef struct QTextTableFormat * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTextTableFormat; QT_G_FUNC( hbqt_gcRelease_QTextTableFormat ) @@ -123,6 +124,7 @@ void * hbqt_gcAllocate_QTextTableFormat( void * pObj, bool bNew ) p->ph = ( QTextTableFormat * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTextTableFormat; + p->type = QT_TYPE_QTextTableFormat; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTimeEdit.cpp b/harbour/contrib/hbqt/qtgui/QTimeEdit.cpp index c0c7750ba9..eac17ec939 100644 --- a/harbour/contrib/hbqt/qtgui/QTimeEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/QTimeEdit.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QTimeEdit > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTimeEdit; QT_G_FUNC( hbqt_gcRelease_QTimeEdit ) @@ -126,6 +127,7 @@ void * hbqt_gcAllocate_QTimeEdit( void * pObj, bool bNew ) new( & p->ph ) QPointer< QTimeEdit >( ( QTimeEdit * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QTimeEdit; + p->type = QT_TYPE_QTimeEdit; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QToolBar.cpp b/harbour/contrib/hbqt/qtgui/QToolBar.cpp index 79cd3f6fa0..86cbbdcff2 100644 --- a/harbour/contrib/hbqt/qtgui/QToolBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QToolBar.cpp @@ -91,6 +91,7 @@ typedef struct QPointer< QToolBar > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QToolBar; QT_G_FUNC( hbqt_gcRelease_QToolBar ) @@ -137,6 +138,7 @@ void * hbqt_gcAllocate_QToolBar( void * pObj, bool bNew ) new( & p->ph ) QPointer< QToolBar >( ( QToolBar * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QToolBar; + p->type = QT_TYPE_QToolBar; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QToolBox.cpp b/harbour/contrib/hbqt/qtgui/QToolBox.cpp index 6ed3699249..54616b2700 100644 --- a/harbour/contrib/hbqt/qtgui/QToolBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QToolBox.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QToolBox > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QToolBox; QT_G_FUNC( hbqt_gcRelease_QToolBox ) @@ -126,6 +127,7 @@ void * hbqt_gcAllocate_QToolBox( void * pObj, bool bNew ) new( & p->ph ) QPointer< QToolBox >( ( QToolBox * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QToolBox; + p->type = QT_TYPE_QToolBox; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QToolButton.cpp b/harbour/contrib/hbqt/qtgui/QToolButton.cpp index 5e173e7f20..f51630af43 100644 --- a/harbour/contrib/hbqt/qtgui/QToolButton.cpp +++ b/harbour/contrib/hbqt/qtgui/QToolButton.cpp @@ -84,6 +84,7 @@ typedef struct QPointer< QToolButton > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QToolButton; QT_G_FUNC( hbqt_gcRelease_QToolButton ) @@ -130,6 +131,7 @@ void * hbqt_gcAllocate_QToolButton( void * pObj, bool bNew ) new( & p->ph ) QPointer< QToolButton >( ( QToolButton * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QToolButton; + p->type = QT_TYPE_QToolButton; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTransform.cpp b/harbour/contrib/hbqt/qtgui/QTransform.cpp index fc322b17fe..e7d6dfcc40 100644 --- a/harbour/contrib/hbqt/qtgui/QTransform.cpp +++ b/harbour/contrib/hbqt/qtgui/QTransform.cpp @@ -85,6 +85,7 @@ typedef struct QTransform * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTransform; QT_G_FUNC( hbqt_gcRelease_QTransform ) @@ -120,6 +121,7 @@ void * hbqt_gcAllocate_QTransform( void * pObj, bool bNew ) p->ph = ( QTransform * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTransform; + p->type = QT_TYPE_QTransform; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTreeView.cpp b/harbour/contrib/hbqt/qtgui/QTreeView.cpp index df90f50103..6a6bbea9f2 100644 --- a/harbour/contrib/hbqt/qtgui/QTreeView.cpp +++ b/harbour/contrib/hbqt/qtgui/QTreeView.cpp @@ -92,6 +92,7 @@ typedef struct QPointer< QTreeView > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTreeView; QT_G_FUNC( hbqt_gcRelease_QTreeView ) @@ -138,6 +139,7 @@ void * hbqt_gcAllocate_QTreeView( void * pObj, bool bNew ) new( & p->ph ) QPointer< QTreeView >( ( QTreeView * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QTreeView; + p->type = QT_TYPE_QTreeView; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTreeWidget.cpp b/harbour/contrib/hbqt/qtgui/QTreeWidget.cpp index a1e79193c3..c99cb3b6a8 100644 --- a/harbour/contrib/hbqt/qtgui/QTreeWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QTreeWidget.cpp @@ -94,6 +94,7 @@ typedef struct QPointer< QTreeWidget > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTreeWidget; QT_G_FUNC( hbqt_gcRelease_QTreeWidget ) @@ -140,6 +141,7 @@ void * hbqt_gcAllocate_QTreeWidget( void * pObj, bool bNew ) new( & p->ph ) QPointer< QTreeWidget >( ( QTreeWidget * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QTreeWidget; + p->type = QT_TYPE_QTreeWidget; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QTreeWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/QTreeWidgetItem.cpp index cdf390441b..4b0d69d827 100644 --- a/harbour/contrib/hbqt/qtgui/QTreeWidgetItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QTreeWidgetItem.cpp @@ -104,6 +104,7 @@ typedef struct QTreeWidgetItem * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QTreeWidgetItem; QT_G_FUNC( hbqt_gcRelease_QTreeWidgetItem ) @@ -139,6 +140,7 @@ void * hbqt_gcAllocate_QTreeWidgetItem( void * pObj, bool bNew ) p->ph = ( QTreeWidgetItem * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QTreeWidgetItem; + p->type = QT_TYPE_QTreeWidgetItem; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QVBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/QVBoxLayout.cpp index 47ed4bfa51..31025d7bf6 100644 --- a/harbour/contrib/hbqt/qtgui/QVBoxLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/QVBoxLayout.cpp @@ -81,6 +81,7 @@ typedef struct QPointer< QVBoxLayout > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QVBoxLayout; QT_G_FUNC( hbqt_gcRelease_QVBoxLayout ) @@ -127,6 +128,7 @@ void * hbqt_gcAllocate_QVBoxLayout( void * pObj, bool bNew ) new( & p->ph ) QPointer< QVBoxLayout >( ( QVBoxLayout * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QVBoxLayout; + p->type = QT_TYPE_QVBoxLayout; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QValidator.cpp b/harbour/contrib/hbqt/qtgui/QValidator.cpp index 64e35e147c..67dfb8a592 100644 --- a/harbour/contrib/hbqt/qtgui/QValidator.cpp +++ b/harbour/contrib/hbqt/qtgui/QValidator.cpp @@ -83,6 +83,7 @@ typedef struct QPointer< QValidator > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QValidator; QT_G_FUNC( hbqt_gcRelease_QValidator ) @@ -103,6 +104,7 @@ void * hbqt_gcAllocate_QValidator( void * pObj, bool bNew ) new( & p->ph ) QPointer< QValidator >( ( QValidator * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QValidator; + p->type = QT_TYPE_QValidator; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QWheelEvent.cpp b/harbour/contrib/hbqt/qtgui/QWheelEvent.cpp index 81352c79a3..10f2c9368a 100644 --- a/harbour/contrib/hbqt/qtgui/QWheelEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QWheelEvent.cpp @@ -80,6 +80,7 @@ typedef struct QWheelEvent * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QWheelEvent; QT_G_FUNC( hbqt_gcRelease_QWheelEvent ) @@ -100,6 +101,7 @@ void * hbqt_gcAllocate_QWheelEvent( void * pObj, bool bNew ) p->ph = ( QWheelEvent * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QWheelEvent; + p->type = QT_TYPE_QWheelEvent; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QWidget.cpp b/harbour/contrib/hbqt/qtgui/QWidget.cpp index a170586b8f..a91d6cb610 100644 --- a/harbour/contrib/hbqt/qtgui/QWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QWidget.cpp @@ -124,6 +124,7 @@ typedef struct QPointer< QWidget > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QWidget; QT_G_FUNC( hbqt_gcRelease_QWidget ) @@ -170,6 +171,7 @@ void * hbqt_gcAllocate_QWidget( void * pObj, bool bNew ) new( & p->ph ) QPointer< QWidget >( ( QWidget * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QWidget; + p->type = QT_TYPE_QWidget; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QWidgetAction.cpp b/harbour/contrib/hbqt/qtgui/QWidgetAction.cpp index 514e51699d..7eeb9a65f8 100644 --- a/harbour/contrib/hbqt/qtgui/QWidgetAction.cpp +++ b/harbour/contrib/hbqt/qtgui/QWidgetAction.cpp @@ -80,6 +80,7 @@ typedef struct QPointer< QWidgetAction > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QWidgetAction; QT_G_FUNC( hbqt_gcRelease_QWidgetAction ) @@ -126,6 +127,7 @@ void * hbqt_gcAllocate_QWidgetAction( void * pObj, bool bNew ) new( & p->ph ) QPointer< QWidgetAction >( ( QWidgetAction * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QWidgetAction; + p->type = QT_TYPE_QWidgetAction; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/QWidgetItem.cpp index 1dc0f4b156..d6e49bc786 100644 --- a/harbour/contrib/hbqt/qtgui/QWidgetItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QWidgetItem.cpp @@ -79,6 +79,7 @@ typedef struct QWidgetItem * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QWidgetItem; QT_G_FUNC( hbqt_gcRelease_QWidgetItem ) @@ -114,6 +115,7 @@ void * hbqt_gcAllocate_QWidgetItem( void * pObj, bool bNew ) p->ph = ( QWidgetItem * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QWidgetItem; + p->type = QT_TYPE_QWidgetItem; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QWindowStateChangeEvent.cpp b/harbour/contrib/hbqt/qtgui/QWindowStateChangeEvent.cpp index 419b028b4e..12a1fa7b1b 100644 --- a/harbour/contrib/hbqt/qtgui/QWindowStateChangeEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QWindowStateChangeEvent.cpp @@ -79,6 +79,7 @@ typedef struct QWindowStateChangeEvent * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QWindowStateChangeEvent; QT_G_FUNC( hbqt_gcRelease_QWindowStateChangeEvent ) @@ -99,6 +100,7 @@ void * hbqt_gcAllocate_QWindowStateChangeEvent( void * pObj, bool bNew ) p->ph = ( QWindowStateChangeEvent * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QWindowStateChangeEvent; + p->type = QT_TYPE_QWindowStateChangeEvent; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QWindowsStyle.cpp b/harbour/contrib/hbqt/qtgui/QWindowsStyle.cpp index 2013b9e907..b6359c35be 100644 --- a/harbour/contrib/hbqt/qtgui/QWindowsStyle.cpp +++ b/harbour/contrib/hbqt/qtgui/QWindowsStyle.cpp @@ -81,6 +81,7 @@ typedef struct QPointer< QWindowsStyle > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QWindowsStyle; QT_G_FUNC( hbqt_gcRelease_QWindowsStyle ) @@ -127,6 +128,7 @@ void * hbqt_gcAllocate_QWindowsStyle( void * pObj, bool bNew ) new( & p->ph ) QPointer< QWindowsStyle >( ( QWindowsStyle * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QWindowsStyle; + p->type = QT_TYPE_QWindowsStyle; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QWizard.cpp b/harbour/contrib/hbqt/qtgui/QWizard.cpp index adf1da198c..db6dc7d42c 100644 --- a/harbour/contrib/hbqt/qtgui/QWizard.cpp +++ b/harbour/contrib/hbqt/qtgui/QWizard.cpp @@ -98,6 +98,7 @@ typedef struct QPointer< QWizard > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QWizard; QT_G_FUNC( hbqt_gcRelease_QWizard ) @@ -144,6 +145,7 @@ void * hbqt_gcAllocate_QWizard( void * pObj, bool bNew ) new( & p->ph ) QPointer< QWizard >( ( QWizard * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QWizard; + p->type = QT_TYPE_QWizard; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtgui/QWizardPage.cpp b/harbour/contrib/hbqt/qtgui/QWizardPage.cpp index 2b72e986ad..5b585983f9 100644 --- a/harbour/contrib/hbqt/qtgui/QWizardPage.cpp +++ b/harbour/contrib/hbqt/qtgui/QWizardPage.cpp @@ -78,6 +78,7 @@ typedef struct QPointer< QWizardPage > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QWizardPage; QT_G_FUNC( hbqt_gcRelease_QWizardPage ) @@ -124,6 +125,7 @@ void * hbqt_gcAllocate_QWizardPage( void * pObj, bool bNew ) new( & p->ph ) QPointer< QWizardPage >( ( QWizardPage * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QWizardPage; + p->type = QT_TYPE_QWizardPage; if( bNew ) { diff --git a/harbour/contrib/hbqt/qth/HBQAbstractItemModel.qth b/harbour/contrib/hbqt/qth/HBQAbstractItemModel.qth new file mode 100644 index 0000000000..88ce26397f --- /dev/null +++ b/harbour/contrib/hbqt/qth/HBQAbstractItemModel.qth @@ -0,0 +1,97 @@ +/* + * $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. + * + */ +/*----------------------------------------------------------------------*/ +; +; Header File to Generate QT Wrapper Sources +; + + +QObject = +Inherits = QAbstractItemModel +Type = +New = + + + + + + + + + +#include +#include "../hbqt_hbqabstractitemmodel.h" + + +/* + * + * + */ +HB_FUNC( QT_HBQABSTRACTITEMMODEL ) +{ + hb_retptr( new HBQAbstractItemModel( ( PHB_ITEM ) hb_param( 1, HB_IT_BLOCK ) ) ); +} + + + + + + +void reset() +QModelIndex index( int row, int column, const QModelIndex & parent = QModelIndex() ) const + + + + + + + diff --git a/harbour/contrib/hbqt/qtnetwork/QFtp.cpp b/harbour/contrib/hbqt/qtnetwork/QFtp.cpp index 8fa92d1bf9..065a7e5985 100644 --- a/harbour/contrib/hbqt/qtnetwork/QFtp.cpp +++ b/harbour/contrib/hbqt/qtnetwork/QFtp.cpp @@ -103,6 +103,7 @@ typedef struct QPointer< QFtp > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QFtp; QT_G_FUNC( hbqt_gcRelease_QFtp ) @@ -149,6 +150,7 @@ void * hbqt_gcAllocate_QFtp( void * pObj, bool bNew ) new( & p->ph ) QPointer< QFtp >( ( QFtp * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QFtp; + p->type = QT_TYPE_QFtp; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtnetwork/QHttp.cpp b/harbour/contrib/hbqt/qtnetwork/QHttp.cpp index b119ec9bf3..496c905f46 100644 --- a/harbour/contrib/hbqt/qtnetwork/QHttp.cpp +++ b/harbour/contrib/hbqt/qtnetwork/QHttp.cpp @@ -103,6 +103,7 @@ typedef struct QPointer< QHttp > ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QHttp; QT_G_FUNC( hbqt_gcRelease_QHttp ) @@ -149,6 +150,7 @@ void * hbqt_gcAllocate_QHttp( void * pObj, bool bNew ) new( & p->ph ) QPointer< QHttp >( ( QHttp * ) pObj ); p->bNew = bNew; p->func = hbqt_gcRelease_QHttp; + p->type = QT_TYPE_QHttp; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtnetwork/QHttpHeader.cpp b/harbour/contrib/hbqt/qtnetwork/QHttpHeader.cpp index 5fae011d39..9c7a653ac8 100644 --- a/harbour/contrib/hbqt/qtnetwork/QHttpHeader.cpp +++ b/harbour/contrib/hbqt/qtnetwork/QHttpHeader.cpp @@ -91,6 +91,7 @@ typedef struct QHttpHeader * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QHttpHeader; QT_G_FUNC( hbqt_gcRelease_QHttpHeader ) @@ -111,6 +112,7 @@ void * hbqt_gcAllocate_QHttpHeader( void * pObj, bool bNew ) p->ph = ( QHttpHeader * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QHttpHeader; + p->type = QT_TYPE_QHttpHeader; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtnetwork/QHttpRequestHeader.cpp b/harbour/contrib/hbqt/qtnetwork/QHttpRequestHeader.cpp index 261714afc5..255fc8e728 100644 --- a/harbour/contrib/hbqt/qtnetwork/QHttpRequestHeader.cpp +++ b/harbour/contrib/hbqt/qtnetwork/QHttpRequestHeader.cpp @@ -81,6 +81,7 @@ typedef struct QHttpRequestHeader * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QHttpRequestHeader; QT_G_FUNC( hbqt_gcRelease_QHttpRequestHeader ) @@ -116,6 +117,7 @@ void * hbqt_gcAllocate_QHttpRequestHeader( void * pObj, bool bNew ) p->ph = ( QHttpRequestHeader * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QHttpRequestHeader; + p->type = QT_TYPE_QHttpRequestHeader; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtnetwork/QHttpResponseHeader.cpp b/harbour/contrib/hbqt/qtnetwork/QHttpResponseHeader.cpp index 50e1ba1cb4..7ff0ccd6d0 100644 --- a/harbour/contrib/hbqt/qtnetwork/QHttpResponseHeader.cpp +++ b/harbour/contrib/hbqt/qtnetwork/QHttpResponseHeader.cpp @@ -81,6 +81,7 @@ typedef struct QHttpResponseHeader * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QHttpResponseHeader; QT_G_FUNC( hbqt_gcRelease_QHttpResponseHeader ) @@ -116,6 +117,7 @@ void * hbqt_gcAllocate_QHttpResponseHeader( void * pObj, bool bNew ) p->ph = ( QHttpResponseHeader * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QHttpResponseHeader; + p->type = QT_TYPE_QHttpResponseHeader; if( bNew ) { diff --git a/harbour/contrib/hbqt/qtnetwork/QNetworkRequest.cpp b/harbour/contrib/hbqt/qtnetwork/QNetworkRequest.cpp index 8c588a8b57..5504ed66b0 100644 --- a/harbour/contrib/hbqt/qtnetwork/QNetworkRequest.cpp +++ b/harbour/contrib/hbqt/qtnetwork/QNetworkRequest.cpp @@ -86,6 +86,7 @@ typedef struct QNetworkRequest * ph; bool bNew; QT_G_FUNC_PTR func; + int type; } QGC_POINTER_QNetworkRequest; QT_G_FUNC( hbqt_gcRelease_QNetworkRequest ) @@ -121,6 +122,7 @@ void * hbqt_gcAllocate_QNetworkRequest( void * pObj, bool bNew ) p->ph = ( QNetworkRequest * ) pObj; p->bNew = bNew; p->func = hbqt_gcRelease_QNetworkRequest; + p->type = QT_TYPE_QNetworkRequest; if( bNew ) { diff --git a/harbour/contrib/hbxbp/xbpbrowse.prg b/harbour/contrib/hbxbp/xbpbrowse.prg index 5c0cd62a7d..7d87bc2443 100644 --- a/harbour/contrib/hbxbp/xbpbrowse.prg +++ b/harbour/contrib/hbxbp/xbpbrowse.prg @@ -83,25 +83,6 @@ #include "setcurs.ch" #include "tbrowse.ch" -/*----------------------------------------------------------------------*/ - -#define HBQT_BRW_CELLVALUE 1001 -#define HBQT_BRW_COLCOUNT 1002 -#define HBQT_BRW_ROWCOUNT 1003 -#define HBQT_BRW_COLHEADER 1004 -#define HBQT_BRW_ROWHEADER 1005 -#define HBQT_BRW_COLALIGN 1006 -#define HBQT_BRW_COLFGCOLOR 1007 -#define HBQT_BRW_COLBGCOLOR 1008 -#define HBQT_BRW_DATFGCOLOR 1009 -#define HBQT_BRW_DATBGCOLOR 1010 -#define HBQT_BRW_COLHEIGHT 1011 -#define HBQT_BRW_DATHEIGHT 1012 -#define HBQT_BRW_DATALIGN 1013 -#define HBQT_BRW_CELLDECORATION 1014 - -/*----------------------------------------------------------------------*/ - #define HB_CLS_NOTOBJECT #define _TBCI_COLOBJECT 1 // column object @@ -297,7 +278,7 @@ EXPORTED: METHOD new( nTop, nLeft, nBottom, nRight ) // constructor, NOTE: This method is a Harbour extension [vszakats] METHOD create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) // constructor, NOTE: This method is a Harbour extension [vszakats] METHOD execSlot( nEvent, p1, p2, p3 ) // executes view events - METHOD supplyInfo( nMode, nInfo, p2, p3 ) // supplies cell parameters to Qt engine + METHOD supplyInfo( nMode, nCall, nRole, nX, nY ) // supplies cell parameters to Qt engine METHOD configure( nMode ) // mark that the internal settings of the TBrowse object should be reconfigured METHOD handleEvent( nEvent, mp1, mp2 ) @@ -350,6 +331,9 @@ PROTECTED: METHOD dispFrames() // display TBrowse border, columns' headings, footings and separators METHOD dispRow( nRow ) // display TBrowse data + METHOD compatColor(nColor) + METHOD compatIcon(cIcon) + FRIEND FUNCTION _mBrwPos // helper function for mRow() and mCol() methods DATA oDbfModel @@ -425,7 +409,7 @@ EXPORTED: METHOD buildLeftFreeze() METHOD buildRightFreeze() - METHOD fetchColumnInfo( nInfo, nArea, nRow, nCol ) + METHOD fetchColumnInfo( nCall, nRole, nArea, nRow, nCol ) METHOD setLeftFrozen( aColFrozens ) METHOD setRightFrozen( aColFrozens ) @@ -438,6 +422,7 @@ EXPORTED: METHOD destroy() DATA nCellHeight INIT 20 + DATA oDefaultCellSize METHOD setCellHeight( nCellHeight ) METHOD setCurrentIndex( lReset ) @@ -459,6 +444,8 @@ METHOD new( nTop, nLeft, nBottom, nRight ) CLASS XbpBrowse ::nRight := nRight ::colorSpec := SetColor() + + ::oDefaultCellSize := QSize():New(20,::nCellHeight) RETURN Self @@ -486,7 +473,8 @@ METHOD XbpBrowse:buildLeftFreeze() ::oLeftHeaderView:configure( ::oLeftView:horizontalHeader() ) ::oLeftHeaderView:setHighlightSections( .F. ) - ::oLeftDbfModel := HBDbfModel():new( {|p1,p2,p3,p4| ::supplyInfo( 151, p1, p2, p3, p4 ) } ) + ::oLeftDbfModel := HBQAbstractItemModel():new( {|t,role,x,y| ::supplyInfo( 151, t, role, x, y ) } ) + ::oLeftView:setModel( ::oLeftDbfModel ) // //::oLeftView:hide() @@ -500,7 +488,8 @@ METHOD XbpBrowse:buildLeftFreeze() ::oLeftFooterView:setResizeMode( QHeaderView_Fixed ) ::oLeftFooterView:setFocusPolicy( Qt_NoFocus ) // - ::oLeftFooterModel := HBDbfModel():new( {|p1,p2,p3,p4| ::supplyInfo( 152, p1, p2, p3, p4 ) } ) + ::oLeftFooterModel := HBQAbstractItemModel():new( {|t,role,x,y| ::supplyInfo( 152, t, role, x, y ) } ) + ::oLeftFooterView:setModel( ::oLeftFooterModel ) // //::oLeftFooterView:hide() @@ -536,7 +525,8 @@ METHOD XbpBrowse:buildRightFreeze() ::oRightHeaderView:configure( ::oRightView:horizontalHeader() ) ::oRightHeaderView:setHighlightSections( .F. ) - ::oRightDbfModel := HBDbfModel():new( {|p1,p2,p3,p4| ::supplyInfo( 161, p1, p2, p3, p4 ) } ) + ::oRightDbfModel := HBQAbstractItemModel():new( {|t,role,x,y| ::supplyInfo( 161, t, role, x, y ) } ) + ::oRightView:setModel( ::oRightDbfModel ) /* Horizontal Footer */ @@ -548,7 +538,8 @@ METHOD XbpBrowse:buildRightFreeze() ::oRightFooterView:setResizeMode( QHeaderView_Fixed ) ::oRightFooterView:setFocusPolicy( Qt_NoFocus ) // - ::oRightFooterModel := HBDbfModel():new( {|p1,p2,p3,p4| ::supplyInfo( 162, p1, p2, p3, p4 ) } ) + ::oRightFooterModel := HBQAbstractItemModel():new( {|t,role,x,y| ::supplyInfo( 162, t, role, x, y ) } ) + ::oRightFooterView:setModel( ::oRightFooterModel ) ::connect( ::oRightView , "mousePressEvent()" , {|p| ::execSlot( 31, p ) } ) @@ -617,7 +608,8 @@ METHOD XbpBrowse:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::connect( ::oHeaderView, "sectionResized(int,int,int)", {|i,i1,i2| ::execSlot( 121, i, i1, i2 ) } ) /* .DBF Manipulation Model */ - ::oDbfModel := HBDbfModel():new( {|p1,p2,p3,p4| ::supplyInfo( 141, p1, p2, p3, p4 ) } ) + ::oDbfModel := HBQAbstractItemModel():new( {|t,role,x,y| ::supplyInfo( 141, t, role, x, y ) } ) + /* Attach Model with the View */ ::oTableView:setModel( ::oDbfModel ) @@ -631,7 +623,7 @@ METHOD XbpBrowse:create( oParent, oOwner, aPos, aSize, aPresParams, lVisible ) ::oFooterView:setResizeMode( QHeaderView_Fixed ) ::oFooterView:setFocusPolicy( Qt_NoFocus ) // - ::oFooterModel := HBDbfModel():new( {|p1,p2,p3,p4| ::supplyInfo( 142, p1, p2, p3, p4 ) } ) + ::oFooterModel := HBQAbstractItemModel():new( {|t,role,x,y| ::supplyInfo( 142, t, role, x, y ) } ) ::oFooterView:setModel( ::oFooterModel ) ::oFooterView:setFocusPolicy( Qt_NoFocus ) @@ -1029,175 +1021,207 @@ METHOD navigate( p1, p2 ) CLASS XbpBrowse /*----------------------------------------------------------------------*/ -METHOD XbpBrowse:supplyInfo( nMode, nInfo, p2, p3 ) +METHOD XbpBrowse:supplyInfo( nMode, nCall, nRole, nX, nY ) + + IF nCall == QT_QAIM_headerData .and. nX == Qt_Vertical + RETURN Nil + End -//HB_TRACE( HB_TR_DEBUG, 0, 'supplyInfo:', nMode, nInfo, memory( 1001 ) ) DO CASE CASE nMode == 141 /* Main View Header|Data */ - IF nInfo == HBQT_BRW_COLCOUNT + IF nCall == QT_QAIM_columnCount IF ::colCount > 0 ::forceStable() ::setHorzScrollBarRange( .t. ) ENDIF RETURN ::colCount - ELSEIF nInfo == HBQT_BRW_ROWCOUNT + ELSEIF nCall == QT_QAIM_rowCount IF ::colCount > 0 ::forceStable() ::setVertScrollBarRange( .f. ) ENDIF RETURN ::rowCount - ELSE - RETURN ::fetchColumnInfo( nInfo, 0, p2, p3 ) + ELSEIF nCall == QT_QAIM_data + RETURN ::fetchColumnInfo( nCall,nRole, 0, nY+1, nX+1 ) + ELSEIF nCall == QT_QAIM_headerData + RETURN ::fetchColumnInfo( nCall,nRole, 0, 0 , nY+1 ) ENDIF + RETURN nil CASE nMode == 142 /* Main View Footer */ - IF nInfo == HBQT_BRW_COLCOUNT + IF nCall == QT_QAIM_columnCount IF ::colCount > 0 ::forceStable() ENDIF RETURN ::colCount - ELSE - RETURN ::fetchColumnInfo( nInfo, 1, p2, p3 ) + ELSEIF nCall == QT_QAIM_data + RETURN ::fetchColumnInfo( nCall,nRole, 1, nY+1, nX+1 ) + ELSEIF nCall == QT_QAIM_headerData + RETURN ::fetchColumnInfo( nCall,nRole, 1, 0 , nY+1 ) ENDIF + RETURN nil CASE nMode == 151 /* Left Frozen Header|Data */ - IF nInfo == HBQT_BRW_COLCOUNT + IF nCall == QT_QAIM_columnCount IF ::nLeftFrozen > 0 ::forceStable() ENDIF RETURN ::nLeftFrozen - ELSEIF nInfo == HBQT_BRW_ROWCOUNT + ELSEIF nCall == QT_QAIM_rowCount IF ::nLeftFrozen > 0 ::forceStable() ENDIF RETURN ::rowCount - ELSE - RETURN ::fetchColumnInfo( nInfo, 0, p2, ::aLeftFrozen[ p3 ] ) + ELSEIF nCall == QT_QAIM_data + RETURN ::fetchColumnInfo( nCall,nRole, 0, nY+1, ::aLeftFrozen[ nX+1 ] ) + ELSEIF nCall == QT_QAIM_headerData + RETURN ::fetchColumnInfo( nCall,nRole, 0, 0, ::aLeftFrozen[ nY+1 ] ) ENDIF + RETURN nil CASE nMode == 152 /* Left Frozen Footer */ - IF nInfo == HBQT_BRW_COLCOUNT + IF nCall == QT_QAIM_columnCount IF ::nLeftFrozen > 0 ::forceStable() ENDIF RETURN ::nLeftFrozen - ELSE - RETURN ::fetchColumnInfo( nInfo, 1, p2, ::aLeftFrozen[ p3 ] ) + ELSEIF nCall == QT_QAIM_data + RETURN ::fetchColumnInfo( nCall,nRole, 1, nY+1, ::aLeftFrozen[ nX+1 ] ) + ELSEIF nCall == QT_QAIM_headerData + RETURN ::fetchColumnInfo( nCall,nRole, 1, 0, ::aLeftFrozen[ nY+1 ] ) ENDIF CASE nMode == 161 /* Right Frozen Header|Data */ - IF nInfo == HBQT_BRW_COLCOUNT + IF nCall == QT_QAIM_columnCount IF ::nRightFrozen > 0 ::forceStable() ENDIF RETURN ::nRightFrozen - ELSEIF nInfo == HBQT_BRW_ROWCOUNT + ELSEIF nCall == QT_QAIM_rowCount IF ::nRightFrozen > 0 ::forceStable() ENDIF RETURN ::rowCount - ELSE - RETURN ::fetchColumnInfo( nInfo, 0, p2, ::aRightFrozen[ p3 ] ) + ELSEIF nCall == QT_QAIM_data + RETURN ::fetchColumnInfo( nCall,nRole, 0, nY+1, ::aRightFrozen[ nX+1 ] ) + ELSEIF nCall == QT_QAIM_headerData + RETURN ::fetchColumnInfo( nCall,nRole, 0, 0, ::aRightFrozen[ nY+1 ] ) ENDIF CASE nMode == 162 /* Right Frozen Footer */ - IF nInfo == HBQT_BRW_COLCOUNT + IF nCall == QT_QAIM_columnCount IF ::nRightFrozen > 0 ::forceStable() ENDIF RETURN ::nRightFrozen - ELSE - RETURN ::fetchColumnInfo( nInfo, 1, p2, ::aRightFrozen[ p3 ] ) + ELSEIF nCall == QT_QAIM_data + RETURN ::fetchColumnInfo( nCall,nRole, 1, nY+1, ::aRightFrozen[ nX+1 ] ) + ELSEIF nCall == QT_QAIM_headerData + RETURN ::fetchColumnInfo( nCall,nRole, 1, 0, ::aRightFrozen[ nY+1 ] ) ENDIF ENDCASE - RETURN "" + RETURN nil /*----------------------------------------------------------------------*/ -METHOD fetchColumnInfo( nInfo, nArea, nRow, nCol ) CLASS XbpBrowse +METHOD fetchColumnInfo( nCall, nRole, nArea, nRow, nCol ) CLASS XbpBrowse LOCAL aColor LOCAL oCol := ::columns[ nCol ] - SWITCH ( nInfo ) + SWITCH nCall + CASE QT_QAIM_data - /* Data Area */ - CASE HBQT_BRW_DATFGCOLOR - IF hb_isBlock( oCol:colorBlock ) - aColor := eval( oCol:colorBlock, ::cellValueA( nRow, nCol ) ) - IF hb_isArray( aColor ) .and. hb_isNumeric( aColor[ 1 ] ) - RETURN hbxbp_ConvertAFactFromXBP( "Color", aColor[ 1 ] ) - ELSE - RETURN oCol:dFgColor - ENDIF - ELSE - RETURN oCol:dFgColor - ENDIF - - CASE HBQT_BRW_DATBGCOLOR - IF hb_isBlock( oCol:colorBlock ) - aColor := eval( oCol:colorBlock, ::cellValueA( nRow, nCol ) ) - IF hb_isArray( aColor ) .and. hb_isNumeric( aColor[ 2 ] ) - RETURN hbxbp_ConvertAFactFromXBP( "Color", aColor[ 2 ] ) - ELSE - RETURN oCol:dBgColor - ENDIF - ELSE - RETURN oCol:dBgColor - ENDIF - - CASE HBQT_BRW_DATALIGN - RETURN oCol:dAlignment - - CASE HBQT_BRW_DATHEIGHT - RETURN ::nCellHeight //oCol:dHeight - - CASE HBQT_BRW_CELLDECORATION - IF oCol:type == XBPCOL_TYPE_FILEICON - RETURN trim( ::cellValue( nRow, nCol ) ) - ELSE - RETURN "" - ENDIF - - CASE HBQT_BRW_CELLVALUE - IF oCol:type == XBPCOL_TYPE_FILEICON - RETURN "" - ELSE - RETURN ::cellValue( nRow, nCol ) - ENDIF - - OTHERWISE - IF nArea == 0 /* Header Area */ - SWITCH nInfo - CASE HBQT_BRW_COLHEIGHT - RETURN ::nCellHeight //oCol:hHeight - CASE HBQT_BRW_COLHEADER - RETURN oCol:heading - CASE HBQT_BRW_COLALIGN - RETURN oCol:hAlignment - CASE HBQT_BRW_COLFGCOLOR - RETURN oCol:hFgColor - CASE HBQT_BRW_COLBGCOLOR - RETURN oCol:hBgColor + SWITCH ( nRole ) + CASE Qt_ForegroundRole + IF hb_isBlock( oCol:colorBlock ) + aColor := eval( oCol:colorBlock, ::cellValueA( nRow, nCol ) ) + IF hb_isArray( aColor ) .and. hb_isNumeric( aColor[ 1 ] ) + RETURN ::compatColor( hbxbp_ConvertAFactFromXBP( "Color", aColor[ 1 ] ) ) + ELSE + RETURN ::compatColor( oCol:dFgColor ) + ENDIF + ELSE + RETURN ::compatColor( oCol:dFgColor ) + ENDIF + + CASE Qt_BackgroundRole + IF hb_isBlock( oCol:colorBlock ) + aColor := eval( oCol:colorBlock, ::cellValueA( nRow, nCol ) ) + IF hb_isArray( aColor ) .and. hb_isNumeric( aColor[ 2 ] ) + RETURN ::compatColor( hbxbp_ConvertAFactFromXBP( "Color", aColor[ 2 ] ) ) + ELSE + RETURN ::compatColor( oCol:dBgColor ) + ENDIF + ELSE + RETURN ::compatColor( oCol:dBgColor ) + ENDIF + + CASE Qt_TextAlignmentRole + RETURN oCol:dAlignment + + CASE Qt_SizeHintRole + RETURN ::oDefaultCellSize + + CASE Qt_DecorationRole + IF oCol:type == XBPCOL_TYPE_FILEICON + RETURN ::compatIcon( ::cellValue( nRow, nCol ) ) + ELSE + RETURN nil + ENDIF + CASE Qt_DisplayRole + IF oCol:type == XBPCOL_TYPE_FILEICON + RETURN nil + ELSE + RETURN ::cellValue( nRow, nCol ) + ENDIF ENDSWITCH - ELSE /* Footer Area */ - SWITCH nInfo - CASE HBQT_BRW_COLHEIGHT - RETURN ::nCellHeight //oCol:fHeight - CASE HBQT_BRW_COLHEADER - RETURN oCol:footing - CASE HBQT_BRW_COLALIGN - RETURN oCol:fAlignment - CASE HBQT_BRW_COLFGCOLOR - RETURN oCol:fFgColor - CASE HBQT_BRW_COLBGCOLOR - RETURN oCol:fBgColor - ENDSWITCH - ENDIF + RETURN nil + + CASE QT_QAIM_headerData + IF nArea == 0 /* Header Area */ + SWITCH nRole + CASE Qt_SizeHintRole + RETURN ::oDefaultCellSize //oCol:hHeight + CASE Qt_DisplayRole + RETURN oCol:heading + CASE Qt_TextAlignmentRole + RETURN oCol:hAlignment + CASE Qt_ForegroundRole + RETURN ::compatColor( oCol:hFgColor ) + CASE Qt_BackgroundRole + RETURN ::compatColor( oCol:hBgColor ) + ENDSWITCH + ELSE /* Footer Area */ + SWITCH nRole + CASE Qt_SizeHintRole + RETURN ::oDefaultCellSize //oCol:fHeight + CASE Qt_DisplayRole + RETURN oCol:footing + CASE Qt_TextAlignmentRole + RETURN oCol:fAlignment + CASE Qt_ForegroundRole + RETURN ::compatColor( oCol:fFgColor ) + CASE Qt_BackgroundRole + RETURN ::compatColor( oCol:fBgColor ) + ENDSWITCH + ENDIF + RETURN nil ENDSWITCH - RETURN "" + RETURN nil + + // TODO: Review the color < 25 case when resolved in HBQt, and avoid unnecessary creation of new QColor/Qicon GC objects + + // However, tested with medium data sets, seems not being a big issue by now + // Implementation choice will depend on planned HBQt evolution of pseudo casts and bypass functions (non GC QColor, QIcon, etc) + +METHOD compatColor(nColor) + RETURN QColor():new( nColor ) + +METHOD compatIcon(cIcon) + RETURN QIcon():new( QPixmap():new( Trim(cIcon) ) ) /*----------------------------------------------------------------------*/ @@ -1705,16 +1729,16 @@ METHOD doConfigure() CLASS XbpBrowse ::setCellHeight( ::nCellHeight ) /* Inform Qt about number of rows and columns browser implements */ - ::oDbfModel:hbSetRowColumns( ::rowCount - 1, ::colCount - 1 ) + //::oDbfModel:hbSetRowColumns( ::rowCount - 1, ::colCount - 1 ) /* Tell Qt to Reload Everything */ ::oDbfModel:reset() // IF hb_isObject( ::oLeftDbfModel ) - ::oLeftDbfModel:hbSetRowColumns( ::rowCount - 1, ::nLeftFrozen - 1 ) + //::oLeftDbfModel:hbSetRowColumns( ::rowCount - 1, ::nLeftFrozen - 1 ) // Dangling code ::oLeftDbfModel:reset() ENDIF IF hb_isObject( ::oRightDbfModel ) - ::oRightDbfModel:hbSetRowColumns( ::rowCount - 1, ::nRightFrozen - 1 ) + //::oRightDbfModel:hbSetRowColumns( ::rowCount - 1, ::nRightFrozen - 1 ) ::oRightDbfModel:reset() ENDIF