fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-11-13 17:43 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)

Browse Source 
* contrib/hbqt/generator/hbqtgen.prg
  * contrib/hbqt/qth/QAbstractItemModel.qth

  * contrib/hbqt/hbqt.h
  * contrib/hbqt/hbqt_destruct.cpp
  * contrib/hbqt/hbqt_garbage.h
  * contrib/hbqt/hbqt_slots.cpp

  * contrib/hbqt/qtcore/QAbstractItemModel.cpp
  * contrib/hbqt/qtcore/QAbstractListModel.cpp
  * contrib/hbqt/qtcore/QAbstractTableModel.cpp
  * contrib/hbqt/qtcore/QBitArray.cpp
  * contrib/hbqt/qtcore/QByteArray.cpp
  * contrib/hbqt/qtcore/QCoreApplication.cpp
  * contrib/hbqt/qtcore/QDataStream.cpp
  * contrib/hbqt/qtcore/QDate.cpp
  * contrib/hbqt/qtcore/QDateTime.cpp
  * contrib/hbqt/qtcore/QDir.cpp
  * contrib/hbqt/qtcore/QEvent.cpp
  * contrib/hbqt/qtcore/QEventLoop.cpp
  * contrib/hbqt/qtcore/QFile.cpp
  * contrib/hbqt/qtcore/QFileInfo.cpp
  * contrib/hbqt/qtcore/QIODevice.cpp
  * contrib/hbqt/qtcore/QLatin1Char.cpp
  * contrib/hbqt/qtcore/QLatin1String.cpp
  * contrib/hbqt/qtcore/QLine.cpp
  * contrib/hbqt/qtcore/QLineF.cpp
  * contrib/hbqt/qtcore/QList.cpp
  * contrib/hbqt/qtcore/QLocale.cpp
  * contrib/hbqt/qtcore/QMimeData.cpp
  * contrib/hbqt/qtcore/QModelIndex.cpp
  * contrib/hbqt/qtcore/QObject.cpp
  * contrib/hbqt/qtcore/QPoint.cpp
  * contrib/hbqt/qtcore/QPointF.cpp
  * contrib/hbqt/qtcore/QProcess.cpp
  * contrib/hbqt/qtcore/QRect.cpp
  * contrib/hbqt/qtcore/QRectF.cpp
  * contrib/hbqt/qtcore/QRegExp.cpp
  * contrib/hbqt/qtcore/QResource.cpp
  * contrib/hbqt/qtcore/QSignalMapper.cpp
  * contrib/hbqt/qtcore/QSize.cpp
  * contrib/hbqt/qtcore/QSizeF.cpp
  * contrib/hbqt/qtcore/QStringList.cpp
  * contrib/hbqt/qtcore/QTextBoundaryFinder.cpp
  * contrib/hbqt/qtcore/QTextCodec.cpp
  * contrib/hbqt/qtcore/QTextDecoder.cpp
  * contrib/hbqt/qtcore/QTextEncoder.cpp
  * contrib/hbqt/qtcore/QTextStream.cpp
  * contrib/hbqt/qtcore/QThread.cpp
  * contrib/hbqt/qtcore/QTime.cpp
  * contrib/hbqt/qtcore/QTimer.cpp
  * contrib/hbqt/qtcore/QTranslator.cpp
  * contrib/hbqt/qtcore/QUrl.cpp
  * contrib/hbqt/qtcore/QVariant.cpp

  * contrib/hbqt/qtgui/QAbstractButton.cpp
  * contrib/hbqt/qtgui/QAbstractItemDelegate.cpp
  * contrib/hbqt/qtgui/QAbstractItemView.cpp
  * contrib/hbqt/qtgui/QAbstractPrintDialog.cpp
  * contrib/hbqt/qtgui/QAbstractProxyModel.cpp
  * contrib/hbqt/qtgui/QAbstractScrollArea.cpp
  * contrib/hbqt/qtgui/QAbstractSlider.cpp
  * contrib/hbqt/qtgui/QAbstractSpinBox.cpp
  * contrib/hbqt/qtgui/QAbstractTextDocumentLayout.cpp
  * contrib/hbqt/qtgui/QAction.cpp
  * contrib/hbqt/qtgui/QActionGroup.cpp
  * contrib/hbqt/qtgui/QApplication.cpp
  * contrib/hbqt/qtgui/QBitmap.cpp
  * contrib/hbqt/qtgui/QBoxLayout.cpp
  * contrib/hbqt/qtgui/QBrush.cpp
  * contrib/hbqt/qtgui/QButtonGroup.cpp
  * contrib/hbqt/qtgui/QCalendarWidget.cpp
  * contrib/hbqt/qtgui/QCheckBox.cpp
  * contrib/hbqt/qtgui/QClipboard.cpp
  * contrib/hbqt/qtgui/QColor.cpp
  * contrib/hbqt/qtgui/QColorDialog.cpp
  * contrib/hbqt/qtgui/QComboBox.cpp
  * contrib/hbqt/qtgui/QCommandLinkButton.cpp
  * contrib/hbqt/qtgui/QCommonStyle.cpp
  * contrib/hbqt/qtgui/QCompleter.cpp
  * contrib/hbqt/qtgui/QConicalGradient.cpp
  * contrib/hbqt/qtgui/QContextMenuEvent.cpp
  * contrib/hbqt/qtgui/QCursor.cpp
  * contrib/hbqt/qtgui/QDateEdit.cpp
  * contrib/hbqt/qtgui/QDateTimeEdit.cpp
  * contrib/hbqt/qtgui/QDesktopWidget.cpp
  * contrib/hbqt/qtgui/QDial.cpp
  * contrib/hbqt/qtgui/QDialog.cpp
  * contrib/hbqt/qtgui/QDirModel.cpp
  * contrib/hbqt/qtgui/QDockWidget.cpp
  * contrib/hbqt/qtgui/QDoubleSpinBox.cpp
  * contrib/hbqt/qtgui/QDragEnterEvent.cpp
  * contrib/hbqt/qtgui/QDragLeaveEvent.cpp
  * contrib/hbqt/qtgui/QDragMoveEvent.cpp
  * contrib/hbqt/qtgui/QDropEvent.cpp
  * contrib/hbqt/qtgui/QErrorMessage.cpp
  * contrib/hbqt/qtgui/QFileDialog.cpp
  * contrib/hbqt/qtgui/QFileIconProvider.cpp
  * contrib/hbqt/qtgui/QFileSystemModel.cpp
  * contrib/hbqt/qtgui/QFocusEvent.cpp
  * contrib/hbqt/qtgui/QFocusFrame.cpp
  * contrib/hbqt/qtgui/QFont.cpp
  * contrib/hbqt/qtgui/QFontComboBox.cpp
  * contrib/hbqt/qtgui/QFontDatabase.cpp
  * contrib/hbqt/qtgui/QFontDialog.cpp
  * contrib/hbqt/qtgui/QFontInfo.cpp
  * contrib/hbqt/qtgui/QFontMetrics.cpp
  * contrib/hbqt/qtgui/QFontMetricsF.cpp
  * contrib/hbqt/qtgui/QFormLayout.cpp
  * contrib/hbqt/qtgui/QFrame.cpp
  * contrib/hbqt/qtgui/QGradient.cpp
  * contrib/hbqt/qtgui/QGridLayout.cpp
  * contrib/hbqt/qtgui/QGroupBox.cpp
  * contrib/hbqt/qtgui/QHBoxLayout.cpp
  * contrib/hbqt/qtgui/QHeaderView.cpp
  * contrib/hbqt/qtgui/QHelpEvent.cpp
  * contrib/hbqt/qtgui/QIcon.cpp
  * contrib/hbqt/qtgui/QImage.cpp
  * contrib/hbqt/qtgui/QImageReader.cpp
  * contrib/hbqt/qtgui/QImageWriter.cpp
  * contrib/hbqt/qtgui/QInputContext.cpp
  * contrib/hbqt/qtgui/QInputDialog.cpp
  * contrib/hbqt/qtgui/QInputEvent.cpp
  * contrib/hbqt/qtgui/QInputMethodEvent.cpp
  * contrib/hbqt/qtgui/QItemSelection.cpp
  * contrib/hbqt/qtgui/QItemSelectionModel.cpp
  * contrib/hbqt/qtgui/QKeyEvent.cpp
  * contrib/hbqt/qtgui/QKeySequence.cpp
  * contrib/hbqt/qtgui/QLabel.cpp
  * contrib/hbqt/qtgui/QLayout.cpp
  * contrib/hbqt/qtgui/QLayoutItem.cpp
  * contrib/hbqt/qtgui/QLCDNumber.cpp
  * contrib/hbqt/qtgui/QLinearGradient.cpp
  * contrib/hbqt/qtgui/QLineEdit.cpp
  * contrib/hbqt/qtgui/QListView.cpp
  * contrib/hbqt/qtgui/QListWidget.cpp
  * contrib/hbqt/qtgui/QListWidgetItem.cpp
  * contrib/hbqt/qtgui/QMainWindow.cpp
  * contrib/hbqt/qtgui/QMatrix.cpp
  * contrib/hbqt/qtgui/QMenu.cpp
  * contrib/hbqt/qtgui/QMenuBar.cpp
  * contrib/hbqt/qtgui/QMessageBox.cpp
  * contrib/hbqt/qtgui/QMouseEvent.cpp
  * contrib/hbqt/qtgui/QMoveEvent.cpp
  * contrib/hbqt/qtgui/QMovie.cpp
  * contrib/hbqt/qtgui/QPageSetupDialog.cpp
  * contrib/hbqt/qtgui/QPaintDevice.cpp
  * contrib/hbqt/qtgui/QPainter.cpp
  * contrib/hbqt/qtgui/QPainterPath.cpp
  * contrib/hbqt/qtgui/QPaintEvent.cpp
  * contrib/hbqt/qtgui/QPalette.cpp
  * contrib/hbqt/qtgui/QPen.cpp
  * contrib/hbqt/qtgui/QPicture.cpp
  * contrib/hbqt/qtgui/QPixmap.cpp
  * contrib/hbqt/qtgui/QPolygon.cpp
  * contrib/hbqt/qtgui/QPolygonF.cpp
  * contrib/hbqt/qtgui/QPrintDialog.cpp
  * contrib/hbqt/qtgui/QPrintEngine.cpp
  * contrib/hbqt/qtgui/QPrinter.cpp
  * contrib/hbqt/qtgui/QPrintPreviewDialog.cpp
  * contrib/hbqt/qtgui/QProgressBar.cpp
  * contrib/hbqt/qtgui/QProgressDialog.cpp
  * contrib/hbqt/qtgui/QPushButton.cpp
  * contrib/hbqt/qtgui/QRadialGradient.cpp
  * contrib/hbqt/qtgui/QRadioButton.cpp
  * contrib/hbqt/qtgui/QRegion.cpp
  * contrib/hbqt/qtgui/QResizeEvent.cpp
  * contrib/hbqt/qtgui/QScrollArea.cpp
  * contrib/hbqt/qtgui/QScrollBar.cpp
  * contrib/hbqt/qtgui/QSessionManager.cpp
  * contrib/hbqt/qtgui/QSizeGrip.cpp
  * contrib/hbqt/qtgui/QSizePolicy.cpp
  * contrib/hbqt/qtgui/QSlider.cpp
  * contrib/hbqt/qtgui/QSound.cpp
  * contrib/hbqt/qtgui/QSpacerItem.cpp
  * contrib/hbqt/qtgui/QSpinBox.cpp
  * contrib/hbqt/qtgui/QSplashScreen.cpp
  * contrib/hbqt/qtgui/QSplitter.cpp
  * contrib/hbqt/qtgui/QStandardItem.cpp
  * contrib/hbqt/qtgui/QStandardItemModel.cpp
  * contrib/hbqt/qtgui/QStatusBar.cpp
  * contrib/hbqt/qtgui/QStringListModel.cpp
  * contrib/hbqt/qtgui/QStyle.cpp
  * contrib/hbqt/qtgui/QStyledItemDelegate.cpp
  * contrib/hbqt/qtgui/QStyleFactory.cpp
  * contrib/hbqt/qtgui/QStyleHintReturn.cpp
  * contrib/hbqt/qtgui/QStyleHintReturnMask.cpp
  * contrib/hbqt/qtgui/QStyleHintReturnVariant.cpp
  * contrib/hbqt/qtgui/QStyleOption.cpp
  * contrib/hbqt/qtgui/QStyleOptionButton.cpp
  * contrib/hbqt/qtgui/QStyleOptionComboBox.cpp
  * contrib/hbqt/qtgui/QStyleOptionComplex.cpp
  * contrib/hbqt/qtgui/QStyleOptionDockWidget.cpp
  * contrib/hbqt/qtgui/QStyleOptionFocusRect.cpp
  * contrib/hbqt/qtgui/QStyleOptionFrame.cpp
  * contrib/hbqt/qtgui/QStyleOptionGroupBox.cpp
  * contrib/hbqt/qtgui/QStyleOptionHeader.cpp
  * contrib/hbqt/qtgui/QStyleOptionMenuItem.cpp
  * contrib/hbqt/qtgui/QStyleOptionProgressBar.cpp
  * contrib/hbqt/qtgui/QStyleOptionSizeGrip.cpp
  * contrib/hbqt/qtgui/QStyleOptionSlider.cpp
  * contrib/hbqt/qtgui/QStyleOptionSpinBox.cpp
  * contrib/hbqt/qtgui/QStyleOptionTab.cpp
  * contrib/hbqt/qtgui/QStyleOptionTabBarBase.cpp
  * contrib/hbqt/qtgui/QStyleOptionTabWidgetFrame.cpp
  * contrib/hbqt/qtgui/QStyleOptionTitleBar.cpp
  * contrib/hbqt/qtgui/QStyleOptionToolBar.cpp
  * contrib/hbqt/qtgui/QStyleOptionToolBox.cpp
  * contrib/hbqt/qtgui/QStyleOptionToolButton.cpp
  * contrib/hbqt/qtgui/QStyleOptionViewItem.cpp
  * contrib/hbqt/qtgui/QStylePainter.cpp
  * contrib/hbqt/qtgui/QSystemTrayIcon.cpp
  * contrib/hbqt/qtgui/QTabBar.cpp
  * contrib/hbqt/qtgui/QTableView.cpp
  * contrib/hbqt/qtgui/QTableWidget.cpp
  * contrib/hbqt/qtgui/QTableWidgetItem.cpp
  * contrib/hbqt/qtgui/QTableWidgetSelectionRange.cpp
  * contrib/hbqt/qtgui/QTabWidget.cpp
  * contrib/hbqt/qtgui/QTextBlock.cpp
  * contrib/hbqt/qtgui/QTextBlockFormat.cpp
  * contrib/hbqt/qtgui/QTextBrowser.cpp
  * contrib/hbqt/qtgui/QTextCharFormat.cpp
  * contrib/hbqt/qtgui/QTextCursor.cpp
  * contrib/hbqt/qtgui/QTextDocument.cpp
  * contrib/hbqt/qtgui/QTextDocumentFragment.cpp
  * contrib/hbqt/qtgui/QTextDocumentWriter.cpp
  * contrib/hbqt/qtgui/QTextEdit.cpp
  * contrib/hbqt/qtgui/QTextFormat.cpp
  * contrib/hbqt/qtgui/QTextFragment.cpp
  * contrib/hbqt/qtgui/QTextFrame.cpp
  * contrib/hbqt/qtgui/QTextFrameFormat.cpp
  * contrib/hbqt/qtgui/QTextImageFormat.cpp
  * contrib/hbqt/qtgui/QTextInlineObject.cpp
  * contrib/hbqt/qtgui/QTextItem.cpp
  * contrib/hbqt/qtgui/QTextLayout.cpp
  * contrib/hbqt/qtgui/QTextLength.cpp
  * contrib/hbqt/qtgui/QTextLine.cpp
  * contrib/hbqt/qtgui/QTextListFormat.cpp
  * contrib/hbqt/qtgui/QTextObject.cpp
  * contrib/hbqt/qtgui/QTextOption.cpp
  * contrib/hbqt/qtgui/QTextTableFormat.cpp
  * contrib/hbqt/qtgui/QTimeEdit.cpp
  * contrib/hbqt/qtgui/QToolBar.cpp
  * contrib/hbqt/qtgui/QToolBox.cpp
  * contrib/hbqt/qtgui/QToolButton.cpp
  * contrib/hbqt/qtgui/QTransform.cpp
  * contrib/hbqt/qtgui/QTreeView.cpp
  * contrib/hbqt/qtgui/QTreeWidget.cpp
  * contrib/hbqt/qtgui/QTreeWidgetItem.cpp
  * contrib/hbqt/qtgui/QValidator.cpp
  * contrib/hbqt/qtgui/QVBoxLayout.cpp
  * contrib/hbqt/qtgui/QWheelEvent.cpp
  * contrib/hbqt/qtgui/QWidget.cpp
  * contrib/hbqt/qtgui/QWidgetAction.cpp
  * contrib/hbqt/qtgui/QWidgetItem.cpp
  * contrib/hbqt/qtgui/QWindowsStyle.cpp
  * contrib/hbqt/qtgui/QWindowsXPStyle.cpp
  * contrib/hbqt/qtgui/QWizard.cpp
  * contrib/hbqt/qtgui/QWizardPage.cpp

  * contrib/hbqt/qtnetwork/QFtp.cpp
  * contrib/hbqt/qtnetwork/QHttp.cpp
  * contrib/hbqt/qtnetwork/QHttpRequestHeader.cpp
  * contrib/hbqt/qtnetwork/QHttpResponseHeader.cpp
  * contrib/hbqt/qtnetwork/QNetworkRequest.cpp

  * contrib/hbqt/qtwebkit/QWebFrame.cpp
  * contrib/hbqt/qtwebkit/QWebHistory.cpp
  * contrib/hbqt/qtwebkit/QWebHistoryInterface.cpp
  * contrib/hbqt/qtwebkit/QWebHistoryItem.cpp
  * contrib/hbqt/qtwebkit/QWebHitTestResult.cpp
  * contrib/hbqt/qtwebkit/QWebPage.cpp
  * contrib/hbqt/qtwebkit/QWebPluginFactory.cpp
  * contrib/hbqt/qtwebkit/QWebSecurityOrigin.cpp
  * contrib/hbqt/qtwebkit/QWebSettings.cpp
  * contrib/hbqt/qtwebkit/QWebView.cpp

  * contrib/hbxbp/xbpbrowse.prg
  * contrib/hbxbp/xbpgeneric.prg
  * contrib/hbxbp/xbpwindow.prg

  * contrib/hbxbp/tests/demoxbp.prg

    + Implemented Bisz Istvan's patch with few fixes. Big thank you.
      This implementation has a better control over pointers and is dynamic.

    - Completely changed windows logging mechanism. Now it is invoked only 
      when you define #define __debug__ on C and PRG level

    TO WATCH: Please do extensive testing with demoxbp and demoqt. 
              We are almost done with pointer resolution, if I am not mistaking,
              but we further need to look into why system memory does not go down
              and keeps on increasing with every invocation of a dialog.
This commit is contained in:
Pritpal Bedi
2009-11-14 01:58:58 +00:00
parent 57012e8e25
commit 957cad0844
276 changed files with 9531 additions and 7041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

298
harbour/ChangeLog
View File

@@ -17,6 +17,302 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-11-13 17:43 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* contrib/hbqt/generator/hbqtgen.prg
* contrib/hbqt/qth/QAbstractItemModel.qth
* contrib/hbqt/hbqt.h
* contrib/hbqt/hbqt_destruct.cpp
* contrib/hbqt/hbqt_garbage.h
* contrib/hbqt/hbqt_slots.cpp
* contrib/hbqt/qtcore/QAbstractItemModel.cpp
* contrib/hbqt/qtcore/QAbstractListModel.cpp
* contrib/hbqt/qtcore/QAbstractTableModel.cpp
* contrib/hbqt/qtcore/QBitArray.cpp
* contrib/hbqt/qtcore/QByteArray.cpp
* contrib/hbqt/qtcore/QCoreApplication.cpp
* contrib/hbqt/qtcore/QDataStream.cpp
* contrib/hbqt/qtcore/QDate.cpp
* contrib/hbqt/qtcore/QDateTime.cpp
* contrib/hbqt/qtcore/QDir.cpp
* contrib/hbqt/qtcore/QEvent.cpp
* contrib/hbqt/qtcore/QEventLoop.cpp
* contrib/hbqt/qtcore/QFile.cpp
* contrib/hbqt/qtcore/QFileInfo.cpp
* contrib/hbqt/qtcore/QIODevice.cpp
* contrib/hbqt/qtcore/QLatin1Char.cpp
* contrib/hbqt/qtcore/QLatin1String.cpp
* contrib/hbqt/qtcore/QLine.cpp
* contrib/hbqt/qtcore/QLineF.cpp
* contrib/hbqt/qtcore/QList.cpp
* contrib/hbqt/qtcore/QLocale.cpp
* contrib/hbqt/qtcore/QMimeData.cpp
* contrib/hbqt/qtcore/QModelIndex.cpp
* contrib/hbqt/qtcore/QObject.cpp
* contrib/hbqt/qtcore/QPoint.cpp
* contrib/hbqt/qtcore/QPointF.cpp
* contrib/hbqt/qtcore/QProcess.cpp
* contrib/hbqt/qtcore/QRect.cpp
* contrib/hbqt/qtcore/QRectF.cpp
* contrib/hbqt/qtcore/QRegExp.cpp
* contrib/hbqt/qtcore/QResource.cpp
* contrib/hbqt/qtcore/QSignalMapper.cpp
* contrib/hbqt/qtcore/QSize.cpp
* contrib/hbqt/qtcore/QSizeF.cpp
* contrib/hbqt/qtcore/QStringList.cpp
* contrib/hbqt/qtcore/QTextBoundaryFinder.cpp
* contrib/hbqt/qtcore/QTextCodec.cpp
* contrib/hbqt/qtcore/QTextDecoder.cpp
* contrib/hbqt/qtcore/QTextEncoder.cpp
* contrib/hbqt/qtcore/QTextStream.cpp
* contrib/hbqt/qtcore/QThread.cpp
* contrib/hbqt/qtcore/QTime.cpp
* contrib/hbqt/qtcore/QTimer.cpp
* contrib/hbqt/qtcore/QTranslator.cpp
* contrib/hbqt/qtcore/QUrl.cpp
* contrib/hbqt/qtcore/QVariant.cpp
* contrib/hbqt/qtgui/QAbstractButton.cpp
* contrib/hbqt/qtgui/QAbstractItemDelegate.cpp
* contrib/hbqt/qtgui/QAbstractItemView.cpp
* contrib/hbqt/qtgui/QAbstractPrintDialog.cpp
* contrib/hbqt/qtgui/QAbstractProxyModel.cpp
* contrib/hbqt/qtgui/QAbstractScrollArea.cpp
* contrib/hbqt/qtgui/QAbstractSlider.cpp
* contrib/hbqt/qtgui/QAbstractSpinBox.cpp
* contrib/hbqt/qtgui/QAbstractTextDocumentLayout.cpp
* contrib/hbqt/qtgui/QAction.cpp
* contrib/hbqt/qtgui/QActionGroup.cpp
* contrib/hbqt/qtgui/QApplication.cpp
* contrib/hbqt/qtgui/QBitmap.cpp
* contrib/hbqt/qtgui/QBoxLayout.cpp
* contrib/hbqt/qtgui/QBrush.cpp
* contrib/hbqt/qtgui/QButtonGroup.cpp
* contrib/hbqt/qtgui/QCalendarWidget.cpp
* contrib/hbqt/qtgui/QCheckBox.cpp
* contrib/hbqt/qtgui/QClipboard.cpp
* contrib/hbqt/qtgui/QColor.cpp
* contrib/hbqt/qtgui/QColorDialog.cpp
* contrib/hbqt/qtgui/QComboBox.cpp
* contrib/hbqt/qtgui/QCommandLinkButton.cpp
* contrib/hbqt/qtgui/QCommonStyle.cpp
* contrib/hbqt/qtgui/QCompleter.cpp
* contrib/hbqt/qtgui/QConicalGradient.cpp
* contrib/hbqt/qtgui/QContextMenuEvent.cpp
* contrib/hbqt/qtgui/QCursor.cpp
* contrib/hbqt/qtgui/QDateEdit.cpp
* contrib/hbqt/qtgui/QDateTimeEdit.cpp
* contrib/hbqt/qtgui/QDesktopWidget.cpp
* contrib/hbqt/qtgui/QDial.cpp
* contrib/hbqt/qtgui/QDialog.cpp
* contrib/hbqt/qtgui/QDirModel.cpp
* contrib/hbqt/qtgui/QDockWidget.cpp
* contrib/hbqt/qtgui/QDoubleSpinBox.cpp
* contrib/hbqt/qtgui/QDragEnterEvent.cpp
* contrib/hbqt/qtgui/QDragLeaveEvent.cpp
* contrib/hbqt/qtgui/QDragMoveEvent.cpp
* contrib/hbqt/qtgui/QDropEvent.cpp
* contrib/hbqt/qtgui/QErrorMessage.cpp
* contrib/hbqt/qtgui/QFileDialog.cpp
* contrib/hbqt/qtgui/QFileIconProvider.cpp
* contrib/hbqt/qtgui/QFileSystemModel.cpp
* contrib/hbqt/qtgui/QFocusEvent.cpp
* contrib/hbqt/qtgui/QFocusFrame.cpp
* contrib/hbqt/qtgui/QFont.cpp
* contrib/hbqt/qtgui/QFontComboBox.cpp
* contrib/hbqt/qtgui/QFontDatabase.cpp
* contrib/hbqt/qtgui/QFontDialog.cpp
* contrib/hbqt/qtgui/QFontInfo.cpp
* contrib/hbqt/qtgui/QFontMetrics.cpp
* contrib/hbqt/qtgui/QFontMetricsF.cpp
* contrib/hbqt/qtgui/QFormLayout.cpp
* contrib/hbqt/qtgui/QFrame.cpp
* contrib/hbqt/qtgui/QGradient.cpp
* contrib/hbqt/qtgui/QGridLayout.cpp
* contrib/hbqt/qtgui/QGroupBox.cpp
* contrib/hbqt/qtgui/QHBoxLayout.cpp
* contrib/hbqt/qtgui/QHeaderView.cpp
* contrib/hbqt/qtgui/QHelpEvent.cpp
* contrib/hbqt/qtgui/QIcon.cpp
* contrib/hbqt/qtgui/QImage.cpp
* contrib/hbqt/qtgui/QImageReader.cpp
* contrib/hbqt/qtgui/QImageWriter.cpp
* contrib/hbqt/qtgui/QInputContext.cpp
* contrib/hbqt/qtgui/QInputDialog.cpp
* contrib/hbqt/qtgui/QInputEvent.cpp
* contrib/hbqt/qtgui/QInputMethodEvent.cpp
* contrib/hbqt/qtgui/QItemSelection.cpp
* contrib/hbqt/qtgui/QItemSelectionModel.cpp
* contrib/hbqt/qtgui/QKeyEvent.cpp
* contrib/hbqt/qtgui/QKeySequence.cpp
* contrib/hbqt/qtgui/QLabel.cpp
* contrib/hbqt/qtgui/QLayout.cpp
* contrib/hbqt/qtgui/QLayoutItem.cpp
* contrib/hbqt/qtgui/QLCDNumber.cpp
* contrib/hbqt/qtgui/QLinearGradient.cpp
* contrib/hbqt/qtgui/QLineEdit.cpp
* contrib/hbqt/qtgui/QListView.cpp
* contrib/hbqt/qtgui/QListWidget.cpp
* contrib/hbqt/qtgui/QListWidgetItem.cpp
* contrib/hbqt/qtgui/QMainWindow.cpp
* contrib/hbqt/qtgui/QMatrix.cpp
* contrib/hbqt/qtgui/QMenu.cpp
* contrib/hbqt/qtgui/QMenuBar.cpp
* contrib/hbqt/qtgui/QMessageBox.cpp
* contrib/hbqt/qtgui/QMouseEvent.cpp
* contrib/hbqt/qtgui/QMoveEvent.cpp
* contrib/hbqt/qtgui/QMovie.cpp
* contrib/hbqt/qtgui/QPageSetupDialog.cpp
* contrib/hbqt/qtgui/QPaintDevice.cpp
* contrib/hbqt/qtgui/QPainter.cpp
* contrib/hbqt/qtgui/QPainterPath.cpp
* contrib/hbqt/qtgui/QPaintEvent.cpp
* contrib/hbqt/qtgui/QPalette.cpp
* contrib/hbqt/qtgui/QPen.cpp
* contrib/hbqt/qtgui/QPicture.cpp
* contrib/hbqt/qtgui/QPixmap.cpp
* contrib/hbqt/qtgui/QPolygon.cpp
* contrib/hbqt/qtgui/QPolygonF.cpp
* contrib/hbqt/qtgui/QPrintDialog.cpp
* contrib/hbqt/qtgui/QPrintEngine.cpp
* contrib/hbqt/qtgui/QPrinter.cpp
* contrib/hbqt/qtgui/QPrintPreviewDialog.cpp
* contrib/hbqt/qtgui/QProgressBar.cpp
* contrib/hbqt/qtgui/QProgressDialog.cpp
* contrib/hbqt/qtgui/QPushButton.cpp
* contrib/hbqt/qtgui/QRadialGradient.cpp
* contrib/hbqt/qtgui/QRadioButton.cpp
* contrib/hbqt/qtgui/QRegion.cpp
* contrib/hbqt/qtgui/QResizeEvent.cpp
* contrib/hbqt/qtgui/QScrollArea.cpp
* contrib/hbqt/qtgui/QScrollBar.cpp
* contrib/hbqt/qtgui/QSessionManager.cpp
* contrib/hbqt/qtgui/QSizeGrip.cpp
* contrib/hbqt/qtgui/QSizePolicy.cpp
* contrib/hbqt/qtgui/QSlider.cpp
* contrib/hbqt/qtgui/QSound.cpp
* contrib/hbqt/qtgui/QSpacerItem.cpp
* contrib/hbqt/qtgui/QSpinBox.cpp
* contrib/hbqt/qtgui/QSplashScreen.cpp
* contrib/hbqt/qtgui/QSplitter.cpp
* contrib/hbqt/qtgui/QStandardItem.cpp
* contrib/hbqt/qtgui/QStandardItemModel.cpp
* contrib/hbqt/qtgui/QStatusBar.cpp
* contrib/hbqt/qtgui/QStringListModel.cpp
* contrib/hbqt/qtgui/QStyle.cpp
* contrib/hbqt/qtgui/QStyledItemDelegate.cpp
* contrib/hbqt/qtgui/QStyleFactory.cpp
* contrib/hbqt/qtgui/QStyleHintReturn.cpp
* contrib/hbqt/qtgui/QStyleHintReturnMask.cpp
* contrib/hbqt/qtgui/QStyleHintReturnVariant.cpp
* contrib/hbqt/qtgui/QStyleOption.cpp
* contrib/hbqt/qtgui/QStyleOptionButton.cpp
* contrib/hbqt/qtgui/QStyleOptionComboBox.cpp
* contrib/hbqt/qtgui/QStyleOptionComplex.cpp
* contrib/hbqt/qtgui/QStyleOptionDockWidget.cpp
* contrib/hbqt/qtgui/QStyleOptionFocusRect.cpp
* contrib/hbqt/qtgui/QStyleOptionFrame.cpp
* contrib/hbqt/qtgui/QStyleOptionGroupBox.cpp
* contrib/hbqt/qtgui/QStyleOptionHeader.cpp
* contrib/hbqt/qtgui/QStyleOptionMenuItem.cpp
* contrib/hbqt/qtgui/QStyleOptionProgressBar.cpp
* contrib/hbqt/qtgui/QStyleOptionSizeGrip.cpp
* contrib/hbqt/qtgui/QStyleOptionSlider.cpp
* contrib/hbqt/qtgui/QStyleOptionSpinBox.cpp
* contrib/hbqt/qtgui/QStyleOptionTab.cpp
* contrib/hbqt/qtgui/QStyleOptionTabBarBase.cpp
* contrib/hbqt/qtgui/QStyleOptionTabWidgetFrame.cpp
* contrib/hbqt/qtgui/QStyleOptionTitleBar.cpp
* contrib/hbqt/qtgui/QStyleOptionToolBar.cpp
* contrib/hbqt/qtgui/QStyleOptionToolBox.cpp
* contrib/hbqt/qtgui/QStyleOptionToolButton.cpp
* contrib/hbqt/qtgui/QStyleOptionViewItem.cpp
* contrib/hbqt/qtgui/QStylePainter.cpp
* contrib/hbqt/qtgui/QSystemTrayIcon.cpp
* contrib/hbqt/qtgui/QTabBar.cpp
* contrib/hbqt/qtgui/QTableView.cpp
* contrib/hbqt/qtgui/QTableWidget.cpp
* contrib/hbqt/qtgui/QTableWidgetItem.cpp
* contrib/hbqt/qtgui/QTableWidgetSelectionRange.cpp
* contrib/hbqt/qtgui/QTabWidget.cpp
* contrib/hbqt/qtgui/QTextBlock.cpp
* contrib/hbqt/qtgui/QTextBlockFormat.cpp
* contrib/hbqt/qtgui/QTextBrowser.cpp
* contrib/hbqt/qtgui/QTextCharFormat.cpp
* contrib/hbqt/qtgui/QTextCursor.cpp
* contrib/hbqt/qtgui/QTextDocument.cpp
* contrib/hbqt/qtgui/QTextDocumentFragment.cpp
* contrib/hbqt/qtgui/QTextDocumentWriter.cpp
* contrib/hbqt/qtgui/QTextEdit.cpp
* contrib/hbqt/qtgui/QTextFormat.cpp
* contrib/hbqt/qtgui/QTextFragment.cpp
* contrib/hbqt/qtgui/QTextFrame.cpp
* contrib/hbqt/qtgui/QTextFrameFormat.cpp
* contrib/hbqt/qtgui/QTextImageFormat.cpp
* contrib/hbqt/qtgui/QTextInlineObject.cpp
* contrib/hbqt/qtgui/QTextItem.cpp
* contrib/hbqt/qtgui/QTextLayout.cpp
* contrib/hbqt/qtgui/QTextLength.cpp
* contrib/hbqt/qtgui/QTextLine.cpp
* contrib/hbqt/qtgui/QTextListFormat.cpp
* contrib/hbqt/qtgui/QTextObject.cpp
* contrib/hbqt/qtgui/QTextOption.cpp
* contrib/hbqt/qtgui/QTextTableFormat.cpp
* contrib/hbqt/qtgui/QTimeEdit.cpp
* contrib/hbqt/qtgui/QToolBar.cpp
* contrib/hbqt/qtgui/QToolBox.cpp
* contrib/hbqt/qtgui/QToolButton.cpp
* contrib/hbqt/qtgui/QTransform.cpp
* contrib/hbqt/qtgui/QTreeView.cpp
* contrib/hbqt/qtgui/QTreeWidget.cpp
* contrib/hbqt/qtgui/QTreeWidgetItem.cpp
* contrib/hbqt/qtgui/QValidator.cpp
* contrib/hbqt/qtgui/QVBoxLayout.cpp
* contrib/hbqt/qtgui/QWheelEvent.cpp
* contrib/hbqt/qtgui/QWidget.cpp
* contrib/hbqt/qtgui/QWidgetAction.cpp
* contrib/hbqt/qtgui/QWidgetItem.cpp
* contrib/hbqt/qtgui/QWindowsStyle.cpp
* contrib/hbqt/qtgui/QWindowsXPStyle.cpp
* contrib/hbqt/qtgui/QWizard.cpp
* contrib/hbqt/qtgui/QWizardPage.cpp
* contrib/hbqt/qtnetwork/QFtp.cpp
* contrib/hbqt/qtnetwork/QHttp.cpp
* contrib/hbqt/qtnetwork/QHttpRequestHeader.cpp
* contrib/hbqt/qtnetwork/QHttpResponseHeader.cpp
* contrib/hbqt/qtnetwork/QNetworkRequest.cpp
* contrib/hbqt/qtwebkit/QWebFrame.cpp
* contrib/hbqt/qtwebkit/QWebHistory.cpp
* contrib/hbqt/qtwebkit/QWebHistoryInterface.cpp
* contrib/hbqt/qtwebkit/QWebHistoryItem.cpp
* contrib/hbqt/qtwebkit/QWebHitTestResult.cpp
* contrib/hbqt/qtwebkit/QWebPage.cpp
* contrib/hbqt/qtwebkit/QWebPluginFactory.cpp
* contrib/hbqt/qtwebkit/QWebSecurityOrigin.cpp
* contrib/hbqt/qtwebkit/QWebSettings.cpp
* contrib/hbqt/qtwebkit/QWebView.cpp
* contrib/hbxbp/xbpbrowse.prg
* contrib/hbxbp/xbpgeneric.prg
* contrib/hbxbp/xbpwindow.prg
* contrib/hbxbp/tests/demoxbp.prg
+ Implemented Bisz Istvan's patch with few fixes. Big thank you.
This implementation has a better control over pointers and is dynamic.
- Completely changed windows logging mechanism. Now it is invoked only
when you define #define __debug__ on C and PRG level
TO WATCH: Please do extensive testing with demoxbp and demoqt.
We are almost done with pointer resolution, if I am not mistaking,
but we further need to look into why system memory does not go down
and keeps on increasing with every invocation of a dialog.
2009-11-13 20:40 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
* harbour/contrib/rddads/ads1.c
* changed ulRetVal to u32RetVal to be the same name in all file
@@ -62,7 +358,7 @@
2009-11-10 11:55 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* contrib/hbxbp/xbpmenubar.prg
! Fixed diuble freeing of signals.
! Fixed double freeing of signals.
2009-11-10 19:31 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/include/hbcdpreg.h

320
harbour/contrib/hbqt/generator/hbqtgen.prg
View File

@@ -16,6 +16,11 @@ STATIC aGui := {}
STATIC aNetwork := {}
STATIC aWebkit := {}
/*
* Force new GC and Qt interface
*/
STATIC lNewGCtoQT := .T.
/*----------------------------------------------------------------------*/
FUNCTION Main( ... )
@@ -465,47 +470,127 @@ STATIC FUNCTION GenSource( cProFile, cPathIn, cPathOut, cPathDoc )
lDestructor := ascan( cls_, {|e_| lower( e_[ 1 ] ) == "destructor" .and. lower( e_[ 2 ] ) == "no"} ) == 0
lObject := ascan( cls_, {|e_| lower( e_[ 1 ] ) == "qobject" .and. lower( e_[ 2 ] ) == "no"} ) == 0
aadd( cpp_, "QT_G_FUNC( release_" + cWidget + " ) " )
aadd( cpp_, "{ " )
IF lDestructor
aadd( cpp_, "#if defined(__debug__)" )
aadd( cpp_, 'hb_snprintf( str, sizeof(str), "' + 'release_' + pad( cWidget, 27 ) + ' %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );' )
aadd( cpp_, "#endif" )
aadd( cpp_, " void * ph = ( void * ) Cargo; " )
aadd( cpp_, " if( ph ) " )
aadd( cpp_, " { " )
IF lObject
aadd( cpp_, " const QMetaObject * m = ( ( QObject * ) ph )->metaObject();" )
aadd( cpp_, ' if( ( QString ) m->className() != ( QString ) "QObject" )' )
aadd( cpp_, " {" )
//aadd( cpp_, " delete ( ( " + cWidget + IF( lList, "< void * >", "" ) + " * ) ph ); " )
aadd( cpp_, " ( ( " + cWidget + IF( lList, "< void * >", "" ) + " * ) ph )->~" + cWidget + "(); " )
aadd( cpp_, " ph = NULL;" )
aadd( cpp_, " }" )
aadd( cpp_, " else" )
aadd( cpp_, " {" )
aadd( cpp_, "#if defined(__debug__)" )
aadd( cpp_, 'hb_snprintf( str, sizeof(str), "' + ' Object Name Missing: ' + cWidget + '" ); OutputDebugString( str );' )
aadd( cpp_, "#endif" )
aadd( cpp_, " }" )
ELSE
//aadd( cpp_, " delete ( ( " + cWidget + IF( lList, "< void * >", "" ) + " * ) ph ); " )
aadd( cpp_, " ( ( " + cWidget + IF( lList, "< void * >", "" ) + " * ) ph )->~" + cWidget + "(); " )
aadd( cpp_, " ph = NULL;" )
IF ( lNewGCtoQT )
lConst := .f.
FOR i := 3 TO len( new_ ) - 1
IF left( ltrim( new_[ i ] ), 2 ) != "//"
IF "hb_retptr(" $ new_[ i ]
lConst := .t.
EXIT
ENDIF
ENDIF
NEXT
IF ( lDestructor ) .AND. ( lConst )
IF lObject
aadd( cpp_, "typedef struct" )
aadd( cpp_, "{" )
aadd( cpp_, " void * ph;" )
aadd( cpp_, " QT_G_FUNC_PTR func;" )
aadd( cpp_, " QPointer< "+ cWidget +" > pq;" )
aadd( cpp_, "} QGC_POINTER_" + cWidget + ";" )
aadd( cpp_, " " )
ENDIF
ENDIF
aadd( cpp_, " }" )
aadd( cpp_, " else" )
aadd( cpp_, " {" )
aadd( cpp_, "#if defined(__debug__)" )
aadd( cpp_, 'hb_snprintf( str, sizeof(str), "' + '! ph____' + cWidget + '" ); OutputDebugString( str );' )
aadd( cpp_, "#endif" )
aadd( cpp_, " }" )
aadd( cpp_, "QT_G_FUNC( release_" + cWidget + " )" )
aadd( cpp_, "{" )
IF ( lDestructor ) .AND. ( lConst )
IF lObject
aadd( cpp_, " QGC_POINTER_" + cWidget + " * p = ( QGC_POINTER_" + cWidget + " * ) Cargo; " )
aadd( cpp_, " " )
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( "release_' + pad( cWidget, 27 ) + ' p=%p", p));')
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( "release_' + pad( cWidget, 27 ) + ' ph=%p pq=%p", p->ph, (void *)(p->pq)));')
aadd( cpp_, " " )
aadd( cpp_, " if( p && p->ph && p->pq ) " )
aadd( cpp_, " { " )
aadd( cpp_, " const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();" )
aadd( cpp_, ' if( ( QString ) m->className() != ( QString ) "QObject" )' )
aadd( cpp_, " {" )
//aadd( cpp_, " delete ( ( " + cWidget + IF( lList, "< void * >", "" ) + " * ) ph ); " )
aadd( cpp_, " ( ( " + cWidget + IF( lList, "< void * >", "" ) + " * ) p->ph )->~" + cWidget + "(); " )
aadd( cpp_, " p->ph = NULL;" )
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( "release_' + pad( cWidget, 27 ) + ' Object deleted!" ) );')
aadd( cpp_, " #if defined(__debug__)" )
aadd( cpp_, ' just_debug( "' + ' YES release_' + pad( cWidget, 27 ) + ' %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );' )
aadd( cpp_, " #endif" )
aadd( cpp_, " }" )
aadd( cpp_, " else" )
aadd( cpp_, " {" )
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( "release_' + pad( cWidget, 27 ) + ' Object Name Missing!" ) );')
aadd( cpp_, " #if defined(__debug__)" )
aadd( cpp_, ' just_debug( "' + ' NO release_' + cWidget + '" );' )
aadd( cpp_, " #endif" )
aadd( cpp_, " }" )
ELSE
aadd( cpp_, " QGC_POINTER * p = ( QGC_POINTER * ) Cargo; " )
aadd( cpp_, " " )
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( "release_' + pad( cWidget, 27 ) + ' p=%p", p ) );' )
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( "release_' + pad( cWidget, 27 ) + ' ph=%p", p->ph ) );' )
aadd( cpp_, " " )
aadd( cpp_, " if( p && p->ph ) " )
aadd( cpp_, " { " )
//aadd( cpp_, " delete ( ( " + cWidget + IF( lList, "< void * >", "" ) + " * ) ph ); " )
aadd( cpp_, " ( ( " + cWidget + IF( lList, "< void * >", "" ) + " * ) p->ph )->~" + cWidget + "(); " )
aadd( cpp_, " p->ph = NULL;" )
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( "release_' + pad( cWidget, 27 ) + ' Object deleted!" ) );')
aadd( cpp_, " #if defined(__debug__)" )
aadd( cpp_, ' just_debug( "' + ' YES release_' + pad( cWidget, 27 ) + ' %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );' )
aadd( cpp_, " #endif" )
ENDIF
aadd( cpp_, " }" )
aadd( cpp_, " else" )
aadd( cpp_, " {" )
aadd( cpp_, ' HB_TRACE( HB_TR_DEBUG, ( "release_' + pad( cWidget, 27 ) + ' Object Allready deleted!" ) );' )
aadd( cpp_, " #if defined(__debug__)" )
aadd( cpp_, ' just_debug( "' + ' DEL release_' + cWidget + '" );' )
aadd( cpp_, " #endif" )
aadd( cpp_, " }" )
ELSE
aadd( cpp_, " HB_SYMBOL_UNUSED( Cargo );" )
ENDIF
aadd( cpp_, "} " )
aadd( cpp_, " " )
ELSE
aadd( cpp_, " HB_SYMBOL_UNUSED( Cargo );" )
aadd( cpp_, "QT_G_FUNC( release_" + cWidget + " ) " )
aadd( cpp_, "{ " )
IF lDestructor
aadd( cpp_, "#if defined(__debug__)" )
aadd( cpp_, ' just_debug( "' + 'release_' + pad( cWidget, 27 ) + ' %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );' )
aadd( cpp_, "#endif" )
aadd( cpp_, " void * ph = ( void * ) Cargo; " )
aadd( cpp_, " if( ph ) " )
aadd( cpp_, " { " )
IF lObject
aadd( cpp_, " const QMetaObject * m = ( ( QObject * ) ph )->metaObject();" )
aadd( cpp_, ' if( ( QString ) m->className() != ( QString ) "QObject" )' )
aadd( cpp_, " {" )
//aadd( cpp_, " delete ( ( " + cWidget + IF( lList, "< void * >", "" ) + " * ) ph ); " )
aadd( cpp_, " ( ( " + cWidget + IF( lList, "< void * >", "" ) + " * ) ph )->~" + cWidget + "(); " )
aadd( cpp_, " ph = NULL;" )
aadd( cpp_, " }" )
aadd( cpp_, " else" )
aadd( cpp_, " {" )
aadd( cpp_, "#if defined(__debug__)" )
aadd( cpp_, 'just_debug( "' + ' Object Name Missing: ' + cWidget + '" );' )
aadd( cpp_, "#endif" )
aadd( cpp_, " }" )
ELSE
//aadd( cpp_, " delete ( ( " + cWidget + IF( lList, "< void * >", "" ) + " * ) ph ); " )
aadd( cpp_, " ( ( " + cWidget + IF( lList, "< void * >", "" ) + " * ) ph )->~" + cWidget + "(); " )
aadd( cpp_, " ph = NULL;" )
ENDIF
aadd( cpp_, " }" )
aadd( cpp_, " else" )
aadd( cpp_, " {" )
aadd( cpp_, "#if defined(__debug__)" )
aadd( cpp_, 'just_debug( "' + '! ph____' + cWidget + '" );' )
aadd( cpp_, "#endif" )
aadd( cpp_, " }" )
ELSE
aadd( cpp_, " HB_SYMBOL_UNUSED( Cargo );" )
ENDIF
aadd( cpp_, "} " )
aadd( cpp_, " " )
ENDIF
aadd( cpp_, "} " )
aadd( cpp_, " " )
/* Insert CONSTRUCTOR - if defined */
lConst := .f.
FOR i := 3 TO len( new_ ) - 1
@@ -516,53 +601,105 @@ STATIC FUNCTION GenSource( cProFile, cPathIn, cPathOut, cPathDoc )
ENDIF
ENDIF
NEXT
aadd( cpp_, new_[ 1 ] ) // Func definition
aadd( cpp_, new_[ 2 ] ) // {
IF lConst
//IF lObject .or. IsMemObject( cWidget )
IF lDestructor
aadd( cpp_, " QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );" )
ENDIF
IF lObject
aadd( cpp_, " QPointer< "+ cWidget +" > pObj = NULL;" )
ELSE
aadd( cpp_, " void * pObj = NULL;" )
ENDIF
aadd( cpp_, "#if defined(__debug__)" )
aadd( cpp_, 'hb_snprintf( str, sizeof(str), "' + ' ' + IF( lDestructor, 'GC', 'NON-GC' ) + ': new ' + pad( cWidget, 27 ) + ' %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );' )
aadd( cpp_, "#endif" )
aadd( cpp_, "" )
FOR i := 3 TO len( new_ ) - 1
IF left( ltrim( new_[ i ] ), 2 ) != "//"
IF "hb_retptr(" $ new_[ i ]
s := trim( strtran( new_[ i ], "hb_retptr(", "pObj =" ) )
s := strtran( s, ");", ";" )
aadd( cpp_, s )
IF ( lNewGCtoQT )
IF lConst
IF lDestructor
aadd( cpp_, "void * gcAllocate_" + cWidget + "( void * pObj )" )
aadd( cpp_, "{ " )
IF lObject
aadd( cpp_, " QGC_POINTER_" + cWidget + " * p = ( QGC_POINTER_" + cWidget + " * ) hb_gcAllocate( sizeof( QGC_POINTER_" + cWidget + " ), gcFuncs() );" )
ELSE
aadd( cpp_, new_[ i ] )
aadd( cpp_, " QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );" )
ENDIF
aadd( cpp_, " " )
aadd( cpp_, " p->ph = pObj;" )
aadd( cpp_, " p->func = release_" + cWidget +";" )
IF lObject
aadd( cpp_, " new( & p->pq ) QPointer< "+ cWidget +" >( ( " + cWidget + " * ) pObj );" )
ENDIF
aadd( cpp_, " #if defined(__debug__)" )
aadd( cpp_, ' just_debug( "' + ' new_' + pad( cWidget, 27 ) + ' %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );' )
aadd( cpp_, " #endif" )
aadd( cpp_, " return( p ); " )
aadd( cpp_, "} " )
aadd( cpp_, " " )
ENDIF
NEXT
aadd( cpp_, "" )
aadd( cpp_, "#if defined(__debug__)" )
aadd( cpp_, 'hb_snprintf( str, sizeof(str), "' + ' ' + IF( lDestructor, 'GC', 'NON-GC' ) + ': ' + pad( " ", 27 ) + ' %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );' )
aadd( cpp_, "#endif" )
//IF lObject .or. IsMemObject( cWidget )
IF lDestructor
aadd( cpp_, " p->ph = pObj;" )
aadd( cpp_, " p->func = release_" + cWidget +";" )
aadd( cpp_, " " )
aadd( cpp_, " hb_retptrGC( p );" )
ELSE
aadd( cpp_, " hb_retptr( pObj );" )
ENDIF
ENDIF
aadd( cpp_, new_[ len( new_ ) ] ) // }
aadd( cpp_, new_[ 1 ] ) // Func definition
aadd( cpp_, new_[ 2 ] ) // {
IF lConst
aadd( cpp_, " void * pObj = NULL;" )
aadd( cpp_, " " )
FOR i := 3 TO len( new_ ) - 1
IF left( ltrim( new_[ i ] ), 2 ) != "//"
IF "hb_retptr(" $ new_[ i ]
s := trim( strtran( new_[ i ], "hb_retptr(", "pObj =" ) )
s := strtran( s, ");", ";" )
aadd( cpp_, s )
ELSE
aadd( cpp_, new_[ i ] )
ENDIF
ENDIF
NEXT
aadd( cpp_, " " )
IF lDestructor
aadd( cpp_, " hb_retptrGC( gcAllocate_" + cWidget + "( pObj ) );" )
ELSE
aadd( cpp_, " hb_retptr( pObj );" )
ENDIF
ENDIF
aadd( cpp_, new_[ len( new_ ) ] ) // }
ELSE
aadd( cpp_, new_[ 1 ] ) // Func definition
aadd( cpp_, new_[ 2 ] ) // {
IF lConst
IF lDestructor
aadd( cpp_, " QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );" )
ENDIF
IF lObject
aadd( cpp_, " QPointer< "+ cWidget +" > pObj = NULL;" )
ELSE
aadd( cpp_, " void * pObj = NULL;" )
ENDIF
aadd( cpp_, "#if defined(__debug__)" )
aadd( cpp_, 'just_debug( "' + ' ' + IF( lDestructor, 'GC', 'NON-GC' ) + ': new ' + pad( cWidget, 27 ) + ' %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );' )
aadd( cpp_, "#endif" )
aadd( cpp_, "" )
FOR i := 3 TO len( new_ ) - 1
IF left( ltrim( new_[ i ] ), 2 ) != "//"
IF "hb_retptr(" $ new_[ i ]
s := trim( strtran( new_[ i ], "hb_retptr(", "pObj =" ) )
s := strtran( s, ");", ";" )
aadd( cpp_, s )
ELSE
aadd( cpp_, new_[ i ] )
ENDIF
ENDIF
NEXT
aadd( cpp_, "" )
aadd( cpp_, "#if defined(__debug__)" )
aadd( cpp_, 'just_debug( "' + ' ' + IF( lDestructor, 'GC', 'NON-GC' ) + ': ' + pad( " ", 27 ) + ' %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );' )
aadd( cpp_, "#endif" )
//IF lObject .or. IsMemObject( cWidget )
IF lDestructor
aadd( cpp_, " p->ph = pObj;" )
aadd( cpp_, " p->func = release_" + cWidget +";" )
aadd( cpp_, " " )
aadd( cpp_, " hb_retptrGC( p );" )
ELSE
aadd( cpp_, " hb_retptr( pObj );" )
ENDIF
ENDIF
aadd( cpp_, new_[ len( new_ ) ] ) // }
ENDIF
/* Insert Functions */
aeval( txt_, {|e| aadd( cpp_, strtran( e, chr( 13 ), '' ) ) } )
@@ -575,8 +712,6 @@ STATIC FUNCTION GenSource( cProFile, cPathIn, cPathOut, cPathDoc )
ENDIF
/* Build Class PRG Source */
// cFileCpp := cPathOut + s_PathSep + cWidget + '.cpp'
// CreateTarget( cFileCpp, cpp_ )
/* Distribute in specific lib subfolder */
cFileCpp := GetSourcePathByLib( cWidget, cPathOut, '.cpp' )
CreateTarget( cFileCpp, cpp_ )
@@ -987,7 +1122,7 @@ STATIC FUNCTION ParseProto( cProto, cWidget, txt_, doc_, aEnum, func_ )
OTHERWISE
/* No attribute is attached to return value */
IF left( aA[ PRT_CAST ], 1 ) == 'Q'
IF (left( aA[ PRT_CAST ], 1 ) == 'Q')
cCmd := Get_Command( aA[ PRT_CAST ], cCmn )
cPrgRet := 'p' + cDocNM
@@ -1150,7 +1285,7 @@ STATIC FUNCTION ParseVariables( cProto, cWidget, txt_, doc_, aEnum, func_ )
OTHERWISE
/* No attribute is attached to return value */
IF left( aA[ PRT_CAST ], 1 ) == 'Q'
IF (left( aA[ PRT_CAST ], 1 ) == 'Q')
// cCmd := 'hb_retptr( new ' + aA[ PRT_CAST ] + '( ' + cCmn + ' ) )'
// cCmd := 'hb_retptrGC( hbqt_pToGCPointer( new ' + aA[ PRT_CAST ] + '( ' + cCmn + ' ) ) )'
cCmd := Get_Command( aA[ PRT_CAST ], cCmn )
@@ -1327,6 +1462,8 @@ STATIC FUNCTION DispHelp()
cHlp += ' ' + s_NewLine
cHlp += ' -c<compile> If QT env is set, attempts to compile resulting .cpp' + s_NewLine
cHlp += '' + s_NewLine
cHlp += ' -noretobject Skip object returning methods' + s_NewLine
cHlp += '' + s_NewLine
OutStd( cHlp )
@@ -1503,6 +1640,13 @@ STATIC FUNCTION Build_GarbageFile( cpp_, cPathOut )
NEXT
aadd( txt_, "" )
IF (lNewGCtoQT)
FOR EACH s IN cpp_
aadd( txt_, "extern void * gcAllocate_" + s + "( void * pObj );" )
NEXT
aadd( txt_, "" )
ENDIF
RETURN CreateTarget( cFile, txt_ )
/*----------------------------------------------------------------------*/
@@ -2193,12 +2337,18 @@ FUNCTION IsMemObject( cWidget )
FUNCTION Get_Command( cWgt, cCmn )
STATIC a_:={}
LOCAL cRet
IF ascan( a_, cWgt ) == 0
aadd( a_, cWgt )
//hb_ToOutDebug( pad( cWgt,30 ) + "No " + zWidget )
ENDIF
//RETURN 'hb_retptrGC( hbqt_ptrTOgcpointer( new ' + cWgt + '( ' + cCmn + ' ), "' + cWgt +'" ) )'
RETURN 'hb_retptrGC( hbqt_ptrTOgcpointer( new ' + cWgt + '( ' + cCmn + ' ), release_' + cWgt +' ) )'
IF (lNewGCtoQT)
cRet := 'hb_retptrGC( gcAllocate_' + cWgt + '( new ' + cWgt + '( ' + cCmn + ' ) ) )'
ELSE
cRet := 'hb_retptrGC( hbqt_ptrTOgcpointer( new ' + cWgt + '( ' + cCmn + ' ), release_' + cWgt +' ) )'
ENDIF
RETURN cRet
/*----------------------------------------------------------------------*/

26
harbour/contrib/hbqt/hbqt.h
View File

@@ -61,29 +61,10 @@
#if QT_VERSION >= 0x040500
//#define __debug__
// #define __debug__
#if defined(__debug__)
#include <windows.h>
static char str[ 100 ];
int hb_getMemUsed( void );
#endif
#if 0
#include <QMainWIndow>
/* global declaration */
typedef void * ( * QT_PARAM_FUNC ) ( int );
typedef struct _QT_PARAM_INFO
{
QT_PARAM_FUNC pFunc;
struct _QT_PARAM_INFO * pNext;
BOOL fInited;
} QT_PARAM_INFO;
extern QMainWindow * hbqt_par_QMainWindow( int iParam );
extern void qt_childregister_QMainWindow( QT_PARAM_INFO * paramInfo );
QWidget * hbqt_par_QWidget( int iParam );
extern void qt_childregister_QWidget( QT_PARAM_INFO * paramInfo );
int hb_getMemUsed( void );
void just_debug( const char * sTraceMsg, ... );
#endif
#define QT_G_FUNC( hbfunc ) void hbfunc( void * Cargo ) /* callback function for cleaning garbage memory pointer */
@@ -99,7 +80,6 @@ typedef struct
HB_GARBAGE_FUNC( Q_release );
void * hbqt_gcpointer( int iParam );
void * hbqt_ptrTOgcpointer( void * p, QT_G_FUNC_PTR func );
const HB_GC_FUNCS * gcFuncs( void );
#include "hbqt_garbage.h"

55
harbour/contrib/hbqt/hbqt_destruct.cpp
View File

@@ -69,7 +69,7 @@ HB_GARBAGE_FUNC( Q_release )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
if( p && p->ph )
{
p->func( p->ph );
p->func( p );
}
}
@@ -98,54 +98,39 @@ void * hbqt_gcpointer( int iParam )
}
}
void * hbqt_ptrTOgcpointer( void * ptr, QT_G_FUNC_PTR func )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = ptr;
p->func = func;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " hbqt_ptrTOgcpointer( %p, %p ) %i %i", ptr, func, ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
return p;
#include <windows.h>
#include <Psapi.h>
void just_debug( const char * sTraceMsg, ... )
{
if( sTraceMsg )
{
char buffer[ 1024 ];
va_list ap;
va_start( ap, sTraceMsg );
hb_vsnprintf( buffer, sizeof( buffer ), sTraceMsg, ap );
va_end( ap );
OutputDebugString( buffer );
}
}
#if defined(__debug__)
#include <Psapi.h>
int hb_getMemUsed( void )
{
HANDLE hProcess;
PROCESS_MEMORY_COUNTERS pmc;
int size = 0;
hProcess = OpenProcess( PROCESS_QUERY_INFORMATION |
PROCESS_VM_READ,
FALSE, GetCurrentProcessId() );
if (NULL == hProcess)
hProcess = OpenProcess( PROCESS_QUERY_INFORMATION | PROCESS_VM_READ,
FALSE, GetCurrentProcessId() );
if ( NULL == hProcess )
return 0;
if ( GetProcessMemoryInfo( hProcess, &pmc, sizeof(pmc)) )
{
#if 0
printf( "\tPageFaultCount: 0x%08X\n", pmc.PageFaultCount );
printf( "\tPeakWorkingSetSize: 0x%08X\n",
pmc.PeakWorkingSetSize );
printf( "\tWorkingSetSize: 0x%08X\n", pmc.WorkingSetSize );
printf( "\tQuotaPeakPagedPoolUsage: 0x%08X\n",
pmc.QuotaPeakPagedPoolUsage );
printf( "\tQuotaPagedPoolUsage: 0x%08X\n",
pmc.QuotaPagedPoolUsage );
printf( "\tQuotaPeakNonPagedPoolUsage: 0x%08X\n",
pmc.QuotaPeakNonPagedPoolUsage );
printf( "\tQuotaNonPagedPoolUsage: 0x%08X\n",
pmc.QuotaNonPagedPoolUsage );
printf( "\tPagefileUsage: 0x%08X\n", pmc.PagefileUsage );
printf( "\tPeakPagefileUsage: 0x%08X\n",
pmc.PeakPagefileUsage );
#endif
size = ( int ) pmc.WorkingSetSize / 1024 ;
}

267
harbour/contrib/hbqt/hbqt_garbage.h
View File

@@ -276,3 +276,270 @@ extern QT_G_FUNC( release_QWindowsXPStyle );
extern QT_G_FUNC( release_QWizard );
extern QT_G_FUNC( release_QWizardPage );
extern void * gcAllocate_QAbstractButton( void * pObj );
extern void * gcAllocate_QAbstractItemDelegate( void * pObj );
extern void * gcAllocate_QAbstractItemModel( void * pObj );
extern void * gcAllocate_QAbstractItemView( void * pObj );
extern void * gcAllocate_QAbstractListModel( void * pObj );
extern void * gcAllocate_QAbstractProxyModel( void * pObj );
extern void * gcAllocate_QAbstractPrintDialog( void * pObj );
extern void * gcAllocate_QAbstractScrollArea( void * pObj );
extern void * gcAllocate_QAbstractSlider( void * pObj );
extern void * gcAllocate_QAbstractSpinBox( void * pObj );
extern void * gcAllocate_QAbstractTableModel( void * pObj );
extern void * gcAllocate_QAbstractTextDocumentLayout( void * pObj );
extern void * gcAllocate_QAction( void * pObj );
extern void * gcAllocate_QActionGroup( void * pObj );
extern void * gcAllocate_QApplication( void * pObj );
extern void * gcAllocate_QBitArray( void * pObj );
extern void * gcAllocate_QBitmap( void * pObj );
extern void * gcAllocate_QBoxLayout( void * pObj );
extern void * gcAllocate_QBrush( void * pObj );
extern void * gcAllocate_QButtonGroup( void * pObj );
extern void * gcAllocate_QByteArray( void * pObj );
extern void * gcAllocate_QCalendarWidget( void * pObj );
extern void * gcAllocate_QCheckBox( void * pObj );
extern void * gcAllocate_QClipboard( void * pObj );
extern void * gcAllocate_QColor( void * pObj );
extern void * gcAllocate_QColorDialog( void * pObj );
extern void * gcAllocate_QComboBox( void * pObj );
extern void * gcAllocate_QCommandLinkButton( void * pObj );
extern void * gcAllocate_QCommonStyle( void * pObj );
extern void * gcAllocate_QCompleter( void * pObj );
extern void * gcAllocate_QConicalGradient( void * pObj );
extern void * gcAllocate_QContextMenuEvent( void * pObj );
extern void * gcAllocate_QCoreApplication( void * pObj );
extern void * gcAllocate_QCursor( void * pObj );
extern void * gcAllocate_QDataStream( void * pObj );
extern void * gcAllocate_QDate( void * pObj );
extern void * gcAllocate_QDateEdit( void * pObj );
extern void * gcAllocate_QDateTime( void * pObj );
extern void * gcAllocate_QDateTimeEdit( void * pObj );
extern void * gcAllocate_QDesktopWidget( void * pObj );
extern void * gcAllocate_QDial( void * pObj );
extern void * gcAllocate_QDialog( void * pObj );
extern void * gcAllocate_QDir( void * pObj );
extern void * gcAllocate_QDirModel( void * pObj );
extern void * gcAllocate_QDockWidget( void * pObj );
extern void * gcAllocate_QDoubleSpinBox( void * pObj );
extern void * gcAllocate_QDropEvent( void * pObj );
extern void * gcAllocate_QDragMoveEvent( void * pObj );
extern void * gcAllocate_QDragEnterEvent( void * pObj );
extern void * gcAllocate_QDragLeaveEvent( void * pObj );
extern void * gcAllocate_QErrorMessage( void * pObj );
extern void * gcAllocate_QEvent( void * pObj );
extern void * gcAllocate_QEventLoop( void * pObj );
extern void * gcAllocate_QFile( void * pObj );
extern void * gcAllocate_QFileDialog( void * pObj );
extern void * gcAllocate_QFileInfo( void * pObj );
extern void * gcAllocate_QFileIconProvider( void * pObj );
extern void * gcAllocate_QFileSystemModel( void * pObj );
extern void * gcAllocate_QFocusEvent( void * pObj );
extern void * gcAllocate_QFocusFrame( void * pObj );
extern void * gcAllocate_QFont( void * pObj );
extern void * gcAllocate_QFontComboBox( void * pObj );
extern void * gcAllocate_QFontDatabase( void * pObj );
extern void * gcAllocate_QFontDialog( void * pObj );
extern void * gcAllocate_QFontInfo( void * pObj );
extern void * gcAllocate_QFontMetrics( void * pObj );
extern void * gcAllocate_QFontMetricsF( void * pObj );
extern void * gcAllocate_QFormLayout( void * pObj );
extern void * gcAllocate_QFrame( void * pObj );
extern void * gcAllocate_QFtp( void * pObj );
extern void * gcAllocate_QGradient( void * pObj );
extern void * gcAllocate_QGridLayout( void * pObj );
extern void * gcAllocate_QGroupBox( void * pObj );
extern void * gcAllocate_QHBoxLayout( void * pObj );
extern void * gcAllocate_QHeaderView( void * pObj );
extern void * gcAllocate_QHelpEvent( void * pObj );
extern void * gcAllocate_QHttp( void * pObj );
extern void * gcAllocate_QHttpRequestHeader( void * pObj );
extern void * gcAllocate_QHttpResponseHeader( void * pObj );
extern void * gcAllocate_QIcon( void * pObj );
extern void * gcAllocate_QInputContext( void * pObj );
extern void * gcAllocate_QInputMethodEvent( void * pObj );
extern void * gcAllocate_QImage( void * pObj );
extern void * gcAllocate_QImageReader( void * pObj );
extern void * gcAllocate_QImageWriter( void * pObj );
extern void * gcAllocate_QInputDialog( void * pObj );
extern void * gcAllocate_QInputEvent( void * pObj );
extern void * gcAllocate_QIODevice( void * pObj );
extern void * gcAllocate_QItemSelection( void * pObj );
extern void * gcAllocate_QItemSelectionModel( void * pObj );
extern void * gcAllocate_QKeyEvent( void * pObj );
extern void * gcAllocate_QKeySequence( void * pObj );
extern void * gcAllocate_QLabel( void * pObj );
extern void * gcAllocate_QLatin1Char( void * pObj );
extern void * gcAllocate_QLatin1String( void * pObj );
extern void * gcAllocate_QLayout( void * pObj );
extern void * gcAllocate_QLayoutItem( void * pObj );
extern void * gcAllocate_QLCDNumber( void * pObj );
extern void * gcAllocate_QLine( void * pObj );
extern void * gcAllocate_QLineF( void * pObj );
extern void * gcAllocate_QLinearGradient( void * pObj );
extern void * gcAllocate_QLineEdit( void * pObj );
extern void * gcAllocate_QList( void * pObj );
extern void * gcAllocate_QListView( void * pObj );
extern void * gcAllocate_QListWidget( void * pObj );
extern void * gcAllocate_QListWidgetItem( void * pObj );
extern void * gcAllocate_QLocale( void * pObj );
extern void * gcAllocate_QMainWindow( void * pObj );
extern void * gcAllocate_QMatrix( void * pObj );
extern void * gcAllocate_QMenu( void * pObj );
extern void * gcAllocate_QMenuBar( void * pObj );
extern void * gcAllocate_QMessageBox( void * pObj );
extern void * gcAllocate_QMimeData( void * pObj );
extern void * gcAllocate_QModelIndex( void * pObj );
extern void * gcAllocate_QMouseEvent( void * pObj );
extern void * gcAllocate_QMoveEvent( void * pObj );
extern void * gcAllocate_QMovie( void * pObj );
extern void * gcAllocate_QNetworkRequest( void * pObj );
extern void * gcAllocate_QObject( void * pObj );
extern void * gcAllocate_QPaintDevice( void * pObj );
extern void * gcAllocate_QPainterPath( void * pObj );
extern void * gcAllocate_QPageSetupDialog( void * pObj );
extern void * gcAllocate_QPainter( void * pObj );
extern void * gcAllocate_QPaintEvent( void * pObj );
extern void * gcAllocate_QPalette( void * pObj );
extern void * gcAllocate_QPen( void * pObj );
extern void * gcAllocate_QPicture( void * pObj );
extern void * gcAllocate_QPixmap( void * pObj );
extern void * gcAllocate_QPoint( void * pObj );
extern void * gcAllocate_QPointF( void * pObj );
extern void * gcAllocate_QPolygon( void * pObj );
extern void * gcAllocate_QPolygonF( void * pObj );
extern void * gcAllocate_QPrintDialog( void * pObj );
extern void * gcAllocate_QPrintEngine( void * pObj );
extern void * gcAllocate_QPrinter( void * pObj );
extern void * gcAllocate_QPrintPreviewDialog( void * pObj );
extern void * gcAllocate_QProcess( void * pObj );
extern void * gcAllocate_QProgressBar( void * pObj );
extern void * gcAllocate_QProgressDialog( void * pObj );
extern void * gcAllocate_QPushButton( void * pObj );
extern void * gcAllocate_QRadialGradient( void * pObj );
extern void * gcAllocate_QRadioButton( void * pObj );
extern void * gcAllocate_QRect( void * pObj );
extern void * gcAllocate_QRectF( void * pObj );
extern void * gcAllocate_QRegion( void * pObj );
extern void * gcAllocate_QRegExp( void * pObj );
extern void * gcAllocate_QResizeEvent( void * pObj );
extern void * gcAllocate_QResource( void * pObj );
extern void * gcAllocate_QScrollArea( void * pObj );
extern void * gcAllocate_QScrollBar( void * pObj );
extern void * gcAllocate_QSessionManager( void * pObj );
extern void * gcAllocate_QSignalMapper( void * pObj );
extern void * gcAllocate_QSize( void * pObj );
extern void * gcAllocate_QSizeF( void * pObj );
extern void * gcAllocate_QSizeGrip( void * pObj );
extern void * gcAllocate_QSizePolicy( void * pObj );
extern void * gcAllocate_QSlider( void * pObj );
extern void * gcAllocate_QSound( void * pObj );
extern void * gcAllocate_QSpacerItem( void * pObj );
extern void * gcAllocate_QSpinBox( void * pObj );
extern void * gcAllocate_QSplashScreen( void * pObj );
extern void * gcAllocate_QSplitter( void * pObj );
extern void * gcAllocate_QStandardItem( void * pObj );
extern void * gcAllocate_QStandardItemModel( void * pObj );
extern void * gcAllocate_QStatusBar( void * pObj );
extern void * gcAllocate_QStringList( void * pObj );
extern void * gcAllocate_QStringListModel( void * pObj );
extern void * gcAllocate_QStyle( void * pObj );
extern void * gcAllocate_QStyledItemDelegate( void * pObj );
extern void * gcAllocate_QStyleFactory( void * pObj );
extern void * gcAllocate_QStyleHintReturn( void * pObj );
extern void * gcAllocate_QStyleHintReturnMask( void * pObj );
extern void * gcAllocate_QStyleHintReturnVariant( void * pObj );
extern void * gcAllocate_QStyleOption( void * pObj );
extern void * gcAllocate_QStyleOptionButton( void * pObj );
extern void * gcAllocate_QStyleOptionComboBox( void * pObj );
extern void * gcAllocate_QStyleOptionComplex( void * pObj );
extern void * gcAllocate_QStyleOptionDockWidget( void * pObj );
extern void * gcAllocate_QStyleOptionFocusRect( void * pObj );
extern void * gcAllocate_QStyleOptionFrame( void * pObj );
extern void * gcAllocate_QStyleOptionGroupBox( void * pObj );
extern void * gcAllocate_QStyleOptionHeader( void * pObj );
extern void * gcAllocate_QStyleOptionMenuItem( void * pObj );
extern void * gcAllocate_QStyleOptionProgressBar( void * pObj );
extern void * gcAllocate_QStyleOptionSizeGrip( void * pObj );
extern void * gcAllocate_QStyleOptionSlider( void * pObj );
extern void * gcAllocate_QStyleOptionSpinBox( void * pObj );
extern void * gcAllocate_QStyleOptionTab( void * pObj );
extern void * gcAllocate_QStyleOptionTabBarBase( void * pObj );
extern void * gcAllocate_QStyleOptionTabWidgetFrame( void * pObj );
extern void * gcAllocate_QStyleOptionTitleBar( void * pObj );
extern void * gcAllocate_QStyleOptionToolBar( void * pObj );
extern void * gcAllocate_QStyleOptionToolBox( void * pObj );
extern void * gcAllocate_QStyleOptionToolButton( void * pObj );
extern void * gcAllocate_QStyleOptionViewItem( void * pObj );
extern void * gcAllocate_QStylePainter( void * pObj );
extern void * gcAllocate_QSystemTrayIcon( void * pObj );
extern void * gcAllocate_QTabBar( void * pObj );
extern void * gcAllocate_QTableView( void * pObj );
extern void * gcAllocate_QTableWidget( void * pObj );
extern void * gcAllocate_QTableWidgetItem( void * pObj );
extern void * gcAllocate_QTabWidget( void * pObj );
extern void * gcAllocate_QTableWidgetSelectionRange( void * pObj );
extern void * gcAllocate_QTextBlock( void * pObj );
extern void * gcAllocate_QTextBlockFormat( void * pObj );
extern void * gcAllocate_QTextBlockGroup( void * pObj );
extern void * gcAllocate_QTextBrowser( void * pObj );
extern void * gcAllocate_QTextBoundaryFinder( void * pObj );
extern void * gcAllocate_QTextCharFormat( void * pObj );
extern void * gcAllocate_QTextCodec( void * pObj );
extern void * gcAllocate_QTextCursor( void * pObj );
extern void * gcAllocate_QTextDecoder( void * pObj );
extern void * gcAllocate_QTextDocument( void * pObj );
extern void * gcAllocate_QTextDocumentFragment( void * pObj );
extern void * gcAllocate_QTextDocumentWriter( void * pObj );
extern void * gcAllocate_QTextEdit( void * pObj );
extern void * gcAllocate_QTextEncoder( void * pObj );
extern void * gcAllocate_QTextFormat( void * pObj );
extern void * gcAllocate_QTextFragment( void * pObj );
extern void * gcAllocate_QTextFrame( void * pObj );
extern void * gcAllocate_QTextFrameFormat( void * pObj );
extern void * gcAllocate_QTextImageFormat( void * pObj );
extern void * gcAllocate_QTextInlineObject( void * pObj );
extern void * gcAllocate_QTextItem( void * pObj );
extern void * gcAllocate_QTextLayout( void * pObj );
extern void * gcAllocate_QTextLength( void * pObj );
extern void * gcAllocate_QTextLine( void * pObj );
extern void * gcAllocate_QTextListFormat( void * pObj );
extern void * gcAllocate_QTextObject( void * pObj );
extern void * gcAllocate_QTextOption( void * pObj );
extern void * gcAllocate_QTextStream( void * pObj );
extern void * gcAllocate_QTextTableFormat( void * pObj );
extern void * gcAllocate_QThread( void * pObj );
extern void * gcAllocate_QTime( void * pObj );
extern void * gcAllocate_QTimeEdit( void * pObj );
extern void * gcAllocate_QTimer( void * pObj );
extern void * gcAllocate_QToolBar( void * pObj );
extern void * gcAllocate_QToolBox( void * pObj );
extern void * gcAllocate_QToolButton( void * pObj );
extern void * gcAllocate_QTransform( void * pObj );
extern void * gcAllocate_QTranslator( void * pObj );
extern void * gcAllocate_QTreeView( void * pObj );
extern void * gcAllocate_QTreeWidget( void * pObj );
extern void * gcAllocate_QTreeWidgetItem( void * pObj );
extern void * gcAllocate_QUrl( void * pObj );
extern void * gcAllocate_QValidator( void * pObj );
extern void * gcAllocate_QVariant( void * pObj );
extern void * gcAllocate_QVBoxLayout( void * pObj );
extern void * gcAllocate_QWebFrame( void * pObj );
extern void * gcAllocate_QWebHistory( void * pObj );
extern void * gcAllocate_QWebHistoryInterface( void * pObj );
extern void * gcAllocate_QWebHistoryItem( void * pObj );
extern void * gcAllocate_QWebHitTestResult( void * pObj );
extern void * gcAllocate_QWebPage( void * pObj );
extern void * gcAllocate_QWebPluginFactory( void * pObj );
extern void * gcAllocate_QWebSecurityOrigin( void * pObj );
extern void * gcAllocate_QWebSettings( void * pObj );
extern void * gcAllocate_QWebView( void * pObj );
extern void * gcAllocate_QWheelEvent( void * pObj );
extern void * gcAllocate_QWidget( void * pObj );
extern void * gcAllocate_QWidgetAction( void * pObj );
extern void * gcAllocate_QWidgetItem( void * pObj );
extern void * gcAllocate_QWindowsStyle( void * pObj );
extern void * gcAllocate_QWindowsXPStyle( void * pObj );
extern void * gcAllocate_QWizard( void * pObj );
extern void * gcAllocate_QWizardPage( void * pObj );

102
harbour/contrib/hbqt/hbqt_slots.cpp
View File

@@ -1957,11 +1957,9 @@ HB_FUNC( QT_DISCONNECT_SIGNAL )
s_s->listBlock[ i - 1 ] = NULL;
s_s->listActv[ i - 1 ] = false;
ret = disconnect_signal( object, signal );
//object->disconnect( signal );
//object->setProperty( signal, QVariant() );
bFreed = true;
#if defined(__debug__)
hb_snprintf( str, sizeof( str ), " QT_DISCONNECT_SIGNAL: %s %s", signal, ret ? "YES" : "NO" ); OutputDebugString( str );
just_debug( " QT_DISCONNECT_SIGNAL: %s %s", ret ? "YES" : "NO", signal );
#endif
}
}
@@ -2019,7 +2017,6 @@ void release_codeblocks( void )
Events::Events( QObject * parent ) : QObject( parent )
{
}
Events::~Events()
{
listBlock.clear();
@@ -2029,12 +2026,14 @@ Events::~Events()
bool Events::eventFilter( QObject * object, QEvent * event )
{
QEvent::Type eventtype = event->type();
//hb_snprintf( str, sizeof( str ), "0 Events::eventFilter = %i", ( int ) eventtype ); OutputDebugString( str );
#if defined(__debug__)
//just_debug( "0 Events::eventFilter = %i", ( int ) eventtype );
#endif
if( ( int ) eventtype == 0 )
{
//hb_snprintf( str, sizeof( str ), "x Events::eventFilter = 0" ); OutputDebugString( str );
#if defined(__debug__)
//just_debug( "x Events::eventFilter = 0" );
#endif
return false;
}
@@ -2043,7 +2042,9 @@ bool Events::eventFilter( QObject * object, QEvent * event )
int found = object->property( prop ).toInt();
if( found == 0 )
{
//hb_snprintf( str, sizeof( str ), "f Events::eventFilter = %s %i", " found=0", ( int ) eventtype ); OutputDebugString( str );
#if defined(__debug__)
//just_debug( "f Events::eventFilter = %s %i", " found=0", ( int ) eventtype );
#endif
return false;
}
@@ -2053,9 +2054,13 @@ bool Events::eventFilter( QObject * object, QEvent * event )
{
PHB_ITEM pObject = hb_itemPutPtr( NULL, object );
PHB_ITEM pEvent = hb_itemPutPtr( NULL, event );
//hb_snprintf( str, sizeof( str ), "0 Events::eventFilter = %i", ( int ) eventtype ); OutputDebugString( str );
#if defined(__debug__)
//just_debug( "0 Events::eventFilter = %i", ( int ) eventtype );
#endif
ret = hb_itemGetL( hb_vmEvalBlockV( ( PHB_ITEM ) listBlock.at( found - 1 ), 2, pObject, pEvent ) );
//hb_snprintf( str, sizeof( str ), "1 Events::eventFilter = %s", ret ? " yes" : " no" ); OutputDebugString( str );
#if defined(__debug__)
//just_debug( "1 Events::eventFilter = %s", ret ? " yes" : " no" );
#endif
hb_itemRelease( pObject );
hb_itemRelease( pEvent );
@@ -2070,7 +2075,9 @@ bool Events::eventFilter( QObject * object, QEvent * event )
event->ignore();
}
}
//hb_snprintf( str, sizeof( str ), "1 Events::eventFilter = %i", ( int ) eventtype ); OutputDebugString( str );
#if defined(__debug__)
//just_debug( "1 Events::eventFilter = %i", ( int ) eventtype );
#endif
return ret;
}
@@ -2131,7 +2138,7 @@ HB_FUNC( QT_DISCONNECT_EVENT )
object->setProperty( prop, QVariant() );
bRet = true;
#if defined(__debug__)
hb_snprintf( str, sizeof( str ), " QT_DISCONNECT_EVENT: %i", type ); OutputDebugString( str );
just_debug( " QT_DISCONNECT_EVENT: %i", type );
#endif
}
hb_retl( bRet );
@@ -2139,24 +2146,17 @@ hb_snprintf( str, sizeof( str ), " QT_DISCONNECT_EVENT: %i", type ); Output
/*----------------------------------------------------------------------*/
HB_FUNC( QT_QDEBUG )
{
qDebug( "%s", hb_parcx( 1 ) );
}
/*----------------------------------------------------------------------*/
HbTableView::HbTableView( QWidget * parent ) : QTableView( parent )
{
}
HbTableView::~HbTableView()
{
#if defined(__debug__)
hb_snprintf( str, sizeof( str ), "HbTableView::~HbTableView() 0 %i %i", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
just_debug( "HbTableView::~HbTableView() 0 %i %i", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
destroy();
#if defined(__debug__)
hb_snprintf( str, sizeof( str ), "HbTableView::~HbTableView() 1 %i %i", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
just_debug( "HbTableView::~HbTableView() 1 %i %i", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
void HbTableView::keyPressEvent( QKeyEvent * event )
@@ -2189,7 +2189,7 @@ void HbTableView::resizeEvent( QResizeEvent * event )
}
QModelIndex HbTableView::moveCursor( HbTableView::CursorAction cursorAction, Qt::KeyboardModifiers modifiers )
{
//hb_snprintf( str, sizeof( str ), "HbTableView: action=%i %i", cursorAction, QAbstractItemView::MoveDown ); OutputDebugString( str );
//just_debug( "HbTableView: action=%i %i", cursorAction, QAbstractItemView::MoveDown );
//emit sg_moveCursor( cursorAction, modifiers );
return QTableView::moveCursor( cursorAction, modifiers );
@@ -2204,21 +2204,12 @@ void HbTableView::scrollContentsBy( int x, int y )
}
void HbTableView::scrollTo( const QModelIndex & index, QAbstractItemView::ScrollHint hint )
{
//hb_snprintf( str, sizeof( str ), "HbTableView:scrollTo row = %i col = %i", index.row(),index.column() ); OutputDebugString( str );
//just_debug( "HbTableView:scrollTo row = %i col = %i", index.row(),index.column() );
QTableView::scrollTo( index, hint );
}
/*----------------------------------------------------------------------*/
#if 0
Qt_DisplayRole 0 Qt_FontRole 6
Qt_DecorationRole 1 Qt_TextAlignmentRole 7
Qt_EditRole 2 Qt_BackgroundRole 8
Qt_ToolTipRole 3 Qt_ForegroundRole 9
Qt_StatusTipRole 4 Qt_CheckStateRole 10
Qt_WhatsThisRole 5 Qt_SizeHintRole 13
#endif
#define HBQT_BRW_CELLVALUE 1001
#define HBQT_BRW_COLCOUNT 1002
@@ -2253,13 +2244,39 @@ QVariant fetchRole( PHB_ITEM block, int what, int par1, int par2 )
hb_itemRelease( p2 );
if( hb_itemType( ret ) & HB_IT_STRING )
{
#if 0
char * a = hb_itemGetC( ret );
vv = a;
hb_xfree( a );
#else
vv = hb_itemGetCPtr( ret );
#endif
#if defined(__debug__)
//just_debug( " fetchRole[ s = %s ]", hb_itemGetCPtr( ret ) );
#endif
}
else if( hb_itemType( ret ) & HB_IT_LOGICAL )
{
vv = hb_itemGetL( ret );
#if defined(__debug__)
just_debug( " fetchRole[ l = %i ]", hb_itemGetL( ret ) );
#endif
}
else if( hb_itemType( ret ) & HB_IT_DOUBLE )
{
vv = hb_itemGetND( ret );
#if defined(__debug__)
just_debug( " fetchRole[ d = %i ]", hb_itemGetND( ret ) );
#endif
}
else if( hb_itemType( ret ) & HB_IT_NUMERIC )
{
vv = hb_itemGetNI( ret );
#if defined(__debug__)
//just_debug( " fetchRole[ n = %i ]", hb_itemGetNI( ret ) );
#endif
}
}
return vv;
}
@@ -2285,7 +2302,9 @@ Qt::ItemFlags HbDbfModel::flags( const QModelIndex & index ) const
QVariant HbDbfModel::data( const QModelIndex & index, int role ) const
{
//hb_snprintf( str, sizeof( str ), "data - row=%i col=%i role=%i", index.row(), index.column(), role ); OutputDebugString( str );
#if defined(__debug__)
//just_debug( "data - row=%i col=%i role=%i", index.row(), index.column(), role );
#endif
if( !index.isValid() )
return( QVariant() );
@@ -2334,8 +2353,9 @@ QVariant HbDbfModel::data( const QModelIndex & index, int role ) const
QVariant HbDbfModel::headerData( int section, Qt::Orientation orientation, int role ) const
{
//hb_snprintf( str, sizeof( str ), "headerData - section=%i orient=%i role=%i name=%s", section, orientation, role, objectName() ); OutputDebugString( str );
#if defined(__debug__)
//just_debug( "headerData - section=%i orient=%i role=%i name=%s", section, orientation, role, objectName() );
#endif
if( orientation == Qt::Horizontal )
{
switch( role )
@@ -2430,9 +2450,7 @@ int HbDbfModel::columnCount( const QModelIndex & /*parent = QModelIndex()*/ ) co
QModelIndex HbDbfModel::index( int row, int column, const QModelIndex & parent ) const
{
//hb_snprintf( str, sizeof( str ), "index: row=%i col=%i", row, column ); OutputDebugString( str );
HB_SYMBOL_UNUSED( parent );
return( createIndex( row, column, row * column ) );
}
@@ -2480,12 +2498,12 @@ MyMainWindow::MyMainWindow( PHB_ITEM pBlock, int iThreadID )
MyMainWindow::~MyMainWindow( void )
{
#if defined(__debug__)
hb_snprintf( str, sizeof( str ), " MyMainWindow::~MyMainWindow 0" ); OutputDebugString( str );
just_debug( " MyMainWindow::~MyMainWindow 0" );
#endif
hb_itemRelease( block );
destroy();
#if defined(__debug__)
hb_snprintf( str, sizeof( str ), " MyMainWindow::~MyMainWindow 1" ); OutputDebugString( str );
just_debug( " MyMainWindow::~MyMainWindow 1" );
#endif
}
void MyMainWindow::paintEvent( QPaintEvent * event )
@@ -2522,7 +2540,7 @@ void MyMainWindow::paintEvent( QPaintEvent * event )
}
bool MyMainWindow::event( QEvent * event )
{
//hb_snprintf( str, sizeof( str ), " event(%i) %i", threadID, (int) event->type() ); OutputDebugString( str );
//just_debug( " event(%i) %i", threadID, (int) event->type() );
hb_threadMutexLock( s_mutex );
#if 0
if( hb_vmRequestReenter() )
@@ -2677,7 +2695,7 @@ void MyMainWindow::resizeEvent( QResizeEvent * event )
void MyMainWindow::closeEvent( QCloseEvent * event )
{
#if defined(__debug__)
hb_snprintf( str, sizeof( str ), " close event(%i)", threadID ); OutputDebugString( str );
just_debug( " close event(%i)", threadID );
#endif
hb_threadMutexLock( s_mutex );
if( hb_vmRequestReenter() )

47
harbour/contrib/hbqt/qtcore/QAbstractItemModel.cpp
View File

@@ -107,7 +107,8 @@ HB_FUNC( QT_HBDBFMODEL_RESET )
HB_FUNC( QT_HBDBFMODEL_INDEX )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_HbDbfModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), QModelIndex() ) ), release_QModelIndex ) );
// BI hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_HbDbfModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), QModelIndex() ) ), release_QModelIndex ) );
hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_HbDbfModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), QModelIndex() ) ) ) );
}
HB_FUNC( QT_HBDBFMODEL_HBSETROWCOLUMNS )
@@ -117,37 +118,15 @@ HB_FUNC( QT_HBDBFMODEL_HBSETROWCOLUMNS )
HB_FUNC( QT_HBDBFMODEL_DESTROY )
{
// BI:TODO fix the GPF hbqt_par_HbDbfModel( 1 )->~HbDbfModel();
// BUT WITHOUT THIS FM STATISTICS GENERATE A BIG LOG SO THIS IS NOT THE OPTION NOW
hbqt_par_HbDbfModel( 1 )->~HbDbfModel();
}
QT_G_FUNC( release_QAbstractItemModel )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QAbstractItemModel %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QAbstractItemModel * ) ph )->~QAbstractItemModel();
ph = NULL;
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QAbstractItemModel" ); OutputDebugString( str );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QAbstractItemModel" ); OutputDebugString( str );
#endif
}
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QABSTRACTITEMMODEL )
@@ -158,7 +137,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL )
*/
HB_FUNC( QT_QABSTRACTITEMMODEL_BUDDY )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->buddy( *hbqt_par_QModelIndex( 2 ) ) ), release_QModelIndex ) );
hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->buddy( *hbqt_par_QModelIndex( 2 ) ) ) ) );
}
/*
@@ -182,7 +161,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_COLUMNCOUNT )
*/
HB_FUNC( QT_QABSTRACTITEMMODEL_DATA )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QAbstractItemModel( 1 )->data( *hbqt_par_QModelIndex( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::DisplayRole ) ) ), release_QVariant ) );
hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QAbstractItemModel( 1 )->data( *hbqt_par_QModelIndex( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::DisplayRole ) ) ) ) );
}
/*
@@ -230,7 +209,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_HASINDEX )
*/
HB_FUNC( QT_QABSTRACTITEMMODEL_HEADERDATA )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QAbstractItemModel( 1 )->headerData( hb_parni( 2 ), ( Qt::Orientation ) hb_parni( 3 ), ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : Qt::DisplayRole ) ) ), release_QVariant ) );
hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QAbstractItemModel( 1 )->headerData( hb_parni( 2 ), ( Qt::Orientation ) hb_parni( 3 ), ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : Qt::DisplayRole ) ) ) ) );
}
/*
@@ -238,7 +217,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_HEADERDATA )
*/
HB_FUNC( QT_QABSTRACTITEMMODEL_INDEX )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ), release_QModelIndex ) );
hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ) ) );
}
/*
@@ -278,7 +257,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_INSERTROWS )
*/
HB_FUNC( QT_QABSTRACTITEMMODEL_MIMETYPES )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QAbstractItemModel( 1 )->mimeTypes() ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QAbstractItemModel( 1 )->mimeTypes() ) ) );
}
/*
@@ -286,7 +265,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_MIMETYPES )
*/
HB_FUNC( QT_QABSTRACTITEMMODEL_PARENT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->parent( *hbqt_par_QModelIndex( 2 ) ) ), release_QModelIndex ) );
hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->parent( *hbqt_par_QModelIndex( 2 ) ) ) ) );
}
/*
@@ -358,7 +337,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_SETSUPPORTEDDRAGACTIONS )
*/
HB_FUNC( QT_QABSTRACTITEMMODEL_SIBLING )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->sibling( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QModelIndex( 4 ) ) ), release_QModelIndex ) );
hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->sibling( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QModelIndex( 4 ) ) ) ) );
}
/*
@@ -374,7 +353,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_SORT )
*/
HB_FUNC( QT_QABSTRACTITEMMODEL_SPAN )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QAbstractItemModel( 1 )->span( *hbqt_par_QModelIndex( 2 ) ) ), release_QSize ) );
hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QAbstractItemModel( 1 )->span( *hbqt_par_QModelIndex( 2 ) ) ) ) );
}
/*

28
harbour/contrib/hbqt/qtcore/QAbstractListModel.cpp
View File

@@ -78,31 +78,7 @@
QT_G_FUNC( release_QAbstractListModel )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QAbstractListModel %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QAbstractListModel * ) ph )->~QAbstractListModel();
ph = NULL;
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QAbstractListModel" ); OutputDebugString( str );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QAbstractListModel" ); OutputDebugString( str );
#endif
}
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QABSTRACTLISTMODEL )
@@ -113,7 +89,7 @@ HB_FUNC( QT_QABSTRACTLISTMODEL )
*/
HB_FUNC( QT_QABSTRACTLISTMODEL_INDEX )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QAbstractListModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ), release_QModelIndex ) );
hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractListModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ) ) );
}

28
harbour/contrib/hbqt/qtcore/QAbstractTableModel.cpp
View File

@@ -78,31 +78,7 @@
QT_G_FUNC( release_QAbstractTableModel )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QAbstractTableModel %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QAbstractTableModel * ) ph )->~QAbstractTableModel();
ph = NULL;
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QAbstractTableModel" ); OutputDebugString( str );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QAbstractTableModel" ); OutputDebugString( str );
#endif
}
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QABSTRACTTABLEMODEL )
@@ -113,7 +89,7 @@ HB_FUNC( QT_QABSTRACTTABLEMODEL )
*/
HB_FUNC( QT_QABSTRACTTABLEMODEL_INDEX )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QAbstractTableModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ), release_QModelIndex ) );
hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractTableModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ) ) );
}

50
harbour/contrib/hbqt/qtcore/QBitArray.cpp
View File

@@ -78,40 +78,48 @@
QT_G_FUNC( release_QBitArray )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QBitArray %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QBitArray p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QBitArray ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QBitArray * ) ph )->~QBitArray();
ph = NULL;
( ( QBitArray * ) p->ph )->~QBitArray();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QBitArray Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QBitArray %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QBitArray" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QBitArray Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QBitArray" );
#endif
}
}
void * gcAllocate_QBitArray( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QBitArray;
#if defined(__debug__)
just_debug( " new_QBitArray %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QBITARRAY )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QBitArray %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
pObj = new QBitArray() ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QBitArray;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QBitArray( pObj ) );
}
/*
* bool at ( int i ) const

146
harbour/contrib/hbqt/qtcore/QByteArray.cpp
View File

@@ -96,47 +96,55 @@
QT_G_FUNC( release_QByteArray )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QByteArray %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QByteArray p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QByteArray ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QByteArray * ) ph )->~QByteArray();
ph = NULL;
( ( QByteArray * ) p->ph )->~QByteArray();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QByteArray Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QByteArray %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QByteArray" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QByteArray Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QByteArray" );
#endif
}
}
void * gcAllocate_QByteArray( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QByteArray;
#if defined(__debug__)
just_debug( " new_QByteArray %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QBYTEARRAY )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QByteArray %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
pObj = new QByteArray() ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QByteArray;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QByteArray( pObj ) );
}
/*
* QByteArray & append ( const QByteArray & ba )
*/
HB_FUNC( QT_QBYTEARRAY_APPEND )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->append( *hbqt_par_QByteArray( 2 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->append( *hbqt_par_QByteArray( 2 ) ) ) ) );
}
/*
@@ -144,7 +152,7 @@ HB_FUNC( QT_QBYTEARRAY_APPEND )
*/
HB_FUNC( QT_QBYTEARRAY_APPEND_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->append( hbqt_par_QString( 2 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->append( hbqt_par_QString( 2 ) ) ) ) );
}
/*
@@ -152,7 +160,7 @@ HB_FUNC( QT_QBYTEARRAY_APPEND_1 )
*/
HB_FUNC( QT_QBYTEARRAY_APPEND_2 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->append( hbqt_par_char( 2 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->append( hbqt_par_char( 2 ) ) ) ) );
}
/*
@@ -160,7 +168,7 @@ HB_FUNC( QT_QBYTEARRAY_APPEND_2 )
*/
HB_FUNC( QT_QBYTEARRAY_APPEND_3 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->append( hbqt_par_char( 2 ), hb_parni( 3 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->append( hbqt_par_char( 2 ), hb_parni( 3 ) ) ) ) );
}
/*
@@ -168,7 +176,7 @@ HB_FUNC( QT_QBYTEARRAY_APPEND_3 )
*/
HB_FUNC( QT_QBYTEARRAY_APPEND_4 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->append( ( char ) hb_parni( 2 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->append( ( char ) hb_parni( 2 ) ) ) ) );
}
/*
@@ -288,7 +296,7 @@ HB_FUNC( QT_QBYTEARRAY_ENDSWITH_2 )
*/
HB_FUNC( QT_QBYTEARRAY_FILL )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->fill( ( char ) hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->fill( ( char ) hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ) ) ) );
}
/*
@@ -328,7 +336,7 @@ HB_FUNC( QT_QBYTEARRAY_INDEXOF_3 )
*/
HB_FUNC( QT_QBYTEARRAY_INSERT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->insert( hb_parni( 2 ), *hbqt_par_QByteArray( 3 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->insert( hb_parni( 2 ), *hbqt_par_QByteArray( 3 ) ) ) ) );
}
/*
@@ -336,7 +344,7 @@ HB_FUNC( QT_QBYTEARRAY_INSERT )
*/
HB_FUNC( QT_QBYTEARRAY_INSERT_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->insert( hb_parni( 2 ), hbqt_par_QString( 3 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->insert( hb_parni( 2 ), hbqt_par_QString( 3 ) ) ) ) );
}
/*
@@ -344,7 +352,7 @@ HB_FUNC( QT_QBYTEARRAY_INSERT_1 )
*/
HB_FUNC( QT_QBYTEARRAY_INSERT_2 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->insert( hb_parni( 2 ), hbqt_par_char( 3 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->insert( hb_parni( 2 ), hbqt_par_char( 3 ) ) ) ) );
}
/*
@@ -352,7 +360,7 @@ HB_FUNC( QT_QBYTEARRAY_INSERT_2 )
*/
HB_FUNC( QT_QBYTEARRAY_INSERT_3 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->insert( hb_parni( 2 ), ( char ) hb_parni( 3 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->insert( hb_parni( 2 ), ( char ) hb_parni( 3 ) ) ) ) );
}
/*
@@ -408,7 +416,7 @@ HB_FUNC( QT_QBYTEARRAY_LASTINDEXOF_3 )
*/
HB_FUNC( QT_QBYTEARRAY_LEFT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->left( hb_parni( 2 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->left( hb_parni( 2 ) ) ) ) );
}
/*
@@ -416,7 +424,7 @@ HB_FUNC( QT_QBYTEARRAY_LEFT )
*/
HB_FUNC( QT_QBYTEARRAY_LEFTJUSTIFIED )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->leftJustified( hb_parni( 2 ), ( char ) hb_parni( 3 ), hb_parl( 4 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->leftJustified( hb_parni( 2 ), ( char ) hb_parni( 3 ), hb_parl( 4 ) ) ) ) );
}
/*
@@ -432,7 +440,7 @@ HB_FUNC( QT_QBYTEARRAY_LENGTH )
*/
HB_FUNC( QT_QBYTEARRAY_MID )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->mid( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->mid( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ) ) ) );
}
/*
@@ -440,7 +448,7 @@ HB_FUNC( QT_QBYTEARRAY_MID )
*/
HB_FUNC( QT_QBYTEARRAY_PREPEND )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->prepend( *hbqt_par_QByteArray( 2 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->prepend( *hbqt_par_QByteArray( 2 ) ) ) ) );
}
/*
@@ -448,7 +456,7 @@ HB_FUNC( QT_QBYTEARRAY_PREPEND )
*/
HB_FUNC( QT_QBYTEARRAY_PREPEND_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->prepend( hbqt_par_char( 2 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->prepend( hbqt_par_char( 2 ) ) ) ) );
}
/*
@@ -456,7 +464,7 @@ HB_FUNC( QT_QBYTEARRAY_PREPEND_1 )
*/
HB_FUNC( QT_QBYTEARRAY_PREPEND_2 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->prepend( ( char ) hb_parni( 2 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->prepend( ( char ) hb_parni( 2 ) ) ) ) );
}
/*
@@ -512,7 +520,7 @@ HB_FUNC( QT_QBYTEARRAY_PUSH_FRONT_2 )
*/
HB_FUNC( QT_QBYTEARRAY_REMOVE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->remove( hb_parni( 2 ), hb_parni( 3 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->remove( hb_parni( 2 ), hb_parni( 3 ) ) ) ) );
}
/*
@@ -520,7 +528,7 @@ HB_FUNC( QT_QBYTEARRAY_REMOVE )
*/
HB_FUNC( QT_QBYTEARRAY_REPEATED )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->repeated( hb_parni( 2 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->repeated( hb_parni( 2 ) ) ) ) );
}
/*
@@ -528,7 +536,7 @@ HB_FUNC( QT_QBYTEARRAY_REPEATED )
*/
HB_FUNC( QT_QBYTEARRAY_REPLACE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QByteArray( 4 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QByteArray( 4 ) ) ) ) );
}
/*
@@ -536,7 +544,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE )
*/
HB_FUNC( QT_QBYTEARRAY_REPLACE_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hb_parni( 2 ), hb_parni( 3 ), hbqt_par_char( 4 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hb_parni( 2 ), hb_parni( 3 ), hbqt_par_char( 4 ) ) ) ) );
}
/*
@@ -544,7 +552,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_1 )
*/
HB_FUNC( QT_QBYTEARRAY_REPLACE_2 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->replace( *hbqt_par_QByteArray( 2 ), *hbqt_par_QByteArray( 3 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( *hbqt_par_QByteArray( 2 ), *hbqt_par_QByteArray( 3 ) ) ) ) );
}
/*
@@ -552,7 +560,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_2 )
*/
HB_FUNC( QT_QBYTEARRAY_REPLACE_3 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_char( 2 ), *hbqt_par_QByteArray( 3 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_char( 2 ), *hbqt_par_QByteArray( 3 ) ) ) ) );
}
/*
@@ -560,7 +568,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_3 )
*/
HB_FUNC( QT_QBYTEARRAY_REPLACE_4 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_char( 2 ), hb_parni( 3 ), hbqt_par_char( 4 ), hb_parni( 5 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_char( 2 ), hb_parni( 3 ), hbqt_par_char( 4 ), hb_parni( 5 ) ) ) ) );
}
/*
@@ -568,7 +576,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_4 )
*/
HB_FUNC( QT_QBYTEARRAY_REPLACE_5 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->replace( *hbqt_par_QByteArray( 2 ), hbqt_par_char( 3 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( *hbqt_par_QByteArray( 2 ), hbqt_par_char( 3 ) ) ) ) );
}
/*
@@ -576,7 +584,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_5 )
*/
HB_FUNC( QT_QBYTEARRAY_REPLACE_6 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_QString( 2 ), *hbqt_par_QByteArray( 3 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_QString( 2 ), *hbqt_par_QByteArray( 3 ) ) ) ) );
}
/*
@@ -584,7 +592,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_6 )
*/
HB_FUNC( QT_QBYTEARRAY_REPLACE_7 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_QString( 2 ), hbqt_par_char( 3 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_QString( 2 ), hbqt_par_char( 3 ) ) ) ) );
}
/*
@@ -592,7 +600,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_7 )
*/
HB_FUNC( QT_QBYTEARRAY_REPLACE_8 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_char( 2 ), hbqt_par_char( 3 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_char( 2 ), hbqt_par_char( 3 ) ) ) ) );
}
/*
@@ -600,7 +608,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_8 )
*/
HB_FUNC( QT_QBYTEARRAY_REPLACE_9 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->replace( ( char ) hb_parni( 2 ), *hbqt_par_QByteArray( 3 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( ( char ) hb_parni( 2 ), *hbqt_par_QByteArray( 3 ) ) ) ) );
}
/*
@@ -608,7 +616,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_9 )
*/
HB_FUNC( QT_QBYTEARRAY_REPLACE_10 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->replace( ( char ) hb_parni( 2 ), hbqt_par_QString( 3 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( ( char ) hb_parni( 2 ), hbqt_par_QString( 3 ) ) ) ) );
}
/*
@@ -616,7 +624,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_10 )
*/
HB_FUNC( QT_QBYTEARRAY_REPLACE_11 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->replace( ( char ) hb_parni( 2 ), hbqt_par_char( 3 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( ( char ) hb_parni( 2 ), hbqt_par_char( 3 ) ) ) ) );
}
/*
@@ -624,7 +632,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_11 )
*/
HB_FUNC( QT_QBYTEARRAY_REPLACE_12 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->replace( ( char ) hb_parni( 2 ), ( char ) hb_parni( 3 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( ( char ) hb_parni( 2 ), ( char ) hb_parni( 3 ) ) ) ) );
}
/*
@@ -648,7 +656,7 @@ HB_FUNC( QT_QBYTEARRAY_RESIZE )
*/
HB_FUNC( QT_QBYTEARRAY_RIGHT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->right( hb_parni( 2 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->right( hb_parni( 2 ) ) ) ) );
}
/*
@@ -656,7 +664,7 @@ HB_FUNC( QT_QBYTEARRAY_RIGHT )
*/
HB_FUNC( QT_QBYTEARRAY_RIGHTJUSTIFIED )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->rightJustified( hb_parni( 2 ), ( char ) hb_parni( 3 ), hb_parl( 4 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->rightJustified( hb_parni( 2 ), ( char ) hb_parni( 3 ), hb_parl( 4 ) ) ) ) );
}
/*
@@ -664,7 +672,7 @@ HB_FUNC( QT_QBYTEARRAY_RIGHTJUSTIFIED )
*/
HB_FUNC( QT_QBYTEARRAY_SETNUM )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ) ) );
}
/*
@@ -672,7 +680,7 @@ HB_FUNC( QT_QBYTEARRAY_SETNUM )
*/
HB_FUNC( QT_QBYTEARRAY_SETNUM_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ) ) );
}
/*
@@ -680,7 +688,7 @@ HB_FUNC( QT_QBYTEARRAY_SETNUM_1 )
*/
HB_FUNC( QT_QBYTEARRAY_SETNUM_2 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ) ) );
}
/*
@@ -688,7 +696,7 @@ HB_FUNC( QT_QBYTEARRAY_SETNUM_2 )
*/
HB_FUNC( QT_QBYTEARRAY_SETNUM_3 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ) ) );
}
/*
@@ -696,7 +704,7 @@ HB_FUNC( QT_QBYTEARRAY_SETNUM_3 )
*/
HB_FUNC( QT_QBYTEARRAY_SETNUM_4 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( ( qlonglong ) hb_parnint( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( ( qlonglong ) hb_parnint( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ) ) );
}
/*
@@ -704,7 +712,7 @@ HB_FUNC( QT_QBYTEARRAY_SETNUM_4 )
*/
HB_FUNC( QT_QBYTEARRAY_SETNUM_5 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( ( qulonglong ) hb_parnint( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( ( qulonglong ) hb_parnint( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ) ) );
}
/*
@@ -712,7 +720,7 @@ HB_FUNC( QT_QBYTEARRAY_SETNUM_5 )
*/
HB_FUNC( QT_QBYTEARRAY_SETNUM_6 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parnd( 2 ), ( char ) hb_parni( 3 ), ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : 6 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parnd( 2 ), ( char ) hb_parni( 3 ), ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : 6 ) ) ) ) );
}
/*
@@ -720,7 +728,7 @@ HB_FUNC( QT_QBYTEARRAY_SETNUM_6 )
*/
HB_FUNC( QT_QBYTEARRAY_SETNUM_7 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parnd( 2 ), ( char ) hb_parni( 3 ), ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : 6 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parnd( 2 ), ( char ) hb_parni( 3 ), ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : 6 ) ) ) ) );
}
/*
@@ -728,7 +736,7 @@ HB_FUNC( QT_QBYTEARRAY_SETNUM_7 )
*/
HB_FUNC( QT_QBYTEARRAY_SIMPLIFIED )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->simplified() ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->simplified() ) ) );
}
/*
@@ -776,7 +784,7 @@ HB_FUNC( QT_QBYTEARRAY_STARTSWITH_2 )
*/
HB_FUNC( QT_QBYTEARRAY_TOBASE64 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->toBase64() ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->toBase64() ) ) );
}
/*
@@ -808,7 +816,7 @@ HB_FUNC( QT_QBYTEARRAY_TOFLOAT )
*/
HB_FUNC( QT_QBYTEARRAY_TOHEX )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->toHex() ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->toHex() ) ) );
}
/*
@@ -852,7 +860,7 @@ HB_FUNC( QT_QBYTEARRAY_TOLONGLONG )
*/
HB_FUNC( QT_QBYTEARRAY_TOLOWER )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->toLower() ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->toLower() ) ) );
}
/*
@@ -860,7 +868,7 @@ HB_FUNC( QT_QBYTEARRAY_TOLOWER )
*/
HB_FUNC( QT_QBYTEARRAY_TOPERCENTENCODING )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->toPercentEncoding( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QByteArray( 2 ) : QByteArray() ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QByteArray( 3 ) : QByteArray() ), ( char ) hb_parni( 4 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->toPercentEncoding( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QByteArray( 2 ) : QByteArray() ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QByteArray( 3 ) : QByteArray() ), ( char ) hb_parni( 4 ) ) ) ) );
}
/*
@@ -928,7 +936,7 @@ HB_FUNC( QT_QBYTEARRAY_TOUSHORT )
*/
HB_FUNC( QT_QBYTEARRAY_TOUPPER )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->toUpper() ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->toUpper() ) ) );
}
/*
@@ -936,7 +944,7 @@ HB_FUNC( QT_QBYTEARRAY_TOUPPER )
*/
HB_FUNC( QT_QBYTEARRAY_TRIMMED )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QByteArray( 1 )->trimmed() ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->trimmed() ) ) );
}
/*

30
harbour/contrib/hbqt/qtcore/QCoreApplication.cpp
View File

@@ -97,31 +97,7 @@
QT_G_FUNC( release_QCoreApplication )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QCoreApplication %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QCoreApplication * ) ph )->~QCoreApplication();
ph = NULL;
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QCoreApplication" ); OutputDebugString( str );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QCoreApplication" ); OutputDebugString( str );
#endif
}
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QCOREAPPLICATION )
@@ -188,7 +164,7 @@ HB_FUNC( QT_QCOREAPPLICATION_APPLICATIONVERSION )
*/
HB_FUNC( QT_QCOREAPPLICATION_ARGUMENTS )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QCoreApplication( 1 )->arguments() ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QCoreApplication( 1 )->arguments() ) ) );
}
/*
@@ -252,7 +228,7 @@ HB_FUNC( QT_QCOREAPPLICATION_INSTANCE )
*/
HB_FUNC( QT_QCOREAPPLICATION_LIBRARYPATHS )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QCoreApplication( 1 )->libraryPaths() ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QCoreApplication( 1 )->libraryPaths() ) ) );
}
/*

50
harbour/contrib/hbqt/qtcore/QDataStream.cpp
View File

@@ -86,40 +86,48 @@
QT_G_FUNC( release_QDataStream )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QDataStream %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QDataStream p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QDataStream ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QDataStream * ) ph )->~QDataStream();
ph = NULL;
( ( QDataStream * ) p->ph )->~QDataStream();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QDataStream Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QDataStream %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QDataStream" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QDataStream Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QDataStream" );
#endif
}
}
void * gcAllocate_QDataStream( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QDataStream;
#if defined(__debug__)
just_debug( " new_QDataStream %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QDATASTREAM )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QDataStream %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
pObj = new QDataStream() ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QDataStream;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QDataStream( pObj ) );
}
/*
* bool atEnd () const

56
harbour/contrib/hbqt/qtcore/QDate.cpp
View File

@@ -81,47 +81,55 @@
QT_G_FUNC( release_QDate )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QDate %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QDate p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QDate ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QDate * ) ph )->~QDate();
ph = NULL;
( ( QDate * ) p->ph )->~QDate();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QDate Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QDate %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QDate" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QDate Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QDate" );
#endif
}
}
void * gcAllocate_QDate( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QDate;
#if defined(__debug__)
just_debug( " new_QDate %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QDATE )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QDate %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
pObj = new QDate() ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QDate;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QDate( pObj ) );
}
/*
* QDate addDays ( int ndays ) const
*/
HB_FUNC( QT_QDATE_ADDDAYS )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDate( hbqt_par_QDate( 1 )->addDays( hb_parni( 2 ) ) ), release_QDate ) );
hb_retptrGC( gcAllocate_QDate( new QDate( hbqt_par_QDate( 1 )->addDays( hb_parni( 2 ) ) ) ) );
}
/*
@@ -129,7 +137,7 @@ HB_FUNC( QT_QDATE_ADDDAYS )
*/
HB_FUNC( QT_QDATE_ADDMONTHS )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDate( hbqt_par_QDate( 1 )->addMonths( hb_parni( 2 ) ) ), release_QDate ) );
hb_retptrGC( gcAllocate_QDate( new QDate( hbqt_par_QDate( 1 )->addMonths( hb_parni( 2 ) ) ) ) );
}
/*
@@ -137,7 +145,7 @@ HB_FUNC( QT_QDATE_ADDMONTHS )
*/
HB_FUNC( QT_QDATE_ADDYEARS )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDate( hbqt_par_QDate( 1 )->addYears( hb_parni( 2 ) ) ), release_QDate ) );
hb_retptrGC( gcAllocate_QDate( new QDate( hbqt_par_QDate( 1 )->addYears( hb_parni( 2 ) ) ) ) );
}
/*

78
harbour/contrib/hbqt/qtcore/QDateTime.cpp
View File

@@ -81,47 +81,55 @@
QT_G_FUNC( release_QDateTime )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QDateTime %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QDateTime p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QDateTime ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QDateTime * ) ph )->~QDateTime();
ph = NULL;
( ( QDateTime * ) p->ph )->~QDateTime();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QDateTime Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QDateTime %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QDateTime" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QDateTime Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QDateTime" );
#endif
}
}
void * gcAllocate_QDateTime( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QDateTime;
#if defined(__debug__)
just_debug( " new_QDateTime %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QDATETIME )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QDateTime %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
pObj = ( QDateTime* ) new QDateTime() ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QDateTime;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QDateTime( pObj ) );
}
/*
* QDateTime addDays ( int ndays ) const
*/
HB_FUNC( QT_QDATETIME_ADDDAYS )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTime( 1 )->addDays( hb_parni( 2 ) ) ), release_QDateTime ) );
hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->addDays( hb_parni( 2 ) ) ) ) );
}
/*
@@ -129,7 +137,7 @@ HB_FUNC( QT_QDATETIME_ADDDAYS )
*/
HB_FUNC( QT_QDATETIME_ADDMSECS )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTime( 1 )->addMSecs( hb_parnint( 2 ) ) ), release_QDateTime ) );
hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->addMSecs( hb_parnint( 2 ) ) ) ) );
}
/*
@@ -137,7 +145,7 @@ HB_FUNC( QT_QDATETIME_ADDMSECS )
*/
HB_FUNC( QT_QDATETIME_ADDMONTHS )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTime( 1 )->addMonths( hb_parni( 2 ) ) ), release_QDateTime ) );
hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->addMonths( hb_parni( 2 ) ) ) ) );
}
/*
@@ -145,7 +153,7 @@ HB_FUNC( QT_QDATETIME_ADDMONTHS )
*/
HB_FUNC( QT_QDATETIME_ADDSECS )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTime( 1 )->addSecs( hb_parni( 2 ) ) ), release_QDateTime ) );
hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->addSecs( hb_parni( 2 ) ) ) ) );
}
/*
@@ -153,7 +161,7 @@ HB_FUNC( QT_QDATETIME_ADDSECS )
*/
HB_FUNC( QT_QDATETIME_ADDYEARS )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTime( 1 )->addYears( hb_parni( 2 ) ) ), release_QDateTime ) );
hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->addYears( hb_parni( 2 ) ) ) ) );
}
/*
@@ -161,7 +169,7 @@ HB_FUNC( QT_QDATETIME_ADDYEARS )
*/
HB_FUNC( QT_QDATETIME_DATE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDate( hbqt_par_QDateTime( 1 )->date() ), release_QDate ) );
hb_retptrGC( gcAllocate_QDate( new QDate( hbqt_par_QDateTime( 1 )->date() ) ) );
}
/*
@@ -233,7 +241,7 @@ HB_FUNC( QT_QDATETIME_SETTIME_T )
*/
HB_FUNC( QT_QDATETIME_TIME )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QTime( hbqt_par_QDateTime( 1 )->time() ), release_QTime ) );
hb_retptrGC( gcAllocate_QTime( new QTime( hbqt_par_QDateTime( 1 )->time() ) ) );
}
/*
@@ -249,7 +257,7 @@ HB_FUNC( QT_QDATETIME_TIMESPEC )
*/
HB_FUNC( QT_QDATETIME_TOLOCALTIME )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTime( 1 )->toLocalTime() ), release_QDateTime ) );
hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->toLocalTime() ) ) );
}
/*
@@ -273,7 +281,7 @@ HB_FUNC( QT_QDATETIME_TOSTRING_1 )
*/
HB_FUNC( QT_QDATETIME_TOTIMESPEC )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTime( 1 )->toTimeSpec( ( Qt::TimeSpec ) hb_parni( 2 ) ) ), release_QDateTime ) );
hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->toTimeSpec( ( Qt::TimeSpec ) hb_parni( 2 ) ) ) ) );
}
/*
@@ -289,7 +297,7 @@ HB_FUNC( QT_QDATETIME_TOTIME_T )
*/
HB_FUNC( QT_QDATETIME_TOUTC )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTime( 1 )->toUTC() ), release_QDateTime ) );
hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->toUTC() ) ) );
}
/*
@@ -297,7 +305,7 @@ HB_FUNC( QT_QDATETIME_TOUTC )
*/
HB_FUNC( QT_QDATETIME_CURRENTDATETIME )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTime( 1 )->currentDateTime() ), release_QDateTime ) );
hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->currentDateTime() ) ) );
}
/*
@@ -305,7 +313,7 @@ HB_FUNC( QT_QDATETIME_CURRENTDATETIME )
*/
HB_FUNC( QT_QDATETIME_FROMSTRING )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTime( 1 )->fromString( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::DateFormat ) hb_parni( 3 ) : ( Qt::DateFormat ) Qt::TextDate ) ) ), release_QDateTime ) );
hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->fromString( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::DateFormat ) hb_parni( 3 ) : ( Qt::DateFormat ) Qt::TextDate ) ) ) ) );
}
/*
@@ -313,7 +321,7 @@ HB_FUNC( QT_QDATETIME_FROMSTRING )
*/
HB_FUNC( QT_QDATETIME_FROMSTRING_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTime( 1 )->fromString( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ), release_QDateTime ) );
hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->fromString( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ) ) );
}
/*
@@ -321,7 +329,7 @@ HB_FUNC( QT_QDATETIME_FROMSTRING_1 )
*/
HB_FUNC( QT_QDATETIME_FROMTIME_T )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTime( 1 )->fromTime_t( hb_parni( 2 ) ) ), release_QDateTime ) );
hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->fromTime_t( hb_parni( 2 ) ) ) ) );
}

66
harbour/contrib/hbqt/qtcore/QDir.cpp
View File

@@ -87,40 +87,48 @@
QT_G_FUNC( release_QDir )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QDir %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QDir p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QDir ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QDir * ) ph )->~QDir();
ph = NULL;
( ( QDir * ) p->ph )->~QDir();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QDir Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QDir %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QDir" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QDir Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QDir" );
#endif
}
}
void * gcAllocate_QDir( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QDir;
#if defined(__debug__)
just_debug( " new_QDir %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QDIR )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QDir %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
pObj = new QDir( hbqt_par_QString( 1 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QDir;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QDir( pObj ) );
}
/*
* QString absoluteFilePath ( const QString & fileName ) const
@@ -183,7 +191,7 @@ HB_FUNC( QT_QDIR_DIRNAME )
*/
HB_FUNC( QT_QDIR_ENTRYLIST )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QDir( 1 )->entryList( *hbqt_par_QStringList( 2 ), ( HB_ISNUM( 3 ) ? ( QDir::Filters ) hb_parni( 3 ) : ( QDir::Filters ) QDir::NoFilter ), ( HB_ISNUM( 4 ) ? ( QDir::SortFlags ) hb_parni( 4 ) : ( QDir::SortFlags ) QDir::NoSort ) ) ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QDir( 1 )->entryList( *hbqt_par_QStringList( 2 ), ( HB_ISNUM( 3 ) ? ( QDir::Filters ) hb_parni( 3 ) : ( QDir::Filters ) QDir::NoFilter ), ( HB_ISNUM( 4 ) ? ( QDir::SortFlags ) hb_parni( 4 ) : ( QDir::SortFlags ) QDir::NoSort ) ) ) ) );
}
/*
@@ -191,7 +199,7 @@ HB_FUNC( QT_QDIR_ENTRYLIST )
*/
HB_FUNC( QT_QDIR_ENTRYLIST_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QDir( 1 )->entryList( ( HB_ISNUM( 2 ) ? ( QDir::Filters ) hb_parni( 2 ) : ( QDir::Filters ) QDir::NoFilter ), ( HB_ISNUM( 3 ) ? ( QDir::SortFlags ) hb_parni( 3 ) : ( QDir::SortFlags ) QDir::NoSort ) ) ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QDir( 1 )->entryList( ( HB_ISNUM( 2 ) ? ( QDir::Filters ) hb_parni( 2 ) : ( QDir::Filters ) QDir::NoFilter ), ( HB_ISNUM( 3 ) ? ( QDir::SortFlags ) hb_parni( 3 ) : ( QDir::SortFlags ) QDir::NoSort ) ) ) ) );
}
/*
@@ -287,7 +295,7 @@ HB_FUNC( QT_QDIR_MKPATH )
*/
HB_FUNC( QT_QDIR_NAMEFILTERS )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QDir( 1 )->nameFilters() ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QDir( 1 )->nameFilters() ) ) );
}
/*
@@ -407,7 +415,7 @@ HB_FUNC( QT_QDIR_CLEANPATH )
*/
HB_FUNC( QT_QDIR_CURRENT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDir( hbqt_par_QDir( 1 )->current() ), release_QDir ) );
hb_retptrGC( gcAllocate_QDir( new QDir( hbqt_par_QDir( 1 )->current() ) ) );
}
/*
@@ -431,7 +439,7 @@ HB_FUNC( QT_QDIR_FROMNATIVESEPARATORS )
*/
HB_FUNC( QT_QDIR_HOME )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDir( hbqt_par_QDir( 1 )->home() ), release_QDir ) );
hb_retptrGC( gcAllocate_QDir( new QDir( hbqt_par_QDir( 1 )->home() ) ) );
}
/*
@@ -479,7 +487,7 @@ HB_FUNC( QT_QDIR_MATCH_1 )
*/
HB_FUNC( QT_QDIR_ROOT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDir( hbqt_par_QDir( 1 )->root() ), release_QDir ) );
hb_retptrGC( gcAllocate_QDir( new QDir( hbqt_par_QDir( 1 )->root() ) ) );
}
/*
@@ -495,7 +503,7 @@ HB_FUNC( QT_QDIR_ROOTPATH )
*/
HB_FUNC( QT_QDIR_SEARCHPATHS )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QDir( 1 )->searchPaths( hbqt_par_QString( 2 ) ) ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QDir( 1 )->searchPaths( hbqt_par_QString( 2 ) ) ) ) );
}
/*
@@ -519,7 +527,7 @@ HB_FUNC( QT_QDIR_SETSEARCHPATHS )
*/
HB_FUNC( QT_QDIR_TEMP )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDir( hbqt_par_QDir( 1 )->temp() ), release_QDir ) );
hb_retptrGC( gcAllocate_QDir( new QDir( hbqt_par_QDir( 1 )->temp() ) ) );
}
/*

50
harbour/contrib/hbqt/qtcore/QEvent.cpp
View File

@@ -82,40 +82,48 @@
QT_G_FUNC( release_QEvent )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QEvent %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QEvent p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QEvent ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QEvent * ) ph )->~QEvent();
ph = NULL;
( ( QEvent * ) p->ph )->~QEvent();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QEvent Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QEvent %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QEvent" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QEvent Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QEvent" );
#endif
}
}
void * gcAllocate_QEvent( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QEvent;
#if defined(__debug__)
just_debug( " new_QEvent %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QEVENT )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QEvent %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
pObj = ( QEvent* ) new QEvent( ( QEvent::Type ) hb_parni( 1 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QEvent;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QEvent( pObj ) );
}
/*
* void accept ()

69
harbour/contrib/hbqt/qtcore/QEventLoop.cpp
View File

@@ -81,52 +81,69 @@
* ~QEventLoop ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QEventLoop > pq;
} QGC_POINTER_QEventLoop;
QT_G_FUNC( release_QEventLoop )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QEventLoop %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QEventLoop * p = ( QGC_POINTER_QEventLoop * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QEventLoop p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QEventLoop ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QEventLoop * ) ph )->~QEventLoop();
ph = NULL;
( ( QEventLoop * ) p->ph )->~QEventLoop();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QEventLoop Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QEventLoop %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QEventLoop" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QEventLoop Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QEventLoop" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QEventLoop" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QEventLoop Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QEventLoop" );
#endif
}
}
void * gcAllocate_QEventLoop( void * pObj )
{
QGC_POINTER_QEventLoop * p = ( QGC_POINTER_QEventLoop * ) hb_gcAllocate( sizeof( QGC_POINTER_QEventLoop ), gcFuncs() );
p->ph = pObj;
p->func = release_QEventLoop;
new( & p->pq ) QPointer< QEventLoop >( ( QEventLoop * ) pObj );
#if defined(__debug__)
just_debug( " new_QEventLoop %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QEVENTLOOP )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QEventLoop > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QEventLoop %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = new QEventLoop( hbqt_par_QObject( 1 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QEventLoop;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QEventLoop( pObj ) );
}
/*
* int exec ( ProcessEventsFlags flags = AllEvents )

71
harbour/contrib/hbqt/qtcore/QFile.cpp
View File

@@ -86,55 +86,72 @@
* ~QFile ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QFile > pq;
} QGC_POINTER_QFile;
QT_G_FUNC( release_QFile )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QFile %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QFile * p = ( QGC_POINTER_QFile * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QFile p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QFile ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QFile * ) ph )->~QFile();
ph = NULL;
( ( QFile * ) p->ph )->~QFile();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QFile Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QFile %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QFile" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QFile Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QFile" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QFile" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QFile Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QFile" );
#endif
}
}
void * gcAllocate_QFile( void * pObj )
{
QGC_POINTER_QFile * p = ( QGC_POINTER_QFile * ) hb_gcAllocate( sizeof( QGC_POINTER_QFile ), gcFuncs() );
p->ph = pObj;
p->func = release_QFile;
new( & p->pq ) QPointer< QFile >( ( QFile * ) pObj );
#if defined(__debug__)
just_debug( " new_QFile %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QFILE )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QFile > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QFile %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
if( hb_pcount() == 1 && HB_ISCHAR( 1 ) )
{
pObj = new QFile( hbqt_par_QString( 1 ) ) ;
}
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QFile;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QFile( pObj ) );
}
/*
* virtual bool atEnd () const
@@ -341,7 +358,7 @@ HB_FUNC( QT_QFILE_DECODENAME_1 )
*/
HB_FUNC( QT_QFILE_ENCODENAME )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QFile( 1 )->encodeName( hbqt_par_QString( 2 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QFile( 1 )->encodeName( hbqt_par_QString( 2 ) ) ) ) );
}
/*

60
harbour/contrib/hbqt/qtcore/QFileInfo.cpp
View File

@@ -87,47 +87,55 @@
QT_G_FUNC( release_QFileInfo )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QFileInfo %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QFileInfo p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QFileInfo ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QFileInfo * ) ph )->~QFileInfo();
ph = NULL;
( ( QFileInfo * ) p->ph )->~QFileInfo();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QFileInfo Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QFileInfo %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QFileInfo" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QFileInfo Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QFileInfo" );
#endif
}
}
void * gcAllocate_QFileInfo( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QFileInfo;
#if defined(__debug__)
just_debug( " new_QFileInfo %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QFILEINFO )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QFileInfo %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
pObj = new QFileInfo() ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QFileInfo;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QFileInfo( pObj ) );
}
/*
* QDir absoluteDir () const
*/
HB_FUNC( QT_QFILEINFO_ABSOLUTEDIR )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDir( hbqt_par_QFileInfo( 1 )->absoluteDir() ), release_QDir ) );
hb_retptrGC( gcAllocate_QDir( new QDir( hbqt_par_QFileInfo( 1 )->absoluteDir() ) ) );
}
/*
@@ -207,7 +215,7 @@ HB_FUNC( QT_QFILEINFO_COMPLETESUFFIX )
*/
HB_FUNC( QT_QFILEINFO_CREATED )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QFileInfo( 1 )->created() ), release_QDateTime ) );
hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QFileInfo( 1 )->created() ) ) );
}
/*
@@ -215,7 +223,7 @@ HB_FUNC( QT_QFILEINFO_CREATED )
*/
HB_FUNC( QT_QFILEINFO_DIR )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDir( hbqt_par_QFileInfo( 1 )->dir() ), release_QDir ) );
hb_retptrGC( gcAllocate_QDir( new QDir( hbqt_par_QFileInfo( 1 )->dir() ) ) );
}
/*
@@ -351,7 +359,7 @@ HB_FUNC( QT_QFILEINFO_ISWRITABLE )
*/
HB_FUNC( QT_QFILEINFO_LASTMODIFIED )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QFileInfo( 1 )->lastModified() ), release_QDateTime ) );
hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QFileInfo( 1 )->lastModified() ) ) );
}
/*
@@ -359,7 +367,7 @@ HB_FUNC( QT_QFILEINFO_LASTMODIFIED )
*/
HB_FUNC( QT_QFILEINFO_LASTREAD )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QFileInfo( 1 )->lastRead() ), release_QDateTime ) );
hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QFileInfo( 1 )->lastRead() ) ) );
}
/*

34
harbour/contrib/hbqt/qtcore/QIODevice.cpp
View File

@@ -84,31 +84,7 @@
QT_G_FUNC( release_QIODevice )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QIODevice %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QIODevice * ) ph )->~QIODevice();
ph = NULL;
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QIODevice" ); OutputDebugString( str );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QIODevice" ); OutputDebugString( str );
#endif
}
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QIODEVICE )
@@ -239,7 +215,7 @@ HB_FUNC( QT_QIODEVICE_PEEK )
*/
HB_FUNC( QT_QIODEVICE_PEEK_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QIODevice( 1 )->peek( hb_parnint( 2 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QIODevice( 1 )->peek( hb_parnint( 2 ) ) ) ) );
}
/*
@@ -271,7 +247,7 @@ HB_FUNC( QT_QIODEVICE_READ )
*/
HB_FUNC( QT_QIODEVICE_READ_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QIODevice( 1 )->read( hb_parnint( 2 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QIODevice( 1 )->read( hb_parnint( 2 ) ) ) ) );
}
/*
@@ -279,7 +255,7 @@ HB_FUNC( QT_QIODEVICE_READ_1 )
*/
HB_FUNC( QT_QIODEVICE_READALL )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QIODevice( 1 )->readAll() ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QIODevice( 1 )->readAll() ) ) );
}
/*
@@ -295,7 +271,7 @@ HB_FUNC( QT_QIODEVICE_READLINE )
*/
HB_FUNC( QT_QIODEVICE_READLINE_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QIODevice( 1 )->readLine( hb_parnint( 2 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QIODevice( 1 )->readLine( hb_parnint( 2 ) ) ) ) );
}
/*

50
harbour/contrib/hbqt/qtcore/QLatin1Char.cpp
View File

@@ -77,40 +77,48 @@
QT_G_FUNC( release_QLatin1Char )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QLatin1Char %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QLatin1Char p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QLatin1Char ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QLatin1Char * ) ph )->~QLatin1Char();
ph = NULL;
( ( QLatin1Char * ) p->ph )->~QLatin1Char();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QLatin1Char Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QLatin1Char %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QLatin1Char" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QLatin1Char Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QLatin1Char" );
#endif
}
}
void * gcAllocate_QLatin1Char( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QLatin1Char;
#if defined(__debug__)
just_debug( " new_QLatin1Char %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QLATIN1CHAR )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QLatin1Char %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
pObj = ( QLatin1Char* ) new QLatin1Char( *hb_parcx( 1 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QLatin1Char;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QLatin1Char( pObj ) );
}
/*
* char toLatin1 () const

50
harbour/contrib/hbqt/qtcore/QLatin1String.cpp
View File

@@ -77,40 +77,48 @@
QT_G_FUNC( release_QLatin1String )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QLatin1String %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QLatin1String p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QLatin1String ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QLatin1String * ) ph )->~QLatin1String();
ph = NULL;
( ( QLatin1String * ) p->ph )->~QLatin1String();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QLatin1String Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QLatin1String %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QLatin1String" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QLatin1String Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QLatin1String" );
#endif
}
}
void * gcAllocate_QLatin1String( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QLatin1String;
#if defined(__debug__)
just_debug( " new_QLatin1String %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QLATIN1STRING )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QLatin1String %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
pObj = ( QLatin1String* ) new QLatin1String( hb_parcx( 1 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QLatin1String;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QLatin1String( pObj ) );
}
/*
* const char * latin1 () const

58
harbour/contrib/hbqt/qtcore/QLine.cpp
View File

@@ -79,30 +79,44 @@
QT_G_FUNC( release_QLine )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QLine %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QLine p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QLine ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QLine * ) ph )->~QLine();
ph = NULL;
( ( QLine * ) p->ph )->~QLine();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QLine Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QLine %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QLine" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QLine Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QLine" );
#endif
}
}
void * gcAllocate_QLine( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QLine;
#if defined(__debug__)
just_debug( " new_QLine %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QLINE )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QLine %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
{
@@ -121,20 +135,14 @@ hb_snprintf( str, sizeof(str), " GC: new QLine %i B %i
pObj = ( QLine* ) new QLine() ;
}
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QLine;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QLine( pObj ) );
}
/*
* QPoint p1 () const
*/
HB_FUNC( QT_QLINE_P1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QLine( 1 )->p1() ), release_QPoint ) );
hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QLine( 1 )->p1() ) ) );
}
/*
@@ -142,7 +150,7 @@ HB_FUNC( QT_QLINE_P1 )
*/
HB_FUNC( QT_QLINE_P2 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QLine( 1 )->p2() ), release_QPoint ) );
hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QLine( 1 )->p2() ) ) );
}
/*
@@ -254,7 +262,7 @@ HB_FUNC( QT_QLINE_TRANSLATE_1 )
*/
HB_FUNC( QT_QLINE_TRANSLATED )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QLine( hbqt_par_QLine( 1 )->translated( *hbqt_par_QPoint( 2 ) ) ), release_QLine ) );
hb_retptrGC( gcAllocate_QLine( new QLine( hbqt_par_QLine( 1 )->translated( *hbqt_par_QPoint( 2 ) ) ) ) );
}
/*
@@ -262,7 +270,7 @@ HB_FUNC( QT_QLINE_TRANSLATED )
*/
HB_FUNC( QT_QLINE_TRANSLATED_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QLine( hbqt_par_QLine( 1 )->translated( hb_parni( 2 ), hb_parni( 3 ) ) ), release_QLine ) );
hb_retptrGC( gcAllocate_QLine( new QLine( hbqt_par_QLine( 1 )->translated( hb_parni( 2 ), hb_parni( 3 ) ) ) ) );
}

66
harbour/contrib/hbqt/qtcore/QLineF.cpp
View File

@@ -83,47 +83,55 @@
QT_G_FUNC( release_QLineF )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QLineF %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QLineF p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QLineF ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QLineF * ) ph )->~QLineF();
ph = NULL;
( ( QLineF * ) p->ph )->~QLineF();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QLineF Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QLineF %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QLineF" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QLineF Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QLineF" );
#endif
}
}
void * gcAllocate_QLineF( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QLineF;
#if defined(__debug__)
just_debug( " new_QLineF %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QLINEF )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QLineF %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
pObj = new QLineF() ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QLineF;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QLineF( pObj ) );
}
/*
* QPointF p1 () const
*/
HB_FUNC( QT_QLINEF_P1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPointF( hbqt_par_QLineF( 1 )->p1() ), release_QPointF ) );
hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QLineF( 1 )->p1() ) ) );
}
/*
@@ -131,7 +139,7 @@ HB_FUNC( QT_QLINEF_P1 )
*/
HB_FUNC( QT_QLINEF_P2 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPointF( hbqt_par_QLineF( 1 )->p2() ), release_QPointF ) );
hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QLineF( 1 )->p2() ) ) );
}
/*
@@ -227,7 +235,7 @@ HB_FUNC( QT_QLINEF_LENGTH )
*/
HB_FUNC( QT_QLINEF_NORMALVECTOR )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QLineF( hbqt_par_QLineF( 1 )->normalVector() ), release_QLineF ) );
hb_retptrGC( gcAllocate_QLineF( new QLineF( hbqt_par_QLineF( 1 )->normalVector() ) ) );
}
/*
@@ -235,7 +243,7 @@ HB_FUNC( QT_QLINEF_NORMALVECTOR )
*/
HB_FUNC( QT_QLINEF_POINTAT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPointF( hbqt_par_QLineF( 1 )->pointAt( hb_parnd( 2 ) ) ), release_QPointF ) );
hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QLineF( 1 )->pointAt( hb_parnd( 2 ) ) ) ) );
}
/*
@@ -291,7 +299,7 @@ HB_FUNC( QT_QLINEF_SETPOINTS )
*/
HB_FUNC( QT_QLINEF_TOLINE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QLine( hbqt_par_QLineF( 1 )->toLine() ), release_QLine ) );
hb_retptrGC( gcAllocate_QLine( new QLine( hbqt_par_QLineF( 1 )->toLine() ) ) );
}
/*
@@ -315,7 +323,7 @@ HB_FUNC( QT_QLINEF_TRANSLATE_1 )
*/
HB_FUNC( QT_QLINEF_TRANSLATED )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QLineF( hbqt_par_QLineF( 1 )->translated( *hbqt_par_QPointF( 2 ) ) ), release_QLineF ) );
hb_retptrGC( gcAllocate_QLineF( new QLineF( hbqt_par_QLineF( 1 )->translated( *hbqt_par_QPointF( 2 ) ) ) ) );
}
/*
@@ -323,7 +331,7 @@ HB_FUNC( QT_QLINEF_TRANSLATED )
*/
HB_FUNC( QT_QLINEF_TRANSLATED_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QLineF( hbqt_par_QLineF( 1 )->translated( hb_parnd( 2 ), hb_parnd( 3 ) ) ), release_QLineF ) );
hb_retptrGC( gcAllocate_QLineF( new QLineF( hbqt_par_QLineF( 1 )->translated( hb_parnd( 2 ), hb_parnd( 3 ) ) ) ) );
}
/*
@@ -331,7 +339,7 @@ HB_FUNC( QT_QLINEF_TRANSLATED_1 )
*/
HB_FUNC( QT_QLINEF_UNITVECTOR )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QLineF( hbqt_par_QLineF( 1 )->unitVector() ), release_QLineF ) );
hb_retptrGC( gcAllocate_QLineF( new QLineF( hbqt_par_QLineF( 1 )->unitVector() ) ) );
}

50
harbour/contrib/hbqt/qtcore/QList.cpp
View File

@@ -105,41 +105,49 @@
QT_G_FUNC( release_QList )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QList %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QList p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QList ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QList< void * > * ) ph )->~QList();
ph = NULL;
( ( QList< void * > * ) p->ph )->~QList();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QList Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QList %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QList" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QList Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QList" );
#endif
}
}
void * gcAllocate_QList( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QList;
#if defined(__debug__)
just_debug( " new_QList %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QLIST )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QList %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
QList<void*>* list = NULL;
pObj = ( QList<void*>* ) list ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QList;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QList( pObj ) );
}
/*
* void append ( const T & value )

66
harbour/contrib/hbqt/qtcore/QLocale.cpp
View File

@@ -107,40 +107,48 @@
QT_G_FUNC( release_QLocale )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QLocale %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QLocale p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QLocale ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QLocale * ) ph )->~QLocale();
ph = NULL;
( ( QLocale * ) p->ph )->~QLocale();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QLocale Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QLocale %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QLocale" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QLocale Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QLocale" );
#endif
}
}
void * gcAllocate_QLocale( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QLocale;
#if defined(__debug__)
just_debug( " new_QLocale %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QLOCALE )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QLocale %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
pObj = new QLocale() ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QLocale;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QLocale( pObj ) );
}
/*
* QString amText () const
@@ -267,7 +275,7 @@ HB_FUNC( QT_QLOCALE_TIMEFORMAT )
*/
HB_FUNC( QT_QLOCALE_TODATE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDate( hbqt_par_QLocale( 1 )->toDate( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( QLocale::FormatType ) hb_parni( 3 ) : ( QLocale::FormatType ) QLocale::LongFormat ) ) ), release_QDate ) );
hb_retptrGC( gcAllocate_QDate( new QDate( hbqt_par_QLocale( 1 )->toDate( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( QLocale::FormatType ) hb_parni( 3 ) : ( QLocale::FormatType ) QLocale::LongFormat ) ) ) ) );
}
/*
@@ -275,7 +283,7 @@ HB_FUNC( QT_QLOCALE_TODATE )
*/
HB_FUNC( QT_QLOCALE_TODATE_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDate( hbqt_par_QLocale( 1 )->toDate( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ), release_QDate ) );
hb_retptrGC( gcAllocate_QDate( new QDate( hbqt_par_QLocale( 1 )->toDate( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ) ) );
}
/*
@@ -283,7 +291,7 @@ HB_FUNC( QT_QLOCALE_TODATE_1 )
*/
HB_FUNC( QT_QLOCALE_TODATETIME )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QLocale( 1 )->toDateTime( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( QLocale::FormatType ) hb_parni( 3 ) : ( QLocale::FormatType ) QLocale::LongFormat ) ) ), release_QDateTime ) );
hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QLocale( 1 )->toDateTime( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( QLocale::FormatType ) hb_parni( 3 ) : ( QLocale::FormatType ) QLocale::LongFormat ) ) ) ) );
}
/*
@@ -291,7 +299,7 @@ HB_FUNC( QT_QLOCALE_TODATETIME )
*/
HB_FUNC( QT_QLOCALE_TODATETIME_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QLocale( 1 )->toDateTime( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ), release_QDateTime ) );
hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QLocale( 1 )->toDateTime( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ) ) );
}
/*
@@ -471,7 +479,7 @@ HB_FUNC( QT_QLOCALE_TOSTRING_13 )
*/
HB_FUNC( QT_QLOCALE_TOTIME )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QTime( hbqt_par_QLocale( 1 )->toTime( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( QLocale::FormatType ) hb_parni( 3 ) : ( QLocale::FormatType ) QLocale::LongFormat ) ) ), release_QTime ) );
hb_retptrGC( gcAllocate_QTime( new QTime( hbqt_par_QLocale( 1 )->toTime( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( QLocale::FormatType ) hb_parni( 3 ) : ( QLocale::FormatType ) QLocale::LongFormat ) ) ) ) );
}
/*
@@ -479,7 +487,7 @@ HB_FUNC( QT_QLOCALE_TOTIME )
*/
HB_FUNC( QT_QLOCALE_TOTIME_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QTime( hbqt_par_QLocale( 1 )->toTime( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ), release_QTime ) );
hb_retptrGC( gcAllocate_QTime( new QTime( hbqt_par_QLocale( 1 )->toTime( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ) ) );
}
/*
@@ -523,7 +531,7 @@ HB_FUNC( QT_QLOCALE_TOUSHORT )
*/
HB_FUNC( QT_QLOCALE_C )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QLocale( hbqt_par_QLocale( 1 )->c() ), release_QLocale ) );
hb_retptrGC( gcAllocate_QLocale( new QLocale( hbqt_par_QLocale( 1 )->c() ) ) );
}
/*
@@ -555,7 +563,7 @@ HB_FUNC( QT_QLOCALE_SETDEFAULT )
*/
HB_FUNC( QT_QLOCALE_SYSTEM )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QLocale( hbqt_par_QLocale( 1 )->system() ), release_QLocale ) );
hb_retptrGC( gcAllocate_QLocale( new QLocale( hbqt_par_QLocale( 1 )->system() ) ) );
}

77
harbour/contrib/hbqt/qtcore/QMimeData.cpp
View File

@@ -86,52 +86,69 @@
* ~QMimeData ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QMimeData > pq;
} QGC_POINTER_QMimeData;
QT_G_FUNC( release_QMimeData )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QMimeData %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QMimeData * p = ( QGC_POINTER_QMimeData * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QMimeData p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QMimeData ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QMimeData * ) ph )->~QMimeData();
ph = NULL;
( ( QMimeData * ) p->ph )->~QMimeData();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QMimeData Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QMimeData %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QMimeData" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QMimeData Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QMimeData" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QMimeData" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QMimeData Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QMimeData" );
#endif
}
}
void * gcAllocate_QMimeData( void * pObj )
{
QGC_POINTER_QMimeData * p = ( QGC_POINTER_QMimeData * ) hb_gcAllocate( sizeof( QGC_POINTER_QMimeData ), gcFuncs() );
p->ph = pObj;
p->func = release_QMimeData;
new( & p->pq ) QPointer< QMimeData >( ( QMimeData * ) pObj );
#if defined(__debug__)
just_debug( " new_QMimeData %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QMIMEDATA )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QMimeData > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QMimeData %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = new QMimeData() ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QMimeData;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QMimeData( pObj ) );
}
/*
* void clear ()
@@ -146,7 +163,7 @@ HB_FUNC( QT_QMIMEDATA_CLEAR )
*/
HB_FUNC( QT_QMIMEDATA_COLORDATA )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QMimeData( 1 )->colorData() ), release_QVariant ) );
hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QMimeData( 1 )->colorData() ) ) );
}
/*
@@ -154,7 +171,7 @@ HB_FUNC( QT_QMIMEDATA_COLORDATA )
*/
HB_FUNC( QT_QMIMEDATA_DATA )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QMimeData( 1 )->data( hbqt_par_QString( 2 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QMimeData( 1 )->data( hbqt_par_QString( 2 ) ) ) ) );
}
/*
@@ -162,7 +179,7 @@ HB_FUNC( QT_QMIMEDATA_DATA )
*/
HB_FUNC( QT_QMIMEDATA_FORMATS )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QMimeData( 1 )->formats() ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QMimeData( 1 )->formats() ) ) );
}
/*
@@ -226,7 +243,7 @@ HB_FUNC( QT_QMIMEDATA_HTML )
*/
HB_FUNC( QT_QMIMEDATA_IMAGEDATA )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QMimeData( 1 )->imageData() ), release_QVariant ) );
hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QMimeData( 1 )->imageData() ) ) );
}
/*

58
harbour/contrib/hbqt/qtcore/QModelIndex.cpp
View File

@@ -79,47 +79,55 @@
QT_G_FUNC( release_QModelIndex )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QModelIndex %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QModelIndex p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QModelIndex ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QModelIndex * ) ph )->~QModelIndex();
ph = NULL;
( ( QModelIndex * ) p->ph )->~QModelIndex();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QModelIndex Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QModelIndex %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QModelIndex" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QModelIndex Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QModelIndex" );
#endif
}
}
void * gcAllocate_QModelIndex( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QModelIndex;
#if defined(__debug__)
just_debug( " new_QModelIndex %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QMODELINDEX )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QModelIndex %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
pObj = new QModelIndex() ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QModelIndex;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QModelIndex( pObj ) );
}
/*
* QModelIndex child ( int row, int column ) const
*/
HB_FUNC( QT_QMODELINDEX_CHILD )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QModelIndex( 1 )->child( hb_parni( 2 ), hb_parni( 3 ) ) ), release_QModelIndex ) );
hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QModelIndex( 1 )->child( hb_parni( 2 ), hb_parni( 3 ) ) ) ) );
}
/*
@@ -135,7 +143,7 @@ HB_FUNC( QT_QMODELINDEX_COLUMN )
*/
HB_FUNC( QT_QMODELINDEX_DATA )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QModelIndex( 1 )->data( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : Qt::DisplayRole ) ) ), release_QVariant ) );
hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QModelIndex( 1 )->data( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : Qt::DisplayRole ) ) ) ) );
}
/*
@@ -183,7 +191,7 @@ HB_FUNC( QT_QMODELINDEX_MODEL )
*/
HB_FUNC( QT_QMODELINDEX_PARENT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QModelIndex( 1 )->parent() ), release_QModelIndex ) );
hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QModelIndex( 1 )->parent() ) ) );
}
/*
@@ -199,7 +207,7 @@ HB_FUNC( QT_QMODELINDEX_ROW )
*/
HB_FUNC( QT_QMODELINDEX_SIBLING )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QModelIndex( 1 )->sibling( hb_parni( 2 ), hb_parni( 3 ) ) ), release_QModelIndex ) );
hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QModelIndex( 1 )->sibling( hb_parni( 2 ), hb_parni( 3 ) ) ) ) );
}

71
harbour/contrib/hbqt/qtcore/QObject.cpp
View File

@@ -94,52 +94,69 @@
* virtual ~QObject ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QObject > pq;
} QGC_POINTER_QObject;
QT_G_FUNC( release_QObject )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QObject %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QObject * p = ( QGC_POINTER_QObject * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QObject p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QObject ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QObject * ) ph )->~QObject();
ph = NULL;
( ( QObject * ) p->ph )->~QObject();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QObject Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QObject %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QObject" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QObject Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QObject" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QObject" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QObject Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QObject" );
#endif
}
}
void * gcAllocate_QObject( void * pObj )
{
QGC_POINTER_QObject * p = ( QGC_POINTER_QObject * ) hb_gcAllocate( sizeof( QGC_POINTER_QObject ), gcFuncs() );
p->ph = pObj;
p->func = release_QObject;
new( & p->pq ) QPointer< QObject >( ( QObject * ) pObj );
#if defined(__debug__)
just_debug( " new_QObject %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QOBJECT )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QObject > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QObject %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = ( QObject* ) new QObject( hbqt_par_QWidget( 1 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QObject;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QObject( pObj ) );
}
/*
* bool blockSignals ( bool block )
@@ -274,7 +291,7 @@ HB_FUNC( QT_QOBJECT_PARENT )
*/
HB_FUNC( QT_QOBJECT_PROPERTY )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QObject( 1 )->property( hbqt_par_char( 2 ) ) ), release_QVariant ) );
hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QObject( 1 )->property( hbqt_par_char( 2 ) ) ) ) );
}
/*

50
harbour/contrib/hbqt/qtcore/QPoint.cpp
View File

@@ -79,30 +79,44 @@
QT_G_FUNC( release_QPoint )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QPoint %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QPoint p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QPoint ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QPoint * ) ph )->~QPoint();
ph = NULL;
( ( QPoint * ) p->ph )->~QPoint();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QPoint Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QPoint %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QPoint" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QPoint Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QPoint" );
#endif
}
}
void * gcAllocate_QPoint( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QPoint;
#if defined(__debug__)
just_debug( " new_QPoint %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QPOINT )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QPoint %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) )
{
@@ -117,13 +131,7 @@ hb_snprintf( str, sizeof(str), " GC: new QPoint %i B %i
pObj = ( QPoint* ) new QPoint() ;
}
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QPoint;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QPoint( pObj ) );
}
/*
* bool isNull () const

52
harbour/contrib/hbqt/qtcore/QPointF.cpp
View File

@@ -79,30 +79,44 @@
QT_G_FUNC( release_QPointF )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QPointF %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QPointF p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QPointF ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QPointF * ) ph )->~QPointF();
ph = NULL;
( ( QPointF * ) p->ph )->~QPointF();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QPointF Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QPointF %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QPointF" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QPointF Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QPointF" );
#endif
}
}
void * gcAllocate_QPointF( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QPointF;
#if defined(__debug__)
just_debug( " new_QPointF %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QPOINTF )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QPointF %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) )
{
@@ -117,13 +131,7 @@ hb_snprintf( str, sizeof(str), " GC: new QPointF %i B %i
pObj = ( QPointF* ) new QPointF() ;
}
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QPointF;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QPointF( pObj ) );
}
/*
* bool isNull () const
@@ -170,7 +178,7 @@ HB_FUNC( QT_QPOINTF_SETY )
*/
HB_FUNC( QT_QPOINTF_TOPOINT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QPointF( 1 )->toPoint() ), release_QPoint ) );
hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QPointF( 1 )->toPoint() ) ) );
}
/*

77
harbour/contrib/hbqt/qtcore/QProcess.cpp
View File

@@ -87,42 +87,65 @@
* virtual ~QProcess ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QProcess > pq;
} QGC_POINTER_QProcess;
QT_G_FUNC( release_QProcess )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QProcess %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QProcess * p = ( QGC_POINTER_QProcess * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QProcess p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QProcess ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QProcess * ) ph )->~QProcess();
ph = NULL;
( ( QProcess * ) p->ph )->~QProcess();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QProcess Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QProcess %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QProcess" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QProcess Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QProcess" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QProcess" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QProcess Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QProcess" );
#endif
}
}
void * gcAllocate_QProcess( void * pObj )
{
QGC_POINTER_QProcess * p = ( QGC_POINTER_QProcess * ) hb_gcAllocate( sizeof( QGC_POINTER_QProcess ), gcFuncs() );
p->ph = pObj;
p->func = release_QProcess;
new( & p->pq ) QPointer< QProcess >( ( QProcess * ) pObj );
#if defined(__debug__)
just_debug( " new_QProcess %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QPROCESS )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QProcess > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QProcess %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
{
@@ -133,13 +156,7 @@ hb_snprintf( str, sizeof(str), " GC: new QProcess %i B %i
pObj = ( QProcess* ) new QProcess() ;
}
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QProcess;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QProcess( pObj ) );
}
/*
* virtual void close ()
@@ -170,7 +187,7 @@ HB_FUNC( QT_QPROCESS_CLOSEWRITECHANNEL )
*/
HB_FUNC( QT_QPROCESS_ENVIRONMENT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QProcess( 1 )->environment() ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QProcess( 1 )->environment() ) ) );
}
/*
@@ -210,7 +227,7 @@ HB_FUNC( QT_QPROCESS_PROCESSCHANNELMODE )
*/
HB_FUNC( QT_QPROCESS_READALLSTANDARDERROR )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QProcess( 1 )->readAllStandardError() ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QProcess( 1 )->readAllStandardError() ) ) );
}
/*
@@ -218,7 +235,7 @@ HB_FUNC( QT_QPROCESS_READALLSTANDARDERROR )
*/
HB_FUNC( QT_QPROCESS_READALLSTANDARDOUTPUT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QProcess( 1 )->readAllStandardOutput() ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QProcess( 1 )->readAllStandardOutput() ) ) );
}
/*
@@ -390,7 +407,7 @@ HB_FUNC( QT_QPROCESS_STARTDETACHED_2 )
*/
HB_FUNC( QT_QPROCESS_SYSTEMENVIRONMENT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QProcess( 1 )->systemEnvironment() ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QProcess( 1 )->systemEnvironment() ) ) );
}
/*

74
harbour/contrib/hbqt/qtcore/QRect.cpp
View File

@@ -81,30 +81,44 @@
QT_G_FUNC( release_QRect )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QRect %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QRect p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QRect ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QRect * ) ph )->~QRect();
ph = NULL;
( ( QRect * ) p->ph )->~QRect();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QRect Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QRect %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QRect" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QRect Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QRect" );
#endif
}
}
void * gcAllocate_QRect( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QRect;
#if defined(__debug__)
just_debug( " new_QRect %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QRECT )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QRect %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
{
@@ -123,13 +137,7 @@ hb_snprintf( str, sizeof(str), " GC: new QRect %i B %i
pObj = ( QRect* ) new QRect() ;
}
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QRect;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QRect( pObj ) );
}
/*
* void adjust ( int dx1, int dy1, int dx2, int dy2 )
@@ -144,7 +152,7 @@ HB_FUNC( QT_QRECT_ADJUST )
*/
HB_FUNC( QT_QRECT_ADJUSTED )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QRect( 1 )->adjusted( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ) ), release_QRect ) );
hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->adjusted( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ) ) ) );
}
/*
@@ -160,7 +168,7 @@ HB_FUNC( QT_QRECT_BOTTOM )
*/
HB_FUNC( QT_QRECT_BOTTOMLEFT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QRect( 1 )->bottomLeft() ), release_QPoint ) );
hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QRect( 1 )->bottomLeft() ) ) );
}
/*
@@ -168,7 +176,7 @@ HB_FUNC( QT_QRECT_BOTTOMLEFT )
*/
HB_FUNC( QT_QRECT_BOTTOMRIGHT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QRect( 1 )->bottomRight() ), release_QPoint ) );
hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QRect( 1 )->bottomRight() ) ) );
}
/*
@@ -176,7 +184,7 @@ HB_FUNC( QT_QRECT_BOTTOMRIGHT )
*/
HB_FUNC( QT_QRECT_CENTER )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QRect( 1 )->center() ), release_QPoint ) );
hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QRect( 1 )->center() ) ) );
}
/*
@@ -260,7 +268,7 @@ HB_FUNC( QT_QRECT_HEIGHT )
*/
HB_FUNC( QT_QRECT_INTERSECTED )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QRect( 1 )->intersected( *hbqt_par_QRect( 2 ) ) ), release_QRect ) );
hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->intersected( *hbqt_par_QRect( 2 ) ) ) ) );
}
/*
@@ -396,7 +404,7 @@ HB_FUNC( QT_QRECT_MOVETOPRIGHT )
*/
HB_FUNC( QT_QRECT_NORMALIZED )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QRect( 1 )->normalized() ), release_QRect ) );
hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->normalized() ) ) );
}
/*
@@ -532,7 +540,7 @@ HB_FUNC( QT_QRECT_SETY )
*/
HB_FUNC( QT_QRECT_SIZE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QRect( 1 )->size() ), release_QSize ) );
hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QRect( 1 )->size() ) ) );
}
/*
@@ -548,7 +556,7 @@ HB_FUNC( QT_QRECT_TOP )
*/
HB_FUNC( QT_QRECT_TOPLEFT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QRect( 1 )->topLeft() ), release_QPoint ) );
hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QRect( 1 )->topLeft() ) ) );
}
/*
@@ -556,7 +564,7 @@ HB_FUNC( QT_QRECT_TOPLEFT )
*/
HB_FUNC( QT_QRECT_TOPRIGHT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QRect( 1 )->topRight() ), release_QPoint ) );
hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QRect( 1 )->topRight() ) ) );
}
/*
@@ -580,7 +588,7 @@ HB_FUNC( QT_QRECT_TRANSLATE_1 )
*/
HB_FUNC( QT_QRECT_TRANSLATED )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QRect( 1 )->translated( hb_parni( 2 ), hb_parni( 3 ) ) ), release_QRect ) );
hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->translated( hb_parni( 2 ), hb_parni( 3 ) ) ) ) );
}
/*
@@ -588,7 +596,7 @@ HB_FUNC( QT_QRECT_TRANSLATED )
*/
HB_FUNC( QT_QRECT_TRANSLATED_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QRect( 1 )->translated( *hbqt_par_QPoint( 2 ) ) ), release_QRect ) );
hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->translated( *hbqt_par_QPoint( 2 ) ) ) ) );
}
/*
@@ -596,7 +604,7 @@ HB_FUNC( QT_QRECT_TRANSLATED_1 )
*/
HB_FUNC( QT_QRECT_UNITED )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QRect( 1 )->united( *hbqt_par_QRect( 2 ) ) ), release_QRect ) );
hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->united( *hbqt_par_QRect( 2 ) ) ) ) );
}
/*

78
harbour/contrib/hbqt/qtcore/QRectF.cpp
View File

@@ -82,30 +82,44 @@
QT_G_FUNC( release_QRectF )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QRectF %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QRectF p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QRectF ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QRectF * ) ph )->~QRectF();
ph = NULL;
( ( QRectF * ) p->ph )->~QRectF();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QRectF Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QRectF %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QRectF" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QRectF Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QRectF" );
#endif
}
}
void * gcAllocate_QRectF( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QRectF;
#if defined(__debug__)
just_debug( " new_QRectF %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QRECTF )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QRectF %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
{
@@ -124,13 +138,7 @@ hb_snprintf( str, sizeof(str), " GC: new QRectF %i B %i
pObj = ( QRectF* ) new QRectF() ;
}
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QRectF;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QRectF( pObj ) );
}
/*
* void adjust ( qreal dx1, qreal dy1, qreal dx2, qreal dy2 )
@@ -145,7 +153,7 @@ HB_FUNC( QT_QRECTF_ADJUST )
*/
HB_FUNC( QT_QRECTF_ADJUSTED )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QRectF( 1 )->adjusted( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ) ), release_QRectF ) );
hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->adjusted( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ) ) ) );
}
/*
@@ -161,7 +169,7 @@ HB_FUNC( QT_QRECTF_BOTTOM )
*/
HB_FUNC( QT_QRECTF_BOTTOMLEFT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPointF( hbqt_par_QRectF( 1 )->bottomLeft() ), release_QPointF ) );
hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QRectF( 1 )->bottomLeft() ) ) );
}
/*
@@ -169,7 +177,7 @@ HB_FUNC( QT_QRECTF_BOTTOMLEFT )
*/
HB_FUNC( QT_QRECTF_BOTTOMRIGHT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPointF( hbqt_par_QRectF( 1 )->bottomRight() ), release_QPointF ) );
hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QRectF( 1 )->bottomRight() ) ) );
}
/*
@@ -177,7 +185,7 @@ HB_FUNC( QT_QRECTF_BOTTOMRIGHT )
*/
HB_FUNC( QT_QRECTF_CENTER )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPointF( hbqt_par_QRectF( 1 )->center() ), release_QPointF ) );
hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QRectF( 1 )->center() ) ) );
}
/*
@@ -253,7 +261,7 @@ HB_FUNC( QT_QRECTF_HEIGHT )
*/
HB_FUNC( QT_QRECTF_INTERSECTED )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QRectF( 1 )->intersected( *hbqt_par_QRectF( 2 ) ) ), release_QRectF ) );
hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->intersected( *hbqt_par_QRectF( 2 ) ) ) ) );
}
/*
@@ -389,7 +397,7 @@ HB_FUNC( QT_QRECTF_MOVETOPRIGHT )
*/
HB_FUNC( QT_QRECTF_NORMALIZED )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QRectF( 1 )->normalized() ), release_QRectF ) );
hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->normalized() ) ) );
}
/*
@@ -525,7 +533,7 @@ HB_FUNC( QT_QRECTF_SETY )
*/
HB_FUNC( QT_QRECTF_SIZE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QSizeF( hbqt_par_QRectF( 1 )->size() ), release_QSizeF ) );
hb_retptrGC( gcAllocate_QSizeF( new QSizeF( hbqt_par_QRectF( 1 )->size() ) ) );
}
/*
@@ -533,7 +541,7 @@ HB_FUNC( QT_QRECTF_SIZE )
*/
HB_FUNC( QT_QRECTF_TOALIGNEDRECT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QRectF( 1 )->toAlignedRect() ), release_QRect ) );
hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QRectF( 1 )->toAlignedRect() ) ) );
}
/*
@@ -541,7 +549,7 @@ HB_FUNC( QT_QRECTF_TOALIGNEDRECT )
*/
HB_FUNC( QT_QRECTF_TORECT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QRectF( 1 )->toRect() ), release_QRect ) );
hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QRectF( 1 )->toRect() ) ) );
}
/*
@@ -557,7 +565,7 @@ HB_FUNC( QT_QRECTF_TOP )
*/
HB_FUNC( QT_QRECTF_TOPLEFT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPointF( hbqt_par_QRectF( 1 )->topLeft() ), release_QPointF ) );
hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QRectF( 1 )->topLeft() ) ) );
}
/*
@@ -565,7 +573,7 @@ HB_FUNC( QT_QRECTF_TOPLEFT )
*/
HB_FUNC( QT_QRECTF_TOPRIGHT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPointF( hbqt_par_QRectF( 1 )->topRight() ), release_QPointF ) );
hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QRectF( 1 )->topRight() ) ) );
}
/*
@@ -589,7 +597,7 @@ HB_FUNC( QT_QRECTF_TRANSLATE_1 )
*/
HB_FUNC( QT_QRECTF_TRANSLATED )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QRectF( 1 )->translated( hb_parnd( 2 ), hb_parnd( 3 ) ) ), release_QRectF ) );
hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->translated( hb_parnd( 2 ), hb_parnd( 3 ) ) ) ) );
}
/*
@@ -597,7 +605,7 @@ HB_FUNC( QT_QRECTF_TRANSLATED )
*/
HB_FUNC( QT_QRECTF_TRANSLATED_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QRectF( 1 )->translated( *hbqt_par_QPointF( 2 ) ) ), release_QRectF ) );
hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->translated( *hbqt_par_QPointF( 2 ) ) ) ) );
}
/*
@@ -605,7 +613,7 @@ HB_FUNC( QT_QRECTF_TRANSLATED_1 )
*/
HB_FUNC( QT_QRECTF_UNITED )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QRectF( 1 )->united( *hbqt_par_QRectF( 2 ) ) ), release_QRectF ) );
hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->united( *hbqt_par_QRectF( 2 ) ) ) ) );
}
/*

52
harbour/contrib/hbqt/qtcore/QRegExp.cpp
View File

@@ -84,40 +84,48 @@
QT_G_FUNC( release_QRegExp )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QRegExp %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QRegExp p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QRegExp ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QRegExp * ) ph )->~QRegExp();
ph = NULL;
( ( QRegExp * ) p->ph )->~QRegExp();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QRegExp Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QRegExp %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QRegExp" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QRegExp Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QRegExp" );
#endif
}
}
void * gcAllocate_QRegExp( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QRegExp;
#if defined(__debug__)
just_debug( " new_QRegExp %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QREGEXP )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QRegExp %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
pObj = new QRegExp() ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QRegExp;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QRegExp( pObj ) );
}
/*
* QString cap ( int nth = 0 ) const
@@ -132,7 +140,7 @@ HB_FUNC( QT_QREGEXP_CAP )
*/
HB_FUNC( QT_QREGEXP_CAPTUREDTEXTS )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QRegExp( 1 )->capturedTexts() ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QRegExp( 1 )->capturedTexts() ) ) );
}
/*

54
harbour/contrib/hbqt/qtcore/QResource.cpp
View File

@@ -78,40 +78,48 @@
QT_G_FUNC( release_QResource )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QResource %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QResource p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QResource ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QResource * ) ph )->~QResource();
ph = NULL;
( ( QResource * ) p->ph )->~QResource();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QResource Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QResource %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QResource" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QResource Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QResource" );
#endif
}
}
void * gcAllocate_QResource( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QResource;
#if defined(__debug__)
just_debug( " new_QResource %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QRESOURCE )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QResource %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
pObj = ( QResource* ) new QResource() ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QResource;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QResource( pObj ) );
}
/*
* QString absoluteFilePath () const
@@ -158,7 +166,7 @@ HB_FUNC( QT_QRESOURCE_ISVALID )
*/
HB_FUNC( QT_QRESOURCE_LOCALE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QLocale( hbqt_par_QResource( 1 )->locale() ), release_QLocale ) );
hb_retptrGC( gcAllocate_QLocale( new QLocale( hbqt_par_QResource( 1 )->locale() ) ) );
}
/*
@@ -198,7 +206,7 @@ HB_FUNC( QT_QRESOURCE_REGISTERRESOURCE )
*/
HB_FUNC( QT_QRESOURCE_SEARCHPATHS )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QResource( 1 )->searchPaths() ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QResource( 1 )->searchPaths() ) ) );
}
/*

69
harbour/contrib/hbqt/qtcore/QSignalMapper.cpp
View File

@@ -76,52 +76,69 @@
* ~QSignalMapper ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QSignalMapper > pq;
} QGC_POINTER_QSignalMapper;
QT_G_FUNC( release_QSignalMapper )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QSignalMapper %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QSignalMapper * p = ( QGC_POINTER_QSignalMapper * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QSignalMapper p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QSignalMapper ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QSignalMapper * ) ph )->~QSignalMapper();
ph = NULL;
( ( QSignalMapper * ) p->ph )->~QSignalMapper();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QSignalMapper Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QSignalMapper %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QSignalMapper" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QSignalMapper Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QSignalMapper" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QSignalMapper" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QSignalMapper Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QSignalMapper" );
#endif
}
}
void * gcAllocate_QSignalMapper( void * pObj )
{
QGC_POINTER_QSignalMapper * p = ( QGC_POINTER_QSignalMapper * ) hb_gcAllocate( sizeof( QGC_POINTER_QSignalMapper ), gcFuncs() );
p->ph = pObj;
p->func = release_QSignalMapper;
new( & p->pq ) QPointer< QSignalMapper >( ( QSignalMapper * ) pObj );
#if defined(__debug__)
just_debug( " new_QSignalMapper %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QSIGNALMAPPER )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QSignalMapper > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QSignalMapper %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = new QSignalMapper( hbqt_par_QObject( 1 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QSignalMapper;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QSignalMapper( pObj ) );
}
/*
* QObject * mapping ( int id ) const

54
harbour/contrib/hbqt/qtcore/QSize.cpp
View File

@@ -79,30 +79,44 @@
QT_G_FUNC( release_QSize )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QSize %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QSize p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QSize ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QSize * ) ph )->~QSize();
ph = NULL;
( ( QSize * ) p->ph )->~QSize();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QSize Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QSize %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QSize" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QSize Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QSize" );
#endif
}
}
void * gcAllocate_QSize( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QSize;
#if defined(__debug__)
just_debug( " new_QSize %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QSIZE )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QSize %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) )
{
@@ -117,13 +131,7 @@ hb_snprintf( str, sizeof(str), " GC: new QSize %i B %i
pObj = ( QSize* ) new QSize() ;
}
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QSize;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QSize( pObj ) );
}
/*
* int height () const
@@ -226,7 +234,7 @@ HB_FUNC( QT_QSIZE_WIDTH )
*/
HB_FUNC( QT_QSIZE_BOUNDEDTO )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QSize( 1 )->boundedTo( *hbqt_par_QSize( 2 ) ) ), release_QSize ) );
hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QSize( 1 )->boundedTo( *hbqt_par_QSize( 2 ) ) ) ) );
}
/*
@@ -234,7 +242,7 @@ HB_FUNC( QT_QSIZE_BOUNDEDTO )
*/
HB_FUNC( QT_QSIZE_EXPANDEDTO )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QSize( 1 )->expandedTo( *hbqt_par_QSize( 2 ) ) ), release_QSize ) );
hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QSize( 1 )->expandedTo( *hbqt_par_QSize( 2 ) ) ) ) );
}

56
harbour/contrib/hbqt/qtcore/QSizeF.cpp
View File

@@ -80,30 +80,44 @@
QT_G_FUNC( release_QSizeF )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QSizeF %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QSizeF p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QSizeF ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QSizeF * ) ph )->~QSizeF();
ph = NULL;
( ( QSizeF * ) p->ph )->~QSizeF();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QSizeF Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QSizeF %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QSizeF" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QSizeF Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QSizeF" );
#endif
}
}
void * gcAllocate_QSizeF( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QSizeF;
#if defined(__debug__)
just_debug( " new_QSizeF %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QSIZEF )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QSizeF %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
if( hb_pcount() == 2 && HB_ISNUM( 1 ) && HB_ISNUM( 2 ) )
{
@@ -114,20 +128,14 @@ hb_snprintf( str, sizeof(str), " GC: new QSizeF %i B %i
pObj = ( QSizeF* ) new QSizeF() ;
}
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QSizeF;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QSizeF( pObj ) );
}
/*
* QSizeF boundedTo ( const QSizeF & otherSize ) const
*/
HB_FUNC( QT_QSIZEF_BOUNDEDTO )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QSizeF( hbqt_par_QSizeF( 1 )->boundedTo( *hbqt_par_QSizeF( 2 ) ) ), release_QSizeF ) );
hb_retptrGC( gcAllocate_QSizeF( new QSizeF( hbqt_par_QSizeF( 1 )->boundedTo( *hbqt_par_QSizeF( 2 ) ) ) ) );
}
/*
@@ -135,7 +143,7 @@ HB_FUNC( QT_QSIZEF_BOUNDEDTO )
*/
HB_FUNC( QT_QSIZEF_EXPANDEDTO )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QSizeF( hbqt_par_QSizeF( 1 )->expandedTo( *hbqt_par_QSizeF( 2 ) ) ), release_QSizeF ) );
hb_retptrGC( gcAllocate_QSizeF( new QSizeF( hbqt_par_QSizeF( 1 )->expandedTo( *hbqt_par_QSizeF( 2 ) ) ) ) );
}
/*
@@ -223,7 +231,7 @@ HB_FUNC( QT_QSIZEF_SETWIDTH )
*/
HB_FUNC( QT_QSIZEF_TOSIZE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QSizeF( 1 )->toSize() ), release_QSize ) );
hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QSizeF( 1 )->toSize() ) ) );
}
/*

54
harbour/contrib/hbqt/qtcore/QStringList.cpp
View File

@@ -98,40 +98,48 @@
QT_G_FUNC( release_QStringList )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QStringList %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QStringList p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QStringList ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QStringList * ) ph )->~QStringList();
ph = NULL;
( ( QStringList * ) p->ph )->~QStringList();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QStringList Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QStringList %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QStringList" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QStringList Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QStringList" );
#endif
}
}
void * gcAllocate_QStringList( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QStringList;
#if defined(__debug__)
just_debug( " new_QStringList %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QSTRINGLIST )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QStringList %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
pObj = ( QStringList* ) new QStringList() ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QStringList;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QStringList( pObj ) );
}
/*
* void append ( const QString & value )
@@ -146,7 +154,7 @@ HB_FUNC( QT_QSTRINGLIST_APPEND )
*/
HB_FUNC( QT_QSTRINGLIST_FILTER )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QStringList( 1 )->filter( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::CaseSensitivity ) hb_parni( 3 ) : ( Qt::CaseSensitivity ) Qt::CaseSensitive ) ) ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QStringList( 1 )->filter( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::CaseSensitivity ) hb_parni( 3 ) : ( Qt::CaseSensitivity ) Qt::CaseSensitive ) ) ) ) );
}
/*
@@ -154,7 +162,7 @@ HB_FUNC( QT_QSTRINGLIST_FILTER )
*/
HB_FUNC( QT_QSTRINGLIST_FILTER_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QStringList( 1 )->filter( *hbqt_par_QRegExp( 2 ) ) ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QStringList( 1 )->filter( *hbqt_par_QRegExp( 2 ) ) ) ) );
}
/*

50
harbour/contrib/hbqt/qtcore/QTextBoundaryFinder.cpp
View File

@@ -87,40 +87,48 @@
QT_G_FUNC( release_QTextBoundaryFinder )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QTextBoundaryFinder %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QTextBoundaryFinder p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QTextBoundaryFinder ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QTextBoundaryFinder * ) ph )->~QTextBoundaryFinder();
ph = NULL;
( ( QTextBoundaryFinder * ) p->ph )->~QTextBoundaryFinder();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QTextBoundaryFinder Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QTextBoundaryFinder %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QTextBoundaryFinder" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QTextBoundaryFinder Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QTextBoundaryFinder" );
#endif
}
}
void * gcAllocate_QTextBoundaryFinder( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QTextBoundaryFinder;
#if defined(__debug__)
just_debug( " new_QTextBoundaryFinder %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QTEXTBOUNDARYFINDER )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QTextBoundaryFinder %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
pObj = ( QTextBoundaryFinder* ) new QTextBoundaryFinder() ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QTextBoundaryFinder;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QTextBoundaryFinder( pObj ) );
}
/*
* BoundaryReasons boundaryReasons () const

4
harbour/contrib/hbqt/qtcore/QTextCodec.cpp
View File

@@ -124,7 +124,7 @@ HB_FUNC( QT_QTEXTCODEC_CANENCODE_1 )
*/
HB_FUNC( QT_QTEXTCODEC_FROMUNICODE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QTextCodec( 1 )->fromUnicode( hbqt_par_QString( 2 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QTextCodec( 1 )->fromUnicode( hbqt_par_QString( 2 ) ) ) ) );
}
/*
@@ -156,7 +156,7 @@ HB_FUNC( QT_QTEXTCODEC_MIBENUM )
*/
HB_FUNC( QT_QTEXTCODEC_NAME )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QTextCodec( 1 )->name() ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QTextCodec( 1 )->name() ) ) );
}
/*

50
harbour/contrib/hbqt/qtcore/QTextDecoder.cpp
View File

@@ -78,40 +78,48 @@
QT_G_FUNC( release_QTextDecoder )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QTextDecoder %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QTextDecoder p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QTextDecoder ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QTextDecoder * ) ph )->~QTextDecoder();
ph = NULL;
( ( QTextDecoder * ) p->ph )->~QTextDecoder();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QTextDecoder Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QTextDecoder %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QTextDecoder" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QTextDecoder Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QTextDecoder" );
#endif
}
}
void * gcAllocate_QTextDecoder( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QTextDecoder;
#if defined(__debug__)
just_debug( " new_QTextDecoder %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QTEXTDECODER )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QTextDecoder %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
pObj = ( QTextDecoder* ) new QTextDecoder( hbqt_par_QTextCodec( 1 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QTextDecoder;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QTextDecoder( pObj ) );
}
/*
* QString toUnicode ( const char * chars, int len )

52
harbour/contrib/hbqt/qtcore/QTextEncoder.cpp
View File

@@ -78,47 +78,55 @@
QT_G_FUNC( release_QTextEncoder )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QTextEncoder %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QTextEncoder p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QTextEncoder ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QTextEncoder * ) ph )->~QTextEncoder();
ph = NULL;
( ( QTextEncoder * ) p->ph )->~QTextEncoder();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QTextEncoder Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QTextEncoder %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QTextEncoder" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QTextEncoder Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QTextEncoder" );
#endif
}
}
void * gcAllocate_QTextEncoder( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QTextEncoder;
#if defined(__debug__)
just_debug( " new_QTextEncoder %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QTEXTENCODER )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QTextEncoder %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
pObj = ( QTextEncoder* ) new QTextEncoder( hbqt_par_QTextCodec( 1 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QTextEncoder;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QTextEncoder( pObj ) );
}
/*
* QByteArray fromUnicode ( const QString & str )
*/
HB_FUNC( QT_QTEXTENCODER_FROMUNICODE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QTextEncoder( 1 )->fromUnicode( hbqt_par_QString( 2 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QTextEncoder( 1 )->fromUnicode( hbqt_par_QString( 2 ) ) ) ) );
}

52
harbour/contrib/hbqt/qtcore/QTextStream.cpp
View File

@@ -98,40 +98,48 @@ HB_FUNC( QT_QTEXTSTREAM_PADCHAR )
QT_G_FUNC( release_QTextStream )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QTextStream %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QTextStream p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QTextStream ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QTextStream * ) ph )->~QTextStream();
ph = NULL;
( ( QTextStream * ) p->ph )->~QTextStream();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QTextStream Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QTextStream %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QTextStream" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QTextStream Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QTextStream" );
#endif
}
}
void * gcAllocate_QTextStream( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QTextStream;
#if defined(__debug__)
just_debug( " new_QTextStream %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QTEXTSTREAM )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QTextStream %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
pObj = new QTextStream( hb_parcx( 1 ), ( QIODevice::OpenMode ) ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : QIODevice::ReadWrite ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QTextStream;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QTextStream( pObj ) );
}
/*
* bool atEnd () const
@@ -210,7 +218,7 @@ HB_FUNC( QT_QTEXTSTREAM_INTEGERBASE )
*/
HB_FUNC( QT_QTEXTSTREAM_LOCALE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QLocale( hbqt_par_QTextStream( 1 )->locale() ), release_QLocale ) );
hb_retptrGC( gcAllocate_QLocale( new QLocale( hbqt_par_QTextStream( 1 )->locale() ) ) );
}
/*

69
harbour/contrib/hbqt/qtcore/QThread.cpp
View File

@@ -79,52 +79,69 @@
* ~QThread ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QThread > pq;
} QGC_POINTER_QThread;
QT_G_FUNC( release_QThread )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QThread %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QThread * p = ( QGC_POINTER_QThread * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QThread p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QThread ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QThread * ) ph )->~QThread();
ph = NULL;
( ( QThread * ) p->ph )->~QThread();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QThread Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QThread %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QThread" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QThread Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QThread" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QThread" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QThread Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QThread" );
#endif
}
}
void * gcAllocate_QThread( void * pObj )
{
QGC_POINTER_QThread * p = ( QGC_POINTER_QThread * ) hb_gcAllocate( sizeof( QGC_POINTER_QThread ), gcFuncs() );
p->ph = pObj;
p->func = release_QThread;
new( & p->pq ) QPointer< QThread >( ( QThread * ) pObj );
#if defined(__debug__)
just_debug( " new_QThread %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QTHREAD )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QThread > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QThread %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = new QThread() ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QThread;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QThread( pObj ) );
}
/*
* void exit ( int returnCode = 0 )

60
harbour/contrib/hbqt/qtcore/QTime.cpp
View File

@@ -77,47 +77,55 @@
QT_G_FUNC( release_QTime )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QTime %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QTime p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QTime ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QTime * ) ph )->~QTime();
ph = NULL;
( ( QTime * ) p->ph )->~QTime();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QTime Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QTime %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QTime" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QTime Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QTime" );
#endif
}
}
void * gcAllocate_QTime( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QTime;
#if defined(__debug__)
just_debug( " new_QTime %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QTIME )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QTime %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
pObj = new QTime() ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QTime;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QTime( pObj ) );
}
/*
* QTime addMSecs ( int ms ) const
*/
HB_FUNC( QT_QTIME_ADDMSECS )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QTime( hbqt_par_QTime( 1 )->addMSecs( hb_parni( 2 ) ) ), release_QTime ) );
hb_retptrGC( gcAllocate_QTime( new QTime( hbqt_par_QTime( 1 )->addMSecs( hb_parni( 2 ) ) ) ) );
}
/*
@@ -125,7 +133,7 @@ HB_FUNC( QT_QTIME_ADDMSECS )
*/
HB_FUNC( QT_QTIME_ADDSECS )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QTime( hbqt_par_QTime( 1 )->addSecs( hb_parni( 2 ) ) ), release_QTime ) );
hb_retptrGC( gcAllocate_QTime( new QTime( hbqt_par_QTime( 1 )->addSecs( hb_parni( 2 ) ) ) ) );
}
/*
@@ -245,7 +253,7 @@ HB_FUNC( QT_QTIME_TOSTRING_1 )
*/
HB_FUNC( QT_QTIME_CURRENTTIME )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QTime( hbqt_par_QTime( 1 )->currentTime() ), release_QTime ) );
hb_retptrGC( gcAllocate_QTime( new QTime( hbqt_par_QTime( 1 )->currentTime() ) ) );
}
/*
@@ -253,7 +261,7 @@ HB_FUNC( QT_QTIME_CURRENTTIME )
*/
HB_FUNC( QT_QTIME_FROMSTRING )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QTime( hbqt_par_QTime( 1 )->fromString( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::DateFormat ) hb_parni( 3 ) : ( Qt::DateFormat ) Qt::TextDate ) ) ), release_QTime ) );
hb_retptrGC( gcAllocate_QTime( new QTime( hbqt_par_QTime( 1 )->fromString( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::DateFormat ) hb_parni( 3 ) : ( Qt::DateFormat ) Qt::TextDate ) ) ) ) );
}
/*
@@ -261,7 +269,7 @@ HB_FUNC( QT_QTIME_FROMSTRING )
*/
HB_FUNC( QT_QTIME_FROMSTRING_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QTime( hbqt_par_QTime( 1 )->fromString( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ), release_QTime ) );
hb_retptrGC( gcAllocate_QTime( new QTime( hbqt_par_QTime( 1 )->fromString( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ) ) );
}
/*

69
harbour/contrib/hbqt/qtcore/QTimer.cpp
View File

@@ -76,52 +76,69 @@
* ~QTimer ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QTimer > pq;
} QGC_POINTER_QTimer;
QT_G_FUNC( release_QTimer )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QTimer %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QTimer * p = ( QGC_POINTER_QTimer * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QTimer p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QTimer ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QTimer * ) ph )->~QTimer();
ph = NULL;
( ( QTimer * ) p->ph )->~QTimer();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QTimer Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QTimer %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QTimer" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QTimer Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QTimer" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QTimer" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QTimer Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QTimer" );
#endif
}
}
void * gcAllocate_QTimer( void * pObj )
{
QGC_POINTER_QTimer * p = ( QGC_POINTER_QTimer * ) hb_gcAllocate( sizeof( QGC_POINTER_QTimer ), gcFuncs() );
p->ph = pObj;
p->func = release_QTimer;
new( & p->pq ) QPointer< QTimer >( ( QTimer * ) pObj );
#if defined(__debug__)
just_debug( " new_QTimer %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QTIMER )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QTimer > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QTimer %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = new QTimer( hbqt_par_QObject( 1 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QTimer;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QTimer( pObj ) );
}
/*
* int interval () const

69
harbour/contrib/hbqt/qtcore/QTranslator.cpp
View File

@@ -75,52 +75,69 @@
* ~QTranslator ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QTranslator > pq;
} QGC_POINTER_QTranslator;
QT_G_FUNC( release_QTranslator )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QTranslator %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QTranslator * p = ( QGC_POINTER_QTranslator * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QTranslator p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QTranslator ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QTranslator * ) ph )->~QTranslator();
ph = NULL;
( ( QTranslator * ) p->ph )->~QTranslator();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QTranslator Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QTranslator %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QTranslator" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QTranslator Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QTranslator" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QTranslator" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QTranslator Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QTranslator" );
#endif
}
}
void * gcAllocate_QTranslator( void * pObj )
{
QGC_POINTER_QTranslator * p = ( QGC_POINTER_QTranslator * ) hb_gcAllocate( sizeof( QGC_POINTER_QTranslator ), gcFuncs() );
p->ph = pObj;
p->func = release_QTranslator;
new( & p->pq ) QPointer< QTranslator >( ( QTranslator * ) pObj );
#if defined(__debug__)
just_debug( " new_QTranslator %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QTRANSLATOR )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QTranslator > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QTranslator %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = new QTranslator() ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QTranslator;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QTranslator( pObj ) );
}
/*
* virtual bool isEmpty () const

82
harbour/contrib/hbqt/qtcore/QUrl.cpp
View File

@@ -112,40 +112,48 @@ HB_FUNC( QT_QURL_SETQUERYDELIMITERS )
QT_G_FUNC( release_QUrl )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QUrl %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QUrl p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QUrl ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QUrl * ) ph )->~QUrl();
ph = NULL;
( ( QUrl * ) p->ph )->~QUrl();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QUrl Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QUrl %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QUrl" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QUrl Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QUrl" );
#endif
}
}
void * gcAllocate_QUrl( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QUrl;
#if defined(__debug__)
just_debug( " new_QUrl %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QURL )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QUrl %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
pObj = new QUrl( hbqt_par_QString( 1 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QUrl;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QUrl( pObj ) );
}
/*
* void addEncodedQueryItem ( const QByteArray & key, const QByteArray & value )
@@ -168,7 +176,7 @@ HB_FUNC( QT_QURL_ADDQUERYITEM )
*/
HB_FUNC( QT_QURL_ALLQUERYITEMVALUES )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QUrl( 1 )->allQueryItemValues( hbqt_par_QString( 2 ) ) ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QUrl( 1 )->allQueryItemValues( hbqt_par_QString( 2 ) ) ) ) );
}
/*
@@ -192,7 +200,7 @@ HB_FUNC( QT_QURL_CLEAR )
*/
HB_FUNC( QT_QURL_ENCODEDFRAGMENT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QUrl( 1 )->encodedFragment() ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedFragment() ) ) );
}
/*
@@ -200,7 +208,7 @@ HB_FUNC( QT_QURL_ENCODEDFRAGMENT )
*/
HB_FUNC( QT_QURL_ENCODEDHOST )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QUrl( 1 )->encodedHost() ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedHost() ) ) );
}
/*
@@ -208,7 +216,7 @@ HB_FUNC( QT_QURL_ENCODEDHOST )
*/
HB_FUNC( QT_QURL_ENCODEDPASSWORD )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QUrl( 1 )->encodedPassword() ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedPassword() ) ) );
}
/*
@@ -216,7 +224,7 @@ HB_FUNC( QT_QURL_ENCODEDPASSWORD )
*/
HB_FUNC( QT_QURL_ENCODEDPATH )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QUrl( 1 )->encodedPath() ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedPath() ) ) );
}
/*
@@ -224,7 +232,7 @@ HB_FUNC( QT_QURL_ENCODEDPATH )
*/
HB_FUNC( QT_QURL_ENCODEDQUERY )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QUrl( 1 )->encodedQuery() ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedQuery() ) ) );
}
/*
@@ -232,7 +240,7 @@ HB_FUNC( QT_QURL_ENCODEDQUERY )
*/
HB_FUNC( QT_QURL_ENCODEDQUERYITEMVALUE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QUrl( 1 )->encodedQueryItemValue( *hbqt_par_QByteArray( 2 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedQueryItemValue( *hbqt_par_QByteArray( 2 ) ) ) ) );
}
/*
@@ -240,7 +248,7 @@ HB_FUNC( QT_QURL_ENCODEDQUERYITEMVALUE )
*/
HB_FUNC( QT_QURL_ENCODEDUSERNAME )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QUrl( 1 )->encodedUserName() ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedUserName() ) ) );
}
/*
@@ -424,7 +432,7 @@ HB_FUNC( QT_QURL_REMOVEQUERYITEM )
*/
HB_FUNC( QT_QURL_RESOLVED )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QUrl( hbqt_par_QUrl( 1 )->resolved( *hbqt_par_QUrl( 2 ) ) ), release_QUrl ) );
hb_retptrGC( gcAllocate_QUrl( new QUrl( hbqt_par_QUrl( 1 )->resolved( *hbqt_par_QUrl( 2 ) ) ) ) );
}
/*
@@ -592,7 +600,7 @@ HB_FUNC( QT_QURL_SETUSERNAME )
*/
HB_FUNC( QT_QURL_TOENCODED )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QUrl( 1 )->toEncoded( ( HB_ISNUM( 2 ) ? ( QUrl::FormattingOptions ) hb_parni( 2 ) : ( QUrl::FormattingOptions ) QUrl::None ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->toEncoded( ( HB_ISNUM( 2 ) ? ( QUrl::FormattingOptions ) hb_parni( 2 ) : ( QUrl::FormattingOptions ) QUrl::None ) ) ) ) );
}
/*
@@ -640,7 +648,7 @@ HB_FUNC( QT_QURL_FROMACE )
*/
HB_FUNC( QT_QURL_FROMENCODED )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QUrl( hbqt_par_QUrl( 1 )->fromEncoded( *hbqt_par_QByteArray( 2 ) ) ), release_QUrl ) );
hb_retptrGC( gcAllocate_QUrl( new QUrl( hbqt_par_QUrl( 1 )->fromEncoded( *hbqt_par_QByteArray( 2 ) ) ) ) );
}
/*
@@ -648,7 +656,7 @@ HB_FUNC( QT_QURL_FROMENCODED )
*/
HB_FUNC( QT_QURL_FROMENCODED_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QUrl( hbqt_par_QUrl( 1 )->fromEncoded( *hbqt_par_QByteArray( 2 ), ( QUrl::ParsingMode ) hb_parni( 3 ) ) ), release_QUrl ) );
hb_retptrGC( gcAllocate_QUrl( new QUrl( hbqt_par_QUrl( 1 )->fromEncoded( *hbqt_par_QByteArray( 2 ), ( QUrl::ParsingMode ) hb_parni( 3 ) ) ) ) );
}
/*
@@ -656,7 +664,7 @@ HB_FUNC( QT_QURL_FROMENCODED_1 )
*/
HB_FUNC( QT_QURL_FROMLOCALFILE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QUrl( hbqt_par_QUrl( 1 )->fromLocalFile( hbqt_par_QString( 2 ) ) ), release_QUrl ) );
hb_retptrGC( gcAllocate_QUrl( new QUrl( hbqt_par_QUrl( 1 )->fromLocalFile( hbqt_par_QString( 2 ) ) ) ) );
}
/*
@@ -672,7 +680,7 @@ HB_FUNC( QT_QURL_FROMPERCENTENCODING )
*/
HB_FUNC( QT_QURL_IDNWHITELIST )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QUrl( 1 )->idnWhitelist() ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QUrl( 1 )->idnWhitelist() ) ) );
}
/*
@@ -688,7 +696,7 @@ HB_FUNC( QT_QURL_SETIDNWHITELIST )
*/
HB_FUNC( QT_QURL_TOACE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QUrl( 1 )->toAce( hbqt_par_QString( 2 ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->toAce( hbqt_par_QString( 2 ) ) ) ) );
}
/*
@@ -696,7 +704,7 @@ HB_FUNC( QT_QURL_TOACE )
*/
HB_FUNC( QT_QURL_TOPERCENTENCODING )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QUrl( 1 )->toPercentEncoding( hbqt_par_QString( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QByteArray( 3 ) : QByteArray() ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QByteArray( 4 ) : QByteArray() ) ) ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->toPercentEncoding( hbqt_par_QString( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QByteArray( 3 ) : QByteArray() ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QByteArray( 4 ) : QByteArray() ) ) ) ) );
}

86
harbour/contrib/hbqt/qtcore/QVariant.cpp
View File

@@ -141,40 +141,48 @@ QVariant ( const QRegExp & regExp )
QT_G_FUNC( release_QVariant )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QVariant %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QVariant p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QVariant ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QVariant * ) ph )->~QVariant();
ph = NULL;
( ( QVariant * ) p->ph )->~QVariant();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QVariant Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QVariant %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QVariant" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QVariant Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QVariant" );
#endif
}
}
void * gcAllocate_QVariant( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QVariant;
#if defined(__debug__)
just_debug( " new_QVariant %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QVARIANT )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QVariant %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
pObj = ( QVariant* ) new QVariant() ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QVariant;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QVariant( pObj ) );
}
/*
* bool canConvert ( Type t ) const
@@ -237,7 +245,7 @@ HB_FUNC( QT_QVARIANT_SETVALUE )
*/
HB_FUNC( QT_QVARIANT_TOBITARRAY )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QBitArray( hbqt_par_QVariant( 1 )->toBitArray() ), release_QBitArray ) );
hb_retptrGC( gcAllocate_QBitArray( new QBitArray( hbqt_par_QVariant( 1 )->toBitArray() ) ) );
}
/*
@@ -253,7 +261,7 @@ HB_FUNC( QT_QVARIANT_TOBOOL )
*/
HB_FUNC( QT_QVARIANT_TOBYTEARRAY )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QVariant( 1 )->toByteArray() ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QVariant( 1 )->toByteArray() ) ) );
}
/*
@@ -261,7 +269,7 @@ HB_FUNC( QT_QVARIANT_TOBYTEARRAY )
*/
HB_FUNC( QT_QVARIANT_TODATE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDate( hbqt_par_QVariant( 1 )->toDate() ), release_QDate ) );
hb_retptrGC( gcAllocate_QDate( new QDate( hbqt_par_QVariant( 1 )->toDate() ) ) );
}
/*
@@ -269,7 +277,7 @@ HB_FUNC( QT_QVARIANT_TODATE )
*/
HB_FUNC( QT_QVARIANT_TODATETIME )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QVariant( 1 )->toDateTime() ), release_QDateTime ) );
hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QVariant( 1 )->toDateTime() ) ) );
}
/*
@@ -301,7 +309,7 @@ HB_FUNC( QT_QVARIANT_TOINT )
*/
HB_FUNC( QT_QVARIANT_TOLINE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QLine( hbqt_par_QVariant( 1 )->toLine() ), release_QLine ) );
hb_retptrGC( gcAllocate_QLine( new QLine( hbqt_par_QVariant( 1 )->toLine() ) ) );
}
/*
@@ -309,7 +317,7 @@ HB_FUNC( QT_QVARIANT_TOLINE )
*/
HB_FUNC( QT_QVARIANT_TOLINEF )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QLineF( hbqt_par_QVariant( 1 )->toLineF() ), release_QLineF ) );
hb_retptrGC( gcAllocate_QLineF( new QLineF( hbqt_par_QVariant( 1 )->toLineF() ) ) );
}
/*
@@ -317,7 +325,7 @@ HB_FUNC( QT_QVARIANT_TOLINEF )
*/
HB_FUNC( QT_QVARIANT_TOLOCALE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QLocale( hbqt_par_QVariant( 1 )->toLocale() ), release_QLocale ) );
hb_retptrGC( gcAllocate_QLocale( new QLocale( hbqt_par_QVariant( 1 )->toLocale() ) ) );
}
/*
@@ -337,7 +345,7 @@ HB_FUNC( QT_QVARIANT_TOLONGLONG )
*/
HB_FUNC( QT_QVARIANT_TOPOINT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QVariant( 1 )->toPoint() ), release_QPoint ) );
hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QVariant( 1 )->toPoint() ) ) );
}
/*
@@ -345,7 +353,7 @@ HB_FUNC( QT_QVARIANT_TOPOINT )
*/
HB_FUNC( QT_QVARIANT_TOPOINTF )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPointF( hbqt_par_QVariant( 1 )->toPointF() ), release_QPointF ) );
hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QVariant( 1 )->toPointF() ) ) );
}
/*
@@ -353,7 +361,7 @@ HB_FUNC( QT_QVARIANT_TOPOINTF )
*/
HB_FUNC( QT_QVARIANT_TORECT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QVariant( 1 )->toRect() ), release_QRect ) );
hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QVariant( 1 )->toRect() ) ) );
}
/*
@@ -361,7 +369,7 @@ HB_FUNC( QT_QVARIANT_TORECT )
*/
HB_FUNC( QT_QVARIANT_TORECTF )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QVariant( 1 )->toRectF() ), release_QRectF ) );
hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QVariant( 1 )->toRectF() ) ) );
}
/*
@@ -369,7 +377,7 @@ HB_FUNC( QT_QVARIANT_TORECTF )
*/
HB_FUNC( QT_QVARIANT_TOREGEXP )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRegExp( hbqt_par_QVariant( 1 )->toRegExp() ), release_QRegExp ) );
hb_retptrGC( gcAllocate_QRegExp( new QRegExp( hbqt_par_QVariant( 1 )->toRegExp() ) ) );
}
/*
@@ -377,7 +385,7 @@ HB_FUNC( QT_QVARIANT_TOREGEXP )
*/
HB_FUNC( QT_QVARIANT_TOSIZE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QVariant( 1 )->toSize() ), release_QSize ) );
hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QVariant( 1 )->toSize() ) ) );
}
/*
@@ -385,7 +393,7 @@ HB_FUNC( QT_QVARIANT_TOSIZE )
*/
HB_FUNC( QT_QVARIANT_TOSIZEF )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QSizeF( hbqt_par_QVariant( 1 )->toSizeF() ), release_QSizeF ) );
hb_retptrGC( gcAllocate_QSizeF( new QSizeF( hbqt_par_QVariant( 1 )->toSizeF() ) ) );
}
/*
@@ -401,7 +409,7 @@ HB_FUNC( QT_QVARIANT_TOSTRING )
*/
HB_FUNC( QT_QVARIANT_TOSTRINGLIST )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QVariant( 1 )->toStringList() ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QVariant( 1 )->toStringList() ) ) );
}
/*
@@ -409,7 +417,7 @@ HB_FUNC( QT_QVARIANT_TOSTRINGLIST )
*/
HB_FUNC( QT_QVARIANT_TOTIME )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QTime( hbqt_par_QVariant( 1 )->toTime() ), release_QTime ) );
hb_retptrGC( gcAllocate_QTime( new QTime( hbqt_par_QVariant( 1 )->toTime() ) ) );
}
/*
@@ -441,7 +449,7 @@ HB_FUNC( QT_QVARIANT_TOULONGLONG )
*/
HB_FUNC( QT_QVARIANT_TOURL )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QUrl( hbqt_par_QVariant( 1 )->toUrl() ), release_QUrl ) );
hb_retptrGC( gcAllocate_QUrl( new QUrl( hbqt_par_QVariant( 1 )->toUrl() ) ) );
}
/*
@@ -465,7 +473,7 @@ HB_FUNC( QT_QVARIANT_USERTYPE )
*/
HB_FUNC( QT_QVARIANT_FROMVALUE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QVariant( 1 )->fromValue( hb_param( 2, HB_IT_ANY ) ) ), release_QVariant ) );
hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QVariant( 1 )->fromValue( hb_param( 2, HB_IT_ANY ) ) ) ) );
}
/*

32
harbour/contrib/hbqt/qtgui/QAbstractButton.cpp
View File

@@ -78,31 +78,7 @@
QT_G_FUNC( release_QAbstractButton )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QAbstractButton %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QAbstractButton * ) ph )->~QAbstractButton();
ph = NULL;
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QAbstractButton" ); OutputDebugString( str );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QAbstractButton" ); OutputDebugString( str );
#endif
}
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QABSTRACTBUTTON )
@@ -153,7 +129,7 @@ HB_FUNC( QT_QABSTRACTBUTTON_GROUP )
*/
HB_FUNC( QT_QABSTRACTBUTTON_ICON )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QAbstractButton( 1 )->icon() ), release_QIcon ) );
hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QAbstractButton( 1 )->icon() ) ) );
}
/*
@@ -161,7 +137,7 @@ HB_FUNC( QT_QABSTRACTBUTTON_ICON )
*/
HB_FUNC( QT_QABSTRACTBUTTON_ICONSIZE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QAbstractButton( 1 )->iconSize() ), release_QSize ) );
hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QAbstractButton( 1 )->iconSize() ) ) );
}
/*
@@ -265,7 +241,7 @@ HB_FUNC( QT_QABSTRACTBUTTON_SETTEXT )
*/
HB_FUNC( QT_QABSTRACTBUTTON_SHORTCUT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QKeySequence( hbqt_par_QAbstractButton( 1 )->shortcut() ), release_QKeySequence ) );
hb_retptrGC( gcAllocate_QKeySequence( new QKeySequence( hbqt_par_QAbstractButton( 1 )->shortcut() ) ) );
}
/*

2
harbour/contrib/hbqt/qtgui/QAbstractItemDelegate.cpp
View File

@@ -132,7 +132,7 @@ HB_FUNC( QT_QABSTRACTITEMDELEGATE_SETMODELDATA )
*/
HB_FUNC( QT_QABSTRACTITEMDELEGATE_SIZEHINT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QAbstractItemDelegate( 1 )->sizeHint( *hbqt_par_QStyleOptionViewItem( 2 ), *hbqt_par_QModelIndex( 3 ) ) ), release_QSize ) );
hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QAbstractItemDelegate( 1 )->sizeHint( *hbqt_par_QStyleOptionViewItem( 2 ), *hbqt_par_QModelIndex( 3 ) ) ) ) );
}
/*

38
harbour/contrib/hbqt/qtgui/QAbstractItemView.cpp
View File

@@ -88,31 +88,7 @@
QT_G_FUNC( release_QAbstractItemView )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QAbstractItemView %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QAbstractItemView * ) ph )->~QAbstractItemView();
ph = NULL;
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QAbstractItemView" ); OutputDebugString( str );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QAbstractItemView" ); OutputDebugString( str );
#endif
}
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QABSTRACTITEMVIEW )
@@ -147,7 +123,7 @@ HB_FUNC( QT_QABSTRACTITEMVIEW_CLOSEPERSISTENTEDITOR )
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_CURRENTINDEX )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QAbstractItemView( 1 )->currentIndex() ), release_QModelIndex ) );
hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemView( 1 )->currentIndex() ) ) );
}
/*
@@ -203,7 +179,7 @@ HB_FUNC( QT_QABSTRACTITEMVIEW_HORIZONTALSCROLLMODE )
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_ICONSIZE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QAbstractItemView( 1 )->iconSize() ), release_QSize ) );
hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QAbstractItemView( 1 )->iconSize() ) ) );
}
/*
@@ -211,7 +187,7 @@ HB_FUNC( QT_QABSTRACTITEMVIEW_ICONSIZE )
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_INDEXAT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QAbstractItemView( 1 )->indexAt( *hbqt_par_QPoint( 2 ) ) ), release_QModelIndex ) );
hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemView( 1 )->indexAt( *hbqt_par_QPoint( 2 ) ) ) ) );
}
/*
@@ -283,7 +259,7 @@ HB_FUNC( QT_QABSTRACTITEMVIEW_OPENPERSISTENTEDITOR )
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_ROOTINDEX )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QAbstractItemView( 1 )->rootIndex() ), release_QModelIndex ) );
hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemView( 1 )->rootIndex() ) ) );
}
/*
@@ -507,7 +483,7 @@ HB_FUNC( QT_QABSTRACTITEMVIEW_SIZEHINTFORCOLUMN )
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_SIZEHINTFORINDEX )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QAbstractItemView( 1 )->sizeHintForIndex( *hbqt_par_QModelIndex( 2 ) ) ), release_QSize ) );
hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QAbstractItemView( 1 )->sizeHintForIndex( *hbqt_par_QModelIndex( 2 ) ) ) ) );
}
/*
@@ -547,7 +523,7 @@ HB_FUNC( QT_QABSTRACTITEMVIEW_VERTICALSCROLLMODE )
*/
HB_FUNC( QT_QABSTRACTITEMVIEW_VISUALRECT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QAbstractItemView( 1 )->visualRect( *hbqt_par_QModelIndex( 2 ) ) ), release_QRect ) );
hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QAbstractItemView( 1 )->visualRect( *hbqt_par_QModelIndex( 2 ) ) ) ) );
}
/*

26
harbour/contrib/hbqt/qtgui/QAbstractPrintDialog.cpp
View File

@@ -92,31 +92,7 @@
QT_G_FUNC( release_QAbstractPrintDialog )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QAbstractPrintDialog %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QAbstractPrintDialog * ) ph )->~QAbstractPrintDialog();
ph = NULL;
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QAbstractPrintDialog" ); OutputDebugString( str );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QAbstractPrintDialog" ); OutputDebugString( str );
#endif
}
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QABSTRACTPRINTDIALOG )

34
harbour/contrib/hbqt/qtgui/QAbstractProxyModel.cpp
View File

@@ -77,31 +77,7 @@
QT_G_FUNC( release_QAbstractProxyModel )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QAbstractProxyModel %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QAbstractProxyModel * ) ph )->~QAbstractProxyModel();
ph = NULL;
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QAbstractProxyModel" ); OutputDebugString( str );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QAbstractProxyModel" ); OutputDebugString( str );
#endif
}
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QABSTRACTPROXYMODEL )
@@ -112,7 +88,7 @@ HB_FUNC( QT_QABSTRACTPROXYMODEL )
*/
HB_FUNC( QT_QABSTRACTPROXYMODEL_MAPFROMSOURCE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QAbstractProxyModel( 1 )->mapFromSource( *hbqt_par_QModelIndex( 2 ) ) ), release_QModelIndex ) );
hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractProxyModel( 1 )->mapFromSource( *hbqt_par_QModelIndex( 2 ) ) ) ) );
}
/*
@@ -120,7 +96,7 @@ HB_FUNC( QT_QABSTRACTPROXYMODEL_MAPFROMSOURCE )
*/
HB_FUNC( QT_QABSTRACTPROXYMODEL_MAPSELECTIONFROMSOURCE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QItemSelection( hbqt_par_QAbstractProxyModel( 1 )->mapSelectionFromSource( *hbqt_par_QItemSelection( 2 ) ) ), release_QItemSelection ) );
hb_retptrGC( gcAllocate_QItemSelection( new QItemSelection( hbqt_par_QAbstractProxyModel( 1 )->mapSelectionFromSource( *hbqt_par_QItemSelection( 2 ) ) ) ) );
}
/*
@@ -128,7 +104,7 @@ HB_FUNC( QT_QABSTRACTPROXYMODEL_MAPSELECTIONFROMSOURCE )
*/
HB_FUNC( QT_QABSTRACTPROXYMODEL_MAPSELECTIONTOSOURCE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QItemSelection( hbqt_par_QAbstractProxyModel( 1 )->mapSelectionToSource( *hbqt_par_QItemSelection( 2 ) ) ), release_QItemSelection ) );
hb_retptrGC( gcAllocate_QItemSelection( new QItemSelection( hbqt_par_QAbstractProxyModel( 1 )->mapSelectionToSource( *hbqt_par_QItemSelection( 2 ) ) ) ) );
}
/*
@@ -136,7 +112,7 @@ HB_FUNC( QT_QABSTRACTPROXYMODEL_MAPSELECTIONTOSOURCE )
*/
HB_FUNC( QT_QABSTRACTPROXYMODEL_MAPTOSOURCE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QAbstractProxyModel( 1 )->mapToSource( *hbqt_par_QModelIndex( 2 ) ) ), release_QModelIndex ) );
hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractProxyModel( 1 )->mapToSource( *hbqt_par_QModelIndex( 2 ) ) ) ) );
}
/*

28
harbour/contrib/hbqt/qtgui/QAbstractScrollArea.cpp
View File

@@ -78,31 +78,7 @@
QT_G_FUNC( release_QAbstractScrollArea )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QAbstractScrollArea %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QAbstractScrollArea * ) ph )->~QAbstractScrollArea();
ph = NULL;
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QAbstractScrollArea" ); OutputDebugString( str );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QAbstractScrollArea" ); OutputDebugString( str );
#endif
}
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QABSTRACTSCROLLAREA )
@@ -145,7 +121,7 @@ HB_FUNC( QT_QABSTRACTSCROLLAREA_HORIZONTALSCROLLBARPOLICY )
*/
HB_FUNC( QT_QABSTRACTSCROLLAREA_MAXIMUMVIEWPORTSIZE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QAbstractScrollArea( 1 )->maximumViewportSize() ), release_QSize ) );
hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QAbstractScrollArea( 1 )->maximumViewportSize() ) ) );
}
/*

26
harbour/contrib/hbqt/qtgui/QAbstractSlider.cpp
View File

@@ -82,31 +82,7 @@
QT_G_FUNC( release_QAbstractSlider )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QAbstractSlider %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QAbstractSlider * ) ph )->~QAbstractSlider();
ph = NULL;
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QAbstractSlider" ); OutputDebugString( str );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QAbstractSlider" ); OutputDebugString( str );
#endif
}
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QABSTRACTSLIDER )

26
harbour/contrib/hbqt/qtgui/QAbstractSpinBox.cpp
View File

@@ -85,31 +85,7 @@
QT_G_FUNC( release_QAbstractSpinBox )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QAbstractSpinBox %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QAbstractSpinBox * ) ph )->~QAbstractSpinBox();
ph = NULL;
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QAbstractSpinBox" ); OutputDebugString( str );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QAbstractSpinBox" ); OutputDebugString( str );
#endif
}
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QABSTRACTSPINBOX )

32
harbour/contrib/hbqt/qtgui/QAbstractTextDocumentLayout.cpp
View File

@@ -77,31 +77,7 @@
QT_G_FUNC( release_QAbstractTextDocumentLayout )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QAbstractTextDocumentLayout %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QAbstractTextDocumentLayout * ) ph )->~QAbstractTextDocumentLayout();
ph = NULL;
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QAbstractTextDocumentLayout" ); OutputDebugString( str );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QAbstractTextDocumentLayout" ); OutputDebugString( str );
#endif
}
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QABSTRACTTEXTDOCUMENTLAYOUT )
@@ -120,7 +96,7 @@ HB_FUNC( QT_QABSTRACTTEXTDOCUMENTLAYOUT_ANCHORAT )
*/
HB_FUNC( QT_QABSTRACTTEXTDOCUMENTLAYOUT_BLOCKBOUNDINGRECT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QAbstractTextDocumentLayout( 1 )->blockBoundingRect( *hbqt_par_QTextBlock( 2 ) ) ), release_QRectF ) );
hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QAbstractTextDocumentLayout( 1 )->blockBoundingRect( *hbqt_par_QTextBlock( 2 ) ) ) ) );
}
/*
@@ -136,7 +112,7 @@ HB_FUNC( QT_QABSTRACTTEXTDOCUMENTLAYOUT_DOCUMENT )
*/
HB_FUNC( QT_QABSTRACTTEXTDOCUMENTLAYOUT_DOCUMENTSIZE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QSizeF( hbqt_par_QAbstractTextDocumentLayout( 1 )->documentSize() ), release_QSizeF ) );
hb_retptrGC( gcAllocate_QSizeF( new QSizeF( hbqt_par_QAbstractTextDocumentLayout( 1 )->documentSize() ) ) );
}
/*
@@ -144,7 +120,7 @@ HB_FUNC( QT_QABSTRACTTEXTDOCUMENTLAYOUT_DOCUMENTSIZE )
*/
HB_FUNC( QT_QABSTRACTTEXTDOCUMENTLAYOUT_FRAMEBOUNDINGRECT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRectF( hbqt_par_QAbstractTextDocumentLayout( 1 )->frameBoundingRect( hbqt_par_QTextFrame( 2 ) ) ), release_QRectF ) );
hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QAbstractTextDocumentLayout( 1 )->frameBoundingRect( hbqt_par_QTextFrame( 2 ) ) ) ) );
}
/*

77
harbour/contrib/hbqt/qtgui/QAction.cpp
View File

@@ -95,42 +95,65 @@
* ~QAction ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QAction > pq;
} QGC_POINTER_QAction;
QT_G_FUNC( release_QAction )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QAction %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QAction * p = ( QGC_POINTER_QAction * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QAction p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QAction ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QAction * ) ph )->~QAction();
ph = NULL;
( ( QAction * ) p->ph )->~QAction();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QAction Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QAction %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QAction" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QAction Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QAction" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QAction" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QAction Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QAction" );
#endif
}
}
void * gcAllocate_QAction( void * pObj )
{
QGC_POINTER_QAction * p = ( QGC_POINTER_QAction * ) hb_gcAllocate( sizeof( QGC_POINTER_QAction ), gcFuncs() );
p->ph = pObj;
p->func = release_QAction;
new( & p->pq ) QPointer< QAction >( ( QAction * ) pObj );
#if defined(__debug__)
just_debug( " new_QAction %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QACTION )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QAction > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QAction %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
if( HB_ISPOINTER( 1 ) )
pObj = new QAction( hbqt_par_QObject( 1 ) ) ;
@@ -139,13 +162,7 @@ hb_snprintf( str, sizeof(str), " GC: new QAction %i B %i
else if( HB_ISPOINTER( 3 ) )
pObj = new QAction( *hbqt_par_QIcon( 1 ), hbqt_par_QString( 2 ), hbqt_par_QObject( 3 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QAction;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QAction( pObj ) );
}
/*
* QActionGroup * actionGroup () const
@@ -176,7 +193,7 @@ HB_FUNC( QT_QACTION_AUTOREPEAT )
*/
HB_FUNC( QT_QACTION_DATA )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QAction( 1 )->data() ), release_QVariant ) );
hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QAction( 1 )->data() ) ) );
}
/*
@@ -184,7 +201,7 @@ HB_FUNC( QT_QACTION_DATA )
*/
HB_FUNC( QT_QACTION_FONT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QAction( 1 )->font() ), release_QFont ) );
hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QAction( 1 )->font() ) ) );
}
/*
@@ -192,7 +209,7 @@ HB_FUNC( QT_QACTION_FONT )
*/
HB_FUNC( QT_QACTION_ICON )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QAction( 1 )->icon() ), release_QIcon ) );
hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QAction( 1 )->icon() ) ) );
}
/*
@@ -424,7 +441,7 @@ HB_FUNC( QT_QACTION_SETWHATSTHIS )
*/
HB_FUNC( QT_QACTION_SHORTCUT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QKeySequence( hbqt_par_QAction( 1 )->shortcut() ), release_QKeySequence ) );
hb_retptrGC( gcAllocate_QKeySequence( new QKeySequence( hbqt_par_QAction( 1 )->shortcut() ) ) );
}
/*

69
harbour/contrib/hbqt/qtgui/QActionGroup.cpp
View File

@@ -84,55 +84,72 @@
* ~QActionGroup ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QActionGroup > pq;
} QGC_POINTER_QActionGroup;
QT_G_FUNC( release_QActionGroup )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QActionGroup %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QActionGroup * p = ( QGC_POINTER_QActionGroup * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QActionGroup p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QActionGroup ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QActionGroup * ) ph )->~QActionGroup();
ph = NULL;
( ( QActionGroup * ) p->ph )->~QActionGroup();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QActionGroup Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QActionGroup %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QActionGroup" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QActionGroup Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QActionGroup" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QActionGroup" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QActionGroup Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QActionGroup" );
#endif
}
}
void * gcAllocate_QActionGroup( void * pObj )
{
QGC_POINTER_QActionGroup * p = ( QGC_POINTER_QActionGroup * ) hb_gcAllocate( sizeof( QGC_POINTER_QActionGroup ), gcFuncs() );
p->ph = pObj;
p->func = release_QActionGroup;
new( & p->pq ) QPointer< QActionGroup >( ( QActionGroup * ) pObj );
#if defined(__debug__)
just_debug( " new_QActionGroup %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QACTIONGROUP )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QActionGroup > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QActionGroup %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
{
pObj = new QActionGroup( hbqt_par_QObject( 1 ) ) ;
}
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QActionGroup;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QActionGroup( pObj ) );
}
/*
* QAction * addAction ( QAction * action )

89
harbour/contrib/hbqt/qtgui/QApplication.cpp
View File

@@ -161,52 +161,69 @@ HB_FUNC( QT_QAPPLICATION_QUIT )
app->quit();
}
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QApplication > pq;
} QGC_POINTER_QApplication;
QT_G_FUNC( release_QApplication )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QApplication %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QApplication * p = ( QGC_POINTER_QApplication * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QApplication p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QApplication ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QApplication * ) ph )->~QApplication();
ph = NULL;
( ( QApplication * ) p->ph )->~QApplication();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QApplication Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QApplication %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QApplication" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QApplication Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QApplication" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QApplication" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QApplication Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QApplication" );
#endif
}
}
void * gcAllocate_QApplication( void * pObj )
{
QGC_POINTER_QApplication * p = ( QGC_POINTER_QApplication * ) hb_gcAllocate( sizeof( QGC_POINTER_QApplication ), gcFuncs() );
p->ph = pObj;
p->func = release_QApplication;
new( & p->pq ) QPointer< QApplication >( ( QApplication * ) pObj );
#if defined(__debug__)
just_debug( " new_QApplication %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QAPPLICATION )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QApplication > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QApplication %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = ( QApplication * ) app ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QApplication;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QApplication( pObj ) );
}
/*
* virtual void commitData ( QSessionManager & manager )
@@ -389,7 +406,7 @@ HB_FUNC( QT_QAPPLICATION_FOCUSWIDGET )
*/
HB_FUNC( QT_QAPPLICATION_FONT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QApplication( 1 )->font() ), release_QFont ) );
hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QApplication( 1 )->font() ) ) );
}
/*
@@ -397,7 +414,7 @@ HB_FUNC( QT_QAPPLICATION_FONT )
*/
HB_FUNC( QT_QAPPLICATION_FONT_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QApplication( 1 )->font( hbqt_par_QWidget( 2 ) ) ), release_QFont ) );
hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QApplication( 1 )->font( hbqt_par_QWidget( 2 ) ) ) ) );
}
/*
@@ -405,7 +422,7 @@ HB_FUNC( QT_QAPPLICATION_FONT_1 )
*/
HB_FUNC( QT_QAPPLICATION_FONT_2 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QApplication( 1 )->font( hbqt_par_char( 2 ) ) ), release_QFont ) );
hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QApplication( 1 )->font( hbqt_par_char( 2 ) ) ) ) );
}
/*
@@ -413,7 +430,7 @@ HB_FUNC( QT_QAPPLICATION_FONT_2 )
*/
HB_FUNC( QT_QAPPLICATION_FONTMETRICS )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QFontMetrics( hbqt_par_QApplication( 1 )->fontMetrics() ), release_QFontMetrics ) );
hb_retptrGC( gcAllocate_QFontMetrics( new QFontMetrics( hbqt_par_QApplication( 1 )->fontMetrics() ) ) );
}
/*
@@ -421,7 +438,7 @@ HB_FUNC( QT_QAPPLICATION_FONTMETRICS )
*/
HB_FUNC( QT_QAPPLICATION_GLOBALSTRUT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QApplication( 1 )->globalStrut() ), release_QSize ) );
hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QApplication( 1 )->globalStrut() ) ) );
}
/*
@@ -469,7 +486,7 @@ HB_FUNC( QT_QAPPLICATION_KEYBOARDINPUTINTERVAL )
*/
HB_FUNC( QT_QAPPLICATION_KEYBOARDINPUTLOCALE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QLocale( hbqt_par_QApplication( 1 )->keyboardInputLocale() ), release_QLocale ) );
hb_retptrGC( gcAllocate_QLocale( new QLocale( hbqt_par_QApplication( 1 )->keyboardInputLocale() ) ) );
}
/*
@@ -509,7 +526,7 @@ HB_FUNC( QT_QAPPLICATION_OVERRIDECURSOR )
*/
HB_FUNC( QT_QAPPLICATION_PALETTE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPalette( hbqt_par_QApplication( 1 )->palette() ), release_QPalette ) );
hb_retptrGC( gcAllocate_QPalette( new QPalette( hbqt_par_QApplication( 1 )->palette() ) ) );
}
/*
@@ -517,7 +534,7 @@ HB_FUNC( QT_QAPPLICATION_PALETTE )
*/
HB_FUNC( QT_QAPPLICATION_PALETTE_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPalette( hbqt_par_QApplication( 1 )->palette( hbqt_par_QWidget( 2 ) ) ), release_QPalette ) );
hb_retptrGC( gcAllocate_QPalette( new QPalette( hbqt_par_QApplication( 1 )->palette( hbqt_par_QWidget( 2 ) ) ) ) );
}
/*
@@ -525,7 +542,7 @@ HB_FUNC( QT_QAPPLICATION_PALETTE_1 )
*/
HB_FUNC( QT_QAPPLICATION_PALETTE_2 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPalette( hbqt_par_QApplication( 1 )->palette( hbqt_par_char( 2 ) ) ), release_QPalette ) );
hb_retptrGC( gcAllocate_QPalette( new QPalette( hbqt_par_QApplication( 1 )->palette( hbqt_par_char( 2 ) ) ) ) );
}
/*
@@ -789,7 +806,7 @@ HB_FUNC( QT_QAPPLICATION_WIDGETAT_1 )
*/
HB_FUNC( QT_QAPPLICATION_WINDOWICON )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QApplication( 1 )->windowIcon() ), release_QIcon ) );
hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QApplication( 1 )->windowIcon() ) ) );
}
/*

56
harbour/contrib/hbqt/qtgui/QBitmap.cpp
View File

@@ -82,30 +82,44 @@
QT_G_FUNC( release_QBitmap )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QBitmap %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QBitmap p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QBitmap ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QBitmap * ) ph )->~QBitmap();
ph = NULL;
( ( QBitmap * ) p->ph )->~QBitmap();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QBitmap Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QBitmap %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QBitmap" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QBitmap Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QBitmap" );
#endif
}
}
void * gcAllocate_QBitmap( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QBitmap;
#if defined(__debug__)
just_debug( " new_QBitmap %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QBITMAP )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QBitmap %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
{
@@ -143,13 +157,7 @@ hb_snprintf( str, sizeof(str), " GC: new QBitmap %i B %i
pObj = ( QBitmap* ) new QBitmap() ;
}
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QBitmap;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QBitmap( pObj ) );
}
/*
* void clear ()
@@ -164,7 +172,7 @@ HB_FUNC( QT_QBITMAP_CLEAR )
*/
HB_FUNC( QT_QBITMAP_TRANSFORMED )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QBitmap( hbqt_par_QBitmap( 1 )->transformed( *hbqt_par_QTransform( 2 ) ) ), release_QBitmap ) );
hb_retptrGC( gcAllocate_QBitmap( new QBitmap( hbqt_par_QBitmap( 1 )->transformed( *hbqt_par_QTransform( 2 ) ) ) ) );
}
/*
@@ -172,7 +180,7 @@ HB_FUNC( QT_QBITMAP_TRANSFORMED )
*/
HB_FUNC( QT_QBITMAP_TRANSFORMED_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QBitmap( hbqt_par_QBitmap( 1 )->transformed( *hbqt_par_QMatrix( 2 ) ) ), release_QBitmap ) );
hb_retptrGC( gcAllocate_QBitmap( new QBitmap( hbqt_par_QBitmap( 1 )->transformed( *hbqt_par_QMatrix( 2 ) ) ) ) );
}
/*
@@ -180,7 +188,7 @@ HB_FUNC( QT_QBITMAP_TRANSFORMED_1 )
*/
HB_FUNC( QT_QBITMAP_FROMIMAGE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QBitmap( hbqt_par_QBitmap( 1 )->fromImage( *hbqt_par_QImage( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::ImageConversionFlags ) hb_parni( 3 ) : ( Qt::ImageConversionFlags ) Qt::AutoColor ) ) ), release_QBitmap ) );
hb_retptrGC( gcAllocate_QBitmap( new QBitmap( hbqt_par_QBitmap( 1 )->fromImage( *hbqt_par_QImage( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::ImageConversionFlags ) hb_parni( 3 ) : ( Qt::ImageConversionFlags ) Qt::AutoColor ) ) ) ) );
}

69
harbour/contrib/hbqt/qtgui/QBoxLayout.cpp
View File

@@ -80,52 +80,69 @@
* ~QBoxLayout ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QBoxLayout > pq;
} QGC_POINTER_QBoxLayout;
QT_G_FUNC( release_QBoxLayout )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QBoxLayout %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QBoxLayout * p = ( QGC_POINTER_QBoxLayout * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QBoxLayout p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QBoxLayout ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QBoxLayout * ) ph )->~QBoxLayout();
ph = NULL;
( ( QBoxLayout * ) p->ph )->~QBoxLayout();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QBoxLayout Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QBoxLayout %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QBoxLayout" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QBoxLayout Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QBoxLayout" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QBoxLayout" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QBoxLayout Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QBoxLayout" );
#endif
}
}
void * gcAllocate_QBoxLayout( void * pObj )
{
QGC_POINTER_QBoxLayout * p = ( QGC_POINTER_QBoxLayout * ) hb_gcAllocate( sizeof( QGC_POINTER_QBoxLayout ), gcFuncs() );
p->ph = pObj;
p->func = release_QBoxLayout;
new( & p->pq ) QPointer< QBoxLayout >( ( QBoxLayout * ) pObj );
#if defined(__debug__)
just_debug( " new_QBoxLayout %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QBOXLAYOUT )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QBoxLayout > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QBoxLayout %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = ( QBoxLayout* ) new QBoxLayout( ( QBoxLayout::Direction ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QBoxLayout;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QBoxLayout( pObj ) );
}
/*
* void addLayout ( QLayout * layout, int stretch = 0 )

60
harbour/contrib/hbqt/qtgui/QBrush.cpp
View File

@@ -87,30 +87,44 @@
QT_G_FUNC( release_QBrush )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QBrush %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QBrush p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QBrush ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QBrush * ) ph )->~QBrush();
ph = NULL;
( ( QBrush * ) p->ph )->~QBrush();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QBrush Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QBrush %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QBrush" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QBrush Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QBrush" );
#endif
}
}
void * gcAllocate_QBrush( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QBrush;
#if defined(__debug__)
just_debug( " new_QBrush %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QBRUSH )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QBrush %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
{
@@ -166,20 +180,14 @@ hb_snprintf( str, sizeof(str), " GC: new QBrush %i B %i
pObj = ( QBrush* ) new QBrush() ;
}
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QBrush;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QBrush( pObj ) );
}
/*
* const QColor & color () const
*/
HB_FUNC( QT_QBRUSH_COLOR )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QBrush( 1 )->color() ), release_QColor ) );
hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QBrush( 1 )->color() ) ) );
}
/*
@@ -195,7 +203,7 @@ HB_FUNC( QT_QBRUSH_ISOPAQUE )
*/
HB_FUNC( QT_QBRUSH_MATRIX )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QMatrix( hbqt_par_QBrush( 1 )->matrix() ), release_QMatrix ) );
hb_retptrGC( gcAllocate_QMatrix( new QMatrix( hbqt_par_QBrush( 1 )->matrix() ) ) );
}
/*
@@ -267,7 +275,7 @@ HB_FUNC( QT_QBRUSH_STYLE )
*/
HB_FUNC( QT_QBRUSH_TEXTURE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QBrush( 1 )->texture() ), release_QPixmap ) );
hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QBrush( 1 )->texture() ) ) );
}
/*
@@ -275,7 +283,7 @@ HB_FUNC( QT_QBRUSH_TEXTURE )
*/
HB_FUNC( QT_QBRUSH_TEXTUREIMAGE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QImage( hbqt_par_QBrush( 1 )->textureImage() ), release_QImage ) );
hb_retptrGC( gcAllocate_QImage( new QImage( hbqt_par_QBrush( 1 )->textureImage() ) ) );
}
/*
@@ -283,7 +291,7 @@ HB_FUNC( QT_QBRUSH_TEXTUREIMAGE )
*/
HB_FUNC( QT_QBRUSH_TRANSFORM )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QTransform( hbqt_par_QBrush( 1 )->transform() ), release_QTransform ) );
hb_retptrGC( gcAllocate_QTransform( new QTransform( hbqt_par_QBrush( 1 )->transform() ) ) );
}

69
harbour/contrib/hbqt/qtgui/QButtonGroup.cpp
View File

@@ -85,42 +85,65 @@
* ~QButtonGroup ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QButtonGroup > pq;
} QGC_POINTER_QButtonGroup;
QT_G_FUNC( release_QButtonGroup )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QButtonGroup %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QButtonGroup * p = ( QGC_POINTER_QButtonGroup * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QButtonGroup p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QButtonGroup ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QButtonGroup * ) ph )->~QButtonGroup();
ph = NULL;
( ( QButtonGroup * ) p->ph )->~QButtonGroup();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QButtonGroup Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QButtonGroup %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QButtonGroup" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QButtonGroup Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QButtonGroup" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QButtonGroup" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QButtonGroup Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QButtonGroup" );
#endif
}
}
void * gcAllocate_QButtonGroup( void * pObj )
{
QGC_POINTER_QButtonGroup * p = ( QGC_POINTER_QButtonGroup * ) hb_gcAllocate( sizeof( QGC_POINTER_QButtonGroup ), gcFuncs() );
p->ph = pObj;
p->func = release_QButtonGroup;
new( & p->pq ) QPointer< QButtonGroup >( ( QButtonGroup * ) pObj );
#if defined(__debug__)
just_debug( " new_QButtonGroup %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QBUTTONGROUP )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QButtonGroup > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QButtonGroup %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
{
@@ -131,13 +154,7 @@ hb_snprintf( str, sizeof(str), " GC: new QButtonGroup %i B %i
pObj = ( QButtonGroup* ) new QButtonGroup() ;
}
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QButtonGroup;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QButtonGroup( pObj ) );
}
/*
* void addButton ( QAbstractButton * button )

81
harbour/contrib/hbqt/qtgui/QCalendarWidget.cpp
View File

@@ -91,52 +91,69 @@
* ~QCalendarWidget ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QCalendarWidget > pq;
} QGC_POINTER_QCalendarWidget;
QT_G_FUNC( release_QCalendarWidget )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QCalendarWidget %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QCalendarWidget * p = ( QGC_POINTER_QCalendarWidget * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QCalendarWidget p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QCalendarWidget ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QCalendarWidget * ) ph )->~QCalendarWidget();
ph = NULL;
( ( QCalendarWidget * ) p->ph )->~QCalendarWidget();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QCalendarWidget Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QCalendarWidget %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QCalendarWidget" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QCalendarWidget Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QCalendarWidget" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QCalendarWidget" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QCalendarWidget Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QCalendarWidget" );
#endif
}
}
void * gcAllocate_QCalendarWidget( void * pObj )
{
QGC_POINTER_QCalendarWidget * p = ( QGC_POINTER_QCalendarWidget * ) hb_gcAllocate( sizeof( QGC_POINTER_QCalendarWidget ), gcFuncs() );
p->ph = pObj;
p->func = release_QCalendarWidget;
new( & p->pq ) QPointer< QCalendarWidget >( ( QCalendarWidget * ) pObj );
#if defined(__debug__)
just_debug( " new_QCalendarWidget %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QCALENDARWIDGET )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QCalendarWidget > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QCalendarWidget %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = ( QCalendarWidget* ) new QCalendarWidget( hbqt_par_QWidget( 1 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QCalendarWidget;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QCalendarWidget( pObj ) );
}
/*
* int dateEditAcceptDelay () const
@@ -151,7 +168,7 @@ HB_FUNC( QT_QCALENDARWIDGET_DATEEDITACCEPTDELAY )
*/
HB_FUNC( QT_QCALENDARWIDGET_DATETEXTFORMAT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QTextCharFormat( hbqt_par_QCalendarWidget( 1 )->dateTextFormat( *hbqt_par_QDate( 2 ) ) ), release_QTextCharFormat ) );
hb_retptrGC( gcAllocate_QTextCharFormat( new QTextCharFormat( hbqt_par_QCalendarWidget( 1 )->dateTextFormat( *hbqt_par_QDate( 2 ) ) ) ) );
}
/*
@@ -167,7 +184,7 @@ HB_FUNC( QT_QCALENDARWIDGET_FIRSTDAYOFWEEK )
*/
HB_FUNC( QT_QCALENDARWIDGET_HEADERTEXTFORMAT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QTextCharFormat( hbqt_par_QCalendarWidget( 1 )->headerTextFormat() ), release_QTextCharFormat ) );
hb_retptrGC( gcAllocate_QTextCharFormat( new QTextCharFormat( hbqt_par_QCalendarWidget( 1 )->headerTextFormat() ) ) );
}
/*
@@ -207,7 +224,7 @@ HB_FUNC( QT_QCALENDARWIDGET_ISNAVIGATIONBARVISIBLE )
*/
HB_FUNC( QT_QCALENDARWIDGET_MAXIMUMDATE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDate( hbqt_par_QCalendarWidget( 1 )->maximumDate() ), release_QDate ) );
hb_retptrGC( gcAllocate_QDate( new QDate( hbqt_par_QCalendarWidget( 1 )->maximumDate() ) ) );
}
/*
@@ -215,7 +232,7 @@ HB_FUNC( QT_QCALENDARWIDGET_MAXIMUMDATE )
*/
HB_FUNC( QT_QCALENDARWIDGET_MINIMUMDATE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDate( hbqt_par_QCalendarWidget( 1 )->minimumDate() ), release_QDate ) );
hb_retptrGC( gcAllocate_QDate( new QDate( hbqt_par_QCalendarWidget( 1 )->minimumDate() ) ) );
}
/*
@@ -231,7 +248,7 @@ HB_FUNC( QT_QCALENDARWIDGET_MONTHSHOWN )
*/
HB_FUNC( QT_QCALENDARWIDGET_SELECTEDDATE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDate( hbqt_par_QCalendarWidget( 1 )->selectedDate() ), release_QDate ) );
hb_retptrGC( gcAllocate_QDate( new QDate( hbqt_par_QCalendarWidget( 1 )->selectedDate() ) ) );
}
/*
@@ -343,7 +360,7 @@ HB_FUNC( QT_QCALENDARWIDGET_VERTICALHEADERFORMAT )
*/
HB_FUNC( QT_QCALENDARWIDGET_WEEKDAYTEXTFORMAT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QTextCharFormat( hbqt_par_QCalendarWidget( 1 )->weekdayTextFormat( ( Qt::DayOfWeek ) hb_parni( 2 ) ) ), release_QTextCharFormat ) );
hb_retptrGC( gcAllocate_QTextCharFormat( new QTextCharFormat( hbqt_par_QCalendarWidget( 1 )->weekdayTextFormat( ( Qt::DayOfWeek ) hb_parni( 2 ) ) ) ) );
}
/*

69
harbour/contrib/hbqt/qtgui/QCheckBox.cpp
View File

@@ -76,42 +76,65 @@
* QCheckBox ( const QString & text, QWidget * parent = 0 )
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QCheckBox > pq;
} QGC_POINTER_QCheckBox;
QT_G_FUNC( release_QCheckBox )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QCheckBox %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QCheckBox * p = ( QGC_POINTER_QCheckBox * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QCheckBox p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QCheckBox ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QCheckBox * ) ph )->~QCheckBox();
ph = NULL;
( ( QCheckBox * ) p->ph )->~QCheckBox();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QCheckBox Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QCheckBox %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QCheckBox" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QCheckBox Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QCheckBox" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QCheckBox" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QCheckBox Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QCheckBox" );
#endif
}
}
void * gcAllocate_QCheckBox( void * pObj )
{
QGC_POINTER_QCheckBox * p = ( QGC_POINTER_QCheckBox * ) hb_gcAllocate( sizeof( QGC_POINTER_QCheckBox ), gcFuncs() );
p->ph = pObj;
p->func = release_QCheckBox;
new( & p->pq ) QPointer< QCheckBox >( ( QCheckBox * ) pObj );
#if defined(__debug__)
just_debug( " new_QCheckBox %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QCHECKBOX )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QCheckBox > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QCheckBox %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
if( hb_pcount() >= 1 && HB_ISCHAR( 1 ) )
{
@@ -122,13 +145,7 @@ hb_snprintf( str, sizeof(str), " GC: new QCheckBox %i B %i
pObj = ( QCheckBox* ) new QCheckBox( hbqt_par_QWidget( 1 ) ) ;
}
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QCheckBox;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QCheckBox( pObj ) );
}
/*
* Qt::CheckState checkState () const

12
harbour/contrib/hbqt/qtgui/QClipboard.cpp
View File

@@ -88,16 +88,10 @@ QT_G_FUNC( release_QClipboard )
HB_FUNC( QT_QCLIPBOARD )
{
QPointer< QClipboard > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " NON-GC: new QClipboard %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = ( QClipboard* ) QApplication::clipboard() ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " NON-GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
hb_retptr( pObj );
}
/*
@@ -113,7 +107,7 @@ HB_FUNC( QT_QCLIPBOARD_CLEAR )
*/
HB_FUNC( QT_QCLIPBOARD_IMAGE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QImage( hbqt_par_QClipboard( 1 )->image( ( HB_ISNUM( 2 ) ? ( QClipboard::Mode ) hb_parni( 2 ) : ( QClipboard::Mode ) QClipboard::Clipboard ) ) ), release_QImage ) );
hb_retptrGC( gcAllocate_QImage( new QImage( hbqt_par_QClipboard( 1 )->image( ( HB_ISNUM( 2 ) ? ( QClipboard::Mode ) hb_parni( 2 ) : ( QClipboard::Mode ) QClipboard::Clipboard ) ) ) ) );
}
/*
@@ -153,7 +147,7 @@ HB_FUNC( QT_QCLIPBOARD_OWNSSELECTION )
*/
HB_FUNC( QT_QCLIPBOARD_PIXMAP )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QClipboard( 1 )->pixmap( ( HB_ISNUM( 2 ) ? ( QClipboard::Mode ) hb_parni( 2 ) : ( QClipboard::Mode ) QClipboard::Clipboard ) ) ), release_QPixmap ) );
hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QClipboard( 1 )->pixmap( ( HB_ISNUM( 2 ) ? ( QClipboard::Mode ) hb_parni( 2 ) : ( QClipboard::Mode ) QClipboard::Clipboard ) ) ) ) );
}
/*

80
harbour/contrib/hbqt/qtgui/QColor.cpp
View File

@@ -87,30 +87,44 @@ QColor ( const QColor & color )
QT_G_FUNC( release_QColor )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QColor %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QColor p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QColor ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QColor * ) ph )->~QColor();
ph = NULL;
( ( QColor * ) p->ph )->~QColor();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QColor Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QColor %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QColor" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QColor Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QColor" );
#endif
}
}
void * gcAllocate_QColor( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QColor;
#if defined(__debug__)
just_debug( " new_QColor %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QCOLOR )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QColor %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
if( hb_pcount() >= 1 )
{
@@ -148,13 +162,7 @@ hb_snprintf( str, sizeof(str), " GC: new QColor %i B %i
pObj = ( QColor* ) new QColor() ;
}
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QColor;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QColor( pObj ) );
}
/*
* int alpha () const
@@ -209,7 +217,7 @@ HB_FUNC( QT_QCOLOR_BLUEF )
*/
HB_FUNC( QT_QCOLOR_CONVERTTO )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->convertTo( ( QColor::Spec ) hb_parni( 2 ) ) ), release_QColor ) );
hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->convertTo( ( QColor::Spec ) hb_parni( 2 ) ) ) ) );
}
/*
@@ -233,7 +241,7 @@ HB_FUNC( QT_QCOLOR_CYANF )
*/
HB_FUNC( QT_QCOLOR_DARKER )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->darker( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 200 ) ) ), release_QColor ) );
hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->darker( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 200 ) ) ) ) );
}
/*
@@ -393,7 +401,7 @@ HB_FUNC( QT_QCOLOR_ISVALID )
*/
HB_FUNC( QT_QCOLOR_LIGHTER )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->lighter( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 150 ) ) ), release_QColor ) );
hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->lighter( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 150 ) ) ) ) );
}
/*
@@ -617,7 +625,7 @@ HB_FUNC( QT_QCOLOR_SPEC )
*/
HB_FUNC( QT_QCOLOR_TOCMYK )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->toCmyk() ), release_QColor ) );
hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->toCmyk() ) ) );
}
/*
@@ -625,7 +633,7 @@ HB_FUNC( QT_QCOLOR_TOCMYK )
*/
HB_FUNC( QT_QCOLOR_TOHSV )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->toHsv() ), release_QColor ) );
hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->toHsv() ) ) );
}
/*
@@ -633,7 +641,7 @@ HB_FUNC( QT_QCOLOR_TOHSV )
*/
HB_FUNC( QT_QCOLOR_TORGB )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->toRgb() ), release_QColor ) );
hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->toRgb() ) ) );
}
/*
@@ -673,7 +681,7 @@ HB_FUNC( QT_QCOLOR_YELLOWF )
*/
HB_FUNC( QT_QCOLOR_COLORNAMES )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QColor( 1 )->colorNames() ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QColor( 1 )->colorNames() ) ) );
}
/*
@@ -681,7 +689,7 @@ HB_FUNC( QT_QCOLOR_COLORNAMES )
*/
HB_FUNC( QT_QCOLOR_FROMCMYK )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->fromCmyk( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), ( HB_ISNUM( 6 ) ? hb_parni( 6 ) : 255 ) ) ), release_QColor ) );
hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->fromCmyk( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), ( HB_ISNUM( 6 ) ? hb_parni( 6 ) : 255 ) ) ) ) );
}
/*
@@ -689,7 +697,7 @@ HB_FUNC( QT_QCOLOR_FROMCMYK )
*/
HB_FUNC( QT_QCOLOR_FROMCMYKF )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->fromCmykF( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ) ) ), release_QColor ) );
hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->fromCmykF( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ) ) ) ) );
}
/*
@@ -697,7 +705,7 @@ HB_FUNC( QT_QCOLOR_FROMCMYKF )
*/
HB_FUNC( QT_QCOLOR_FROMHSV )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->fromHsv( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : 255 ) ) ), release_QColor ) );
hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->fromHsv( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : 255 ) ) ) ) );
}
/*
@@ -705,7 +713,7 @@ HB_FUNC( QT_QCOLOR_FROMHSV )
*/
HB_FUNC( QT_QCOLOR_FROMHSVF )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->fromHsvF( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ) ), release_QColor ) );
hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->fromHsvF( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ) ) ) );
}
/*
@@ -713,7 +721,7 @@ HB_FUNC( QT_QCOLOR_FROMHSVF )
*/
HB_FUNC( QT_QCOLOR_FROMRGB )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->fromRgb( hb_parnl( 2 ) ) ), release_QColor ) );
hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->fromRgb( hb_parnl( 2 ) ) ) ) );
}
/*
@@ -721,7 +729,7 @@ HB_FUNC( QT_QCOLOR_FROMRGB )
*/
HB_FUNC( QT_QCOLOR_FROMRGB_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->fromRgb( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : 255 ) ) ), release_QColor ) );
hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->fromRgb( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : 255 ) ) ) ) );
}
/*
@@ -729,7 +737,7 @@ HB_FUNC( QT_QCOLOR_FROMRGB_1 )
*/
HB_FUNC( QT_QCOLOR_FROMRGBF )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->fromRgbF( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ) ), release_QColor ) );
hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->fromRgbF( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ) ) ) );
}
/*
@@ -737,7 +745,7 @@ HB_FUNC( QT_QCOLOR_FROMRGBF )
*/
HB_FUNC( QT_QCOLOR_FROMRGBA )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColor( 1 )->fromRgba( hb_parnl( 2 ) ) ), release_QColor ) );
hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->fromRgba( hb_parnl( 2 ) ) ) ) );
}

77
harbour/contrib/hbqt/qtgui/QColorDialog.cpp
View File

@@ -81,42 +81,65 @@
* ~QColorDialog ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QColorDialog > pq;
} QGC_POINTER_QColorDialog;
QT_G_FUNC( release_QColorDialog )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QColorDialog %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QColorDialog * p = ( QGC_POINTER_QColorDialog * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QColorDialog p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QColorDialog ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QColorDialog * ) ph )->~QColorDialog();
ph = NULL;
( ( QColorDialog * ) p->ph )->~QColorDialog();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QColorDialog Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QColorDialog %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QColorDialog" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QColorDialog Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QColorDialog" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QColorDialog" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QColorDialog Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QColorDialog" );
#endif
}
}
void * gcAllocate_QColorDialog( void * pObj )
{
QGC_POINTER_QColorDialog * p = ( QGC_POINTER_QColorDialog * ) hb_gcAllocate( sizeof( QGC_POINTER_QColorDialog ), gcFuncs() );
p->ph = pObj;
p->func = release_QColorDialog;
new( & p->pq ) QPointer< QColorDialog >( ( QColorDialog * ) pObj );
#if defined(__debug__)
just_debug( " new_QColorDialog %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QCOLORDIALOG )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QColorDialog > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QColorDialog %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
if( hb_pcount() >= 1 && HB_ISNUM( 1 ) )
{
@@ -127,20 +150,14 @@ hb_snprintf( str, sizeof(str), " GC: new QColorDialog %i B %i
pObj = ( QColorDialog* ) new QColorDialog( hbqt_par_QWidget( 1 ) ) ;
}
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QColorDialog;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QColorDialog( pObj ) );
}
/*
* QColor currentColor () const
*/
HB_FUNC( QT_QCOLORDIALOG_CURRENTCOLOR )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColorDialog( 1 )->currentColor() ), release_QColor ) );
hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColorDialog( 1 )->currentColor() ) ) );
}
/*
@@ -164,7 +181,7 @@ HB_FUNC( QT_QCOLORDIALOG_OPTIONS )
*/
HB_FUNC( QT_QCOLORDIALOG_SELECTEDCOLOR )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColorDialog( 1 )->selectedColor() ), release_QColor ) );
hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColorDialog( 1 )->selectedColor() ) ) );
}
/*
@@ -228,7 +245,7 @@ HB_FUNC( QT_QCOLORDIALOG_CUSTOMCOUNT )
*/
HB_FUNC( QT_QCOLORDIALOG_GETCOLOR )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColorDialog( 1 )->getColor( *hbqt_par_QColor( 2 ), hbqt_par_QWidget( 3 ), hbqt_par_QString( 4 ), ( QColorDialog::ColorDialogOptions ) hb_parni( 5 ) ) ), release_QColor ) );
hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColorDialog( 1 )->getColor( *hbqt_par_QColor( 2 ), hbqt_par_QWidget( 3 ), hbqt_par_QString( 4 ), ( QColorDialog::ColorDialogOptions ) hb_parni( 5 ) ) ) ) );
}
/*
@@ -236,7 +253,7 @@ HB_FUNC( QT_QCOLORDIALOG_GETCOLOR )
*/
HB_FUNC( QT_QCOLORDIALOG_GETCOLOR_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QColor( hbqt_par_QColorDialog( 1 )->getColor( *hbqt_par_QColor( 2 ), hbqt_par_QWidget( 3 ) ) ), release_QColor ) );
hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColorDialog( 1 )->getColor( *hbqt_par_QColor( 2 ), hbqt_par_QWidget( 3 ) ) ) ) );
}
/*

77
harbour/contrib/hbqt/qtgui/QComboBox.cpp
View File

@@ -81,52 +81,69 @@
* ~QComboBox ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QComboBox > pq;
} QGC_POINTER_QComboBox;
QT_G_FUNC( release_QComboBox )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QComboBox %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QComboBox * p = ( QGC_POINTER_QComboBox * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QComboBox p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QComboBox ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QComboBox * ) ph )->~QComboBox();
ph = NULL;
( ( QComboBox * ) p->ph )->~QComboBox();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QComboBox Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QComboBox %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QComboBox" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QComboBox Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QComboBox" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QComboBox" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QComboBox Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QComboBox" );
#endif
}
}
void * gcAllocate_QComboBox( void * pObj )
{
QGC_POINTER_QComboBox * p = ( QGC_POINTER_QComboBox * ) hb_gcAllocate( sizeof( QGC_POINTER_QComboBox ), gcFuncs() );
p->ph = pObj;
p->func = release_QComboBox;
new( & p->pq ) QPointer< QComboBox >( ( QComboBox * ) pObj );
#if defined(__debug__)
just_debug( " new_QComboBox %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QCOMBOBOX )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QComboBox > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QComboBox %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = ( QComboBox* ) new QComboBox( hbqt_par_QWidget( 1 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QComboBox;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QComboBox( pObj ) );
}
/*
* void addItem ( const QString & text, const QVariant & userData = QVariant() )
@@ -229,7 +246,7 @@ HB_FUNC( QT_QCOMBOBOX_HIDEPOPUP )
*/
HB_FUNC( QT_QCOMBOBOX_ICONSIZE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QSize( hbqt_par_QComboBox( 1 )->iconSize() ), release_QSize ) );
hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QComboBox( 1 )->iconSize() ) ) );
}
/*
@@ -285,7 +302,7 @@ HB_FUNC( QT_QCOMBOBOX_ISEDITABLE )
*/
HB_FUNC( QT_QCOMBOBOX_ITEMDATA )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QComboBox( 1 )->itemData( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::UserRole ) ) ), release_QVariant ) );
hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QComboBox( 1 )->itemData( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::UserRole ) ) ) ) );
}
/*
@@ -301,7 +318,7 @@ HB_FUNC( QT_QCOMBOBOX_ITEMDELEGATE )
*/
HB_FUNC( QT_QCOMBOBOX_ITEMICON )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QComboBox( 1 )->itemIcon( hb_parni( 2 ) ) ), release_QIcon ) );
hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QComboBox( 1 )->itemIcon( hb_parni( 2 ) ) ) ) );
}
/*
@@ -373,7 +390,7 @@ HB_FUNC( QT_QCOMBOBOX_REMOVEITEM )
*/
HB_FUNC( QT_QCOMBOBOX_ROOTMODELINDEX )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QComboBox( 1 )->rootModelIndex() ), release_QModelIndex ) );
hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QComboBox( 1 )->rootModelIndex() ) ) );
}
/*

69
harbour/contrib/hbqt/qtgui/QCommandLinkButton.cpp
View File

@@ -77,52 +77,69 @@
* QCommandLinkButton ( const QString & text, const QString & description, QWidget * parent = 0 )
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QCommandLinkButton > pq;
} QGC_POINTER_QCommandLinkButton;
QT_G_FUNC( release_QCommandLinkButton )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QCommandLinkButton %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QCommandLinkButton * p = ( QGC_POINTER_QCommandLinkButton * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QCommandLinkButton p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QCommandLinkButton ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QCommandLinkButton * ) ph )->~QCommandLinkButton();
ph = NULL;
( ( QCommandLinkButton * ) p->ph )->~QCommandLinkButton();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QCommandLinkButton Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QCommandLinkButton %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QCommandLinkButton" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QCommandLinkButton Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QCommandLinkButton" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QCommandLinkButton" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QCommandLinkButton Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QCommandLinkButton" );
#endif
}
}
void * gcAllocate_QCommandLinkButton( void * pObj )
{
QGC_POINTER_QCommandLinkButton * p = ( QGC_POINTER_QCommandLinkButton * ) hb_gcAllocate( sizeof( QGC_POINTER_QCommandLinkButton ), gcFuncs() );
p->ph = pObj;
p->func = release_QCommandLinkButton;
new( & p->pq ) QPointer< QCommandLinkButton >( ( QCommandLinkButton * ) pObj );
#if defined(__debug__)
just_debug( " new_QCommandLinkButton %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QCOMMANDLINKBUTTON )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QCommandLinkButton > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QCommandLinkButton %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = ( QCommandLinkButton* ) new QCommandLinkButton( hbqt_par_QWidget( 1 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QCommandLinkButton;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QCommandLinkButton( pObj ) );
}
/*
* QString description () const

69
harbour/contrib/hbqt/qtgui/QCommonStyle.cpp
View File

@@ -75,52 +75,69 @@
* QCommonStyle ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QCommonStyle > pq;
} QGC_POINTER_QCommonStyle;
QT_G_FUNC( release_QCommonStyle )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QCommonStyle %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QCommonStyle * p = ( QGC_POINTER_QCommonStyle * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QCommonStyle p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QCommonStyle ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QCommonStyle * ) ph )->~QCommonStyle();
ph = NULL;
( ( QCommonStyle * ) p->ph )->~QCommonStyle();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QCommonStyle Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QCommonStyle %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QCommonStyle" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QCommonStyle Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QCommonStyle" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QCommonStyle" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QCommonStyle Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QCommonStyle" );
#endif
}
}
void * gcAllocate_QCommonStyle( void * pObj )
{
QGC_POINTER_QCommonStyle * p = ( QGC_POINTER_QCommonStyle * ) hb_gcAllocate( sizeof( QGC_POINTER_QCommonStyle ), gcFuncs() );
p->ph = pObj;
p->func = release_QCommonStyle;
new( & p->pq ) QPointer< QCommonStyle >( ( QCommonStyle * ) pObj );
#if defined(__debug__)
just_debug( " new_QCommonStyle %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QCOMMONSTYLE )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QCommonStyle > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QCommonStyle %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = ( QCommonStyle* ) new QCommonStyle() ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QCommonStyle;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QCommonStyle( pObj ) );
}
/*----------------------------------------------------------------------*/

73
harbour/contrib/hbqt/qtgui/QCompleter.cpp
View File

@@ -82,52 +82,69 @@
* ~QCompleter ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QCompleter > pq;
} QGC_POINTER_QCompleter;
QT_G_FUNC( release_QCompleter )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QCompleter %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QCompleter * p = ( QGC_POINTER_QCompleter * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QCompleter p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QCompleter ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QCompleter * ) ph )->~QCompleter();
ph = NULL;
( ( QCompleter * ) p->ph )->~QCompleter();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QCompleter Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QCompleter %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QCompleter" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QCompleter Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QCompleter" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QCompleter" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QCompleter Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QCompleter" );
#endif
}
}
void * gcAllocate_QCompleter( void * pObj )
{
QGC_POINTER_QCompleter * p = ( QGC_POINTER_QCompleter * ) hb_gcAllocate( sizeof( QGC_POINTER_QCompleter ), gcFuncs() );
p->ph = pObj;
p->func = release_QCompleter;
new( & p->pq ) QPointer< QCompleter >( ( QCompleter * ) pObj );
#if defined(__debug__)
just_debug( " new_QCompleter %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QCOMPLETER )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QCompleter > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QCompleter %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = new QCompleter() ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QCompleter;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QCompleter( pObj ) );
}
/*
* Qt::CaseSensitivity caseSensitivity () const
@@ -198,7 +215,7 @@ HB_FUNC( QT_QCOMPLETER_CURRENTCOMPLETION )
*/
HB_FUNC( QT_QCOMPLETER_CURRENTINDEX )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QCompleter( 1 )->currentIndex() ), release_QModelIndex ) );
hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QCompleter( 1 )->currentIndex() ) ) );
}
/*
@@ -318,7 +335,7 @@ HB_FUNC( QT_QCOMPLETER_SETWIDGET )
*/
HB_FUNC( QT_QCOMPLETER_SPLITPATH )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QCompleter( 1 )->splitPath( hbqt_par_QString( 2 ) ) ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QCompleter( 1 )->splitPath( hbqt_par_QString( 2 ) ) ) ) );
}
/*

52
harbour/contrib/hbqt/qtgui/QConicalGradient.cpp
View File

@@ -85,40 +85,48 @@
QT_G_FUNC( release_QConicalGradient )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QConicalGradient %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QConicalGradient p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QConicalGradient ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QConicalGradient * ) ph )->~QConicalGradient();
ph = NULL;
( ( QConicalGradient * ) p->ph )->~QConicalGradient();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QConicalGradient Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QConicalGradient %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QConicalGradient" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QConicalGradient Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QConicalGradient" );
#endif
}
}
void * gcAllocate_QConicalGradient( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QConicalGradient;
#if defined(__debug__)
just_debug( " new_QConicalGradient %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QCONICALGRADIENT )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QConicalGradient %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
pObj = ( QConicalGradient* ) new QConicalGradient() ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QConicalGradient;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QConicalGradient( pObj ) );
}
/*
* qreal angle () const
@@ -133,7 +141,7 @@ HB_FUNC( QT_QCONICALGRADIENT_ANGLE )
*/
HB_FUNC( QT_QCONICALGRADIENT_CENTER )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPointF( hbqt_par_QConicalGradient( 1 )->center() ), release_QPointF ) );
hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QConicalGradient( 1 )->center() ) ) );
}
/*

54
harbour/contrib/hbqt/qtgui/QContextMenuEvent.cpp
View File

@@ -82,47 +82,55 @@
QT_G_FUNC( release_QContextMenuEvent )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QContextMenuEvent %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QContextMenuEvent p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QContextMenuEvent ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QContextMenuEvent * ) ph )->~QContextMenuEvent();
ph = NULL;
( ( QContextMenuEvent * ) p->ph )->~QContextMenuEvent();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QContextMenuEvent Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QContextMenuEvent %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QContextMenuEvent" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QContextMenuEvent Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QContextMenuEvent" );
#endif
}
}
void * gcAllocate_QContextMenuEvent( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QContextMenuEvent;
#if defined(__debug__)
just_debug( " new_QContextMenuEvent %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QCONTEXTMENUEVENT )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QContextMenuEvent %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
pObj = new QContextMenuEvent( ( QContextMenuEvent::Reason ) hb_parni( 1 ), *hbqt_par_QPoint( 2 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QContextMenuEvent;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QContextMenuEvent( pObj ) );
}
/*
* const QPoint & globalPos () const
*/
HB_FUNC( QT_QCONTEXTMENUEVENT_GLOBALPOS )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QContextMenuEvent( 1 )->globalPos() ), release_QPoint ) );
hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QContextMenuEvent( 1 )->globalPos() ) ) );
}
/*
@@ -146,7 +154,7 @@ HB_FUNC( QT_QCONTEXTMENUEVENT_GLOBALY )
*/
HB_FUNC( QT_QCONTEXTMENUEVENT_POS )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QContextMenuEvent( 1 )->pos() ), release_QPoint ) );
hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QContextMenuEvent( 1 )->pos() ) ) );
}
/*

56
harbour/contrib/hbqt/qtgui/QCursor.cpp
View File

@@ -84,30 +84,44 @@
QT_G_FUNC( release_QCursor )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QCursor %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QCursor p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QCursor ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QCursor * ) ph )->~QCursor();
ph = NULL;
( ( QCursor * ) p->ph )->~QCursor();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QCursor Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QCursor %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QCursor" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QCursor Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QCursor" );
#endif
}
}
void * gcAllocate_QCursor( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QCursor;
#if defined(__debug__)
just_debug( " new_QCursor %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QCURSOR )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QCursor %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
if( hb_pcount() == 1 && HB_ISNUM( 1 ) )
{
@@ -139,13 +153,7 @@ hb_snprintf( str, sizeof(str), " GC: new QCursor %i B %i
pObj = ( QCursor* ) new QCursor() ;
}
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QCursor;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QCursor( pObj ) );
}
/*
* const QBitmap * bitmap () const
@@ -160,7 +168,7 @@ HB_FUNC( QT_QCURSOR_BITMAP )
*/
HB_FUNC( QT_QCURSOR_HOTSPOT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QCursor( 1 )->hotSpot() ), release_QPoint ) );
hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QCursor( 1 )->hotSpot() ) ) );
}
/*
@@ -176,7 +184,7 @@ HB_FUNC( QT_QCURSOR_MASK )
*/
HB_FUNC( QT_QCURSOR_PIXMAP )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPixmap( hbqt_par_QCursor( 1 )->pixmap() ), release_QPixmap ) );
hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QCursor( 1 )->pixmap() ) ) );
}
/*
@@ -200,7 +208,7 @@ HB_FUNC( QT_QCURSOR_SHAPE )
*/
HB_FUNC( QT_QCURSOR_POS )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QCursor( 1 )->pos() ), release_QPoint ) );
hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QCursor( 1 )->pos() ) ) );
}
/*

69
harbour/contrib/hbqt/qtgui/QDateEdit.cpp
View File

@@ -76,52 +76,69 @@
* QDateEdit ( const QDate & date, QWidget * parent = 0 )
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QDateEdit > pq;
} QGC_POINTER_QDateEdit;
QT_G_FUNC( release_QDateEdit )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QDateEdit %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QDateEdit * p = ( QGC_POINTER_QDateEdit * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QDateEdit p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QDateEdit ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QDateEdit * ) ph )->~QDateEdit();
ph = NULL;
( ( QDateEdit * ) p->ph )->~QDateEdit();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QDateEdit Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QDateEdit %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QDateEdit" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QDateEdit Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QDateEdit" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QDateEdit" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QDateEdit Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QDateEdit" );
#endif
}
}
void * gcAllocate_QDateEdit( void * pObj )
{
QGC_POINTER_QDateEdit * p = ( QGC_POINTER_QDateEdit * ) hb_gcAllocate( sizeof( QGC_POINTER_QDateEdit ), gcFuncs() );
p->ph = pObj;
p->func = release_QDateEdit;
new( & p->pq ) QPointer< QDateEdit >( ( QDateEdit * ) pObj );
#if defined(__debug__)
just_debug( " new_QDateEdit %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QDATEEDIT )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QDateEdit > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QDateEdit %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = ( QDateEdit* ) new QDateEdit( hbqt_par_QWidget( 1 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QDateEdit;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QDateEdit( pObj ) );
}
/*----------------------------------------------------------------------*/

87
harbour/contrib/hbqt/qtgui/QDateTimeEdit.cpp
View File

@@ -83,52 +83,69 @@
* QDateTimeEdit ( const QTime & time, QWidget * parent = 0 )
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QDateTimeEdit > pq;
} QGC_POINTER_QDateTimeEdit;
QT_G_FUNC( release_QDateTimeEdit )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QDateTimeEdit %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QDateTimeEdit * p = ( QGC_POINTER_QDateTimeEdit * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QDateTimeEdit p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QDateTimeEdit ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QDateTimeEdit * ) ph )->~QDateTimeEdit();
ph = NULL;
( ( QDateTimeEdit * ) p->ph )->~QDateTimeEdit();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QDateTimeEdit Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QDateTimeEdit %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QDateTimeEdit" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QDateTimeEdit Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QDateTimeEdit" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QDateTimeEdit" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QDateTimeEdit Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QDateTimeEdit" );
#endif
}
}
void * gcAllocate_QDateTimeEdit( void * pObj )
{
QGC_POINTER_QDateTimeEdit * p = ( QGC_POINTER_QDateTimeEdit * ) hb_gcAllocate( sizeof( QGC_POINTER_QDateTimeEdit ), gcFuncs() );
p->ph = pObj;
p->func = release_QDateTimeEdit;
new( & p->pq ) QPointer< QDateTimeEdit >( ( QDateTimeEdit * ) pObj );
#if defined(__debug__)
just_debug( " new_QDateTimeEdit %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QDATETIMEEDIT )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QDateTimeEdit > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QDateTimeEdit %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = ( QDateTimeEdit* ) new QDateTimeEdit( hbqt_par_QWidget( 1 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QDateTimeEdit;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QDateTimeEdit( pObj ) );
}
/*
* bool calendarPopup () const
@@ -215,7 +232,7 @@ HB_FUNC( QT_QDATETIMEEDIT_CURRENTSECTIONINDEX )
*/
HB_FUNC( QT_QDATETIMEEDIT_DATE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDate( hbqt_par_QDateTimeEdit( 1 )->date() ), release_QDate ) );
hb_retptrGC( gcAllocate_QDate( new QDate( hbqt_par_QDateTimeEdit( 1 )->date() ) ) );
}
/*
@@ -223,7 +240,7 @@ HB_FUNC( QT_QDATETIMEEDIT_DATE )
*/
HB_FUNC( QT_QDATETIMEEDIT_DATETIME )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTimeEdit( 1 )->dateTime() ), release_QDateTime ) );
hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTimeEdit( 1 )->dateTime() ) ) );
}
/*
@@ -247,7 +264,7 @@ HB_FUNC( QT_QDATETIMEEDIT_DISPLAYEDSECTIONS )
*/
HB_FUNC( QT_QDATETIMEEDIT_MAXIMUMDATE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDate( hbqt_par_QDateTimeEdit( 1 )->maximumDate() ), release_QDate ) );
hb_retptrGC( gcAllocate_QDate( new QDate( hbqt_par_QDateTimeEdit( 1 )->maximumDate() ) ) );
}
/*
@@ -255,7 +272,7 @@ HB_FUNC( QT_QDATETIMEEDIT_MAXIMUMDATE )
*/
HB_FUNC( QT_QDATETIMEEDIT_MAXIMUMDATETIME )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTimeEdit( 1 )->maximumDateTime() ), release_QDateTime ) );
hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTimeEdit( 1 )->maximumDateTime() ) ) );
}
/*
@@ -263,7 +280,7 @@ HB_FUNC( QT_QDATETIMEEDIT_MAXIMUMDATETIME )
*/
HB_FUNC( QT_QDATETIMEEDIT_MAXIMUMTIME )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QTime( hbqt_par_QDateTimeEdit( 1 )->maximumTime() ), release_QTime ) );
hb_retptrGC( gcAllocate_QTime( new QTime( hbqt_par_QDateTimeEdit( 1 )->maximumTime() ) ) );
}
/*
@@ -271,7 +288,7 @@ HB_FUNC( QT_QDATETIMEEDIT_MAXIMUMTIME )
*/
HB_FUNC( QT_QDATETIMEEDIT_MINIMUMDATE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDate( hbqt_par_QDateTimeEdit( 1 )->minimumDate() ), release_QDate ) );
hb_retptrGC( gcAllocate_QDate( new QDate( hbqt_par_QDateTimeEdit( 1 )->minimumDate() ) ) );
}
/*
@@ -279,7 +296,7 @@ HB_FUNC( QT_QDATETIMEEDIT_MINIMUMDATE )
*/
HB_FUNC( QT_QDATETIMEEDIT_MINIMUMDATETIME )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QDateTimeEdit( 1 )->minimumDateTime() ), release_QDateTime ) );
hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTimeEdit( 1 )->minimumDateTime() ) ) );
}
/*
@@ -287,7 +304,7 @@ HB_FUNC( QT_QDATETIMEEDIT_MINIMUMDATETIME )
*/
HB_FUNC( QT_QDATETIMEEDIT_MINIMUMTIME )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QTime( hbqt_par_QDateTimeEdit( 1 )->minimumTime() ), release_QTime ) );
hb_retptrGC( gcAllocate_QTime( new QTime( hbqt_par_QDateTimeEdit( 1 )->minimumTime() ) ) );
}
/*
@@ -447,7 +464,7 @@ HB_FUNC( QT_QDATETIMEEDIT_SETTIMESPEC )
*/
HB_FUNC( QT_QDATETIMEEDIT_TIME )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QTime( hbqt_par_QDateTimeEdit( 1 )->time() ), release_QTime ) );
hb_retptrGC( gcAllocate_QTime( new QTime( hbqt_par_QDateTimeEdit( 1 )->time() ) ) );
}
/*

81
harbour/contrib/hbqt/qtgui/QDesktopWidget.cpp
View File

@@ -76,59 +76,76 @@
* ~QDesktopWidget ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QDesktopWidget > pq;
} QGC_POINTER_QDesktopWidget;
QT_G_FUNC( release_QDesktopWidget )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QDesktopWidget %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QDesktopWidget * p = ( QGC_POINTER_QDesktopWidget * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QDesktopWidget p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QDesktopWidget ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QDesktopWidget * ) ph )->~QDesktopWidget();
ph = NULL;
( ( QDesktopWidget * ) p->ph )->~QDesktopWidget();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QDesktopWidget Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QDesktopWidget %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QDesktopWidget" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QDesktopWidget Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QDesktopWidget" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QDesktopWidget" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QDesktopWidget Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QDesktopWidget" );
#endif
}
}
void * gcAllocate_QDesktopWidget( void * pObj )
{
QGC_POINTER_QDesktopWidget * p = ( QGC_POINTER_QDesktopWidget * ) hb_gcAllocate( sizeof( QGC_POINTER_QDesktopWidget ), gcFuncs() );
p->ph = pObj;
p->func = release_QDesktopWidget;
new( & p->pq ) QPointer< QDesktopWidget >( ( QDesktopWidget * ) pObj );
#if defined(__debug__)
just_debug( " new_QDesktopWidget %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QDESKTOPWIDGET )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QDesktopWidget > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QDesktopWidget %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = new QDesktopWidget() ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QDesktopWidget;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QDesktopWidget( pObj ) );
}
/*
* const QRect availableGeometry ( int screen = -1 ) const
*/
HB_FUNC( QT_QDESKTOPWIDGET_AVAILABLEGEOMETRY )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QDesktopWidget( 1 )->availableGeometry( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : -1 ) ) ), release_QRect ) );
hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QDesktopWidget( 1 )->availableGeometry( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : -1 ) ) ) ) );
}
/*
@@ -136,7 +153,7 @@ HB_FUNC( QT_QDESKTOPWIDGET_AVAILABLEGEOMETRY )
*/
HB_FUNC( QT_QDESKTOPWIDGET_AVAILABLEGEOMETRY_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QDesktopWidget( 1 )->availableGeometry( hbqt_par_QWidget( 2 ) ) ), release_QRect ) );
hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QDesktopWidget( 1 )->availableGeometry( hbqt_par_QWidget( 2 ) ) ) ) );
}
/*
@@ -144,7 +161,7 @@ HB_FUNC( QT_QDESKTOPWIDGET_AVAILABLEGEOMETRY_1 )
*/
HB_FUNC( QT_QDESKTOPWIDGET_AVAILABLEGEOMETRY_2 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QDesktopWidget( 1 )->availableGeometry( *hbqt_par_QPoint( 2 ) ) ), release_QRect ) );
hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QDesktopWidget( 1 )->availableGeometry( *hbqt_par_QPoint( 2 ) ) ) ) );
}
/*
@@ -184,7 +201,7 @@ HB_FUNC( QT_QDESKTOPWIDGET_SCREEN )
*/
HB_FUNC( QT_QDESKTOPWIDGET_SCREENGEOMETRY )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QDesktopWidget( 1 )->screenGeometry( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : -1 ) ) ), release_QRect ) );
hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QDesktopWidget( 1 )->screenGeometry( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : -1 ) ) ) ) );
}
/*
@@ -192,7 +209,7 @@ HB_FUNC( QT_QDESKTOPWIDGET_SCREENGEOMETRY )
*/
HB_FUNC( QT_QDESKTOPWIDGET_SCREENGEOMETRY_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QDesktopWidget( 1 )->screenGeometry( hbqt_par_QWidget( 2 ) ) ), release_QRect ) );
hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QDesktopWidget( 1 )->screenGeometry( hbqt_par_QWidget( 2 ) ) ) ) );
}
/*
@@ -200,7 +217,7 @@ HB_FUNC( QT_QDESKTOPWIDGET_SCREENGEOMETRY_1 )
*/
HB_FUNC( QT_QDESKTOPWIDGET_SCREENGEOMETRY_2 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QDesktopWidget( 1 )->screenGeometry( *hbqt_par_QPoint( 2 ) ) ), release_QRect ) );
hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QDesktopWidget( 1 )->screenGeometry( *hbqt_par_QPoint( 2 ) ) ) ) );
}
/*

69
harbour/contrib/hbqt/qtgui/QDial.cpp
View File

@@ -76,52 +76,69 @@
* ~QDial ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QDial > pq;
} QGC_POINTER_QDial;
QT_G_FUNC( release_QDial )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QDial %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QDial * p = ( QGC_POINTER_QDial * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QDial p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QDial ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QDial * ) ph )->~QDial();
ph = NULL;
( ( QDial * ) p->ph )->~QDial();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QDial Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QDial %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QDial" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QDial Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QDial" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QDial" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QDial Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QDial" );
#endif
}
}
void * gcAllocate_QDial( void * pObj )
{
QGC_POINTER_QDial * p = ( QGC_POINTER_QDial * ) hb_gcAllocate( sizeof( QGC_POINTER_QDial ), gcFuncs() );
p->ph = pObj;
p->func = release_QDial;
new( & p->pq ) QPointer< QDial >( ( QDial * ) pObj );
#if defined(__debug__)
just_debug( " new_QDial %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QDIAL )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QDial > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QDial %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = ( QDial* ) new QDial( hbqt_par_QWidget( 1 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QDial;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QDial( pObj ) );
}
/*
* int notchSize () const

69
harbour/contrib/hbqt/qtgui/QDialog.cpp
View File

@@ -80,52 +80,69 @@
* ~QDialog ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QDialog > pq;
} QGC_POINTER_QDialog;
QT_G_FUNC( release_QDialog )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QDialog %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QDialog * p = ( QGC_POINTER_QDialog * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QDialog p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QDialog ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QDialog * ) ph )->~QDialog();
ph = NULL;
( ( QDialog * ) p->ph )->~QDialog();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QDialog Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QDialog %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QDialog" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QDialog Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QDialog" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QDialog" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QDialog Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QDialog" );
#endif
}
}
void * gcAllocate_QDialog( void * pObj )
{
QGC_POINTER_QDialog * p = ( QGC_POINTER_QDialog * ) hb_gcAllocate( sizeof( QGC_POINTER_QDialog ), gcFuncs() );
p->ph = pObj;
p->func = release_QDialog;
new( & p->pq ) QPointer< QDialog >( ( QDialog * ) pObj );
#if defined(__debug__)
just_debug( " new_QDialog %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QDIALOG )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QDialog > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QDialog %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = new QDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QDialog;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QDialog( pObj ) );
}
/*
* bool isSizeGripEnabled () const

89
harbour/contrib/hbqt/qtgui/QDirModel.cpp
View File

@@ -81,52 +81,69 @@
* ~QDirModel ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QDirModel > pq;
} QGC_POINTER_QDirModel;
QT_G_FUNC( release_QDirModel )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QDirModel %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QDirModel * p = ( QGC_POINTER_QDirModel * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QDirModel p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QDirModel ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QDirModel * ) ph )->~QDirModel();
ph = NULL;
( ( QDirModel * ) p->ph )->~QDirModel();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QDirModel Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QDirModel %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QDirModel" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QDirModel Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QDirModel" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QDirModel" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QDirModel Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QDirModel" );
#endif
}
}
void * gcAllocate_QDirModel( void * pObj )
{
QGC_POINTER_QDirModel * p = ( QGC_POINTER_QDirModel * ) hb_gcAllocate( sizeof( QGC_POINTER_QDirModel ), gcFuncs() );
p->ph = pObj;
p->func = release_QDirModel;
new( & p->pq ) QPointer< QDirModel >( ( QDirModel * ) pObj );
#if defined(__debug__)
just_debug( " new_QDirModel %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QDIRMODEL )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QDirModel > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QDirModel %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = ( QDirModel* ) new QDirModel( hbqt_par_QObject( 1 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QDirModel;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QDirModel( pObj ) );
}
/*
* virtual int columnCount ( const QModelIndex & parent = QModelIndex() ) const
@@ -141,7 +158,7 @@ HB_FUNC( QT_QDIRMODEL_COLUMNCOUNT )
*/
HB_FUNC( QT_QDIRMODEL_DATA )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QDirModel( 1 )->data( *hbqt_par_QModelIndex( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::DisplayRole ) ) ), release_QVariant ) );
hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QDirModel( 1 )->data( *hbqt_par_QModelIndex( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::DisplayRole ) ) ) ) );
}
/*
@@ -157,7 +174,7 @@ HB_FUNC( QT_QDIRMODEL_DROPMIMEDATA )
*/
HB_FUNC( QT_QDIRMODEL_FILEICON )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QDirModel( 1 )->fileIcon( *hbqt_par_QModelIndex( 2 ) ) ), release_QIcon ) );
hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QDirModel( 1 )->fileIcon( *hbqt_par_QModelIndex( 2 ) ) ) ) );
}
/*
@@ -165,7 +182,7 @@ HB_FUNC( QT_QDIRMODEL_FILEICON )
*/
HB_FUNC( QT_QDIRMODEL_FILEINFO )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QFileInfo( hbqt_par_QDirModel( 1 )->fileInfo( *hbqt_par_QModelIndex( 2 ) ) ), release_QFileInfo ) );
hb_retptrGC( gcAllocate_QFileInfo( new QFileInfo( hbqt_par_QDirModel( 1 )->fileInfo( *hbqt_par_QModelIndex( 2 ) ) ) ) );
}
/*
@@ -213,7 +230,7 @@ HB_FUNC( QT_QDIRMODEL_HASCHILDREN )
*/
HB_FUNC( QT_QDIRMODEL_HEADERDATA )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QDirModel( 1 )->headerData( hb_parni( 2 ), ( Qt::Orientation ) hb_parni( 3 ), ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : Qt::DisplayRole ) ) ), release_QVariant ) );
hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QDirModel( 1 )->headerData( hb_parni( 2 ), ( Qt::Orientation ) hb_parni( 3 ), ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : Qt::DisplayRole ) ) ) ) );
}
/*
@@ -229,7 +246,7 @@ HB_FUNC( QT_QDIRMODEL_ICONPROVIDER )
*/
HB_FUNC( QT_QDIRMODEL_INDEX )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QDirModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ), release_QModelIndex ) );
hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QDirModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ) ) );
}
/*
@@ -237,7 +254,7 @@ HB_FUNC( QT_QDIRMODEL_INDEX )
*/
HB_FUNC( QT_QDIRMODEL_INDEX_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QDirModel( 1 )->index( hbqt_par_QString( 2 ), hb_parni( 3 ) ) ), release_QModelIndex ) );
hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QDirModel( 1 )->index( hbqt_par_QString( 2 ), hb_parni( 3 ) ) ) ) );
}
/*
@@ -269,7 +286,7 @@ HB_FUNC( QT_QDIRMODEL_LAZYCHILDCOUNT )
*/
HB_FUNC( QT_QDIRMODEL_MIMETYPES )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QDirModel( 1 )->mimeTypes() ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QDirModel( 1 )->mimeTypes() ) ) );
}
/*
@@ -277,7 +294,7 @@ HB_FUNC( QT_QDIRMODEL_MIMETYPES )
*/
HB_FUNC( QT_QDIRMODEL_MKDIR )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QDirModel( 1 )->mkdir( *hbqt_par_QModelIndex( 2 ), hbqt_par_QString( 3 ) ) ), release_QModelIndex ) );
hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QDirModel( 1 )->mkdir( *hbqt_par_QModelIndex( 2 ), hbqt_par_QString( 3 ) ) ) ) );
}
/*
@@ -285,7 +302,7 @@ HB_FUNC( QT_QDIRMODEL_MKDIR )
*/
HB_FUNC( QT_QDIRMODEL_NAMEFILTERS )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QDirModel( 1 )->nameFilters() ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QDirModel( 1 )->nameFilters() ) ) );
}
/*
@@ -293,7 +310,7 @@ HB_FUNC( QT_QDIRMODEL_NAMEFILTERS )
*/
HB_FUNC( QT_QDIRMODEL_PARENT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QDirModel( 1 )->parent( *hbqt_par_QModelIndex( 2 ) ) ), release_QModelIndex ) );
hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QDirModel( 1 )->parent( *hbqt_par_QModelIndex( 2 ) ) ) ) );
}
/*

69
harbour/contrib/hbqt/qtgui/QDockWidget.cpp
View File

@@ -82,52 +82,69 @@
* ~QDockWidget ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QDockWidget > pq;
} QGC_POINTER_QDockWidget;
QT_G_FUNC( release_QDockWidget )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QDockWidget %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QDockWidget * p = ( QGC_POINTER_QDockWidget * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QDockWidget p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QDockWidget ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QDockWidget * ) ph )->~QDockWidget();
ph = NULL;
( ( QDockWidget * ) p->ph )->~QDockWidget();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QDockWidget Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QDockWidget %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QDockWidget" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QDockWidget Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QDockWidget" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QDockWidget" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QDockWidget Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QDockWidget" );
#endif
}
}
void * gcAllocate_QDockWidget( void * pObj )
{
QGC_POINTER_QDockWidget * p = ( QGC_POINTER_QDockWidget * ) hb_gcAllocate( sizeof( QGC_POINTER_QDockWidget ), gcFuncs() );
p->ph = pObj;
p->func = release_QDockWidget;
new( & p->pq ) QPointer< QDockWidget >( ( QDockWidget * ) pObj );
#if defined(__debug__)
just_debug( " new_QDockWidget %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QDOCKWIDGET )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QDockWidget > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QDockWidget %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = new QDockWidget( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QDockWidget;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QDockWidget( pObj ) );
}
/*
* Qt::DockWidgetAreas allowedAreas () const

69
harbour/contrib/hbqt/qtgui/QDoubleSpinBox.cpp
View File

@@ -75,52 +75,69 @@
* QDoubleSpinBox ( QWidget * parent = 0 )
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QDoubleSpinBox > pq;
} QGC_POINTER_QDoubleSpinBox;
QT_G_FUNC( release_QDoubleSpinBox )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QDoubleSpinBox %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QDoubleSpinBox * p = ( QGC_POINTER_QDoubleSpinBox * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QDoubleSpinBox p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QDoubleSpinBox ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QDoubleSpinBox * ) ph )->~QDoubleSpinBox();
ph = NULL;
( ( QDoubleSpinBox * ) p->ph )->~QDoubleSpinBox();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QDoubleSpinBox Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QDoubleSpinBox %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QDoubleSpinBox" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QDoubleSpinBox Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QDoubleSpinBox" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QDoubleSpinBox" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QDoubleSpinBox Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QDoubleSpinBox" );
#endif
}
}
void * gcAllocate_QDoubleSpinBox( void * pObj )
{
QGC_POINTER_QDoubleSpinBox * p = ( QGC_POINTER_QDoubleSpinBox * ) hb_gcAllocate( sizeof( QGC_POINTER_QDoubleSpinBox ), gcFuncs() );
p->ph = pObj;
p->func = release_QDoubleSpinBox;
new( & p->pq ) QPointer< QDoubleSpinBox >( ( QDoubleSpinBox * ) pObj );
#if defined(__debug__)
just_debug( " new_QDoubleSpinBox %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QDOUBLESPINBOX )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QDoubleSpinBox > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QDoubleSpinBox %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = ( QDoubleSpinBox* ) new QDoubleSpinBox( hbqt_par_QWidget( 1 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QDoubleSpinBox;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QDoubleSpinBox( pObj ) );
}
/*
* QString cleanText () const

26
harbour/contrib/hbqt/qtgui/QDragEnterEvent.cpp
View File

@@ -77,31 +77,7 @@
QT_G_FUNC( release_QDragEnterEvent )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QDragEnterEvent %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QDragEnterEvent * ) ph )->~QDragEnterEvent();
ph = NULL;
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QDragEnterEvent" ); OutputDebugString( str );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QDragEnterEvent" ); OutputDebugString( str );
#endif
}
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QDRAGENTEREVENT )

26
harbour/contrib/hbqt/qtgui/QDragLeaveEvent.cpp
View File

@@ -77,31 +77,7 @@
QT_G_FUNC( release_QDragLeaveEvent )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QDragLeaveEvent %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QDragLeaveEvent * ) ph )->~QDragLeaveEvent();
ph = NULL;
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QDragLeaveEvent" ); OutputDebugString( str );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QDragLeaveEvent" ); OutputDebugString( str );
#endif
}
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QDRAGLEAVEEVENT )

18
harbour/contrib/hbqt/qtgui/QDragMoveEvent.cpp
View File

@@ -78,21 +78,7 @@
QT_G_FUNC( release_QDragMoveEvent )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QDragMoveEvent %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
{
( ( QDragMoveEvent * ) ph )->~QDragMoveEvent();
ph = NULL;
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QDragMoveEvent" ); OutputDebugString( str );
#endif
}
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QDRAGMOVEEVENT )
@@ -119,7 +105,7 @@ HB_FUNC( QT_QDRAGMOVEEVENT_ACCEPT_1 )
*/
HB_FUNC( QT_QDRAGMOVEEVENT_ANSWERRECT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QRect( hbqt_par_QDragMoveEvent( 1 )->answerRect() ), release_QRect ) );
hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QDragMoveEvent( 1 )->answerRect() ) ) );
}
/*

18
harbour/contrib/hbqt/qtgui/QDropEvent.cpp
View File

@@ -77,21 +77,7 @@
QT_G_FUNC( release_QDropEvent )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QDropEvent %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
{
( ( QDropEvent * ) ph )->~QDropEvent();
ph = NULL;
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QDropEvent" ); OutputDebugString( str );
#endif
}
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QDROPEVENT )
@@ -142,7 +128,7 @@ HB_FUNC( QT_QDROPEVENT_MOUSEBUTTONS )
*/
HB_FUNC( QT_QDROPEVENT_POS )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QPoint( hbqt_par_QDropEvent( 1 )->pos() ), release_QPoint ) );
hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QDropEvent( 1 )->pos() ) ) );
}
/*

69
harbour/contrib/hbqt/qtgui/QErrorMessage.cpp
View File

@@ -85,52 +85,69 @@
* ~QErrorMessage ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QErrorMessage > pq;
} QGC_POINTER_QErrorMessage;
QT_G_FUNC( release_QErrorMessage )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QErrorMessage %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QErrorMessage * p = ( QGC_POINTER_QErrorMessage * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QErrorMessage p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QErrorMessage ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QErrorMessage * ) ph )->~QErrorMessage();
ph = NULL;
( ( QErrorMessage * ) p->ph )->~QErrorMessage();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QErrorMessage Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QErrorMessage %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QErrorMessage" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QErrorMessage Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QErrorMessage" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QErrorMessage" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QErrorMessage Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QErrorMessage" );
#endif
}
}
void * gcAllocate_QErrorMessage( void * pObj )
{
QGC_POINTER_QErrorMessage * p = ( QGC_POINTER_QErrorMessage * ) hb_gcAllocate( sizeof( QGC_POINTER_QErrorMessage ), gcFuncs() );
p->ph = pObj;
p->func = release_QErrorMessage;
new( & p->pq ) QPointer< QErrorMessage >( ( QErrorMessage * ) pObj );
#if defined(__debug__)
just_debug( " new_QErrorMessage %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QERRORMESSAGE )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QErrorMessage > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QErrorMessage %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = ( QErrorMessage* ) new QErrorMessage( hbqt_par_QWidget( 1 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QErrorMessage;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QErrorMessage( pObj ) );
}
/*
* void showMessage ( const QString & message, const QString & type )

79
harbour/contrib/hbqt/qtgui/QFileDialog.cpp
View File

@@ -103,42 +103,65 @@
* ~QFileDialog ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QFileDialog > pq;
} QGC_POINTER_QFileDialog;
QT_G_FUNC( release_QFileDialog )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QFileDialog %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QFileDialog * p = ( QGC_POINTER_QFileDialog * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QFileDialog p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QFileDialog ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QFileDialog * ) ph )->~QFileDialog();
ph = NULL;
( ( QFileDialog * ) p->ph )->~QFileDialog();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QFileDialog Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QFileDialog %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QFileDialog" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QFileDialog Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QFileDialog" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QFileDialog" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QFileDialog Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QFileDialog" );
#endif
}
}
void * gcAllocate_QFileDialog( void * pObj )
{
QGC_POINTER_QFileDialog * p = ( QGC_POINTER_QFileDialog * ) hb_gcAllocate( sizeof( QGC_POINTER_QFileDialog ), gcFuncs() );
p->ph = pObj;
p->func = release_QFileDialog;
new( & p->pq ) QPointer< QFileDialog >( ( QFileDialog * ) pObj );
#if defined(__debug__)
just_debug( " new_QFileDialog %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QFILEDIALOG )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QFileDialog > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QFileDialog %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
if( hb_pcount() == 1 && HB_ISPOINTER( 1 ) )
{
@@ -153,13 +176,7 @@ hb_snprintf( str, sizeof(str), " GC: new QFileDialog %i B %i
pObj = new QFileDialog() ;
}
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QFileDialog;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QFileDialog( pObj ) );
}
/*
* AcceptMode acceptMode () const
@@ -190,7 +207,7 @@ HB_FUNC( QT_QFILEDIALOG_DEFAULTSUFFIX )
*/
HB_FUNC( QT_QFILEDIALOG_DIRECTORY )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDir( hbqt_par_QFileDialog( 1 )->directory() ), release_QDir ) );
hb_retptrGC( gcAllocate_QDir( new QDir( hbqt_par_QFileDialog( 1 )->directory() ) ) );
}
/*
@@ -214,7 +231,7 @@ HB_FUNC( QT_QFILEDIALOG_FILTER )
*/
HB_FUNC( QT_QFILEDIALOG_HISTORY )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QFileDialog( 1 )->history() ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QFileDialog( 1 )->history() ) ) );
}
/*
@@ -262,7 +279,7 @@ HB_FUNC( QT_QFILEDIALOG_LABELTEXT )
*/
HB_FUNC( QT_QFILEDIALOG_NAMEFILTERS )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QFileDialog( 1 )->nameFilters() ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QFileDialog( 1 )->nameFilters() ) ) );
}
/*
@@ -302,7 +319,7 @@ HB_FUNC( QT_QFILEDIALOG_RESTORESTATE )
*/
HB_FUNC( QT_QFILEDIALOG_SAVESTATE )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QByteArray( hbqt_par_QFileDialog( 1 )->saveState() ), release_QByteArray ) );
hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QFileDialog( 1 )->saveState() ) ) );
}
/*
@@ -326,7 +343,7 @@ HB_FUNC( QT_QFILEDIALOG_SELECTNAMEFILTER )
*/
HB_FUNC( QT_QFILEDIALOG_SELECTEDFILES )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QFileDialog( 1 )->selectedFiles() ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QFileDialog( 1 )->selectedFiles() ) ) );
}
/*

54
harbour/contrib/hbqt/qtgui/QFileIconProvider.cpp
View File

@@ -81,47 +81,55 @@
QT_G_FUNC( release_QFileIconProvider )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QFileIconProvider %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QFileIconProvider p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QFileIconProvider ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QFileIconProvider * ) ph )->~QFileIconProvider();
ph = NULL;
( ( QFileIconProvider * ) p->ph )->~QFileIconProvider();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QFileIconProvider Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QFileIconProvider %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QFileIconProvider" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QFileIconProvider Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QFileIconProvider" );
#endif
}
}
void * gcAllocate_QFileIconProvider( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QFileIconProvider;
#if defined(__debug__)
just_debug( " new_QFileIconProvider %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QFILEICONPROVIDER )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QFileIconProvider %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
pObj = new QFileIconProvider() ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QFileIconProvider;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QFileIconProvider( pObj ) );
}
/*
* virtual QIcon icon ( IconType type ) const
*/
HB_FUNC( QT_QFILEICONPROVIDER_ICON )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QFileIconProvider( 1 )->icon( ( QFileIconProvider::IconType ) hb_parni( 2 ) ) ), release_QIcon ) );
hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QFileIconProvider( 1 )->icon( ( QFileIconProvider::IconType ) hb_parni( 2 ) ) ) ) );
}
/*
@@ -129,7 +137,7 @@ HB_FUNC( QT_QFILEICONPROVIDER_ICON )
*/
HB_FUNC( QT_QFILEICONPROVIDER_ICON_1 )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QFileIconProvider( 1 )->icon( *hbqt_par_QFileInfo( 2 ) ) ), release_QIcon ) );
hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QFileIconProvider( 1 )->icon( *hbqt_par_QFileInfo( 2 ) ) ) ) );
}
/*

89
harbour/contrib/hbqt/qtgui/QFileSystemModel.cpp
View File

@@ -80,52 +80,69 @@
* ~QFileSystemModel ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QFileSystemModel > pq;
} QGC_POINTER_QFileSystemModel;
QT_G_FUNC( release_QFileSystemModel )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QFileSystemModel %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QFileSystemModel * p = ( QGC_POINTER_QFileSystemModel * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QFileSystemModel p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QFileSystemModel ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QFileSystemModel * ) ph )->~QFileSystemModel();
ph = NULL;
( ( QFileSystemModel * ) p->ph )->~QFileSystemModel();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QFileSystemModel Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QFileSystemModel %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QFileSystemModel" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QFileSystemModel Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QFileSystemModel" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QFileSystemModel" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QFileSystemModel Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QFileSystemModel" );
#endif
}
}
void * gcAllocate_QFileSystemModel( void * pObj )
{
QGC_POINTER_QFileSystemModel * p = ( QGC_POINTER_QFileSystemModel * ) hb_gcAllocate( sizeof( QGC_POINTER_QFileSystemModel ), gcFuncs() );
p->ph = pObj;
p->func = release_QFileSystemModel;
new( & p->pq ) QPointer< QFileSystemModel >( ( QFileSystemModel * ) pObj );
#if defined(__debug__)
just_debug( " new_QFileSystemModel %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QFILESYSTEMMODEL )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QFileSystemModel > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QFileSystemModel %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = ( QFileSystemModel * ) new QFileSystemModel() ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QFileSystemModel;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QFileSystemModel( pObj ) );
}
/*
* virtual bool dropMimeData ( const QMimeData * data, Qt::DropAction action, int row, int column, const QModelIndex & parent )
@@ -140,7 +157,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_DROPMIMEDATA )
*/
HB_FUNC( QT_QFILESYSTEMMODEL_FILEICON )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QIcon( hbqt_par_QFileSystemModel( 1 )->fileIcon( *hbqt_par_QModelIndex( 2 ) ) ), release_QIcon ) );
hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QFileSystemModel( 1 )->fileIcon( *hbqt_par_QModelIndex( 2 ) ) ) ) );
}
/*
@@ -148,7 +165,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_FILEICON )
*/
HB_FUNC( QT_QFILESYSTEMMODEL_FILEINFO )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QFileInfo( hbqt_par_QFileSystemModel( 1 )->fileInfo( *hbqt_par_QModelIndex( 2 ) ) ), release_QFileInfo ) );
hb_retptrGC( gcAllocate_QFileInfo( new QFileInfo( hbqt_par_QFileSystemModel( 1 )->fileInfo( *hbqt_par_QModelIndex( 2 ) ) ) ) );
}
/*
@@ -180,7 +197,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_FILTER )
*/
HB_FUNC( QT_QFILESYSTEMMODEL_INDEX )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QFileSystemModel( 1 )->index( hbqt_par_QString( 2 ), hb_parni( 3 ) ) ), release_QModelIndex ) );
hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QFileSystemModel( 1 )->index( hbqt_par_QString( 2 ), hb_parni( 3 ) ) ) ) );
}
/*
@@ -204,7 +221,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_ISREADONLY )
*/
HB_FUNC( QT_QFILESYSTEMMODEL_LASTMODIFIED )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDateTime( hbqt_par_QFileSystemModel( 1 )->lastModified( *hbqt_par_QModelIndex( 2 ) ) ), release_QDateTime ) );
hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QFileSystemModel( 1 )->lastModified( *hbqt_par_QModelIndex( 2 ) ) ) ) );
}
/*
@@ -212,7 +229,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_LASTMODIFIED )
*/
HB_FUNC( QT_QFILESYSTEMMODEL_MIMETYPES )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QFileSystemModel( 1 )->mimeTypes() ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QFileSystemModel( 1 )->mimeTypes() ) ) );
}
/*
@@ -220,7 +237,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_MIMETYPES )
*/
HB_FUNC( QT_QFILESYSTEMMODEL_MKDIR )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QFileSystemModel( 1 )->mkdir( *hbqt_par_QModelIndex( 2 ), hbqt_par_QString( 3 ) ) ), release_QModelIndex ) );
hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QFileSystemModel( 1 )->mkdir( *hbqt_par_QModelIndex( 2 ), hbqt_par_QString( 3 ) ) ) ) );
}
/*
@@ -228,7 +245,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_MKDIR )
*/
HB_FUNC( QT_QFILESYSTEMMODEL_MYCOMPUTER )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QVariant( hbqt_par_QFileSystemModel( 1 )->myComputer( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : Qt::DisplayRole ) ) ), release_QVariant ) );
hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QFileSystemModel( 1 )->myComputer( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : Qt::DisplayRole ) ) ) ) );
}
/*
@@ -244,7 +261,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_NAMEFILTERDISABLES )
*/
HB_FUNC( QT_QFILESYSTEMMODEL_NAMEFILTERS )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QFileSystemModel( 1 )->nameFilters() ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QFileSystemModel( 1 )->nameFilters() ) ) );
}
/*
@@ -284,7 +301,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_RMDIR )
*/
HB_FUNC( QT_QFILESYSTEMMODEL_ROOTDIRECTORY )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QDir( hbqt_par_QFileSystemModel( 1 )->rootDirectory() ), release_QDir ) );
hb_retptrGC( gcAllocate_QDir( new QDir( hbqt_par_QFileSystemModel( 1 )->rootDirectory() ) ) );
}
/*
@@ -340,7 +357,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_SETRESOLVESYMLINKS )
*/
HB_FUNC( QT_QFILESYSTEMMODEL_SETROOTPATH )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QModelIndex( hbqt_par_QFileSystemModel( 1 )->setRootPath( hbqt_par_QString( 2 ) ) ), release_QModelIndex ) );
hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QFileSystemModel( 1 )->setRootPath( hbqt_par_QString( 2 ) ) ) ) );
}
/*

26
harbour/contrib/hbqt/qtgui/QFocusEvent.cpp
View File

@@ -77,31 +77,7 @@
QT_G_FUNC( release_QFocusEvent )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QFocusEvent %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QFocusEvent * ) ph )->~QFocusEvent();
ph = NULL;
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QFocusEvent" ); OutputDebugString( str );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QFocusEvent" ); OutputDebugString( str );
#endif
}
HB_SYMBOL_UNUSED( Cargo );
}
HB_FUNC( QT_QFOCUSEVENT )

69
harbour/contrib/hbqt/qtgui/QFocusFrame.cpp
View File

@@ -76,52 +76,69 @@
* ~QFocusFrame ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QFocusFrame > pq;
} QGC_POINTER_QFocusFrame;
QT_G_FUNC( release_QFocusFrame )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QFocusFrame %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QFocusFrame * p = ( QGC_POINTER_QFocusFrame * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QFocusFrame p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QFocusFrame ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QFocusFrame * ) ph )->~QFocusFrame();
ph = NULL;
( ( QFocusFrame * ) p->ph )->~QFocusFrame();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QFocusFrame Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QFocusFrame %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QFocusFrame" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QFocusFrame Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QFocusFrame" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QFocusFrame" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QFocusFrame Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QFocusFrame" );
#endif
}
}
void * gcAllocate_QFocusFrame( void * pObj )
{
QGC_POINTER_QFocusFrame * p = ( QGC_POINTER_QFocusFrame * ) hb_gcAllocate( sizeof( QGC_POINTER_QFocusFrame ), gcFuncs() );
p->ph = pObj;
p->func = release_QFocusFrame;
new( & p->pq ) QPointer< QFocusFrame >( ( QFocusFrame * ) pObj );
#if defined(__debug__)
just_debug( " new_QFocusFrame %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QFOCUSFRAME )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QFocusFrame > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QFocusFrame %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = ( QFocusFrame* ) new QFocusFrame( hbqt_par_QWidget( 1 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QFocusFrame;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QFocusFrame( pObj ) );
}
/*
* void setWidget ( QWidget * widget )

54
harbour/contrib/hbqt/qtgui/QFont.cpp
View File

@@ -91,30 +91,44 @@
QT_G_FUNC( release_QFont )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QFont %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER * p = ( QGC_POINTER * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QFont p=%p", p ) );
HB_TRACE( HB_TR_DEBUG, ( "release_QFont ph=%p", p->ph ) );
if( p && p->ph )
{
( ( QFont * ) ph )->~QFont();
ph = NULL;
( ( QFont * ) p->ph )->~QFont();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QFont Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QFont %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QFont" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QFont Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QFont" );
#endif
}
}
void * gcAllocate_QFont( void * pObj )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
p->ph = pObj;
p->func = release_QFont;
#if defined(__debug__)
just_debug( " new_QFont %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QFONT )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
void * pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QFont %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
if( hb_pcount() == 1 && HB_ISCHAR( 1 ) )
{
@@ -145,13 +159,7 @@ hb_snprintf( str, sizeof(str), " GC: new QFont %i B %i
pObj = ( QFont* ) new QFont() ;
}
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QFont;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QFont( pObj ) );
}
/*
* bool bold () const
@@ -606,7 +614,7 @@ HB_FUNC( QT_QFONT_SUBSTITUTE )
*/
HB_FUNC( QT_QFONT_SUBSTITUTES )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QFont( 1 )->substitutes( hbqt_par_QString( 2 ) ) ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QFont( 1 )->substitutes( hbqt_par_QString( 2 ) ) ) ) );
}
/*
@@ -614,7 +622,7 @@ HB_FUNC( QT_QFONT_SUBSTITUTES )
*/
HB_FUNC( QT_QFONT_SUBSTITUTIONS )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QStringList( hbqt_par_QFont( 1 )->substitutions() ), release_QStringList ) );
hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QFont( 1 )->substitutions() ) ) );
}

71
harbour/contrib/hbqt/qtgui/QFontComboBox.cpp
View File

@@ -81,59 +81,76 @@
* ~QFontComboBox ()
*/
typedef struct
{
void * ph;
QT_G_FUNC_PTR func;
QPointer< QFontComboBox > pq;
} QGC_POINTER_QFontComboBox;
QT_G_FUNC( release_QFontComboBox )
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "release_QFontComboBox %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * ph = ( void * ) Cargo;
if( ph )
QGC_POINTER_QFontComboBox * p = ( QGC_POINTER_QFontComboBox * ) Cargo;
HB_TRACE( HB_TR_DEBUG, ( "release_QFontComboBox p=%p", p));
HB_TRACE( HB_TR_DEBUG, ( "release_QFontComboBox ph=%p pq=%p", p->ph, (void *)(p->pq)));
if( p && p->ph && p->pq )
{
const QMetaObject * m = ( ( QObject * ) ph )->metaObject();
const QMetaObject * m = ( ( QObject * ) p->ph )->metaObject();
if( ( QString ) m->className() != ( QString ) "QObject" )
{
( ( QFontComboBox * ) ph )->~QFontComboBox();
ph = NULL;
( ( QFontComboBox * ) p->ph )->~QFontComboBox();
p->ph = NULL;
HB_TRACE( HB_TR_DEBUG, ( "release_QFontComboBox Object deleted!" ) );
#if defined(__debug__)
just_debug( " YES release_QFontComboBox %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " Object Name Missing: QFontComboBox" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QFontComboBox Object Name Missing!" ) );
#if defined(__debug__)
just_debug( " NO release_QFontComboBox" );
#endif
}
}
else
{
#if defined(__debug__)
hb_snprintf( str, sizeof(str), "! ph____QFontComboBox" ); OutputDebugString( str );
#endif
HB_TRACE( HB_TR_DEBUG, ( "release_QFontComboBox Object Allready deleted!" ) );
#if defined(__debug__)
just_debug( " DEL release_QFontComboBox" );
#endif
}
}
void * gcAllocate_QFontComboBox( void * pObj )
{
QGC_POINTER_QFontComboBox * p = ( QGC_POINTER_QFontComboBox * ) hb_gcAllocate( sizeof( QGC_POINTER_QFontComboBox ), gcFuncs() );
p->ph = pObj;
p->func = release_QFontComboBox;
new( & p->pq ) QPointer< QFontComboBox >( ( QFontComboBox * ) pObj );
#if defined(__debug__)
just_debug( " new_QFontComboBox %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() );
#endif
return( p );
}
HB_FUNC( QT_QFONTCOMBOBOX )
{
QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() );
QPointer< QFontComboBox > pObj = NULL;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: new QFontComboBox %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
void * pObj = NULL;
pObj = ( QFontComboBox * ) new QFontComboBox( hbqt_par_QWidget( 1 ) ) ;
#if defined(__debug__)
hb_snprintf( str, sizeof(str), " GC: %i B %i KB", ( int ) hb_xquery( 1001 ), hb_getMemUsed() ); OutputDebugString( str );
#endif
p->ph = pObj;
p->func = release_QFontComboBox;
hb_retptrGC( p );
hb_retptrGC( gcAllocate_QFontComboBox( pObj ) );
}
/*
* QFont currentFont () const
*/
HB_FUNC( QT_QFONTCOMBOBOX_CURRENTFONT )
{
hb_retptrGC( hbqt_ptrTOgcpointer( new QFont( hbqt_par_QFontComboBox( 1 )->currentFont() ), release_QFont ) );
hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QFontComboBox( 1 )->currentFont() ) ) );
}
/*

Some files were not shown because too many files have changed in this diff Show More