diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 467934bda7..41f4bb1ae9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,15 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-12-18 10:19 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * INSTALL + + Added more generic link for QT OSS downloads. + + * contrib/hbqt/* + * Regenerated. + (Please list only '* contrib/hbqt/*' to avoid growing ChangeLog + with several hundred entries each time the generator changes) + 2009-12-18 09:58 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/hbqt_hbdbfmodel.cpp * contrib/hbqt/generator/hbqtgen.prg @@ -28,7 +37,7 @@ ! Fixed gcFuncs() to be named hbqt_gcFuncs(). This is a public function, please remember to prefix all public functions to have a lib specific prefix. - ; TODO: Regenerate. + ; TODO: Regenerate. [DONE] 2009-12-18 09:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL diff --git a/harbour/INSTALL b/harbour/INSTALL index 78ac925c9f..5c69a36ceb 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -1270,7 +1270,8 @@ HARBOUR HB_WITH_PNG - libpng [multiplatform, free, open-source] http://www.libpng.org/pub/png/libpng.html HB_WITH_QT - Nokia QT (GUI) [win, wce, darwin, linux, free, open-source] - http://qt.nokia.com/products + http://qt.nokia.com/products/ + http://get.qt.nokia.com/qt/source/ Currently supported Windows binary package: http://get.qt.nokia.com/qt/source/qt-win-opensource-4.5.3-mingw.exe How to create static and MSVC builds: diff --git a/harbour/contrib/hbqt/hbqt_garbage.h b/harbour/contrib/hbqt/hbqt_garbage.h index ecdf7b0f5f..251d6e567e 100644 --- a/harbour/contrib/hbqt/hbqt_garbage.h +++ b/harbour/contrib/hbqt/hbqt_garbage.h @@ -278,272 +278,272 @@ extern QT_G_FUNC( release_QWindowsStyle ); 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_QPlainTextEdit( 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_QSyntaxHighlighter( 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_QUiLoader( 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_QWizard( void * pObj ); -extern void * gcAllocate_QWizardPage( void * pObj ); +extern void * hbqt_gcAllocate_QAbstractButton( void * pObj ); +extern void * hbqt_gcAllocate_QAbstractItemDelegate( void * pObj ); +extern void * hbqt_gcAllocate_QAbstractItemModel( void * pObj ); +extern void * hbqt_gcAllocate_QAbstractItemView( void * pObj ); +extern void * hbqt_gcAllocate_QAbstractListModel( void * pObj ); +extern void * hbqt_gcAllocate_QAbstractProxyModel( void * pObj ); +extern void * hbqt_gcAllocate_QAbstractPrintDialog( void * pObj ); +extern void * hbqt_gcAllocate_QAbstractScrollArea( void * pObj ); +extern void * hbqt_gcAllocate_QAbstractSlider( void * pObj ); +extern void * hbqt_gcAllocate_QAbstractSpinBox( void * pObj ); +extern void * hbqt_gcAllocate_QAbstractTableModel( void * pObj ); +extern void * hbqt_gcAllocate_QAbstractTextDocumentLayout( void * pObj ); +extern void * hbqt_gcAllocate_QAction( void * pObj ); +extern void * hbqt_gcAllocate_QActionGroup( void * pObj ); +extern void * hbqt_gcAllocate_QApplication( void * pObj ); +extern void * hbqt_gcAllocate_QBitArray( void * pObj ); +extern void * hbqt_gcAllocate_QBitmap( void * pObj ); +extern void * hbqt_gcAllocate_QBoxLayout( void * pObj ); +extern void * hbqt_gcAllocate_QBrush( void * pObj ); +extern void * hbqt_gcAllocate_QButtonGroup( void * pObj ); +extern void * hbqt_gcAllocate_QByteArray( void * pObj ); +extern void * hbqt_gcAllocate_QCalendarWidget( void * pObj ); +extern void * hbqt_gcAllocate_QCheckBox( void * pObj ); +extern void * hbqt_gcAllocate_QClipboard( void * pObj ); +extern void * hbqt_gcAllocate_QColor( void * pObj ); +extern void * hbqt_gcAllocate_QColorDialog( void * pObj ); +extern void * hbqt_gcAllocate_QComboBox( void * pObj ); +extern void * hbqt_gcAllocate_QCommandLinkButton( void * pObj ); +extern void * hbqt_gcAllocate_QCommonStyle( void * pObj ); +extern void * hbqt_gcAllocate_QCompleter( void * pObj ); +extern void * hbqt_gcAllocate_QConicalGradient( void * pObj ); +extern void * hbqt_gcAllocate_QContextMenuEvent( void * pObj ); +extern void * hbqt_gcAllocate_QCoreApplication( void * pObj ); +extern void * hbqt_gcAllocate_QCursor( void * pObj ); +extern void * hbqt_gcAllocate_QDataStream( void * pObj ); +extern void * hbqt_gcAllocate_QDate( void * pObj ); +extern void * hbqt_gcAllocate_QDateEdit( void * pObj ); +extern void * hbqt_gcAllocate_QDateTime( void * pObj ); +extern void * hbqt_gcAllocate_QDateTimeEdit( void * pObj ); +extern void * hbqt_gcAllocate_QDesktopWidget( void * pObj ); +extern void * hbqt_gcAllocate_QDial( void * pObj ); +extern void * hbqt_gcAllocate_QDialog( void * pObj ); +extern void * hbqt_gcAllocate_QDir( void * pObj ); +extern void * hbqt_gcAllocate_QDirModel( void * pObj ); +extern void * hbqt_gcAllocate_QDockWidget( void * pObj ); +extern void * hbqt_gcAllocate_QDoubleSpinBox( void * pObj ); +extern void * hbqt_gcAllocate_QDropEvent( void * pObj ); +extern void * hbqt_gcAllocate_QDragMoveEvent( void * pObj ); +extern void * hbqt_gcAllocate_QDragEnterEvent( void * pObj ); +extern void * hbqt_gcAllocate_QDragLeaveEvent( void * pObj ); +extern void * hbqt_gcAllocate_QErrorMessage( void * pObj ); +extern void * hbqt_gcAllocate_QEvent( void * pObj ); +extern void * hbqt_gcAllocate_QEventLoop( void * pObj ); +extern void * hbqt_gcAllocate_QFile( void * pObj ); +extern void * hbqt_gcAllocate_QFileDialog( void * pObj ); +extern void * hbqt_gcAllocate_QFileInfo( void * pObj ); +extern void * hbqt_gcAllocate_QFileIconProvider( void * pObj ); +extern void * hbqt_gcAllocate_QFileSystemModel( void * pObj ); +extern void * hbqt_gcAllocate_QFocusEvent( void * pObj ); +extern void * hbqt_gcAllocate_QFocusFrame( void * pObj ); +extern void * hbqt_gcAllocate_QFont( void * pObj ); +extern void * hbqt_gcAllocate_QFontComboBox( void * pObj ); +extern void * hbqt_gcAllocate_QFontDatabase( void * pObj ); +extern void * hbqt_gcAllocate_QFontDialog( void * pObj ); +extern void * hbqt_gcAllocate_QFontInfo( void * pObj ); +extern void * hbqt_gcAllocate_QFontMetrics( void * pObj ); +extern void * hbqt_gcAllocate_QFontMetricsF( void * pObj ); +extern void * hbqt_gcAllocate_QFormLayout( void * pObj ); +extern void * hbqt_gcAllocate_QFrame( void * pObj ); +extern void * hbqt_gcAllocate_QFtp( void * pObj ); +extern void * hbqt_gcAllocate_QGradient( void * pObj ); +extern void * hbqt_gcAllocate_QGridLayout( void * pObj ); +extern void * hbqt_gcAllocate_QGroupBox( void * pObj ); +extern void * hbqt_gcAllocate_QHBoxLayout( void * pObj ); +extern void * hbqt_gcAllocate_QHeaderView( void * pObj ); +extern void * hbqt_gcAllocate_QHelpEvent( void * pObj ); +extern void * hbqt_gcAllocate_QHttp( void * pObj ); +extern void * hbqt_gcAllocate_QHttpRequestHeader( void * pObj ); +extern void * hbqt_gcAllocate_QHttpResponseHeader( void * pObj ); +extern void * hbqt_gcAllocate_QIcon( void * pObj ); +extern void * hbqt_gcAllocate_QInputContext( void * pObj ); +extern void * hbqt_gcAllocate_QInputMethodEvent( void * pObj ); +extern void * hbqt_gcAllocate_QImage( void * pObj ); +extern void * hbqt_gcAllocate_QImageReader( void * pObj ); +extern void * hbqt_gcAllocate_QImageWriter( void * pObj ); +extern void * hbqt_gcAllocate_QInputDialog( void * pObj ); +extern void * hbqt_gcAllocate_QInputEvent( void * pObj ); +extern void * hbqt_gcAllocate_QIODevice( void * pObj ); +extern void * hbqt_gcAllocate_QItemSelection( void * pObj ); +extern void * hbqt_gcAllocate_QItemSelectionModel( void * pObj ); +extern void * hbqt_gcAllocate_QKeyEvent( void * pObj ); +extern void * hbqt_gcAllocate_QKeySequence( void * pObj ); +extern void * hbqt_gcAllocate_QLabel( void * pObj ); +extern void * hbqt_gcAllocate_QLatin1Char( void * pObj ); +extern void * hbqt_gcAllocate_QLatin1String( void * pObj ); +extern void * hbqt_gcAllocate_QLayout( void * pObj ); +extern void * hbqt_gcAllocate_QLayoutItem( void * pObj ); +extern void * hbqt_gcAllocate_QLCDNumber( void * pObj ); +extern void * hbqt_gcAllocate_QLine( void * pObj ); +extern void * hbqt_gcAllocate_QLineF( void * pObj ); +extern void * hbqt_gcAllocate_QLinearGradient( void * pObj ); +extern void * hbqt_gcAllocate_QLineEdit( void * pObj ); +extern void * hbqt_gcAllocate_QList( void * pObj ); +extern void * hbqt_gcAllocate_QListView( void * pObj ); +extern void * hbqt_gcAllocate_QListWidget( void * pObj ); +extern void * hbqt_gcAllocate_QListWidgetItem( void * pObj ); +extern void * hbqt_gcAllocate_QLocale( void * pObj ); +extern void * hbqt_gcAllocate_QMainWindow( void * pObj ); +extern void * hbqt_gcAllocate_QMatrix( void * pObj ); +extern void * hbqt_gcAllocate_QMenu( void * pObj ); +extern void * hbqt_gcAllocate_QMenuBar( void * pObj ); +extern void * hbqt_gcAllocate_QMessageBox( void * pObj ); +extern void * hbqt_gcAllocate_QMimeData( void * pObj ); +extern void * hbqt_gcAllocate_QModelIndex( void * pObj ); +extern void * hbqt_gcAllocate_QMouseEvent( void * pObj ); +extern void * hbqt_gcAllocate_QMoveEvent( void * pObj ); +extern void * hbqt_gcAllocate_QMovie( void * pObj ); +extern void * hbqt_gcAllocate_QNetworkRequest( void * pObj ); +extern void * hbqt_gcAllocate_QObject( void * pObj ); +extern void * hbqt_gcAllocate_QPaintDevice( void * pObj ); +extern void * hbqt_gcAllocate_QPainterPath( void * pObj ); +extern void * hbqt_gcAllocate_QPageSetupDialog( void * pObj ); +extern void * hbqt_gcAllocate_QPainter( void * pObj ); +extern void * hbqt_gcAllocate_QPaintEvent( void * pObj ); +extern void * hbqt_gcAllocate_QPalette( void * pObj ); +extern void * hbqt_gcAllocate_QPen( void * pObj ); +extern void * hbqt_gcAllocate_QPicture( void * pObj ); +extern void * hbqt_gcAllocate_QPixmap( void * pObj ); +extern void * hbqt_gcAllocate_QPlainTextEdit( void * pObj ); +extern void * hbqt_gcAllocate_QPoint( void * pObj ); +extern void * hbqt_gcAllocate_QPointF( void * pObj ); +extern void * hbqt_gcAllocate_QPolygon( void * pObj ); +extern void * hbqt_gcAllocate_QPolygonF( void * pObj ); +extern void * hbqt_gcAllocate_QPrintDialog( void * pObj ); +extern void * hbqt_gcAllocate_QPrintEngine( void * pObj ); +extern void * hbqt_gcAllocate_QPrinter( void * pObj ); +extern void * hbqt_gcAllocate_QPrintPreviewDialog( void * pObj ); +extern void * hbqt_gcAllocate_QProcess( void * pObj ); +extern void * hbqt_gcAllocate_QProgressBar( void * pObj ); +extern void * hbqt_gcAllocate_QProgressDialog( void * pObj ); +extern void * hbqt_gcAllocate_QPushButton( void * pObj ); +extern void * hbqt_gcAllocate_QRadialGradient( void * pObj ); +extern void * hbqt_gcAllocate_QRadioButton( void * pObj ); +extern void * hbqt_gcAllocate_QRect( void * pObj ); +extern void * hbqt_gcAllocate_QRectF( void * pObj ); +extern void * hbqt_gcAllocate_QRegion( void * pObj ); +extern void * hbqt_gcAllocate_QRegExp( void * pObj ); +extern void * hbqt_gcAllocate_QResizeEvent( void * pObj ); +extern void * hbqt_gcAllocate_QResource( void * pObj ); +extern void * hbqt_gcAllocate_QScrollArea( void * pObj ); +extern void * hbqt_gcAllocate_QScrollBar( void * pObj ); +extern void * hbqt_gcAllocate_QSessionManager( void * pObj ); +extern void * hbqt_gcAllocate_QSignalMapper( void * pObj ); +extern void * hbqt_gcAllocate_QSize( void * pObj ); +extern void * hbqt_gcAllocate_QSizeF( void * pObj ); +extern void * hbqt_gcAllocate_QSizeGrip( void * pObj ); +extern void * hbqt_gcAllocate_QSizePolicy( void * pObj ); +extern void * hbqt_gcAllocate_QSlider( void * pObj ); +extern void * hbqt_gcAllocate_QSound( void * pObj ); +extern void * hbqt_gcAllocate_QSpacerItem( void * pObj ); +extern void * hbqt_gcAllocate_QSpinBox( void * pObj ); +extern void * hbqt_gcAllocate_QSplashScreen( void * pObj ); +extern void * hbqt_gcAllocate_QSplitter( void * pObj ); +extern void * hbqt_gcAllocate_QStandardItem( void * pObj ); +extern void * hbqt_gcAllocate_QStandardItemModel( void * pObj ); +extern void * hbqt_gcAllocate_QStatusBar( void * pObj ); +extern void * hbqt_gcAllocate_QStringList( void * pObj ); +extern void * hbqt_gcAllocate_QStringListModel( void * pObj ); +extern void * hbqt_gcAllocate_QStyle( void * pObj ); +extern void * hbqt_gcAllocate_QStyledItemDelegate( void * pObj ); +extern void * hbqt_gcAllocate_QStyleFactory( void * pObj ); +extern void * hbqt_gcAllocate_QStyleHintReturn( void * pObj ); +extern void * hbqt_gcAllocate_QStyleHintReturnMask( void * pObj ); +extern void * hbqt_gcAllocate_QStyleHintReturnVariant( void * pObj ); +extern void * hbqt_gcAllocate_QStyleOption( void * pObj ); +extern void * hbqt_gcAllocate_QStyleOptionButton( void * pObj ); +extern void * hbqt_gcAllocate_QStyleOptionComboBox( void * pObj ); +extern void * hbqt_gcAllocate_QStyleOptionComplex( void * pObj ); +extern void * hbqt_gcAllocate_QStyleOptionDockWidget( void * pObj ); +extern void * hbqt_gcAllocate_QStyleOptionFocusRect( void * pObj ); +extern void * hbqt_gcAllocate_QStyleOptionFrame( void * pObj ); +extern void * hbqt_gcAllocate_QStyleOptionGroupBox( void * pObj ); +extern void * hbqt_gcAllocate_QStyleOptionHeader( void * pObj ); +extern void * hbqt_gcAllocate_QStyleOptionMenuItem( void * pObj ); +extern void * hbqt_gcAllocate_QStyleOptionProgressBar( void * pObj ); +extern void * hbqt_gcAllocate_QStyleOptionSizeGrip( void * pObj ); +extern void * hbqt_gcAllocate_QStyleOptionSlider( void * pObj ); +extern void * hbqt_gcAllocate_QStyleOptionSpinBox( void * pObj ); +extern void * hbqt_gcAllocate_QStyleOptionTab( void * pObj ); +extern void * hbqt_gcAllocate_QStyleOptionTabBarBase( void * pObj ); +extern void * hbqt_gcAllocate_QStyleOptionTabWidgetFrame( void * pObj ); +extern void * hbqt_gcAllocate_QStyleOptionTitleBar( void * pObj ); +extern void * hbqt_gcAllocate_QStyleOptionToolBar( void * pObj ); +extern void * hbqt_gcAllocate_QStyleOptionToolBox( void * pObj ); +extern void * hbqt_gcAllocate_QStyleOptionToolButton( void * pObj ); +extern void * hbqt_gcAllocate_QStyleOptionViewItem( void * pObj ); +extern void * hbqt_gcAllocate_QStylePainter( void * pObj ); +extern void * hbqt_gcAllocate_QSyntaxHighlighter( void * pObj ); +extern void * hbqt_gcAllocate_QSystemTrayIcon( void * pObj ); +extern void * hbqt_gcAllocate_QTabBar( void * pObj ); +extern void * hbqt_gcAllocate_QTableView( void * pObj ); +extern void * hbqt_gcAllocate_QTableWidget( void * pObj ); +extern void * hbqt_gcAllocate_QTableWidgetItem( void * pObj ); +extern void * hbqt_gcAllocate_QTabWidget( void * pObj ); +extern void * hbqt_gcAllocate_QTableWidgetSelectionRange( void * pObj ); +extern void * hbqt_gcAllocate_QTextBlock( void * pObj ); +extern void * hbqt_gcAllocate_QTextBlockFormat( void * pObj ); +extern void * hbqt_gcAllocate_QTextBlockGroup( void * pObj ); +extern void * hbqt_gcAllocate_QTextBrowser( void * pObj ); +extern void * hbqt_gcAllocate_QTextBoundaryFinder( void * pObj ); +extern void * hbqt_gcAllocate_QTextCharFormat( void * pObj ); +extern void * hbqt_gcAllocate_QTextCodec( void * pObj ); +extern void * hbqt_gcAllocate_QTextCursor( void * pObj ); +extern void * hbqt_gcAllocate_QTextDecoder( void * pObj ); +extern void * hbqt_gcAllocate_QTextDocument( void * pObj ); +extern void * hbqt_gcAllocate_QTextDocumentFragment( void * pObj ); +extern void * hbqt_gcAllocate_QTextDocumentWriter( void * pObj ); +extern void * hbqt_gcAllocate_QTextEdit( void * pObj ); +extern void * hbqt_gcAllocate_QTextEncoder( void * pObj ); +extern void * hbqt_gcAllocate_QTextFormat( void * pObj ); +extern void * hbqt_gcAllocate_QTextFragment( void * pObj ); +extern void * hbqt_gcAllocate_QTextFrame( void * pObj ); +extern void * hbqt_gcAllocate_QTextFrameFormat( void * pObj ); +extern void * hbqt_gcAllocate_QTextImageFormat( void * pObj ); +extern void * hbqt_gcAllocate_QTextInlineObject( void * pObj ); +extern void * hbqt_gcAllocate_QTextItem( void * pObj ); +extern void * hbqt_gcAllocate_QTextLayout( void * pObj ); +extern void * hbqt_gcAllocate_QTextLength( void * pObj ); +extern void * hbqt_gcAllocate_QTextLine( void * pObj ); +extern void * hbqt_gcAllocate_QTextListFormat( void * pObj ); +extern void * hbqt_gcAllocate_QTextObject( void * pObj ); +extern void * hbqt_gcAllocate_QTextOption( void * pObj ); +extern void * hbqt_gcAllocate_QTextStream( void * pObj ); +extern void * hbqt_gcAllocate_QTextTableFormat( void * pObj ); +extern void * hbqt_gcAllocate_QThread( void * pObj ); +extern void * hbqt_gcAllocate_QTime( void * pObj ); +extern void * hbqt_gcAllocate_QTimeEdit( void * pObj ); +extern void * hbqt_gcAllocate_QTimer( void * pObj ); +extern void * hbqt_gcAllocate_QToolBar( void * pObj ); +extern void * hbqt_gcAllocate_QToolBox( void * pObj ); +extern void * hbqt_gcAllocate_QToolButton( void * pObj ); +extern void * hbqt_gcAllocate_QTransform( void * pObj ); +extern void * hbqt_gcAllocate_QTranslator( void * pObj ); +extern void * hbqt_gcAllocate_QTreeView( void * pObj ); +extern void * hbqt_gcAllocate_QTreeWidget( void * pObj ); +extern void * hbqt_gcAllocate_QTreeWidgetItem( void * pObj ); +extern void * hbqt_gcAllocate_QUiLoader( void * pObj ); +extern void * hbqt_gcAllocate_QUrl( void * pObj ); +extern void * hbqt_gcAllocate_QValidator( void * pObj ); +extern void * hbqt_gcAllocate_QVariant( void * pObj ); +extern void * hbqt_gcAllocate_QVBoxLayout( void * pObj ); +extern void * hbqt_gcAllocate_QWebFrame( void * pObj ); +extern void * hbqt_gcAllocate_QWebHistory( void * pObj ); +extern void * hbqt_gcAllocate_QWebHistoryInterface( void * pObj ); +extern void * hbqt_gcAllocate_QWebHistoryItem( void * pObj ); +extern void * hbqt_gcAllocate_QWebHitTestResult( void * pObj ); +extern void * hbqt_gcAllocate_QWebPage( void * pObj ); +extern void * hbqt_gcAllocate_QWebPluginFactory( void * pObj ); +extern void * hbqt_gcAllocate_QWebSecurityOrigin( void * pObj ); +extern void * hbqt_gcAllocate_QWebSettings( void * pObj ); +extern void * hbqt_gcAllocate_QWebView( void * pObj ); +extern void * hbqt_gcAllocate_QWheelEvent( void * pObj ); +extern void * hbqt_gcAllocate_QWidget( void * pObj ); +extern void * hbqt_gcAllocate_QWidgetAction( void * pObj ); +extern void * hbqt_gcAllocate_QWidgetItem( void * pObj ); +extern void * hbqt_gcAllocate_QWindowsStyle( void * pObj ); +extern void * hbqt_gcAllocate_QWizard( void * pObj ); +extern void * hbqt_gcAllocate_QWizardPage( void * pObj ); diff --git a/harbour/contrib/hbqt/qtcore/QAbstractItemModel.cpp b/harbour/contrib/hbqt/qtcore/QAbstractItemModel.cpp index 6a6f85f7f7..1f17da9f88 100644 --- a/harbour/contrib/hbqt/qtcore/QAbstractItemModel.cpp +++ b/harbour/contrib/hbqt/qtcore/QAbstractItemModel.cpp @@ -109,7 +109,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL ) */ HB_FUNC( QT_QABSTRACTITEMMODEL_BUDDY ) { - hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->buddy( *hbqt_par_QModelIndex( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->buddy( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* @@ -133,7 +133,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_COLUMNCOUNT ) */ HB_FUNC( QT_QABSTRACTITEMMODEL_DATA ) { - hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QAbstractItemModel( 1 )->data( *hbqt_par_QModelIndex( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::DisplayRole ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QAbstractItemModel( 1 )->data( *hbqt_par_QModelIndex( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::DisplayRole ) ) ) ) ); } /* @@ -181,7 +181,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_HASINDEX ) */ HB_FUNC( QT_QABSTRACTITEMMODEL_HEADERDATA ) { - 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 ) ) ) ) ); + hb_retptrGC( hbqt_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 ) ) ) ) ); } /* @@ -189,7 +189,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_HEADERDATA ) */ HB_FUNC( QT_QABSTRACTITEMMODEL_INDEX ) { - 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() ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ) ) ); } /* @@ -229,7 +229,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_INSERTROWS ) */ HB_FUNC( QT_QABSTRACTITEMMODEL_MIMETYPES ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QAbstractItemModel( 1 )->mimeTypes() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QAbstractItemModel( 1 )->mimeTypes() ) ) ); } /* @@ -237,7 +237,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_MIMETYPES ) */ HB_FUNC( QT_QABSTRACTITEMMODEL_PARENT ) { - hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->parent( *hbqt_par_QModelIndex( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->parent( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* @@ -309,7 +309,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_SETSUPPORTEDDRAGACTIONS ) */ HB_FUNC( QT_QABSTRACTITEMMODEL_SIBLING ) { - hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->sibling( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QModelIndex( 4 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemModel( 1 )->sibling( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QModelIndex( 4 ) ) ) ) ); } /* @@ -325,7 +325,7 @@ HB_FUNC( QT_QABSTRACTITEMMODEL_SORT ) */ HB_FUNC( QT_QABSTRACTITEMMODEL_SPAN ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QAbstractItemModel( 1 )->span( *hbqt_par_QModelIndex( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QAbstractItemModel( 1 )->span( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtcore/QAbstractListModel.cpp b/harbour/contrib/hbqt/qtcore/QAbstractListModel.cpp index 3eab5eaa39..266497c93c 100644 --- a/harbour/contrib/hbqt/qtcore/QAbstractListModel.cpp +++ b/harbour/contrib/hbqt/qtcore/QAbstractListModel.cpp @@ -89,7 +89,7 @@ HB_FUNC( QT_QABSTRACTLISTMODEL ) */ HB_FUNC( QT_QABSTRACTLISTMODEL_INDEX ) { - 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() ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractListModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/qtcore/QAbstractTableModel.cpp b/harbour/contrib/hbqt/qtcore/QAbstractTableModel.cpp index 2375e48702..d353c3eb6e 100644 --- a/harbour/contrib/hbqt/qtcore/QAbstractTableModel.cpp +++ b/harbour/contrib/hbqt/qtcore/QAbstractTableModel.cpp @@ -89,7 +89,7 @@ HB_FUNC( QT_QABSTRACTTABLEMODEL ) */ HB_FUNC( QT_QABSTRACTTABLEMODEL_INDEX ) { - 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() ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractTableModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/qtcore/QBitArray.cpp b/harbour/contrib/hbqt/qtcore/QBitArray.cpp index de392c1817..6fd4dcaf75 100644 --- a/harbour/contrib/hbqt/qtcore/QBitArray.cpp +++ b/harbour/contrib/hbqt/qtcore/QBitArray.cpp @@ -95,9 +95,9 @@ QT_G_FUNC( release_QBitArray ) } } -void * gcAllocate_QBitArray( void * pObj ) +void * hbqt_gcAllocate_QBitArray( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QBitArray; @@ -111,7 +111,7 @@ HB_FUNC( QT_QBITARRAY ) pObj = new QBitArray() ; - hb_retptrGC( gcAllocate_QBitArray( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QBitArray( pObj ) ); } /* * bool at ( int i ) const diff --git a/harbour/contrib/hbqt/qtcore/QByteArray.cpp b/harbour/contrib/hbqt/qtcore/QByteArray.cpp index 8f91746f3d..b1bbf251ad 100644 --- a/harbour/contrib/hbqt/qtcore/QByteArray.cpp +++ b/harbour/contrib/hbqt/qtcore/QByteArray.cpp @@ -113,9 +113,9 @@ QT_G_FUNC( release_QByteArray ) } } -void * gcAllocate_QByteArray( void * pObj ) +void * hbqt_gcAllocate_QByteArray( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QByteArray; @@ -129,14 +129,14 @@ HB_FUNC( QT_QBYTEARRAY ) pObj = new QByteArray() ; - hb_retptrGC( gcAllocate_QByteArray( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( pObj ) ); } /* * QByteArray & append ( const QByteArray & ba ) */ HB_FUNC( QT_QBYTEARRAY_APPEND ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->append( *hbqt_par_QByteArray( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->append( *hbqt_par_QByteArray( 2 ) ) ) ) ); } /* @@ -144,7 +144,7 @@ HB_FUNC( QT_QBYTEARRAY_APPEND ) */ HB_FUNC( QT_QBYTEARRAY_APPEND_1 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->append( hbqt_par_QString( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->append( hbqt_par_QString( 2 ) ) ) ) ); } /* @@ -152,7 +152,7 @@ HB_FUNC( QT_QBYTEARRAY_APPEND_1 ) */ HB_FUNC( QT_QBYTEARRAY_APPEND_2 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->append( hbqt_par_char( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->append( hbqt_par_char( 2 ) ) ) ) ); } /* @@ -160,7 +160,7 @@ HB_FUNC( QT_QBYTEARRAY_APPEND_2 ) */ HB_FUNC( QT_QBYTEARRAY_APPEND_3 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->append( hbqt_par_char( 2 ), hb_parni( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->append( hbqt_par_char( 2 ), hb_parni( 3 ) ) ) ) ); } /* @@ -168,7 +168,7 @@ HB_FUNC( QT_QBYTEARRAY_APPEND_3 ) */ HB_FUNC( QT_QBYTEARRAY_APPEND_4 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->append( ( char ) hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->append( ( char ) hb_parni( 2 ) ) ) ) ); } /* @@ -288,7 +288,7 @@ HB_FUNC( QT_QBYTEARRAY_ENDSWITH_2 ) */ HB_FUNC( QT_QBYTEARRAY_FILL ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->fill( ( char ) hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->fill( ( char ) hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ) ) ) ); } /* @@ -328,7 +328,7 @@ HB_FUNC( QT_QBYTEARRAY_INDEXOF_3 ) */ HB_FUNC( QT_QBYTEARRAY_INSERT ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->insert( hb_parni( 2 ), *hbqt_par_QByteArray( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->insert( hb_parni( 2 ), *hbqt_par_QByteArray( 3 ) ) ) ) ); } /* @@ -336,7 +336,7 @@ HB_FUNC( QT_QBYTEARRAY_INSERT ) */ HB_FUNC( QT_QBYTEARRAY_INSERT_1 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->insert( hb_parni( 2 ), hbqt_par_QString( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->insert( hb_parni( 2 ), hbqt_par_QString( 3 ) ) ) ) ); } /* @@ -344,7 +344,7 @@ HB_FUNC( QT_QBYTEARRAY_INSERT_1 ) */ HB_FUNC( QT_QBYTEARRAY_INSERT_2 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->insert( hb_parni( 2 ), hbqt_par_char( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->insert( hb_parni( 2 ), hbqt_par_char( 3 ) ) ) ) ); } /* @@ -352,7 +352,7 @@ HB_FUNC( QT_QBYTEARRAY_INSERT_2 ) */ HB_FUNC( QT_QBYTEARRAY_INSERT_3 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->insert( hb_parni( 2 ), ( char ) hb_parni( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->insert( hb_parni( 2 ), ( char ) hb_parni( 3 ) ) ) ) ); } /* @@ -408,7 +408,7 @@ HB_FUNC( QT_QBYTEARRAY_LASTINDEXOF_3 ) */ HB_FUNC( QT_QBYTEARRAY_LEFT ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->left( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->left( hb_parni( 2 ) ) ) ) ); } /* @@ -416,7 +416,7 @@ HB_FUNC( QT_QBYTEARRAY_LEFT ) */ HB_FUNC( QT_QBYTEARRAY_LEFTJUSTIFIED ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->leftJustified( hb_parni( 2 ), ( char ) hb_parni( 3 ), hb_parl( 4 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->leftJustified( hb_parni( 2 ), ( char ) hb_parni( 3 ), hb_parl( 4 ) ) ) ) ); } /* @@ -432,7 +432,7 @@ HB_FUNC( QT_QBYTEARRAY_LENGTH ) */ HB_FUNC( QT_QBYTEARRAY_MID ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->mid( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->mid( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : -1 ) ) ) ) ); } /* @@ -440,7 +440,7 @@ HB_FUNC( QT_QBYTEARRAY_MID ) */ HB_FUNC( QT_QBYTEARRAY_PREPEND ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->prepend( *hbqt_par_QByteArray( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->prepend( *hbqt_par_QByteArray( 2 ) ) ) ) ); } /* @@ -448,7 +448,7 @@ HB_FUNC( QT_QBYTEARRAY_PREPEND ) */ HB_FUNC( QT_QBYTEARRAY_PREPEND_1 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->prepend( hbqt_par_char( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->prepend( hbqt_par_char( 2 ) ) ) ) ); } /* @@ -456,7 +456,7 @@ HB_FUNC( QT_QBYTEARRAY_PREPEND_1 ) */ HB_FUNC( QT_QBYTEARRAY_PREPEND_2 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->prepend( ( char ) hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->prepend( ( char ) hb_parni( 2 ) ) ) ) ); } /* @@ -512,7 +512,7 @@ HB_FUNC( QT_QBYTEARRAY_PUSH_FRONT_2 ) */ HB_FUNC( QT_QBYTEARRAY_REMOVE ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->remove( hb_parni( 2 ), hb_parni( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->remove( hb_parni( 2 ), hb_parni( 3 ) ) ) ) ); } /* @@ -520,7 +520,7 @@ HB_FUNC( QT_QBYTEARRAY_REMOVE ) */ HB_FUNC( QT_QBYTEARRAY_REPEATED ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->repeated( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->repeated( hb_parni( 2 ) ) ) ) ); } /* @@ -528,7 +528,7 @@ HB_FUNC( QT_QBYTEARRAY_REPEATED ) */ HB_FUNC( QT_QBYTEARRAY_REPLACE ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QByteArray( 4 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QByteArray( 4 ) ) ) ) ); } /* @@ -536,7 +536,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE ) */ HB_FUNC( QT_QBYTEARRAY_REPLACE_1 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hb_parni( 2 ), hb_parni( 3 ), hbqt_par_char( 4 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hb_parni( 2 ), hb_parni( 3 ), hbqt_par_char( 4 ) ) ) ) ); } /* @@ -544,7 +544,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_1 ) */ HB_FUNC( QT_QBYTEARRAY_REPLACE_2 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( *hbqt_par_QByteArray( 2 ), *hbqt_par_QByteArray( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( *hbqt_par_QByteArray( 2 ), *hbqt_par_QByteArray( 3 ) ) ) ) ); } /* @@ -552,7 +552,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_2 ) */ HB_FUNC( QT_QBYTEARRAY_REPLACE_3 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_char( 2 ), *hbqt_par_QByteArray( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_char( 2 ), *hbqt_par_QByteArray( 3 ) ) ) ) ); } /* @@ -560,7 +560,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_3 ) */ HB_FUNC( QT_QBYTEARRAY_REPLACE_4 ) { - 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 ) ) ) ) ); + hb_retptrGC( hbqt_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 +568,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_4 ) */ HB_FUNC( QT_QBYTEARRAY_REPLACE_5 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( *hbqt_par_QByteArray( 2 ), hbqt_par_char( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( *hbqt_par_QByteArray( 2 ), hbqt_par_char( 3 ) ) ) ) ); } /* @@ -576,7 +576,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_5 ) */ HB_FUNC( QT_QBYTEARRAY_REPLACE_6 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_QString( 2 ), *hbqt_par_QByteArray( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_QString( 2 ), *hbqt_par_QByteArray( 3 ) ) ) ) ); } /* @@ -584,7 +584,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_6 ) */ HB_FUNC( QT_QBYTEARRAY_REPLACE_7 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_QString( 2 ), hbqt_par_char( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_QString( 2 ), hbqt_par_char( 3 ) ) ) ) ); } /* @@ -592,7 +592,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_7 ) */ HB_FUNC( QT_QBYTEARRAY_REPLACE_8 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_char( 2 ), hbqt_par_char( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( hbqt_par_char( 2 ), hbqt_par_char( 3 ) ) ) ) ); } /* @@ -600,7 +600,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_8 ) */ HB_FUNC( QT_QBYTEARRAY_REPLACE_9 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( ( char ) hb_parni( 2 ), *hbqt_par_QByteArray( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( ( char ) hb_parni( 2 ), *hbqt_par_QByteArray( 3 ) ) ) ) ); } /* @@ -608,7 +608,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_9 ) */ HB_FUNC( QT_QBYTEARRAY_REPLACE_10 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( ( char ) hb_parni( 2 ), hbqt_par_QString( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( ( char ) hb_parni( 2 ), hbqt_par_QString( 3 ) ) ) ) ); } /* @@ -616,7 +616,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_10 ) */ HB_FUNC( QT_QBYTEARRAY_REPLACE_11 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( ( char ) hb_parni( 2 ), hbqt_par_char( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( ( char ) hb_parni( 2 ), hbqt_par_char( 3 ) ) ) ) ); } /* @@ -624,7 +624,7 @@ HB_FUNC( QT_QBYTEARRAY_REPLACE_11 ) */ HB_FUNC( QT_QBYTEARRAY_REPLACE_12 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( ( char ) hb_parni( 2 ), ( char ) hb_parni( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->replace( ( char ) hb_parni( 2 ), ( char ) hb_parni( 3 ) ) ) ) ); } /* @@ -648,7 +648,7 @@ HB_FUNC( QT_QBYTEARRAY_RESIZE ) */ HB_FUNC( QT_QBYTEARRAY_RIGHT ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->right( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->right( hb_parni( 2 ) ) ) ) ); } /* @@ -656,7 +656,7 @@ HB_FUNC( QT_QBYTEARRAY_RIGHT ) */ HB_FUNC( QT_QBYTEARRAY_RIGHTJUSTIFIED ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->rightJustified( hb_parni( 2 ), ( char ) hb_parni( 3 ), hb_parl( 4 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->rightJustified( hb_parni( 2 ), ( char ) hb_parni( 3 ), hb_parl( 4 ) ) ) ) ); } /* @@ -664,7 +664,7 @@ HB_FUNC( QT_QBYTEARRAY_RIGHTJUSTIFIED ) */ HB_FUNC( QT_QBYTEARRAY_SETNUM ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ) ) ); } /* @@ -672,7 +672,7 @@ HB_FUNC( QT_QBYTEARRAY_SETNUM ) */ HB_FUNC( QT_QBYTEARRAY_SETNUM_1 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ) ) ); } /* @@ -680,7 +680,7 @@ HB_FUNC( QT_QBYTEARRAY_SETNUM_1 ) */ HB_FUNC( QT_QBYTEARRAY_SETNUM_2 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ) ) ); } /* @@ -688,7 +688,7 @@ HB_FUNC( QT_QBYTEARRAY_SETNUM_2 ) */ HB_FUNC( QT_QBYTEARRAY_SETNUM_3 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ) ) ); } /* @@ -696,7 +696,7 @@ HB_FUNC( QT_QBYTEARRAY_SETNUM_3 ) */ HB_FUNC( QT_QBYTEARRAY_SETNUM_4 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( ( qlonglong ) hb_parnint( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( ( qlonglong ) hb_parnint( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ) ) ); } /* @@ -704,7 +704,7 @@ HB_FUNC( QT_QBYTEARRAY_SETNUM_4 ) */ HB_FUNC( QT_QBYTEARRAY_SETNUM_5 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( ( qulonglong ) hb_parnint( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->setNum( ( qulonglong ) hb_parnint( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : 10 ) ) ) ) ); } /* @@ -712,7 +712,7 @@ HB_FUNC( QT_QBYTEARRAY_SETNUM_5 ) */ HB_FUNC( QT_QBYTEARRAY_SETNUM_6 ) { - 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 ) ) ) ) ); + hb_retptrGC( hbqt_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 +720,7 @@ HB_FUNC( QT_QBYTEARRAY_SETNUM_6 ) */ HB_FUNC( QT_QBYTEARRAY_SETNUM_7 ) { - 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 ) ) ) ) ); + hb_retptrGC( hbqt_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 +728,7 @@ HB_FUNC( QT_QBYTEARRAY_SETNUM_7 ) */ HB_FUNC( QT_QBYTEARRAY_SIMPLIFIED ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->simplified() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->simplified() ) ) ); } /* @@ -776,7 +776,7 @@ HB_FUNC( QT_QBYTEARRAY_STARTSWITH_2 ) */ HB_FUNC( QT_QBYTEARRAY_TOBASE64 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->toBase64() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->toBase64() ) ) ); } /* @@ -808,7 +808,7 @@ HB_FUNC( QT_QBYTEARRAY_TOFLOAT ) */ HB_FUNC( QT_QBYTEARRAY_TOHEX ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->toHex() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->toHex() ) ) ); } /* @@ -852,7 +852,7 @@ HB_FUNC( QT_QBYTEARRAY_TOLONGLONG ) */ HB_FUNC( QT_QBYTEARRAY_TOLOWER ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->toLower() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->toLower() ) ) ); } /* @@ -860,7 +860,7 @@ HB_FUNC( QT_QBYTEARRAY_TOLOWER ) */ HB_FUNC( QT_QBYTEARRAY_TOPERCENTENCODING ) { - 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 ) ) ) ) ); + hb_retptrGC( hbqt_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 +928,7 @@ HB_FUNC( QT_QBYTEARRAY_TOUSHORT ) */ HB_FUNC( QT_QBYTEARRAY_TOUPPER ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->toUpper() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->toUpper() ) ) ); } /* @@ -936,7 +936,7 @@ HB_FUNC( QT_QBYTEARRAY_TOUPPER ) */ HB_FUNC( QT_QBYTEARRAY_TRIMMED ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->trimmed() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QByteArray( 1 )->trimmed() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtcore/QCoreApplication.cpp b/harbour/contrib/hbqt/qtcore/QCoreApplication.cpp index 93d0e67dbb..143f1cdc58 100644 --- a/harbour/contrib/hbqt/qtcore/QCoreApplication.cpp +++ b/harbour/contrib/hbqt/qtcore/QCoreApplication.cpp @@ -164,7 +164,7 @@ HB_FUNC( QT_QCOREAPPLICATION_APPLICATIONVERSION ) */ HB_FUNC( QT_QCOREAPPLICATION_ARGUMENTS ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QCoreApplication( 1 )->arguments() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QCoreApplication( 1 )->arguments() ) ) ); } /* @@ -228,7 +228,7 @@ HB_FUNC( QT_QCOREAPPLICATION_INSTANCE ) */ HB_FUNC( QT_QCOREAPPLICATION_LIBRARYPATHS ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QCoreApplication( 1 )->libraryPaths() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QCoreApplication( 1 )->libraryPaths() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtcore/QDataStream.cpp b/harbour/contrib/hbqt/qtcore/QDataStream.cpp index bbcb831712..b3e28ce4be 100644 --- a/harbour/contrib/hbqt/qtcore/QDataStream.cpp +++ b/harbour/contrib/hbqt/qtcore/QDataStream.cpp @@ -103,9 +103,9 @@ QT_G_FUNC( release_QDataStream ) } } -void * gcAllocate_QDataStream( void * pObj ) +void * hbqt_gcAllocate_QDataStream( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QDataStream; @@ -119,7 +119,7 @@ HB_FUNC( QT_QDATASTREAM ) pObj = new QDataStream() ; - hb_retptrGC( gcAllocate_QDataStream( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QDataStream( pObj ) ); } /* * bool atEnd () const diff --git a/harbour/contrib/hbqt/qtcore/QDate.cpp b/harbour/contrib/hbqt/qtcore/QDate.cpp index 0fbb89ebb9..316a70b472 100644 --- a/harbour/contrib/hbqt/qtcore/QDate.cpp +++ b/harbour/contrib/hbqt/qtcore/QDate.cpp @@ -98,9 +98,9 @@ QT_G_FUNC( release_QDate ) } } -void * gcAllocate_QDate( void * pObj ) +void * hbqt_gcAllocate_QDate( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QDate; @@ -114,14 +114,14 @@ HB_FUNC( QT_QDATE ) pObj = new QDate() ; - hb_retptrGC( gcAllocate_QDate( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QDate( pObj ) ); } /* * QDate addDays ( int ndays ) const */ HB_FUNC( QT_QDATE_ADDDAYS ) { - hb_retptrGC( gcAllocate_QDate( new QDate( hbqt_par_QDate( 1 )->addDays( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDate( new QDate( hbqt_par_QDate( 1 )->addDays( hb_parni( 2 ) ) ) ) ); } /* @@ -129,7 +129,7 @@ HB_FUNC( QT_QDATE_ADDDAYS ) */ HB_FUNC( QT_QDATE_ADDMONTHS ) { - hb_retptrGC( gcAllocate_QDate( new QDate( hbqt_par_QDate( 1 )->addMonths( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDate( new QDate( hbqt_par_QDate( 1 )->addMonths( hb_parni( 2 ) ) ) ) ); } /* @@ -137,7 +137,7 @@ HB_FUNC( QT_QDATE_ADDMONTHS ) */ HB_FUNC( QT_QDATE_ADDYEARS ) { - hb_retptrGC( gcAllocate_QDate( new QDate( hbqt_par_QDate( 1 )->addYears( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDate( new QDate( hbqt_par_QDate( 1 )->addYears( hb_parni( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtcore/QDateTime.cpp b/harbour/contrib/hbqt/qtcore/QDateTime.cpp index 898de8f473..009b617ae2 100644 --- a/harbour/contrib/hbqt/qtcore/QDateTime.cpp +++ b/harbour/contrib/hbqt/qtcore/QDateTime.cpp @@ -98,9 +98,9 @@ QT_G_FUNC( release_QDateTime ) } } -void * gcAllocate_QDateTime( void * pObj ) +void * hbqt_gcAllocate_QDateTime( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QDateTime; @@ -114,14 +114,14 @@ HB_FUNC( QT_QDATETIME ) pObj = ( QDateTime* ) new QDateTime() ; - hb_retptrGC( gcAllocate_QDateTime( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QDateTime( pObj ) ); } /* * QDateTime addDays ( int ndays ) const */ HB_FUNC( QT_QDATETIME_ADDDAYS ) { - hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->addDays( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->addDays( hb_parni( 2 ) ) ) ) ); } /* @@ -129,7 +129,7 @@ HB_FUNC( QT_QDATETIME_ADDDAYS ) */ HB_FUNC( QT_QDATETIME_ADDMSECS ) { - hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->addMSecs( hb_parnint( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->addMSecs( hb_parnint( 2 ) ) ) ) ); } /* @@ -137,7 +137,7 @@ HB_FUNC( QT_QDATETIME_ADDMSECS ) */ HB_FUNC( QT_QDATETIME_ADDMONTHS ) { - hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->addMonths( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->addMonths( hb_parni( 2 ) ) ) ) ); } /* @@ -145,7 +145,7 @@ HB_FUNC( QT_QDATETIME_ADDMONTHS ) */ HB_FUNC( QT_QDATETIME_ADDSECS ) { - hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->addSecs( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->addSecs( hb_parni( 2 ) ) ) ) ); } /* @@ -153,7 +153,7 @@ HB_FUNC( QT_QDATETIME_ADDSECS ) */ HB_FUNC( QT_QDATETIME_ADDYEARS ) { - hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->addYears( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->addYears( hb_parni( 2 ) ) ) ) ); } /* @@ -161,7 +161,7 @@ HB_FUNC( QT_QDATETIME_ADDYEARS ) */ HB_FUNC( QT_QDATETIME_DATE ) { - hb_retptrGC( gcAllocate_QDate( new QDate( hbqt_par_QDateTime( 1 )->date() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDate( new QDate( hbqt_par_QDateTime( 1 )->date() ) ) ); } /* @@ -233,7 +233,7 @@ HB_FUNC( QT_QDATETIME_SETTIME_T ) */ HB_FUNC( QT_QDATETIME_TIME ) { - hb_retptrGC( gcAllocate_QTime( new QTime( hbqt_par_QDateTime( 1 )->time() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QDateTime( 1 )->time() ) ) ); } /* @@ -249,7 +249,7 @@ HB_FUNC( QT_QDATETIME_TIMESPEC ) */ HB_FUNC( QT_QDATETIME_TOLOCALTIME ) { - hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->toLocalTime() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->toLocalTime() ) ) ); } /* @@ -273,7 +273,7 @@ HB_FUNC( QT_QDATETIME_TOSTRING_1 ) */ HB_FUNC( QT_QDATETIME_TOTIMESPEC ) { - hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->toTimeSpec( ( Qt::TimeSpec ) hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->toTimeSpec( ( Qt::TimeSpec ) hb_parni( 2 ) ) ) ) ); } /* @@ -289,7 +289,7 @@ HB_FUNC( QT_QDATETIME_TOTIME_T ) */ HB_FUNC( QT_QDATETIME_TOUTC ) { - hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->toUTC() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->toUTC() ) ) ); } /* @@ -297,7 +297,7 @@ HB_FUNC( QT_QDATETIME_TOUTC ) */ HB_FUNC( QT_QDATETIME_CURRENTDATETIME ) { - hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->currentDateTime() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->currentDateTime() ) ) ); } /* @@ -305,7 +305,7 @@ HB_FUNC( QT_QDATETIME_CURRENTDATETIME ) */ HB_FUNC( QT_QDATETIME_FROMSTRING ) { - 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 ) ) ) ) ); + hb_retptrGC( hbqt_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 +313,7 @@ HB_FUNC( QT_QDATETIME_FROMSTRING ) */ HB_FUNC( QT_QDATETIME_FROMSTRING_1 ) { - hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->fromString( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->fromString( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ) ) ); } /* @@ -321,7 +321,7 @@ HB_FUNC( QT_QDATETIME_FROMSTRING_1 ) */ HB_FUNC( QT_QDATETIME_FROMTIME_T ) { - hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->fromTime_t( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTime( 1 )->fromTime_t( hb_parni( 2 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/qtcore/QDir.cpp b/harbour/contrib/hbqt/qtcore/QDir.cpp index 8fd2b1fbb4..f966a5ee36 100644 --- a/harbour/contrib/hbqt/qtcore/QDir.cpp +++ b/harbour/contrib/hbqt/qtcore/QDir.cpp @@ -104,9 +104,9 @@ QT_G_FUNC( release_QDir ) } } -void * gcAllocate_QDir( void * pObj ) +void * hbqt_gcAllocate_QDir( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QDir; @@ -120,7 +120,7 @@ HB_FUNC( QT_QDIR ) pObj = new QDir( hbqt_par_QString( 1 ) ) ; - hb_retptrGC( gcAllocate_QDir( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QDir( pObj ) ); } /* * QString absoluteFilePath ( const QString & fileName ) const @@ -183,7 +183,7 @@ HB_FUNC( QT_QDIR_DIRNAME ) */ HB_FUNC( QT_QDIR_ENTRYLIST ) { - 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 ) ) ) ) ); + hb_retptrGC( hbqt_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 +191,7 @@ HB_FUNC( QT_QDIR_ENTRYLIST ) */ HB_FUNC( QT_QDIR_ENTRYLIST_1 ) { - 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 ) ) ) ) ); + hb_retptrGC( hbqt_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 +287,7 @@ HB_FUNC( QT_QDIR_MKPATH ) */ HB_FUNC( QT_QDIR_NAMEFILTERS ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QDir( 1 )->nameFilters() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QDir( 1 )->nameFilters() ) ) ); } /* @@ -407,7 +407,7 @@ HB_FUNC( QT_QDIR_CLEANPATH ) */ HB_FUNC( QT_QDIR_CURRENT ) { - hb_retptrGC( gcAllocate_QDir( new QDir( hbqt_par_QDir( 1 )->current() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDir( new QDir( hbqt_par_QDir( 1 )->current() ) ) ); } /* @@ -431,7 +431,7 @@ HB_FUNC( QT_QDIR_FROMNATIVESEPARATORS ) */ HB_FUNC( QT_QDIR_HOME ) { - hb_retptrGC( gcAllocate_QDir( new QDir( hbqt_par_QDir( 1 )->home() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDir( new QDir( hbqt_par_QDir( 1 )->home() ) ) ); } /* @@ -479,7 +479,7 @@ HB_FUNC( QT_QDIR_MATCH_1 ) */ HB_FUNC( QT_QDIR_ROOT ) { - hb_retptrGC( gcAllocate_QDir( new QDir( hbqt_par_QDir( 1 )->root() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDir( new QDir( hbqt_par_QDir( 1 )->root() ) ) ); } /* @@ -495,7 +495,7 @@ HB_FUNC( QT_QDIR_ROOTPATH ) */ HB_FUNC( QT_QDIR_SEARCHPATHS ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QDir( 1 )->searchPaths( hbqt_par_QString( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QDir( 1 )->searchPaths( hbqt_par_QString( 2 ) ) ) ) ); } /* @@ -519,7 +519,7 @@ HB_FUNC( QT_QDIR_SETSEARCHPATHS ) */ HB_FUNC( QT_QDIR_TEMP ) { - hb_retptrGC( gcAllocate_QDir( new QDir( hbqt_par_QDir( 1 )->temp() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDir( new QDir( hbqt_par_QDir( 1 )->temp() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtcore/QEvent.cpp b/harbour/contrib/hbqt/qtcore/QEvent.cpp index 6d80e4221f..18e6b26cc5 100644 --- a/harbour/contrib/hbqt/qtcore/QEvent.cpp +++ b/harbour/contrib/hbqt/qtcore/QEvent.cpp @@ -99,9 +99,9 @@ QT_G_FUNC( release_QEvent ) } } -void * gcAllocate_QEvent( void * pObj ) +void * hbqt_gcAllocate_QEvent( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QEvent; @@ -115,7 +115,7 @@ HB_FUNC( QT_QEVENT ) pObj = ( QEvent* ) new QEvent( ( QEvent::Type ) hb_parni( 1 ) ) ; - hb_retptrGC( gcAllocate_QEvent( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QEvent( pObj ) ); } /* * void accept () diff --git a/harbour/contrib/hbqt/qtcore/QEventLoop.cpp b/harbour/contrib/hbqt/qtcore/QEventLoop.cpp index fd6f2468d2..db4484f03a 100644 --- a/harbour/contrib/hbqt/qtcore/QEventLoop.cpp +++ b/harbour/contrib/hbqt/qtcore/QEventLoop.cpp @@ -126,9 +126,9 @@ QT_G_FUNC( release_QEventLoop ) } } -void * gcAllocate_QEventLoop( void * pObj ) +void * hbqt_gcAllocate_QEventLoop( void * pObj ) { - QGC_POINTER_QEventLoop * p = ( QGC_POINTER_QEventLoop * ) hb_gcAllocate( sizeof( QGC_POINTER_QEventLoop ), gcFuncs() ); + QGC_POINTER_QEventLoop * p = ( QGC_POINTER_QEventLoop * ) hb_gcAllocate( sizeof( QGC_POINTER_QEventLoop ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QEventLoop; @@ -143,7 +143,7 @@ HB_FUNC( QT_QEVENTLOOP ) pObj = new QEventLoop( hbqt_par_QObject( 1 ) ) ; - hb_retptrGC( gcAllocate_QEventLoop( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QEventLoop( pObj ) ); } /* * int exec ( ProcessEventsFlags flags = AllEvents ) diff --git a/harbour/contrib/hbqt/qtcore/QFile.cpp b/harbour/contrib/hbqt/qtcore/QFile.cpp index 780cb19b43..4f8041f343 100644 --- a/harbour/contrib/hbqt/qtcore/QFile.cpp +++ b/harbour/contrib/hbqt/qtcore/QFile.cpp @@ -131,9 +131,9 @@ QT_G_FUNC( release_QFile ) } } -void * gcAllocate_QFile( void * pObj ) +void * hbqt_gcAllocate_QFile( void * pObj ) { - QGC_POINTER_QFile * p = ( QGC_POINTER_QFile * ) hb_gcAllocate( sizeof( QGC_POINTER_QFile ), gcFuncs() ); + QGC_POINTER_QFile * p = ( QGC_POINTER_QFile * ) hb_gcAllocate( sizeof( QGC_POINTER_QFile ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QFile; @@ -151,7 +151,7 @@ HB_FUNC( QT_QFILE ) pObj = new QFile( hbqt_par_QString( 1 ) ) ; } - hb_retptrGC( gcAllocate_QFile( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QFile( pObj ) ); } /* * virtual bool atEnd () const @@ -358,7 +358,7 @@ HB_FUNC( QT_QFILE_DECODENAME_1 ) */ HB_FUNC( QT_QFILE_ENCODENAME ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QFile( 1 )->encodeName( hbqt_par_QString( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QFile( 1 )->encodeName( hbqt_par_QString( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtcore/QFileInfo.cpp b/harbour/contrib/hbqt/qtcore/QFileInfo.cpp index 3b081562cd..bb35fce1b2 100644 --- a/harbour/contrib/hbqt/qtcore/QFileInfo.cpp +++ b/harbour/contrib/hbqt/qtcore/QFileInfo.cpp @@ -104,9 +104,9 @@ QT_G_FUNC( release_QFileInfo ) } } -void * gcAllocate_QFileInfo( void * pObj ) +void * hbqt_gcAllocate_QFileInfo( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QFileInfo; @@ -120,14 +120,14 @@ HB_FUNC( QT_QFILEINFO ) pObj = new QFileInfo() ; - hb_retptrGC( gcAllocate_QFileInfo( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QFileInfo( pObj ) ); } /* * QDir absoluteDir () const */ HB_FUNC( QT_QFILEINFO_ABSOLUTEDIR ) { - hb_retptrGC( gcAllocate_QDir( new QDir( hbqt_par_QFileInfo( 1 )->absoluteDir() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDir( new QDir( hbqt_par_QFileInfo( 1 )->absoluteDir() ) ) ); } /* @@ -207,7 +207,7 @@ HB_FUNC( QT_QFILEINFO_COMPLETESUFFIX ) */ HB_FUNC( QT_QFILEINFO_CREATED ) { - hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QFileInfo( 1 )->created() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QFileInfo( 1 )->created() ) ) ); } /* @@ -215,7 +215,7 @@ HB_FUNC( QT_QFILEINFO_CREATED ) */ HB_FUNC( QT_QFILEINFO_DIR ) { - hb_retptrGC( gcAllocate_QDir( new QDir( hbqt_par_QFileInfo( 1 )->dir() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDir( new QDir( hbqt_par_QFileInfo( 1 )->dir() ) ) ); } /* @@ -351,7 +351,7 @@ HB_FUNC( QT_QFILEINFO_ISWRITABLE ) */ HB_FUNC( QT_QFILEINFO_LASTMODIFIED ) { - hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QFileInfo( 1 )->lastModified() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QFileInfo( 1 )->lastModified() ) ) ); } /* @@ -359,7 +359,7 @@ HB_FUNC( QT_QFILEINFO_LASTMODIFIED ) */ HB_FUNC( QT_QFILEINFO_LASTREAD ) { - hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QFileInfo( 1 )->lastRead() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QFileInfo( 1 )->lastRead() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtcore/QIODevice.cpp b/harbour/contrib/hbqt/qtcore/QIODevice.cpp index 754b836d9c..c2c324a13e 100644 --- a/harbour/contrib/hbqt/qtcore/QIODevice.cpp +++ b/harbour/contrib/hbqt/qtcore/QIODevice.cpp @@ -215,7 +215,7 @@ HB_FUNC( QT_QIODEVICE_PEEK ) */ HB_FUNC( QT_QIODEVICE_PEEK_1 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QIODevice( 1 )->peek( hb_parnint( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QIODevice( 1 )->peek( hb_parnint( 2 ) ) ) ) ); } /* @@ -247,7 +247,7 @@ HB_FUNC( QT_QIODEVICE_READ ) */ HB_FUNC( QT_QIODEVICE_READ_1 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QIODevice( 1 )->read( hb_parnint( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QIODevice( 1 )->read( hb_parnint( 2 ) ) ) ) ); } /* @@ -255,7 +255,7 @@ HB_FUNC( QT_QIODEVICE_READ_1 ) */ HB_FUNC( QT_QIODEVICE_READALL ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QIODevice( 1 )->readAll() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QIODevice( 1 )->readAll() ) ) ); } /* @@ -271,7 +271,7 @@ HB_FUNC( QT_QIODEVICE_READLINE ) */ HB_FUNC( QT_QIODEVICE_READLINE_1 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QIODevice( 1 )->readLine( hb_parnint( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QIODevice( 1 )->readLine( hb_parnint( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtcore/QLatin1Char.cpp b/harbour/contrib/hbqt/qtcore/QLatin1Char.cpp index 2a7cc314de..d807568436 100644 --- a/harbour/contrib/hbqt/qtcore/QLatin1Char.cpp +++ b/harbour/contrib/hbqt/qtcore/QLatin1Char.cpp @@ -94,9 +94,9 @@ QT_G_FUNC( release_QLatin1Char ) } } -void * gcAllocate_QLatin1Char( void * pObj ) +void * hbqt_gcAllocate_QLatin1Char( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QLatin1Char; @@ -110,7 +110,7 @@ HB_FUNC( QT_QLATIN1CHAR ) pObj = ( QLatin1Char* ) new QLatin1Char( *hb_parcx( 1 ) ) ; - hb_retptrGC( gcAllocate_QLatin1Char( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QLatin1Char( pObj ) ); } /* * char toLatin1 () const diff --git a/harbour/contrib/hbqt/qtcore/QLatin1String.cpp b/harbour/contrib/hbqt/qtcore/QLatin1String.cpp index 33a76c51d6..b02040be9e 100644 --- a/harbour/contrib/hbqt/qtcore/QLatin1String.cpp +++ b/harbour/contrib/hbqt/qtcore/QLatin1String.cpp @@ -94,9 +94,9 @@ QT_G_FUNC( release_QLatin1String ) } } -void * gcAllocate_QLatin1String( void * pObj ) +void * hbqt_gcAllocate_QLatin1String( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QLatin1String; @@ -110,7 +110,7 @@ HB_FUNC( QT_QLATIN1STRING ) pObj = ( QLatin1String* ) new QLatin1String( hb_parcx( 1 ) ) ; - hb_retptrGC( gcAllocate_QLatin1String( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QLatin1String( pObj ) ); } /* * const char * latin1 () const diff --git a/harbour/contrib/hbqt/qtcore/QLine.cpp b/harbour/contrib/hbqt/qtcore/QLine.cpp index bf890db5b5..4fc8d1793d 100644 --- a/harbour/contrib/hbqt/qtcore/QLine.cpp +++ b/harbour/contrib/hbqt/qtcore/QLine.cpp @@ -96,9 +96,9 @@ QT_G_FUNC( release_QLine ) } } -void * gcAllocate_QLine( void * pObj ) +void * hbqt_gcAllocate_QLine( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QLine; @@ -127,14 +127,14 @@ HB_FUNC( QT_QLINE ) pObj = ( QLine* ) new QLine() ; } - hb_retptrGC( gcAllocate_QLine( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QLine( pObj ) ); } /* * QPoint p1 () const */ HB_FUNC( QT_QLINE_P1 ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QLine( 1 )->p1() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QLine( 1 )->p1() ) ) ); } /* @@ -142,7 +142,7 @@ HB_FUNC( QT_QLINE_P1 ) */ HB_FUNC( QT_QLINE_P2 ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QLine( 1 )->p2() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QLine( 1 )->p2() ) ) ); } /* @@ -254,7 +254,7 @@ HB_FUNC( QT_QLINE_TRANSLATE_1 ) */ HB_FUNC( QT_QLINE_TRANSLATED ) { - hb_retptrGC( gcAllocate_QLine( new QLine( hbqt_par_QLine( 1 )->translated( *hbqt_par_QPoint( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QLine( new QLine( hbqt_par_QLine( 1 )->translated( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* @@ -262,7 +262,7 @@ HB_FUNC( QT_QLINE_TRANSLATED ) */ HB_FUNC( QT_QLINE_TRANSLATED_1 ) { - hb_retptrGC( gcAllocate_QLine( new QLine( hbqt_par_QLine( 1 )->translated( hb_parni( 2 ), hb_parni( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QLine( new QLine( hbqt_par_QLine( 1 )->translated( hb_parni( 2 ), hb_parni( 3 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/qtcore/QLineF.cpp b/harbour/contrib/hbqt/qtcore/QLineF.cpp index fc862dcdd8..82b757a8db 100644 --- a/harbour/contrib/hbqt/qtcore/QLineF.cpp +++ b/harbour/contrib/hbqt/qtcore/QLineF.cpp @@ -100,9 +100,9 @@ QT_G_FUNC( release_QLineF ) } } -void * gcAllocate_QLineF( void * pObj ) +void * hbqt_gcAllocate_QLineF( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QLineF; @@ -116,14 +116,14 @@ HB_FUNC( QT_QLINEF ) pObj = new QLineF() ; - hb_retptrGC( gcAllocate_QLineF( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QLineF( pObj ) ); } /* * QPointF p1 () const */ HB_FUNC( QT_QLINEF_P1 ) { - hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QLineF( 1 )->p1() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QLineF( 1 )->p1() ) ) ); } /* @@ -131,7 +131,7 @@ HB_FUNC( QT_QLINEF_P1 ) */ HB_FUNC( QT_QLINEF_P2 ) { - hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QLineF( 1 )->p2() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QLineF( 1 )->p2() ) ) ); } /* @@ -227,7 +227,7 @@ HB_FUNC( QT_QLINEF_LENGTH ) */ HB_FUNC( QT_QLINEF_NORMALVECTOR ) { - hb_retptrGC( gcAllocate_QLineF( new QLineF( hbqt_par_QLineF( 1 )->normalVector() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QLineF( new QLineF( hbqt_par_QLineF( 1 )->normalVector() ) ) ); } /* @@ -235,7 +235,7 @@ HB_FUNC( QT_QLINEF_NORMALVECTOR ) */ HB_FUNC( QT_QLINEF_POINTAT ) { - hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QLineF( 1 )->pointAt( hb_parnd( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QLineF( 1 )->pointAt( hb_parnd( 2 ) ) ) ) ); } /* @@ -291,7 +291,7 @@ HB_FUNC( QT_QLINEF_SETPOINTS ) */ HB_FUNC( QT_QLINEF_TOLINE ) { - hb_retptrGC( gcAllocate_QLine( new QLine( hbqt_par_QLineF( 1 )->toLine() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QLine( new QLine( hbqt_par_QLineF( 1 )->toLine() ) ) ); } /* @@ -315,7 +315,7 @@ HB_FUNC( QT_QLINEF_TRANSLATE_1 ) */ HB_FUNC( QT_QLINEF_TRANSLATED ) { - hb_retptrGC( gcAllocate_QLineF( new QLineF( hbqt_par_QLineF( 1 )->translated( *hbqt_par_QPointF( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QLineF( new QLineF( hbqt_par_QLineF( 1 )->translated( *hbqt_par_QPointF( 2 ) ) ) ) ); } /* @@ -323,7 +323,7 @@ HB_FUNC( QT_QLINEF_TRANSLATED ) */ HB_FUNC( QT_QLINEF_TRANSLATED_1 ) { - hb_retptrGC( gcAllocate_QLineF( new QLineF( hbqt_par_QLineF( 1 )->translated( hb_parnd( 2 ), hb_parnd( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QLineF( new QLineF( hbqt_par_QLineF( 1 )->translated( hb_parnd( 2 ), hb_parnd( 3 ) ) ) ) ); } /* @@ -331,7 +331,7 @@ HB_FUNC( QT_QLINEF_TRANSLATED_1 ) */ HB_FUNC( QT_QLINEF_UNITVECTOR ) { - hb_retptrGC( gcAllocate_QLineF( new QLineF( hbqt_par_QLineF( 1 )->unitVector() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QLineF( new QLineF( hbqt_par_QLineF( 1 )->unitVector() ) ) ); } diff --git a/harbour/contrib/hbqt/qtcore/QList.cpp b/harbour/contrib/hbqt/qtcore/QList.cpp index eec3efffb2..688fef73f8 100644 --- a/harbour/contrib/hbqt/qtcore/QList.cpp +++ b/harbour/contrib/hbqt/qtcore/QList.cpp @@ -122,9 +122,9 @@ QT_G_FUNC( release_QList ) } } -void * gcAllocate_QList( void * pObj ) +void * hbqt_gcAllocate_QList( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QList; @@ -139,7 +139,7 @@ HB_FUNC( QT_QLIST ) QList* list = NULL; pObj = ( QList* ) list ; - hb_retptrGC( gcAllocate_QList( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QList( pObj ) ); } /* * void append ( const T & value ) diff --git a/harbour/contrib/hbqt/qtcore/QLocale.cpp b/harbour/contrib/hbqt/qtcore/QLocale.cpp index 524200de02..29ff98211e 100644 --- a/harbour/contrib/hbqt/qtcore/QLocale.cpp +++ b/harbour/contrib/hbqt/qtcore/QLocale.cpp @@ -124,9 +124,9 @@ QT_G_FUNC( release_QLocale ) } } -void * gcAllocate_QLocale( void * pObj ) +void * hbqt_gcAllocate_QLocale( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QLocale; @@ -140,7 +140,7 @@ HB_FUNC( QT_QLOCALE ) pObj = new QLocale() ; - hb_retptrGC( gcAllocate_QLocale( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QLocale( pObj ) ); } /* * QString amText () const @@ -267,7 +267,7 @@ HB_FUNC( QT_QLOCALE_TIMEFORMAT ) */ HB_FUNC( QT_QLOCALE_TODATE ) { - 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 ) ) ) ) ); + hb_retptrGC( hbqt_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 +275,7 @@ HB_FUNC( QT_QLOCALE_TODATE ) */ HB_FUNC( QT_QLOCALE_TODATE_1 ) { - hb_retptrGC( gcAllocate_QDate( new QDate( hbqt_par_QLocale( 1 )->toDate( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDate( new QDate( hbqt_par_QLocale( 1 )->toDate( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ) ) ); } /* @@ -283,7 +283,7 @@ HB_FUNC( QT_QLOCALE_TODATE_1 ) */ HB_FUNC( QT_QLOCALE_TODATETIME ) { - 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 ) ) ) ) ); + hb_retptrGC( hbqt_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 +291,7 @@ HB_FUNC( QT_QLOCALE_TODATETIME ) */ HB_FUNC( QT_QLOCALE_TODATETIME_1 ) { - hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QLocale( 1 )->toDateTime( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QLocale( 1 )->toDateTime( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ) ) ); } /* @@ -471,7 +471,7 @@ HB_FUNC( QT_QLOCALE_TOSTRING_13 ) */ HB_FUNC( QT_QLOCALE_TOTIME ) { - 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 ) ) ) ) ); + hb_retptrGC( hbqt_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 +479,7 @@ HB_FUNC( QT_QLOCALE_TOTIME ) */ HB_FUNC( QT_QLOCALE_TOTIME_1 ) { - hb_retptrGC( gcAllocate_QTime( new QTime( hbqt_par_QLocale( 1 )->toTime( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QLocale( 1 )->toTime( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ) ) ); } /* @@ -523,7 +523,7 @@ HB_FUNC( QT_QLOCALE_TOUSHORT ) */ HB_FUNC( QT_QLOCALE_C ) { - hb_retptrGC( gcAllocate_QLocale( new QLocale( hbqt_par_QLocale( 1 )->c() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QLocale( new QLocale( hbqt_par_QLocale( 1 )->c() ) ) ); } /* @@ -555,7 +555,7 @@ HB_FUNC( QT_QLOCALE_SETDEFAULT ) */ HB_FUNC( QT_QLOCALE_SYSTEM ) { - hb_retptrGC( gcAllocate_QLocale( new QLocale( hbqt_par_QLocale( 1 )->system() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QLocale( new QLocale( hbqt_par_QLocale( 1 )->system() ) ) ); } diff --git a/harbour/contrib/hbqt/qtcore/QMimeData.cpp b/harbour/contrib/hbqt/qtcore/QMimeData.cpp index bf34ecdad9..e401fe8356 100644 --- a/harbour/contrib/hbqt/qtcore/QMimeData.cpp +++ b/harbour/contrib/hbqt/qtcore/QMimeData.cpp @@ -131,9 +131,9 @@ QT_G_FUNC( release_QMimeData ) } } -void * gcAllocate_QMimeData( void * pObj ) +void * hbqt_gcAllocate_QMimeData( void * pObj ) { - QGC_POINTER_QMimeData * p = ( QGC_POINTER_QMimeData * ) hb_gcAllocate( sizeof( QGC_POINTER_QMimeData ), gcFuncs() ); + QGC_POINTER_QMimeData * p = ( QGC_POINTER_QMimeData * ) hb_gcAllocate( sizeof( QGC_POINTER_QMimeData ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QMimeData; @@ -148,7 +148,7 @@ HB_FUNC( QT_QMIMEDATA ) pObj = new QMimeData() ; - hb_retptrGC( gcAllocate_QMimeData( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QMimeData( pObj ) ); } /* * void clear () @@ -163,7 +163,7 @@ HB_FUNC( QT_QMIMEDATA_CLEAR ) */ HB_FUNC( QT_QMIMEDATA_COLORDATA ) { - hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QMimeData( 1 )->colorData() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QMimeData( 1 )->colorData() ) ) ); } /* @@ -171,7 +171,7 @@ HB_FUNC( QT_QMIMEDATA_COLORDATA ) */ HB_FUNC( QT_QMIMEDATA_DATA ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QMimeData( 1 )->data( hbqt_par_QString( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QMimeData( 1 )->data( hbqt_par_QString( 2 ) ) ) ) ); } /* @@ -179,7 +179,7 @@ HB_FUNC( QT_QMIMEDATA_DATA ) */ HB_FUNC( QT_QMIMEDATA_FORMATS ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QMimeData( 1 )->formats() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QMimeData( 1 )->formats() ) ) ); } /* @@ -243,7 +243,7 @@ HB_FUNC( QT_QMIMEDATA_HTML ) */ HB_FUNC( QT_QMIMEDATA_IMAGEDATA ) { - hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QMimeData( 1 )->imageData() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QMimeData( 1 )->imageData() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtcore/QModelIndex.cpp b/harbour/contrib/hbqt/qtcore/QModelIndex.cpp index af28ca8278..e59f14ebf0 100644 --- a/harbour/contrib/hbqt/qtcore/QModelIndex.cpp +++ b/harbour/contrib/hbqt/qtcore/QModelIndex.cpp @@ -96,9 +96,9 @@ QT_G_FUNC( release_QModelIndex ) } } -void * gcAllocate_QModelIndex( void * pObj ) +void * hbqt_gcAllocate_QModelIndex( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QModelIndex; @@ -112,14 +112,14 @@ HB_FUNC( QT_QMODELINDEX ) pObj = new QModelIndex() ; - hb_retptrGC( gcAllocate_QModelIndex( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( pObj ) ); } /* * QModelIndex child ( int row, int column ) const */ HB_FUNC( QT_QMODELINDEX_CHILD ) { - hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QModelIndex( 1 )->child( hb_parni( 2 ), hb_parni( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QModelIndex( 1 )->child( hb_parni( 2 ), hb_parni( 3 ) ) ) ) ); } /* @@ -135,7 +135,7 @@ HB_FUNC( QT_QMODELINDEX_COLUMN ) */ HB_FUNC( QT_QMODELINDEX_DATA ) { - hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QModelIndex( 1 )->data( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : Qt::DisplayRole ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QModelIndex( 1 )->data( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : Qt::DisplayRole ) ) ) ) ); } /* @@ -183,7 +183,7 @@ HB_FUNC( QT_QMODELINDEX_MODEL ) */ HB_FUNC( QT_QMODELINDEX_PARENT ) { - hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QModelIndex( 1 )->parent() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QModelIndex( 1 )->parent() ) ) ); } /* @@ -199,7 +199,7 @@ HB_FUNC( QT_QMODELINDEX_ROW ) */ HB_FUNC( QT_QMODELINDEX_SIBLING ) { - hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QModelIndex( 1 )->sibling( hb_parni( 2 ), hb_parni( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QModelIndex( 1 )->sibling( hb_parni( 2 ), hb_parni( 3 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/qtcore/QObject.cpp b/harbour/contrib/hbqt/qtcore/QObject.cpp index cab7e6ba0a..b743410bcb 100644 --- a/harbour/contrib/hbqt/qtcore/QObject.cpp +++ b/harbour/contrib/hbqt/qtcore/QObject.cpp @@ -138,9 +138,9 @@ QT_G_FUNC( release_QObject ) } } -void * gcAllocate_QObject( void * pObj ) +void * hbqt_gcAllocate_QObject( void * pObj ) { - QGC_POINTER_QObject * p = ( QGC_POINTER_QObject * ) hb_gcAllocate( sizeof( QGC_POINTER_QObject ), gcFuncs() ); + QGC_POINTER_QObject * p = ( QGC_POINTER_QObject * ) hb_gcAllocate( sizeof( QGC_POINTER_QObject ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QObject; @@ -155,7 +155,7 @@ HB_FUNC( QT_QOBJECT ) pObj = ( QObject* ) new QObject( hbqt_par_QObject( 1 ) ) ; - hb_retptrGC( gcAllocate_QObject( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QObject( pObj ) ); } /* * bool blockSignals ( bool block ) @@ -290,7 +290,7 @@ HB_FUNC( QT_QOBJECT_PARENT ) */ HB_FUNC( QT_QOBJECT_PROPERTY ) { - hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QObject( 1 )->property( hbqt_par_char( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QObject( 1 )->property( hbqt_par_char( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtcore/QPoint.cpp b/harbour/contrib/hbqt/qtcore/QPoint.cpp index 92bdac4ae0..bf32dfa326 100644 --- a/harbour/contrib/hbqt/qtcore/QPoint.cpp +++ b/harbour/contrib/hbqt/qtcore/QPoint.cpp @@ -96,9 +96,9 @@ QT_G_FUNC( release_QPoint ) } } -void * gcAllocate_QPoint( void * pObj ) +void * hbqt_gcAllocate_QPoint( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QPoint; @@ -123,7 +123,7 @@ HB_FUNC( QT_QPOINT ) pObj = ( QPoint* ) new QPoint() ; } - hb_retptrGC( gcAllocate_QPoint( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( pObj ) ); } /* * bool isNull () const diff --git a/harbour/contrib/hbqt/qtcore/QPointF.cpp b/harbour/contrib/hbqt/qtcore/QPointF.cpp index ea092df938..3a6ab7a0d1 100644 --- a/harbour/contrib/hbqt/qtcore/QPointF.cpp +++ b/harbour/contrib/hbqt/qtcore/QPointF.cpp @@ -96,9 +96,9 @@ QT_G_FUNC( release_QPointF ) } } -void * gcAllocate_QPointF( void * pObj ) +void * hbqt_gcAllocate_QPointF( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QPointF; @@ -123,7 +123,7 @@ HB_FUNC( QT_QPOINTF ) pObj = ( QPointF* ) new QPointF() ; } - hb_retptrGC( gcAllocate_QPointF( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QPointF( pObj ) ); } /* * bool isNull () const @@ -170,7 +170,7 @@ HB_FUNC( QT_QPOINTF_SETY ) */ HB_FUNC( QT_QPOINTF_TOPOINT ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QPointF( 1 )->toPoint() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QPointF( 1 )->toPoint() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtcore/QProcess.cpp b/harbour/contrib/hbqt/qtcore/QProcess.cpp index 4bc6706918..202c949973 100644 --- a/harbour/contrib/hbqt/qtcore/QProcess.cpp +++ b/harbour/contrib/hbqt/qtcore/QProcess.cpp @@ -132,9 +132,9 @@ QT_G_FUNC( release_QProcess ) } } -void * gcAllocate_QProcess( void * pObj ) +void * hbqt_gcAllocate_QProcess( void * pObj ) { - QGC_POINTER_QProcess * p = ( QGC_POINTER_QProcess * ) hb_gcAllocate( sizeof( QGC_POINTER_QProcess ), gcFuncs() ); + QGC_POINTER_QProcess * p = ( QGC_POINTER_QProcess * ) hb_gcAllocate( sizeof( QGC_POINTER_QProcess ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QProcess; @@ -156,7 +156,7 @@ HB_FUNC( QT_QPROCESS ) pObj = ( QProcess* ) new QProcess() ; } - hb_retptrGC( gcAllocate_QProcess( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QProcess( pObj ) ); } /* * virtual void close () @@ -187,7 +187,7 @@ HB_FUNC( QT_QPROCESS_CLOSEWRITECHANNEL ) */ HB_FUNC( QT_QPROCESS_ENVIRONMENT ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QProcess( 1 )->environment() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QProcess( 1 )->environment() ) ) ); } /* @@ -227,7 +227,7 @@ HB_FUNC( QT_QPROCESS_PROCESSCHANNELMODE ) */ HB_FUNC( QT_QPROCESS_READALLSTANDARDERROR ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QProcess( 1 )->readAllStandardError() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QProcess( 1 )->readAllStandardError() ) ) ); } /* @@ -235,7 +235,7 @@ HB_FUNC( QT_QPROCESS_READALLSTANDARDERROR ) */ HB_FUNC( QT_QPROCESS_READALLSTANDARDOUTPUT ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QProcess( 1 )->readAllStandardOutput() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QProcess( 1 )->readAllStandardOutput() ) ) ); } /* @@ -407,7 +407,7 @@ HB_FUNC( QT_QPROCESS_STARTDETACHED_2 ) */ HB_FUNC( QT_QPROCESS_SYSTEMENVIRONMENT ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QProcess( 1 )->systemEnvironment() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QProcess( 1 )->systemEnvironment() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtcore/QRect.cpp b/harbour/contrib/hbqt/qtcore/QRect.cpp index 0ccf15fa63..95b19dde0a 100644 --- a/harbour/contrib/hbqt/qtcore/QRect.cpp +++ b/harbour/contrib/hbqt/qtcore/QRect.cpp @@ -98,9 +98,9 @@ QT_G_FUNC( release_QRect ) } } -void * gcAllocate_QRect( void * pObj ) +void * hbqt_gcAllocate_QRect( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QRect; @@ -129,7 +129,7 @@ HB_FUNC( QT_QRECT ) pObj = ( QRect* ) new QRect() ; } - hb_retptrGC( gcAllocate_QRect( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( pObj ) ); } /* * void adjust ( int dx1, int dy1, int dx2, int dy2 ) @@ -144,7 +144,7 @@ HB_FUNC( QT_QRECT_ADJUST ) */ HB_FUNC( QT_QRECT_ADJUSTED ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->adjusted( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->adjusted( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ) ) ) ); } /* @@ -160,7 +160,7 @@ HB_FUNC( QT_QRECT_BOTTOM ) */ HB_FUNC( QT_QRECT_BOTTOMLEFT ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QRect( 1 )->bottomLeft() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QRect( 1 )->bottomLeft() ) ) ); } /* @@ -168,7 +168,7 @@ HB_FUNC( QT_QRECT_BOTTOMLEFT ) */ HB_FUNC( QT_QRECT_BOTTOMRIGHT ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QRect( 1 )->bottomRight() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QRect( 1 )->bottomRight() ) ) ); } /* @@ -176,7 +176,7 @@ HB_FUNC( QT_QRECT_BOTTOMRIGHT ) */ HB_FUNC( QT_QRECT_CENTER ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QRect( 1 )->center() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QRect( 1 )->center() ) ) ); } /* @@ -260,7 +260,7 @@ HB_FUNC( QT_QRECT_HEIGHT ) */ HB_FUNC( QT_QRECT_INTERSECTED ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->intersected( *hbqt_par_QRect( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->intersected( *hbqt_par_QRect( 2 ) ) ) ) ); } /* @@ -396,7 +396,7 @@ HB_FUNC( QT_QRECT_MOVETOPRIGHT ) */ HB_FUNC( QT_QRECT_NORMALIZED ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->normalized() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->normalized() ) ) ); } /* @@ -532,7 +532,7 @@ HB_FUNC( QT_QRECT_SETY ) */ HB_FUNC( QT_QRECT_SIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QRect( 1 )->size() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QRect( 1 )->size() ) ) ); } /* @@ -548,7 +548,7 @@ HB_FUNC( QT_QRECT_TOP ) */ HB_FUNC( QT_QRECT_TOPLEFT ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QRect( 1 )->topLeft() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QRect( 1 )->topLeft() ) ) ); } /* @@ -556,7 +556,7 @@ HB_FUNC( QT_QRECT_TOPLEFT ) */ HB_FUNC( QT_QRECT_TOPRIGHT ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QRect( 1 )->topRight() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QRect( 1 )->topRight() ) ) ); } /* @@ -580,7 +580,7 @@ HB_FUNC( QT_QRECT_TRANSLATE_1 ) */ HB_FUNC( QT_QRECT_TRANSLATED ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->translated( hb_parni( 2 ), hb_parni( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->translated( hb_parni( 2 ), hb_parni( 3 ) ) ) ) ); } /* @@ -588,7 +588,7 @@ HB_FUNC( QT_QRECT_TRANSLATED ) */ HB_FUNC( QT_QRECT_TRANSLATED_1 ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->translated( *hbqt_par_QPoint( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->translated( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* @@ -596,7 +596,7 @@ HB_FUNC( QT_QRECT_TRANSLATED_1 ) */ HB_FUNC( QT_QRECT_UNITED ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->united( *hbqt_par_QRect( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QRect( 1 )->united( *hbqt_par_QRect( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtcore/QRectF.cpp b/harbour/contrib/hbqt/qtcore/QRectF.cpp index a0dcc11610..d52a0cf954 100644 --- a/harbour/contrib/hbqt/qtcore/QRectF.cpp +++ b/harbour/contrib/hbqt/qtcore/QRectF.cpp @@ -99,9 +99,9 @@ QT_G_FUNC( release_QRectF ) } } -void * gcAllocate_QRectF( void * pObj ) +void * hbqt_gcAllocate_QRectF( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QRectF; @@ -130,7 +130,7 @@ HB_FUNC( QT_QRECTF ) pObj = ( QRectF* ) new QRectF() ; } - hb_retptrGC( gcAllocate_QRectF( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( pObj ) ); } /* * void adjust ( qreal dx1, qreal dy1, qreal dx2, qreal dy2 ) @@ -145,7 +145,7 @@ HB_FUNC( QT_QRECTF_ADJUST ) */ HB_FUNC( QT_QRECTF_ADJUSTED ) { - hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->adjusted( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->adjusted( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ) ) ) ); } /* @@ -161,7 +161,7 @@ HB_FUNC( QT_QRECTF_BOTTOM ) */ HB_FUNC( QT_QRECTF_BOTTOMLEFT ) { - hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QRectF( 1 )->bottomLeft() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QRectF( 1 )->bottomLeft() ) ) ); } /* @@ -169,7 +169,7 @@ HB_FUNC( QT_QRECTF_BOTTOMLEFT ) */ HB_FUNC( QT_QRECTF_BOTTOMRIGHT ) { - hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QRectF( 1 )->bottomRight() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QRectF( 1 )->bottomRight() ) ) ); } /* @@ -177,7 +177,7 @@ HB_FUNC( QT_QRECTF_BOTTOMRIGHT ) */ HB_FUNC( QT_QRECTF_CENTER ) { - hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QRectF( 1 )->center() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QRectF( 1 )->center() ) ) ); } /* @@ -253,7 +253,7 @@ HB_FUNC( QT_QRECTF_HEIGHT ) */ HB_FUNC( QT_QRECTF_INTERSECTED ) { - hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->intersected( *hbqt_par_QRectF( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->intersected( *hbqt_par_QRectF( 2 ) ) ) ) ); } /* @@ -389,7 +389,7 @@ HB_FUNC( QT_QRECTF_MOVETOPRIGHT ) */ HB_FUNC( QT_QRECTF_NORMALIZED ) { - hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->normalized() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->normalized() ) ) ); } /* @@ -525,7 +525,7 @@ HB_FUNC( QT_QRECTF_SETY ) */ HB_FUNC( QT_QRECTF_SIZE ) { - hb_retptrGC( gcAllocate_QSizeF( new QSizeF( hbqt_par_QRectF( 1 )->size() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSizeF( new QSizeF( hbqt_par_QRectF( 1 )->size() ) ) ); } /* @@ -533,7 +533,7 @@ HB_FUNC( QT_QRECTF_SIZE ) */ HB_FUNC( QT_QRECTF_TOALIGNEDRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QRectF( 1 )->toAlignedRect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QRectF( 1 )->toAlignedRect() ) ) ); } /* @@ -541,7 +541,7 @@ HB_FUNC( QT_QRECTF_TOALIGNEDRECT ) */ HB_FUNC( QT_QRECTF_TORECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QRectF( 1 )->toRect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QRectF( 1 )->toRect() ) ) ); } /* @@ -557,7 +557,7 @@ HB_FUNC( QT_QRECTF_TOP ) */ HB_FUNC( QT_QRECTF_TOPLEFT ) { - hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QRectF( 1 )->topLeft() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QRectF( 1 )->topLeft() ) ) ); } /* @@ -565,7 +565,7 @@ HB_FUNC( QT_QRECTF_TOPLEFT ) */ HB_FUNC( QT_QRECTF_TOPRIGHT ) { - hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QRectF( 1 )->topRight() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QRectF( 1 )->topRight() ) ) ); } /* @@ -589,7 +589,7 @@ HB_FUNC( QT_QRECTF_TRANSLATE_1 ) */ HB_FUNC( QT_QRECTF_TRANSLATED ) { - hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->translated( hb_parnd( 2 ), hb_parnd( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->translated( hb_parnd( 2 ), hb_parnd( 3 ) ) ) ) ); } /* @@ -597,7 +597,7 @@ HB_FUNC( QT_QRECTF_TRANSLATED ) */ HB_FUNC( QT_QRECTF_TRANSLATED_1 ) { - hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->translated( *hbqt_par_QPointF( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->translated( *hbqt_par_QPointF( 2 ) ) ) ) ); } /* @@ -605,7 +605,7 @@ HB_FUNC( QT_QRECTF_TRANSLATED_1 ) */ HB_FUNC( QT_QRECTF_UNITED ) { - hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->united( *hbqt_par_QRectF( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QRectF( 1 )->united( *hbqt_par_QRectF( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtcore/QRegExp.cpp b/harbour/contrib/hbqt/qtcore/QRegExp.cpp index 00f326511c..c7b499c423 100644 --- a/harbour/contrib/hbqt/qtcore/QRegExp.cpp +++ b/harbour/contrib/hbqt/qtcore/QRegExp.cpp @@ -101,9 +101,9 @@ QT_G_FUNC( release_QRegExp ) } } -void * gcAllocate_QRegExp( void * pObj ) +void * hbqt_gcAllocate_QRegExp( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QRegExp; @@ -117,7 +117,7 @@ HB_FUNC( QT_QREGEXP ) pObj = new QRegExp() ; - hb_retptrGC( gcAllocate_QRegExp( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QRegExp( pObj ) ); } /* * QString cap ( int nth = 0 ) const @@ -132,7 +132,7 @@ HB_FUNC( QT_QREGEXP_CAP ) */ HB_FUNC( QT_QREGEXP_CAPTUREDTEXTS ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QRegExp( 1 )->capturedTexts() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QRegExp( 1 )->capturedTexts() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtcore/QResource.cpp b/harbour/contrib/hbqt/qtcore/QResource.cpp index 9d4134bdfb..5db32368ab 100644 --- a/harbour/contrib/hbqt/qtcore/QResource.cpp +++ b/harbour/contrib/hbqt/qtcore/QResource.cpp @@ -95,9 +95,9 @@ QT_G_FUNC( release_QResource ) } } -void * gcAllocate_QResource( void * pObj ) +void * hbqt_gcAllocate_QResource( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QResource; @@ -111,7 +111,7 @@ HB_FUNC( QT_QRESOURCE ) pObj = ( QResource* ) new QResource() ; - hb_retptrGC( gcAllocate_QResource( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QResource( pObj ) ); } /* * QString absoluteFilePath () const @@ -158,7 +158,7 @@ HB_FUNC( QT_QRESOURCE_ISVALID ) */ HB_FUNC( QT_QRESOURCE_LOCALE ) { - hb_retptrGC( gcAllocate_QLocale( new QLocale( hbqt_par_QResource( 1 )->locale() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QLocale( new QLocale( hbqt_par_QResource( 1 )->locale() ) ) ); } /* @@ -198,7 +198,7 @@ HB_FUNC( QT_QRESOURCE_REGISTERRESOURCE ) */ HB_FUNC( QT_QRESOURCE_SEARCHPATHS ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QResource( 1 )->searchPaths() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QResource( 1 )->searchPaths() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtcore/QSignalMapper.cpp b/harbour/contrib/hbqt/qtcore/QSignalMapper.cpp index 03d83004db..2090477976 100644 --- a/harbour/contrib/hbqt/qtcore/QSignalMapper.cpp +++ b/harbour/contrib/hbqt/qtcore/QSignalMapper.cpp @@ -121,9 +121,9 @@ QT_G_FUNC( release_QSignalMapper ) } } -void * gcAllocate_QSignalMapper( void * pObj ) +void * hbqt_gcAllocate_QSignalMapper( void * pObj ) { - QGC_POINTER_QSignalMapper * p = ( QGC_POINTER_QSignalMapper * ) hb_gcAllocate( sizeof( QGC_POINTER_QSignalMapper ), gcFuncs() ); + QGC_POINTER_QSignalMapper * p = ( QGC_POINTER_QSignalMapper * ) hb_gcAllocate( sizeof( QGC_POINTER_QSignalMapper ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QSignalMapper; @@ -138,7 +138,7 @@ HB_FUNC( QT_QSIGNALMAPPER ) pObj = new QSignalMapper( hbqt_par_QObject( 1 ) ) ; - hb_retptrGC( gcAllocate_QSignalMapper( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QSignalMapper( pObj ) ); } /* * QObject * mapping ( int id ) const diff --git a/harbour/contrib/hbqt/qtcore/QSize.cpp b/harbour/contrib/hbqt/qtcore/QSize.cpp index 564086ec26..763ebb3da3 100644 --- a/harbour/contrib/hbqt/qtcore/QSize.cpp +++ b/harbour/contrib/hbqt/qtcore/QSize.cpp @@ -96,9 +96,9 @@ QT_G_FUNC( release_QSize ) } } -void * gcAllocate_QSize( void * pObj ) +void * hbqt_gcAllocate_QSize( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QSize; @@ -123,7 +123,7 @@ HB_FUNC( QT_QSIZE ) pObj = ( QSize* ) new QSize() ; } - hb_retptrGC( gcAllocate_QSize( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( pObj ) ); } /* * int height () const @@ -226,7 +226,7 @@ HB_FUNC( QT_QSIZE_WIDTH ) */ HB_FUNC( QT_QSIZE_BOUNDEDTO ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QSize( 1 )->boundedTo( *hbqt_par_QSize( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QSize( 1 )->boundedTo( *hbqt_par_QSize( 2 ) ) ) ) ); } /* @@ -234,7 +234,7 @@ HB_FUNC( QT_QSIZE_BOUNDEDTO ) */ HB_FUNC( QT_QSIZE_EXPANDEDTO ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QSize( 1 )->expandedTo( *hbqt_par_QSize( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QSize( 1 )->expandedTo( *hbqt_par_QSize( 2 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/qtcore/QSizeF.cpp b/harbour/contrib/hbqt/qtcore/QSizeF.cpp index 30ea67dcc3..56fb459b26 100644 --- a/harbour/contrib/hbqt/qtcore/QSizeF.cpp +++ b/harbour/contrib/hbqt/qtcore/QSizeF.cpp @@ -97,9 +97,9 @@ QT_G_FUNC( release_QSizeF ) } } -void * gcAllocate_QSizeF( void * pObj ) +void * hbqt_gcAllocate_QSizeF( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QSizeF; @@ -120,14 +120,14 @@ HB_FUNC( QT_QSIZEF ) pObj = ( QSizeF* ) new QSizeF() ; } - hb_retptrGC( gcAllocate_QSizeF( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QSizeF( pObj ) ); } /* * QSizeF boundedTo ( const QSizeF & otherSize ) const */ HB_FUNC( QT_QSIZEF_BOUNDEDTO ) { - hb_retptrGC( gcAllocate_QSizeF( new QSizeF( hbqt_par_QSizeF( 1 )->boundedTo( *hbqt_par_QSizeF( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSizeF( new QSizeF( hbqt_par_QSizeF( 1 )->boundedTo( *hbqt_par_QSizeF( 2 ) ) ) ) ); } /* @@ -135,7 +135,7 @@ HB_FUNC( QT_QSIZEF_BOUNDEDTO ) */ HB_FUNC( QT_QSIZEF_EXPANDEDTO ) { - hb_retptrGC( gcAllocate_QSizeF( new QSizeF( hbqt_par_QSizeF( 1 )->expandedTo( *hbqt_par_QSizeF( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSizeF( new QSizeF( hbqt_par_QSizeF( 1 )->expandedTo( *hbqt_par_QSizeF( 2 ) ) ) ) ); } /* @@ -223,7 +223,7 @@ HB_FUNC( QT_QSIZEF_SETWIDTH ) */ HB_FUNC( QT_QSIZEF_TOSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QSizeF( 1 )->toSize() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QSizeF( 1 )->toSize() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtcore/QStringList.cpp b/harbour/contrib/hbqt/qtcore/QStringList.cpp index 2d4c0e552e..685437f910 100644 --- a/harbour/contrib/hbqt/qtcore/QStringList.cpp +++ b/harbour/contrib/hbqt/qtcore/QStringList.cpp @@ -115,9 +115,9 @@ QT_G_FUNC( release_QStringList ) } } -void * gcAllocate_QStringList( void * pObj ) +void * hbqt_gcAllocate_QStringList( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStringList; @@ -131,7 +131,7 @@ HB_FUNC( QT_QSTRINGLIST ) pObj = ( QStringList* ) new QStringList() ; - hb_retptrGC( gcAllocate_QStringList( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( pObj ) ); } /* * void append ( const QString & value ) @@ -146,7 +146,7 @@ HB_FUNC( QT_QSTRINGLIST_APPEND ) */ HB_FUNC( QT_QSTRINGLIST_FILTER ) { - 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 ) ) ) ) ); + hb_retptrGC( hbqt_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 +154,7 @@ HB_FUNC( QT_QSTRINGLIST_FILTER ) */ HB_FUNC( QT_QSTRINGLIST_FILTER_1 ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QStringList( 1 )->filter( *hbqt_par_QRegExp( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QStringList( 1 )->filter( *hbqt_par_QRegExp( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtcore/QTextBoundaryFinder.cpp b/harbour/contrib/hbqt/qtcore/QTextBoundaryFinder.cpp index 98816ed684..90de458ca6 100644 --- a/harbour/contrib/hbqt/qtcore/QTextBoundaryFinder.cpp +++ b/harbour/contrib/hbqt/qtcore/QTextBoundaryFinder.cpp @@ -104,9 +104,9 @@ QT_G_FUNC( release_QTextBoundaryFinder ) } } -void * gcAllocate_QTextBoundaryFinder( void * pObj ) +void * hbqt_gcAllocate_QTextBoundaryFinder( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTextBoundaryFinder; @@ -120,7 +120,7 @@ HB_FUNC( QT_QTEXTBOUNDARYFINDER ) pObj = ( QTextBoundaryFinder* ) new QTextBoundaryFinder() ; - hb_retptrGC( gcAllocate_QTextBoundaryFinder( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTextBoundaryFinder( pObj ) ); } /* * BoundaryReasons boundaryReasons () const diff --git a/harbour/contrib/hbqt/qtcore/QTextCodec.cpp b/harbour/contrib/hbqt/qtcore/QTextCodec.cpp index 8c3578a7bc..4701ced842 100644 --- a/harbour/contrib/hbqt/qtcore/QTextCodec.cpp +++ b/harbour/contrib/hbqt/qtcore/QTextCodec.cpp @@ -124,7 +124,7 @@ HB_FUNC( QT_QTEXTCODEC_CANENCODE_1 ) */ HB_FUNC( QT_QTEXTCODEC_FROMUNICODE ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QTextCodec( 1 )->fromUnicode( hbqt_par_QString( 2 ) ) ) ) ); + hb_retptrGC( hbqt_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( gcAllocate_QByteArray( new QByteArray( hbqt_par_QTextCodec( 1 )->name() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QTextCodec( 1 )->name() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtcore/QTextDecoder.cpp b/harbour/contrib/hbqt/qtcore/QTextDecoder.cpp index e9d3e9e8bf..018e070717 100644 --- a/harbour/contrib/hbqt/qtcore/QTextDecoder.cpp +++ b/harbour/contrib/hbqt/qtcore/QTextDecoder.cpp @@ -95,9 +95,9 @@ QT_G_FUNC( release_QTextDecoder ) } } -void * gcAllocate_QTextDecoder( void * pObj ) +void * hbqt_gcAllocate_QTextDecoder( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTextDecoder; @@ -111,7 +111,7 @@ HB_FUNC( QT_QTEXTDECODER ) pObj = ( QTextDecoder* ) new QTextDecoder( hbqt_par_QTextCodec( 1 ) ) ; - hb_retptrGC( gcAllocate_QTextDecoder( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTextDecoder( pObj ) ); } /* * QString toUnicode ( const char * chars, int len ) diff --git a/harbour/contrib/hbqt/qtcore/QTextEncoder.cpp b/harbour/contrib/hbqt/qtcore/QTextEncoder.cpp index 0c48da56d9..53b35c9b31 100644 --- a/harbour/contrib/hbqt/qtcore/QTextEncoder.cpp +++ b/harbour/contrib/hbqt/qtcore/QTextEncoder.cpp @@ -95,9 +95,9 @@ QT_G_FUNC( release_QTextEncoder ) } } -void * gcAllocate_QTextEncoder( void * pObj ) +void * hbqt_gcAllocate_QTextEncoder( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTextEncoder; @@ -111,14 +111,14 @@ HB_FUNC( QT_QTEXTENCODER ) pObj = ( QTextEncoder* ) new QTextEncoder( hbqt_par_QTextCodec( 1 ) ) ; - hb_retptrGC( gcAllocate_QTextEncoder( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTextEncoder( pObj ) ); } /* * QByteArray fromUnicode ( const QString & str ) */ HB_FUNC( QT_QTEXTENCODER_FROMUNICODE ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QTextEncoder( 1 )->fromUnicode( hbqt_par_QString( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QTextEncoder( 1 )->fromUnicode( hbqt_par_QString( 2 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/qtcore/QTextStream.cpp b/harbour/contrib/hbqt/qtcore/QTextStream.cpp index a8654f3ae7..69f35e7ed3 100644 --- a/harbour/contrib/hbqt/qtcore/QTextStream.cpp +++ b/harbour/contrib/hbqt/qtcore/QTextStream.cpp @@ -115,9 +115,9 @@ QT_G_FUNC( release_QTextStream ) } } -void * gcAllocate_QTextStream( void * pObj ) +void * hbqt_gcAllocate_QTextStream( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTextStream; @@ -131,7 +131,7 @@ HB_FUNC( QT_QTEXTSTREAM ) pObj = new QTextStream( hb_parcx( 1 ), ( QIODevice::OpenMode ) ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : QIODevice::ReadWrite ) ) ; - hb_retptrGC( gcAllocate_QTextStream( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTextStream( pObj ) ); } /* * bool atEnd () const @@ -210,7 +210,7 @@ HB_FUNC( QT_QTEXTSTREAM_INTEGERBASE ) */ HB_FUNC( QT_QTEXTSTREAM_LOCALE ) { - hb_retptrGC( gcAllocate_QLocale( new QLocale( hbqt_par_QTextStream( 1 )->locale() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QLocale( new QLocale( hbqt_par_QTextStream( 1 )->locale() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtcore/QThread.cpp b/harbour/contrib/hbqt/qtcore/QThread.cpp index 75e9ef017f..f2709bc451 100644 --- a/harbour/contrib/hbqt/qtcore/QThread.cpp +++ b/harbour/contrib/hbqt/qtcore/QThread.cpp @@ -124,9 +124,9 @@ QT_G_FUNC( release_QThread ) } } -void * gcAllocate_QThread( void * pObj ) +void * hbqt_gcAllocate_QThread( void * pObj ) { - QGC_POINTER_QThread * p = ( QGC_POINTER_QThread * ) hb_gcAllocate( sizeof( QGC_POINTER_QThread ), gcFuncs() ); + QGC_POINTER_QThread * p = ( QGC_POINTER_QThread * ) hb_gcAllocate( sizeof( QGC_POINTER_QThread ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QThread; @@ -141,7 +141,7 @@ HB_FUNC( QT_QTHREAD ) pObj = new QThread() ; - hb_retptrGC( gcAllocate_QThread( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QThread( pObj ) ); } /* * void exit ( int returnCode = 0 ) diff --git a/harbour/contrib/hbqt/qtcore/QTime.cpp b/harbour/contrib/hbqt/qtcore/QTime.cpp index 157e30485b..b7a9429acd 100644 --- a/harbour/contrib/hbqt/qtcore/QTime.cpp +++ b/harbour/contrib/hbqt/qtcore/QTime.cpp @@ -94,9 +94,9 @@ QT_G_FUNC( release_QTime ) } } -void * gcAllocate_QTime( void * pObj ) +void * hbqt_gcAllocate_QTime( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTime; @@ -110,14 +110,14 @@ HB_FUNC( QT_QTIME ) pObj = new QTime() ; - hb_retptrGC( gcAllocate_QTime( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTime( pObj ) ); } /* * QTime addMSecs ( int ms ) const */ HB_FUNC( QT_QTIME_ADDMSECS ) { - hb_retptrGC( gcAllocate_QTime( new QTime( hbqt_par_QTime( 1 )->addMSecs( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QTime( 1 )->addMSecs( hb_parni( 2 ) ) ) ) ); } /* @@ -125,7 +125,7 @@ HB_FUNC( QT_QTIME_ADDMSECS ) */ HB_FUNC( QT_QTIME_ADDSECS ) { - hb_retptrGC( gcAllocate_QTime( new QTime( hbqt_par_QTime( 1 )->addSecs( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QTime( 1 )->addSecs( hb_parni( 2 ) ) ) ) ); } /* @@ -245,7 +245,7 @@ HB_FUNC( QT_QTIME_TOSTRING_1 ) */ HB_FUNC( QT_QTIME_CURRENTTIME ) { - hb_retptrGC( gcAllocate_QTime( new QTime( hbqt_par_QTime( 1 )->currentTime() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QTime( 1 )->currentTime() ) ) ); } /* @@ -253,7 +253,7 @@ HB_FUNC( QT_QTIME_CURRENTTIME ) */ HB_FUNC( QT_QTIME_FROMSTRING ) { - 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 ) ) ) ) ); + hb_retptrGC( hbqt_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 +261,7 @@ HB_FUNC( QT_QTIME_FROMSTRING ) */ HB_FUNC( QT_QTIME_FROMSTRING_1 ) { - hb_retptrGC( gcAllocate_QTime( new QTime( hbqt_par_QTime( 1 )->fromString( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QTime( 1 )->fromString( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtcore/QTimer.cpp b/harbour/contrib/hbqt/qtcore/QTimer.cpp index 9d04e2ebdb..5a1cf2b074 100644 --- a/harbour/contrib/hbqt/qtcore/QTimer.cpp +++ b/harbour/contrib/hbqt/qtcore/QTimer.cpp @@ -121,9 +121,9 @@ QT_G_FUNC( release_QTimer ) } } -void * gcAllocate_QTimer( void * pObj ) +void * hbqt_gcAllocate_QTimer( void * pObj ) { - QGC_POINTER_QTimer * p = ( QGC_POINTER_QTimer * ) hb_gcAllocate( sizeof( QGC_POINTER_QTimer ), gcFuncs() ); + QGC_POINTER_QTimer * p = ( QGC_POINTER_QTimer * ) hb_gcAllocate( sizeof( QGC_POINTER_QTimer ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTimer; @@ -138,7 +138,7 @@ HB_FUNC( QT_QTIMER ) pObj = new QTimer( hbqt_par_QObject( 1 ) ) ; - hb_retptrGC( gcAllocate_QTimer( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTimer( pObj ) ); } /* * int interval () const diff --git a/harbour/contrib/hbqt/qtcore/QTranslator.cpp b/harbour/contrib/hbqt/qtcore/QTranslator.cpp index 39edf1b07b..4db7f85da3 100644 --- a/harbour/contrib/hbqt/qtcore/QTranslator.cpp +++ b/harbour/contrib/hbqt/qtcore/QTranslator.cpp @@ -120,9 +120,9 @@ QT_G_FUNC( release_QTranslator ) } } -void * gcAllocate_QTranslator( void * pObj ) +void * hbqt_gcAllocate_QTranslator( void * pObj ) { - QGC_POINTER_QTranslator * p = ( QGC_POINTER_QTranslator * ) hb_gcAllocate( sizeof( QGC_POINTER_QTranslator ), gcFuncs() ); + QGC_POINTER_QTranslator * p = ( QGC_POINTER_QTranslator * ) hb_gcAllocate( sizeof( QGC_POINTER_QTranslator ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTranslator; @@ -137,7 +137,7 @@ HB_FUNC( QT_QTRANSLATOR ) pObj = new QTranslator() ; - hb_retptrGC( gcAllocate_QTranslator( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTranslator( pObj ) ); } /* * virtual bool isEmpty () const diff --git a/harbour/contrib/hbqt/qtcore/QUiLoader.cpp b/harbour/contrib/hbqt/qtcore/QUiLoader.cpp index 1231e2b497..ce938f6e8b 100644 --- a/harbour/contrib/hbqt/qtcore/QUiLoader.cpp +++ b/harbour/contrib/hbqt/qtcore/QUiLoader.cpp @@ -122,9 +122,9 @@ QT_G_FUNC( release_QUiLoader ) } } -void * gcAllocate_QUiLoader( void * pObj ) +void * hbqt_gcAllocate_QUiLoader( void * pObj ) { - QGC_POINTER_QUiLoader * p = ( QGC_POINTER_QUiLoader * ) hb_gcAllocate( sizeof( QGC_POINTER_QUiLoader ), gcFuncs() ); + QGC_POINTER_QUiLoader * p = ( QGC_POINTER_QUiLoader * ) hb_gcAllocate( sizeof( QGC_POINTER_QUiLoader ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QUiLoader; @@ -146,7 +146,7 @@ HB_FUNC( QT_QUILOADER ) pObj = new QUiLoader() ; } - hb_retptrGC( gcAllocate_QUiLoader( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QUiLoader( pObj ) ); } /* * void addPluginPath ( const QString & path ) @@ -161,7 +161,7 @@ HB_FUNC( QT_QUILOADER_ADDPLUGINPATH ) */ HB_FUNC( QT_QUILOADER_AVAILABLELAYOUTS ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QUiLoader( 1 )->availableLayouts() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QUiLoader( 1 )->availableLayouts() ) ) ); } /* @@ -169,7 +169,7 @@ HB_FUNC( QT_QUILOADER_AVAILABLELAYOUTS ) */ HB_FUNC( QT_QUILOADER_AVAILABLEWIDGETS ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QUiLoader( 1 )->availableWidgets() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QUiLoader( 1 )->availableWidgets() ) ) ); } /* @@ -233,7 +233,7 @@ HB_FUNC( QT_QUILOADER_LOAD ) */ HB_FUNC( QT_QUILOADER_PLUGINPATHS ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QUiLoader( 1 )->pluginPaths() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QUiLoader( 1 )->pluginPaths() ) ) ); } /* @@ -257,7 +257,7 @@ HB_FUNC( QT_QUILOADER_SETWORKINGDIRECTORY ) */ HB_FUNC( QT_QUILOADER_WORKINGDIRECTORY ) { - hb_retptrGC( gcAllocate_QDir( new QDir( hbqt_par_QUiLoader( 1 )->workingDirectory() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDir( new QDir( hbqt_par_QUiLoader( 1 )->workingDirectory() ) ) ); } diff --git a/harbour/contrib/hbqt/qtcore/QUrl.cpp b/harbour/contrib/hbqt/qtcore/QUrl.cpp index a0b3c9530a..43d84dc681 100644 --- a/harbour/contrib/hbqt/qtcore/QUrl.cpp +++ b/harbour/contrib/hbqt/qtcore/QUrl.cpp @@ -129,9 +129,9 @@ QT_G_FUNC( release_QUrl ) } } -void * gcAllocate_QUrl( void * pObj ) +void * hbqt_gcAllocate_QUrl( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QUrl; @@ -145,7 +145,7 @@ HB_FUNC( QT_QURL ) pObj = new QUrl( hbqt_par_QString( 1 ) ) ; - hb_retptrGC( gcAllocate_QUrl( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QUrl( pObj ) ); } /* * void addEncodedQueryItem ( const QByteArray & key, const QByteArray & value ) @@ -168,7 +168,7 @@ HB_FUNC( QT_QURL_ADDQUERYITEM ) */ HB_FUNC( QT_QURL_ALLQUERYITEMVALUES ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QUrl( 1 )->allQueryItemValues( hbqt_par_QString( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QUrl( 1 )->allQueryItemValues( hbqt_par_QString( 2 ) ) ) ) ); } /* @@ -192,7 +192,7 @@ HB_FUNC( QT_QURL_CLEAR ) */ HB_FUNC( QT_QURL_ENCODEDFRAGMENT ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedFragment() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedFragment() ) ) ); } /* @@ -200,7 +200,7 @@ HB_FUNC( QT_QURL_ENCODEDFRAGMENT ) */ HB_FUNC( QT_QURL_ENCODEDHOST ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedHost() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedHost() ) ) ); } /* @@ -208,7 +208,7 @@ HB_FUNC( QT_QURL_ENCODEDHOST ) */ HB_FUNC( QT_QURL_ENCODEDPASSWORD ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedPassword() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedPassword() ) ) ); } /* @@ -216,7 +216,7 @@ HB_FUNC( QT_QURL_ENCODEDPASSWORD ) */ HB_FUNC( QT_QURL_ENCODEDPATH ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedPath() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedPath() ) ) ); } /* @@ -224,7 +224,7 @@ HB_FUNC( QT_QURL_ENCODEDPATH ) */ HB_FUNC( QT_QURL_ENCODEDQUERY ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedQuery() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedQuery() ) ) ); } /* @@ -232,7 +232,7 @@ HB_FUNC( QT_QURL_ENCODEDQUERY ) */ HB_FUNC( QT_QURL_ENCODEDQUERYITEMVALUE ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedQueryItemValue( *hbqt_par_QByteArray( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedQueryItemValue( *hbqt_par_QByteArray( 2 ) ) ) ) ); } /* @@ -240,7 +240,7 @@ HB_FUNC( QT_QURL_ENCODEDQUERYITEMVALUE ) */ HB_FUNC( QT_QURL_ENCODEDUSERNAME ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedUserName() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->encodedUserName() ) ) ); } /* @@ -424,7 +424,7 @@ HB_FUNC( QT_QURL_REMOVEQUERYITEM ) */ HB_FUNC( QT_QURL_RESOLVED ) { - hb_retptrGC( gcAllocate_QUrl( new QUrl( hbqt_par_QUrl( 1 )->resolved( *hbqt_par_QUrl( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QUrl( new QUrl( hbqt_par_QUrl( 1 )->resolved( *hbqt_par_QUrl( 2 ) ) ) ) ); } /* @@ -592,7 +592,7 @@ HB_FUNC( QT_QURL_SETUSERNAME ) */ HB_FUNC( QT_QURL_TOENCODED ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->toEncoded( ( HB_ISNUM( 2 ) ? ( QUrl::FormattingOptions ) hb_parni( 2 ) : ( QUrl::FormattingOptions ) QUrl::None ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->toEncoded( ( HB_ISNUM( 2 ) ? ( QUrl::FormattingOptions ) hb_parni( 2 ) : ( QUrl::FormattingOptions ) QUrl::None ) ) ) ) ); } /* @@ -640,7 +640,7 @@ HB_FUNC( QT_QURL_FROMACE ) */ HB_FUNC( QT_QURL_FROMENCODED ) { - hb_retptrGC( gcAllocate_QUrl( new QUrl( hbqt_par_QUrl( 1 )->fromEncoded( *hbqt_par_QByteArray( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QUrl( new QUrl( hbqt_par_QUrl( 1 )->fromEncoded( *hbqt_par_QByteArray( 2 ) ) ) ) ); } /* @@ -648,7 +648,7 @@ HB_FUNC( QT_QURL_FROMENCODED ) */ HB_FUNC( QT_QURL_FROMENCODED_1 ) { - hb_retptrGC( gcAllocate_QUrl( new QUrl( hbqt_par_QUrl( 1 )->fromEncoded( *hbqt_par_QByteArray( 2 ), ( QUrl::ParsingMode ) hb_parni( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QUrl( new QUrl( hbqt_par_QUrl( 1 )->fromEncoded( *hbqt_par_QByteArray( 2 ), ( QUrl::ParsingMode ) hb_parni( 3 ) ) ) ) ); } /* @@ -656,7 +656,7 @@ HB_FUNC( QT_QURL_FROMENCODED_1 ) */ HB_FUNC( QT_QURL_FROMLOCALFILE ) { - hb_retptrGC( gcAllocate_QUrl( new QUrl( hbqt_par_QUrl( 1 )->fromLocalFile( hbqt_par_QString( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QUrl( new QUrl( hbqt_par_QUrl( 1 )->fromLocalFile( hbqt_par_QString( 2 ) ) ) ) ); } /* @@ -672,7 +672,7 @@ HB_FUNC( QT_QURL_FROMPERCENTENCODING ) */ HB_FUNC( QT_QURL_IDNWHITELIST ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QUrl( 1 )->idnWhitelist() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QUrl( 1 )->idnWhitelist() ) ) ); } /* @@ -688,7 +688,7 @@ HB_FUNC( QT_QURL_SETIDNWHITELIST ) */ HB_FUNC( QT_QURL_TOACE ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->toAce( hbqt_par_QString( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QUrl( 1 )->toAce( hbqt_par_QString( 2 ) ) ) ) ); } /* @@ -696,7 +696,7 @@ HB_FUNC( QT_QURL_TOACE ) */ HB_FUNC( QT_QURL_TOPERCENTENCODING ) { - 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() ) ) ) ) ); + hb_retptrGC( hbqt_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() ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/qtcore/QVariant.cpp b/harbour/contrib/hbqt/qtcore/QVariant.cpp index 2d7f800dbc..ab90360532 100644 --- a/harbour/contrib/hbqt/qtcore/QVariant.cpp +++ b/harbour/contrib/hbqt/qtcore/QVariant.cpp @@ -158,9 +158,9 @@ QT_G_FUNC( release_QVariant ) } } -void * gcAllocate_QVariant( void * pObj ) +void * hbqt_gcAllocate_QVariant( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QVariant; @@ -174,7 +174,7 @@ HB_FUNC( QT_QVARIANT ) pObj = ( QVariant* ) new QVariant() ; - hb_retptrGC( gcAllocate_QVariant( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( pObj ) ); } /* * bool canConvert ( Type t ) const @@ -237,7 +237,7 @@ HB_FUNC( QT_QVARIANT_SETVALUE ) */ HB_FUNC( QT_QVARIANT_TOBITARRAY ) { - hb_retptrGC( gcAllocate_QBitArray( new QBitArray( hbqt_par_QVariant( 1 )->toBitArray() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBitArray( new QBitArray( hbqt_par_QVariant( 1 )->toBitArray() ) ) ); } /* @@ -253,7 +253,7 @@ HB_FUNC( QT_QVARIANT_TOBOOL ) */ HB_FUNC( QT_QVARIANT_TOBYTEARRAY ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QVariant( 1 )->toByteArray() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QVariant( 1 )->toByteArray() ) ) ); } /* @@ -261,7 +261,7 @@ HB_FUNC( QT_QVARIANT_TOBYTEARRAY ) */ HB_FUNC( QT_QVARIANT_TODATE ) { - hb_retptrGC( gcAllocate_QDate( new QDate( hbqt_par_QVariant( 1 )->toDate() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDate( new QDate( hbqt_par_QVariant( 1 )->toDate() ) ) ); } /* @@ -269,7 +269,7 @@ HB_FUNC( QT_QVARIANT_TODATE ) */ HB_FUNC( QT_QVARIANT_TODATETIME ) { - hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QVariant( 1 )->toDateTime() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QVariant( 1 )->toDateTime() ) ) ); } /* @@ -301,7 +301,7 @@ HB_FUNC( QT_QVARIANT_TOINT ) */ HB_FUNC( QT_QVARIANT_TOLINE ) { - hb_retptrGC( gcAllocate_QLine( new QLine( hbqt_par_QVariant( 1 )->toLine() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QLine( new QLine( hbqt_par_QVariant( 1 )->toLine() ) ) ); } /* @@ -309,7 +309,7 @@ HB_FUNC( QT_QVARIANT_TOLINE ) */ HB_FUNC( QT_QVARIANT_TOLINEF ) { - hb_retptrGC( gcAllocate_QLineF( new QLineF( hbqt_par_QVariant( 1 )->toLineF() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QLineF( new QLineF( hbqt_par_QVariant( 1 )->toLineF() ) ) ); } /* @@ -317,7 +317,7 @@ HB_FUNC( QT_QVARIANT_TOLINEF ) */ HB_FUNC( QT_QVARIANT_TOLOCALE ) { - hb_retptrGC( gcAllocate_QLocale( new QLocale( hbqt_par_QVariant( 1 )->toLocale() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QLocale( new QLocale( hbqt_par_QVariant( 1 )->toLocale() ) ) ); } /* @@ -337,7 +337,7 @@ HB_FUNC( QT_QVARIANT_TOLONGLONG ) */ HB_FUNC( QT_QVARIANT_TOPOINT ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QVariant( 1 )->toPoint() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QVariant( 1 )->toPoint() ) ) ); } /* @@ -345,7 +345,7 @@ HB_FUNC( QT_QVARIANT_TOPOINT ) */ HB_FUNC( QT_QVARIANT_TOPOINTF ) { - hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QVariant( 1 )->toPointF() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QVariant( 1 )->toPointF() ) ) ); } /* @@ -353,7 +353,7 @@ HB_FUNC( QT_QVARIANT_TOPOINTF ) */ HB_FUNC( QT_QVARIANT_TORECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QVariant( 1 )->toRect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QVariant( 1 )->toRect() ) ) ); } /* @@ -361,7 +361,7 @@ HB_FUNC( QT_QVARIANT_TORECT ) */ HB_FUNC( QT_QVARIANT_TORECTF ) { - hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QVariant( 1 )->toRectF() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QVariant( 1 )->toRectF() ) ) ); } /* @@ -369,7 +369,7 @@ HB_FUNC( QT_QVARIANT_TORECTF ) */ HB_FUNC( QT_QVARIANT_TOREGEXP ) { - hb_retptrGC( gcAllocate_QRegExp( new QRegExp( hbqt_par_QVariant( 1 )->toRegExp() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRegExp( new QRegExp( hbqt_par_QVariant( 1 )->toRegExp() ) ) ); } /* @@ -377,7 +377,7 @@ HB_FUNC( QT_QVARIANT_TOREGEXP ) */ HB_FUNC( QT_QVARIANT_TOSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QVariant( 1 )->toSize() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QVariant( 1 )->toSize() ) ) ); } /* @@ -385,7 +385,7 @@ HB_FUNC( QT_QVARIANT_TOSIZE ) */ HB_FUNC( QT_QVARIANT_TOSIZEF ) { - hb_retptrGC( gcAllocate_QSizeF( new QSizeF( hbqt_par_QVariant( 1 )->toSizeF() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSizeF( new QSizeF( hbqt_par_QVariant( 1 )->toSizeF() ) ) ); } /* @@ -401,7 +401,7 @@ HB_FUNC( QT_QVARIANT_TOSTRING ) */ HB_FUNC( QT_QVARIANT_TOSTRINGLIST ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QVariant( 1 )->toStringList() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QVariant( 1 )->toStringList() ) ) ); } /* @@ -409,7 +409,7 @@ HB_FUNC( QT_QVARIANT_TOSTRINGLIST ) */ HB_FUNC( QT_QVARIANT_TOTIME ) { - hb_retptrGC( gcAllocate_QTime( new QTime( hbqt_par_QVariant( 1 )->toTime() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QVariant( 1 )->toTime() ) ) ); } /* @@ -441,7 +441,7 @@ HB_FUNC( QT_QVARIANT_TOULONGLONG ) */ HB_FUNC( QT_QVARIANT_TOURL ) { - hb_retptrGC( gcAllocate_QUrl( new QUrl( hbqt_par_QVariant( 1 )->toUrl() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QUrl( new QUrl( hbqt_par_QVariant( 1 )->toUrl() ) ) ); } /* @@ -465,7 +465,7 @@ HB_FUNC( QT_QVARIANT_USERTYPE ) */ HB_FUNC( QT_QVARIANT_FROMVALUE ) { - hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QVariant( 1 )->fromValue( hb_param( 2, HB_IT_ANY ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QVariant( 1 )->fromValue( hb_param( 2, HB_IT_ANY ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QAbstractButton.cpp b/harbour/contrib/hbqt/qtgui/QAbstractButton.cpp index 182f81595a..eaabea6844 100644 --- a/harbour/contrib/hbqt/qtgui/QAbstractButton.cpp +++ b/harbour/contrib/hbqt/qtgui/QAbstractButton.cpp @@ -129,7 +129,7 @@ HB_FUNC( QT_QABSTRACTBUTTON_GROUP ) */ HB_FUNC( QT_QABSTRACTBUTTON_ICON ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QAbstractButton( 1 )->icon() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QAbstractButton( 1 )->icon() ) ) ); } /* @@ -137,7 +137,7 @@ HB_FUNC( QT_QABSTRACTBUTTON_ICON ) */ HB_FUNC( QT_QABSTRACTBUTTON_ICONSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QAbstractButton( 1 )->iconSize() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QAbstractButton( 1 )->iconSize() ) ) ); } /* @@ -241,7 +241,7 @@ HB_FUNC( QT_QABSTRACTBUTTON_SETTEXT ) */ HB_FUNC( QT_QABSTRACTBUTTON_SHORTCUT ) { - hb_retptrGC( gcAllocate_QKeySequence( new QKeySequence( hbqt_par_QAbstractButton( 1 )->shortcut() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QKeySequence( new QKeySequence( hbqt_par_QAbstractButton( 1 )->shortcut() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QAbstractItemDelegate.cpp b/harbour/contrib/hbqt/qtgui/QAbstractItemDelegate.cpp index 1ea6318c02..a0a13c891d 100644 --- a/harbour/contrib/hbqt/qtgui/QAbstractItemDelegate.cpp +++ b/harbour/contrib/hbqt/qtgui/QAbstractItemDelegate.cpp @@ -132,7 +132,7 @@ HB_FUNC( QT_QABSTRACTITEMDELEGATE_SETMODELDATA ) */ HB_FUNC( QT_QABSTRACTITEMDELEGATE_SIZEHINT ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QAbstractItemDelegate( 1 )->sizeHint( *hbqt_par_QStyleOptionViewItem( 2 ), *hbqt_par_QModelIndex( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QAbstractItemDelegate( 1 )->sizeHint( *hbqt_par_QStyleOptionViewItem( 2 ), *hbqt_par_QModelIndex( 3 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QAbstractItemView.cpp b/harbour/contrib/hbqt/qtgui/QAbstractItemView.cpp index 4417e809e2..49d230420a 100644 --- a/harbour/contrib/hbqt/qtgui/QAbstractItemView.cpp +++ b/harbour/contrib/hbqt/qtgui/QAbstractItemView.cpp @@ -123,7 +123,7 @@ HB_FUNC( QT_QABSTRACTITEMVIEW_CLOSEPERSISTENTEDITOR ) */ HB_FUNC( QT_QABSTRACTITEMVIEW_CURRENTINDEX ) { - hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemView( 1 )->currentIndex() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemView( 1 )->currentIndex() ) ) ); } /* @@ -179,7 +179,7 @@ HB_FUNC( QT_QABSTRACTITEMVIEW_HORIZONTALSCROLLMODE ) */ HB_FUNC( QT_QABSTRACTITEMVIEW_ICONSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QAbstractItemView( 1 )->iconSize() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QAbstractItemView( 1 )->iconSize() ) ) ); } /* @@ -187,7 +187,7 @@ HB_FUNC( QT_QABSTRACTITEMVIEW_ICONSIZE ) */ HB_FUNC( QT_QABSTRACTITEMVIEW_INDEXAT ) { - hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemView( 1 )->indexAt( *hbqt_par_QPoint( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemView( 1 )->indexAt( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* @@ -259,7 +259,7 @@ HB_FUNC( QT_QABSTRACTITEMVIEW_OPENPERSISTENTEDITOR ) */ HB_FUNC( QT_QABSTRACTITEMVIEW_ROOTINDEX ) { - hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemView( 1 )->rootIndex() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractItemView( 1 )->rootIndex() ) ) ); } /* @@ -483,7 +483,7 @@ HB_FUNC( QT_QABSTRACTITEMVIEW_SIZEHINTFORCOLUMN ) */ HB_FUNC( QT_QABSTRACTITEMVIEW_SIZEHINTFORINDEX ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QAbstractItemView( 1 )->sizeHintForIndex( *hbqt_par_QModelIndex( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QAbstractItemView( 1 )->sizeHintForIndex( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* @@ -523,7 +523,7 @@ HB_FUNC( QT_QABSTRACTITEMVIEW_VERTICALSCROLLMODE ) */ HB_FUNC( QT_QABSTRACTITEMVIEW_VISUALRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QAbstractItemView( 1 )->visualRect( *hbqt_par_QModelIndex( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QAbstractItemView( 1 )->visualRect( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QAbstractProxyModel.cpp b/harbour/contrib/hbqt/qtgui/QAbstractProxyModel.cpp index 14591cd810..1eb6dc0f85 100644 --- a/harbour/contrib/hbqt/qtgui/QAbstractProxyModel.cpp +++ b/harbour/contrib/hbqt/qtgui/QAbstractProxyModel.cpp @@ -88,7 +88,7 @@ HB_FUNC( QT_QABSTRACTPROXYMODEL ) */ HB_FUNC( QT_QABSTRACTPROXYMODEL_MAPFROMSOURCE ) { - hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractProxyModel( 1 )->mapFromSource( *hbqt_par_QModelIndex( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractProxyModel( 1 )->mapFromSource( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* @@ -96,7 +96,7 @@ HB_FUNC( QT_QABSTRACTPROXYMODEL_MAPFROMSOURCE ) */ HB_FUNC( QT_QABSTRACTPROXYMODEL_MAPSELECTIONFROMSOURCE ) { - hb_retptrGC( gcAllocate_QItemSelection( new QItemSelection( hbqt_par_QAbstractProxyModel( 1 )->mapSelectionFromSource( *hbqt_par_QItemSelection( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QItemSelection( new QItemSelection( hbqt_par_QAbstractProxyModel( 1 )->mapSelectionFromSource( *hbqt_par_QItemSelection( 2 ) ) ) ) ); } /* @@ -104,7 +104,7 @@ HB_FUNC( QT_QABSTRACTPROXYMODEL_MAPSELECTIONFROMSOURCE ) */ HB_FUNC( QT_QABSTRACTPROXYMODEL_MAPSELECTIONTOSOURCE ) { - hb_retptrGC( gcAllocate_QItemSelection( new QItemSelection( hbqt_par_QAbstractProxyModel( 1 )->mapSelectionToSource( *hbqt_par_QItemSelection( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QItemSelection( new QItemSelection( hbqt_par_QAbstractProxyModel( 1 )->mapSelectionToSource( *hbqt_par_QItemSelection( 2 ) ) ) ) ); } /* @@ -112,7 +112,7 @@ HB_FUNC( QT_QABSTRACTPROXYMODEL_MAPSELECTIONTOSOURCE ) */ HB_FUNC( QT_QABSTRACTPROXYMODEL_MAPTOSOURCE ) { - hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractProxyModel( 1 )->mapToSource( *hbqt_par_QModelIndex( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QAbstractProxyModel( 1 )->mapToSource( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QAbstractScrollArea.cpp b/harbour/contrib/hbqt/qtgui/QAbstractScrollArea.cpp index 6ad20bfd13..b72a2f1f7a 100644 --- a/harbour/contrib/hbqt/qtgui/QAbstractScrollArea.cpp +++ b/harbour/contrib/hbqt/qtgui/QAbstractScrollArea.cpp @@ -121,7 +121,7 @@ HB_FUNC( QT_QABSTRACTSCROLLAREA_HORIZONTALSCROLLBARPOLICY ) */ HB_FUNC( QT_QABSTRACTSCROLLAREA_MAXIMUMVIEWPORTSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QAbstractScrollArea( 1 )->maximumViewportSize() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QAbstractScrollArea( 1 )->maximumViewportSize() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QAbstractTextDocumentLayout.cpp b/harbour/contrib/hbqt/qtgui/QAbstractTextDocumentLayout.cpp index c3160602e7..abc2d10460 100644 --- a/harbour/contrib/hbqt/qtgui/QAbstractTextDocumentLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/QAbstractTextDocumentLayout.cpp @@ -96,7 +96,7 @@ HB_FUNC( QT_QABSTRACTTEXTDOCUMENTLAYOUT_ANCHORAT ) */ HB_FUNC( QT_QABSTRACTTEXTDOCUMENTLAYOUT_BLOCKBOUNDINGRECT ) { - hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QAbstractTextDocumentLayout( 1 )->blockBoundingRect( *hbqt_par_QTextBlock( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QAbstractTextDocumentLayout( 1 )->blockBoundingRect( *hbqt_par_QTextBlock( 2 ) ) ) ) ); } /* @@ -112,7 +112,7 @@ HB_FUNC( QT_QABSTRACTTEXTDOCUMENTLAYOUT_DOCUMENT ) */ HB_FUNC( QT_QABSTRACTTEXTDOCUMENTLAYOUT_DOCUMENTSIZE ) { - hb_retptrGC( gcAllocate_QSizeF( new QSizeF( hbqt_par_QAbstractTextDocumentLayout( 1 )->documentSize() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSizeF( new QSizeF( hbqt_par_QAbstractTextDocumentLayout( 1 )->documentSize() ) ) ); } /* @@ -120,7 +120,7 @@ HB_FUNC( QT_QABSTRACTTEXTDOCUMENTLAYOUT_DOCUMENTSIZE ) */ HB_FUNC( QT_QABSTRACTTEXTDOCUMENTLAYOUT_FRAMEBOUNDINGRECT ) { - hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QAbstractTextDocumentLayout( 1 )->frameBoundingRect( hbqt_par_QTextFrame( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QAbstractTextDocumentLayout( 1 )->frameBoundingRect( hbqt_par_QTextFrame( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QAction.cpp b/harbour/contrib/hbqt/qtgui/QAction.cpp index 1d35d8f0ec..db9758e91c 100644 --- a/harbour/contrib/hbqt/qtgui/QAction.cpp +++ b/harbour/contrib/hbqt/qtgui/QAction.cpp @@ -140,9 +140,9 @@ QT_G_FUNC( release_QAction ) } } -void * gcAllocate_QAction( void * pObj ) +void * hbqt_gcAllocate_QAction( void * pObj ) { - QGC_POINTER_QAction * p = ( QGC_POINTER_QAction * ) hb_gcAllocate( sizeof( QGC_POINTER_QAction ), gcFuncs() ); + QGC_POINTER_QAction * p = ( QGC_POINTER_QAction * ) hb_gcAllocate( sizeof( QGC_POINTER_QAction ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QAction; @@ -162,7 +162,7 @@ HB_FUNC( QT_QACTION ) else if( HB_ISPOINTER( 3 ) ) pObj = new QAction( *hbqt_par_QIcon( 1 ), hbqt_par_QString( 2 ), hbqt_par_QObject( 3 ) ) ; - hb_retptrGC( gcAllocate_QAction( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QAction( pObj ) ); } /* * QActionGroup * actionGroup () const @@ -193,7 +193,7 @@ HB_FUNC( QT_QACTION_AUTOREPEAT ) */ HB_FUNC( QT_QACTION_DATA ) { - hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QAction( 1 )->data() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QAction( 1 )->data() ) ) ); } /* @@ -201,7 +201,7 @@ HB_FUNC( QT_QACTION_DATA ) */ HB_FUNC( QT_QACTION_FONT ) { - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QAction( 1 )->font() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QAction( 1 )->font() ) ) ); } /* @@ -209,7 +209,7 @@ HB_FUNC( QT_QACTION_FONT ) */ HB_FUNC( QT_QACTION_ICON ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QAction( 1 )->icon() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QAction( 1 )->icon() ) ) ); } /* @@ -441,7 +441,7 @@ HB_FUNC( QT_QACTION_SETWHATSTHIS ) */ HB_FUNC( QT_QACTION_SHORTCUT ) { - hb_retptrGC( gcAllocate_QKeySequence( new QKeySequence( hbqt_par_QAction( 1 )->shortcut() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QKeySequence( new QKeySequence( hbqt_par_QAction( 1 )->shortcut() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QActionGroup.cpp b/harbour/contrib/hbqt/qtgui/QActionGroup.cpp index 2ada9c88e8..2aa641cbf8 100644 --- a/harbour/contrib/hbqt/qtgui/QActionGroup.cpp +++ b/harbour/contrib/hbqt/qtgui/QActionGroup.cpp @@ -129,9 +129,9 @@ QT_G_FUNC( release_QActionGroup ) } } -void * gcAllocate_QActionGroup( void * pObj ) +void * hbqt_gcAllocate_QActionGroup( void * pObj ) { - QGC_POINTER_QActionGroup * p = ( QGC_POINTER_QActionGroup * ) hb_gcAllocate( sizeof( QGC_POINTER_QActionGroup ), gcFuncs() ); + QGC_POINTER_QActionGroup * p = ( QGC_POINTER_QActionGroup * ) hb_gcAllocate( sizeof( QGC_POINTER_QActionGroup ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QActionGroup; @@ -149,7 +149,7 @@ HB_FUNC( QT_QACTIONGROUP ) pObj = new QActionGroup( hbqt_par_QObject( 1 ) ) ; } - hb_retptrGC( gcAllocate_QActionGroup( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QActionGroup( pObj ) ); } /* * QAction * addAction ( QAction * action ) diff --git a/harbour/contrib/hbqt/qtgui/QApplication.cpp b/harbour/contrib/hbqt/qtgui/QApplication.cpp index e65d7d70a6..6e8ecd4df2 100644 --- a/harbour/contrib/hbqt/qtgui/QApplication.cpp +++ b/harbour/contrib/hbqt/qtgui/QApplication.cpp @@ -202,9 +202,9 @@ QT_G_FUNC( release_QApplication ) } } -void * gcAllocate_QApplication( void * pObj ) +void * hbqt_gcAllocate_QApplication( void * pObj ) { - QGC_POINTER_QApplication * p = ( QGC_POINTER_QApplication * ) hb_gcAllocate( sizeof( QGC_POINTER_QApplication ), gcFuncs() ); + QGC_POINTER_QApplication * p = ( QGC_POINTER_QApplication * ) hb_gcAllocate( sizeof( QGC_POINTER_QApplication ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QApplication; @@ -219,7 +219,7 @@ HB_FUNC( QT_QAPPLICATION ) pObj = ( QApplication * ) app ; - hb_retptrGC( gcAllocate_QApplication( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QApplication( pObj ) ); } /* * virtual void commitData ( QSessionManager & manager ) @@ -402,7 +402,7 @@ HB_FUNC( QT_QAPPLICATION_FOCUSWIDGET ) */ HB_FUNC( QT_QAPPLICATION_FONT ) { - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QApplication( 1 )->font() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QApplication( 1 )->font() ) ) ); } /* @@ -410,7 +410,7 @@ HB_FUNC( QT_QAPPLICATION_FONT ) */ HB_FUNC( QT_QAPPLICATION_FONT_1 ) { - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QApplication( 1 )->font( hbqt_par_QWidget( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QApplication( 1 )->font( hbqt_par_QWidget( 2 ) ) ) ) ); } /* @@ -418,7 +418,7 @@ HB_FUNC( QT_QAPPLICATION_FONT_1 ) */ HB_FUNC( QT_QAPPLICATION_FONT_2 ) { - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QApplication( 1 )->font( hbqt_par_char( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QApplication( 1 )->font( hbqt_par_char( 2 ) ) ) ) ); } /* @@ -426,7 +426,7 @@ HB_FUNC( QT_QAPPLICATION_FONT_2 ) */ HB_FUNC( QT_QAPPLICATION_FONTMETRICS ) { - hb_retptrGC( gcAllocate_QFontMetrics( new QFontMetrics( hbqt_par_QApplication( 1 )->fontMetrics() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFontMetrics( new QFontMetrics( hbqt_par_QApplication( 1 )->fontMetrics() ) ) ); } /* @@ -434,7 +434,7 @@ HB_FUNC( QT_QAPPLICATION_FONTMETRICS ) */ HB_FUNC( QT_QAPPLICATION_GLOBALSTRUT ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QApplication( 1 )->globalStrut() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QApplication( 1 )->globalStrut() ) ) ); } /* @@ -482,7 +482,7 @@ HB_FUNC( QT_QAPPLICATION_KEYBOARDINPUTINTERVAL ) */ HB_FUNC( QT_QAPPLICATION_KEYBOARDINPUTLOCALE ) { - hb_retptrGC( gcAllocate_QLocale( new QLocale( hbqt_par_QApplication( 1 )->keyboardInputLocale() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QLocale( new QLocale( hbqt_par_QApplication( 1 )->keyboardInputLocale() ) ) ); } /* @@ -522,7 +522,7 @@ HB_FUNC( QT_QAPPLICATION_OVERRIDECURSOR ) */ HB_FUNC( QT_QAPPLICATION_PALETTE ) { - hb_retptrGC( gcAllocate_QPalette( new QPalette( hbqt_par_QApplication( 1 )->palette() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPalette( new QPalette( hbqt_par_QApplication( 1 )->palette() ) ) ); } /* @@ -530,7 +530,7 @@ HB_FUNC( QT_QAPPLICATION_PALETTE ) */ HB_FUNC( QT_QAPPLICATION_PALETTE_1 ) { - hb_retptrGC( gcAllocate_QPalette( new QPalette( hbqt_par_QApplication( 1 )->palette( hbqt_par_QWidget( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPalette( new QPalette( hbqt_par_QApplication( 1 )->palette( hbqt_par_QWidget( 2 ) ) ) ) ); } /* @@ -538,7 +538,7 @@ HB_FUNC( QT_QAPPLICATION_PALETTE_1 ) */ HB_FUNC( QT_QAPPLICATION_PALETTE_2 ) { - hb_retptrGC( gcAllocate_QPalette( new QPalette( hbqt_par_QApplication( 1 )->palette( hbqt_par_char( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPalette( new QPalette( hbqt_par_QApplication( 1 )->palette( hbqt_par_char( 2 ) ) ) ) ); } /* @@ -802,7 +802,7 @@ HB_FUNC( QT_QAPPLICATION_WIDGETAT_1 ) */ HB_FUNC( QT_QAPPLICATION_WINDOWICON ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QApplication( 1 )->windowIcon() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QApplication( 1 )->windowIcon() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QBitmap.cpp b/harbour/contrib/hbqt/qtgui/QBitmap.cpp index 1b0a2cc360..054d0724d4 100644 --- a/harbour/contrib/hbqt/qtgui/QBitmap.cpp +++ b/harbour/contrib/hbqt/qtgui/QBitmap.cpp @@ -99,9 +99,9 @@ QT_G_FUNC( release_QBitmap ) } } -void * gcAllocate_QBitmap( void * pObj ) +void * hbqt_gcAllocate_QBitmap( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QBitmap; @@ -149,7 +149,7 @@ HB_FUNC( QT_QBITMAP ) pObj = ( QBitmap* ) new QBitmap() ; } - hb_retptrGC( gcAllocate_QBitmap( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QBitmap( pObj ) ); } /* * void clear () @@ -164,7 +164,7 @@ HB_FUNC( QT_QBITMAP_CLEAR ) */ HB_FUNC( QT_QBITMAP_TRANSFORMED ) { - hb_retptrGC( gcAllocate_QBitmap( new QBitmap( hbqt_par_QBitmap( 1 )->transformed( *hbqt_par_QTransform( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBitmap( new QBitmap( hbqt_par_QBitmap( 1 )->transformed( *hbqt_par_QTransform( 2 ) ) ) ) ); } /* @@ -172,7 +172,7 @@ HB_FUNC( QT_QBITMAP_TRANSFORMED ) */ HB_FUNC( QT_QBITMAP_TRANSFORMED_1 ) { - hb_retptrGC( gcAllocate_QBitmap( new QBitmap( hbqt_par_QBitmap( 1 )->transformed( *hbqt_par_QMatrix( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBitmap( new QBitmap( hbqt_par_QBitmap( 1 )->transformed( *hbqt_par_QMatrix( 2 ) ) ) ) ); } /* @@ -180,7 +180,7 @@ HB_FUNC( QT_QBITMAP_TRANSFORMED_1 ) */ HB_FUNC( QT_QBITMAP_FROMIMAGE ) { - 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 ) ) ) ) ); + hb_retptrGC( hbqt_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 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/QBoxLayout.cpp index f35273320b..08324b2130 100644 --- a/harbour/contrib/hbqt/qtgui/QBoxLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/QBoxLayout.cpp @@ -125,9 +125,9 @@ QT_G_FUNC( release_QBoxLayout ) } } -void * gcAllocate_QBoxLayout( void * pObj ) +void * hbqt_gcAllocate_QBoxLayout( void * pObj ) { - QGC_POINTER_QBoxLayout * p = ( QGC_POINTER_QBoxLayout * ) hb_gcAllocate( sizeof( QGC_POINTER_QBoxLayout ), gcFuncs() ); + QGC_POINTER_QBoxLayout * p = ( QGC_POINTER_QBoxLayout * ) hb_gcAllocate( sizeof( QGC_POINTER_QBoxLayout ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QBoxLayout; @@ -142,7 +142,7 @@ HB_FUNC( QT_QBOXLAYOUT ) pObj = ( QBoxLayout* ) new QBoxLayout( ( QBoxLayout::Direction ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) ; - hb_retptrGC( gcAllocate_QBoxLayout( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QBoxLayout( pObj ) ); } /* * void addLayout ( QLayout * layout, int stretch = 0 ) diff --git a/harbour/contrib/hbqt/qtgui/QBrush.cpp b/harbour/contrib/hbqt/qtgui/QBrush.cpp index 9de4c6e0c0..dd20479e2b 100644 --- a/harbour/contrib/hbqt/qtgui/QBrush.cpp +++ b/harbour/contrib/hbqt/qtgui/QBrush.cpp @@ -104,9 +104,9 @@ QT_G_FUNC( release_QBrush ) } } -void * gcAllocate_QBrush( void * pObj ) +void * hbqt_gcAllocate_QBrush( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QBrush; @@ -172,14 +172,14 @@ HB_FUNC( QT_QBRUSH ) pObj = ( QBrush* ) new QBrush() ; } - hb_retptrGC( gcAllocate_QBrush( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( pObj ) ); } /* * const QColor & color () const */ HB_FUNC( QT_QBRUSH_COLOR ) { - hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QBrush( 1 )->color() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QBrush( 1 )->color() ) ) ); } /* @@ -195,7 +195,7 @@ HB_FUNC( QT_QBRUSH_ISOPAQUE ) */ HB_FUNC( QT_QBRUSH_MATRIX ) { - hb_retptrGC( gcAllocate_QMatrix( new QMatrix( hbqt_par_QBrush( 1 )->matrix() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QMatrix( new QMatrix( hbqt_par_QBrush( 1 )->matrix() ) ) ); } /* @@ -267,7 +267,7 @@ HB_FUNC( QT_QBRUSH_STYLE ) */ HB_FUNC( QT_QBRUSH_TEXTURE ) { - hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QBrush( 1 )->texture() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( hbqt_par_QBrush( 1 )->texture() ) ) ); } /* @@ -275,7 +275,7 @@ HB_FUNC( QT_QBRUSH_TEXTURE ) */ HB_FUNC( QT_QBRUSH_TEXTUREIMAGE ) { - hb_retptrGC( gcAllocate_QImage( new QImage( hbqt_par_QBrush( 1 )->textureImage() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( hbqt_par_QBrush( 1 )->textureImage() ) ) ); } /* @@ -283,7 +283,7 @@ HB_FUNC( QT_QBRUSH_TEXTUREIMAGE ) */ HB_FUNC( QT_QBRUSH_TRANSFORM ) { - hb_retptrGC( gcAllocate_QTransform( new QTransform( hbqt_par_QBrush( 1 )->transform() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTransform( new QTransform( hbqt_par_QBrush( 1 )->transform() ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QButtonGroup.cpp b/harbour/contrib/hbqt/qtgui/QButtonGroup.cpp index ba840c9c1f..5999f8b0e3 100644 --- a/harbour/contrib/hbqt/qtgui/QButtonGroup.cpp +++ b/harbour/contrib/hbqt/qtgui/QButtonGroup.cpp @@ -130,9 +130,9 @@ QT_G_FUNC( release_QButtonGroup ) } } -void * gcAllocate_QButtonGroup( void * pObj ) +void * hbqt_gcAllocate_QButtonGroup( void * pObj ) { - QGC_POINTER_QButtonGroup * p = ( QGC_POINTER_QButtonGroup * ) hb_gcAllocate( sizeof( QGC_POINTER_QButtonGroup ), gcFuncs() ); + QGC_POINTER_QButtonGroup * p = ( QGC_POINTER_QButtonGroup * ) hb_gcAllocate( sizeof( QGC_POINTER_QButtonGroup ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QButtonGroup; @@ -154,7 +154,7 @@ HB_FUNC( QT_QBUTTONGROUP ) pObj = ( QButtonGroup* ) new QButtonGroup() ; } - hb_retptrGC( gcAllocate_QButtonGroup( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QButtonGroup( pObj ) ); } /* * void addButton ( QAbstractButton * button ) diff --git a/harbour/contrib/hbqt/qtgui/QCalendarWidget.cpp b/harbour/contrib/hbqt/qtgui/QCalendarWidget.cpp index 31ac76ab9b..eb5cdc9201 100644 --- a/harbour/contrib/hbqt/qtgui/QCalendarWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QCalendarWidget.cpp @@ -136,9 +136,9 @@ QT_G_FUNC( release_QCalendarWidget ) } } -void * gcAllocate_QCalendarWidget( void * pObj ) +void * hbqt_gcAllocate_QCalendarWidget( void * pObj ) { - QGC_POINTER_QCalendarWidget * p = ( QGC_POINTER_QCalendarWidget * ) hb_gcAllocate( sizeof( QGC_POINTER_QCalendarWidget ), gcFuncs() ); + QGC_POINTER_QCalendarWidget * p = ( QGC_POINTER_QCalendarWidget * ) hb_gcAllocate( sizeof( QGC_POINTER_QCalendarWidget ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QCalendarWidget; @@ -153,7 +153,7 @@ HB_FUNC( QT_QCALENDARWIDGET ) pObj = ( QCalendarWidget* ) new QCalendarWidget( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QCalendarWidget( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QCalendarWidget( pObj ) ); } /* * int dateEditAcceptDelay () const @@ -168,7 +168,7 @@ HB_FUNC( QT_QCALENDARWIDGET_DATEEDITACCEPTDELAY ) */ HB_FUNC( QT_QCALENDARWIDGET_DATETEXTFORMAT ) { - hb_retptrGC( gcAllocate_QTextCharFormat( new QTextCharFormat( hbqt_par_QCalendarWidget( 1 )->dateTextFormat( *hbqt_par_QDate( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextCharFormat( new QTextCharFormat( hbqt_par_QCalendarWidget( 1 )->dateTextFormat( *hbqt_par_QDate( 2 ) ) ) ) ); } /* @@ -184,7 +184,7 @@ HB_FUNC( QT_QCALENDARWIDGET_FIRSTDAYOFWEEK ) */ HB_FUNC( QT_QCALENDARWIDGET_HEADERTEXTFORMAT ) { - hb_retptrGC( gcAllocate_QTextCharFormat( new QTextCharFormat( hbqt_par_QCalendarWidget( 1 )->headerTextFormat() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextCharFormat( new QTextCharFormat( hbqt_par_QCalendarWidget( 1 )->headerTextFormat() ) ) ); } /* @@ -224,7 +224,7 @@ HB_FUNC( QT_QCALENDARWIDGET_ISNAVIGATIONBARVISIBLE ) */ HB_FUNC( QT_QCALENDARWIDGET_MAXIMUMDATE ) { - hb_retptrGC( gcAllocate_QDate( new QDate( hbqt_par_QCalendarWidget( 1 )->maximumDate() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDate( new QDate( hbqt_par_QCalendarWidget( 1 )->maximumDate() ) ) ); } /* @@ -232,7 +232,7 @@ HB_FUNC( QT_QCALENDARWIDGET_MAXIMUMDATE ) */ HB_FUNC( QT_QCALENDARWIDGET_MINIMUMDATE ) { - hb_retptrGC( gcAllocate_QDate( new QDate( hbqt_par_QCalendarWidget( 1 )->minimumDate() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDate( new QDate( hbqt_par_QCalendarWidget( 1 )->minimumDate() ) ) ); } /* @@ -248,7 +248,7 @@ HB_FUNC( QT_QCALENDARWIDGET_MONTHSHOWN ) */ HB_FUNC( QT_QCALENDARWIDGET_SELECTEDDATE ) { - hb_retptrGC( gcAllocate_QDate( new QDate( hbqt_par_QCalendarWidget( 1 )->selectedDate() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDate( new QDate( hbqt_par_QCalendarWidget( 1 )->selectedDate() ) ) ); } /* @@ -360,7 +360,7 @@ HB_FUNC( QT_QCALENDARWIDGET_VERTICALHEADERFORMAT ) */ HB_FUNC( QT_QCALENDARWIDGET_WEEKDAYTEXTFORMAT ) { - hb_retptrGC( gcAllocate_QTextCharFormat( new QTextCharFormat( hbqt_par_QCalendarWidget( 1 )->weekdayTextFormat( ( Qt::DayOfWeek ) hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextCharFormat( new QTextCharFormat( hbqt_par_QCalendarWidget( 1 )->weekdayTextFormat( ( Qt::DayOfWeek ) hb_parni( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QCheckBox.cpp b/harbour/contrib/hbqt/qtgui/QCheckBox.cpp index fc82f0866b..616b4af24f 100644 --- a/harbour/contrib/hbqt/qtgui/QCheckBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QCheckBox.cpp @@ -121,9 +121,9 @@ QT_G_FUNC( release_QCheckBox ) } } -void * gcAllocate_QCheckBox( void * pObj ) +void * hbqt_gcAllocate_QCheckBox( void * pObj ) { - QGC_POINTER_QCheckBox * p = ( QGC_POINTER_QCheckBox * ) hb_gcAllocate( sizeof( QGC_POINTER_QCheckBox ), gcFuncs() ); + QGC_POINTER_QCheckBox * p = ( QGC_POINTER_QCheckBox * ) hb_gcAllocate( sizeof( QGC_POINTER_QCheckBox ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QCheckBox; @@ -145,7 +145,7 @@ HB_FUNC( QT_QCHECKBOX ) pObj = ( QCheckBox* ) new QCheckBox( hbqt_par_QWidget( 1 ) ) ; } - hb_retptrGC( gcAllocate_QCheckBox( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QCheckBox( pObj ) ); } /* * Qt::CheckState checkState () const diff --git a/harbour/contrib/hbqt/qtgui/QClipboard.cpp b/harbour/contrib/hbqt/qtgui/QClipboard.cpp index 9201cf1734..3cc3b2945c 100644 --- a/harbour/contrib/hbqt/qtgui/QClipboard.cpp +++ b/harbour/contrib/hbqt/qtgui/QClipboard.cpp @@ -107,7 +107,7 @@ HB_FUNC( QT_QCLIPBOARD_CLEAR ) */ HB_FUNC( QT_QCLIPBOARD_IMAGE ) { - hb_retptrGC( gcAllocate_QImage( new QImage( hbqt_par_QClipboard( 1 )->image( ( HB_ISNUM( 2 ) ? ( QClipboard::Mode ) hb_parni( 2 ) : ( QClipboard::Mode ) QClipboard::Clipboard ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( hbqt_par_QClipboard( 1 )->image( ( HB_ISNUM( 2 ) ? ( QClipboard::Mode ) hb_parni( 2 ) : ( QClipboard::Mode ) QClipboard::Clipboard ) ) ) ) ); } /* @@ -147,7 +147,7 @@ HB_FUNC( QT_QCLIPBOARD_OWNSSELECTION ) */ HB_FUNC( QT_QCLIPBOARD_PIXMAP ) { - hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QClipboard( 1 )->pixmap( ( HB_ISNUM( 2 ) ? ( QClipboard::Mode ) hb_parni( 2 ) : ( QClipboard::Mode ) QClipboard::Clipboard ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( hbqt_par_QClipboard( 1 )->pixmap( ( HB_ISNUM( 2 ) ? ( QClipboard::Mode ) hb_parni( 2 ) : ( QClipboard::Mode ) QClipboard::Clipboard ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QColor.cpp b/harbour/contrib/hbqt/qtgui/QColor.cpp index 0a652172c6..d4806d9121 100644 --- a/harbour/contrib/hbqt/qtgui/QColor.cpp +++ b/harbour/contrib/hbqt/qtgui/QColor.cpp @@ -104,9 +104,9 @@ QT_G_FUNC( release_QColor ) } } -void * gcAllocate_QColor( void * pObj ) +void * hbqt_gcAllocate_QColor( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QColor; @@ -154,7 +154,7 @@ HB_FUNC( QT_QCOLOR ) pObj = ( QColor* ) new QColor() ; } - hb_retptrGC( gcAllocate_QColor( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( pObj ) ); } /* * int alpha () const @@ -209,7 +209,7 @@ HB_FUNC( QT_QCOLOR_BLUEF ) */ HB_FUNC( QT_QCOLOR_CONVERTTO ) { - hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->convertTo( ( QColor::Spec ) hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->convertTo( ( QColor::Spec ) hb_parni( 2 ) ) ) ) ); } /* @@ -233,7 +233,7 @@ HB_FUNC( QT_QCOLOR_CYANF ) */ HB_FUNC( QT_QCOLOR_DARKER ) { - hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->darker( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 200 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->darker( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 200 ) ) ) ) ); } /* @@ -393,7 +393,7 @@ HB_FUNC( QT_QCOLOR_ISVALID ) */ HB_FUNC( QT_QCOLOR_LIGHTER ) { - hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->lighter( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 150 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->lighter( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : 150 ) ) ) ) ); } /* @@ -617,7 +617,7 @@ HB_FUNC( QT_QCOLOR_SPEC ) */ HB_FUNC( QT_QCOLOR_TOCMYK ) { - hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->toCmyk() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->toCmyk() ) ) ); } /* @@ -625,7 +625,7 @@ HB_FUNC( QT_QCOLOR_TOCMYK ) */ HB_FUNC( QT_QCOLOR_TOHSV ) { - hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->toHsv() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->toHsv() ) ) ); } /* @@ -633,7 +633,7 @@ HB_FUNC( QT_QCOLOR_TOHSV ) */ HB_FUNC( QT_QCOLOR_TORGB ) { - hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->toRgb() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->toRgb() ) ) ); } /* @@ -673,7 +673,7 @@ HB_FUNC( QT_QCOLOR_YELLOWF ) */ HB_FUNC( QT_QCOLOR_COLORNAMES ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QColor( 1 )->colorNames() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QColor( 1 )->colorNames() ) ) ); } /* @@ -681,7 +681,7 @@ HB_FUNC( QT_QCOLOR_COLORNAMES ) */ HB_FUNC( QT_QCOLOR_FROMCMYK ) { - 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 ) ) ) ) ); + hb_retptrGC( hbqt_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 +689,7 @@ HB_FUNC( QT_QCOLOR_FROMCMYK ) */ HB_FUNC( QT_QCOLOR_FROMCMYKF ) { - 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 ) ) ) ) ); + hb_retptrGC( hbqt_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 +697,7 @@ HB_FUNC( QT_QCOLOR_FROMCMYKF ) */ HB_FUNC( QT_QCOLOR_FROMHSV ) { - 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 ) ) ) ) ); + hb_retptrGC( hbqt_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 +705,7 @@ HB_FUNC( QT_QCOLOR_FROMHSV ) */ HB_FUNC( QT_QCOLOR_FROMHSVF ) { - hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->fromHsvF( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->fromHsvF( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ) ) ) ); } /* @@ -713,7 +713,7 @@ HB_FUNC( QT_QCOLOR_FROMHSVF ) */ HB_FUNC( QT_QCOLOR_FROMRGB ) { - hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->fromRgb( hb_parnl( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->fromRgb( hb_parnl( 2 ) ) ) ) ); } /* @@ -721,7 +721,7 @@ HB_FUNC( QT_QCOLOR_FROMRGB ) */ HB_FUNC( QT_QCOLOR_FROMRGB_1 ) { - 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 ) ) ) ) ); + hb_retptrGC( hbqt_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 +729,7 @@ HB_FUNC( QT_QCOLOR_FROMRGB_1 ) */ HB_FUNC( QT_QCOLOR_FROMRGBF ) { - hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->fromRgbF( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->fromRgbF( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ) ) ) ); } /* @@ -737,7 +737,7 @@ HB_FUNC( QT_QCOLOR_FROMRGBF ) */ HB_FUNC( QT_QCOLOR_FROMRGBA ) { - hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->fromRgba( hb_parnl( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QColor( 1 )->fromRgba( hb_parnl( 2 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QColorDialog.cpp b/harbour/contrib/hbqt/qtgui/QColorDialog.cpp index c47bfa0fae..fdd634f3a9 100644 --- a/harbour/contrib/hbqt/qtgui/QColorDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QColorDialog.cpp @@ -126,9 +126,9 @@ QT_G_FUNC( release_QColorDialog ) } } -void * gcAllocate_QColorDialog( void * pObj ) +void * hbqt_gcAllocate_QColorDialog( void * pObj ) { - QGC_POINTER_QColorDialog * p = ( QGC_POINTER_QColorDialog * ) hb_gcAllocate( sizeof( QGC_POINTER_QColorDialog ), gcFuncs() ); + QGC_POINTER_QColorDialog * p = ( QGC_POINTER_QColorDialog * ) hb_gcAllocate( sizeof( QGC_POINTER_QColorDialog ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QColorDialog; @@ -150,14 +150,14 @@ HB_FUNC( QT_QCOLORDIALOG ) pObj = ( QColorDialog* ) new QColorDialog( hbqt_par_QWidget( 1 ) ) ; } - hb_retptrGC( gcAllocate_QColorDialog( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QColorDialog( pObj ) ); } /* * QColor currentColor () const */ HB_FUNC( QT_QCOLORDIALOG_CURRENTCOLOR ) { - hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColorDialog( 1 )->currentColor() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QColorDialog( 1 )->currentColor() ) ) ); } /* @@ -181,7 +181,7 @@ HB_FUNC( QT_QCOLORDIALOG_OPTIONS ) */ HB_FUNC( QT_QCOLORDIALOG_SELECTEDCOLOR ) { - hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColorDialog( 1 )->selectedColor() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QColorDialog( 1 )->selectedColor() ) ) ); } /* @@ -245,7 +245,7 @@ HB_FUNC( QT_QCOLORDIALOG_CUSTOMCOUNT ) */ HB_FUNC( QT_QCOLORDIALOG_GETCOLOR ) { - 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 ) ) ) ) ); + hb_retptrGC( hbqt_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 ) ) ) ) ); } /* @@ -253,7 +253,7 @@ HB_FUNC( QT_QCOLORDIALOG_GETCOLOR ) */ HB_FUNC( QT_QCOLORDIALOG_GETCOLOR_1 ) { - hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QColorDialog( 1 )->getColor( *hbqt_par_QColor( 2 ), hbqt_par_QWidget( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QColorDialog( 1 )->getColor( *hbqt_par_QColor( 2 ), hbqt_par_QWidget( 3 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QComboBox.cpp b/harbour/contrib/hbqt/qtgui/QComboBox.cpp index bc2780b622..9741fa8c04 100644 --- a/harbour/contrib/hbqt/qtgui/QComboBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QComboBox.cpp @@ -126,9 +126,9 @@ QT_G_FUNC( release_QComboBox ) } } -void * gcAllocate_QComboBox( void * pObj ) +void * hbqt_gcAllocate_QComboBox( void * pObj ) { - QGC_POINTER_QComboBox * p = ( QGC_POINTER_QComboBox * ) hb_gcAllocate( sizeof( QGC_POINTER_QComboBox ), gcFuncs() ); + QGC_POINTER_QComboBox * p = ( QGC_POINTER_QComboBox * ) hb_gcAllocate( sizeof( QGC_POINTER_QComboBox ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QComboBox; @@ -143,7 +143,7 @@ HB_FUNC( QT_QCOMBOBOX ) pObj = ( QComboBox* ) new QComboBox( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QComboBox( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QComboBox( pObj ) ); } /* * void addItem ( const QString & text, const QVariant & userData = QVariant() ) @@ -246,7 +246,7 @@ HB_FUNC( QT_QCOMBOBOX_HIDEPOPUP ) */ HB_FUNC( QT_QCOMBOBOX_ICONSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QComboBox( 1 )->iconSize() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QComboBox( 1 )->iconSize() ) ) ); } /* @@ -302,7 +302,7 @@ HB_FUNC( QT_QCOMBOBOX_ISEDITABLE ) */ HB_FUNC( QT_QCOMBOBOX_ITEMDATA ) { - hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QComboBox( 1 )->itemData( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::UserRole ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QComboBox( 1 )->itemData( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::UserRole ) ) ) ) ); } /* @@ -318,7 +318,7 @@ HB_FUNC( QT_QCOMBOBOX_ITEMDELEGATE ) */ HB_FUNC( QT_QCOMBOBOX_ITEMICON ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QComboBox( 1 )->itemIcon( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QComboBox( 1 )->itemIcon( hb_parni( 2 ) ) ) ) ); } /* @@ -390,7 +390,7 @@ HB_FUNC( QT_QCOMBOBOX_REMOVEITEM ) */ HB_FUNC( QT_QCOMBOBOX_ROOTMODELINDEX ) { - hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QComboBox( 1 )->rootModelIndex() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QComboBox( 1 )->rootModelIndex() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QCommandLinkButton.cpp b/harbour/contrib/hbqt/qtgui/QCommandLinkButton.cpp index 6d58b70a31..cf7478a95b 100644 --- a/harbour/contrib/hbqt/qtgui/QCommandLinkButton.cpp +++ b/harbour/contrib/hbqt/qtgui/QCommandLinkButton.cpp @@ -122,9 +122,9 @@ QT_G_FUNC( release_QCommandLinkButton ) } } -void * gcAllocate_QCommandLinkButton( void * pObj ) +void * hbqt_gcAllocate_QCommandLinkButton( void * pObj ) { - QGC_POINTER_QCommandLinkButton * p = ( QGC_POINTER_QCommandLinkButton * ) hb_gcAllocate( sizeof( QGC_POINTER_QCommandLinkButton ), gcFuncs() ); + QGC_POINTER_QCommandLinkButton * p = ( QGC_POINTER_QCommandLinkButton * ) hb_gcAllocate( sizeof( QGC_POINTER_QCommandLinkButton ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QCommandLinkButton; @@ -139,7 +139,7 @@ HB_FUNC( QT_QCOMMANDLINKBUTTON ) pObj = ( QCommandLinkButton* ) new QCommandLinkButton( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QCommandLinkButton( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QCommandLinkButton( pObj ) ); } /* * QString description () const diff --git a/harbour/contrib/hbqt/qtgui/QCommonStyle.cpp b/harbour/contrib/hbqt/qtgui/QCommonStyle.cpp index a57aa81b57..f99046abef 100644 --- a/harbour/contrib/hbqt/qtgui/QCommonStyle.cpp +++ b/harbour/contrib/hbqt/qtgui/QCommonStyle.cpp @@ -120,9 +120,9 @@ QT_G_FUNC( release_QCommonStyle ) } } -void * gcAllocate_QCommonStyle( void * pObj ) +void * hbqt_gcAllocate_QCommonStyle( void * pObj ) { - QGC_POINTER_QCommonStyle * p = ( QGC_POINTER_QCommonStyle * ) hb_gcAllocate( sizeof( QGC_POINTER_QCommonStyle ), gcFuncs() ); + QGC_POINTER_QCommonStyle * p = ( QGC_POINTER_QCommonStyle * ) hb_gcAllocate( sizeof( QGC_POINTER_QCommonStyle ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QCommonStyle; @@ -137,7 +137,7 @@ HB_FUNC( QT_QCOMMONSTYLE ) pObj = ( QCommonStyle* ) new QCommonStyle() ; - hb_retptrGC( gcAllocate_QCommonStyle( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QCommonStyle( pObj ) ); } /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/QCompleter.cpp b/harbour/contrib/hbqt/qtgui/QCompleter.cpp index 2450ebd6df..61c9c7f756 100644 --- a/harbour/contrib/hbqt/qtgui/QCompleter.cpp +++ b/harbour/contrib/hbqt/qtgui/QCompleter.cpp @@ -127,9 +127,9 @@ QT_G_FUNC( release_QCompleter ) } } -void * gcAllocate_QCompleter( void * pObj ) +void * hbqt_gcAllocate_QCompleter( void * pObj ) { - QGC_POINTER_QCompleter * p = ( QGC_POINTER_QCompleter * ) hb_gcAllocate( sizeof( QGC_POINTER_QCompleter ), gcFuncs() ); + QGC_POINTER_QCompleter * p = ( QGC_POINTER_QCompleter * ) hb_gcAllocate( sizeof( QGC_POINTER_QCompleter ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QCompleter; @@ -144,7 +144,7 @@ HB_FUNC( QT_QCOMPLETER ) pObj = new QCompleter() ; - hb_retptrGC( gcAllocate_QCompleter( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QCompleter( pObj ) ); } /* * Qt::CaseSensitivity caseSensitivity () const @@ -215,7 +215,7 @@ HB_FUNC( QT_QCOMPLETER_CURRENTCOMPLETION ) */ HB_FUNC( QT_QCOMPLETER_CURRENTINDEX ) { - hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QCompleter( 1 )->currentIndex() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QCompleter( 1 )->currentIndex() ) ) ); } /* @@ -335,7 +335,7 @@ HB_FUNC( QT_QCOMPLETER_SETWIDGET ) */ HB_FUNC( QT_QCOMPLETER_SPLITPATH ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QCompleter( 1 )->splitPath( hbqt_par_QString( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QCompleter( 1 )->splitPath( hbqt_par_QString( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QConicalGradient.cpp b/harbour/contrib/hbqt/qtgui/QConicalGradient.cpp index f10854971e..f5aec9fb2e 100644 --- a/harbour/contrib/hbqt/qtgui/QConicalGradient.cpp +++ b/harbour/contrib/hbqt/qtgui/QConicalGradient.cpp @@ -102,9 +102,9 @@ QT_G_FUNC( release_QConicalGradient ) } } -void * gcAllocate_QConicalGradient( void * pObj ) +void * hbqt_gcAllocate_QConicalGradient( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QConicalGradient; @@ -118,7 +118,7 @@ HB_FUNC( QT_QCONICALGRADIENT ) pObj = ( QConicalGradient* ) new QConicalGradient() ; - hb_retptrGC( gcAllocate_QConicalGradient( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QConicalGradient( pObj ) ); } /* * qreal angle () const @@ -133,7 +133,7 @@ HB_FUNC( QT_QCONICALGRADIENT_ANGLE ) */ HB_FUNC( QT_QCONICALGRADIENT_CENTER ) { - hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QConicalGradient( 1 )->center() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QConicalGradient( 1 )->center() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QContextMenuEvent.cpp b/harbour/contrib/hbqt/qtgui/QContextMenuEvent.cpp index ef4cc2eca1..68f22126db 100644 --- a/harbour/contrib/hbqt/qtgui/QContextMenuEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QContextMenuEvent.cpp @@ -99,9 +99,9 @@ QT_G_FUNC( release_QContextMenuEvent ) } } -void * gcAllocate_QContextMenuEvent( void * pObj ) +void * hbqt_gcAllocate_QContextMenuEvent( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QContextMenuEvent; @@ -115,14 +115,14 @@ HB_FUNC( QT_QCONTEXTMENUEVENT ) pObj = new QContextMenuEvent( ( QContextMenuEvent::Reason ) hb_parni( 1 ), *hbqt_par_QPoint( 2 ) ) ; - hb_retptrGC( gcAllocate_QContextMenuEvent( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QContextMenuEvent( pObj ) ); } /* * const QPoint & globalPos () const */ HB_FUNC( QT_QCONTEXTMENUEVENT_GLOBALPOS ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QContextMenuEvent( 1 )->globalPos() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QContextMenuEvent( 1 )->globalPos() ) ) ); } /* @@ -146,7 +146,7 @@ HB_FUNC( QT_QCONTEXTMENUEVENT_GLOBALY ) */ HB_FUNC( QT_QCONTEXTMENUEVENT_POS ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QContextMenuEvent( 1 )->pos() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QContextMenuEvent( 1 )->pos() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QCursor.cpp b/harbour/contrib/hbqt/qtgui/QCursor.cpp index 2e8d2cbd2a..5633cb64c1 100644 --- a/harbour/contrib/hbqt/qtgui/QCursor.cpp +++ b/harbour/contrib/hbqt/qtgui/QCursor.cpp @@ -101,9 +101,9 @@ QT_G_FUNC( release_QCursor ) } } -void * gcAllocate_QCursor( void * pObj ) +void * hbqt_gcAllocate_QCursor( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QCursor; @@ -145,7 +145,7 @@ HB_FUNC( QT_QCURSOR ) pObj = ( QCursor* ) new QCursor() ; } - hb_retptrGC( gcAllocate_QCursor( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QCursor( pObj ) ); } /* * const QBitmap * bitmap () const @@ -160,7 +160,7 @@ HB_FUNC( QT_QCURSOR_BITMAP ) */ HB_FUNC( QT_QCURSOR_HOTSPOT ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QCursor( 1 )->hotSpot() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QCursor( 1 )->hotSpot() ) ) ); } /* @@ -176,7 +176,7 @@ HB_FUNC( QT_QCURSOR_MASK ) */ HB_FUNC( QT_QCURSOR_PIXMAP ) { - hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QCursor( 1 )->pixmap() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( hbqt_par_QCursor( 1 )->pixmap() ) ) ); } /* @@ -200,7 +200,7 @@ HB_FUNC( QT_QCURSOR_SHAPE ) */ HB_FUNC( QT_QCURSOR_POS ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QCursor( 1 )->pos() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QCursor( 1 )->pos() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QDateEdit.cpp b/harbour/contrib/hbqt/qtgui/QDateEdit.cpp index 15ea5c0d2f..a873a9e4fd 100644 --- a/harbour/contrib/hbqt/qtgui/QDateEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/QDateEdit.cpp @@ -121,9 +121,9 @@ QT_G_FUNC( release_QDateEdit ) } } -void * gcAllocate_QDateEdit( void * pObj ) +void * hbqt_gcAllocate_QDateEdit( void * pObj ) { - QGC_POINTER_QDateEdit * p = ( QGC_POINTER_QDateEdit * ) hb_gcAllocate( sizeof( QGC_POINTER_QDateEdit ), gcFuncs() ); + QGC_POINTER_QDateEdit * p = ( QGC_POINTER_QDateEdit * ) hb_gcAllocate( sizeof( QGC_POINTER_QDateEdit ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QDateEdit; @@ -138,7 +138,7 @@ HB_FUNC( QT_QDATEEDIT ) pObj = ( QDateEdit* ) new QDateEdit( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QDateEdit( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QDateEdit( pObj ) ); } /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/QDateTimeEdit.cpp b/harbour/contrib/hbqt/qtgui/QDateTimeEdit.cpp index e42d7aa86d..74f6146572 100644 --- a/harbour/contrib/hbqt/qtgui/QDateTimeEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/QDateTimeEdit.cpp @@ -128,9 +128,9 @@ QT_G_FUNC( release_QDateTimeEdit ) } } -void * gcAllocate_QDateTimeEdit( void * pObj ) +void * hbqt_gcAllocate_QDateTimeEdit( void * pObj ) { - QGC_POINTER_QDateTimeEdit * p = ( QGC_POINTER_QDateTimeEdit * ) hb_gcAllocate( sizeof( QGC_POINTER_QDateTimeEdit ), gcFuncs() ); + QGC_POINTER_QDateTimeEdit * p = ( QGC_POINTER_QDateTimeEdit * ) hb_gcAllocate( sizeof( QGC_POINTER_QDateTimeEdit ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QDateTimeEdit; @@ -145,7 +145,7 @@ HB_FUNC( QT_QDATETIMEEDIT ) pObj = ( QDateTimeEdit* ) new QDateTimeEdit( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QDateTimeEdit( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QDateTimeEdit( pObj ) ); } /* * bool calendarPopup () const @@ -232,7 +232,7 @@ HB_FUNC( QT_QDATETIMEEDIT_CURRENTSECTIONINDEX ) */ HB_FUNC( QT_QDATETIMEEDIT_DATE ) { - hb_retptrGC( gcAllocate_QDate( new QDate( hbqt_par_QDateTimeEdit( 1 )->date() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDate( new QDate( hbqt_par_QDateTimeEdit( 1 )->date() ) ) ); } /* @@ -240,7 +240,7 @@ HB_FUNC( QT_QDATETIMEEDIT_DATE ) */ HB_FUNC( QT_QDATETIMEEDIT_DATETIME ) { - hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTimeEdit( 1 )->dateTime() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTimeEdit( 1 )->dateTime() ) ) ); } /* @@ -264,7 +264,7 @@ HB_FUNC( QT_QDATETIMEEDIT_DISPLAYEDSECTIONS ) */ HB_FUNC( QT_QDATETIMEEDIT_MAXIMUMDATE ) { - hb_retptrGC( gcAllocate_QDate( new QDate( hbqt_par_QDateTimeEdit( 1 )->maximumDate() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDate( new QDate( hbqt_par_QDateTimeEdit( 1 )->maximumDate() ) ) ); } /* @@ -272,7 +272,7 @@ HB_FUNC( QT_QDATETIMEEDIT_MAXIMUMDATE ) */ HB_FUNC( QT_QDATETIMEEDIT_MAXIMUMDATETIME ) { - hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTimeEdit( 1 )->maximumDateTime() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTimeEdit( 1 )->maximumDateTime() ) ) ); } /* @@ -280,7 +280,7 @@ HB_FUNC( QT_QDATETIMEEDIT_MAXIMUMDATETIME ) */ HB_FUNC( QT_QDATETIMEEDIT_MAXIMUMTIME ) { - hb_retptrGC( gcAllocate_QTime( new QTime( hbqt_par_QDateTimeEdit( 1 )->maximumTime() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QDateTimeEdit( 1 )->maximumTime() ) ) ); } /* @@ -288,7 +288,7 @@ HB_FUNC( QT_QDATETIMEEDIT_MAXIMUMTIME ) */ HB_FUNC( QT_QDATETIMEEDIT_MINIMUMDATE ) { - hb_retptrGC( gcAllocate_QDate( new QDate( hbqt_par_QDateTimeEdit( 1 )->minimumDate() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDate( new QDate( hbqt_par_QDateTimeEdit( 1 )->minimumDate() ) ) ); } /* @@ -296,7 +296,7 @@ HB_FUNC( QT_QDATETIMEEDIT_MINIMUMDATE ) */ HB_FUNC( QT_QDATETIMEEDIT_MINIMUMDATETIME ) { - hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTimeEdit( 1 )->minimumDateTime() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QDateTimeEdit( 1 )->minimumDateTime() ) ) ); } /* @@ -304,7 +304,7 @@ HB_FUNC( QT_QDATETIMEEDIT_MINIMUMDATETIME ) */ HB_FUNC( QT_QDATETIMEEDIT_MINIMUMTIME ) { - hb_retptrGC( gcAllocate_QTime( new QTime( hbqt_par_QDateTimeEdit( 1 )->minimumTime() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QDateTimeEdit( 1 )->minimumTime() ) ) ); } /* @@ -464,7 +464,7 @@ HB_FUNC( QT_QDATETIMEEDIT_SETTIMESPEC ) */ HB_FUNC( QT_QDATETIMEEDIT_TIME ) { - hb_retptrGC( gcAllocate_QTime( new QTime( hbqt_par_QDateTimeEdit( 1 )->time() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTime( new QTime( hbqt_par_QDateTimeEdit( 1 )->time() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QDesktopWidget.cpp b/harbour/contrib/hbqt/qtgui/QDesktopWidget.cpp index 69a44338dd..6c90f7f24c 100644 --- a/harbour/contrib/hbqt/qtgui/QDesktopWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QDesktopWidget.cpp @@ -121,9 +121,9 @@ QT_G_FUNC( release_QDesktopWidget ) } } -void * gcAllocate_QDesktopWidget( void * pObj ) +void * hbqt_gcAllocate_QDesktopWidget( void * pObj ) { - QGC_POINTER_QDesktopWidget * p = ( QGC_POINTER_QDesktopWidget * ) hb_gcAllocate( sizeof( QGC_POINTER_QDesktopWidget ), gcFuncs() ); + QGC_POINTER_QDesktopWidget * p = ( QGC_POINTER_QDesktopWidget * ) hb_gcAllocate( sizeof( QGC_POINTER_QDesktopWidget ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QDesktopWidget; @@ -138,14 +138,14 @@ HB_FUNC( QT_QDESKTOPWIDGET ) pObj = new QDesktopWidget() ; - hb_retptrGC( gcAllocate_QDesktopWidget( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QDesktopWidget( pObj ) ); } /* * const QRect availableGeometry ( int screen = -1 ) const */ HB_FUNC( QT_QDESKTOPWIDGET_AVAILABLEGEOMETRY ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QDesktopWidget( 1 )->availableGeometry( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : -1 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QDesktopWidget( 1 )->availableGeometry( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : -1 ) ) ) ) ); } /* @@ -153,7 +153,7 @@ HB_FUNC( QT_QDESKTOPWIDGET_AVAILABLEGEOMETRY ) */ HB_FUNC( QT_QDESKTOPWIDGET_AVAILABLEGEOMETRY_1 ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QDesktopWidget( 1 )->availableGeometry( hbqt_par_QWidget( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QDesktopWidget( 1 )->availableGeometry( hbqt_par_QWidget( 2 ) ) ) ) ); } /* @@ -161,7 +161,7 @@ HB_FUNC( QT_QDESKTOPWIDGET_AVAILABLEGEOMETRY_1 ) */ HB_FUNC( QT_QDESKTOPWIDGET_AVAILABLEGEOMETRY_2 ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QDesktopWidget( 1 )->availableGeometry( *hbqt_par_QPoint( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QDesktopWidget( 1 )->availableGeometry( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* @@ -201,7 +201,7 @@ HB_FUNC( QT_QDESKTOPWIDGET_SCREEN ) */ HB_FUNC( QT_QDESKTOPWIDGET_SCREENGEOMETRY ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QDesktopWidget( 1 )->screenGeometry( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : -1 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QDesktopWidget( 1 )->screenGeometry( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : -1 ) ) ) ) ); } /* @@ -209,7 +209,7 @@ HB_FUNC( QT_QDESKTOPWIDGET_SCREENGEOMETRY ) */ HB_FUNC( QT_QDESKTOPWIDGET_SCREENGEOMETRY_1 ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QDesktopWidget( 1 )->screenGeometry( hbqt_par_QWidget( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QDesktopWidget( 1 )->screenGeometry( hbqt_par_QWidget( 2 ) ) ) ) ); } /* @@ -217,7 +217,7 @@ HB_FUNC( QT_QDESKTOPWIDGET_SCREENGEOMETRY_1 ) */ HB_FUNC( QT_QDESKTOPWIDGET_SCREENGEOMETRY_2 ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QDesktopWidget( 1 )->screenGeometry( *hbqt_par_QPoint( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QDesktopWidget( 1 )->screenGeometry( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QDial.cpp b/harbour/contrib/hbqt/qtgui/QDial.cpp index 06cf3c2d4f..0cb63a4e1f 100644 --- a/harbour/contrib/hbqt/qtgui/QDial.cpp +++ b/harbour/contrib/hbqt/qtgui/QDial.cpp @@ -121,9 +121,9 @@ QT_G_FUNC( release_QDial ) } } -void * gcAllocate_QDial( void * pObj ) +void * hbqt_gcAllocate_QDial( void * pObj ) { - QGC_POINTER_QDial * p = ( QGC_POINTER_QDial * ) hb_gcAllocate( sizeof( QGC_POINTER_QDial ), gcFuncs() ); + QGC_POINTER_QDial * p = ( QGC_POINTER_QDial * ) hb_gcAllocate( sizeof( QGC_POINTER_QDial ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QDial; @@ -138,7 +138,7 @@ HB_FUNC( QT_QDIAL ) pObj = ( QDial* ) new QDial( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QDial( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QDial( pObj ) ); } /* * int notchSize () const diff --git a/harbour/contrib/hbqt/qtgui/QDialog.cpp b/harbour/contrib/hbqt/qtgui/QDialog.cpp index d3fad89295..cde4144220 100644 --- a/harbour/contrib/hbqt/qtgui/QDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QDialog.cpp @@ -125,9 +125,9 @@ QT_G_FUNC( release_QDialog ) } } -void * gcAllocate_QDialog( void * pObj ) +void * hbqt_gcAllocate_QDialog( void * pObj ) { - QGC_POINTER_QDialog * p = ( QGC_POINTER_QDialog * ) hb_gcAllocate( sizeof( QGC_POINTER_QDialog ), gcFuncs() ); + QGC_POINTER_QDialog * p = ( QGC_POINTER_QDialog * ) hb_gcAllocate( sizeof( QGC_POINTER_QDialog ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QDialog; @@ -142,7 +142,7 @@ HB_FUNC( QT_QDIALOG ) pObj = new QDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ; - hb_retptrGC( gcAllocate_QDialog( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QDialog( pObj ) ); } /* * bool isSizeGripEnabled () const diff --git a/harbour/contrib/hbqt/qtgui/QDirModel.cpp b/harbour/contrib/hbqt/qtgui/QDirModel.cpp index ab86a9de55..80c9653a8d 100644 --- a/harbour/contrib/hbqt/qtgui/QDirModel.cpp +++ b/harbour/contrib/hbqt/qtgui/QDirModel.cpp @@ -126,9 +126,9 @@ QT_G_FUNC( release_QDirModel ) } } -void * gcAllocate_QDirModel( void * pObj ) +void * hbqt_gcAllocate_QDirModel( void * pObj ) { - QGC_POINTER_QDirModel * p = ( QGC_POINTER_QDirModel * ) hb_gcAllocate( sizeof( QGC_POINTER_QDirModel ), gcFuncs() ); + QGC_POINTER_QDirModel * p = ( QGC_POINTER_QDirModel * ) hb_gcAllocate( sizeof( QGC_POINTER_QDirModel ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QDirModel; @@ -143,7 +143,7 @@ HB_FUNC( QT_QDIRMODEL ) pObj = ( QDirModel* ) new QDirModel( hbqt_par_QObject( 1 ) ) ; - hb_retptrGC( gcAllocate_QDirModel( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QDirModel( pObj ) ); } /* * virtual int columnCount ( const QModelIndex & parent = QModelIndex() ) const @@ -158,7 +158,7 @@ HB_FUNC( QT_QDIRMODEL_COLUMNCOUNT ) */ HB_FUNC( QT_QDIRMODEL_DATA ) { - hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QDirModel( 1 )->data( *hbqt_par_QModelIndex( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::DisplayRole ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QDirModel( 1 )->data( *hbqt_par_QModelIndex( 2 ), ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::DisplayRole ) ) ) ) ); } /* @@ -174,7 +174,7 @@ HB_FUNC( QT_QDIRMODEL_DROPMIMEDATA ) */ HB_FUNC( QT_QDIRMODEL_FILEICON ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QDirModel( 1 )->fileIcon( *hbqt_par_QModelIndex( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QDirModel( 1 )->fileIcon( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* @@ -182,7 +182,7 @@ HB_FUNC( QT_QDIRMODEL_FILEICON ) */ HB_FUNC( QT_QDIRMODEL_FILEINFO ) { - hb_retptrGC( gcAllocate_QFileInfo( new QFileInfo( hbqt_par_QDirModel( 1 )->fileInfo( *hbqt_par_QModelIndex( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFileInfo( new QFileInfo( hbqt_par_QDirModel( 1 )->fileInfo( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* @@ -230,7 +230,7 @@ HB_FUNC( QT_QDIRMODEL_HASCHILDREN ) */ HB_FUNC( QT_QDIRMODEL_HEADERDATA ) { - 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 ) ) ) ) ); + hb_retptrGC( hbqt_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 ) ) ) ) ); } /* @@ -246,7 +246,7 @@ HB_FUNC( QT_QDIRMODEL_ICONPROVIDER ) */ HB_FUNC( QT_QDIRMODEL_INDEX ) { - 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() ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QDirModel( 1 )->index( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QModelIndex( 4 ) : QModelIndex() ) ) ) ) ); } /* @@ -254,7 +254,7 @@ HB_FUNC( QT_QDIRMODEL_INDEX ) */ HB_FUNC( QT_QDIRMODEL_INDEX_1 ) { - hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QDirModel( 1 )->index( hbqt_par_QString( 2 ), hb_parni( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QDirModel( 1 )->index( hbqt_par_QString( 2 ), hb_parni( 3 ) ) ) ) ); } /* @@ -286,7 +286,7 @@ HB_FUNC( QT_QDIRMODEL_LAZYCHILDCOUNT ) */ HB_FUNC( QT_QDIRMODEL_MIMETYPES ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QDirModel( 1 )->mimeTypes() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QDirModel( 1 )->mimeTypes() ) ) ); } /* @@ -294,7 +294,7 @@ HB_FUNC( QT_QDIRMODEL_MIMETYPES ) */ HB_FUNC( QT_QDIRMODEL_MKDIR ) { - hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QDirModel( 1 )->mkdir( *hbqt_par_QModelIndex( 2 ), hbqt_par_QString( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QDirModel( 1 )->mkdir( *hbqt_par_QModelIndex( 2 ), hbqt_par_QString( 3 ) ) ) ) ); } /* @@ -302,7 +302,7 @@ HB_FUNC( QT_QDIRMODEL_MKDIR ) */ HB_FUNC( QT_QDIRMODEL_NAMEFILTERS ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QDirModel( 1 )->nameFilters() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QDirModel( 1 )->nameFilters() ) ) ); } /* @@ -310,7 +310,7 @@ HB_FUNC( QT_QDIRMODEL_NAMEFILTERS ) */ HB_FUNC( QT_QDIRMODEL_PARENT ) { - hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QDirModel( 1 )->parent( *hbqt_par_QModelIndex( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QDirModel( 1 )->parent( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QDockWidget.cpp b/harbour/contrib/hbqt/qtgui/QDockWidget.cpp index 179299260d..fab51ccc8e 100644 --- a/harbour/contrib/hbqt/qtgui/QDockWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QDockWidget.cpp @@ -127,9 +127,9 @@ QT_G_FUNC( release_QDockWidget ) } } -void * gcAllocate_QDockWidget( void * pObj ) +void * hbqt_gcAllocate_QDockWidget( void * pObj ) { - QGC_POINTER_QDockWidget * p = ( QGC_POINTER_QDockWidget * ) hb_gcAllocate( sizeof( QGC_POINTER_QDockWidget ), gcFuncs() ); + QGC_POINTER_QDockWidget * p = ( QGC_POINTER_QDockWidget * ) hb_gcAllocate( sizeof( QGC_POINTER_QDockWidget ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QDockWidget; @@ -144,7 +144,7 @@ HB_FUNC( QT_QDOCKWIDGET ) pObj = new QDockWidget( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ; - hb_retptrGC( gcAllocate_QDockWidget( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QDockWidget( pObj ) ); } /* * Qt::DockWidgetAreas allowedAreas () const diff --git a/harbour/contrib/hbqt/qtgui/QDoubleSpinBox.cpp b/harbour/contrib/hbqt/qtgui/QDoubleSpinBox.cpp index 86da01a901..67d5349b60 100644 --- a/harbour/contrib/hbqt/qtgui/QDoubleSpinBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QDoubleSpinBox.cpp @@ -120,9 +120,9 @@ QT_G_FUNC( release_QDoubleSpinBox ) } } -void * gcAllocate_QDoubleSpinBox( void * pObj ) +void * hbqt_gcAllocate_QDoubleSpinBox( void * pObj ) { - QGC_POINTER_QDoubleSpinBox * p = ( QGC_POINTER_QDoubleSpinBox * ) hb_gcAllocate( sizeof( QGC_POINTER_QDoubleSpinBox ), gcFuncs() ); + QGC_POINTER_QDoubleSpinBox * p = ( QGC_POINTER_QDoubleSpinBox * ) hb_gcAllocate( sizeof( QGC_POINTER_QDoubleSpinBox ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QDoubleSpinBox; @@ -137,7 +137,7 @@ HB_FUNC( QT_QDOUBLESPINBOX ) pObj = ( QDoubleSpinBox* ) new QDoubleSpinBox( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QDoubleSpinBox( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QDoubleSpinBox( pObj ) ); } /* * QString cleanText () const diff --git a/harbour/contrib/hbqt/qtgui/QDragMoveEvent.cpp b/harbour/contrib/hbqt/qtgui/QDragMoveEvent.cpp index f21801c8f9..6dc62508e2 100644 --- a/harbour/contrib/hbqt/qtgui/QDragMoveEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QDragMoveEvent.cpp @@ -105,7 +105,7 @@ HB_FUNC( QT_QDRAGMOVEEVENT_ACCEPT_1 ) */ HB_FUNC( QT_QDRAGMOVEEVENT_ANSWERRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QDragMoveEvent( 1 )->answerRect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QDragMoveEvent( 1 )->answerRect() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QDropEvent.cpp b/harbour/contrib/hbqt/qtgui/QDropEvent.cpp index 48cd3aa95f..84a61c565a 100644 --- a/harbour/contrib/hbqt/qtgui/QDropEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QDropEvent.cpp @@ -128,7 +128,7 @@ HB_FUNC( QT_QDROPEVENT_MOUSEBUTTONS ) */ HB_FUNC( QT_QDROPEVENT_POS ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QDropEvent( 1 )->pos() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QDropEvent( 1 )->pos() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QErrorMessage.cpp b/harbour/contrib/hbqt/qtgui/QErrorMessage.cpp index ab5eaeb3a5..b5f5fc6246 100644 --- a/harbour/contrib/hbqt/qtgui/QErrorMessage.cpp +++ b/harbour/contrib/hbqt/qtgui/QErrorMessage.cpp @@ -130,9 +130,9 @@ QT_G_FUNC( release_QErrorMessage ) } } -void * gcAllocate_QErrorMessage( void * pObj ) +void * hbqt_gcAllocate_QErrorMessage( void * pObj ) { - QGC_POINTER_QErrorMessage * p = ( QGC_POINTER_QErrorMessage * ) hb_gcAllocate( sizeof( QGC_POINTER_QErrorMessage ), gcFuncs() ); + QGC_POINTER_QErrorMessage * p = ( QGC_POINTER_QErrorMessage * ) hb_gcAllocate( sizeof( QGC_POINTER_QErrorMessage ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QErrorMessage; @@ -147,7 +147,7 @@ HB_FUNC( QT_QERRORMESSAGE ) pObj = ( QErrorMessage* ) new QErrorMessage( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QErrorMessage( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QErrorMessage( pObj ) ); } /* * void showMessage ( const QString & message, const QString & type ) diff --git a/harbour/contrib/hbqt/qtgui/QFileDialog.cpp b/harbour/contrib/hbqt/qtgui/QFileDialog.cpp index acae3b8729..2b3e8ec67c 100644 --- a/harbour/contrib/hbqt/qtgui/QFileDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QFileDialog.cpp @@ -148,9 +148,9 @@ QT_G_FUNC( release_QFileDialog ) } } -void * gcAllocate_QFileDialog( void * pObj ) +void * hbqt_gcAllocate_QFileDialog( void * pObj ) { - QGC_POINTER_QFileDialog * p = ( QGC_POINTER_QFileDialog * ) hb_gcAllocate( sizeof( QGC_POINTER_QFileDialog ), gcFuncs() ); + QGC_POINTER_QFileDialog * p = ( QGC_POINTER_QFileDialog * ) hb_gcAllocate( sizeof( QGC_POINTER_QFileDialog ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QFileDialog; @@ -176,7 +176,7 @@ HB_FUNC( QT_QFILEDIALOG ) pObj = new QFileDialog() ; } - hb_retptrGC( gcAllocate_QFileDialog( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QFileDialog( pObj ) ); } /* * AcceptMode acceptMode () const @@ -207,7 +207,7 @@ HB_FUNC( QT_QFILEDIALOG_DEFAULTSUFFIX ) */ HB_FUNC( QT_QFILEDIALOG_DIRECTORY ) { - hb_retptrGC( gcAllocate_QDir( new QDir( hbqt_par_QFileDialog( 1 )->directory() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDir( new QDir( hbqt_par_QFileDialog( 1 )->directory() ) ) ); } /* @@ -231,7 +231,7 @@ HB_FUNC( QT_QFILEDIALOG_FILTER ) */ HB_FUNC( QT_QFILEDIALOG_HISTORY ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QFileDialog( 1 )->history() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QFileDialog( 1 )->history() ) ) ); } /* @@ -279,7 +279,7 @@ HB_FUNC( QT_QFILEDIALOG_LABELTEXT ) */ HB_FUNC( QT_QFILEDIALOG_NAMEFILTERS ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QFileDialog( 1 )->nameFilters() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QFileDialog( 1 )->nameFilters() ) ) ); } /* @@ -319,7 +319,7 @@ HB_FUNC( QT_QFILEDIALOG_RESTORESTATE ) */ HB_FUNC( QT_QFILEDIALOG_SAVESTATE ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QFileDialog( 1 )->saveState() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QFileDialog( 1 )->saveState() ) ) ); } /* @@ -343,7 +343,7 @@ HB_FUNC( QT_QFILEDIALOG_SELECTNAMEFILTER ) */ HB_FUNC( QT_QFILEDIALOG_SELECTEDFILES ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QFileDialog( 1 )->selectedFiles() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QFileDialog( 1 )->selectedFiles() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QFileIconProvider.cpp b/harbour/contrib/hbqt/qtgui/QFileIconProvider.cpp index 34119255ed..9385e16085 100644 --- a/harbour/contrib/hbqt/qtgui/QFileIconProvider.cpp +++ b/harbour/contrib/hbqt/qtgui/QFileIconProvider.cpp @@ -98,9 +98,9 @@ QT_G_FUNC( release_QFileIconProvider ) } } -void * gcAllocate_QFileIconProvider( void * pObj ) +void * hbqt_gcAllocate_QFileIconProvider( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QFileIconProvider; @@ -114,14 +114,14 @@ HB_FUNC( QT_QFILEICONPROVIDER ) pObj = new QFileIconProvider() ; - hb_retptrGC( gcAllocate_QFileIconProvider( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QFileIconProvider( pObj ) ); } /* * virtual QIcon icon ( IconType type ) const */ HB_FUNC( QT_QFILEICONPROVIDER_ICON ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QFileIconProvider( 1 )->icon( ( QFileIconProvider::IconType ) hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QFileIconProvider( 1 )->icon( ( QFileIconProvider::IconType ) hb_parni( 2 ) ) ) ) ); } /* @@ -129,7 +129,7 @@ HB_FUNC( QT_QFILEICONPROVIDER_ICON ) */ HB_FUNC( QT_QFILEICONPROVIDER_ICON_1 ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QFileIconProvider( 1 )->icon( *hbqt_par_QFileInfo( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QFileIconProvider( 1 )->icon( *hbqt_par_QFileInfo( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QFileSystemModel.cpp b/harbour/contrib/hbqt/qtgui/QFileSystemModel.cpp index 5541b530b1..da482c8f7b 100644 --- a/harbour/contrib/hbqt/qtgui/QFileSystemModel.cpp +++ b/harbour/contrib/hbqt/qtgui/QFileSystemModel.cpp @@ -125,9 +125,9 @@ QT_G_FUNC( release_QFileSystemModel ) } } -void * gcAllocate_QFileSystemModel( void * pObj ) +void * hbqt_gcAllocate_QFileSystemModel( void * pObj ) { - QGC_POINTER_QFileSystemModel * p = ( QGC_POINTER_QFileSystemModel * ) hb_gcAllocate( sizeof( QGC_POINTER_QFileSystemModel ), gcFuncs() ); + QGC_POINTER_QFileSystemModel * p = ( QGC_POINTER_QFileSystemModel * ) hb_gcAllocate( sizeof( QGC_POINTER_QFileSystemModel ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QFileSystemModel; @@ -142,7 +142,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL ) pObj = ( QFileSystemModel * ) new QFileSystemModel() ; - hb_retptrGC( gcAllocate_QFileSystemModel( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QFileSystemModel( pObj ) ); } /* * virtual bool dropMimeData ( const QMimeData * data, Qt::DropAction action, int row, int column, const QModelIndex & parent ) @@ -157,7 +157,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_DROPMIMEDATA ) */ HB_FUNC( QT_QFILESYSTEMMODEL_FILEICON ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QFileSystemModel( 1 )->fileIcon( *hbqt_par_QModelIndex( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QFileSystemModel( 1 )->fileIcon( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* @@ -165,7 +165,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_FILEICON ) */ HB_FUNC( QT_QFILESYSTEMMODEL_FILEINFO ) { - hb_retptrGC( gcAllocate_QFileInfo( new QFileInfo( hbqt_par_QFileSystemModel( 1 )->fileInfo( *hbqt_par_QModelIndex( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFileInfo( new QFileInfo( hbqt_par_QFileSystemModel( 1 )->fileInfo( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* @@ -197,7 +197,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_FILTER ) */ HB_FUNC( QT_QFILESYSTEMMODEL_INDEX ) { - hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QFileSystemModel( 1 )->index( hbqt_par_QString( 2 ), hb_parni( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QFileSystemModel( 1 )->index( hbqt_par_QString( 2 ), hb_parni( 3 ) ) ) ) ); } /* @@ -221,7 +221,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_ISREADONLY ) */ HB_FUNC( QT_QFILESYSTEMMODEL_LASTMODIFIED ) { - hb_retptrGC( gcAllocate_QDateTime( new QDateTime( hbqt_par_QFileSystemModel( 1 )->lastModified( *hbqt_par_QModelIndex( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDateTime( new QDateTime( hbqt_par_QFileSystemModel( 1 )->lastModified( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* @@ -229,7 +229,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_LASTMODIFIED ) */ HB_FUNC( QT_QFILESYSTEMMODEL_MIMETYPES ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QFileSystemModel( 1 )->mimeTypes() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QFileSystemModel( 1 )->mimeTypes() ) ) ); } /* @@ -237,7 +237,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_MIMETYPES ) */ HB_FUNC( QT_QFILESYSTEMMODEL_MKDIR ) { - hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QFileSystemModel( 1 )->mkdir( *hbqt_par_QModelIndex( 2 ), hbqt_par_QString( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QFileSystemModel( 1 )->mkdir( *hbqt_par_QModelIndex( 2 ), hbqt_par_QString( 3 ) ) ) ) ); } /* @@ -245,7 +245,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_MKDIR ) */ HB_FUNC( QT_QFILESYSTEMMODEL_MYCOMPUTER ) { - hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QFileSystemModel( 1 )->myComputer( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : Qt::DisplayRole ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QFileSystemModel( 1 )->myComputer( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : Qt::DisplayRole ) ) ) ) ); } /* @@ -261,7 +261,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_NAMEFILTERDISABLES ) */ HB_FUNC( QT_QFILESYSTEMMODEL_NAMEFILTERS ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QFileSystemModel( 1 )->nameFilters() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QFileSystemModel( 1 )->nameFilters() ) ) ); } /* @@ -301,7 +301,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_RMDIR ) */ HB_FUNC( QT_QFILESYSTEMMODEL_ROOTDIRECTORY ) { - hb_retptrGC( gcAllocate_QDir( new QDir( hbqt_par_QFileSystemModel( 1 )->rootDirectory() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QDir( new QDir( hbqt_par_QFileSystemModel( 1 )->rootDirectory() ) ) ); } /* @@ -357,7 +357,7 @@ HB_FUNC( QT_QFILESYSTEMMODEL_SETRESOLVESYMLINKS ) */ HB_FUNC( QT_QFILESYSTEMMODEL_SETROOTPATH ) { - hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QFileSystemModel( 1 )->setRootPath( hbqt_par_QString( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QFileSystemModel( 1 )->setRootPath( hbqt_par_QString( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QFocusFrame.cpp b/harbour/contrib/hbqt/qtgui/QFocusFrame.cpp index 9aa6834344..269ba7b101 100644 --- a/harbour/contrib/hbqt/qtgui/QFocusFrame.cpp +++ b/harbour/contrib/hbqt/qtgui/QFocusFrame.cpp @@ -121,9 +121,9 @@ QT_G_FUNC( release_QFocusFrame ) } } -void * gcAllocate_QFocusFrame( void * pObj ) +void * hbqt_gcAllocate_QFocusFrame( void * pObj ) { - QGC_POINTER_QFocusFrame * p = ( QGC_POINTER_QFocusFrame * ) hb_gcAllocate( sizeof( QGC_POINTER_QFocusFrame ), gcFuncs() ); + QGC_POINTER_QFocusFrame * p = ( QGC_POINTER_QFocusFrame * ) hb_gcAllocate( sizeof( QGC_POINTER_QFocusFrame ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QFocusFrame; @@ -138,7 +138,7 @@ HB_FUNC( QT_QFOCUSFRAME ) pObj = ( QFocusFrame* ) new QFocusFrame( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QFocusFrame( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QFocusFrame( pObj ) ); } /* * void setWidget ( QWidget * widget ) diff --git a/harbour/contrib/hbqt/qtgui/QFont.cpp b/harbour/contrib/hbqt/qtgui/QFont.cpp index cd3c7b4905..82c6ebc00b 100644 --- a/harbour/contrib/hbqt/qtgui/QFont.cpp +++ b/harbour/contrib/hbqt/qtgui/QFont.cpp @@ -108,9 +108,9 @@ QT_G_FUNC( release_QFont ) } } -void * gcAllocate_QFont( void * pObj ) +void * hbqt_gcAllocate_QFont( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QFont; @@ -151,7 +151,7 @@ HB_FUNC( QT_QFONT ) pObj = ( QFont* ) new QFont() ; } - hb_retptrGC( gcAllocate_QFont( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( pObj ) ); } /* * bool bold () const @@ -606,7 +606,7 @@ HB_FUNC( QT_QFONT_SUBSTITUTE ) */ HB_FUNC( QT_QFONT_SUBSTITUTES ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QFont( 1 )->substitutes( hbqt_par_QString( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QFont( 1 )->substitutes( hbqt_par_QString( 2 ) ) ) ) ); } /* @@ -614,7 +614,7 @@ HB_FUNC( QT_QFONT_SUBSTITUTES ) */ HB_FUNC( QT_QFONT_SUBSTITUTIONS ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QFont( 1 )->substitutions() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QFont( 1 )->substitutions() ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QFontComboBox.cpp b/harbour/contrib/hbqt/qtgui/QFontComboBox.cpp index 69040b5847..156e3badaa 100644 --- a/harbour/contrib/hbqt/qtgui/QFontComboBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QFontComboBox.cpp @@ -126,9 +126,9 @@ QT_G_FUNC( release_QFontComboBox ) } } -void * gcAllocate_QFontComboBox( void * pObj ) +void * hbqt_gcAllocate_QFontComboBox( void * pObj ) { - QGC_POINTER_QFontComboBox * p = ( QGC_POINTER_QFontComboBox * ) hb_gcAllocate( sizeof( QGC_POINTER_QFontComboBox ), gcFuncs() ); + QGC_POINTER_QFontComboBox * p = ( QGC_POINTER_QFontComboBox * ) hb_gcAllocate( sizeof( QGC_POINTER_QFontComboBox ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QFontComboBox; @@ -143,14 +143,14 @@ HB_FUNC( QT_QFONTCOMBOBOX ) pObj = ( QFontComboBox * ) new QFontComboBox( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QFontComboBox( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QFontComboBox( pObj ) ); } /* * QFont currentFont () const */ HB_FUNC( QT_QFONTCOMBOBOX_CURRENTFONT ) { - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QFontComboBox( 1 )->currentFont() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QFontComboBox( 1 )->currentFont() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QFontDatabase.cpp b/harbour/contrib/hbqt/qtgui/QFontDatabase.cpp index 7ea32630f8..f9729c8f63 100644 --- a/harbour/contrib/hbqt/qtgui/QFontDatabase.cpp +++ b/harbour/contrib/hbqt/qtgui/QFontDatabase.cpp @@ -112,9 +112,9 @@ QT_G_FUNC( release_QFontDatabase ) } } -void * gcAllocate_QFontDatabase( void * pObj ) +void * hbqt_gcAllocate_QFontDatabase( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QFontDatabase; @@ -128,7 +128,7 @@ HB_FUNC( QT_QFONTDATABASE ) pObj = new QFontDatabase() ; - hb_retptrGC( gcAllocate_QFontDatabase( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QFontDatabase( pObj ) ); } /* * bool bold ( const QString & family, const QString & style ) const @@ -143,7 +143,7 @@ HB_FUNC( QT_QFONTDATABASE_BOLD ) */ HB_FUNC( QT_QFONTDATABASE_FAMILIES ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QFontDatabase( 1 )->families( ( HB_ISNUM( 2 ) ? ( QFontDatabase::WritingSystem ) hb_parni( 2 ) : ( QFontDatabase::WritingSystem ) QFontDatabase::Any ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QFontDatabase( 1 )->families( ( HB_ISNUM( 2 ) ? ( QFontDatabase::WritingSystem ) hb_parni( 2 ) : ( QFontDatabase::WritingSystem ) QFontDatabase::Any ) ) ) ) ); } /* @@ -151,7 +151,7 @@ HB_FUNC( QT_QFONTDATABASE_FAMILIES ) */ HB_FUNC( QT_QFONTDATABASE_FONT ) { - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QFontDatabase( 1 )->font( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ), hb_parni( 4 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QFontDatabase( 1 )->font( hbqt_par_QString( 2 ), hbqt_par_QString( 3 ), hb_parni( 4 ) ) ) ) ); } /* @@ -215,7 +215,7 @@ HB_FUNC( QT_QFONTDATABASE_STYLESTRING_1 ) */ HB_FUNC( QT_QFONTDATABASE_STYLES ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QFontDatabase( 1 )->styles( hbqt_par_QString( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QFontDatabase( 1 )->styles( hbqt_par_QString( 2 ) ) ) ) ); } /* @@ -247,7 +247,7 @@ HB_FUNC( QT_QFONTDATABASE_ADDAPPLICATIONFONTFROMDATA ) */ HB_FUNC( QT_QFONTDATABASE_APPLICATIONFONTFAMILIES ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QFontDatabase( 1 )->applicationFontFamilies( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QFontDatabase( 1 )->applicationFontFamilies( hb_parni( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QFontDialog.cpp b/harbour/contrib/hbqt/qtgui/QFontDialog.cpp index 7c3a285634..b1a7495ee1 100644 --- a/harbour/contrib/hbqt/qtgui/QFontDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QFontDialog.cpp @@ -126,9 +126,9 @@ QT_G_FUNC( release_QFontDialog ) } } -void * gcAllocate_QFontDialog( void * pObj ) +void * hbqt_gcAllocate_QFontDialog( void * pObj ) { - QGC_POINTER_QFontDialog * p = ( QGC_POINTER_QFontDialog * ) hb_gcAllocate( sizeof( QGC_POINTER_QFontDialog ), gcFuncs() ); + QGC_POINTER_QFontDialog * p = ( QGC_POINTER_QFontDialog * ) hb_gcAllocate( sizeof( QGC_POINTER_QFontDialog ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QFontDialog; @@ -154,14 +154,14 @@ HB_FUNC( QT_QFONTDIALOG ) pObj = new QFontDialog( 0 ) ; } - hb_retptrGC( gcAllocate_QFontDialog( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QFontDialog( pObj ) ); } /* * QFont currentFont () const */ HB_FUNC( QT_QFONTDIALOG_CURRENTFONT ) { - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QFontDialog( 1 )->currentFont() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QFontDialog( 1 )->currentFont() ) ) ); } /* @@ -177,7 +177,7 @@ HB_FUNC( QT_QFONTDIALOG_OPTIONS ) */ HB_FUNC( QT_QFONTDIALOG_SELECTEDFONT ) { - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QFontDialog( 1 )->selectedFont() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QFontDialog( 1 )->selectedFont() ) ) ); } /* @@ -219,7 +219,7 @@ HB_FUNC( QT_QFONTDIALOG_GETFONT ) { bool iOk = 0; - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QFontDialog( 1 )->getFont( &iOk, *hbqt_par_QFont( 3 ), hbqt_par_QWidget( 4 ), hbqt_par_QString( 5 ), ( QFontDialog::FontDialogOptions ) hb_parni( 6 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QFontDialog( 1 )->getFont( &iOk, *hbqt_par_QFont( 3 ), hbqt_par_QWidget( 4 ), hbqt_par_QString( 5 ), ( QFontDialog::FontDialogOptions ) hb_parni( 6 ) ) ) ) ); hb_stornl( iOk, 2 ); } @@ -231,7 +231,7 @@ HB_FUNC( QT_QFONTDIALOG_GETFONT_1 ) { bool iOk = 0; - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QFontDialog( 1 )->getFont( &iOk, *hbqt_par_QFont( 3 ), hbqt_par_QWidget( 4 ), hbqt_par_char( 5 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QFontDialog( 1 )->getFont( &iOk, *hbqt_par_QFont( 3 ), hbqt_par_QWidget( 4 ), hbqt_par_char( 5 ) ) ) ) ); hb_stornl( iOk, 2 ); } @@ -243,7 +243,7 @@ HB_FUNC( QT_QFONTDIALOG_GETFONT_2 ) { bool iOk = 0; - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QFontDialog( 1 )->getFont( &iOk, *hbqt_par_QFont( 3 ), hbqt_par_QWidget( 4 ), hbqt_par_QString( 5 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QFontDialog( 1 )->getFont( &iOk, *hbqt_par_QFont( 3 ), hbqt_par_QWidget( 4 ), hbqt_par_QString( 5 ) ) ) ) ); hb_stornl( iOk, 2 ); } @@ -255,7 +255,7 @@ HB_FUNC( QT_QFONTDIALOG_GETFONT_3 ) { bool iOk = 0; - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QFontDialog( 1 )->getFont( &iOk, *hbqt_par_QFont( 3 ), hbqt_par_QWidget( 4 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QFontDialog( 1 )->getFont( &iOk, *hbqt_par_QFont( 3 ), hbqt_par_QWidget( 4 ) ) ) ) ); hb_stornl( iOk, 2 ); } @@ -267,7 +267,7 @@ HB_FUNC( QT_QFONTDIALOG_GETFONT_4 ) { bool iOk = 0; - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QFontDialog( 1 )->getFont( &iOk, hbqt_par_QWidget( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QFontDialog( 1 )->getFont( &iOk, hbqt_par_QWidget( 3 ) ) ) ) ); hb_stornl( iOk, 2 ); } diff --git a/harbour/contrib/hbqt/qtgui/QFontInfo.cpp b/harbour/contrib/hbqt/qtgui/QFontInfo.cpp index 97e3964237..41447b2b4a 100644 --- a/harbour/contrib/hbqt/qtgui/QFontInfo.cpp +++ b/harbour/contrib/hbqt/qtgui/QFontInfo.cpp @@ -96,9 +96,9 @@ QT_G_FUNC( release_QFontInfo ) } } -void * gcAllocate_QFontInfo( void * pObj ) +void * hbqt_gcAllocate_QFontInfo( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QFontInfo; @@ -119,7 +119,7 @@ HB_FUNC( QT_QFONTINFO ) pObj = new QFontInfo( *hbqt_par_QFont( 2 ) ) ; } - hb_retptrGC( gcAllocate_QFontInfo( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QFontInfo( pObj ) ); } /* * bool bold () const diff --git a/harbour/contrib/hbqt/qtgui/QFontMetrics.cpp b/harbour/contrib/hbqt/qtgui/QFontMetrics.cpp index 542478d3aa..8a17b91ce3 100644 --- a/harbour/contrib/hbqt/qtgui/QFontMetrics.cpp +++ b/harbour/contrib/hbqt/qtgui/QFontMetrics.cpp @@ -97,9 +97,9 @@ QT_G_FUNC( release_QFontMetrics ) } } -void * gcAllocate_QFontMetrics( void * pObj ) +void * hbqt_gcAllocate_QFontMetrics( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QFontMetrics; @@ -127,7 +127,7 @@ HB_FUNC( QT_QFONTMETRICS ) pObj = new QFontMetrics( *hbqt_par_QFont( 1 ), hbqt_par_QPaintDevice( 2 ) ) ; } - hb_retptrGC( gcAllocate_QFontMetrics( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QFontMetrics( pObj ) ); } /* * int ascent () const @@ -150,7 +150,7 @@ HB_FUNC( QT_QFONTMETRICS_AVERAGECHARWIDTH ) */ HB_FUNC( QT_QFONTMETRICS_BOUNDINGRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QFontMetrics( 1 )->boundingRect( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QFontMetrics( 1 )->boundingRect( hb_parni( 2 ) ) ) ) ); } /* @@ -158,7 +158,7 @@ HB_FUNC( QT_QFONTMETRICS_BOUNDINGRECT ) */ HB_FUNC( QT_QFONTMETRICS_BOUNDINGRECT_1 ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QFontMetrics( 1 )->boundingRect( hbqt_par_QString( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QFontMetrics( 1 )->boundingRect( hbqt_par_QString( 2 ) ) ) ) ); } /* @@ -168,7 +168,7 @@ HB_FUNC( QT_QFONTMETRICS_BOUNDINGRECT_2 ) { int iTabArray = 0; - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QFontMetrics( 1 )->boundingRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), hbqt_par_QString( 7 ), hb_parni( 8 ), &iTabArray ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QFontMetrics( 1 )->boundingRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), hbqt_par_QString( 7 ), hb_parni( 8 ), &iTabArray ) ) ) ); hb_storni( iTabArray, 9 ); } @@ -180,7 +180,7 @@ HB_FUNC( QT_QFONTMETRICS_BOUNDINGRECT_3 ) { int iTabArray = 0; - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QFontMetrics( 1 )->boundingRect( *hbqt_par_QRect( 2 ), hb_parni( 3 ), hbqt_par_QString( 4 ), hb_parni( 5 ), &iTabArray ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QFontMetrics( 1 )->boundingRect( *hbqt_par_QRect( 2 ), hb_parni( 3 ), hbqt_par_QString( 4 ), hb_parni( 5 ), &iTabArray ) ) ) ); hb_storni( iTabArray, 6 ); } @@ -296,7 +296,7 @@ HB_FUNC( QT_QFONTMETRICS_SIZE ) { int iTabArray = 0; - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QFontMetrics( 1 )->size( hb_parni( 2 ), hbqt_par_QString( 3 ), hb_parni( 4 ), &iTabArray ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QFontMetrics( 1 )->size( hb_parni( 2 ), hbqt_par_QString( 3 ), hb_parni( 4 ), &iTabArray ) ) ) ); hb_storni( iTabArray, 5 ); } @@ -314,7 +314,7 @@ HB_FUNC( QT_QFONTMETRICS_STRIKEOUTPOS ) */ HB_FUNC( QT_QFONTMETRICS_TIGHTBOUNDINGRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QFontMetrics( 1 )->tightBoundingRect( hbqt_par_QString( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QFontMetrics( 1 )->tightBoundingRect( hbqt_par_QString( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QFontMetricsF.cpp b/harbour/contrib/hbqt/qtgui/QFontMetricsF.cpp index 5c015d9c22..397464c90f 100644 --- a/harbour/contrib/hbqt/qtgui/QFontMetricsF.cpp +++ b/harbour/contrib/hbqt/qtgui/QFontMetricsF.cpp @@ -98,9 +98,9 @@ QT_G_FUNC( release_QFontMetricsF ) } } -void * gcAllocate_QFontMetricsF( void * pObj ) +void * hbqt_gcAllocate_QFontMetricsF( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QFontMetricsF; @@ -132,7 +132,7 @@ HB_FUNC( QT_QFONTMETRICSF ) pObj = ( QFontMetricsF* ) new QFontMetricsF( *hbqt_par_QFont( 1 ), hbqt_par_QPaintDevice( 2 ) ) ; } - hb_retptrGC( gcAllocate_QFontMetricsF( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QFontMetricsF( pObj ) ); } /* * qreal ascent () const @@ -155,7 +155,7 @@ HB_FUNC( QT_QFONTMETRICSF_AVERAGECHARWIDTH ) */ HB_FUNC( QT_QFONTMETRICSF_BOUNDINGRECT ) { - hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QFontMetricsF( 1 )->boundingRect( hbqt_par_QString( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QFontMetricsF( 1 )->boundingRect( hbqt_par_QString( 2 ) ) ) ) ); } /* @@ -163,7 +163,7 @@ HB_FUNC( QT_QFONTMETRICSF_BOUNDINGRECT ) */ HB_FUNC( QT_QFONTMETRICSF_BOUNDINGRECT_1 ) { - hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QFontMetricsF( 1 )->boundingRect( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QFontMetricsF( 1 )->boundingRect( hb_parni( 2 ) ) ) ) ); } /* @@ -173,7 +173,7 @@ HB_FUNC( QT_QFONTMETRICSF_BOUNDINGRECT_2 ) { int iTabArray = 0; - hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QFontMetricsF( 1 )->boundingRect( *hbqt_par_QRectF( 2 ), hb_parni( 3 ), hbqt_par_QString( 4 ), hb_parni( 5 ), &iTabArray ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QFontMetricsF( 1 )->boundingRect( *hbqt_par_QRectF( 2 ), hb_parni( 3 ), hbqt_par_QString( 4 ), hb_parni( 5 ), &iTabArray ) ) ) ); hb_storni( iTabArray, 6 ); } @@ -289,7 +289,7 @@ HB_FUNC( QT_QFONTMETRICSF_SIZE ) { int iTabArray = 0; - hb_retptrGC( gcAllocate_QSizeF( new QSizeF( hbqt_par_QFontMetricsF( 1 )->size( hb_parni( 2 ), hbqt_par_QString( 3 ), hb_parni( 4 ), &iTabArray ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSizeF( new QSizeF( hbqt_par_QFontMetricsF( 1 )->size( hb_parni( 2 ), hbqt_par_QString( 3 ), hb_parni( 4 ), &iTabArray ) ) ) ); hb_storni( iTabArray, 5 ); } @@ -307,7 +307,7 @@ HB_FUNC( QT_QFONTMETRICSF_STRIKEOUTPOS ) */ HB_FUNC( QT_QFONTMETRICSF_TIGHTBOUNDINGRECT ) { - hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QFontMetricsF( 1 )->tightBoundingRect( hbqt_par_QString( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QFontMetricsF( 1 )->tightBoundingRect( hbqt_par_QString( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QFormLayout.cpp b/harbour/contrib/hbqt/qtgui/QFormLayout.cpp index dc69062fd7..f072704b9f 100644 --- a/harbour/contrib/hbqt/qtgui/QFormLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/QFormLayout.cpp @@ -127,9 +127,9 @@ QT_G_FUNC( release_QFormLayout ) } } -void * gcAllocate_QFormLayout( void * pObj ) +void * hbqt_gcAllocate_QFormLayout( void * pObj ) { - QGC_POINTER_QFormLayout * p = ( QGC_POINTER_QFormLayout * ) hb_gcAllocate( sizeof( QGC_POINTER_QFormLayout ), gcFuncs() ); + QGC_POINTER_QFormLayout * p = ( QGC_POINTER_QFormLayout * ) hb_gcAllocate( sizeof( QGC_POINTER_QFormLayout ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QFormLayout; @@ -144,7 +144,7 @@ HB_FUNC( QT_QFORMLAYOUT ) pObj = ( QFormLayout * ) new QFormLayout( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QFormLayout( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QFormLayout( pObj ) ); } /* * void addRow ( QWidget * label, QWidget * field ) diff --git a/harbour/contrib/hbqt/qtgui/QFrame.cpp b/harbour/contrib/hbqt/qtgui/QFrame.cpp index 79957881d2..b52e9ddb49 100644 --- a/harbour/contrib/hbqt/qtgui/QFrame.cpp +++ b/harbour/contrib/hbqt/qtgui/QFrame.cpp @@ -127,9 +127,9 @@ QT_G_FUNC( release_QFrame ) } } -void * gcAllocate_QFrame( void * pObj ) +void * hbqt_gcAllocate_QFrame( void * pObj ) { - QGC_POINTER_QFrame * p = ( QGC_POINTER_QFrame * ) hb_gcAllocate( sizeof( QGC_POINTER_QFrame ), gcFuncs() ); + QGC_POINTER_QFrame * p = ( QGC_POINTER_QFrame * ) hb_gcAllocate( sizeof( QGC_POINTER_QFrame ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QFrame; @@ -144,14 +144,14 @@ HB_FUNC( QT_QFRAME ) pObj = new QFrame( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ; - hb_retptrGC( gcAllocate_QFrame( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QFrame( pObj ) ); } /* * QRect frameRect () const */ HB_FUNC( QT_QFRAME_FRAMERECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QFrame( 1 )->frameRect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QFrame( 1 )->frameRect() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QGridLayout.cpp b/harbour/contrib/hbqt/qtgui/QGridLayout.cpp index 205b99ac7d..aaaa326d62 100644 --- a/harbour/contrib/hbqt/qtgui/QGridLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/QGridLayout.cpp @@ -122,9 +122,9 @@ QT_G_FUNC( release_QGridLayout ) } } -void * gcAllocate_QGridLayout( void * pObj ) +void * hbqt_gcAllocate_QGridLayout( void * pObj ) { - QGC_POINTER_QGridLayout * p = ( QGC_POINTER_QGridLayout * ) hb_gcAllocate( sizeof( QGC_POINTER_QGridLayout ), gcFuncs() ); + QGC_POINTER_QGridLayout * p = ( QGC_POINTER_QGridLayout * ) hb_gcAllocate( sizeof( QGC_POINTER_QGridLayout ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QGridLayout; @@ -139,7 +139,7 @@ HB_FUNC( QT_QGRIDLAYOUT ) pObj = new QGridLayout( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QGridLayout( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QGridLayout( pObj ) ); } /* * void addItem ( QLayoutItem * item, int row, int column, int rowSpan = 1, int columnSpan = 1, Qt::Alignment alignment = 0 ) @@ -186,7 +186,7 @@ HB_FUNC( QT_QGRIDLAYOUT_ADDWIDGET_1 ) */ HB_FUNC( QT_QGRIDLAYOUT_CELLRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QGridLayout( 1 )->cellRect( hb_parni( 2 ), hb_parni( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QGridLayout( 1 )->cellRect( hb_parni( 2 ), hb_parni( 3 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QGroupBox.cpp b/harbour/contrib/hbqt/qtgui/QGroupBox.cpp index 8ce43d95ba..b0d5393057 100644 --- a/harbour/contrib/hbqt/qtgui/QGroupBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QGroupBox.cpp @@ -122,9 +122,9 @@ QT_G_FUNC( release_QGroupBox ) } } -void * gcAllocate_QGroupBox( void * pObj ) +void * hbqt_gcAllocate_QGroupBox( void * pObj ) { - QGC_POINTER_QGroupBox * p = ( QGC_POINTER_QGroupBox * ) hb_gcAllocate( sizeof( QGC_POINTER_QGroupBox ), gcFuncs() ); + QGC_POINTER_QGroupBox * p = ( QGC_POINTER_QGroupBox * ) hb_gcAllocate( sizeof( QGC_POINTER_QGroupBox ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QGroupBox; @@ -139,7 +139,7 @@ HB_FUNC( QT_QGROUPBOX ) pObj = ( QGroupBox * ) new QGroupBox( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QGroupBox( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QGroupBox( pObj ) ); } /* * Qt::Alignment alignment () const diff --git a/harbour/contrib/hbqt/qtgui/QHBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/QHBoxLayout.cpp index c6c34e1ce2..17eaecf42d 100644 --- a/harbour/contrib/hbqt/qtgui/QHBoxLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/QHBoxLayout.cpp @@ -122,9 +122,9 @@ QT_G_FUNC( release_QHBoxLayout ) } } -void * gcAllocate_QHBoxLayout( void * pObj ) +void * hbqt_gcAllocate_QHBoxLayout( void * pObj ) { - QGC_POINTER_QHBoxLayout * p = ( QGC_POINTER_QHBoxLayout * ) hb_gcAllocate( sizeof( QGC_POINTER_QHBoxLayout ), gcFuncs() ); + QGC_POINTER_QHBoxLayout * p = ( QGC_POINTER_QHBoxLayout * ) hb_gcAllocate( sizeof( QGC_POINTER_QHBoxLayout ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QHBoxLayout; @@ -139,7 +139,7 @@ HB_FUNC( QT_QHBOXLAYOUT ) pObj = ( QHBoxLayout * ) new QHBoxLayout( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QHBoxLayout( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QHBoxLayout( pObj ) ); } /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/QHeaderView.cpp b/harbour/contrib/hbqt/qtgui/QHeaderView.cpp index cbc776c7d2..a1a49c2fc5 100644 --- a/harbour/contrib/hbqt/qtgui/QHeaderView.cpp +++ b/harbour/contrib/hbqt/qtgui/QHeaderView.cpp @@ -125,9 +125,9 @@ QT_G_FUNC( release_QHeaderView ) } } -void * gcAllocate_QHeaderView( void * pObj ) +void * hbqt_gcAllocate_QHeaderView( void * pObj ) { - QGC_POINTER_QHeaderView * p = ( QGC_POINTER_QHeaderView * ) hb_gcAllocate( sizeof( QGC_POINTER_QHeaderView ), gcFuncs() ); + QGC_POINTER_QHeaderView * p = ( QGC_POINTER_QHeaderView * ) hb_gcAllocate( sizeof( QGC_POINTER_QHeaderView ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QHeaderView; @@ -142,7 +142,7 @@ HB_FUNC( QT_QHEADERVIEW ) pObj = new QHeaderView( ( Qt::Orientation ) hb_parni( 1 ), hbqt_par_QWidget( 2 ) ) ; - hb_retptrGC( gcAllocate_QHeaderView( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QHeaderView( pObj ) ); } /* * bool cascadingSectionResizes () const @@ -341,7 +341,7 @@ HB_FUNC( QT_QHEADERVIEW_RESTORESTATE ) */ HB_FUNC( QT_QHEADERVIEW_SAVESTATE ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QHeaderView( 1 )->saveState() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QHeaderView( 1 )->saveState() ) ) ); } /* @@ -509,7 +509,7 @@ HB_FUNC( QT_QHEADERVIEW_SHOWSECTION ) */ HB_FUNC( QT_QHEADERVIEW_SIZEHINT ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QHeaderView( 1 )->sizeHint() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QHeaderView( 1 )->sizeHint() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QHelpEvent.cpp b/harbour/contrib/hbqt/qtgui/QHelpEvent.cpp index dea513b01c..c4f1e06ddb 100644 --- a/harbour/contrib/hbqt/qtgui/QHelpEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QHelpEvent.cpp @@ -88,7 +88,7 @@ HB_FUNC( QT_QHELPEVENT ) */ HB_FUNC( QT_QHELPEVENT_GLOBALPOS ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QHelpEvent( 1 )->globalPos() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QHelpEvent( 1 )->globalPos() ) ) ); } /* @@ -112,7 +112,7 @@ HB_FUNC( QT_QHELPEVENT_GLOBALY ) */ HB_FUNC( QT_QHELPEVENT_POS ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QHelpEvent( 1 )->pos() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QHelpEvent( 1 )->pos() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QIcon.cpp b/harbour/contrib/hbqt/qtgui/QIcon.cpp index 3fa284edb9..3a0d192f1d 100644 --- a/harbour/contrib/hbqt/qtgui/QIcon.cpp +++ b/harbour/contrib/hbqt/qtgui/QIcon.cpp @@ -114,9 +114,9 @@ QT_G_FUNC( release_QIcon ) } } -void * gcAllocate_QIcon( void * pObj ) +void * hbqt_gcAllocate_QIcon( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QIcon; @@ -141,14 +141,14 @@ HB_FUNC( QT_QICON ) pObj = ( QIcon* ) new QIcon() ; } - hb_retptrGC( gcAllocate_QIcon( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( pObj ) ); } /* * QSize actualSize ( const QSize & size, Mode mode = Normal, State state = Off ) const */ HB_FUNC( QT_QICON_ACTUALSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QIcon( 1 )->actualSize( *hbqt_par_QSize( 2 ), ( HB_ISNUM( 3 ) ? ( QIcon::Mode ) hb_parni( 3 ) : ( QIcon::Mode ) QIcon::Normal ), ( HB_ISNUM( 4 ) ? ( QIcon::State ) hb_parni( 4 ) : ( QIcon::State ) QIcon::Off ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QIcon( 1 )->actualSize( *hbqt_par_QSize( 2 ), ( HB_ISNUM( 3 ) ? ( QIcon::Mode ) hb_parni( 3 ) : ( QIcon::Mode ) QIcon::Normal ), ( HB_ISNUM( 4 ) ? ( QIcon::State ) hb_parni( 4 ) : ( QIcon::State ) QIcon::Off ) ) ) ) ); } /* @@ -204,7 +204,7 @@ HB_FUNC( QT_QICON_PAINT_1 ) */ HB_FUNC( QT_QICON_PIXMAP ) { - hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QIcon( 1 )->pixmap( *hbqt_par_QSize( 2 ), ( HB_ISNUM( 3 ) ? ( QIcon::Mode ) hb_parni( 3 ) : ( QIcon::Mode ) QIcon::Normal ), ( HB_ISNUM( 4 ) ? ( QIcon::State ) hb_parni( 4 ) : ( QIcon::State ) QIcon::Off ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( hbqt_par_QIcon( 1 )->pixmap( *hbqt_par_QSize( 2 ), ( HB_ISNUM( 3 ) ? ( QIcon::Mode ) hb_parni( 3 ) : ( QIcon::Mode ) QIcon::Normal ), ( HB_ISNUM( 4 ) ? ( QIcon::State ) hb_parni( 4 ) : ( QIcon::State ) QIcon::Off ) ) ) ) ); } /* @@ -212,7 +212,7 @@ HB_FUNC( QT_QICON_PIXMAP ) */ HB_FUNC( QT_QICON_PIXMAP_1 ) { - hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QIcon( 1 )->pixmap( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISNUM( 4 ) ? ( QIcon::Mode ) hb_parni( 4 ) : ( QIcon::Mode ) QIcon::Normal ), ( HB_ISNUM( 5 ) ? ( QIcon::State ) hb_parni( 5 ) : ( QIcon::State ) QIcon::Off ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( hbqt_par_QIcon( 1 )->pixmap( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISNUM( 4 ) ? ( QIcon::Mode ) hb_parni( 4 ) : ( QIcon::Mode ) QIcon::Normal ), ( HB_ISNUM( 5 ) ? ( QIcon::State ) hb_parni( 5 ) : ( QIcon::State ) QIcon::Off ) ) ) ) ); } /* @@ -220,7 +220,7 @@ HB_FUNC( QT_QICON_PIXMAP_1 ) */ HB_FUNC( QT_QICON_PIXMAP_2 ) { - hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QIcon( 1 )->pixmap( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( QIcon::Mode ) hb_parni( 3 ) : ( QIcon::Mode ) QIcon::Normal ), ( HB_ISNUM( 4 ) ? ( QIcon::State ) hb_parni( 4 ) : ( QIcon::State ) QIcon::Off ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( hbqt_par_QIcon( 1 )->pixmap( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( QIcon::Mode ) hb_parni( 3 ) : ( QIcon::Mode ) QIcon::Normal ), ( HB_ISNUM( 4 ) ? ( QIcon::State ) hb_parni( 4 ) : ( QIcon::State ) QIcon::Off ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QImage.cpp b/harbour/contrib/hbqt/qtgui/QImage.cpp index 6ec4fe52a6..f8010e23f9 100644 --- a/harbour/contrib/hbqt/qtgui/QImage.cpp +++ b/harbour/contrib/hbqt/qtgui/QImage.cpp @@ -126,9 +126,9 @@ QT_G_FUNC( release_QImage ) } } -void * gcAllocate_QImage( void * pObj ) +void * hbqt_gcAllocate_QImage( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QImage; @@ -173,7 +173,7 @@ HB_FUNC( QT_QIMAGE ) pObj = ( QImage* ) new QImage() ; } - hb_retptrGC( gcAllocate_QImage( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QImage( pObj ) ); } /* * bool allGray () const @@ -188,7 +188,7 @@ HB_FUNC( QT_QIMAGE_ALLGRAY ) */ HB_FUNC( QT_QIMAGE_ALPHACHANNEL ) { - hb_retptrGC( gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->alphaChannel() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->alphaChannel() ) ) ); } /* @@ -236,7 +236,7 @@ HB_FUNC( QT_QIMAGE_COLOR ) */ HB_FUNC( QT_QIMAGE_CONVERTTOFORMAT ) { - hb_retptrGC( gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->convertToFormat( ( QImage::Format ) hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::ImageConversionFlags ) hb_parni( 3 ) : ( Qt::ImageConversionFlags ) Qt::AutoColor ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->convertToFormat( ( QImage::Format ) hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::ImageConversionFlags ) hb_parni( 3 ) : ( Qt::ImageConversionFlags ) Qt::AutoColor ) ) ) ) ); } /* @@ -244,7 +244,7 @@ HB_FUNC( QT_QIMAGE_CONVERTTOFORMAT ) */ HB_FUNC( QT_QIMAGE_COPY ) { - hb_retptrGC( gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->copy( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QRect( 2 ) : QRect() ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->copy( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QRect( 2 ) : QRect() ) ) ) ) ); } /* @@ -252,7 +252,7 @@ HB_FUNC( QT_QIMAGE_COPY ) */ HB_FUNC( QT_QIMAGE_COPY_1 ) { - hb_retptrGC( gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->copy( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->copy( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ) ) ) ); } /* @@ -260,7 +260,7 @@ HB_FUNC( QT_QIMAGE_COPY_1 ) */ HB_FUNC( QT_QIMAGE_CREATEALPHAMASK ) { - hb_retptrGC( gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->createAlphaMask( ( HB_ISNUM( 2 ) ? ( Qt::ImageConversionFlags ) hb_parni( 2 ) : ( Qt::ImageConversionFlags ) Qt::AutoColor ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->createAlphaMask( ( HB_ISNUM( 2 ) ? ( Qt::ImageConversionFlags ) hb_parni( 2 ) : ( Qt::ImageConversionFlags ) Qt::AutoColor ) ) ) ) ); } /* @@ -268,7 +268,7 @@ HB_FUNC( QT_QIMAGE_CREATEALPHAMASK ) */ HB_FUNC( QT_QIMAGE_CREATEHEURISTICMASK ) { - hb_retptrGC( gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->createHeuristicMask( hb_parl( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->createHeuristicMask( hb_parl( 2 ) ) ) ) ); } /* @@ -276,7 +276,7 @@ HB_FUNC( QT_QIMAGE_CREATEHEURISTICMASK ) */ HB_FUNC( QT_QIMAGE_CREATEMASKFROMCOLOR ) { - hb_retptrGC( gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->createMaskFromColor( hb_parnl( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::MaskMode ) hb_parni( 3 ) : ( Qt::MaskMode ) Qt::MaskInColor ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->createMaskFromColor( hb_parnl( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::MaskMode ) hb_parni( 3 ) : ( Qt::MaskMode ) Qt::MaskInColor ) ) ) ) ); } /* @@ -388,7 +388,7 @@ HB_FUNC( QT_QIMAGE_LOADFROMDATA ) */ HB_FUNC( QT_QIMAGE_MIRRORED ) { - hb_retptrGC( gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->mirrored( hb_parl( 2 ), hb_parl( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->mirrored( hb_parl( 2 ), hb_parl( 3 ) ) ) ) ); } /* @@ -412,7 +412,7 @@ HB_FUNC( QT_QIMAGE_NUMCOLORS ) */ HB_FUNC( QT_QIMAGE_OFFSET ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QImage( 1 )->offset() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QImage( 1 )->offset() ) ) ); } /* @@ -452,7 +452,7 @@ HB_FUNC( QT_QIMAGE_PIXELINDEX_1 ) */ HB_FUNC( QT_QIMAGE_RECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QImage( 1 )->rect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QImage( 1 )->rect() ) ) ); } /* @@ -460,7 +460,7 @@ HB_FUNC( QT_QIMAGE_RECT ) */ HB_FUNC( QT_QIMAGE_RGBSWAPPED ) { - hb_retptrGC( gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->rgbSwapped() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->rgbSwapped() ) ) ); } /* @@ -484,7 +484,7 @@ HB_FUNC( QT_QIMAGE_SAVE_1 ) */ HB_FUNC( QT_QIMAGE_SCALED ) { - hb_retptrGC( gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->scaled( *hbqt_par_QSize( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::AspectRatioMode ) hb_parni( 3 ) : ( Qt::AspectRatioMode ) Qt::IgnoreAspectRatio ), ( HB_ISNUM( 4 ) ? ( Qt::TransformationMode ) hb_parni( 4 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->scaled( *hbqt_par_QSize( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::AspectRatioMode ) hb_parni( 3 ) : ( Qt::AspectRatioMode ) Qt::IgnoreAspectRatio ), ( HB_ISNUM( 4 ) ? ( Qt::TransformationMode ) hb_parni( 4 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); } /* @@ -492,7 +492,7 @@ HB_FUNC( QT_QIMAGE_SCALED ) */ HB_FUNC( QT_QIMAGE_SCALED_1 ) { - hb_retptrGC( gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->scaled( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISNUM( 4 ) ? ( Qt::AspectRatioMode ) hb_parni( 4 ) : ( Qt::AspectRatioMode ) Qt::IgnoreAspectRatio ), ( HB_ISNUM( 5 ) ? ( Qt::TransformationMode ) hb_parni( 5 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->scaled( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISNUM( 4 ) ? ( Qt::AspectRatioMode ) hb_parni( 4 ) : ( Qt::AspectRatioMode ) Qt::IgnoreAspectRatio ), ( HB_ISNUM( 5 ) ? ( Qt::TransformationMode ) hb_parni( 5 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); } /* @@ -500,7 +500,7 @@ HB_FUNC( QT_QIMAGE_SCALED_1 ) */ HB_FUNC( QT_QIMAGE_SCALEDTOHEIGHT ) { - hb_retptrGC( gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->scaledToHeight( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->scaledToHeight( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); } /* @@ -508,7 +508,7 @@ HB_FUNC( QT_QIMAGE_SCALEDTOHEIGHT ) */ HB_FUNC( QT_QIMAGE_SCALEDTOWIDTH ) { - hb_retptrGC( gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->scaledToWidth( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->scaledToWidth( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); } /* @@ -596,7 +596,7 @@ HB_FUNC( QT_QIMAGE_SETTEXT ) */ HB_FUNC( QT_QIMAGE_SIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QImage( 1 )->size() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QImage( 1 )->size() ) ) ); } /* @@ -612,7 +612,7 @@ HB_FUNC( QT_QIMAGE_TEXT ) */ HB_FUNC( QT_QIMAGE_TEXTKEYS ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QImage( 1 )->textKeys() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QImage( 1 )->textKeys() ) ) ); } /* @@ -620,7 +620,7 @@ HB_FUNC( QT_QIMAGE_TEXTKEYS ) */ HB_FUNC( QT_QIMAGE_TRANSFORMED ) { - hb_retptrGC( gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->transformed( *hbqt_par_QMatrix( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->transformed( *hbqt_par_QMatrix( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); } /* @@ -628,7 +628,7 @@ HB_FUNC( QT_QIMAGE_TRANSFORMED ) */ HB_FUNC( QT_QIMAGE_TRANSFORMED_1 ) { - hb_retptrGC( gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->transformed( *hbqt_par_QTransform( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( hbqt_par_QImage( 1 )->transformed( *hbqt_par_QTransform( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QImageReader.cpp b/harbour/contrib/hbqt/qtgui/QImageReader.cpp index b1f071a0ae..053848230a 100644 --- a/harbour/contrib/hbqt/qtgui/QImageReader.cpp +++ b/harbour/contrib/hbqt/qtgui/QImageReader.cpp @@ -111,9 +111,9 @@ QT_G_FUNC( release_QImageReader ) } } -void * gcAllocate_QImageReader( void * pObj ) +void * hbqt_gcAllocate_QImageReader( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QImageReader; @@ -127,7 +127,7 @@ HB_FUNC( QT_QIMAGEREADER ) pObj = ( QImageReader* ) new QImageReader() ; - hb_retptrGC( gcAllocate_QImageReader( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QImageReader( pObj ) ); } /* * bool autoDetectImageFormat () const @@ -142,7 +142,7 @@ HB_FUNC( QT_QIMAGEREADER_AUTODETECTIMAGEFORMAT ) */ HB_FUNC( QT_QIMAGEREADER_BACKGROUNDCOLOR ) { - hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QImageReader( 1 )->backgroundColor() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QImageReader( 1 )->backgroundColor() ) ) ); } /* @@ -158,7 +158,7 @@ HB_FUNC( QT_QIMAGEREADER_CANREAD ) */ HB_FUNC( QT_QIMAGEREADER_CLIPRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QImageReader( 1 )->clipRect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QImageReader( 1 )->clipRect() ) ) ); } /* @@ -174,7 +174,7 @@ HB_FUNC( QT_QIMAGEREADER_CURRENTIMAGENUMBER ) */ HB_FUNC( QT_QIMAGEREADER_CURRENTIMAGERECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QImageReader( 1 )->currentImageRect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QImageReader( 1 )->currentImageRect() ) ) ); } /* @@ -214,7 +214,7 @@ HB_FUNC( QT_QIMAGEREADER_FILENAME ) */ HB_FUNC( QT_QIMAGEREADER_FORMAT ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QImageReader( 1 )->format() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QImageReader( 1 )->format() ) ) ); } /* @@ -278,7 +278,7 @@ HB_FUNC( QT_QIMAGEREADER_QUALITY ) */ HB_FUNC( QT_QIMAGEREADER_READ ) { - hb_retptrGC( gcAllocate_QImage( new QImage( hbqt_par_QImageReader( 1 )->read() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( hbqt_par_QImageReader( 1 )->read() ) ) ); } /* @@ -294,7 +294,7 @@ HB_FUNC( QT_QIMAGEREADER_READ_1 ) */ HB_FUNC( QT_QIMAGEREADER_SCALEDCLIPRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QImageReader( 1 )->scaledClipRect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QImageReader( 1 )->scaledClipRect() ) ) ); } /* @@ -302,7 +302,7 @@ HB_FUNC( QT_QIMAGEREADER_SCALEDCLIPRECT ) */ HB_FUNC( QT_QIMAGEREADER_SCALEDSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QImageReader( 1 )->scaledSize() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QImageReader( 1 )->scaledSize() ) ) ); } /* @@ -382,7 +382,7 @@ HB_FUNC( QT_QIMAGEREADER_SETSCALEDSIZE ) */ HB_FUNC( QT_QIMAGEREADER_SIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QImageReader( 1 )->size() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QImageReader( 1 )->size() ) ) ); } /* @@ -414,7 +414,7 @@ HB_FUNC( QT_QIMAGEREADER_TEXT ) */ HB_FUNC( QT_QIMAGEREADER_TEXTKEYS ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QImageReader( 1 )->textKeys() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QImageReader( 1 )->textKeys() ) ) ); } /* @@ -422,7 +422,7 @@ HB_FUNC( QT_QIMAGEREADER_TEXTKEYS ) */ HB_FUNC( QT_QIMAGEREADER_IMAGEFORMAT_1 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QImageReader( 1 )->imageFormat( hbqt_par_QString( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QImageReader( 1 )->imageFormat( hbqt_par_QString( 2 ) ) ) ) ); } /* @@ -430,7 +430,7 @@ HB_FUNC( QT_QIMAGEREADER_IMAGEFORMAT_1 ) */ HB_FUNC( QT_QIMAGEREADER_IMAGEFORMAT_2 ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QImageReader( 1 )->imageFormat( hbqt_par_QIODevice( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QImageReader( 1 )->imageFormat( hbqt_par_QIODevice( 2 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QImageWriter.cpp b/harbour/contrib/hbqt/qtgui/QImageWriter.cpp index d24d32e58e..048c23bf62 100644 --- a/harbour/contrib/hbqt/qtgui/QImageWriter.cpp +++ b/harbour/contrib/hbqt/qtgui/QImageWriter.cpp @@ -110,9 +110,9 @@ QT_G_FUNC( release_QImageWriter ) } } -void * gcAllocate_QImageWriter( void * pObj ) +void * hbqt_gcAllocate_QImageWriter( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QImageWriter; @@ -126,7 +126,7 @@ HB_FUNC( QT_QIMAGEWRITER ) pObj = ( QImageWriter* ) new QImageWriter() ; - hb_retptrGC( gcAllocate_QImageWriter( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QImageWriter( pObj ) ); } /* * bool canWrite () const @@ -181,7 +181,7 @@ HB_FUNC( QT_QIMAGEWRITER_FILENAME ) */ HB_FUNC( QT_QIMAGEWRITER_FORMAT ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QImageWriter( 1 )->format() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QImageWriter( 1 )->format() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QInputContext.cpp b/harbour/contrib/hbqt/qtgui/QInputContext.cpp index edd4e574d0..05b5aa1be0 100644 --- a/harbour/contrib/hbqt/qtgui/QInputContext.cpp +++ b/harbour/contrib/hbqt/qtgui/QInputContext.cpp @@ -113,7 +113,7 @@ HB_FUNC( QT_QINPUTCONTEXT_FILTEREVENT ) */ HB_FUNC( QT_QINPUTCONTEXT_FONT ) { - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QInputContext( 1 )->font() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QInputContext( 1 )->font() ) ) ); } /* @@ -169,7 +169,7 @@ HB_FUNC( QT_QINPUTCONTEXT_SENDEVENT ) */ HB_FUNC( QT_QINPUTCONTEXT_STANDARDFORMAT ) { - hb_retptrGC( gcAllocate_QTextFormat( new QTextFormat( hbqt_par_QInputContext( 1 )->standardFormat( ( QInputContext::StandardFormat ) hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextFormat( new QTextFormat( hbqt_par_QInputContext( 1 )->standardFormat( ( QInputContext::StandardFormat ) hb_parni( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QInputDialog.cpp b/harbour/contrib/hbqt/qtgui/QInputDialog.cpp index 3cf48ab733..d88eb1f99d 100644 --- a/harbour/contrib/hbqt/qtgui/QInputDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QInputDialog.cpp @@ -127,9 +127,9 @@ QT_G_FUNC( release_QInputDialog ) } } -void * gcAllocate_QInputDialog( void * pObj ) +void * hbqt_gcAllocate_QInputDialog( void * pObj ) { - QGC_POINTER_QInputDialog * p = ( QGC_POINTER_QInputDialog * ) hb_gcAllocate( sizeof( QGC_POINTER_QInputDialog ), gcFuncs() ); + QGC_POINTER_QInputDialog * p = ( QGC_POINTER_QInputDialog * ) hb_gcAllocate( sizeof( QGC_POINTER_QInputDialog ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QInputDialog; @@ -144,7 +144,7 @@ HB_FUNC( QT_QINPUTDIALOG ) pObj = ( QInputDialog * ) new QInputDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ; - hb_retptrGC( gcAllocate_QInputDialog( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QInputDialog( pObj ) ); } /* * QString cancelButtonText () const @@ -159,7 +159,7 @@ HB_FUNC( QT_QINPUTDIALOG_CANCELBUTTONTEXT ) */ HB_FUNC( QT_QINPUTDIALOG_COMBOBOXITEMS ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QInputDialog( 1 )->comboBoxItems() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QInputDialog( 1 )->comboBoxItems() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QInputEvent.cpp b/harbour/contrib/hbqt/qtgui/QInputEvent.cpp index 00d05e3375..80ab95421b 100644 --- a/harbour/contrib/hbqt/qtgui/QInputEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QInputEvent.cpp @@ -95,9 +95,9 @@ QT_G_FUNC( release_QInputEvent ) } } -void * gcAllocate_QInputEvent( void * pObj ) +void * hbqt_gcAllocate_QInputEvent( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QInputEvent; @@ -111,7 +111,7 @@ HB_FUNC( QT_QINPUTEVENT ) pObj = ( QInputEvent* ) new QInputEvent( ( QEvent::Type ) hb_parni( 1 ), ( Qt::KeyboardModifiers ) hb_parni( 2 ) ) ; - hb_retptrGC( gcAllocate_QInputEvent( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QInputEvent( pObj ) ); } /* * Qt::KeyboardModifiers modifiers () const diff --git a/harbour/contrib/hbqt/qtgui/QInputMethodEvent.cpp b/harbour/contrib/hbqt/qtgui/QInputMethodEvent.cpp index 6e4d83a600..3e672ad626 100644 --- a/harbour/contrib/hbqt/qtgui/QInputMethodEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QInputMethodEvent.cpp @@ -108,9 +108,9 @@ QT_G_FUNC( release_QInputMethodEvent ) } } -void * gcAllocate_QInputMethodEvent( void * pObj ) +void * hbqt_gcAllocate_QInputMethodEvent( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QInputMethodEvent; @@ -124,7 +124,7 @@ HB_FUNC( QT_QINPUTMETHODEVENT ) pObj = new QInputMethodEvent() ; - hb_retptrGC( gcAllocate_QInputMethodEvent( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QInputMethodEvent( pObj ) ); } /* * const QString & commitString () const diff --git a/harbour/contrib/hbqt/qtgui/QItemSelection.cpp b/harbour/contrib/hbqt/qtgui/QItemSelection.cpp index ef9b02f890..5a4516b2a3 100644 --- a/harbour/contrib/hbqt/qtgui/QItemSelection.cpp +++ b/harbour/contrib/hbqt/qtgui/QItemSelection.cpp @@ -94,9 +94,9 @@ QT_G_FUNC( release_QItemSelection ) } } -void * gcAllocate_QItemSelection( void * pObj ) +void * hbqt_gcAllocate_QItemSelection( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QItemSelection; @@ -110,7 +110,7 @@ HB_FUNC( QT_QITEMSELECTION ) pObj = new QItemSelection() ; - hb_retptrGC( gcAllocate_QItemSelection( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QItemSelection( pObj ) ); } /* * bool contains ( const QModelIndex & index ) const diff --git a/harbour/contrib/hbqt/qtgui/QItemSelectionModel.cpp b/harbour/contrib/hbqt/qtgui/QItemSelectionModel.cpp index d7c7879fbf..e664485bee 100644 --- a/harbour/contrib/hbqt/qtgui/QItemSelectionModel.cpp +++ b/harbour/contrib/hbqt/qtgui/QItemSelectionModel.cpp @@ -126,9 +126,9 @@ QT_G_FUNC( release_QItemSelectionModel ) } } -void * gcAllocate_QItemSelectionModel( void * pObj ) +void * hbqt_gcAllocate_QItemSelectionModel( void * pObj ) { - QGC_POINTER_QItemSelectionModel * p = ( QGC_POINTER_QItemSelectionModel * ) hb_gcAllocate( sizeof( QGC_POINTER_QItemSelectionModel ), gcFuncs() ); + QGC_POINTER_QItemSelectionModel * p = ( QGC_POINTER_QItemSelectionModel * ) hb_gcAllocate( sizeof( QGC_POINTER_QItemSelectionModel ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QItemSelectionModel; @@ -146,7 +146,7 @@ HB_FUNC( QT_QITEMSELECTIONMODEL ) pObj = new QItemSelectionModel( hbqt_par_QAbstractItemModel( 1 ) ) ; } - hb_retptrGC( gcAllocate_QItemSelectionModel( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QItemSelectionModel( pObj ) ); } /* * bool columnIntersectsSelection ( int column, const QModelIndex & parent ) const @@ -161,7 +161,7 @@ HB_FUNC( QT_QITEMSELECTIONMODEL_COLUMNINTERSECTSSELECTION ) */ HB_FUNC( QT_QITEMSELECTIONMODEL_CURRENTINDEX ) { - hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QItemSelectionModel( 1 )->currentIndex() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QItemSelectionModel( 1 )->currentIndex() ) ) ); } /* @@ -217,7 +217,7 @@ HB_FUNC( QT_QITEMSELECTIONMODEL_ROWINTERSECTSSELECTION ) */ HB_FUNC( QT_QITEMSELECTIONMODEL_SELECTION ) { - hb_retptrGC( gcAllocate_QItemSelection( new QItemSelection( hbqt_par_QItemSelectionModel( 1 )->selection() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QItemSelection( new QItemSelection( hbqt_par_QItemSelectionModel( 1 )->selection() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QKeySequence.cpp b/harbour/contrib/hbqt/qtgui/QKeySequence.cpp index b03c750c10..329c911f02 100644 --- a/harbour/contrib/hbqt/qtgui/QKeySequence.cpp +++ b/harbour/contrib/hbqt/qtgui/QKeySequence.cpp @@ -114,9 +114,9 @@ QT_G_FUNC( release_QKeySequence ) } } -void * gcAllocate_QKeySequence( void * pObj ) +void * hbqt_gcAllocate_QKeySequence( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QKeySequence; @@ -137,7 +137,7 @@ HB_FUNC( QT_QKEYSEQUENCE ) else pObj = ( QKeySequence * ) new QKeySequence() ; - hb_retptrGC( gcAllocate_QKeySequence( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QKeySequence( pObj ) ); } /* * uint count () const @@ -176,7 +176,7 @@ HB_FUNC( QT_QKEYSEQUENCE_TOSTRING ) */ HB_FUNC( QT_QKEYSEQUENCE_FROMSTRING ) { - hb_retptrGC( gcAllocate_QKeySequence( new QKeySequence( hbqt_par_QKeySequence( 1 )->fromString( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( QKeySequence::SequenceFormat ) hb_parni( 3 ) : ( QKeySequence::SequenceFormat ) QKeySequence::PortableText ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QKeySequence( new QKeySequence( hbqt_par_QKeySequence( 1 )->fromString( hbqt_par_QString( 2 ), ( HB_ISNUM( 3 ) ? ( QKeySequence::SequenceFormat ) hb_parni( 3 ) : ( QKeySequence::SequenceFormat ) QKeySequence::PortableText ) ) ) ) ); } /* @@ -184,7 +184,7 @@ HB_FUNC( QT_QKEYSEQUENCE_FROMSTRING ) */ HB_FUNC( QT_QKEYSEQUENCE_MNEMONIC ) { - hb_retptrGC( gcAllocate_QKeySequence( new QKeySequence( hbqt_par_QKeySequence( 1 )->mnemonic( hbqt_par_QString( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QKeySequence( new QKeySequence( hbqt_par_QKeySequence( 1 )->mnemonic( hbqt_par_QString( 2 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QLCDNumber.cpp b/harbour/contrib/hbqt/qtgui/QLCDNumber.cpp index 098739bf16..664bd9b7e1 100644 --- a/harbour/contrib/hbqt/qtgui/QLCDNumber.cpp +++ b/harbour/contrib/hbqt/qtgui/QLCDNumber.cpp @@ -127,9 +127,9 @@ QT_G_FUNC( release_QLCDNumber ) } } -void * gcAllocate_QLCDNumber( void * pObj ) +void * hbqt_gcAllocate_QLCDNumber( void * pObj ) { - QGC_POINTER_QLCDNumber * p = ( QGC_POINTER_QLCDNumber * ) hb_gcAllocate( sizeof( QGC_POINTER_QLCDNumber ), gcFuncs() ); + QGC_POINTER_QLCDNumber * p = ( QGC_POINTER_QLCDNumber * ) hb_gcAllocate( sizeof( QGC_POINTER_QLCDNumber ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QLCDNumber; @@ -144,7 +144,7 @@ HB_FUNC( QT_QLCDNUMBER ) pObj = ( QLCDNumber * ) new QLCDNumber( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QLCDNumber( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QLCDNumber( pObj ) ); } /* * bool checkOverflow ( double num ) const diff --git a/harbour/contrib/hbqt/qtgui/QLabel.cpp b/harbour/contrib/hbqt/qtgui/QLabel.cpp index 13b23be235..ed5fbe9e53 100644 --- a/harbour/contrib/hbqt/qtgui/QLabel.cpp +++ b/harbour/contrib/hbqt/qtgui/QLabel.cpp @@ -122,9 +122,9 @@ QT_G_FUNC( release_QLabel ) } } -void * gcAllocate_QLabel( void * pObj ) +void * hbqt_gcAllocate_QLabel( void * pObj ) { - QGC_POINTER_QLabel * p = ( QGC_POINTER_QLabel * ) hb_gcAllocate( sizeof( QGC_POINTER_QLabel ), gcFuncs() ); + QGC_POINTER_QLabel * p = ( QGC_POINTER_QLabel * ) hb_gcAllocate( sizeof( QGC_POINTER_QLabel ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QLabel; @@ -139,7 +139,7 @@ HB_FUNC( QT_QLABEL ) pObj = ( QLabel* ) new QLabel( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QLabel( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QLabel( pObj ) ); } /* * Qt::Alignment alignment () const diff --git a/harbour/contrib/hbqt/qtgui/QLayout.cpp b/harbour/contrib/hbqt/qtgui/QLayout.cpp index 2161e3027e..b050b98323 100644 --- a/harbour/contrib/hbqt/qtgui/QLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/QLayout.cpp @@ -117,7 +117,7 @@ HB_FUNC( QT_QLAYOUT_ADDWIDGET ) */ HB_FUNC( QT_QLAYOUT_CONTENTSRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QLayout( 1 )->contentsRect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QLayout( 1 )->contentsRect() ) ) ); } /* @@ -183,7 +183,7 @@ HB_FUNC( QT_QLAYOUT_ITEMAT ) */ HB_FUNC( QT_QLAYOUT_MAXIMUMSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QLayout( 1 )->maximumSize() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QLayout( 1 )->maximumSize() ) ) ); } /* @@ -199,7 +199,7 @@ HB_FUNC( QT_QLAYOUT_MENUBAR ) */ HB_FUNC( QT_QLAYOUT_MINIMUMSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QLayout( 1 )->minimumSize() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QLayout( 1 )->minimumSize() ) ) ); } /* @@ -327,7 +327,7 @@ HB_FUNC( QT_QLAYOUT_UPDATE ) */ HB_FUNC( QT_QLAYOUT_CLOSESTACCEPTABLESIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QLayout( 1 )->closestAcceptableSize( hbqt_par_QWidget( 2 ), *hbqt_par_QSize( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QLayout( 1 )->closestAcceptableSize( hbqt_par_QWidget( 2 ), *hbqt_par_QSize( 3 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QLayoutItem.cpp b/harbour/contrib/hbqt/qtgui/QLayoutItem.cpp index 21a3c8c335..73cbb665c6 100644 --- a/harbour/contrib/hbqt/qtgui/QLayoutItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QLayoutItem.cpp @@ -113,7 +113,7 @@ HB_FUNC( QT_QLAYOUTITEM_EXPANDINGDIRECTIONS ) */ HB_FUNC( QT_QLAYOUTITEM_GEOMETRY ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QLayoutItem( 1 )->geometry() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QLayoutItem( 1 )->geometry() ) ) ); } /* @@ -161,7 +161,7 @@ HB_FUNC( QT_QLAYOUTITEM_LAYOUT ) */ HB_FUNC( QT_QLAYOUTITEM_MAXIMUMSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QLayoutItem( 1 )->maximumSize() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QLayoutItem( 1 )->maximumSize() ) ) ); } /* @@ -177,7 +177,7 @@ HB_FUNC( QT_QLAYOUTITEM_MINIMUMHEIGHTFORWIDTH ) */ HB_FUNC( QT_QLAYOUTITEM_MINIMUMSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QLayoutItem( 1 )->minimumSize() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QLayoutItem( 1 )->minimumSize() ) ) ); } /* @@ -201,7 +201,7 @@ HB_FUNC( QT_QLAYOUTITEM_SETGEOMETRY ) */ HB_FUNC( QT_QLAYOUTITEM_SIZEHINT ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QLayoutItem( 1 )->sizeHint() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QLayoutItem( 1 )->sizeHint() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QLineEdit.cpp b/harbour/contrib/hbqt/qtgui/QLineEdit.cpp index 8aacade182..2f77d6af5a 100644 --- a/harbour/contrib/hbqt/qtgui/QLineEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/QLineEdit.cpp @@ -126,9 +126,9 @@ QT_G_FUNC( release_QLineEdit ) } } -void * gcAllocate_QLineEdit( void * pObj ) +void * hbqt_gcAllocate_QLineEdit( void * pObj ) { - QGC_POINTER_QLineEdit * p = ( QGC_POINTER_QLineEdit * ) hb_gcAllocate( sizeof( QGC_POINTER_QLineEdit ), gcFuncs() ); + QGC_POINTER_QLineEdit * p = ( QGC_POINTER_QLineEdit * ) hb_gcAllocate( sizeof( QGC_POINTER_QLineEdit ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QLineEdit; @@ -143,7 +143,7 @@ HB_FUNC( QT_QLINEEDIT ) pObj = ( QLineEdit* ) new QLineEdit( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QLineEdit( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QLineEdit( pObj ) ); } /* * Qt::Alignment alignment () const @@ -384,7 +384,7 @@ HB_FUNC( QT_QLINEEDIT_MAXLENGTH ) */ HB_FUNC( QT_QLINEEDIT_MINIMUMSIZEHINT ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QLineEdit( 1 )->minimumSizeHint() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QLineEdit( 1 )->minimumSizeHint() ) ) ); } /* @@ -512,7 +512,7 @@ HB_FUNC( QT_QLINEEDIT_SETVALIDATOR ) */ HB_FUNC( QT_QLINEEDIT_SIZEHINT ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QLineEdit( 1 )->sizeHint() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QLineEdit( 1 )->sizeHint() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QLinearGradient.cpp b/harbour/contrib/hbqt/qtgui/QLinearGradient.cpp index 7bb94ab4d2..cd661e1a23 100644 --- a/harbour/contrib/hbqt/qtgui/QLinearGradient.cpp +++ b/harbour/contrib/hbqt/qtgui/QLinearGradient.cpp @@ -102,9 +102,9 @@ QT_G_FUNC( release_QLinearGradient ) } } -void * gcAllocate_QLinearGradient( void * pObj ) +void * hbqt_gcAllocate_QLinearGradient( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QLinearGradient; @@ -133,14 +133,14 @@ HB_FUNC( QT_QLINEARGRADIENT ) pObj = ( QLinearGradient* ) new QLinearGradient() ; } - hb_retptrGC( gcAllocate_QLinearGradient( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QLinearGradient( pObj ) ); } /* * QPointF finalStop () const */ HB_FUNC( QT_QLINEARGRADIENT_FINALSTOP ) { - hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QLinearGradient( 1 )->finalStop() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QLinearGradient( 1 )->finalStop() ) ) ); } /* @@ -180,7 +180,7 @@ HB_FUNC( QT_QLINEARGRADIENT_SETSTART_1 ) */ HB_FUNC( QT_QLINEARGRADIENT_START ) { - hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QLinearGradient( 1 )->start() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QLinearGradient( 1 )->start() ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QListView.cpp b/harbour/contrib/hbqt/qtgui/QListView.cpp index febdeea0f8..d913473806 100644 --- a/harbour/contrib/hbqt/qtgui/QListView.cpp +++ b/harbour/contrib/hbqt/qtgui/QListView.cpp @@ -129,9 +129,9 @@ QT_G_FUNC( release_QListView ) } } -void * gcAllocate_QListView( void * pObj ) +void * hbqt_gcAllocate_QListView( void * pObj ) { - QGC_POINTER_QListView * p = ( QGC_POINTER_QListView * ) hb_gcAllocate( sizeof( QGC_POINTER_QListView ), gcFuncs() ); + QGC_POINTER_QListView * p = ( QGC_POINTER_QListView * ) hb_gcAllocate( sizeof( QGC_POINTER_QListView ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QListView; @@ -146,7 +146,7 @@ HB_FUNC( QT_QLISTVIEW ) pObj = ( QListView * ) new QListView( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QListView( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QListView( pObj ) ); } /* * int batchSize () const @@ -177,7 +177,7 @@ HB_FUNC( QT_QLISTVIEW_FLOW ) */ HB_FUNC( QT_QLISTVIEW_GRIDSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QListView( 1 )->gridSize() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QListView( 1 )->gridSize() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QListWidget.cpp b/harbour/contrib/hbqt/qtgui/QListWidget.cpp index 864a070d34..22e8853b99 100644 --- a/harbour/contrib/hbqt/qtgui/QListWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QListWidget.cpp @@ -131,9 +131,9 @@ QT_G_FUNC( release_QListWidget ) } } -void * gcAllocate_QListWidget( void * pObj ) +void * hbqt_gcAllocate_QListWidget( void * pObj ) { - QGC_POINTER_QListWidget * p = ( QGC_POINTER_QListWidget * ) hb_gcAllocate( sizeof( QGC_POINTER_QListWidget ), gcFuncs() ); + QGC_POINTER_QListWidget * p = ( QGC_POINTER_QListWidget * ) hb_gcAllocate( sizeof( QGC_POINTER_QListWidget ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QListWidget; @@ -148,7 +148,7 @@ HB_FUNC( QT_QLISTWIDGET ) pObj = new QListWidget( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QListWidget( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QListWidget( pObj ) ); } /* * void addItem ( const QString & label ) @@ -371,7 +371,7 @@ HB_FUNC( QT_QLISTWIDGET_TAKEITEM ) */ HB_FUNC( QT_QLISTWIDGET_VISUALITEMRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QListWidget( 1 )->visualItemRect( hbqt_par_QListWidgetItem( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QListWidget( 1 )->visualItemRect( hbqt_par_QListWidgetItem( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QListWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/QListWidgetItem.cpp index df8c71e889..816692b6a3 100644 --- a/harbour/contrib/hbqt/qtgui/QListWidgetItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QListWidgetItem.cpp @@ -102,9 +102,9 @@ QT_G_FUNC( release_QListWidgetItem ) } } -void * gcAllocate_QListWidgetItem( void * pObj ) +void * hbqt_gcAllocate_QListWidgetItem( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QListWidgetItem; @@ -118,14 +118,14 @@ HB_FUNC( QT_QLISTWIDGETITEM ) pObj = new QListWidgetItem( hbqt_par_QListWidget( 1 ), hb_parni( 2 ) ) ; - hb_retptrGC( gcAllocate_QListWidgetItem( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QListWidgetItem( pObj ) ); } /* * QBrush background () const */ HB_FUNC( QT_QLISTWIDGETITEM_BACKGROUND ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QListWidgetItem( 1 )->background() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QListWidgetItem( 1 )->background() ) ) ); } /* @@ -149,7 +149,7 @@ HB_FUNC( QT_QLISTWIDGETITEM_CLONE ) */ HB_FUNC( QT_QLISTWIDGETITEM_DATA ) { - hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QListWidgetItem( 1 )->data( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QListWidgetItem( 1 )->data( hb_parni( 2 ) ) ) ) ); } /* @@ -165,7 +165,7 @@ HB_FUNC( QT_QLISTWIDGETITEM_FLAGS ) */ HB_FUNC( QT_QLISTWIDGETITEM_FONT ) { - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QListWidgetItem( 1 )->font() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QListWidgetItem( 1 )->font() ) ) ); } /* @@ -173,7 +173,7 @@ HB_FUNC( QT_QLISTWIDGETITEM_FONT ) */ HB_FUNC( QT_QLISTWIDGETITEM_FOREGROUND ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QListWidgetItem( 1 )->foreground() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QListWidgetItem( 1 )->foreground() ) ) ); } /* @@ -181,7 +181,7 @@ HB_FUNC( QT_QLISTWIDGETITEM_FOREGROUND ) */ HB_FUNC( QT_QLISTWIDGETITEM_ICON ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QListWidgetItem( 1 )->icon() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QListWidgetItem( 1 )->icon() ) ) ); } /* @@ -341,7 +341,7 @@ HB_FUNC( QT_QLISTWIDGETITEM_SETWHATSTHIS ) */ HB_FUNC( QT_QLISTWIDGETITEM_SIZEHINT ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QListWidgetItem( 1 )->sizeHint() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QListWidgetItem( 1 )->sizeHint() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QMainWindow.cpp b/harbour/contrib/hbqt/qtgui/QMainWindow.cpp index eda983f15c..3aaf840050 100644 --- a/harbour/contrib/hbqt/qtgui/QMainWindow.cpp +++ b/harbour/contrib/hbqt/qtgui/QMainWindow.cpp @@ -135,9 +135,9 @@ QT_G_FUNC( release_QMainWindow ) } } -void * gcAllocate_QMainWindow( void * pObj ) +void * hbqt_gcAllocate_QMainWindow( void * pObj ) { - QGC_POINTER_QMainWindow * p = ( QGC_POINTER_QMainWindow * ) hb_gcAllocate( sizeof( QGC_POINTER_QMainWindow ), gcFuncs() ); + QGC_POINTER_QMainWindow * p = ( QGC_POINTER_QMainWindow * ) hb_gcAllocate( sizeof( QGC_POINTER_QMainWindow ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QMainWindow; @@ -152,7 +152,7 @@ HB_FUNC( QT_QMAINWINDOW ) pObj = ( QMainWindow* ) new QMainWindow( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ; - hb_retptrGC( gcAllocate_QMainWindow( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QMainWindow( pObj ) ); } /* * void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget ) @@ -255,7 +255,7 @@ HB_FUNC( QT_QMAINWINDOW_DOCUMENTMODE ) */ HB_FUNC( QT_QMAINWINDOW_ICONSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QMainWindow( 1 )->iconSize() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QMainWindow( 1 )->iconSize() ) ) ); } /* @@ -351,7 +351,7 @@ HB_FUNC( QT_QMAINWINDOW_RESTORESTATE ) */ HB_FUNC( QT_QMAINWINDOW_SAVESTATE ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QMainWindow( 1 )->saveState( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QMainWindow( 1 )->saveState( hb_parni( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QMatrix.cpp b/harbour/contrib/hbqt/qtgui/QMatrix.cpp index 75c3885dc5..af926bb95c 100644 --- a/harbour/contrib/hbqt/qtgui/QMatrix.cpp +++ b/harbour/contrib/hbqt/qtgui/QMatrix.cpp @@ -96,9 +96,9 @@ QT_G_FUNC( release_QMatrix ) } } -void * gcAllocate_QMatrix( void * pObj ) +void * hbqt_gcAllocate_QMatrix( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QMatrix; @@ -112,7 +112,7 @@ HB_FUNC( QT_QMATRIX ) pObj = new QMatrix() ; - hb_retptrGC( gcAllocate_QMatrix( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QMatrix( pObj ) ); } /* * qreal m11 () const @@ -177,7 +177,7 @@ HB_FUNC( QT_QMATRIX_INVERTED ) { bool iInvertible = 0; - hb_retptrGC( gcAllocate_QMatrix( new QMatrix( hbqt_par_QMatrix( 1 )->inverted( &iInvertible ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QMatrix( new QMatrix( hbqt_par_QMatrix( 1 )->inverted( &iInvertible ) ) ) ); hb_stornl( iInvertible, 2 ); } @@ -231,7 +231,7 @@ HB_FUNC( QT_QMATRIX_MAP_1 ) */ HB_FUNC( QT_QMATRIX_MAP_2 ) { - hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QMatrix( 1 )->map( *hbqt_par_QPointF( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QMatrix( 1 )->map( *hbqt_par_QPointF( 2 ) ) ) ) ); } /* @@ -239,7 +239,7 @@ HB_FUNC( QT_QMATRIX_MAP_2 ) */ HB_FUNC( QT_QMATRIX_MAP_3 ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QMatrix( 1 )->map( *hbqt_par_QPoint( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QMatrix( 1 )->map( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* @@ -247,7 +247,7 @@ HB_FUNC( QT_QMATRIX_MAP_3 ) */ HB_FUNC( QT_QMATRIX_MAP_4 ) { - hb_retptrGC( gcAllocate_QLineF( new QLineF( hbqt_par_QMatrix( 1 )->map( *hbqt_par_QLineF( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QLineF( new QLineF( hbqt_par_QMatrix( 1 )->map( *hbqt_par_QLineF( 2 ) ) ) ) ); } /* @@ -255,7 +255,7 @@ HB_FUNC( QT_QMATRIX_MAP_4 ) */ HB_FUNC( QT_QMATRIX_MAP_5 ) { - hb_retptrGC( gcAllocate_QLine( new QLine( hbqt_par_QMatrix( 1 )->map( *hbqt_par_QLine( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QLine( new QLine( hbqt_par_QMatrix( 1 )->map( *hbqt_par_QLine( 2 ) ) ) ) ); } /* @@ -263,7 +263,7 @@ HB_FUNC( QT_QMATRIX_MAP_5 ) */ HB_FUNC( QT_QMATRIX_MAP_6 ) { - hb_retptrGC( gcAllocate_QPolygonF( new QPolygonF( hbqt_par_QMatrix( 1 )->map( *hbqt_par_QPolygonF( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPolygonF( new QPolygonF( hbqt_par_QMatrix( 1 )->map( *hbqt_par_QPolygonF( 2 ) ) ) ) ); } /* @@ -271,7 +271,7 @@ HB_FUNC( QT_QMATRIX_MAP_6 ) */ HB_FUNC( QT_QMATRIX_MAP_7 ) { - hb_retptrGC( gcAllocate_QPolygon( new QPolygon( hbqt_par_QMatrix( 1 )->map( *hbqt_par_QPolygon( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPolygon( new QPolygon( hbqt_par_QMatrix( 1 )->map( *hbqt_par_QPolygon( 2 ) ) ) ) ); } /* @@ -279,7 +279,7 @@ HB_FUNC( QT_QMATRIX_MAP_7 ) */ HB_FUNC( QT_QMATRIX_MAP_8 ) { - hb_retptrGC( gcAllocate_QRegion( new QRegion( hbqt_par_QMatrix( 1 )->map( *hbqt_par_QRegion( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRegion( new QRegion( hbqt_par_QMatrix( 1 )->map( *hbqt_par_QRegion( 2 ) ) ) ) ); } /* @@ -287,7 +287,7 @@ HB_FUNC( QT_QMATRIX_MAP_8 ) */ HB_FUNC( QT_QMATRIX_MAP_9 ) { - hb_retptrGC( gcAllocate_QPainterPath( new QPainterPath( hbqt_par_QMatrix( 1 )->map( *hbqt_par_QPainterPath( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPainterPath( new QPainterPath( hbqt_par_QMatrix( 1 )->map( *hbqt_par_QPainterPath( 2 ) ) ) ) ); } /* @@ -295,7 +295,7 @@ HB_FUNC( QT_QMATRIX_MAP_9 ) */ HB_FUNC( QT_QMATRIX_MAPRECT ) { - hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QMatrix( 1 )->mapRect( *hbqt_par_QRectF( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QMatrix( 1 )->mapRect( *hbqt_par_QRectF( 2 ) ) ) ) ); } /* @@ -303,7 +303,7 @@ HB_FUNC( QT_QMATRIX_MAPRECT ) */ HB_FUNC( QT_QMATRIX_MAPRECT_1 ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QMatrix( 1 )->mapRect( *hbqt_par_QRect( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QMatrix( 1 )->mapRect( *hbqt_par_QRect( 2 ) ) ) ) ); } /* @@ -311,7 +311,7 @@ HB_FUNC( QT_QMATRIX_MAPRECT_1 ) */ HB_FUNC( QT_QMATRIX_MAPTOPOLYGON ) { - hb_retptrGC( gcAllocate_QPolygon( new QPolygon( hbqt_par_QMatrix( 1 )->mapToPolygon( *hbqt_par_QRect( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPolygon( new QPolygon( hbqt_par_QMatrix( 1 )->mapToPolygon( *hbqt_par_QRect( 2 ) ) ) ) ); } /* @@ -327,7 +327,7 @@ HB_FUNC( QT_QMATRIX_RESET ) */ HB_FUNC( QT_QMATRIX_ROTATE ) { - hb_retptrGC( gcAllocate_QMatrix( new QMatrix( hbqt_par_QMatrix( 1 )->rotate( hb_parnd( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QMatrix( new QMatrix( hbqt_par_QMatrix( 1 )->rotate( hb_parnd( 2 ) ) ) ) ); } /* @@ -335,7 +335,7 @@ HB_FUNC( QT_QMATRIX_ROTATE ) */ HB_FUNC( QT_QMATRIX_SCALE ) { - hb_retptrGC( gcAllocate_QMatrix( new QMatrix( hbqt_par_QMatrix( 1 )->scale( hb_parnd( 2 ), hb_parnd( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QMatrix( new QMatrix( hbqt_par_QMatrix( 1 )->scale( hb_parnd( 2 ), hb_parnd( 3 ) ) ) ) ); } /* @@ -351,7 +351,7 @@ HB_FUNC( QT_QMATRIX_SETMATRIX ) */ HB_FUNC( QT_QMATRIX_SHEAR ) { - hb_retptrGC( gcAllocate_QMatrix( new QMatrix( hbqt_par_QMatrix( 1 )->shear( hb_parnd( 2 ), hb_parnd( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QMatrix( new QMatrix( hbqt_par_QMatrix( 1 )->shear( hb_parnd( 2 ), hb_parnd( 3 ) ) ) ) ); } /* @@ -359,7 +359,7 @@ HB_FUNC( QT_QMATRIX_SHEAR ) */ HB_FUNC( QT_QMATRIX_TRANSLATE ) { - hb_retptrGC( gcAllocate_QMatrix( new QMatrix( hbqt_par_QMatrix( 1 )->translate( hb_parnd( 2 ), hb_parnd( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QMatrix( new QMatrix( hbqt_par_QMatrix( 1 )->translate( hb_parnd( 2 ), hb_parnd( 3 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QMenu.cpp b/harbour/contrib/hbqt/qtgui/QMenu.cpp index 098110b016..1d7e81d11a 100644 --- a/harbour/contrib/hbqt/qtgui/QMenu.cpp +++ b/harbour/contrib/hbqt/qtgui/QMenu.cpp @@ -132,9 +132,9 @@ QT_G_FUNC( release_QMenu ) } } -void * gcAllocate_QMenu( void * pObj ) +void * hbqt_gcAllocate_QMenu( void * pObj ) { - QGC_POINTER_QMenu * p = ( QGC_POINTER_QMenu * ) hb_gcAllocate( sizeof( QGC_POINTER_QMenu ), gcFuncs() ); + QGC_POINTER_QMenu * p = ( QGC_POINTER_QMenu * ) hb_gcAllocate( sizeof( QGC_POINTER_QMenu ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QMenu; @@ -156,7 +156,7 @@ HB_FUNC( QT_QMENU ) pObj = ( QMenu* ) new QMenu( hbqt_par_QWidget( 1 ) ) ; } - hb_retptrGC( gcAllocate_QMenu( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QMenu( pObj ) ); } /* * QAction * actionAt ( const QPoint & pt ) const @@ -171,7 +171,7 @@ HB_FUNC( QT_QMENU_ACTIONAT ) */ HB_FUNC( QT_QMENU_ACTIONGEOMETRY ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QMenu( 1 )->actionGeometry( hbqt_par_QAction( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QMenu( 1 )->actionGeometry( hbqt_par_QAction( 2 ) ) ) ) ); } /* @@ -299,7 +299,7 @@ HB_FUNC( QT_QMENU_HIDETEAROFFMENU ) */ HB_FUNC( QT_QMENU_ICON ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QMenu( 1 )->icon() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QMenu( 1 )->icon() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QMenuBar.cpp b/harbour/contrib/hbqt/qtgui/QMenuBar.cpp index 25a9a9063d..0fcf3c7678 100644 --- a/harbour/contrib/hbqt/qtgui/QMenuBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QMenuBar.cpp @@ -135,9 +135,9 @@ QT_G_FUNC( release_QMenuBar ) } } -void * gcAllocate_QMenuBar( void * pObj ) +void * hbqt_gcAllocate_QMenuBar( void * pObj ) { - QGC_POINTER_QMenuBar * p = ( QGC_POINTER_QMenuBar * ) hb_gcAllocate( sizeof( QGC_POINTER_QMenuBar ), gcFuncs() ); + QGC_POINTER_QMenuBar * p = ( QGC_POINTER_QMenuBar * ) hb_gcAllocate( sizeof( QGC_POINTER_QMenuBar ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QMenuBar; @@ -152,7 +152,7 @@ HB_FUNC( QT_QMENUBAR ) pObj = ( QMenuBar* ) new QMenuBar( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QMenuBar( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QMenuBar( pObj ) ); } /* * QAction * activeAction () const diff --git a/harbour/contrib/hbqt/qtgui/QMessageBox.cpp b/harbour/contrib/hbqt/qtgui/QMessageBox.cpp index 226250ee83..00c7c6a577 100644 --- a/harbour/contrib/hbqt/qtgui/QMessageBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QMessageBox.cpp @@ -138,9 +138,9 @@ QT_G_FUNC( release_QMessageBox ) } } -void * gcAllocate_QMessageBox( void * pObj ) +void * hbqt_gcAllocate_QMessageBox( void * pObj ) { - QGC_POINTER_QMessageBox * p = ( QGC_POINTER_QMessageBox * ) hb_gcAllocate( sizeof( QGC_POINTER_QMessageBox ), gcFuncs() ); + QGC_POINTER_QMessageBox * p = ( QGC_POINTER_QMessageBox * ) hb_gcAllocate( sizeof( QGC_POINTER_QMessageBox ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QMessageBox; @@ -155,7 +155,7 @@ HB_FUNC( QT_QMESSAGEBOX ) pObj = ( QMessageBox* ) new QMessageBox() ; - hb_retptrGC( gcAllocate_QMessageBox( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QMessageBox( pObj ) ); } /* * void addButton ( QAbstractButton * button, ButtonRole role ) @@ -242,7 +242,7 @@ HB_FUNC( QT_QMESSAGEBOX_ICON ) */ HB_FUNC( QT_QMESSAGEBOX_ICONPIXMAP ) { - hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QMessageBox( 1 )->iconPixmap() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( hbqt_par_QMessageBox( 1 )->iconPixmap() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QMouseEvent.cpp b/harbour/contrib/hbqt/qtgui/QMouseEvent.cpp index ab2c699655..3dc859260c 100644 --- a/harbour/contrib/hbqt/qtgui/QMouseEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QMouseEvent.cpp @@ -96,9 +96,9 @@ QT_G_FUNC( release_QMouseEvent ) } } -void * gcAllocate_QMouseEvent( void * pObj ) +void * hbqt_gcAllocate_QMouseEvent( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QMouseEvent; @@ -115,7 +115,7 @@ HB_FUNC( QT_QMOUSEEVENT ) pObj = new QMouseEvent( *hbqt_par_QMouseEvent( 1 ) ) ; } - hb_retptrGC( gcAllocate_QMouseEvent( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QMouseEvent( pObj ) ); } /* * Qt::MouseButton button () const @@ -138,7 +138,7 @@ HB_FUNC( QT_QMOUSEEVENT_BUTTONS ) */ HB_FUNC( QT_QMOUSEEVENT_GLOBALPOS ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QMouseEvent( 1 )->globalPos() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QMouseEvent( 1 )->globalPos() ) ) ); } /* @@ -162,7 +162,7 @@ HB_FUNC( QT_QMOUSEEVENT_GLOBALY ) */ HB_FUNC( QT_QMOUSEEVENT_POS ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QMouseEvent( 1 )->pos() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QMouseEvent( 1 )->pos() ) ) ); } /* @@ -170,7 +170,7 @@ HB_FUNC( QT_QMOUSEEVENT_POS ) */ HB_FUNC( QT_QMOUSEEVENT_POSF ) { - hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QMouseEvent( 1 )->posF() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QMouseEvent( 1 )->posF() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QMoveEvent.cpp b/harbour/contrib/hbqt/qtgui/QMoveEvent.cpp index 6aeb136147..85ccd4a03a 100644 --- a/harbour/contrib/hbqt/qtgui/QMoveEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QMoveEvent.cpp @@ -89,7 +89,7 @@ HB_FUNC( QT_QMOVEEVENT ) */ HB_FUNC( QT_QMOVEEVENT_OLDPOS ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QMoveEvent( 1 )->oldPos() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QMoveEvent( 1 )->oldPos() ) ) ); } /* @@ -97,7 +97,7 @@ HB_FUNC( QT_QMOVEEVENT_OLDPOS ) */ HB_FUNC( QT_QMOVEEVENT_POS ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QMoveEvent( 1 )->pos() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QMoveEvent( 1 )->pos() ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QMovie.cpp b/harbour/contrib/hbqt/qtgui/QMovie.cpp index ecfa4ba3fc..3df96156d9 100644 --- a/harbour/contrib/hbqt/qtgui/QMovie.cpp +++ b/harbour/contrib/hbqt/qtgui/QMovie.cpp @@ -129,9 +129,9 @@ QT_G_FUNC( release_QMovie ) } } -void * gcAllocate_QMovie( void * pObj ) +void * hbqt_gcAllocate_QMovie( void * pObj ) { - QGC_POINTER_QMovie * p = ( QGC_POINTER_QMovie * ) hb_gcAllocate( sizeof( QGC_POINTER_QMovie ), gcFuncs() ); + QGC_POINTER_QMovie * p = ( QGC_POINTER_QMovie * ) hb_gcAllocate( sizeof( QGC_POINTER_QMovie ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QMovie; @@ -146,14 +146,14 @@ HB_FUNC( QT_QMOVIE ) pObj = new QMovie() ; - hb_retptrGC( gcAllocate_QMovie( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QMovie( pObj ) ); } /* * QColor backgroundColor () const */ HB_FUNC( QT_QMOVIE_BACKGROUNDCOLOR ) { - hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QMovie( 1 )->backgroundColor() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QMovie( 1 )->backgroundColor() ) ) ); } /* @@ -177,7 +177,7 @@ HB_FUNC( QT_QMOVIE_CURRENTFRAMENUMBER ) */ HB_FUNC( QT_QMOVIE_CURRENTIMAGE ) { - hb_retptrGC( gcAllocate_QImage( new QImage( hbqt_par_QMovie( 1 )->currentImage() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( hbqt_par_QMovie( 1 )->currentImage() ) ) ); } /* @@ -185,7 +185,7 @@ HB_FUNC( QT_QMOVIE_CURRENTIMAGE ) */ HB_FUNC( QT_QMOVIE_CURRENTPIXMAP ) { - hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QMovie( 1 )->currentPixmap() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( hbqt_par_QMovie( 1 )->currentPixmap() ) ) ); } /* @@ -209,7 +209,7 @@ HB_FUNC( QT_QMOVIE_FILENAME ) */ HB_FUNC( QT_QMOVIE_FORMAT ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QMovie( 1 )->format() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QMovie( 1 )->format() ) ) ); } /* @@ -225,7 +225,7 @@ HB_FUNC( QT_QMOVIE_FRAMECOUNT ) */ HB_FUNC( QT_QMOVIE_FRAMERECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QMovie( 1 )->frameRect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QMovie( 1 )->frameRect() ) ) ); } /* @@ -265,7 +265,7 @@ HB_FUNC( QT_QMOVIE_NEXTFRAMEDELAY ) */ HB_FUNC( QT_QMOVIE_SCALEDSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QMovie( 1 )->scaledSize() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QMovie( 1 )->scaledSize() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QPageSetupDialog.cpp b/harbour/contrib/hbqt/qtgui/QPageSetupDialog.cpp index 3c8b330600..6b8cde0a70 100644 --- a/harbour/contrib/hbqt/qtgui/QPageSetupDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QPageSetupDialog.cpp @@ -126,9 +126,9 @@ QT_G_FUNC( release_QPageSetupDialog ) } } -void * gcAllocate_QPageSetupDialog( void * pObj ) +void * hbqt_gcAllocate_QPageSetupDialog( void * pObj ) { - QGC_POINTER_QPageSetupDialog * p = ( QGC_POINTER_QPageSetupDialog * ) hb_gcAllocate( sizeof( QGC_POINTER_QPageSetupDialog ), gcFuncs() ); + QGC_POINTER_QPageSetupDialog * p = ( QGC_POINTER_QPageSetupDialog * ) hb_gcAllocate( sizeof( QGC_POINTER_QPageSetupDialog ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QPageSetupDialog; @@ -146,7 +146,7 @@ HB_FUNC( QT_QPAGESETUPDIALOG ) else pObj = ( QPageSetupDialog* ) new QPageSetupDialog( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QPageSetupDialog( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QPageSetupDialog( pObj ) ); } /* * virtual int exec () diff --git a/harbour/contrib/hbqt/qtgui/QPaintEvent.cpp b/harbour/contrib/hbqt/qtgui/QPaintEvent.cpp index e1e99e3f3b..76a3eea133 100644 --- a/harbour/contrib/hbqt/qtgui/QPaintEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QPaintEvent.cpp @@ -95,9 +95,9 @@ QT_G_FUNC( release_QPaintEvent ) } } -void * gcAllocate_QPaintEvent( void * pObj ) +void * hbqt_gcAllocate_QPaintEvent( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QPaintEvent; @@ -123,14 +123,14 @@ HB_FUNC( QT_QPAINTEVENT ) } } - hb_retptrGC( gcAllocate_QPaintEvent( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QPaintEvent( pObj ) ); } /* * const QRect & rect () const */ HB_FUNC( QT_QPAINTEVENT_RECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QPaintEvent( 1 )->rect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QPaintEvent( 1 )->rect() ) ) ); } /* @@ -138,7 +138,7 @@ HB_FUNC( QT_QPAINTEVENT_RECT ) */ HB_FUNC( QT_QPAINTEVENT_REGION ) { - hb_retptrGC( gcAllocate_QRegion( new QRegion( hbqt_par_QPaintEvent( 1 )->region() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRegion( new QRegion( hbqt_par_QPaintEvent( 1 )->region() ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QPainter.cpp b/harbour/contrib/hbqt/qtgui/QPainter.cpp index 69e3de87e3..45b5bfd19e 100644 --- a/harbour/contrib/hbqt/qtgui/QPainter.cpp +++ b/harbour/contrib/hbqt/qtgui/QPainter.cpp @@ -115,9 +115,9 @@ QT_G_FUNC( release_QPainter ) } } -void * gcAllocate_QPainter( void * pObj ) +void * hbqt_gcAllocate_QPainter( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QPainter; @@ -138,14 +138,14 @@ HB_FUNC( QT_QPAINTER ) pObj = new QPainter() ; } - hb_retptrGC( gcAllocate_QPainter( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QPainter( pObj ) ); } /* * const QBrush & background () const */ HB_FUNC( QT_QPAINTER_BACKGROUND ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QPainter( 1 )->background() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QPainter( 1 )->background() ) ) ); } /* @@ -169,7 +169,7 @@ HB_FUNC( QT_QPAINTER_BEGIN ) */ HB_FUNC( QT_QPAINTER_BOUNDINGRECT ) { - hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QPainter( 1 )->boundingRect( *hbqt_par_QRectF( 2 ), hb_parni( 3 ), hbqt_par_QString( 4 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QPainter( 1 )->boundingRect( *hbqt_par_QRectF( 2 ), hb_parni( 3 ), hbqt_par_QString( 4 ) ) ) ) ); } /* @@ -177,7 +177,7 @@ HB_FUNC( QT_QPAINTER_BOUNDINGRECT ) */ HB_FUNC( QT_QPAINTER_BOUNDINGRECT_1 ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QPainter( 1 )->boundingRect( *hbqt_par_QRect( 2 ), hb_parni( 3 ), hbqt_par_QString( 4 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QPainter( 1 )->boundingRect( *hbqt_par_QRect( 2 ), hb_parni( 3 ), hbqt_par_QString( 4 ) ) ) ) ); } /* @@ -185,7 +185,7 @@ HB_FUNC( QT_QPAINTER_BOUNDINGRECT_1 ) */ HB_FUNC( QT_QPAINTER_BOUNDINGRECT_2 ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QPainter( 1 )->boundingRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), hbqt_par_QString( 7 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QPainter( 1 )->boundingRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), hbqt_par_QString( 7 ) ) ) ) ); } /* @@ -193,7 +193,7 @@ HB_FUNC( QT_QPAINTER_BOUNDINGRECT_2 ) */ HB_FUNC( QT_QPAINTER_BOUNDINGRECT_3 ) { - hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QPainter( 1 )->boundingRect( *hbqt_par_QRectF( 2 ), hbqt_par_QString( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QTextOption( 4 ) : QTextOption() ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QPainter( 1 )->boundingRect( *hbqt_par_QRectF( 2 ), hbqt_par_QString( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QTextOption( 4 ) : QTextOption() ) ) ) ) ); } /* @@ -201,7 +201,7 @@ HB_FUNC( QT_QPAINTER_BOUNDINGRECT_3 ) */ HB_FUNC( QT_QPAINTER_BRUSH ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QPainter( 1 )->brush() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QPainter( 1 )->brush() ) ) ); } /* @@ -209,7 +209,7 @@ HB_FUNC( QT_QPAINTER_BRUSH ) */ HB_FUNC( QT_QPAINTER_BRUSHORIGIN ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QPainter( 1 )->brushOrigin() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QPainter( 1 )->brushOrigin() ) ) ); } /* @@ -217,7 +217,7 @@ HB_FUNC( QT_QPAINTER_BRUSHORIGIN ) */ HB_FUNC( QT_QPAINTER_CLIPPATH ) { - hb_retptrGC( gcAllocate_QPainterPath( new QPainterPath( hbqt_par_QPainter( 1 )->clipPath() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPainterPath( new QPainterPath( hbqt_par_QPainter( 1 )->clipPath() ) ) ); } /* @@ -225,7 +225,7 @@ HB_FUNC( QT_QPAINTER_CLIPPATH ) */ HB_FUNC( QT_QPAINTER_CLIPREGION ) { - hb_retptrGC( gcAllocate_QRegion( new QRegion( hbqt_par_QPainter( 1 )->clipRegion() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRegion( new QRegion( hbqt_par_QPainter( 1 )->clipRegion() ) ) ); } /* @@ -233,7 +233,7 @@ HB_FUNC( QT_QPAINTER_CLIPREGION ) */ HB_FUNC( QT_QPAINTER_COMBINEDMATRIX ) { - hb_retptrGC( gcAllocate_QMatrix( new QMatrix( hbqt_par_QPainter( 1 )->combinedMatrix() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QMatrix( new QMatrix( hbqt_par_QPainter( 1 )->combinedMatrix() ) ) ); } /* @@ -241,7 +241,7 @@ HB_FUNC( QT_QPAINTER_COMBINEDMATRIX ) */ HB_FUNC( QT_QPAINTER_COMBINEDTRANSFORM ) { - hb_retptrGC( gcAllocate_QTransform( new QTransform( hbqt_par_QPainter( 1 )->combinedTransform() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTransform( new QTransform( hbqt_par_QPainter( 1 )->combinedTransform() ) ) ); } /* @@ -265,7 +265,7 @@ HB_FUNC( QT_QPAINTER_DEVICE ) */ HB_FUNC( QT_QPAINTER_DEVICEMATRIX ) { - hb_retptrGC( gcAllocate_QMatrix( new QMatrix( hbqt_par_QPainter( 1 )->deviceMatrix() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QMatrix( new QMatrix( hbqt_par_QPainter( 1 )->deviceMatrix() ) ) ); } /* @@ -273,7 +273,7 @@ HB_FUNC( QT_QPAINTER_DEVICEMATRIX ) */ HB_FUNC( QT_QPAINTER_DEVICETRANSFORM ) { - hb_retptrGC( gcAllocate_QTransform( new QTransform( hbqt_par_QPainter( 1 )->deviceTransform() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTransform( new QTransform( hbqt_par_QPainter( 1 )->deviceTransform() ) ) ); } /* @@ -1089,7 +1089,7 @@ HB_FUNC( QT_QPAINTER_FILLRECT_11 ) */ HB_FUNC( QT_QPAINTER_FONT ) { - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QPainter( 1 )->font() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QPainter( 1 )->font() ) ) ); } /* @@ -1097,7 +1097,7 @@ HB_FUNC( QT_QPAINTER_FONT ) */ HB_FUNC( QT_QPAINTER_FONTINFO ) { - hb_retptrGC( gcAllocate_QFontInfo( new QFontInfo( hbqt_par_QPainter( 1 )->fontInfo() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFontInfo( new QFontInfo( hbqt_par_QPainter( 1 )->fontInfo() ) ) ); } /* @@ -1105,7 +1105,7 @@ HB_FUNC( QT_QPAINTER_FONTINFO ) */ HB_FUNC( QT_QPAINTER_FONTMETRICS ) { - hb_retptrGC( gcAllocate_QFontMetrics( new QFontMetrics( hbqt_par_QPainter( 1 )->fontMetrics() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFontMetrics( new QFontMetrics( hbqt_par_QPainter( 1 )->fontMetrics() ) ) ); } /* @@ -1161,7 +1161,7 @@ HB_FUNC( QT_QPAINTER_PAINTENGINE ) */ HB_FUNC( QT_QPAINTER_PEN ) { - hb_retptrGC( gcAllocate_QPen( new QPen( hbqt_par_QPainter( 1 )->pen() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPen( new QPen( hbqt_par_QPainter( 1 )->pen() ) ) ); } /* @@ -1497,7 +1497,7 @@ HB_FUNC( QT_QPAINTER_TESTRENDERHINT ) */ HB_FUNC( QT_QPAINTER_TRANSFORM ) { - hb_retptrGC( gcAllocate_QTransform( new QTransform( hbqt_par_QPainter( 1 )->transform() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTransform( new QTransform( hbqt_par_QPainter( 1 )->transform() ) ) ); } /* @@ -1537,7 +1537,7 @@ HB_FUNC( QT_QPAINTER_VIEWTRANSFORMENABLED ) */ HB_FUNC( QT_QPAINTER_VIEWPORT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QPainter( 1 )->viewport() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QPainter( 1 )->viewport() ) ) ); } /* @@ -1545,7 +1545,7 @@ HB_FUNC( QT_QPAINTER_VIEWPORT ) */ HB_FUNC( QT_QPAINTER_WINDOW ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QPainter( 1 )->window() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QPainter( 1 )->window() ) ) ); } /* @@ -1553,7 +1553,7 @@ HB_FUNC( QT_QPAINTER_WINDOW ) */ HB_FUNC( QT_QPAINTER_WORLDMATRIX ) { - hb_retptrGC( gcAllocate_QMatrix( new QMatrix( hbqt_par_QPainter( 1 )->worldMatrix() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QMatrix( new QMatrix( hbqt_par_QPainter( 1 )->worldMatrix() ) ) ); } /* @@ -1569,7 +1569,7 @@ HB_FUNC( QT_QPAINTER_WORLDMATRIXENABLED ) */ HB_FUNC( QT_QPAINTER_WORLDTRANSFORM ) { - hb_retptrGC( gcAllocate_QTransform( new QTransform( hbqt_par_QPainter( 1 )->worldTransform() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTransform( new QTransform( hbqt_par_QPainter( 1 )->worldTransform() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QPainterPath.cpp b/harbour/contrib/hbqt/qtgui/QPainterPath.cpp index 2bfa8a0ee8..1bc22dac9c 100644 --- a/harbour/contrib/hbqt/qtgui/QPainterPath.cpp +++ b/harbour/contrib/hbqt/qtgui/QPainterPath.cpp @@ -116,9 +116,9 @@ QT_G_FUNC( release_QPainterPath ) } } -void * gcAllocate_QPainterPath( void * pObj ) +void * hbqt_gcAllocate_QPainterPath( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QPainterPath; @@ -132,7 +132,7 @@ HB_FUNC( QT_QPAINTERPATH ) pObj = new QPainterPath() ; - hb_retptrGC( gcAllocate_QPainterPath( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QPainterPath( pObj ) ); } /* * void addEllipse ( const QRectF & boundingRectangle ) @@ -275,7 +275,7 @@ HB_FUNC( QT_QPAINTERPATH_ARCTO_1 ) */ HB_FUNC( QT_QPAINTERPATH_BOUNDINGRECT ) { - hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QPainterPath( 1 )->boundingRect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QPainterPath( 1 )->boundingRect() ) ) ); } /* @@ -323,7 +323,7 @@ HB_FUNC( QT_QPAINTERPATH_CONTAINS_2 ) */ HB_FUNC( QT_QPAINTERPATH_CONTROLPOINTRECT ) { - hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QPainterPath( 1 )->controlPointRect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QPainterPath( 1 )->controlPointRect() ) ) ); } /* @@ -347,7 +347,7 @@ HB_FUNC( QT_QPAINTERPATH_CUBICTO_1 ) */ HB_FUNC( QT_QPAINTERPATH_CURRENTPOSITION ) { - hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QPainterPath( 1 )->currentPosition() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QPainterPath( 1 )->currentPosition() ) ) ); } /* @@ -371,7 +371,7 @@ HB_FUNC( QT_QPAINTERPATH_FILLRULE ) */ HB_FUNC( QT_QPAINTERPATH_INTERSECTED ) { - hb_retptrGC( gcAllocate_QPainterPath( new QPainterPath( hbqt_par_QPainterPath( 1 )->intersected( *hbqt_par_QPainterPath( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPainterPath( new QPainterPath( hbqt_par_QPainterPath( 1 )->intersected( *hbqt_par_QPainterPath( 2 ) ) ) ) ); } /* @@ -451,7 +451,7 @@ HB_FUNC( QT_QPAINTERPATH_PERCENTATLENGTH ) */ HB_FUNC( QT_QPAINTERPATH_POINTATPERCENT ) { - hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QPainterPath( 1 )->pointAtPercent( hb_parnd( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QPainterPath( 1 )->pointAtPercent( hb_parnd( 2 ) ) ) ) ); } /* @@ -491,7 +491,7 @@ HB_FUNC( QT_QPAINTERPATH_SETFILLRULE ) */ HB_FUNC( QT_QPAINTERPATH_SIMPLIFIED ) { - hb_retptrGC( gcAllocate_QPainterPath( new QPainterPath( hbqt_par_QPainterPath( 1 )->simplified() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPainterPath( new QPainterPath( hbqt_par_QPainterPath( 1 )->simplified() ) ) ); } /* @@ -507,7 +507,7 @@ HB_FUNC( QT_QPAINTERPATH_SLOPEATPERCENT ) */ HB_FUNC( QT_QPAINTERPATH_SUBTRACTED ) { - hb_retptrGC( gcAllocate_QPainterPath( new QPainterPath( hbqt_par_QPainterPath( 1 )->subtracted( *hbqt_par_QPainterPath( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPainterPath( new QPainterPath( hbqt_par_QPainterPath( 1 )->subtracted( *hbqt_par_QPainterPath( 2 ) ) ) ) ); } /* @@ -515,7 +515,7 @@ HB_FUNC( QT_QPAINTERPATH_SUBTRACTED ) */ HB_FUNC( QT_QPAINTERPATH_TOFILLPOLYGON ) { - hb_retptrGC( gcAllocate_QPolygonF( new QPolygonF( hbqt_par_QPainterPath( 1 )->toFillPolygon( *hbqt_par_QTransform( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPolygonF( new QPolygonF( hbqt_par_QPainterPath( 1 )->toFillPolygon( *hbqt_par_QTransform( 2 ) ) ) ) ); } /* @@ -523,7 +523,7 @@ HB_FUNC( QT_QPAINTERPATH_TOFILLPOLYGON ) */ HB_FUNC( QT_QPAINTERPATH_TOFILLPOLYGON_1 ) { - hb_retptrGC( gcAllocate_QPolygonF( new QPolygonF( hbqt_par_QPainterPath( 1 )->toFillPolygon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QMatrix( 2 ) : QMatrix() ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPolygonF( new QPolygonF( hbqt_par_QPainterPath( 1 )->toFillPolygon( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QMatrix( 2 ) : QMatrix() ) ) ) ) ); } /* @@ -531,7 +531,7 @@ HB_FUNC( QT_QPAINTERPATH_TOFILLPOLYGON_1 ) */ HB_FUNC( QT_QPAINTERPATH_TOREVERSED ) { - hb_retptrGC( gcAllocate_QPainterPath( new QPainterPath( hbqt_par_QPainterPath( 1 )->toReversed() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPainterPath( new QPainterPath( hbqt_par_QPainterPath( 1 )->toReversed() ) ) ); } /* @@ -539,7 +539,7 @@ HB_FUNC( QT_QPAINTERPATH_TOREVERSED ) */ HB_FUNC( QT_QPAINTERPATH_UNITED ) { - hb_retptrGC( gcAllocate_QPainterPath( new QPainterPath( hbqt_par_QPainterPath( 1 )->united( *hbqt_par_QPainterPath( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPainterPath( new QPainterPath( hbqt_par_QPainterPath( 1 )->united( *hbqt_par_QPainterPath( 2 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QPalette.cpp b/harbour/contrib/hbqt/qtgui/QPalette.cpp index 81d508316a..de279c25a2 100644 --- a/harbour/contrib/hbqt/qtgui/QPalette.cpp +++ b/harbour/contrib/hbqt/qtgui/QPalette.cpp @@ -105,9 +105,9 @@ QT_G_FUNC( release_QPalette ) } } -void * gcAllocate_QPalette( void * pObj ) +void * hbqt_gcAllocate_QPalette( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QPalette; @@ -136,14 +136,14 @@ HB_FUNC( QT_QPALETTE ) pObj = ( QPalette* ) new QPalette() ; } - hb_retptrGC( gcAllocate_QPalette( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QPalette( pObj ) ); } /* * const QBrush & alternateBase () const */ HB_FUNC( QT_QPALETTE_ALTERNATEBASE ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->alternateBase() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->alternateBase() ) ) ); } /* @@ -151,7 +151,7 @@ HB_FUNC( QT_QPALETTE_ALTERNATEBASE ) */ HB_FUNC( QT_QPALETTE_BASE ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->base() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->base() ) ) ); } /* @@ -159,7 +159,7 @@ HB_FUNC( QT_QPALETTE_BASE ) */ HB_FUNC( QT_QPALETTE_BRIGHTTEXT ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->brightText() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->brightText() ) ) ); } /* @@ -167,7 +167,7 @@ HB_FUNC( QT_QPALETTE_BRIGHTTEXT ) */ HB_FUNC( QT_QPALETTE_BRUSH ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->brush( ( QPalette::ColorGroup ) hb_parni( 2 ), ( QPalette::ColorRole ) hb_parni( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->brush( ( QPalette::ColorGroup ) hb_parni( 2 ), ( QPalette::ColorRole ) hb_parni( 3 ) ) ) ) ); } /* @@ -175,7 +175,7 @@ HB_FUNC( QT_QPALETTE_BRUSH ) */ HB_FUNC( QT_QPALETTE_BRUSH_1 ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->brush( ( QPalette::ColorRole ) hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->brush( ( QPalette::ColorRole ) hb_parni( 2 ) ) ) ) ); } /* @@ -183,7 +183,7 @@ HB_FUNC( QT_QPALETTE_BRUSH_1 ) */ HB_FUNC( QT_QPALETTE_BUTTON ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->button() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->button() ) ) ); } /* @@ -191,7 +191,7 @@ HB_FUNC( QT_QPALETTE_BUTTON ) */ HB_FUNC( QT_QPALETTE_BUTTONTEXT ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->buttonText() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->buttonText() ) ) ); } /* @@ -207,7 +207,7 @@ HB_FUNC( QT_QPALETTE_CACHEKEY ) */ HB_FUNC( QT_QPALETTE_COLOR ) { - hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QPalette( 1 )->color( ( QPalette::ColorGroup ) hb_parni( 2 ), ( QPalette::ColorRole ) hb_parni( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QPalette( 1 )->color( ( QPalette::ColorGroup ) hb_parni( 2 ), ( QPalette::ColorRole ) hb_parni( 3 ) ) ) ) ); } /* @@ -215,7 +215,7 @@ HB_FUNC( QT_QPALETTE_COLOR ) */ HB_FUNC( QT_QPALETTE_COLOR_1 ) { - hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QPalette( 1 )->color( ( QPalette::ColorRole ) hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QPalette( 1 )->color( ( QPalette::ColorRole ) hb_parni( 2 ) ) ) ) ); } /* @@ -231,7 +231,7 @@ HB_FUNC( QT_QPALETTE_CURRENTCOLORGROUP ) */ HB_FUNC( QT_QPALETTE_DARK ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->dark() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->dark() ) ) ); } /* @@ -239,7 +239,7 @@ HB_FUNC( QT_QPALETTE_DARK ) */ HB_FUNC( QT_QPALETTE_HIGHLIGHT ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->highlight() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->highlight() ) ) ); } /* @@ -247,7 +247,7 @@ HB_FUNC( QT_QPALETTE_HIGHLIGHT ) */ HB_FUNC( QT_QPALETTE_HIGHLIGHTEDTEXT ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->highlightedText() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->highlightedText() ) ) ); } /* @@ -279,7 +279,7 @@ HB_FUNC( QT_QPALETTE_ISEQUAL ) */ HB_FUNC( QT_QPALETTE_LIGHT ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->light() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->light() ) ) ); } /* @@ -287,7 +287,7 @@ HB_FUNC( QT_QPALETTE_LIGHT ) */ HB_FUNC( QT_QPALETTE_LINK ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->link() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->link() ) ) ); } /* @@ -295,7 +295,7 @@ HB_FUNC( QT_QPALETTE_LINK ) */ HB_FUNC( QT_QPALETTE_LINKVISITED ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->linkVisited() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->linkVisited() ) ) ); } /* @@ -303,7 +303,7 @@ HB_FUNC( QT_QPALETTE_LINKVISITED ) */ HB_FUNC( QT_QPALETTE_MID ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->mid() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->mid() ) ) ); } /* @@ -311,7 +311,7 @@ HB_FUNC( QT_QPALETTE_MID ) */ HB_FUNC( QT_QPALETTE_MIDLIGHT ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->midlight() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->midlight() ) ) ); } /* @@ -319,7 +319,7 @@ HB_FUNC( QT_QPALETTE_MIDLIGHT ) */ HB_FUNC( QT_QPALETTE_RESOLVE ) { - hb_retptrGC( gcAllocate_QPalette( new QPalette( hbqt_par_QPalette( 1 )->resolve( *hbqt_par_QPalette( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPalette( new QPalette( hbqt_par_QPalette( 1 )->resolve( *hbqt_par_QPalette( 2 ) ) ) ) ); } /* @@ -375,7 +375,7 @@ HB_FUNC( QT_QPALETTE_SETCURRENTCOLORGROUP ) */ HB_FUNC( QT_QPALETTE_SHADOW ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->shadow() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->shadow() ) ) ); } /* @@ -383,7 +383,7 @@ HB_FUNC( QT_QPALETTE_SHADOW ) */ HB_FUNC( QT_QPALETTE_TEXT ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->text() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->text() ) ) ); } /* @@ -391,7 +391,7 @@ HB_FUNC( QT_QPALETTE_TEXT ) */ HB_FUNC( QT_QPALETTE_TOOLTIPBASE ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->toolTipBase() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->toolTipBase() ) ) ); } /* @@ -399,7 +399,7 @@ HB_FUNC( QT_QPALETTE_TOOLTIPBASE ) */ HB_FUNC( QT_QPALETTE_TOOLTIPTEXT ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->toolTipText() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->toolTipText() ) ) ); } /* @@ -407,7 +407,7 @@ HB_FUNC( QT_QPALETTE_TOOLTIPTEXT ) */ HB_FUNC( QT_QPALETTE_WINDOW ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->window() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->window() ) ) ); } /* @@ -415,7 +415,7 @@ HB_FUNC( QT_QPALETTE_WINDOW ) */ HB_FUNC( QT_QPALETTE_WINDOWTEXT ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->windowText() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QPalette( 1 )->windowText() ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QPen.cpp b/harbour/contrib/hbqt/qtgui/QPen.cpp index 5a9667f1a4..102b9de725 100644 --- a/harbour/contrib/hbqt/qtgui/QPen.cpp +++ b/harbour/contrib/hbqt/qtgui/QPen.cpp @@ -109,9 +109,9 @@ QT_G_FUNC( release_QPen ) } } -void * gcAllocate_QPen( void * pObj ) +void * hbqt_gcAllocate_QPen( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QPen; @@ -157,14 +157,14 @@ HB_FUNC( QT_QPEN ) pObj = ( QPen* ) new QPen() ; } - hb_retptrGC( gcAllocate_QPen( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QPen( pObj ) ); } /* * QBrush brush () const */ HB_FUNC( QT_QPEN_BRUSH ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QPen( 1 )->brush() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QPen( 1 )->brush() ) ) ); } /* @@ -180,7 +180,7 @@ HB_FUNC( QT_QPEN_CAPSTYLE ) */ HB_FUNC( QT_QPEN_COLOR ) { - hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QPen( 1 )->color() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QPen( 1 )->color() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QPicture.cpp b/harbour/contrib/hbqt/qtgui/QPicture.cpp index b18615b569..4b9be9d13e 100644 --- a/harbour/contrib/hbqt/qtgui/QPicture.cpp +++ b/harbour/contrib/hbqt/qtgui/QPicture.cpp @@ -96,9 +96,9 @@ QT_G_FUNC( release_QPicture ) } } -void * gcAllocate_QPicture( void * pObj ) +void * hbqt_gcAllocate_QPicture( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QPicture; @@ -123,14 +123,14 @@ HB_FUNC( QT_QPICTURE ) pObj = new QPicture() ; } - hb_retptrGC( gcAllocate_QPicture( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QPicture( pObj ) ); } /* * QRect boundingRect () const */ HB_FUNC( QT_QPICTURE_BOUNDINGRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QPicture( 1 )->boundingRect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QPicture( 1 )->boundingRect() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QPixmap.cpp b/harbour/contrib/hbqt/qtgui/QPixmap.cpp index ffe3de273f..d180b74101 100644 --- a/harbour/contrib/hbqt/qtgui/QPixmap.cpp +++ b/harbour/contrib/hbqt/qtgui/QPixmap.cpp @@ -105,9 +105,9 @@ QT_G_FUNC( release_QPixmap ) } } -void * gcAllocate_QPixmap( void * pObj ) +void * hbqt_gcAllocate_QPixmap( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QPixmap; @@ -136,14 +136,14 @@ HB_FUNC( QT_QPIXMAP ) pObj = new QPixmap() ; } - hb_retptrGC( gcAllocate_QPixmap( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QPixmap( pObj ) ); } /* * QPixmap alphaChannel () const */ HB_FUNC( QT_QPIXMAP_ALPHACHANNEL ) { - hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QPixmap( 1 )->alphaChannel() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( hbqt_par_QPixmap( 1 )->alphaChannel() ) ) ); } /* @@ -159,7 +159,7 @@ HB_FUNC( QT_QPIXMAP_CACHEKEY ) */ HB_FUNC( QT_QPIXMAP_COPY ) { - hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QPixmap( 1 )->copy( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QRect( 2 ) : QRect() ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( hbqt_par_QPixmap( 1 )->copy( ( HB_ISPOINTER( 2 ) ? *hbqt_par_QRect( 2 ) : QRect() ) ) ) ) ); } /* @@ -167,7 +167,7 @@ HB_FUNC( QT_QPIXMAP_COPY ) */ HB_FUNC( QT_QPIXMAP_COPY_1 ) { - hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QPixmap( 1 )->copy( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( hbqt_par_QPixmap( 1 )->copy( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ) ) ) ); } /* @@ -175,7 +175,7 @@ HB_FUNC( QT_QPIXMAP_COPY_1 ) */ HB_FUNC( QT_QPIXMAP_CREATEHEURISTICMASK ) { - hb_retptrGC( gcAllocate_QBitmap( new QBitmap( hbqt_par_QPixmap( 1 )->createHeuristicMask( hb_parl( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBitmap( new QBitmap( hbqt_par_QPixmap( 1 )->createHeuristicMask( hb_parl( 2 ) ) ) ) ); } /* @@ -183,7 +183,7 @@ HB_FUNC( QT_QPIXMAP_CREATEHEURISTICMASK ) */ HB_FUNC( QT_QPIXMAP_CREATEMASKFROMCOLOR ) { - hb_retptrGC( gcAllocate_QBitmap( new QBitmap( hbqt_par_QPixmap( 1 )->createMaskFromColor( *hbqt_par_QColor( 2 ), ( Qt::MaskMode ) hb_parni( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBitmap( new QBitmap( hbqt_par_QPixmap( 1 )->createMaskFromColor( *hbqt_par_QColor( 2 ), ( Qt::MaskMode ) hb_parni( 3 ) ) ) ) ); } /* @@ -191,7 +191,7 @@ HB_FUNC( QT_QPIXMAP_CREATEMASKFROMCOLOR ) */ HB_FUNC( QT_QPIXMAP_CREATEMASKFROMCOLOR_1 ) { - hb_retptrGC( gcAllocate_QBitmap( new QBitmap( hbqt_par_QPixmap( 1 )->createMaskFromColor( *hbqt_par_QColor( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBitmap( new QBitmap( hbqt_par_QPixmap( 1 )->createMaskFromColor( *hbqt_par_QColor( 2 ) ) ) ) ); } /* @@ -295,7 +295,7 @@ HB_FUNC( QT_QPIXMAP_LOADFROMDATA ) */ HB_FUNC( QT_QPIXMAP_MASK ) { - hb_retptrGC( gcAllocate_QBitmap( new QBitmap( hbqt_par_QPixmap( 1 )->mask() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBitmap( new QBitmap( hbqt_par_QPixmap( 1 )->mask() ) ) ); } /* @@ -303,7 +303,7 @@ HB_FUNC( QT_QPIXMAP_MASK ) */ HB_FUNC( QT_QPIXMAP_RECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QPixmap( 1 )->rect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QPixmap( 1 )->rect() ) ) ); } /* @@ -327,7 +327,7 @@ HB_FUNC( QT_QPIXMAP_SAVE_1 ) */ HB_FUNC( QT_QPIXMAP_SCALED ) { - hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QPixmap( 1 )->scaled( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISNUM( 4 ) ? ( Qt::AspectRatioMode ) hb_parni( 4 ) : ( Qt::AspectRatioMode ) Qt::IgnoreAspectRatio ), ( HB_ISNUM( 5 ) ? ( Qt::TransformationMode ) hb_parni( 5 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( hbqt_par_QPixmap( 1 )->scaled( hb_parni( 2 ), hb_parni( 3 ), ( HB_ISNUM( 4 ) ? ( Qt::AspectRatioMode ) hb_parni( 4 ) : ( Qt::AspectRatioMode ) Qt::IgnoreAspectRatio ), ( HB_ISNUM( 5 ) ? ( Qt::TransformationMode ) hb_parni( 5 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); } /* @@ -335,7 +335,7 @@ HB_FUNC( QT_QPIXMAP_SCALED ) */ HB_FUNC( QT_QPIXMAP_SCALED_1 ) { - hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QPixmap( 1 )->scaled( *hbqt_par_QSize( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::AspectRatioMode ) hb_parni( 3 ) : ( Qt::AspectRatioMode ) Qt::IgnoreAspectRatio ), ( HB_ISNUM( 4 ) ? ( Qt::TransformationMode ) hb_parni( 4 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( hbqt_par_QPixmap( 1 )->scaled( *hbqt_par_QSize( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::AspectRatioMode ) hb_parni( 3 ) : ( Qt::AspectRatioMode ) Qt::IgnoreAspectRatio ), ( HB_ISNUM( 4 ) ? ( Qt::TransformationMode ) hb_parni( 4 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); } /* @@ -343,7 +343,7 @@ HB_FUNC( QT_QPIXMAP_SCALED_1 ) */ HB_FUNC( QT_QPIXMAP_SCALEDTOHEIGHT ) { - hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QPixmap( 1 )->scaledToHeight( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( hbqt_par_QPixmap( 1 )->scaledToHeight( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); } /* @@ -351,7 +351,7 @@ HB_FUNC( QT_QPIXMAP_SCALEDTOHEIGHT ) */ HB_FUNC( QT_QPIXMAP_SCALEDTOWIDTH ) { - hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QPixmap( 1 )->scaledToWidth( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( hbqt_par_QPixmap( 1 )->scaledToWidth( hb_parni( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); } /* @@ -375,7 +375,7 @@ HB_FUNC( QT_QPIXMAP_SETMASK ) */ HB_FUNC( QT_QPIXMAP_SIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QPixmap( 1 )->size() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QPixmap( 1 )->size() ) ) ); } /* @@ -383,7 +383,7 @@ HB_FUNC( QT_QPIXMAP_SIZE ) */ HB_FUNC( QT_QPIXMAP_TOIMAGE ) { - hb_retptrGC( gcAllocate_QImage( new QImage( hbqt_par_QPixmap( 1 )->toImage() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QImage( new QImage( hbqt_par_QPixmap( 1 )->toImage() ) ) ); } /* @@ -391,7 +391,7 @@ HB_FUNC( QT_QPIXMAP_TOIMAGE ) */ HB_FUNC( QT_QPIXMAP_TRANSFORMED ) { - hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QPixmap( 1 )->transformed( *hbqt_par_QTransform( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( hbqt_par_QPixmap( 1 )->transformed( *hbqt_par_QTransform( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); } /* @@ -399,7 +399,7 @@ HB_FUNC( QT_QPIXMAP_TRANSFORMED ) */ HB_FUNC( QT_QPIXMAP_TRANSFORMED_1 ) { - hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QPixmap( 1 )->transformed( *hbqt_par_QMatrix( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( hbqt_par_QPixmap( 1 )->transformed( *hbqt_par_QMatrix( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::TransformationMode ) hb_parni( 3 ) : ( Qt::TransformationMode ) Qt::FastTransformation ) ) ) ) ); } /* @@ -423,7 +423,7 @@ HB_FUNC( QT_QPIXMAP_DEFAULTDEPTH ) */ HB_FUNC( QT_QPIXMAP_FROMIMAGE ) { - hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QPixmap( 1 )->fromImage( *hbqt_par_QImage( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::ImageConversionFlags ) hb_parni( 3 ) : ( Qt::ImageConversionFlags ) Qt::AutoColor ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( hbqt_par_QPixmap( 1 )->fromImage( *hbqt_par_QImage( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::ImageConversionFlags ) hb_parni( 3 ) : ( Qt::ImageConversionFlags ) Qt::AutoColor ) ) ) ) ); } /* @@ -431,7 +431,7 @@ HB_FUNC( QT_QPIXMAP_FROMIMAGE ) */ HB_FUNC( QT_QPIXMAP_GRABWIDGET ) { - hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QPixmap( 1 )->grabWidget( hbqt_par_QWidget( 2 ), *hbqt_par_QRect( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( hbqt_par_QPixmap( 1 )->grabWidget( hbqt_par_QWidget( 2 ), *hbqt_par_QRect( 3 ) ) ) ) ); } /* @@ -439,7 +439,7 @@ HB_FUNC( QT_QPIXMAP_GRABWIDGET ) */ HB_FUNC( QT_QPIXMAP_GRABWIDGET_1 ) { - hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QPixmap( 1 )->grabWidget( hbqt_par_QWidget( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : -1 ), ( HB_ISNUM( 6 ) ? hb_parni( 6 ) : -1 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( hbqt_par_QPixmap( 1 )->grabWidget( hbqt_par_QWidget( 2 ), hb_parni( 3 ), hb_parni( 4 ), ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : -1 ), ( HB_ISNUM( 6 ) ? hb_parni( 6 ) : -1 ) ) ) ) ); } /* @@ -447,7 +447,7 @@ HB_FUNC( QT_QPIXMAP_GRABWIDGET_1 ) */ HB_FUNC( QT_QPIXMAP_TRUEMATRIX ) { - hb_retptrGC( gcAllocate_QTransform( new QTransform( hbqt_par_QPixmap( 1 )->trueMatrix( *hbqt_par_QTransform( 2 ), hb_parni( 3 ), hb_parni( 4 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTransform( new QTransform( hbqt_par_QPixmap( 1 )->trueMatrix( *hbqt_par_QTransform( 2 ), hb_parni( 3 ), hb_parni( 4 ) ) ) ) ); } /* @@ -455,7 +455,7 @@ HB_FUNC( QT_QPIXMAP_TRUEMATRIX ) */ HB_FUNC( QT_QPIXMAP_TRUEMATRIX_1 ) { - hb_retptrGC( gcAllocate_QMatrix( new QMatrix( hbqt_par_QPixmap( 1 )->trueMatrix( *hbqt_par_QMatrix( 2 ), hb_parni( 3 ), hb_parni( 4 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QMatrix( new QMatrix( hbqt_par_QPixmap( 1 )->trueMatrix( *hbqt_par_QMatrix( 2 ), hb_parni( 3 ), hb_parni( 4 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QPlainTextEdit.cpp b/harbour/contrib/hbqt/qtgui/QPlainTextEdit.cpp index 3f5a3f7d7f..d6d848a4e5 100644 --- a/harbour/contrib/hbqt/qtgui/QPlainTextEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/QPlainTextEdit.cpp @@ -141,9 +141,9 @@ QT_G_FUNC( release_QPlainTextEdit ) } } -void * gcAllocate_QPlainTextEdit( void * pObj ) +void * hbqt_gcAllocate_QPlainTextEdit( void * pObj ) { - QGC_POINTER_QPlainTextEdit * p = ( QGC_POINTER_QPlainTextEdit * ) hb_gcAllocate( sizeof( QGC_POINTER_QPlainTextEdit ), gcFuncs() ); + QGC_POINTER_QPlainTextEdit * p = ( QGC_POINTER_QPlainTextEdit * ) hb_gcAllocate( sizeof( QGC_POINTER_QPlainTextEdit ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QPlainTextEdit; @@ -173,7 +173,7 @@ HB_FUNC( QT_QPLAINTEXTEDIT ) pObj = new QPlainTextEdit() ; } - hb_retptrGC( gcAllocate_QPlainTextEdit( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QPlainTextEdit( pObj ) ); } /* * bool backgroundVisible () const @@ -220,7 +220,7 @@ HB_FUNC( QT_QPLAINTEXTEDIT_CREATESTANDARDCONTEXTMENU ) */ HB_FUNC( QT_QPLAINTEXTEDIT_CURRENTCHARFORMAT ) { - hb_retptrGC( gcAllocate_QTextCharFormat( new QTextCharFormat( hbqt_par_QPlainTextEdit( 1 )->currentCharFormat() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextCharFormat( new QTextCharFormat( hbqt_par_QPlainTextEdit( 1 )->currentCharFormat() ) ) ); } /* @@ -228,7 +228,7 @@ HB_FUNC( QT_QPLAINTEXTEDIT_CURRENTCHARFORMAT ) */ HB_FUNC( QT_QPLAINTEXTEDIT_CURSORFORPOSITION ) { - hb_retptrGC( gcAllocate_QTextCursor( new QTextCursor( hbqt_par_QPlainTextEdit( 1 )->cursorForPosition( *hbqt_par_QPoint( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextCursor( new QTextCursor( hbqt_par_QPlainTextEdit( 1 )->cursorForPosition( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* @@ -236,7 +236,7 @@ HB_FUNC( QT_QPLAINTEXTEDIT_CURSORFORPOSITION ) */ HB_FUNC( QT_QPLAINTEXTEDIT_CURSORRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QPlainTextEdit( 1 )->cursorRect( *hbqt_par_QTextCursor( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QPlainTextEdit( 1 )->cursorRect( *hbqt_par_QTextCursor( 2 ) ) ) ) ); } /* @@ -244,7 +244,7 @@ HB_FUNC( QT_QPLAINTEXTEDIT_CURSORRECT ) */ HB_FUNC( QT_QPLAINTEXTEDIT_CURSORRECT_1 ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QPlainTextEdit( 1 )->cursorRect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QPlainTextEdit( 1 )->cursorRect() ) ) ); } /* @@ -316,7 +316,7 @@ HB_FUNC( QT_QPLAINTEXTEDIT_LINEWRAPMODE ) */ HB_FUNC( QT_QPLAINTEXTEDIT_LOADRESOURCE ) { - hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QPlainTextEdit( 1 )->loadResource( hb_parni( 2 ), *hbqt_par_QUrl( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QPlainTextEdit( 1 )->loadResource( hb_parni( 2 ), *hbqt_par_QUrl( 3 ) ) ) ) ); } /* @@ -508,7 +508,7 @@ HB_FUNC( QT_QPLAINTEXTEDIT_TABSTOPWIDTH ) */ HB_FUNC( QT_QPLAINTEXTEDIT_TEXTCURSOR ) { - hb_retptrGC( gcAllocate_QTextCursor( new QTextCursor( hbqt_par_QPlainTextEdit( 1 )->textCursor() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextCursor( new QTextCursor( hbqt_par_QPlainTextEdit( 1 )->textCursor() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QPolygon.cpp b/harbour/contrib/hbqt/qtgui/QPolygon.cpp index 412cbd19d8..fc3f653412 100644 --- a/harbour/contrib/hbqt/qtgui/QPolygon.cpp +++ b/harbour/contrib/hbqt/qtgui/QPolygon.cpp @@ -98,9 +98,9 @@ QT_G_FUNC( release_QPolygon ) } } -void * gcAllocate_QPolygon( void * pObj ) +void * hbqt_gcAllocate_QPolygon( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QPolygon; @@ -114,14 +114,14 @@ HB_FUNC( QT_QPOLYGON ) pObj = new QPolygon() ; - hb_retptrGC( gcAllocate_QPolygon( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QPolygon( pObj ) ); } /* * QRect boundingRect () const */ HB_FUNC( QT_QPOLYGON_BOUNDINGRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QPolygon( 1 )->boundingRect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QPolygon( 1 )->boundingRect() ) ) ); } /* @@ -137,7 +137,7 @@ HB_FUNC( QT_QPOLYGON_CONTAINSPOINT ) */ HB_FUNC( QT_QPOLYGON_INTERSECTED ) { - hb_retptrGC( gcAllocate_QPolygon( new QPolygon( hbqt_par_QPolygon( 1 )->intersected( *hbqt_par_QPolygon( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPolygon( new QPolygon( hbqt_par_QPolygon( 1 )->intersected( *hbqt_par_QPolygon( 2 ) ) ) ) ); } /* @@ -159,7 +159,7 @@ HB_FUNC( QT_QPOLYGON_POINT ) */ HB_FUNC( QT_QPOLYGON_POINT_1 ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QPolygon( 1 )->point( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QPolygon( 1 )->point( hb_parni( 2 ) ) ) ) ); } /* @@ -203,7 +203,7 @@ HB_FUNC( QT_QPOLYGON_SETPOINTS ) */ HB_FUNC( QT_QPOLYGON_SUBTRACTED ) { - hb_retptrGC( gcAllocate_QPolygon( new QPolygon( hbqt_par_QPolygon( 1 )->subtracted( *hbqt_par_QPolygon( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPolygon( new QPolygon( hbqt_par_QPolygon( 1 )->subtracted( *hbqt_par_QPolygon( 2 ) ) ) ) ); } /* @@ -227,7 +227,7 @@ HB_FUNC( QT_QPOLYGON_TRANSLATE_1 ) */ HB_FUNC( QT_QPOLYGON_UNITED ) { - hb_retptrGC( gcAllocate_QPolygon( new QPolygon( hbqt_par_QPolygon( 1 )->united( *hbqt_par_QPolygon( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPolygon( new QPolygon( hbqt_par_QPolygon( 1 )->united( *hbqt_par_QPolygon( 2 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QPolygonF.cpp b/harbour/contrib/hbqt/qtgui/QPolygonF.cpp index 8734fc6a44..282f63aa15 100644 --- a/harbour/contrib/hbqt/qtgui/QPolygonF.cpp +++ b/harbour/contrib/hbqt/qtgui/QPolygonF.cpp @@ -99,9 +99,9 @@ QT_G_FUNC( release_QPolygonF ) } } -void * gcAllocate_QPolygonF( void * pObj ) +void * hbqt_gcAllocate_QPolygonF( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QPolygonF; @@ -115,14 +115,14 @@ HB_FUNC( QT_QPOLYGONF ) pObj = new QPolygonF() ; - hb_retptrGC( gcAllocate_QPolygonF( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QPolygonF( pObj ) ); } /* * QRectF boundingRect () const */ HB_FUNC( QT_QPOLYGONF_BOUNDINGRECT ) { - hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QPolygonF( 1 )->boundingRect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QPolygonF( 1 )->boundingRect() ) ) ); } /* @@ -138,7 +138,7 @@ HB_FUNC( QT_QPOLYGONF_CONTAINSPOINT ) */ HB_FUNC( QT_QPOLYGONF_INTERSECTED ) { - hb_retptrGC( gcAllocate_QPolygonF( new QPolygonF( hbqt_par_QPolygonF( 1 )->intersected( *hbqt_par_QPolygonF( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPolygonF( new QPolygonF( hbqt_par_QPolygonF( 1 )->intersected( *hbqt_par_QPolygonF( 2 ) ) ) ) ); } /* @@ -154,7 +154,7 @@ HB_FUNC( QT_QPOLYGONF_ISCLOSED ) */ HB_FUNC( QT_QPOLYGONF_SUBTRACTED ) { - hb_retptrGC( gcAllocate_QPolygonF( new QPolygonF( hbqt_par_QPolygonF( 1 )->subtracted( *hbqt_par_QPolygonF( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPolygonF( new QPolygonF( hbqt_par_QPolygonF( 1 )->subtracted( *hbqt_par_QPolygonF( 2 ) ) ) ) ); } /* @@ -162,7 +162,7 @@ HB_FUNC( QT_QPOLYGONF_SUBTRACTED ) */ HB_FUNC( QT_QPOLYGONF_TOPOLYGON ) { - hb_retptrGC( gcAllocate_QPolygon( new QPolygon( hbqt_par_QPolygonF( 1 )->toPolygon() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPolygon( new QPolygon( hbqt_par_QPolygonF( 1 )->toPolygon() ) ) ); } /* @@ -186,7 +186,7 @@ HB_FUNC( QT_QPOLYGONF_TRANSLATE_1 ) */ HB_FUNC( QT_QPOLYGONF_UNITED ) { - hb_retptrGC( gcAllocate_QPolygonF( new QPolygonF( hbqt_par_QPolygonF( 1 )->united( *hbqt_par_QPolygonF( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPolygonF( new QPolygonF( hbqt_par_QPolygonF( 1 )->united( *hbqt_par_QPolygonF( 2 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QPrintDialog.cpp b/harbour/contrib/hbqt/qtgui/QPrintDialog.cpp index d7900b14b1..9e824c4ffd 100644 --- a/harbour/contrib/hbqt/qtgui/QPrintDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QPrintDialog.cpp @@ -127,9 +127,9 @@ QT_G_FUNC( release_QPrintDialog ) } } -void * gcAllocate_QPrintDialog( void * pObj ) +void * hbqt_gcAllocate_QPrintDialog( void * pObj ) { - QGC_POINTER_QPrintDialog * p = ( QGC_POINTER_QPrintDialog * ) hb_gcAllocate( sizeof( QGC_POINTER_QPrintDialog ), gcFuncs() ); + QGC_POINTER_QPrintDialog * p = ( QGC_POINTER_QPrintDialog * ) hb_gcAllocate( sizeof( QGC_POINTER_QPrintDialog ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QPrintDialog; @@ -144,7 +144,7 @@ HB_FUNC( QT_QPRINTDIALOG ) pObj = ( QPrintDialog* ) new QPrintDialog ( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QPrintDialog( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QPrintDialog( pObj ) ); } /* * virtual void done ( int result ) diff --git a/harbour/contrib/hbqt/qtgui/QPrintEngine.cpp b/harbour/contrib/hbqt/qtgui/QPrintEngine.cpp index 5cd9fe641d..9fc2579760 100644 --- a/harbour/contrib/hbqt/qtgui/QPrintEngine.cpp +++ b/harbour/contrib/hbqt/qtgui/QPrintEngine.cpp @@ -124,7 +124,7 @@ HB_FUNC( QT_QPRINTENGINE_PRINTERSTATE ) */ HB_FUNC( QT_QPRINTENGINE_PROPERTY ) { - hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QPrintEngine( 1 )->property( ( QPrintEngine::PrintEnginePropertyKey ) hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QPrintEngine( 1 )->property( ( QPrintEngine::PrintEnginePropertyKey ) hb_parni( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QPrintPreviewDialog.cpp b/harbour/contrib/hbqt/qtgui/QPrintPreviewDialog.cpp index ed5f5e813d..77fb10f582 100644 --- a/harbour/contrib/hbqt/qtgui/QPrintPreviewDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QPrintPreviewDialog.cpp @@ -122,9 +122,9 @@ QT_G_FUNC( release_QPrintPreviewDialog ) } } -void * gcAllocate_QPrintPreviewDialog( void * pObj ) +void * hbqt_gcAllocate_QPrintPreviewDialog( void * pObj ) { - QGC_POINTER_QPrintPreviewDialog * p = ( QGC_POINTER_QPrintPreviewDialog * ) hb_gcAllocate( sizeof( QGC_POINTER_QPrintPreviewDialog ), gcFuncs() ); + QGC_POINTER_QPrintPreviewDialog * p = ( QGC_POINTER_QPrintPreviewDialog * ) hb_gcAllocate( sizeof( QGC_POINTER_QPrintPreviewDialog ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QPrintPreviewDialog; @@ -142,7 +142,7 @@ HB_FUNC( QT_QPRINTPREVIEWDIALOG ) else pObj = new QPrintPreviewDialog( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ; - hb_retptrGC( gcAllocate_QPrintPreviewDialog( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QPrintPreviewDialog( pObj ) ); } /* * void open ( QObject * receiver, const char * member ) diff --git a/harbour/contrib/hbqt/qtgui/QPrinter.cpp b/harbour/contrib/hbqt/qtgui/QPrinter.cpp index 40f1be83d4..690ccbe469 100644 --- a/harbour/contrib/hbqt/qtgui/QPrinter.cpp +++ b/harbour/contrib/hbqt/qtgui/QPrinter.cpp @@ -127,9 +127,9 @@ QT_G_FUNC( release_QPrinter ) } } -void * gcAllocate_QPrinter( void * pObj ) +void * hbqt_gcAllocate_QPrinter( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QPrinter; @@ -143,7 +143,7 @@ HB_FUNC( QT_QPRINTER ) pObj = ( QPrinter* ) new QPrinter() ; - hb_retptrGC( gcAllocate_QPrinter( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QPrinter( pObj ) ); } /* * bool abort () @@ -304,7 +304,7 @@ HB_FUNC( QT_QPRINTER_PAGEORDER ) */ HB_FUNC( QT_QPRINTER_PAGERECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QPrinter( 1 )->pageRect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QPrinter( 1 )->pageRect() ) ) ); } /* @@ -312,7 +312,7 @@ HB_FUNC( QT_QPRINTER_PAGERECT ) */ HB_FUNC( QT_QPRINTER_PAGERECT_1 ) { - hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QPrinter( 1 )->pageRect( ( QPrinter::Unit ) hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QPrinter( 1 )->pageRect( ( QPrinter::Unit ) hb_parni( 2 ) ) ) ) ); } /* @@ -328,7 +328,7 @@ HB_FUNC( QT_QPRINTER_PAINTENGINE ) */ HB_FUNC( QT_QPRINTER_PAPERRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QPrinter( 1 )->paperRect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QPrinter( 1 )->paperRect() ) ) ); } /* @@ -336,7 +336,7 @@ HB_FUNC( QT_QPRINTER_PAPERRECT ) */ HB_FUNC( QT_QPRINTER_PAPERRECT_1 ) { - hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QPrinter( 1 )->paperRect( ( QPrinter::Unit ) hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QPrinter( 1 )->paperRect( ( QPrinter::Unit ) hb_parni( 2 ) ) ) ) ); } /* @@ -352,7 +352,7 @@ HB_FUNC( QT_QPRINTER_PAPERSIZE ) */ HB_FUNC( QT_QPRINTER_PAPERSIZE_1 ) { - hb_retptrGC( gcAllocate_QSizeF( new QSizeF( hbqt_par_QPrinter( 1 )->paperSize( ( QPrinter::Unit ) hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSizeF( new QSizeF( hbqt_par_QPrinter( 1 )->paperSize( ( QPrinter::Unit ) hb_parni( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QProgressBar.cpp b/harbour/contrib/hbqt/qtgui/QProgressBar.cpp index 1051c8e356..06eb5ff716 100644 --- a/harbour/contrib/hbqt/qtgui/QProgressBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QProgressBar.cpp @@ -124,9 +124,9 @@ QT_G_FUNC( release_QProgressBar ) } } -void * gcAllocate_QProgressBar( void * pObj ) +void * hbqt_gcAllocate_QProgressBar( void * pObj ) { - QGC_POINTER_QProgressBar * p = ( QGC_POINTER_QProgressBar * ) hb_gcAllocate( sizeof( QGC_POINTER_QProgressBar ), gcFuncs() ); + QGC_POINTER_QProgressBar * p = ( QGC_POINTER_QProgressBar * ) hb_gcAllocate( sizeof( QGC_POINTER_QProgressBar ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QProgressBar; @@ -141,7 +141,7 @@ HB_FUNC( QT_QPROGRESSBAR ) pObj = ( QProgressBar* ) new QProgressBar( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QProgressBar( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QProgressBar( pObj ) ); } /* * Qt::Alignment alignment () const diff --git a/harbour/contrib/hbqt/qtgui/QProgressDialog.cpp b/harbour/contrib/hbqt/qtgui/QProgressDialog.cpp index 128805fa1c..b8ecc7a55c 100644 --- a/harbour/contrib/hbqt/qtgui/QProgressDialog.cpp +++ b/harbour/contrib/hbqt/qtgui/QProgressDialog.cpp @@ -122,9 +122,9 @@ QT_G_FUNC( release_QProgressDialog ) } } -void * gcAllocate_QProgressDialog( void * pObj ) +void * hbqt_gcAllocate_QProgressDialog( void * pObj ) { - QGC_POINTER_QProgressDialog * p = ( QGC_POINTER_QProgressDialog * ) hb_gcAllocate( sizeof( QGC_POINTER_QProgressDialog ), gcFuncs() ); + QGC_POINTER_QProgressDialog * p = ( QGC_POINTER_QProgressDialog * ) hb_gcAllocate( sizeof( QGC_POINTER_QProgressDialog ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QProgressDialog; @@ -139,7 +139,7 @@ HB_FUNC( QT_QPROGRESSDIALOG ) pObj = new QProgressDialog( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QProgressDialog( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QProgressDialog( pObj ) ); } /* * bool autoClose () const @@ -242,7 +242,7 @@ HB_FUNC( QT_QPROGRESSDIALOG_SETLABEL ) */ HB_FUNC( QT_QPROGRESSDIALOG_SIZEHINT ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QProgressDialog( 1 )->sizeHint() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QProgressDialog( 1 )->sizeHint() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QPushButton.cpp b/harbour/contrib/hbqt/qtgui/QPushButton.cpp index 4c9881bb3b..62fae4f3ec 100644 --- a/harbour/contrib/hbqt/qtgui/QPushButton.cpp +++ b/harbour/contrib/hbqt/qtgui/QPushButton.cpp @@ -123,9 +123,9 @@ QT_G_FUNC( release_QPushButton ) } } -void * gcAllocate_QPushButton( void * pObj ) +void * hbqt_gcAllocate_QPushButton( void * pObj ) { - QGC_POINTER_QPushButton * p = ( QGC_POINTER_QPushButton * ) hb_gcAllocate( sizeof( QGC_POINTER_QPushButton ), gcFuncs() ); + QGC_POINTER_QPushButton * p = ( QGC_POINTER_QPushButton * ) hb_gcAllocate( sizeof( QGC_POINTER_QPushButton ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QPushButton; @@ -140,7 +140,7 @@ HB_FUNC( QT_QPUSHBUTTON ) pObj = ( QPushButton* ) new QPushButton( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QPushButton( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QPushButton( pObj ) ); } /* * bool autoDefault () const diff --git a/harbour/contrib/hbqt/qtgui/QRadialGradient.cpp b/harbour/contrib/hbqt/qtgui/QRadialGradient.cpp index 7a659e274c..82a09d4d30 100644 --- a/harbour/contrib/hbqt/qtgui/QRadialGradient.cpp +++ b/harbour/contrib/hbqt/qtgui/QRadialGradient.cpp @@ -104,9 +104,9 @@ QT_G_FUNC( release_QRadialGradient ) } } -void * gcAllocate_QRadialGradient( void * pObj ) +void * hbqt_gcAllocate_QRadialGradient( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QRadialGradient; @@ -139,14 +139,14 @@ HB_FUNC( QT_QRADIALGRADIENT ) pObj = ( QRadialGradient* ) new QRadialGradient() ; } - hb_retptrGC( gcAllocate_QRadialGradient( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QRadialGradient( pObj ) ); } /* * QPointF center () const */ HB_FUNC( QT_QRADIALGRADIENT_CENTER ) { - hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QRadialGradient( 1 )->center() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QRadialGradient( 1 )->center() ) ) ); } /* @@ -154,7 +154,7 @@ HB_FUNC( QT_QRADIALGRADIENT_CENTER ) */ HB_FUNC( QT_QRADIALGRADIENT_FOCALPOINT ) { - hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QRadialGradient( 1 )->focalPoint() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QRadialGradient( 1 )->focalPoint() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QRadioButton.cpp b/harbour/contrib/hbqt/qtgui/QRadioButton.cpp index dd2799616d..7b232b8c34 100644 --- a/harbour/contrib/hbqt/qtgui/QRadioButton.cpp +++ b/harbour/contrib/hbqt/qtgui/QRadioButton.cpp @@ -121,9 +121,9 @@ QT_G_FUNC( release_QRadioButton ) } } -void * gcAllocate_QRadioButton( void * pObj ) +void * hbqt_gcAllocate_QRadioButton( void * pObj ) { - QGC_POINTER_QRadioButton * p = ( QGC_POINTER_QRadioButton * ) hb_gcAllocate( sizeof( QGC_POINTER_QRadioButton ), gcFuncs() ); + QGC_POINTER_QRadioButton * p = ( QGC_POINTER_QRadioButton * ) hb_gcAllocate( sizeof( QGC_POINTER_QRadioButton ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QRadioButton; @@ -141,7 +141,7 @@ HB_FUNC( QT_QRADIOBUTTON ) else pObj = ( QRadioButton* ) new QRadioButton( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QRadioButton( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QRadioButton( pObj ) ); } /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/QRegion.cpp b/harbour/contrib/hbqt/qtgui/QRegion.cpp index 1abe9a87a0..24d26414a6 100644 --- a/harbour/contrib/hbqt/qtgui/QRegion.cpp +++ b/harbour/contrib/hbqt/qtgui/QRegion.cpp @@ -117,9 +117,9 @@ QT_G_FUNC( release_QRegion ) } } -void * gcAllocate_QRegion( void * pObj ) +void * hbqt_gcAllocate_QRegion( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QRegion; @@ -167,14 +167,14 @@ HB_FUNC( QT_QREGION ) pObj = ( QRegion* ) new QRegion() ; } - hb_retptrGC( gcAllocate_QRegion( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QRegion( pObj ) ); } /* * QRect boundingRect () const */ HB_FUNC( QT_QREGION_BOUNDINGRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QRegion( 1 )->boundingRect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QRegion( 1 )->boundingRect() ) ) ); } /* @@ -198,7 +198,7 @@ HB_FUNC( QT_QREGION_CONTAINS_1 ) */ HB_FUNC( QT_QREGION_INTERSECTED ) { - hb_retptrGC( gcAllocate_QRegion( new QRegion( hbqt_par_QRegion( 1 )->intersected( *hbqt_par_QRegion( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRegion( new QRegion( hbqt_par_QRegion( 1 )->intersected( *hbqt_par_QRegion( 2 ) ) ) ) ); } /* @@ -206,7 +206,7 @@ HB_FUNC( QT_QREGION_INTERSECTED ) */ HB_FUNC( QT_QREGION_INTERSECTED_1 ) { - hb_retptrGC( gcAllocate_QRegion( new QRegion( hbqt_par_QRegion( 1 )->intersected( *hbqt_par_QRect( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRegion( new QRegion( hbqt_par_QRegion( 1 )->intersected( *hbqt_par_QRect( 2 ) ) ) ) ); } /* @@ -254,7 +254,7 @@ HB_FUNC( QT_QREGION_SETRECTS ) */ HB_FUNC( QT_QREGION_SUBTRACTED ) { - hb_retptrGC( gcAllocate_QRegion( new QRegion( hbqt_par_QRegion( 1 )->subtracted( *hbqt_par_QRegion( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRegion( new QRegion( hbqt_par_QRegion( 1 )->subtracted( *hbqt_par_QRegion( 2 ) ) ) ) ); } /* @@ -278,7 +278,7 @@ HB_FUNC( QT_QREGION_TRANSLATE_1 ) */ HB_FUNC( QT_QREGION_TRANSLATED ) { - hb_retptrGC( gcAllocate_QRegion( new QRegion( hbqt_par_QRegion( 1 )->translated( hb_parni( 2 ), hb_parni( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRegion( new QRegion( hbqt_par_QRegion( 1 )->translated( hb_parni( 2 ), hb_parni( 3 ) ) ) ) ); } /* @@ -286,7 +286,7 @@ HB_FUNC( QT_QREGION_TRANSLATED ) */ HB_FUNC( QT_QREGION_TRANSLATED_1 ) { - hb_retptrGC( gcAllocate_QRegion( new QRegion( hbqt_par_QRegion( 1 )->translated( *hbqt_par_QPoint( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRegion( new QRegion( hbqt_par_QRegion( 1 )->translated( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* @@ -294,7 +294,7 @@ HB_FUNC( QT_QREGION_TRANSLATED_1 ) */ HB_FUNC( QT_QREGION_UNITED ) { - hb_retptrGC( gcAllocate_QRegion( new QRegion( hbqt_par_QRegion( 1 )->united( *hbqt_par_QRegion( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRegion( new QRegion( hbqt_par_QRegion( 1 )->united( *hbqt_par_QRegion( 2 ) ) ) ) ); } /* @@ -302,7 +302,7 @@ HB_FUNC( QT_QREGION_UNITED ) */ HB_FUNC( QT_QREGION_UNITED_1 ) { - hb_retptrGC( gcAllocate_QRegion( new QRegion( hbqt_par_QRegion( 1 )->united( *hbqt_par_QRect( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRegion( new QRegion( hbqt_par_QRegion( 1 )->united( *hbqt_par_QRect( 2 ) ) ) ) ); } /* @@ -310,7 +310,7 @@ HB_FUNC( QT_QREGION_UNITED_1 ) */ HB_FUNC( QT_QREGION_XORED ) { - hb_retptrGC( gcAllocate_QRegion( new QRegion( hbqt_par_QRegion( 1 )->xored( *hbqt_par_QRegion( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRegion( new QRegion( hbqt_par_QRegion( 1 )->xored( *hbqt_par_QRegion( 2 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QResizeEvent.cpp b/harbour/contrib/hbqt/qtgui/QResizeEvent.cpp index 2f48968d08..56fa0375d9 100644 --- a/harbour/contrib/hbqt/qtgui/QResizeEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QResizeEvent.cpp @@ -88,7 +88,7 @@ HB_FUNC( QT_QRESIZEEVENT ) */ HB_FUNC( QT_QRESIZEEVENT_OLDSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QResizeEvent( 1 )->oldSize() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QResizeEvent( 1 )->oldSize() ) ) ); } /* @@ -96,7 +96,7 @@ HB_FUNC( QT_QRESIZEEVENT_OLDSIZE ) */ HB_FUNC( QT_QRESIZEEVENT_SIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QResizeEvent( 1 )->size() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QResizeEvent( 1 )->size() ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QScrollArea.cpp b/harbour/contrib/hbqt/qtgui/QScrollArea.cpp index 4a0284c9b0..eeca063bdf 100644 --- a/harbour/contrib/hbqt/qtgui/QScrollArea.cpp +++ b/harbour/contrib/hbqt/qtgui/QScrollArea.cpp @@ -121,9 +121,9 @@ QT_G_FUNC( release_QScrollArea ) } } -void * gcAllocate_QScrollArea( void * pObj ) +void * hbqt_gcAllocate_QScrollArea( void * pObj ) { - QGC_POINTER_QScrollArea * p = ( QGC_POINTER_QScrollArea * ) hb_gcAllocate( sizeof( QGC_POINTER_QScrollArea ), gcFuncs() ); + QGC_POINTER_QScrollArea * p = ( QGC_POINTER_QScrollArea * ) hb_gcAllocate( sizeof( QGC_POINTER_QScrollArea ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QScrollArea; @@ -138,7 +138,7 @@ HB_FUNC( QT_QSCROLLAREA ) pObj = ( QScrollArea* ) new QScrollArea( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QScrollArea( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QScrollArea( pObj ) ); } /* * Qt::Alignment alignment () const diff --git a/harbour/contrib/hbqt/qtgui/QScrollBar.cpp b/harbour/contrib/hbqt/qtgui/QScrollBar.cpp index e35c042c73..0ea00de553 100644 --- a/harbour/contrib/hbqt/qtgui/QScrollBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QScrollBar.cpp @@ -122,9 +122,9 @@ QT_G_FUNC( release_QScrollBar ) } } -void * gcAllocate_QScrollBar( void * pObj ) +void * hbqt_gcAllocate_QScrollBar( void * pObj ) { - QGC_POINTER_QScrollBar * p = ( QGC_POINTER_QScrollBar * ) hb_gcAllocate( sizeof( QGC_POINTER_QScrollBar ), gcFuncs() ); + QGC_POINTER_QScrollBar * p = ( QGC_POINTER_QScrollBar * ) hb_gcAllocate( sizeof( QGC_POINTER_QScrollBar ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QScrollBar; @@ -139,7 +139,7 @@ HB_FUNC( QT_QSCROLLBAR ) pObj = ( QScrollBar* ) new QScrollBar( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QScrollBar( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QScrollBar( pObj ) ); } /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/QSessionManager.cpp b/harbour/contrib/hbqt/qtgui/QSessionManager.cpp index 2d90479df9..2ccb403341 100644 --- a/harbour/contrib/hbqt/qtgui/QSessionManager.cpp +++ b/harbour/contrib/hbqt/qtgui/QSessionManager.cpp @@ -116,7 +116,7 @@ HB_FUNC( QT_QSESSIONMANAGER_CANCEL ) */ HB_FUNC( QT_QSESSIONMANAGER_DISCARDCOMMAND ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QSessionManager( 1 )->discardCommand() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QSessionManager( 1 )->discardCommand() ) ) ); } /* @@ -148,7 +148,7 @@ HB_FUNC( QT_QSESSIONMANAGER_REQUESTPHASE2 ) */ HB_FUNC( QT_QSESSIONMANAGER_RESTARTCOMMAND ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QSessionManager( 1 )->restartCommand() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QSessionManager( 1 )->restartCommand() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QSizeGrip.cpp b/harbour/contrib/hbqt/qtgui/QSizeGrip.cpp index 495732aa1d..b3201c50d3 100644 --- a/harbour/contrib/hbqt/qtgui/QSizeGrip.cpp +++ b/harbour/contrib/hbqt/qtgui/QSizeGrip.cpp @@ -121,9 +121,9 @@ QT_G_FUNC( release_QSizeGrip ) } } -void * gcAllocate_QSizeGrip( void * pObj ) +void * hbqt_gcAllocate_QSizeGrip( void * pObj ) { - QGC_POINTER_QSizeGrip * p = ( QGC_POINTER_QSizeGrip * ) hb_gcAllocate( sizeof( QGC_POINTER_QSizeGrip ), gcFuncs() ); + QGC_POINTER_QSizeGrip * p = ( QGC_POINTER_QSizeGrip * ) hb_gcAllocate( sizeof( QGC_POINTER_QSizeGrip ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QSizeGrip; @@ -138,7 +138,7 @@ HB_FUNC( QT_QSIZEGRIP ) pObj = ( QSizeGrip* ) new QSizeGrip( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QSizeGrip( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QSizeGrip( pObj ) ); } /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/QSizePolicy.cpp b/harbour/contrib/hbqt/qtgui/QSizePolicy.cpp index 30a92d4660..552dc7851c 100644 --- a/harbour/contrib/hbqt/qtgui/QSizePolicy.cpp +++ b/harbour/contrib/hbqt/qtgui/QSizePolicy.cpp @@ -103,9 +103,9 @@ QT_G_FUNC( release_QSizePolicy ) } } -void * gcAllocate_QSizePolicy( void * pObj ) +void * hbqt_gcAllocate_QSizePolicy( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QSizePolicy; @@ -119,7 +119,7 @@ HB_FUNC( QT_QSIZEPOLICY ) pObj = ( QSizePolicy* ) new QSizePolicy() ; - hb_retptrGC( gcAllocate_QSizePolicy( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QSizePolicy( pObj ) ); } /* * ControlType controlType () const diff --git a/harbour/contrib/hbqt/qtgui/QSlider.cpp b/harbour/contrib/hbqt/qtgui/QSlider.cpp index 7ebff6d1ae..6ebfe38af2 100644 --- a/harbour/contrib/hbqt/qtgui/QSlider.cpp +++ b/harbour/contrib/hbqt/qtgui/QSlider.cpp @@ -126,9 +126,9 @@ QT_G_FUNC( release_QSlider ) } } -void * gcAllocate_QSlider( void * pObj ) +void * hbqt_gcAllocate_QSlider( void * pObj ) { - QGC_POINTER_QSlider * p = ( QGC_POINTER_QSlider * ) hb_gcAllocate( sizeof( QGC_POINTER_QSlider ), gcFuncs() ); + QGC_POINTER_QSlider * p = ( QGC_POINTER_QSlider * ) hb_gcAllocate( sizeof( QGC_POINTER_QSlider ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QSlider; @@ -146,7 +146,7 @@ HB_FUNC( QT_QSLIDER ) else pObj = ( QSlider* ) new QSlider( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QSlider( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QSlider( pObj ) ); } /* * void setTickInterval ( int ti ) diff --git a/harbour/contrib/hbqt/qtgui/QSound.cpp b/harbour/contrib/hbqt/qtgui/QSound.cpp index af1d6f3836..17ba608c77 100644 --- a/harbour/contrib/hbqt/qtgui/QSound.cpp +++ b/harbour/contrib/hbqt/qtgui/QSound.cpp @@ -121,9 +121,9 @@ QT_G_FUNC( release_QSound ) } } -void * gcAllocate_QSound( void * pObj ) +void * hbqt_gcAllocate_QSound( void * pObj ) { - QGC_POINTER_QSound * p = ( QGC_POINTER_QSound * ) hb_gcAllocate( sizeof( QGC_POINTER_QSound ), gcFuncs() ); + QGC_POINTER_QSound * p = ( QGC_POINTER_QSound * ) hb_gcAllocate( sizeof( QGC_POINTER_QSound ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QSound; @@ -138,7 +138,7 @@ HB_FUNC( QT_QSOUND ) pObj = ( QSound* ) new QSound( hbqt_par_QString( 1 ) ) ; - hb_retptrGC( gcAllocate_QSound( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QSound( pObj ) ); } /* * QString fileName () const diff --git a/harbour/contrib/hbqt/qtgui/QSpacerItem.cpp b/harbour/contrib/hbqt/qtgui/QSpacerItem.cpp index 613a102df1..7f94ebd644 100644 --- a/harbour/contrib/hbqt/qtgui/QSpacerItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QSpacerItem.cpp @@ -94,9 +94,9 @@ QT_G_FUNC( release_QSpacerItem ) } } -void * gcAllocate_QSpacerItem( void * pObj ) +void * hbqt_gcAllocate_QSpacerItem( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QSpacerItem; @@ -113,7 +113,7 @@ HB_FUNC( QT_QSPACERITEM ) pObj = new QSpacerItem( *hbqt_par_QSpacerItem( 1 ) ) ; } - hb_retptrGC( gcAllocate_QSpacerItem( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QSpacerItem( pObj ) ); } /* * void changeSize ( int w, int h, QSizePolicy::Policy hPolicy = QSizePolicy::Minimum, QSizePolicy::Policy vPolicy = QSizePolicy::Minimum ) diff --git a/harbour/contrib/hbqt/qtgui/QSpinBox.cpp b/harbour/contrib/hbqt/qtgui/QSpinBox.cpp index 11707ddacc..0f1de57a50 100644 --- a/harbour/contrib/hbqt/qtgui/QSpinBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QSpinBox.cpp @@ -120,9 +120,9 @@ QT_G_FUNC( release_QSpinBox ) } } -void * gcAllocate_QSpinBox( void * pObj ) +void * hbqt_gcAllocate_QSpinBox( void * pObj ) { - QGC_POINTER_QSpinBox * p = ( QGC_POINTER_QSpinBox * ) hb_gcAllocate( sizeof( QGC_POINTER_QSpinBox ), gcFuncs() ); + QGC_POINTER_QSpinBox * p = ( QGC_POINTER_QSpinBox * ) hb_gcAllocate( sizeof( QGC_POINTER_QSpinBox ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QSpinBox; @@ -137,7 +137,7 @@ HB_FUNC( QT_QSPINBOX ) pObj = ( QSpinBox* ) new QSpinBox( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QSpinBox( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QSpinBox( pObj ) ); } /* * QString cleanText () const diff --git a/harbour/contrib/hbqt/qtgui/QSplashScreen.cpp b/harbour/contrib/hbqt/qtgui/QSplashScreen.cpp index 25735c7d91..628548ff15 100644 --- a/harbour/contrib/hbqt/qtgui/QSplashScreen.cpp +++ b/harbour/contrib/hbqt/qtgui/QSplashScreen.cpp @@ -122,9 +122,9 @@ QT_G_FUNC( release_QSplashScreen ) } } -void * gcAllocate_QSplashScreen( void * pObj ) +void * hbqt_gcAllocate_QSplashScreen( void * pObj ) { - QGC_POINTER_QSplashScreen * p = ( QGC_POINTER_QSplashScreen * ) hb_gcAllocate( sizeof( QGC_POINTER_QSplashScreen ), gcFuncs() ); + QGC_POINTER_QSplashScreen * p = ( QGC_POINTER_QSplashScreen * ) hb_gcAllocate( sizeof( QGC_POINTER_QSplashScreen ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QSplashScreen; @@ -139,7 +139,7 @@ HB_FUNC( QT_QSPLASHSCREEN ) pObj = new QSplashScreen( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QSplashScreen( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QSplashScreen( pObj ) ); } /* * void finish ( QWidget * mainWin ) @@ -154,7 +154,7 @@ HB_FUNC( QT_QSPLASHSCREEN_FINISH ) */ HB_FUNC( QT_QSPLASHSCREEN_PIXMAP ) { - hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QSplashScreen( 1 )->pixmap() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( hbqt_par_QSplashScreen( 1 )->pixmap() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QSplitter.cpp b/harbour/contrib/hbqt/qtgui/QSplitter.cpp index 3708925887..34362e227d 100644 --- a/harbour/contrib/hbqt/qtgui/QSplitter.cpp +++ b/harbour/contrib/hbqt/qtgui/QSplitter.cpp @@ -132,9 +132,9 @@ QT_G_FUNC( release_QSplitter ) } } -void * gcAllocate_QSplitter( void * pObj ) +void * hbqt_gcAllocate_QSplitter( void * pObj ) { - QGC_POINTER_QSplitter * p = ( QGC_POINTER_QSplitter * ) hb_gcAllocate( sizeof( QGC_POINTER_QSplitter ), gcFuncs() ); + QGC_POINTER_QSplitter * p = ( QGC_POINTER_QSplitter * ) hb_gcAllocate( sizeof( QGC_POINTER_QSplitter ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QSplitter; @@ -152,7 +152,7 @@ HB_FUNC( QT_QSPLITTER ) else pObj = ( QSplitter* ) new QSplitter( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QSplitter( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QSplitter( pObj ) ); } /* * void addWidget ( QWidget * widget ) @@ -269,7 +269,7 @@ HB_FUNC( QT_QSPLITTER_RESTORESTATE ) */ HB_FUNC( QT_QSPLITTER_SAVESTATE ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QSplitter( 1 )->saveState() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QSplitter( 1 )->saveState() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QStandardItem.cpp b/harbour/contrib/hbqt/qtgui/QStandardItem.cpp index b98f6ff0ea..3825feeba1 100644 --- a/harbour/contrib/hbqt/qtgui/QStandardItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QStandardItem.cpp @@ -118,9 +118,9 @@ QT_G_FUNC( release_QStandardItem ) } } -void * gcAllocate_QStandardItem( void * pObj ) +void * hbqt_gcAllocate_QStandardItem( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStandardItem; @@ -134,7 +134,7 @@ HB_FUNC( QT_QSTANDARDITEM ) pObj = ( QStandardItem* ) new QStandardItem() ; - hb_retptrGC( gcAllocate_QStandardItem( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStandardItem( pObj ) ); } /* * QString accessibleDescription () const @@ -165,7 +165,7 @@ HB_FUNC( QT_QSTANDARDITEM_APPENDROW ) */ HB_FUNC( QT_QSTANDARDITEM_BACKGROUND ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QStandardItem( 1 )->background() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QStandardItem( 1 )->background() ) ) ); } /* @@ -213,7 +213,7 @@ HB_FUNC( QT_QSTANDARDITEM_COLUMNCOUNT ) */ HB_FUNC( QT_QSTANDARDITEM_DATA ) { - hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QStandardItem( 1 )->data( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : Qt::UserRole + 1 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QStandardItem( 1 )->data( ( HB_ISNUM( 2 ) ? hb_parni( 2 ) : Qt::UserRole + 1 ) ) ) ) ); } /* @@ -229,7 +229,7 @@ HB_FUNC( QT_QSTANDARDITEM_FLAGS ) */ HB_FUNC( QT_QSTANDARDITEM_FONT ) { - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QStandardItem( 1 )->font() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QStandardItem( 1 )->font() ) ) ); } /* @@ -237,7 +237,7 @@ HB_FUNC( QT_QSTANDARDITEM_FONT ) */ HB_FUNC( QT_QSTANDARDITEM_FOREGROUND ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QStandardItem( 1 )->foreground() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QStandardItem( 1 )->foreground() ) ) ); } /* @@ -253,7 +253,7 @@ HB_FUNC( QT_QSTANDARDITEM_HASCHILDREN ) */ HB_FUNC( QT_QSTANDARDITEM_ICON ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QStandardItem( 1 )->icon() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QStandardItem( 1 )->icon() ) ) ); } /* @@ -261,7 +261,7 @@ HB_FUNC( QT_QSTANDARDITEM_ICON ) */ HB_FUNC( QT_QSTANDARDITEM_INDEX ) { - hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QStandardItem( 1 )->index() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QStandardItem( 1 )->index() ) ) ); } /* @@ -629,7 +629,7 @@ HB_FUNC( QT_QSTANDARDITEM_SETWHATSTHIS ) */ HB_FUNC( QT_QSTANDARDITEM_SIZEHINT ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QStandardItem( 1 )->sizeHint() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QStandardItem( 1 )->sizeHint() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QStandardItemModel.cpp b/harbour/contrib/hbqt/qtgui/QStandardItemModel.cpp index f23daf6bcc..bafb81009b 100644 --- a/harbour/contrib/hbqt/qtgui/QStandardItemModel.cpp +++ b/harbour/contrib/hbqt/qtgui/QStandardItemModel.cpp @@ -137,9 +137,9 @@ QT_G_FUNC( release_QStandardItemModel ) } } -void * gcAllocate_QStandardItemModel( void * pObj ) +void * hbqt_gcAllocate_QStandardItemModel( void * pObj ) { - QGC_POINTER_QStandardItemModel * p = ( QGC_POINTER_QStandardItemModel * ) hb_gcAllocate( sizeof( QGC_POINTER_QStandardItemModel ), gcFuncs() ); + QGC_POINTER_QStandardItemModel * p = ( QGC_POINTER_QStandardItemModel * ) hb_gcAllocate( sizeof( QGC_POINTER_QStandardItemModel ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStandardItemModel; @@ -154,7 +154,7 @@ HB_FUNC( QT_QSTANDARDITEMMODEL ) pObj = ( QStandardItemModel* ) new QStandardItemModel( hbqt_par_QObject( 1 ) ) ; - hb_retptrGC( gcAllocate_QStandardItemModel( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStandardItemModel( pObj ) ); } /* * void appendRow ( QStandardItem * item ) @@ -185,7 +185,7 @@ HB_FUNC( QT_QSTANDARDITEMMODEL_HORIZONTALHEADERITEM ) */ HB_FUNC( QT_QSTANDARDITEMMODEL_INDEXFROMITEM ) { - hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QStandardItemModel( 1 )->indexFromItem( hbqt_par_QStandardItem( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QStandardItemModel( 1 )->indexFromItem( hbqt_par_QStandardItem( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QStatusBar.cpp b/harbour/contrib/hbqt/qtgui/QStatusBar.cpp index 51a2ce65bd..644e845e74 100644 --- a/harbour/contrib/hbqt/qtgui/QStatusBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QStatusBar.cpp @@ -121,9 +121,9 @@ QT_G_FUNC( release_QStatusBar ) } } -void * gcAllocate_QStatusBar( void * pObj ) +void * hbqt_gcAllocate_QStatusBar( void * pObj ) { - QGC_POINTER_QStatusBar * p = ( QGC_POINTER_QStatusBar * ) hb_gcAllocate( sizeof( QGC_POINTER_QStatusBar ), gcFuncs() ); + QGC_POINTER_QStatusBar * p = ( QGC_POINTER_QStatusBar * ) hb_gcAllocate( sizeof( QGC_POINTER_QStatusBar ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStatusBar; @@ -138,7 +138,7 @@ HB_FUNC( QT_QSTATUSBAR ) pObj = ( QStatusBar* ) new QStatusBar( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QStatusBar( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStatusBar( pObj ) ); } /* * void addPermanentWidget ( QWidget * widget, int stretch = 0 ) diff --git a/harbour/contrib/hbqt/qtgui/QStringListModel.cpp b/harbour/contrib/hbqt/qtgui/QStringListModel.cpp index e9614f6c26..6915cecaef 100644 --- a/harbour/contrib/hbqt/qtgui/QStringListModel.cpp +++ b/harbour/contrib/hbqt/qtgui/QStringListModel.cpp @@ -121,9 +121,9 @@ QT_G_FUNC( release_QStringListModel ) } } -void * gcAllocate_QStringListModel( void * pObj ) +void * hbqt_gcAllocate_QStringListModel( void * pObj ) { - QGC_POINTER_QStringListModel * p = ( QGC_POINTER_QStringListModel * ) hb_gcAllocate( sizeof( QGC_POINTER_QStringListModel ), gcFuncs() ); + QGC_POINTER_QStringListModel * p = ( QGC_POINTER_QStringListModel * ) hb_gcAllocate( sizeof( QGC_POINTER_QStringListModel ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStringListModel; @@ -138,14 +138,14 @@ HB_FUNC( QT_QSTRINGLISTMODEL ) pObj = ( QStringListModel* ) new QStringListModel() ; - hb_retptrGC( gcAllocate_QStringListModel( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStringListModel( pObj ) ); } /* * virtual QVariant data ( const QModelIndex & index, int role ) const */ HB_FUNC( QT_QSTRINGLISTMODEL_DATA ) { - hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QStringListModel( 1 )->data( *hbqt_par_QModelIndex( 2 ), hb_parni( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QStringListModel( 1 )->data( *hbqt_par_QModelIndex( 2 ), hb_parni( 3 ) ) ) ) ); } /* @@ -201,7 +201,7 @@ HB_FUNC( QT_QSTRINGLISTMODEL_SETSTRINGLIST ) */ HB_FUNC( QT_QSTRINGLISTMODEL_STRINGLIST ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QStringListModel( 1 )->stringList() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QStringListModel( 1 )->stringList() ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QStyle.cpp b/harbour/contrib/hbqt/qtgui/QStyle.cpp index 4b7c9d8e3e..51c6482256 100644 --- a/harbour/contrib/hbqt/qtgui/QStyle.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyle.cpp @@ -152,7 +152,7 @@ HB_FUNC( QT_QSTYLE_DRAWPRIMITIVE ) */ HB_FUNC( QT_QSTYLE_GENERATEDICONPIXMAP ) { - hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QStyle( 1 )->generatedIconPixmap( ( QIcon::Mode ) hb_parni( 2 ), *hbqt_par_QPixmap( 3 ), hbqt_par_QStyleOption( 4 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( hbqt_par_QStyle( 1 )->generatedIconPixmap( ( QIcon::Mode ) hb_parni( 2 ), *hbqt_par_QPixmap( 3 ), hbqt_par_QStyleOption( 4 ) ) ) ) ); } /* @@ -168,7 +168,7 @@ HB_FUNC( QT_QSTYLE_HITTESTCOMPLEXCONTROL ) */ HB_FUNC( QT_QSTYLE_ITEMPIXMAPRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QStyle( 1 )->itemPixmapRect( *hbqt_par_QRect( 2 ), hb_parni( 3 ), *hbqt_par_QPixmap( 4 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QStyle( 1 )->itemPixmapRect( *hbqt_par_QRect( 2 ), hb_parni( 3 ), *hbqt_par_QPixmap( 4 ) ) ) ) ); } /* @@ -176,7 +176,7 @@ HB_FUNC( QT_QSTYLE_ITEMPIXMAPRECT ) */ HB_FUNC( QT_QSTYLE_ITEMTEXTRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QStyle( 1 )->itemTextRect( *hbqt_par_QFontMetrics( 2 ), *hbqt_par_QRect( 3 ), hb_parni( 4 ), hb_parl( 5 ), hbqt_par_QString( 6 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QStyle( 1 )->itemTextRect( *hbqt_par_QFontMetrics( 2 ), *hbqt_par_QRect( 3 ), hb_parni( 4 ), hb_parl( 5 ), hbqt_par_QString( 6 ) ) ) ) ); } /* @@ -224,7 +224,7 @@ HB_FUNC( QT_QSTYLE_POLISH_2 ) */ HB_FUNC( QT_QSTYLE_SIZEFROMCONTENTS ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QStyle( 1 )->sizeFromContents( ( QStyle::ContentsType ) hb_parni( 2 ), hbqt_par_QStyleOption( 3 ), *hbqt_par_QSize( 4 ), hbqt_par_QWidget( 5 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QStyle( 1 )->sizeFromContents( ( QStyle::ContentsType ) hb_parni( 2 ), hbqt_par_QStyleOption( 3 ), *hbqt_par_QSize( 4 ), hbqt_par_QWidget( 5 ) ) ) ) ); } /* @@ -232,7 +232,7 @@ HB_FUNC( QT_QSTYLE_SIZEFROMCONTENTS ) */ HB_FUNC( QT_QSTYLE_STANDARDICON ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QStyle( 1 )->standardIcon( ( QStyle::StandardPixmap ) hb_parni( 2 ), hbqt_par_QStyleOption( 3 ), hbqt_par_QWidget( 4 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QStyle( 1 )->standardIcon( ( QStyle::StandardPixmap ) hb_parni( 2 ), hbqt_par_QStyleOption( 3 ), hbqt_par_QWidget( 4 ) ) ) ) ); } /* @@ -240,7 +240,7 @@ HB_FUNC( QT_QSTYLE_STANDARDICON ) */ HB_FUNC( QT_QSTYLE_STANDARDPALETTE ) { - hb_retptrGC( gcAllocate_QPalette( new QPalette( hbqt_par_QStyle( 1 )->standardPalette() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPalette( new QPalette( hbqt_par_QStyle( 1 )->standardPalette() ) ) ); } /* @@ -256,7 +256,7 @@ HB_FUNC( QT_QSTYLE_STYLEHINT ) */ HB_FUNC( QT_QSTYLE_SUBCONTROLRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QStyle( 1 )->subControlRect( ( QStyle::ComplexControl ) hb_parni( 2 ), hbqt_par_QStyleOptionComplex( 3 ), ( QStyle::SubControl ) hb_parni( 4 ), hbqt_par_QWidget( 5 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QStyle( 1 )->subControlRect( ( QStyle::ComplexControl ) hb_parni( 2 ), hbqt_par_QStyleOptionComplex( 3 ), ( QStyle::SubControl ) hb_parni( 4 ), hbqt_par_QWidget( 5 ) ) ) ) ); } /* @@ -264,7 +264,7 @@ HB_FUNC( QT_QSTYLE_SUBCONTROLRECT ) */ HB_FUNC( QT_QSTYLE_SUBELEMENTRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QStyle( 1 )->subElementRect( ( QStyle::SubElement ) hb_parni( 2 ), hbqt_par_QStyleOption( 3 ), hbqt_par_QWidget( 4 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QStyle( 1 )->subElementRect( ( QStyle::SubElement ) hb_parni( 2 ), hbqt_par_QStyleOption( 3 ), hbqt_par_QWidget( 4 ) ) ) ) ); } /* @@ -288,7 +288,7 @@ HB_FUNC( QT_QSTYLE_UNPOLISH_1 ) */ HB_FUNC( QT_QSTYLE_ALIGNEDRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QStyle( 1 )->alignedRect( ( Qt::LayoutDirection ) hb_parni( 2 ), ( Qt::Alignment ) hb_parni( 3 ), *hbqt_par_QSize( 4 ), *hbqt_par_QRect( 5 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QStyle( 1 )->alignedRect( ( Qt::LayoutDirection ) hb_parni( 2 ), ( Qt::Alignment ) hb_parni( 3 ), *hbqt_par_QSize( 4 ), *hbqt_par_QRect( 5 ) ) ) ) ); } /* @@ -320,7 +320,7 @@ HB_FUNC( QT_QSTYLE_VISUALALIGNMENT ) */ HB_FUNC( QT_QSTYLE_VISUALPOS ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QStyle( 1 )->visualPos( ( Qt::LayoutDirection ) hb_parni( 2 ), *hbqt_par_QRect( 3 ), *hbqt_par_QPoint( 4 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QStyle( 1 )->visualPos( ( Qt::LayoutDirection ) hb_parni( 2 ), *hbqt_par_QRect( 3 ), *hbqt_par_QPoint( 4 ) ) ) ) ); } /* @@ -328,7 +328,7 @@ HB_FUNC( QT_QSTYLE_VISUALPOS ) */ HB_FUNC( QT_QSTYLE_VISUALRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QStyle( 1 )->visualRect( ( Qt::LayoutDirection ) hb_parni( 2 ), *hbqt_par_QRect( 3 ), *hbqt_par_QRect( 4 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QStyle( 1 )->visualRect( ( Qt::LayoutDirection ) hb_parni( 2 ), *hbqt_par_QRect( 3 ), *hbqt_par_QRect( 4 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QStyleFactory.cpp b/harbour/contrib/hbqt/qtgui/QStyleFactory.cpp index 8c0b58234d..e71b009bbb 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleFactory.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleFactory.cpp @@ -94,9 +94,9 @@ QT_G_FUNC( release_QStyleFactory ) } } -void * gcAllocate_QStyleFactory( void * pObj ) +void * hbqt_gcAllocate_QStyleFactory( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStyleFactory; @@ -110,7 +110,7 @@ HB_FUNC( QT_QSTYLEFACTORY ) pObj = new QStyleFactory() ; - hb_retptrGC( gcAllocate_QStyleFactory( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStyleFactory( pObj ) ); } /* * QStyle * create ( const QString & key ) @@ -125,7 +125,7 @@ HB_FUNC( QT_QSTYLEFACTORY_CREATE ) */ HB_FUNC( QT_QSTYLEFACTORY_KEYS ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QStyleFactory( 1 )->keys() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QStyleFactory( 1 )->keys() ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QStyleOption.cpp b/harbour/contrib/hbqt/qtgui/QStyleOption.cpp index 557d188df2..e57418641d 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOption.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOption.cpp @@ -102,9 +102,9 @@ QT_G_FUNC( release_QStyleOption ) } } -void * gcAllocate_QStyleOption( void * pObj ) +void * hbqt_gcAllocate_QStyleOption( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStyleOption; @@ -118,7 +118,7 @@ HB_FUNC( QT_QSTYLEOPTION ) pObj = ( QStyleOption* ) new QStyleOption() ; - hb_retptrGC( gcAllocate_QStyleOption( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStyleOption( pObj ) ); } /* * void initFrom ( const QWidget * widget ) @@ -141,7 +141,7 @@ HB_FUNC( QT_QSTYLEOPTION_DIRECTION ) */ HB_FUNC( QT_QSTYLEOPTION_FONTMETRICS ) { - hb_retptrGC( gcAllocate_QFontMetrics( new QFontMetrics( hbqt_par_QStyleOption( 1 )->fontMetrics ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFontMetrics( new QFontMetrics( hbqt_par_QStyleOption( 1 )->fontMetrics ) ) ); } /* @@ -149,7 +149,7 @@ HB_FUNC( QT_QSTYLEOPTION_FONTMETRICS ) */ HB_FUNC( QT_QSTYLEOPTION_PALETTE ) { - hb_retptrGC( gcAllocate_QPalette( new QPalette( hbqt_par_QStyleOption( 1 )->palette ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPalette( new QPalette( hbqt_par_QStyleOption( 1 )->palette ) ) ); } /* @@ -157,7 +157,7 @@ HB_FUNC( QT_QSTYLEOPTION_PALETTE ) */ HB_FUNC( QT_QSTYLEOPTION_RECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QStyleOption( 1 )->rect ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QStyleOption( 1 )->rect ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionButton.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionButton.cpp index aae9baafef..c970b881da 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionButton.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionButton.cpp @@ -102,9 +102,9 @@ QT_G_FUNC( release_QStyleOptionButton ) } } -void * gcAllocate_QStyleOptionButton( void * pObj ) +void * hbqt_gcAllocate_QStyleOptionButton( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStyleOptionButton; @@ -118,7 +118,7 @@ HB_FUNC( QT_QSTYLEOPTIONBUTTON ) pObj = ( QStyleOptionButton* ) new QStyleOptionButton() ; - hb_retptrGC( gcAllocate_QStyleOptionButton( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStyleOptionButton( pObj ) ); } /* * ButtonFeatures features @@ -133,7 +133,7 @@ HB_FUNC( QT_QSTYLEOPTIONBUTTON_FEATURES ) */ HB_FUNC( QT_QSTYLEOPTIONBUTTON_ICON ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QStyleOptionButton( 1 )->icon ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QStyleOptionButton( 1 )->icon ) ) ); } /* @@ -141,7 +141,7 @@ HB_FUNC( QT_QSTYLEOPTIONBUTTON_ICON ) */ HB_FUNC( QT_QSTYLEOPTIONBUTTON_ICONSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QStyleOptionButton( 1 )->iconSize ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QStyleOptionButton( 1 )->iconSize ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionComboBox.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionComboBox.cpp index 347c36b6b2..1fa816cd70 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionComboBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionComboBox.cpp @@ -100,9 +100,9 @@ QT_G_FUNC( release_QStyleOptionComboBox ) } } -void * gcAllocate_QStyleOptionComboBox( void * pObj ) +void * hbqt_gcAllocate_QStyleOptionComboBox( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStyleOptionComboBox; @@ -116,14 +116,14 @@ HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX ) pObj = ( QStyleOptionComboBox* ) new QStyleOptionComboBox() ; - hb_retptrGC( gcAllocate_QStyleOptionComboBox( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStyleOptionComboBox( pObj ) ); } /* * QIcon currentIcon */ HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX_CURRENTICON ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QStyleOptionComboBox( 1 )->currentIcon ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QStyleOptionComboBox( 1 )->currentIcon ) ) ); } /* @@ -155,7 +155,7 @@ HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX_FRAME ) */ HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX_ICONSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QStyleOptionComboBox( 1 )->iconSize ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QStyleOptionComboBox( 1 )->iconSize ) ) ); } /* @@ -163,7 +163,7 @@ HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX_ICONSIZE ) */ HB_FUNC( QT_QSTYLEOPTIONCOMBOBOX_POPUPRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QStyleOptionComboBox( 1 )->popupRect ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QStyleOptionComboBox( 1 )->popupRect ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionComplex.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionComplex.cpp index b830948c1c..38572dc260 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionComplex.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionComplex.cpp @@ -100,9 +100,9 @@ QT_G_FUNC( release_QStyleOptionComplex ) } } -void * gcAllocate_QStyleOptionComplex( void * pObj ) +void * hbqt_gcAllocate_QStyleOptionComplex( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStyleOptionComplex; @@ -116,7 +116,7 @@ HB_FUNC( QT_QSTYLEOPTIONCOMPLEX ) pObj = ( QStyleOptionComplex* ) new QStyleOptionComplex() ; - hb_retptrGC( gcAllocate_QStyleOptionComplex( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStyleOptionComplex( pObj ) ); } /* * QStyle::SubControls activeSubControls diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionDockWidget.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionDockWidget.cpp index dbed4eb27d..c013a14b05 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionDockWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionDockWidget.cpp @@ -100,9 +100,9 @@ QT_G_FUNC( release_QStyleOptionDockWidget ) } } -void * gcAllocate_QStyleOptionDockWidget( void * pObj ) +void * hbqt_gcAllocate_QStyleOptionDockWidget( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStyleOptionDockWidget; @@ -116,7 +116,7 @@ HB_FUNC( QT_QSTYLEOPTIONDOCKWIDGET ) pObj = ( QStyleOptionDockWidget* ) new QStyleOptionDockWidget() ; - hb_retptrGC( gcAllocate_QStyleOptionDockWidget( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStyleOptionDockWidget( pObj ) ); } /* * bool closable diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionFocusRect.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionFocusRect.cpp index 25ede71a93..6502e5f893 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionFocusRect.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionFocusRect.cpp @@ -100,9 +100,9 @@ QT_G_FUNC( release_QStyleOptionFocusRect ) } } -void * gcAllocate_QStyleOptionFocusRect( void * pObj ) +void * hbqt_gcAllocate_QStyleOptionFocusRect( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStyleOptionFocusRect; @@ -116,14 +116,14 @@ HB_FUNC( QT_QSTYLEOPTIONFOCUSRECT ) pObj = ( QStyleOptionFocusRect* ) new QStyleOptionFocusRect() ; - hb_retptrGC( gcAllocate_QStyleOptionFocusRect( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStyleOptionFocusRect( pObj ) ); } /* * QColor backgroundColor */ HB_FUNC( QT_QSTYLEOPTIONFOCUSRECT_BACKGROUNDCOLOR ) { - hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QStyleOptionFocusRect( 1 )->backgroundColor ) ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QStyleOptionFocusRect( 1 )->backgroundColor ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionFrame.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionFrame.cpp index ca97128079..474eedc182 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionFrame.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionFrame.cpp @@ -100,9 +100,9 @@ QT_G_FUNC( release_QStyleOptionFrame ) } } -void * gcAllocate_QStyleOptionFrame( void * pObj ) +void * hbqt_gcAllocate_QStyleOptionFrame( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStyleOptionFrame; @@ -116,7 +116,7 @@ HB_FUNC( QT_QSTYLEOPTIONFRAME ) pObj = ( QStyleOptionFrame* ) new QStyleOptionFrame() ; - hb_retptrGC( gcAllocate_QStyleOptionFrame( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStyleOptionFrame( pObj ) ); } /* * int lineWidth diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionGroupBox.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionGroupBox.cpp index 97d69904c3..53f2a63fc9 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionGroupBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionGroupBox.cpp @@ -100,9 +100,9 @@ QT_G_FUNC( release_QStyleOptionGroupBox ) } } -void * gcAllocate_QStyleOptionGroupBox( void * pObj ) +void * hbqt_gcAllocate_QStyleOptionGroupBox( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStyleOptionGroupBox; @@ -116,7 +116,7 @@ HB_FUNC( QT_QSTYLEOPTIONGROUPBOX ) pObj = ( QStyleOptionGroupBox* ) new QStyleOptionGroupBox() ; - hb_retptrGC( gcAllocate_QStyleOptionGroupBox( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStyleOptionGroupBox( pObj ) ); } /* * QStyleOptionFrameV2::FrameFeatures features @@ -163,7 +163,7 @@ HB_FUNC( QT_QSTYLEOPTIONGROUPBOX_TEXTALIGNMENT ) */ HB_FUNC( QT_QSTYLEOPTIONGROUPBOX_TEXTCOLOR ) { - hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QStyleOptionGroupBox( 1 )->textColor ) ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QStyleOptionGroupBox( 1 )->textColor ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionHeader.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionHeader.cpp index bac001f8b2..961259e8a8 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionHeader.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionHeader.cpp @@ -103,9 +103,9 @@ QT_G_FUNC( release_QStyleOptionHeader ) } } -void * gcAllocate_QStyleOptionHeader( void * pObj ) +void * hbqt_gcAllocate_QStyleOptionHeader( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStyleOptionHeader; @@ -119,14 +119,14 @@ HB_FUNC( QT_QSTYLEOPTIONHEADER ) pObj = ( QStyleOptionHeader* ) new QStyleOptionHeader() ; - hb_retptrGC( gcAllocate_QStyleOptionHeader( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStyleOptionHeader( pObj ) ); } /* * QIcon icon */ HB_FUNC( QT_QSTYLEOPTIONHEADER_ICON ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QStyleOptionHeader( 1 )->icon ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QStyleOptionHeader( 1 )->icon ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionMenuItem.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionMenuItem.cpp index f1aa6d2b5b..e093e0a463 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionMenuItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionMenuItem.cpp @@ -102,9 +102,9 @@ QT_G_FUNC( release_QStyleOptionMenuItem ) } } -void * gcAllocate_QStyleOptionMenuItem( void * pObj ) +void * hbqt_gcAllocate_QStyleOptionMenuItem( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStyleOptionMenuItem; @@ -118,7 +118,7 @@ HB_FUNC( QT_QSTYLEOPTIONMENUITEM ) pObj = ( QStyleOptionMenuItem* ) new QStyleOptionMenuItem() ; - hb_retptrGC( gcAllocate_QStyleOptionMenuItem( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStyleOptionMenuItem( pObj ) ); } /* * CheckType checkType @@ -141,7 +141,7 @@ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_CHECKED ) */ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_FONT ) { - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QStyleOptionMenuItem( 1 )->font ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QStyleOptionMenuItem( 1 )->font ) ) ); } /* @@ -149,7 +149,7 @@ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_FONT ) */ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_ICON ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QStyleOptionMenuItem( 1 )->icon ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QStyleOptionMenuItem( 1 )->icon ) ) ); } /* @@ -181,7 +181,7 @@ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_MENUITEMTYPE ) */ HB_FUNC( QT_QSTYLEOPTIONMENUITEM_MENURECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QStyleOptionMenuItem( 1 )->menuRect ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QStyleOptionMenuItem( 1 )->menuRect ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionProgressBar.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionProgressBar.cpp index 9b44c98480..ba159b50b1 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionProgressBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionProgressBar.cpp @@ -101,9 +101,9 @@ QT_G_FUNC( release_QStyleOptionProgressBar ) } } -void * gcAllocate_QStyleOptionProgressBar( void * pObj ) +void * hbqt_gcAllocate_QStyleOptionProgressBar( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStyleOptionProgressBar; @@ -117,7 +117,7 @@ HB_FUNC( QT_QSTYLEOPTIONPROGRESSBAR ) pObj = ( QStyleOptionProgressBar* ) new QStyleOptionProgressBar() ; - hb_retptrGC( gcAllocate_QStyleOptionProgressBar( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStyleOptionProgressBar( pObj ) ); } /* * int maximum diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionSizeGrip.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionSizeGrip.cpp index 6b0a54916b..fc2bf0927f 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionSizeGrip.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionSizeGrip.cpp @@ -100,9 +100,9 @@ QT_G_FUNC( release_QStyleOptionSizeGrip ) } } -void * gcAllocate_QStyleOptionSizeGrip( void * pObj ) +void * hbqt_gcAllocate_QStyleOptionSizeGrip( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStyleOptionSizeGrip; @@ -116,7 +116,7 @@ HB_FUNC( QT_QSTYLEOPTIONSIZEGRIP ) pObj = ( QStyleOptionSizeGrip* ) new QStyleOptionSizeGrip() ; - hb_retptrGC( gcAllocate_QStyleOptionSizeGrip( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStyleOptionSizeGrip( pObj ) ); } /* * Qt::Corner corner diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionSlider.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionSlider.cpp index a12fd762e6..e0be5d74d3 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionSlider.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionSlider.cpp @@ -100,9 +100,9 @@ QT_G_FUNC( release_QStyleOptionSlider ) } } -void * gcAllocate_QStyleOptionSlider( void * pObj ) +void * hbqt_gcAllocate_QStyleOptionSlider( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStyleOptionSlider; @@ -116,7 +116,7 @@ HB_FUNC( QT_QSTYLEOPTIONSLIDER ) pObj = ( QStyleOptionSlider* ) new QStyleOptionSlider() ; - hb_retptrGC( gcAllocate_QStyleOptionSlider( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStyleOptionSlider( pObj ) ); } /* * bool dialWrapping diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionSpinBox.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionSpinBox.cpp index abb378fb7a..c55c31e62e 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionSpinBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionSpinBox.cpp @@ -100,9 +100,9 @@ QT_G_FUNC( release_QStyleOptionSpinBox ) } } -void * gcAllocate_QStyleOptionSpinBox( void * pObj ) +void * hbqt_gcAllocate_QStyleOptionSpinBox( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStyleOptionSpinBox; @@ -116,7 +116,7 @@ HB_FUNC( QT_QSTYLEOPTIONSPINBOX ) pObj = ( QStyleOptionSpinBox* ) new QStyleOptionSpinBox() ; - hb_retptrGC( gcAllocate_QStyleOptionSpinBox( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStyleOptionSpinBox( pObj ) ); } /* * QAbstractSpinBox::ButtonSymbols buttonSymbols diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionTab.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionTab.cpp index af5494769e..f3c005a179 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionTab.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionTab.cpp @@ -104,9 +104,9 @@ QT_G_FUNC( release_QStyleOptionTab ) } } -void * gcAllocate_QStyleOptionTab( void * pObj ) +void * hbqt_gcAllocate_QStyleOptionTab( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStyleOptionTab; @@ -120,7 +120,7 @@ HB_FUNC( QT_QSTYLEOPTIONTAB ) pObj = ( QStyleOptionTab* ) new QStyleOptionTab() ; - hb_retptrGC( gcAllocate_QStyleOptionTab( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStyleOptionTab( pObj ) ); } /* * CornerWidgets cornerWidgets @@ -135,7 +135,7 @@ HB_FUNC( QT_QSTYLEOPTIONTAB_CORNERWIDGETS ) */ HB_FUNC( QT_QSTYLEOPTIONTAB_ICON ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QStyleOptionTab( 1 )->icon ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QStyleOptionTab( 1 )->icon ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionTabBarBase.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionTabBarBase.cpp index af806c5a51..b58ce195fc 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionTabBarBase.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionTabBarBase.cpp @@ -100,9 +100,9 @@ QT_G_FUNC( release_QStyleOptionTabBarBase ) } } -void * gcAllocate_QStyleOptionTabBarBase( void * pObj ) +void * hbqt_gcAllocate_QStyleOptionTabBarBase( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStyleOptionTabBarBase; @@ -116,14 +116,14 @@ HB_FUNC( QT_QSTYLEOPTIONTABBARBASE ) pObj = ( QStyleOptionTabBarBase* ) new QStyleOptionTabBarBase() ; - hb_retptrGC( gcAllocate_QStyleOptionTabBarBase( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStyleOptionTabBarBase( pObj ) ); } /* * QRect selectedTabRect */ HB_FUNC( QT_QSTYLEOPTIONTABBARBASE_SELECTEDTABRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QStyleOptionTabBarBase( 1 )->selectedTabRect ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QStyleOptionTabBarBase( 1 )->selectedTabRect ) ) ); } /* @@ -139,7 +139,7 @@ HB_FUNC( QT_QSTYLEOPTIONTABBARBASE_SHAPE ) */ HB_FUNC( QT_QSTYLEOPTIONTABBARBASE_TABBARRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QStyleOptionTabBarBase( 1 )->tabBarRect ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QStyleOptionTabBarBase( 1 )->tabBarRect ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionTabWidgetFrame.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionTabWidgetFrame.cpp index da55b57649..ba4b332c08 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionTabWidgetFrame.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionTabWidgetFrame.cpp @@ -100,9 +100,9 @@ QT_G_FUNC( release_QStyleOptionTabWidgetFrame ) } } -void * gcAllocate_QStyleOptionTabWidgetFrame( void * pObj ) +void * hbqt_gcAllocate_QStyleOptionTabWidgetFrame( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStyleOptionTabWidgetFrame; @@ -116,14 +116,14 @@ HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME ) pObj = ( QStyleOptionTabWidgetFrame* ) new QStyleOptionTabWidgetFrame() ; - hb_retptrGC( gcAllocate_QStyleOptionTabWidgetFrame( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStyleOptionTabWidgetFrame( pObj ) ); } /* * QSize leftCornerWidgetSize */ HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME_LEFTCORNERWIDGETSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QStyleOptionTabWidgetFrame( 1 )->leftCornerWidgetSize ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QStyleOptionTabWidgetFrame( 1 )->leftCornerWidgetSize ) ) ); } /* @@ -147,7 +147,7 @@ HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME_MIDLINEWIDTH ) */ HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME_RIGHTCORNERWIDGETSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QStyleOptionTabWidgetFrame( 1 )->rightCornerWidgetSize ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QStyleOptionTabWidgetFrame( 1 )->rightCornerWidgetSize ) ) ); } /* @@ -163,7 +163,7 @@ HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME_SHAPE ) */ HB_FUNC( QT_QSTYLEOPTIONTABWIDGETFRAME_TABBARSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QStyleOptionTabWidgetFrame( 1 )->tabBarSize ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QStyleOptionTabWidgetFrame( 1 )->tabBarSize ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionTitleBar.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionTitleBar.cpp index f29c0dbdec..4de4a9d8f0 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionTitleBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionTitleBar.cpp @@ -100,9 +100,9 @@ QT_G_FUNC( release_QStyleOptionTitleBar ) } } -void * gcAllocate_QStyleOptionTitleBar( void * pObj ) +void * hbqt_gcAllocate_QStyleOptionTitleBar( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStyleOptionTitleBar; @@ -116,14 +116,14 @@ HB_FUNC( QT_QSTYLEOPTIONTITLEBAR ) pObj = ( QStyleOptionTitleBar* ) new QStyleOptionTitleBar() ; - hb_retptrGC( gcAllocate_QStyleOptionTitleBar( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStyleOptionTitleBar( pObj ) ); } /* * QIcon icon */ HB_FUNC( QT_QSTYLEOPTIONTITLEBAR_ICON ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QStyleOptionTitleBar( 1 )->icon ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QStyleOptionTitleBar( 1 )->icon ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionToolBar.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionToolBar.cpp index 65ab5f999f..1ed66f4572 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionToolBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionToolBar.cpp @@ -103,9 +103,9 @@ QT_G_FUNC( release_QStyleOptionToolBar ) } } -void * gcAllocate_QStyleOptionToolBar( void * pObj ) +void * hbqt_gcAllocate_QStyleOptionToolBar( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStyleOptionToolBar; @@ -119,7 +119,7 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBAR ) pObj = ( QStyleOptionToolBar* ) new QStyleOptionToolBar() ; - hb_retptrGC( gcAllocate_QStyleOptionToolBar( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStyleOptionToolBar( pObj ) ); } /* * ToolBarFeatures features diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionToolBox.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionToolBox.cpp index c30a8b707c..240785575d 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionToolBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionToolBox.cpp @@ -100,9 +100,9 @@ QT_G_FUNC( release_QStyleOptionToolBox ) } } -void * gcAllocate_QStyleOptionToolBox( void * pObj ) +void * hbqt_gcAllocate_QStyleOptionToolBox( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStyleOptionToolBox; @@ -116,14 +116,14 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBOX ) pObj = ( QStyleOptionToolBox* ) new QStyleOptionToolBox() ; - hb_retptrGC( gcAllocate_QStyleOptionToolBox( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStyleOptionToolBox( pObj ) ); } /* * QIcon icon */ HB_FUNC( QT_QSTYLEOPTIONTOOLBOX_ICON ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QStyleOptionToolBox( 1 )->icon ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QStyleOptionToolBox( 1 )->icon ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionToolButton.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionToolButton.cpp index 9a4a4575b1..844ab912b3 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionToolButton.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionToolButton.cpp @@ -102,9 +102,9 @@ QT_G_FUNC( release_QStyleOptionToolButton ) } } -void * gcAllocate_QStyleOptionToolButton( void * pObj ) +void * hbqt_gcAllocate_QStyleOptionToolButton( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStyleOptionToolButton; @@ -118,7 +118,7 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON ) pObj = ( QStyleOptionToolButton* ) new QStyleOptionToolButton() ; - hb_retptrGC( gcAllocate_QStyleOptionToolButton( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStyleOptionToolButton( pObj ) ); } /* * Qt::ArrowType arrowType @@ -141,7 +141,7 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_FEATURES ) */ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_FONT ) { - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QStyleOptionToolButton( 1 )->font ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QStyleOptionToolButton( 1 )->font ) ) ); } /* @@ -149,7 +149,7 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_FONT ) */ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_ICON ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QStyleOptionToolButton( 1 )->icon ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QStyleOptionToolButton( 1 )->icon ) ) ); } /* @@ -157,7 +157,7 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_ICON ) */ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_ICONSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QStyleOptionToolButton( 1 )->iconSize ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QStyleOptionToolButton( 1 )->iconSize ) ) ); } /* @@ -165,7 +165,7 @@ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_ICONSIZE ) */ HB_FUNC( QT_QSTYLEOPTIONTOOLBUTTON_POS ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QStyleOptionToolButton( 1 )->pos ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QStyleOptionToolButton( 1 )->pos ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QStyleOptionViewItem.cpp b/harbour/contrib/hbqt/qtgui/QStyleOptionViewItem.cpp index a74ef31f0a..e726ca3205 100644 --- a/harbour/contrib/hbqt/qtgui/QStyleOptionViewItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyleOptionViewItem.cpp @@ -101,9 +101,9 @@ QT_G_FUNC( release_QStyleOptionViewItem ) } } -void * gcAllocate_QStyleOptionViewItem( void * pObj ) +void * hbqt_gcAllocate_QStyleOptionViewItem( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStyleOptionViewItem; @@ -117,7 +117,7 @@ HB_FUNC( QT_QSTYLEOPTIONVIEWITEM ) pObj = ( QStyleOptionViewItem* ) new QStyleOptionViewItem() ; - hb_retptrGC( gcAllocate_QStyleOptionViewItem( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStyleOptionViewItem( pObj ) ); } /* * Qt::Alignment decorationAlignment @@ -140,7 +140,7 @@ HB_FUNC( QT_QSTYLEOPTIONVIEWITEM_DECORATIONPOSITION ) */ HB_FUNC( QT_QSTYLEOPTIONVIEWITEM_DECORATIONSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QStyleOptionViewItem( 1 )->decorationSize ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QStyleOptionViewItem( 1 )->decorationSize ) ) ); } /* @@ -156,7 +156,7 @@ HB_FUNC( QT_QSTYLEOPTIONVIEWITEM_DISPLAYALIGNMENT ) */ HB_FUNC( QT_QSTYLEOPTIONVIEWITEM_FONT ) { - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QStyleOptionViewItem( 1 )->font ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QStyleOptionViewItem( 1 )->font ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QStylePainter.cpp b/harbour/contrib/hbqt/qtgui/QStylePainter.cpp index ab6c527c5d..b5ba6dc3d0 100644 --- a/harbour/contrib/hbqt/qtgui/QStylePainter.cpp +++ b/harbour/contrib/hbqt/qtgui/QStylePainter.cpp @@ -96,9 +96,9 @@ QT_G_FUNC( release_QStylePainter ) } } -void * gcAllocate_QStylePainter( void * pObj ) +void * hbqt_gcAllocate_QStylePainter( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStylePainter; @@ -112,7 +112,7 @@ HB_FUNC( QT_QSTYLEPAINTER ) pObj = ( QStylePainter* ) new QStylePainter() ; - hb_retptrGC( gcAllocate_QStylePainter( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStylePainter( pObj ) ); } /* * bool begin ( QWidget * widget ) diff --git a/harbour/contrib/hbqt/qtgui/QStyledItemDelegate.cpp b/harbour/contrib/hbqt/qtgui/QStyledItemDelegate.cpp index 5c245d49e8..83556d71dc 100644 --- a/harbour/contrib/hbqt/qtgui/QStyledItemDelegate.cpp +++ b/harbour/contrib/hbqt/qtgui/QStyledItemDelegate.cpp @@ -121,9 +121,9 @@ QT_G_FUNC( release_QStyledItemDelegate ) } } -void * gcAllocate_QStyledItemDelegate( void * pObj ) +void * hbqt_gcAllocate_QStyledItemDelegate( void * pObj ) { - QGC_POINTER_QStyledItemDelegate * p = ( QGC_POINTER_QStyledItemDelegate * ) hb_gcAllocate( sizeof( QGC_POINTER_QStyledItemDelegate ), gcFuncs() ); + QGC_POINTER_QStyledItemDelegate * p = ( QGC_POINTER_QStyledItemDelegate * ) hb_gcAllocate( sizeof( QGC_POINTER_QStyledItemDelegate ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QStyledItemDelegate; @@ -138,7 +138,7 @@ HB_FUNC( QT_QSTYLEDITEMDELEGATE ) pObj = ( QStyledItemDelegate* ) new QStyledItemDelegate( hbqt_par_QObject( 1 ) ) ; - hb_retptrGC( gcAllocate_QStyledItemDelegate( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QStyledItemDelegate( pObj ) ); } /* * virtual QWidget * createEditor ( QWidget * parent, const QStyleOptionViewItem & option, const QModelIndex & index ) const @@ -185,7 +185,7 @@ HB_FUNC( QT_QSTYLEDITEMDELEGATE_SETMODELDATA ) */ HB_FUNC( QT_QSTYLEDITEMDELEGATE_SIZEHINT ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QStyledItemDelegate( 1 )->sizeHint( *hbqt_par_QStyleOptionViewItem( 2 ), *hbqt_par_QModelIndex( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QStyledItemDelegate( 1 )->sizeHint( *hbqt_par_QStyleOptionViewItem( 2 ), *hbqt_par_QModelIndex( 3 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QSyntaxHighlighter.cpp b/harbour/contrib/hbqt/qtgui/QSyntaxHighlighter.cpp index 82cd7919df..62bc5e8b12 100644 --- a/harbour/contrib/hbqt/qtgui/QSyntaxHighlighter.cpp +++ b/harbour/contrib/hbqt/qtgui/QSyntaxHighlighter.cpp @@ -123,9 +123,9 @@ QT_G_FUNC( release_QSyntaxHighlighter ) } } -void * gcAllocate_QSyntaxHighlighter( void * pObj ) +void * hbqt_gcAllocate_QSyntaxHighlighter( void * pObj ) { - QGC_POINTER_QSyntaxHighlighter * p = ( QGC_POINTER_QSyntaxHighlighter * ) hb_gcAllocate( sizeof( QGC_POINTER_QSyntaxHighlighter ), gcFuncs() ); + QGC_POINTER_QSyntaxHighlighter * p = ( QGC_POINTER_QSyntaxHighlighter * ) hb_gcAllocate( sizeof( QGC_POINTER_QSyntaxHighlighter ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QSyntaxHighlighter; @@ -143,7 +143,7 @@ HB_FUNC( QT_QSYNTAXHIGHLIGHTER ) pObj = new HBQSyntaxHighlighter( hbqt_par_QTextDocument( 1 ) ) ; } - hb_retptrGC( gcAllocate_QSyntaxHighlighter( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QSyntaxHighlighter( pObj ) ); } /* * QTextDocument * document () const diff --git a/harbour/contrib/hbqt/qtgui/QSystemTrayIcon.cpp b/harbour/contrib/hbqt/qtgui/QSystemTrayIcon.cpp index 0dceb83744..6d490bbaee 100644 --- a/harbour/contrib/hbqt/qtgui/QSystemTrayIcon.cpp +++ b/harbour/contrib/hbqt/qtgui/QSystemTrayIcon.cpp @@ -127,9 +127,9 @@ QT_G_FUNC( release_QSystemTrayIcon ) } } -void * gcAllocate_QSystemTrayIcon( void * pObj ) +void * hbqt_gcAllocate_QSystemTrayIcon( void * pObj ) { - QGC_POINTER_QSystemTrayIcon * p = ( QGC_POINTER_QSystemTrayIcon * ) hb_gcAllocate( sizeof( QGC_POINTER_QSystemTrayIcon ), gcFuncs() ); + QGC_POINTER_QSystemTrayIcon * p = ( QGC_POINTER_QSystemTrayIcon * ) hb_gcAllocate( sizeof( QGC_POINTER_QSystemTrayIcon ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QSystemTrayIcon; @@ -144,7 +144,7 @@ HB_FUNC( QT_QSYSTEMTRAYICON ) pObj = ( QSystemTrayIcon* ) new QSystemTrayIcon( hbqt_par_QObject( 1 ) ) ; - hb_retptrGC( gcAllocate_QSystemTrayIcon( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QSystemTrayIcon( pObj ) ); } /* * QMenu * contextMenu () const @@ -159,7 +159,7 @@ HB_FUNC( QT_QSYSTEMTRAYICON_CONTEXTMENU ) */ HB_FUNC( QT_QSYSTEMTRAYICON_GEOMETRY ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QSystemTrayIcon( 1 )->geometry() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QSystemTrayIcon( 1 )->geometry() ) ) ); } /* @@ -167,7 +167,7 @@ HB_FUNC( QT_QSYSTEMTRAYICON_GEOMETRY ) */ HB_FUNC( QT_QSYSTEMTRAYICON_ICON ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QSystemTrayIcon( 1 )->icon() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QSystemTrayIcon( 1 )->icon() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QTabBar.cpp b/harbour/contrib/hbqt/qtgui/QTabBar.cpp index 253eea03ba..da8beb0fe7 100644 --- a/harbour/contrib/hbqt/qtgui/QTabBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QTabBar.cpp @@ -128,9 +128,9 @@ QT_G_FUNC( release_QTabBar ) } } -void * gcAllocate_QTabBar( void * pObj ) +void * hbqt_gcAllocate_QTabBar( void * pObj ) { - QGC_POINTER_QTabBar * p = ( QGC_POINTER_QTabBar * ) hb_gcAllocate( sizeof( QGC_POINTER_QTabBar ), gcFuncs() ); + QGC_POINTER_QTabBar * p = ( QGC_POINTER_QTabBar * ) hb_gcAllocate( sizeof( QGC_POINTER_QTabBar ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTabBar; @@ -145,7 +145,7 @@ HB_FUNC( QT_QTABBAR ) pObj = ( QTabBar* ) new QTabBar( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QTabBar( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTabBar( pObj ) ); } /* * int addTab ( const QString & text ) @@ -208,7 +208,7 @@ HB_FUNC( QT_QTABBAR_EXPANDING ) */ HB_FUNC( QT_QTABBAR_ICONSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QTabBar( 1 )->iconSize() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QTabBar( 1 )->iconSize() ) ) ); } /* @@ -424,7 +424,7 @@ HB_FUNC( QT_QTABBAR_TABBUTTON ) */ HB_FUNC( QT_QTABBAR_TABDATA ) { - hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QTabBar( 1 )->tabData( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QTabBar( 1 )->tabData( hb_parni( 2 ) ) ) ) ); } /* @@ -432,7 +432,7 @@ HB_FUNC( QT_QTABBAR_TABDATA ) */ HB_FUNC( QT_QTABBAR_TABICON ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QTabBar( 1 )->tabIcon( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QTabBar( 1 )->tabIcon( hb_parni( 2 ) ) ) ) ); } /* @@ -440,7 +440,7 @@ HB_FUNC( QT_QTABBAR_TABICON ) */ HB_FUNC( QT_QTABBAR_TABRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QTabBar( 1 )->tabRect( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QTabBar( 1 )->tabRect( hb_parni( 2 ) ) ) ) ); } /* @@ -456,7 +456,7 @@ HB_FUNC( QT_QTABBAR_TABTEXT ) */ HB_FUNC( QT_QTABBAR_TABTEXTCOLOR ) { - hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QTabBar( 1 )->tabTextColor( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QTabBar( 1 )->tabTextColor( hb_parni( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QTabWidget.cpp b/harbour/contrib/hbqt/qtgui/QTabWidget.cpp index 97d9dc99b2..a507ddb300 100644 --- a/harbour/contrib/hbqt/qtgui/QTabWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QTabWidget.cpp @@ -126,9 +126,9 @@ QT_G_FUNC( release_QTabWidget ) } } -void * gcAllocate_QTabWidget( void * pObj ) +void * hbqt_gcAllocate_QTabWidget( void * pObj ) { - QGC_POINTER_QTabWidget * p = ( QGC_POINTER_QTabWidget * ) hb_gcAllocate( sizeof( QGC_POINTER_QTabWidget ), gcFuncs() ); + QGC_POINTER_QTabWidget * p = ( QGC_POINTER_QTabWidget * ) hb_gcAllocate( sizeof( QGC_POINTER_QTabWidget ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTabWidget; @@ -143,7 +143,7 @@ HB_FUNC( QT_QTABWIDGET ) pObj = ( QTabWidget* ) new QTabWidget( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QTabWidget( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTabWidget( pObj ) ); } /* * int addTab ( QWidget * page, const QString & label ) @@ -222,7 +222,7 @@ HB_FUNC( QT_QTABWIDGET_ELIDEMODE ) */ HB_FUNC( QT_QTABWIDGET_ICONSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QTabWidget( 1 )->iconSize() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QTabWidget( 1 )->iconSize() ) ) ); } /* @@ -390,7 +390,7 @@ HB_FUNC( QT_QTABWIDGET_SETUSESSCROLLBUTTONS ) */ HB_FUNC( QT_QTABWIDGET_TABICON ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QTabWidget( 1 )->tabIcon( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QTabWidget( 1 )->tabIcon( hb_parni( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QTableView.cpp b/harbour/contrib/hbqt/qtgui/QTableView.cpp index ddd97b5311..4beafc512b 100644 --- a/harbour/contrib/hbqt/qtgui/QTableView.cpp +++ b/harbour/contrib/hbqt/qtgui/QTableView.cpp @@ -123,9 +123,9 @@ QT_G_FUNC( release_QTableView ) } } -void * gcAllocate_QTableView( void * pObj ) +void * hbqt_gcAllocate_QTableView( void * pObj ) { - QGC_POINTER_QTableView * p = ( QGC_POINTER_QTableView * ) hb_gcAllocate( sizeof( QGC_POINTER_QTableView ), gcFuncs() ); + QGC_POINTER_QTableView * p = ( QGC_POINTER_QTableView * ) hb_gcAllocate( sizeof( QGC_POINTER_QTableView ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTableView; @@ -140,7 +140,7 @@ HB_FUNC( QT_QTABLEVIEW ) pObj = ( QTableView* ) new QTableView( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QTableView( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTableView( pObj ) ); } /* * void clearSpans () @@ -203,7 +203,7 @@ HB_FUNC( QT_QTABLEVIEW_HORIZONTALHEADER ) */ HB_FUNC( QT_QTABLEVIEW_INDEXAT ) { - hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QTableView( 1 )->indexAt( *hbqt_par_QPoint( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QTableView( 1 )->indexAt( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QTableWidget.cpp b/harbour/contrib/hbqt/qtgui/QTableWidget.cpp index 641979b1b9..f9b3b39748 100644 --- a/harbour/contrib/hbqt/qtgui/QTableWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QTableWidget.cpp @@ -133,9 +133,9 @@ QT_G_FUNC( release_QTableWidget ) } } -void * gcAllocate_QTableWidget( void * pObj ) +void * hbqt_gcAllocate_QTableWidget( void * pObj ) { - QGC_POINTER_QTableWidget * p = ( QGC_POINTER_QTableWidget * ) hb_gcAllocate( sizeof( QGC_POINTER_QTableWidget ), gcFuncs() ); + QGC_POINTER_QTableWidget * p = ( QGC_POINTER_QTableWidget * ) hb_gcAllocate( sizeof( QGC_POINTER_QTableWidget ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTableWidget; @@ -153,7 +153,7 @@ HB_FUNC( QT_QTABLEWIDGET ) else pObj = ( QTableWidget* ) new QTableWidget( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QTableWidget( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTableWidget( pObj ) ); } /* * QWidget * cellWidget ( int row, int column ) const @@ -456,7 +456,7 @@ HB_FUNC( QT_QTABLEWIDGET_VISUALCOLUMN ) */ HB_FUNC( QT_QTABLEWIDGET_VISUALITEMRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QTableWidget( 1 )->visualItemRect( hbqt_par_QTableWidgetItem( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QTableWidget( 1 )->visualItemRect( hbqt_par_QTableWidgetItem( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QTableWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/QTableWidgetItem.cpp index 3a05bc95c1..381bf427c0 100644 --- a/harbour/contrib/hbqt/qtgui/QTableWidgetItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QTableWidgetItem.cpp @@ -102,9 +102,9 @@ QT_G_FUNC( release_QTableWidgetItem ) } } -void * gcAllocate_QTableWidgetItem( void * pObj ) +void * hbqt_gcAllocate_QTableWidgetItem( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTableWidgetItem; @@ -133,14 +133,14 @@ HB_FUNC( QT_QTABLEWIDGETITEM ) pObj = new QTableWidgetItem( 0 ) ; } - hb_retptrGC( gcAllocate_QTableWidgetItem( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTableWidgetItem( pObj ) ); } /* * QBrush background () const */ HB_FUNC( QT_QTABLEWIDGETITEM_BACKGROUND ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QTableWidgetItem( 1 )->background() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QTableWidgetItem( 1 )->background() ) ) ); } /* @@ -172,7 +172,7 @@ HB_FUNC( QT_QTABLEWIDGETITEM_COLUMN ) */ HB_FUNC( QT_QTABLEWIDGETITEM_DATA ) { - hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QTableWidgetItem( 1 )->data( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QTableWidgetItem( 1 )->data( hb_parni( 2 ) ) ) ) ); } /* @@ -188,7 +188,7 @@ HB_FUNC( QT_QTABLEWIDGETITEM_FLAGS ) */ HB_FUNC( QT_QTABLEWIDGETITEM_FONT ) { - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QTableWidgetItem( 1 )->font() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QTableWidgetItem( 1 )->font() ) ) ); } /* @@ -196,7 +196,7 @@ HB_FUNC( QT_QTABLEWIDGETITEM_FONT ) */ HB_FUNC( QT_QTABLEWIDGETITEM_FOREGROUND ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QTableWidgetItem( 1 )->foreground() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QTableWidgetItem( 1 )->foreground() ) ) ); } /* @@ -204,7 +204,7 @@ HB_FUNC( QT_QTABLEWIDGETITEM_FOREGROUND ) */ HB_FUNC( QT_QTABLEWIDGETITEM_ICON ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QTableWidgetItem( 1 )->icon() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QTableWidgetItem( 1 )->icon() ) ) ); } /* @@ -348,7 +348,7 @@ HB_FUNC( QT_QTABLEWIDGETITEM_SETWHATSTHIS ) */ HB_FUNC( QT_QTABLEWIDGETITEM_SIZEHINT ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QTableWidgetItem( 1 )->sizeHint() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QTableWidgetItem( 1 )->sizeHint() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QTableWidgetSelectionRange.cpp b/harbour/contrib/hbqt/qtgui/QTableWidgetSelectionRange.cpp index d52cf53e5b..5af7fbafb3 100644 --- a/harbour/contrib/hbqt/qtgui/QTableWidgetSelectionRange.cpp +++ b/harbour/contrib/hbqt/qtgui/QTableWidgetSelectionRange.cpp @@ -96,9 +96,9 @@ QT_G_FUNC( release_QTableWidgetSelectionRange ) } } -void * gcAllocate_QTableWidgetSelectionRange( void * pObj ) +void * hbqt_gcAllocate_QTableWidgetSelectionRange( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTableWidgetSelectionRange; @@ -112,7 +112,7 @@ HB_FUNC( QT_QTABLEWIDGETSELECTIONRANGE ) pObj = new QTableWidgetSelectionRange() ; - hb_retptrGC( gcAllocate_QTableWidgetSelectionRange( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTableWidgetSelectionRange( pObj ) ); } /* * int bottomRow () const diff --git a/harbour/contrib/hbqt/qtgui/QTextBlock.cpp b/harbour/contrib/hbqt/qtgui/QTextBlock.cpp index 08b01df5a0..03adc8e9d0 100644 --- a/harbour/contrib/hbqt/qtgui/QTextBlock.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextBlock.cpp @@ -94,9 +94,9 @@ QT_G_FUNC( release_QTextBlock ) } } -void * gcAllocate_QTextBlock( void * pObj ) +void * hbqt_gcAllocate_QTextBlock( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTextBlock; @@ -117,14 +117,14 @@ HB_FUNC( QT_QTEXTBLOCK ) pObj = new QTextBlock() ; } - hb_retptrGC( gcAllocate_QTextBlock( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTextBlock( pObj ) ); } /* * QTextBlockFormat blockFormat () const */ HB_FUNC( QT_QTEXTBLOCK_BLOCKFORMAT ) { - hb_retptrGC( gcAllocate_QTextBlockFormat( new QTextBlockFormat( hbqt_par_QTextBlock( 1 )->blockFormat() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextBlockFormat( new QTextBlockFormat( hbqt_par_QTextBlock( 1 )->blockFormat() ) ) ); } /* @@ -148,7 +148,7 @@ HB_FUNC( QT_QTEXTBLOCK_BLOCKNUMBER ) */ HB_FUNC( QT_QTEXTBLOCK_CHARFORMAT ) { - hb_retptrGC( gcAllocate_QTextCharFormat( new QTextCharFormat( hbqt_par_QTextBlock( 1 )->charFormat() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextCharFormat( new QTextCharFormat( hbqt_par_QTextBlock( 1 )->charFormat() ) ) ); } /* @@ -236,7 +236,7 @@ HB_FUNC( QT_QTEXTBLOCK_LINECOUNT ) */ HB_FUNC( QT_QTEXTBLOCK_NEXT ) { - hb_retptrGC( gcAllocate_QTextBlock( new QTextBlock( hbqt_par_QTextBlock( 1 )->next() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextBlock( new QTextBlock( hbqt_par_QTextBlock( 1 )->next() ) ) ); } /* @@ -252,7 +252,7 @@ HB_FUNC( QT_QTEXTBLOCK_POSITION ) */ HB_FUNC( QT_QTEXTBLOCK_PREVIOUS ) { - hb_retptrGC( gcAllocate_QTextBlock( new QTextBlock( hbqt_par_QTextBlock( 1 )->previous() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextBlock( new QTextBlock( hbqt_par_QTextBlock( 1 )->previous() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QTextBlockFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextBlockFormat.cpp index d660775125..8e6622a828 100644 --- a/harbour/contrib/hbqt/qtgui/QTextBlockFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextBlockFormat.cpp @@ -113,9 +113,9 @@ QT_G_FUNC( release_QTextBlockFormat ) } } -void * gcAllocate_QTextBlockFormat( void * pObj ) +void * hbqt_gcAllocate_QTextBlockFormat( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTextBlockFormat; @@ -136,7 +136,7 @@ HB_FUNC( QT_QTEXTBLOCKFORMAT ) pObj = ( QTextBlockFormat* ) new QTextBlockFormat() ; } - hb_retptrGC( gcAllocate_QTextBlockFormat( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTextBlockFormat( pObj ) ); } /* * Qt::Alignment alignment () const diff --git a/harbour/contrib/hbqt/qtgui/QTextBrowser.cpp b/harbour/contrib/hbqt/qtgui/QTextBrowser.cpp index dddf2ea356..cf2cbd2eb3 100644 --- a/harbour/contrib/hbqt/qtgui/QTextBrowser.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextBrowser.cpp @@ -120,9 +120,9 @@ QT_G_FUNC( release_QTextBrowser ) } } -void * gcAllocate_QTextBrowser( void * pObj ) +void * hbqt_gcAllocate_QTextBrowser( void * pObj ) { - QGC_POINTER_QTextBrowser * p = ( QGC_POINTER_QTextBrowser * ) hb_gcAllocate( sizeof( QGC_POINTER_QTextBrowser ), gcFuncs() ); + QGC_POINTER_QTextBrowser * p = ( QGC_POINTER_QTextBrowser * ) hb_gcAllocate( sizeof( QGC_POINTER_QTextBrowser ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTextBrowser; @@ -137,7 +137,7 @@ HB_FUNC( QT_QTEXTBROWSER ) pObj = ( QTextBrowser* ) new QTextBrowser( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QTextBrowser( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTextBrowser( pObj ) ); } /* * int backwardHistoryCount () const @@ -176,7 +176,7 @@ HB_FUNC( QT_QTEXTBROWSER_HISTORYTITLE ) */ HB_FUNC( QT_QTEXTBROWSER_HISTORYURL ) { - hb_retptrGC( gcAllocate_QUrl( new QUrl( hbqt_par_QTextBrowser( 1 )->historyUrl( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QUrl( new QUrl( hbqt_par_QTextBrowser( 1 )->historyUrl( hb_parni( 2 ) ) ) ) ); } /* @@ -200,7 +200,7 @@ HB_FUNC( QT_QTEXTBROWSER_ISFORWARDAVAILABLE ) */ HB_FUNC( QT_QTEXTBROWSER_LOADRESOURCE ) { - hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QTextBrowser( 1 )->loadResource( hb_parni( 2 ), *hbqt_par_QUrl( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QTextBrowser( 1 )->loadResource( hb_parni( 2 ), *hbqt_par_QUrl( 3 ) ) ) ) ); } /* @@ -224,7 +224,7 @@ HB_FUNC( QT_QTEXTBROWSER_OPENLINKS ) */ HB_FUNC( QT_QTEXTBROWSER_SEARCHPATHS ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QTextBrowser( 1 )->searchPaths() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QTextBrowser( 1 )->searchPaths() ) ) ); } /* @@ -256,7 +256,7 @@ HB_FUNC( QT_QTEXTBROWSER_SETSEARCHPATHS ) */ HB_FUNC( QT_QTEXTBROWSER_SOURCE ) { - hb_retptrGC( gcAllocate_QUrl( new QUrl( hbqt_par_QTextBrowser( 1 )->source() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QUrl( new QUrl( hbqt_par_QTextBrowser( 1 )->source() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QTextCharFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextCharFormat.cpp index 8635c162eb..2682503845 100644 --- a/harbour/contrib/hbqt/qtgui/QTextCharFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextCharFormat.cpp @@ -100,9 +100,9 @@ QT_G_FUNC( release_QTextCharFormat ) } } -void * gcAllocate_QTextCharFormat( void * pObj ) +void * hbqt_gcAllocate_QTextCharFormat( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTextCharFormat; @@ -116,7 +116,7 @@ HB_FUNC( QT_QTEXTCHARFORMAT ) pObj = ( QTextCharFormat* ) new QTextCharFormat() ; - hb_retptrGC( gcAllocate_QTextCharFormat( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTextCharFormat( pObj ) ); } /* * QString anchorHref () const @@ -131,7 +131,7 @@ HB_FUNC( QT_QTEXTCHARFORMAT_ANCHORHREF ) */ HB_FUNC( QT_QTEXTCHARFORMAT_ANCHORNAMES ) { - hb_retptrGC( gcAllocate_QStringList( new QStringList( hbqt_par_QTextCharFormat( 1 )->anchorNames() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QStringList( new QStringList( hbqt_par_QTextCharFormat( 1 )->anchorNames() ) ) ); } /* @@ -139,7 +139,7 @@ HB_FUNC( QT_QTEXTCHARFORMAT_ANCHORNAMES ) */ HB_FUNC( QT_QTEXTCHARFORMAT_FONT ) { - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QTextCharFormat( 1 )->font() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QTextCharFormat( 1 )->font() ) ) ); } /* @@ -459,7 +459,7 @@ HB_FUNC( QT_QTEXTCHARFORMAT_SETVERTICALALIGNMENT ) */ HB_FUNC( QT_QTEXTCHARFORMAT_TEXTOUTLINE ) { - hb_retptrGC( gcAllocate_QPen( new QPen( hbqt_par_QTextCharFormat( 1 )->textOutline() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPen( new QPen( hbqt_par_QTextCharFormat( 1 )->textOutline() ) ) ); } /* @@ -475,7 +475,7 @@ HB_FUNC( QT_QTEXTCHARFORMAT_TOOLTIP ) */ HB_FUNC( QT_QTEXTCHARFORMAT_UNDERLINECOLOR ) { - hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QTextCharFormat( 1 )->underlineColor() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QTextCharFormat( 1 )->underlineColor() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QTextCursor.cpp b/harbour/contrib/hbqt/qtgui/QTextCursor.cpp index 64af85bc00..b97edeeb63 100644 --- a/harbour/contrib/hbqt/qtgui/QTextCursor.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextCursor.cpp @@ -106,9 +106,9 @@ QT_G_FUNC( release_QTextCursor ) } } -void * gcAllocate_QTextCursor( void * pObj ) +void * hbqt_gcAllocate_QTextCursor( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTextCursor; @@ -150,7 +150,7 @@ HB_FUNC( QT_QTEXTCURSOR ) pObj = ( QTextCursor* ) new QTextCursor() ; } - hb_retptrGC( gcAllocate_QTextCursor( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTextCursor( pObj ) ); } /* * int anchor () const @@ -205,7 +205,7 @@ HB_FUNC( QT_QTEXTCURSOR_BEGINEDITBLOCK ) */ HB_FUNC( QT_QTEXTCURSOR_BLOCKCHARFORMAT ) { - hb_retptrGC( gcAllocate_QTextCharFormat( new QTextCharFormat( hbqt_par_QTextCursor( 1 )->blockCharFormat() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextCharFormat( new QTextCharFormat( hbqt_par_QTextCursor( 1 )->blockCharFormat() ) ) ); } /* @@ -213,7 +213,7 @@ HB_FUNC( QT_QTEXTCURSOR_BLOCKCHARFORMAT ) */ HB_FUNC( QT_QTEXTCURSOR_BLOCKFORMAT ) { - hb_retptrGC( gcAllocate_QTextBlockFormat( new QTextBlockFormat( hbqt_par_QTextCursor( 1 )->blockFormat() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextBlockFormat( new QTextBlockFormat( hbqt_par_QTextCursor( 1 )->blockFormat() ) ) ); } /* @@ -229,7 +229,7 @@ HB_FUNC( QT_QTEXTCURSOR_BLOCKNUMBER ) */ HB_FUNC( QT_QTEXTCURSOR_CHARFORMAT ) { - hb_retptrGC( gcAllocate_QTextCharFormat( new QTextCharFormat( hbqt_par_QTextCursor( 1 )->charFormat() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextCharFormat( new QTextCharFormat( hbqt_par_QTextCursor( 1 )->charFormat() ) ) ); } /* @@ -575,7 +575,7 @@ HB_FUNC( QT_QTEXTCURSOR_SELECTEDTEXT ) */ HB_FUNC( QT_QTEXTCURSOR_SELECTION ) { - hb_retptrGC( gcAllocate_QTextDocumentFragment( new QTextDocumentFragment( hbqt_par_QTextCursor( 1 )->selection() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextDocumentFragment( new QTextDocumentFragment( hbqt_par_QTextCursor( 1 )->selection() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QTextDocument.cpp b/harbour/contrib/hbqt/qtgui/QTextDocument.cpp index 0dae7c552e..e934ec2ccf 100644 --- a/harbour/contrib/hbqt/qtgui/QTextDocument.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextDocument.cpp @@ -144,9 +144,9 @@ QT_G_FUNC( release_QTextDocument ) } } -void * gcAllocate_QTextDocument( void * pObj ) +void * hbqt_gcAllocate_QTextDocument( void * pObj ) { - QGC_POINTER_QTextDocument * p = ( QGC_POINTER_QTextDocument * ) hb_gcAllocate( sizeof( QGC_POINTER_QTextDocument ), gcFuncs() ); + QGC_POINTER_QTextDocument * p = ( QGC_POINTER_QTextDocument * ) hb_gcAllocate( sizeof( QGC_POINTER_QTextDocument ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTextDocument; @@ -161,7 +161,7 @@ HB_FUNC( QT_QTEXTDOCUMENT ) pObj = ( QTextDocument* ) new QTextDocument( hbqt_par_QObject( 1 ) ) ; - hb_retptrGC( gcAllocate_QTextDocument( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTextDocument( pObj ) ); } /* * void addResource ( int type, const QUrl & name, const QVariant & resource ) @@ -184,7 +184,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_ADJUSTSIZE ) */ HB_FUNC( QT_QTEXTDOCUMENT_BEGIN ) { - hb_retptrGC( gcAllocate_QTextBlock( new QTextBlock( hbqt_par_QTextDocument( 1 )->begin() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextBlock( new QTextBlock( hbqt_par_QTextDocument( 1 )->begin() ) ) ); } /* @@ -224,7 +224,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_CLONE ) */ HB_FUNC( QT_QTEXTDOCUMENT_DEFAULTFONT ) { - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QTextDocument( 1 )->defaultFont() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QTextDocument( 1 )->defaultFont() ) ) ); } /* @@ -240,7 +240,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_DEFAULTSTYLESHEET ) */ HB_FUNC( QT_QTEXTDOCUMENT_DEFAULTTEXTOPTION ) { - hb_retptrGC( gcAllocate_QTextOption( new QTextOption( hbqt_par_QTextDocument( 1 )->defaultTextOption() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextOption( new QTextOption( hbqt_par_QTextDocument( 1 )->defaultTextOption() ) ) ); } /* @@ -272,7 +272,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_DRAWCONTENTS ) */ HB_FUNC( QT_QTEXTDOCUMENT_END ) { - hb_retptrGC( gcAllocate_QTextBlock( new QTextBlock( hbqt_par_QTextDocument( 1 )->end() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextBlock( new QTextBlock( hbqt_par_QTextDocument( 1 )->end() ) ) ); } /* @@ -280,7 +280,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_END ) */ HB_FUNC( QT_QTEXTDOCUMENT_FIND ) { - hb_retptrGC( gcAllocate_QTextCursor( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( hbqt_par_QString( 2 ), *hbqt_par_QTextCursor( 3 ), ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextCursor( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( hbqt_par_QString( 2 ), *hbqt_par_QTextCursor( 3 ), ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ) ); } /* @@ -288,7 +288,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_FIND ) */ HB_FUNC( QT_QTEXTDOCUMENT_FIND_1 ) { - hb_retptrGC( gcAllocate_QTextCursor( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( *hbqt_par_QRegExp( 2 ), *hbqt_par_QTextCursor( 3 ), ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextCursor( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( *hbqt_par_QRegExp( 2 ), *hbqt_par_QTextCursor( 3 ), ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ) ); } /* @@ -296,7 +296,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_FIND_1 ) */ HB_FUNC( QT_QTEXTDOCUMENT_FIND_2 ) { - hb_retptrGC( gcAllocate_QTextCursor( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( hbqt_par_QString( 2 ), hb_parni( 3 ), ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextCursor( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( hbqt_par_QString( 2 ), hb_parni( 3 ), ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ) ); } /* @@ -304,7 +304,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_FIND_2 ) */ HB_FUNC( QT_QTEXTDOCUMENT_FIND_3 ) { - hb_retptrGC( gcAllocate_QTextCursor( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( *hbqt_par_QRegExp( 2 ), hb_parni( 3 ), ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextCursor( new QTextCursor( hbqt_par_QTextDocument( 1 )->find( *hbqt_par_QRegExp( 2 ), hb_parni( 3 ), ( QTextDocument::FindFlags ) hb_parni( 4 ) ) ) ) ); } /* @@ -312,7 +312,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_FIND_3 ) */ HB_FUNC( QT_QTEXTDOCUMENT_FINDBLOCK ) { - hb_retptrGC( gcAllocate_QTextBlock( new QTextBlock( hbqt_par_QTextDocument( 1 )->findBlock( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextBlock( new QTextBlock( hbqt_par_QTextDocument( 1 )->findBlock( hb_parni( 2 ) ) ) ) ); } /* @@ -320,7 +320,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_FINDBLOCK ) */ HB_FUNC( QT_QTEXTDOCUMENT_FINDBLOCKBYLINENUMBER ) { - hb_retptrGC( gcAllocate_QTextBlock( new QTextBlock( hbqt_par_QTextDocument( 1 )->findBlockByLineNumber( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextBlock( new QTextBlock( hbqt_par_QTextDocument( 1 )->findBlockByLineNumber( hb_parni( 2 ) ) ) ) ); } /* @@ -328,7 +328,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_FINDBLOCKBYLINENUMBER ) */ HB_FUNC( QT_QTEXTDOCUMENT_FINDBLOCKBYNUMBER ) { - hb_retptrGC( gcAllocate_QTextBlock( new QTextBlock( hbqt_par_QTextDocument( 1 )->findBlockByNumber( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextBlock( new QTextBlock( hbqt_par_QTextDocument( 1 )->findBlockByNumber( hb_parni( 2 ) ) ) ) ); } /* @@ -336,7 +336,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_FINDBLOCKBYNUMBER ) */ HB_FUNC( QT_QTEXTDOCUMENT_FIRSTBLOCK ) { - hb_retptrGC( gcAllocate_QTextBlock( new QTextBlock( hbqt_par_QTextDocument( 1 )->firstBlock() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextBlock( new QTextBlock( hbqt_par_QTextDocument( 1 )->firstBlock() ) ) ); } /* @@ -400,7 +400,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_ISUNDOREDOENABLED ) */ HB_FUNC( QT_QTEXTDOCUMENT_LASTBLOCK ) { - hb_retptrGC( gcAllocate_QTextBlock( new QTextBlock( hbqt_par_QTextDocument( 1 )->lastBlock() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextBlock( new QTextBlock( hbqt_par_QTextDocument( 1 )->lastBlock() ) ) ); } /* @@ -464,7 +464,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_PAGECOUNT ) */ HB_FUNC( QT_QTEXTDOCUMENT_PAGESIZE ) { - hb_retptrGC( gcAllocate_QSizeF( new QSizeF( hbqt_par_QTextDocument( 1 )->pageSize() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSizeF( new QSizeF( hbqt_par_QTextDocument( 1 )->pageSize() ) ) ); } /* @@ -488,7 +488,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_REDO ) */ HB_FUNC( QT_QTEXTDOCUMENT_RESOURCE ) { - hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QTextDocument( 1 )->resource( hb_parni( 2 ), *hbqt_par_QUrl( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QTextDocument( 1 )->resource( hb_parni( 2 ), *hbqt_par_QUrl( 3 ) ) ) ) ); } /* @@ -624,7 +624,7 @@ HB_FUNC( QT_QTEXTDOCUMENT_SETUSEDESIGNMETRICS ) */ HB_FUNC( QT_QTEXTDOCUMENT_SIZE ) { - hb_retptrGC( gcAllocate_QSizeF( new QSizeF( hbqt_par_QTextDocument( 1 )->size() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSizeF( new QSizeF( hbqt_par_QTextDocument( 1 )->size() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QTextDocumentFragment.cpp b/harbour/contrib/hbqt/qtgui/QTextDocumentFragment.cpp index 7c71443757..277c68a917 100644 --- a/harbour/contrib/hbqt/qtgui/QTextDocumentFragment.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextDocumentFragment.cpp @@ -98,9 +98,9 @@ QT_G_FUNC( release_QTextDocumentFragment ) } } -void * gcAllocate_QTextDocumentFragment( void * pObj ) +void * hbqt_gcAllocate_QTextDocumentFragment( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTextDocumentFragment; @@ -114,7 +114,7 @@ HB_FUNC( QT_QTEXTDOCUMENTFRAGMENT ) pObj = ( QTextDocumentFragment* ) new QTextDocumentFragment() ; - hb_retptrGC( gcAllocate_QTextDocumentFragment( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTextDocumentFragment( pObj ) ); } /* * bool isEmpty () const @@ -153,7 +153,7 @@ HB_FUNC( QT_QTEXTDOCUMENTFRAGMENT_TOPLAINTEXT ) */ HB_FUNC( QT_QTEXTDOCUMENTFRAGMENT_FROMHTML ) { - hb_retptrGC( gcAllocate_QTextDocumentFragment( new QTextDocumentFragment( hbqt_par_QTextDocumentFragment( 1 )->fromHtml( hbqt_par_QString( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextDocumentFragment( new QTextDocumentFragment( hbqt_par_QTextDocumentFragment( 1 )->fromHtml( hbqt_par_QString( 2 ) ) ) ) ); } /* @@ -161,7 +161,7 @@ HB_FUNC( QT_QTEXTDOCUMENTFRAGMENT_FROMHTML ) */ HB_FUNC( QT_QTEXTDOCUMENTFRAGMENT_FROMHTML_1 ) { - hb_retptrGC( gcAllocate_QTextDocumentFragment( new QTextDocumentFragment( hbqt_par_QTextDocumentFragment( 1 )->fromHtml( hbqt_par_QString( 2 ), hbqt_par_QTextDocument( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextDocumentFragment( new QTextDocumentFragment( hbqt_par_QTextDocumentFragment( 1 )->fromHtml( hbqt_par_QString( 2 ), hbqt_par_QTextDocument( 3 ) ) ) ) ); } /* @@ -169,7 +169,7 @@ HB_FUNC( QT_QTEXTDOCUMENTFRAGMENT_FROMHTML_1 ) */ HB_FUNC( QT_QTEXTDOCUMENTFRAGMENT_FROMPLAINTEXT ) { - hb_retptrGC( gcAllocate_QTextDocumentFragment( new QTextDocumentFragment( hbqt_par_QTextDocumentFragment( 1 )->fromPlainText( hbqt_par_QString( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextDocumentFragment( new QTextDocumentFragment( hbqt_par_QTextDocumentFragment( 1 )->fromPlainText( hbqt_par_QString( 2 ) ) ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QTextDocumentWriter.cpp b/harbour/contrib/hbqt/qtgui/QTextDocumentWriter.cpp index f6e6b6ea13..e76bb389bf 100644 --- a/harbour/contrib/hbqt/qtgui/QTextDocumentWriter.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextDocumentWriter.cpp @@ -97,9 +97,9 @@ QT_G_FUNC( release_QTextDocumentWriter ) } } -void * gcAllocate_QTextDocumentWriter( void * pObj ) +void * hbqt_gcAllocate_QTextDocumentWriter( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTextDocumentWriter; @@ -113,7 +113,7 @@ HB_FUNC( QT_QTEXTDOCUMENTWRITER ) pObj = ( QTextDocumentWriter* ) new QTextDocumentWriter() ; - hb_retptrGC( gcAllocate_QTextDocumentWriter( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTextDocumentWriter( pObj ) ); } /* * QTextCodec * codec () const @@ -144,7 +144,7 @@ HB_FUNC( QT_QTEXTDOCUMENTWRITER_FILENAME ) */ HB_FUNC( QT_QTEXTDOCUMENTWRITER_FORMAT ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QTextDocumentWriter( 1 )->format() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QTextDocumentWriter( 1 )->format() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QTextEdit.cpp b/harbour/contrib/hbqt/qtgui/QTextEdit.cpp index fb1883e118..7388bee0f2 100644 --- a/harbour/contrib/hbqt/qtgui/QTextEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextEdit.cpp @@ -139,9 +139,9 @@ QT_G_FUNC( release_QTextEdit ) } } -void * gcAllocate_QTextEdit( void * pObj ) +void * hbqt_gcAllocate_QTextEdit( void * pObj ) { - QGC_POINTER_QTextEdit * p = ( QGC_POINTER_QTextEdit * ) hb_gcAllocate( sizeof( QGC_POINTER_QTextEdit ), gcFuncs() ); + QGC_POINTER_QTextEdit * p = ( QGC_POINTER_QTextEdit * ) hb_gcAllocate( sizeof( QGC_POINTER_QTextEdit ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTextEdit; @@ -159,7 +159,7 @@ HB_FUNC( QT_QTEXTEDIT ) else pObj = ( QTextEdit* ) new QTextEdit( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QTextEdit( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTextEdit( pObj ) ); } /* * bool acceptRichText () const @@ -222,7 +222,7 @@ HB_FUNC( QT_QTEXTEDIT_CREATESTANDARDCONTEXTMENU_1 ) */ HB_FUNC( QT_QTEXTEDIT_CURRENTCHARFORMAT ) { - hb_retptrGC( gcAllocate_QTextCharFormat( new QTextCharFormat( hbqt_par_QTextEdit( 1 )->currentCharFormat() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextCharFormat( new QTextCharFormat( hbqt_par_QTextEdit( 1 )->currentCharFormat() ) ) ); } /* @@ -230,7 +230,7 @@ HB_FUNC( QT_QTEXTEDIT_CURRENTCHARFORMAT ) */ HB_FUNC( QT_QTEXTEDIT_CURRENTFONT ) { - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QTextEdit( 1 )->currentFont() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QTextEdit( 1 )->currentFont() ) ) ); } /* @@ -238,7 +238,7 @@ HB_FUNC( QT_QTEXTEDIT_CURRENTFONT ) */ HB_FUNC( QT_QTEXTEDIT_CURSORFORPOSITION ) { - hb_retptrGC( gcAllocate_QTextCursor( new QTextCursor( hbqt_par_QTextEdit( 1 )->cursorForPosition( *hbqt_par_QPoint( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextCursor( new QTextCursor( hbqt_par_QTextEdit( 1 )->cursorForPosition( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* @@ -246,7 +246,7 @@ HB_FUNC( QT_QTEXTEDIT_CURSORFORPOSITION ) */ HB_FUNC( QT_QTEXTEDIT_CURSORRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QTextEdit( 1 )->cursorRect( *hbqt_par_QTextCursor( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QTextEdit( 1 )->cursorRect( *hbqt_par_QTextCursor( 2 ) ) ) ) ); } /* @@ -254,7 +254,7 @@ HB_FUNC( QT_QTEXTEDIT_CURSORRECT ) */ HB_FUNC( QT_QTEXTEDIT_CURSORRECT_1 ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QTextEdit( 1 )->cursorRect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QTextEdit( 1 )->cursorRect() ) ) ); } /* @@ -374,7 +374,7 @@ HB_FUNC( QT_QTEXTEDIT_LINEWRAPMODE ) */ HB_FUNC( QT_QTEXTEDIT_LOADRESOURCE ) { - hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QTextEdit( 1 )->loadResource( hb_parni( 2 ), *hbqt_par_QUrl( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QTextEdit( 1 )->loadResource( hb_parni( 2 ), *hbqt_par_QUrl( 3 ) ) ) ) ); } /* @@ -558,7 +558,7 @@ HB_FUNC( QT_QTEXTEDIT_TABSTOPWIDTH ) */ HB_FUNC( QT_QTEXTEDIT_TEXTBACKGROUNDCOLOR ) { - hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QTextEdit( 1 )->textBackgroundColor() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QTextEdit( 1 )->textBackgroundColor() ) ) ); } /* @@ -566,7 +566,7 @@ HB_FUNC( QT_QTEXTEDIT_TEXTBACKGROUNDCOLOR ) */ HB_FUNC( QT_QTEXTEDIT_TEXTCOLOR ) { - hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QTextEdit( 1 )->textColor() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QTextEdit( 1 )->textColor() ) ) ); } /* @@ -574,7 +574,7 @@ HB_FUNC( QT_QTEXTEDIT_TEXTCOLOR ) */ HB_FUNC( QT_QTEXTEDIT_TEXTCURSOR ) { - hb_retptrGC( gcAllocate_QTextCursor( new QTextCursor( hbqt_par_QTextEdit( 1 )->textCursor() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextCursor( new QTextCursor( hbqt_par_QTextEdit( 1 )->textCursor() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QTextFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextFormat.cpp index 7aa6a5d1a5..58480c2223 100644 --- a/harbour/contrib/hbqt/qtgui/QTextFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextFormat.cpp @@ -120,9 +120,9 @@ QT_G_FUNC( release_QTextFormat ) } } -void * gcAllocate_QTextFormat( void * pObj ) +void * hbqt_gcAllocate_QTextFormat( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTextFormat; @@ -136,14 +136,14 @@ HB_FUNC( QT_QTEXTFORMAT ) pObj = ( QTextFormat* ) new QTextFormat() ; - hb_retptrGC( gcAllocate_QTextFormat( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTextFormat( pObj ) ); } /* * QBrush background () const */ HB_FUNC( QT_QTEXTFORMAT_BACKGROUND ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QTextFormat( 1 )->background() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QTextFormat( 1 )->background() ) ) ); } /* @@ -159,7 +159,7 @@ HB_FUNC( QT_QTEXTFORMAT_BOOLPROPERTY ) */ HB_FUNC( QT_QTEXTFORMAT_BRUSHPROPERTY ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QTextFormat( 1 )->brushProperty( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QTextFormat( 1 )->brushProperty( hb_parni( 2 ) ) ) ) ); } /* @@ -191,7 +191,7 @@ HB_FUNC( QT_QTEXTFORMAT_CLEARPROPERTY ) */ HB_FUNC( QT_QTEXTFORMAT_COLORPROPERTY ) { - hb_retptrGC( gcAllocate_QColor( new QColor( hbqt_par_QTextFormat( 1 )->colorProperty( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QColor( new QColor( hbqt_par_QTextFormat( 1 )->colorProperty( hb_parni( 2 ) ) ) ) ); } /* @@ -207,7 +207,7 @@ HB_FUNC( QT_QTEXTFORMAT_DOUBLEPROPERTY ) */ HB_FUNC( QT_QTEXTFORMAT_FOREGROUND ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QTextFormat( 1 )->foreground() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QTextFormat( 1 )->foreground() ) ) ); } /* @@ -303,7 +303,7 @@ HB_FUNC( QT_QTEXTFORMAT_LAYOUTDIRECTION ) */ HB_FUNC( QT_QTEXTFORMAT_LENGTHPROPERTY ) { - hb_retptrGC( gcAllocate_QTextLength( new QTextLength( hbqt_par_QTextFormat( 1 )->lengthProperty( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextLength( new QTextLength( hbqt_par_QTextFormat( 1 )->lengthProperty( hb_parni( 2 ) ) ) ) ); } /* @@ -335,7 +335,7 @@ HB_FUNC( QT_QTEXTFORMAT_OBJECTTYPE ) */ HB_FUNC( QT_QTEXTFORMAT_PENPROPERTY ) { - hb_retptrGC( gcAllocate_QPen( new QPen( hbqt_par_QTextFormat( 1 )->penProperty( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPen( new QPen( hbqt_par_QTextFormat( 1 )->penProperty( hb_parni( 2 ) ) ) ) ); } /* @@ -343,7 +343,7 @@ HB_FUNC( QT_QTEXTFORMAT_PENPROPERTY ) */ HB_FUNC( QT_QTEXTFORMAT_PROPERTY ) { - hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QTextFormat( 1 )->property( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QTextFormat( 1 )->property( hb_parni( 2 ) ) ) ) ); } /* @@ -415,7 +415,7 @@ HB_FUNC( QT_QTEXTFORMAT_STRINGPROPERTY ) */ HB_FUNC( QT_QTEXTFORMAT_TOBLOCKFORMAT ) { - hb_retptrGC( gcAllocate_QTextBlockFormat( new QTextBlockFormat( hbqt_par_QTextFormat( 1 )->toBlockFormat() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextBlockFormat( new QTextBlockFormat( hbqt_par_QTextFormat( 1 )->toBlockFormat() ) ) ); } /* @@ -423,7 +423,7 @@ HB_FUNC( QT_QTEXTFORMAT_TOBLOCKFORMAT ) */ HB_FUNC( QT_QTEXTFORMAT_TOCHARFORMAT ) { - hb_retptrGC( gcAllocate_QTextCharFormat( new QTextCharFormat( hbqt_par_QTextFormat( 1 )->toCharFormat() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextCharFormat( new QTextCharFormat( hbqt_par_QTextFormat( 1 )->toCharFormat() ) ) ); } /* @@ -431,7 +431,7 @@ HB_FUNC( QT_QTEXTFORMAT_TOCHARFORMAT ) */ HB_FUNC( QT_QTEXTFORMAT_TOFRAMEFORMAT ) { - hb_retptrGC( gcAllocate_QTextFrameFormat( new QTextFrameFormat( hbqt_par_QTextFormat( 1 )->toFrameFormat() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextFrameFormat( new QTextFrameFormat( hbqt_par_QTextFormat( 1 )->toFrameFormat() ) ) ); } /* @@ -439,7 +439,7 @@ HB_FUNC( QT_QTEXTFORMAT_TOFRAMEFORMAT ) */ HB_FUNC( QT_QTEXTFORMAT_TOIMAGEFORMAT ) { - hb_retptrGC( gcAllocate_QTextImageFormat( new QTextImageFormat( hbqt_par_QTextFormat( 1 )->toImageFormat() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextImageFormat( new QTextImageFormat( hbqt_par_QTextFormat( 1 )->toImageFormat() ) ) ); } /* @@ -447,7 +447,7 @@ HB_FUNC( QT_QTEXTFORMAT_TOIMAGEFORMAT ) */ HB_FUNC( QT_QTEXTFORMAT_TOLISTFORMAT ) { - hb_retptrGC( gcAllocate_QTextListFormat( new QTextListFormat( hbqt_par_QTextFormat( 1 )->toListFormat() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextListFormat( new QTextListFormat( hbqt_par_QTextFormat( 1 )->toListFormat() ) ) ); } /* @@ -455,7 +455,7 @@ HB_FUNC( QT_QTEXTFORMAT_TOLISTFORMAT ) */ HB_FUNC( QT_QTEXTFORMAT_TOTABLEFORMAT ) { - hb_retptrGC( gcAllocate_QTextTableFormat( new QTextTableFormat( hbqt_par_QTextFormat( 1 )->toTableFormat() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextTableFormat( new QTextTableFormat( hbqt_par_QTextFormat( 1 )->toTableFormat() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QTextFragment.cpp b/harbour/contrib/hbqt/qtgui/QTextFragment.cpp index 6a2b0538cc..a54e0ee207 100644 --- a/harbour/contrib/hbqt/qtgui/QTextFragment.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextFragment.cpp @@ -95,9 +95,9 @@ QT_G_FUNC( release_QTextFragment ) } } -void * gcAllocate_QTextFragment( void * pObj ) +void * hbqt_gcAllocate_QTextFragment( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTextFragment; @@ -111,14 +111,14 @@ HB_FUNC( QT_QTEXTFRAGMENT ) pObj = ( QTextFragment* ) new QTextFragment() ; - hb_retptrGC( gcAllocate_QTextFragment( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTextFragment( pObj ) ); } /* * QTextCharFormat charFormat () const */ HB_FUNC( QT_QTEXTFRAGMENT_CHARFORMAT ) { - hb_retptrGC( gcAllocate_QTextCharFormat( new QTextCharFormat( hbqt_par_QTextFragment( 1 )->charFormat() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextCharFormat( new QTextCharFormat( hbqt_par_QTextFragment( 1 )->charFormat() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QTextFrame.cpp b/harbour/contrib/hbqt/qtgui/QTextFrame.cpp index 7948018bb5..a2383e80f2 100644 --- a/harbour/contrib/hbqt/qtgui/QTextFrame.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextFrame.cpp @@ -136,9 +136,9 @@ QT_G_FUNC( release_QTextFrame ) } } -void * gcAllocate_QTextFrame( void * pObj ) +void * hbqt_gcAllocate_QTextFrame( void * pObj ) { - QGC_POINTER_QTextFrame * p = ( QGC_POINTER_QTextFrame * ) hb_gcAllocate( sizeof( QGC_POINTER_QTextFrame ), gcFuncs() ); + QGC_POINTER_QTextFrame * p = ( QGC_POINTER_QTextFrame * ) hb_gcAllocate( sizeof( QGC_POINTER_QTextFrame ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTextFrame; @@ -153,14 +153,14 @@ HB_FUNC( QT_QTEXTFRAME ) pObj = ( QTextFrame* ) new QTextFrame( hbqt_par_QTextDocument( 1 ) ) ; - hb_retptrGC( gcAllocate_QTextFrame( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTextFrame( pObj ) ); } /* * QTextCursor firstCursorPosition () const */ HB_FUNC( QT_QTEXTFRAME_FIRSTCURSORPOSITION ) { - hb_retptrGC( gcAllocate_QTextCursor( new QTextCursor( hbqt_par_QTextFrame( 1 )->firstCursorPosition() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextCursor( new QTextCursor( hbqt_par_QTextFrame( 1 )->firstCursorPosition() ) ) ); } /* @@ -176,7 +176,7 @@ HB_FUNC( QT_QTEXTFRAME_FIRSTPOSITION ) */ HB_FUNC( QT_QTEXTFRAME_FRAMEFORMAT ) { - hb_retptrGC( gcAllocate_QTextFrameFormat( new QTextFrameFormat( hbqt_par_QTextFrame( 1 )->frameFormat() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextFrameFormat( new QTextFrameFormat( hbqt_par_QTextFrame( 1 )->frameFormat() ) ) ); } /* @@ -184,7 +184,7 @@ HB_FUNC( QT_QTEXTFRAME_FRAMEFORMAT ) */ HB_FUNC( QT_QTEXTFRAME_LASTCURSORPOSITION ) { - hb_retptrGC( gcAllocate_QTextCursor( new QTextCursor( hbqt_par_QTextFrame( 1 )->lastCursorPosition() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextCursor( new QTextCursor( hbqt_par_QTextFrame( 1 )->lastCursorPosition() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QTextFrameFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextFrameFormat.cpp index 370309b93c..9d3659377a 100644 --- a/harbour/contrib/hbqt/qtgui/QTextFrameFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextFrameFormat.cpp @@ -104,9 +104,9 @@ QT_G_FUNC( release_QTextFrameFormat ) } } -void * gcAllocate_QTextFrameFormat( void * pObj ) +void * hbqt_gcAllocate_QTextFrameFormat( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTextFrameFormat; @@ -120,7 +120,7 @@ HB_FUNC( QT_QTEXTFRAMEFORMAT ) pObj = ( QTextFrameFormat* ) new QTextFrameFormat() ; - hb_retptrGC( gcAllocate_QTextFrameFormat( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTextFrameFormat( pObj ) ); } /* * qreal border () const @@ -135,7 +135,7 @@ HB_FUNC( QT_QTEXTFRAMEFORMAT_BORDER ) */ HB_FUNC( QT_QTEXTFRAMEFORMAT_BORDERBRUSH ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QTextFrameFormat( 1 )->borderBrush() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QTextFrameFormat( 1 )->borderBrush() ) ) ); } /* @@ -159,7 +159,7 @@ HB_FUNC( QT_QTEXTFRAMEFORMAT_BOTTOMMARGIN ) */ HB_FUNC( QT_QTEXTFRAMEFORMAT_HEIGHT ) { - hb_retptrGC( gcAllocate_QTextLength( new QTextLength( hbqt_par_QTextFrameFormat( 1 )->height() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextLength( new QTextLength( hbqt_par_QTextFrameFormat( 1 )->height() ) ) ); } /* @@ -351,7 +351,7 @@ HB_FUNC( QT_QTEXTFRAMEFORMAT_TOPMARGIN ) */ HB_FUNC( QT_QTEXTFRAMEFORMAT_WIDTH ) { - hb_retptrGC( gcAllocate_QTextLength( new QTextLength( hbqt_par_QTextFrameFormat( 1 )->width() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextLength( new QTextLength( hbqt_par_QTextFrameFormat( 1 )->width() ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QTextImageFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextImageFormat.cpp index f14286021d..4c8cfbd159 100644 --- a/harbour/contrib/hbqt/qtgui/QTextImageFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextImageFormat.cpp @@ -95,9 +95,9 @@ QT_G_FUNC( release_QTextImageFormat ) } } -void * gcAllocate_QTextImageFormat( void * pObj ) +void * hbqt_gcAllocate_QTextImageFormat( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTextImageFormat; @@ -111,7 +111,7 @@ HB_FUNC( QT_QTEXTIMAGEFORMAT ) pObj = ( QTextImageFormat* ) new QTextImageFormat() ; - hb_retptrGC( gcAllocate_QTextImageFormat( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTextImageFormat( pObj ) ); } /* * qreal height () const diff --git a/harbour/contrib/hbqt/qtgui/QTextInlineObject.cpp b/harbour/contrib/hbqt/qtgui/QTextInlineObject.cpp index cdc0aafca5..6cb2bece23 100644 --- a/harbour/contrib/hbqt/qtgui/QTextInlineObject.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextInlineObject.cpp @@ -105,7 +105,7 @@ HB_FUNC( QT_QTEXTINLINEOBJECT_DESCENT ) */ HB_FUNC( QT_QTEXTINLINEOBJECT_FORMAT ) { - hb_retptrGC( gcAllocate_QTextFormat( new QTextFormat( hbqt_par_QTextInlineObject( 1 )->format() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextFormat( new QTextFormat( hbqt_par_QTextInlineObject( 1 )->format() ) ) ); } /* @@ -137,7 +137,7 @@ HB_FUNC( QT_QTEXTINLINEOBJECT_ISVALID ) */ HB_FUNC( QT_QTEXTINLINEOBJECT_RECT ) { - hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QTextInlineObject( 1 )->rect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QTextInlineObject( 1 )->rect() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QTextItem.cpp b/harbour/contrib/hbqt/qtgui/QTextItem.cpp index 43b86cce42..facea9a3de 100644 --- a/harbour/contrib/hbqt/qtgui/QTextItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextItem.cpp @@ -100,9 +100,9 @@ QT_G_FUNC( release_QTextItem ) } } -void * gcAllocate_QTextItem( void * pObj ) +void * hbqt_gcAllocate_QTextItem( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTextItem; @@ -116,7 +116,7 @@ HB_FUNC( QT_QTEXTITEM ) pObj = ( QTextItem* ) new QTextItem() ; - hb_retptrGC( gcAllocate_QTextItem( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTextItem( pObj ) ); } /* * qreal ascent () const @@ -139,7 +139,7 @@ HB_FUNC( QT_QTEXTITEM_DESCENT ) */ HB_FUNC( QT_QTEXTITEM_FONT ) { - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QTextItem( 1 )->font() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QTextItem( 1 )->font() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QTextLayout.cpp b/harbour/contrib/hbqt/qtgui/QTextLayout.cpp index 2e067d820f..6a6d54093e 100644 --- a/harbour/contrib/hbqt/qtgui/QTextLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextLayout.cpp @@ -112,9 +112,9 @@ QT_G_FUNC( release_QTextLayout ) } } -void * gcAllocate_QTextLayout( void * pObj ) +void * hbqt_gcAllocate_QTextLayout( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTextLayout; @@ -128,7 +128,7 @@ HB_FUNC( QT_QTEXTLAYOUT ) pObj = ( QTextLayout* ) new QTextLayout() ; - hb_retptrGC( gcAllocate_QTextLayout( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTextLayout( pObj ) ); } /* * void beginLayout () @@ -143,7 +143,7 @@ HB_FUNC( QT_QTEXTLAYOUT_BEGINLAYOUT ) */ HB_FUNC( QT_QTEXTLAYOUT_BOUNDINGRECT ) { - hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QTextLayout( 1 )->boundingRect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QTextLayout( 1 )->boundingRect() ) ) ); } /* @@ -175,7 +175,7 @@ HB_FUNC( QT_QTEXTLAYOUT_CLEARLAYOUT ) */ HB_FUNC( QT_QTEXTLAYOUT_CREATELINE ) { - hb_retptrGC( gcAllocate_QTextLine( new QTextLine( hbqt_par_QTextLayout( 1 )->createLine() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextLine( new QTextLine( hbqt_par_QTextLayout( 1 )->createLine() ) ) ); } /* @@ -207,7 +207,7 @@ HB_FUNC( QT_QTEXTLAYOUT_ENDLAYOUT ) */ HB_FUNC( QT_QTEXTLAYOUT_FONT ) { - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QTextLayout( 1 )->font() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QTextLayout( 1 )->font() ) ) ); } /* @@ -223,7 +223,7 @@ HB_FUNC( QT_QTEXTLAYOUT_ISVALIDCURSORPOSITION ) */ HB_FUNC( QT_QTEXTLAYOUT_LINEAT ) { - hb_retptrGC( gcAllocate_QTextLine( new QTextLine( hbqt_par_QTextLayout( 1 )->lineAt( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextLine( new QTextLine( hbqt_par_QTextLayout( 1 )->lineAt( hb_parni( 2 ) ) ) ) ); } /* @@ -239,7 +239,7 @@ HB_FUNC( QT_QTEXTLAYOUT_LINECOUNT ) */ HB_FUNC( QT_QTEXTLAYOUT_LINEFORTEXTPOSITION ) { - hb_retptrGC( gcAllocate_QTextLine( new QTextLine( hbqt_par_QTextLayout( 1 )->lineForTextPosition( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextLine( new QTextLine( hbqt_par_QTextLayout( 1 )->lineForTextPosition( hb_parni( 2 ) ) ) ) ); } /* @@ -271,7 +271,7 @@ HB_FUNC( QT_QTEXTLAYOUT_NEXTCURSORPOSITION ) */ HB_FUNC( QT_QTEXTLAYOUT_POSITION ) { - hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QTextLayout( 1 )->position() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QTextLayout( 1 )->position() ) ) ); } /* @@ -359,7 +359,7 @@ HB_FUNC( QT_QTEXTLAYOUT_TEXT ) */ HB_FUNC( QT_QTEXTLAYOUT_TEXTOPTION ) { - hb_retptrGC( gcAllocate_QTextOption( new QTextOption( hbqt_par_QTextLayout( 1 )->textOption() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextOption( new QTextOption( hbqt_par_QTextLayout( 1 )->textOption() ) ) ); } diff --git a/harbour/contrib/hbqt/qtgui/QTextLength.cpp b/harbour/contrib/hbqt/qtgui/QTextLength.cpp index c6e3c628ea..a8004a1147 100644 --- a/harbour/contrib/hbqt/qtgui/QTextLength.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextLength.cpp @@ -99,9 +99,9 @@ QT_G_FUNC( release_QTextLength ) } } -void * gcAllocate_QTextLength( void * pObj ) +void * hbqt_gcAllocate_QTextLength( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTextLength; @@ -115,7 +115,7 @@ HB_FUNC( QT_QTEXTLENGTH ) pObj = ( QTextLength* ) new QTextLength() ; - hb_retptrGC( gcAllocate_QTextLength( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTextLength( pObj ) ); } /* * qreal rawValue () const diff --git a/harbour/contrib/hbqt/qtgui/QTextLine.cpp b/harbour/contrib/hbqt/qtgui/QTextLine.cpp index e083022ab1..6cf039f4ed 100644 --- a/harbour/contrib/hbqt/qtgui/QTextLine.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextLine.cpp @@ -99,9 +99,9 @@ QT_G_FUNC( release_QTextLine ) } } -void * gcAllocate_QTextLine( void * pObj ) +void * hbqt_gcAllocate_QTextLine( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTextLine; @@ -115,7 +115,7 @@ HB_FUNC( QT_QTEXTLINE ) pObj = ( QTextLine* ) new QTextLine() ; - hb_retptrGC( gcAllocate_QTextLine( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTextLine( pObj ) ); } /* * qreal ascent () const @@ -182,7 +182,7 @@ HB_FUNC( QT_QTEXTLINE_LINENUMBER ) */ HB_FUNC( QT_QTEXTLINE_NATURALTEXTRECT ) { - hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QTextLine( 1 )->naturalTextRect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QTextLine( 1 )->naturalTextRect() ) ) ); } /* @@ -198,7 +198,7 @@ HB_FUNC( QT_QTEXTLINE_NATURALTEXTWIDTH ) */ HB_FUNC( QT_QTEXTLINE_POSITION ) { - hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QTextLine( 1 )->position() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QTextLine( 1 )->position() ) ) ); } /* @@ -206,7 +206,7 @@ HB_FUNC( QT_QTEXTLINE_POSITION ) */ HB_FUNC( QT_QTEXTLINE_RECT ) { - hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QTextLine( 1 )->rect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QTextLine( 1 )->rect() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QTextListFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextListFormat.cpp index 5e6c6fe283..02a1881158 100644 --- a/harbour/contrib/hbqt/qtgui/QTextListFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextListFormat.cpp @@ -98,9 +98,9 @@ QT_G_FUNC( release_QTextListFormat ) } } -void * gcAllocate_QTextListFormat( void * pObj ) +void * hbqt_gcAllocate_QTextListFormat( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTextListFormat; @@ -114,7 +114,7 @@ HB_FUNC( QT_QTEXTLISTFORMAT ) pObj = new QTextListFormat() ; - hb_retptrGC( gcAllocate_QTextListFormat( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTextListFormat( pObj ) ); } /* * int indent () const diff --git a/harbour/contrib/hbqt/qtgui/QTextObject.cpp b/harbour/contrib/hbqt/qtgui/QTextObject.cpp index e5a89c7ecb..bcd79937ef 100644 --- a/harbour/contrib/hbqt/qtgui/QTextObject.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextObject.cpp @@ -96,7 +96,7 @@ HB_FUNC( QT_QTEXTOBJECT_DOCUMENT ) */ HB_FUNC( QT_QTEXTOBJECT_FORMAT ) { - hb_retptrGC( gcAllocate_QTextFormat( new QTextFormat( hbqt_par_QTextObject( 1 )->format() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTextFormat( new QTextFormat( hbqt_par_QTextObject( 1 )->format() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QTextOption.cpp b/harbour/contrib/hbqt/qtgui/QTextOption.cpp index 377a005126..2b1a990a74 100644 --- a/harbour/contrib/hbqt/qtgui/QTextOption.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextOption.cpp @@ -116,9 +116,9 @@ QT_G_FUNC( release_QTextOption ) } } -void * gcAllocate_QTextOption( void * pObj ) +void * hbqt_gcAllocate_QTextOption( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTextOption; @@ -132,7 +132,7 @@ HB_FUNC( QT_QTEXTOPTION ) pObj = new QTextOption() ; - hb_retptrGC( gcAllocate_QTextOption( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTextOption( pObj ) ); } /* * Qt::Alignment alignment () const diff --git a/harbour/contrib/hbqt/qtgui/QTextTableFormat.cpp b/harbour/contrib/hbqt/qtgui/QTextTableFormat.cpp index a413c89bbf..b7855c710a 100644 --- a/harbour/contrib/hbqt/qtgui/QTextTableFormat.cpp +++ b/harbour/contrib/hbqt/qtgui/QTextTableFormat.cpp @@ -103,9 +103,9 @@ QT_G_FUNC( release_QTextTableFormat ) } } -void * gcAllocate_QTextTableFormat( void * pObj ) +void * hbqt_gcAllocate_QTextTableFormat( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTextTableFormat; @@ -119,7 +119,7 @@ HB_FUNC( QT_QTEXTTABLEFORMAT ) pObj = new QTextTableFormat() ; - hb_retptrGC( gcAllocate_QTextTableFormat( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTextTableFormat( pObj ) ); } /* * Qt::Alignment alignment () const diff --git a/harbour/contrib/hbqt/qtgui/QTimeEdit.cpp b/harbour/contrib/hbqt/qtgui/QTimeEdit.cpp index 0adcc7351d..54f7604914 100644 --- a/harbour/contrib/hbqt/qtgui/QTimeEdit.cpp +++ b/harbour/contrib/hbqt/qtgui/QTimeEdit.cpp @@ -121,9 +121,9 @@ QT_G_FUNC( release_QTimeEdit ) } } -void * gcAllocate_QTimeEdit( void * pObj ) +void * hbqt_gcAllocate_QTimeEdit( void * pObj ) { - QGC_POINTER_QTimeEdit * p = ( QGC_POINTER_QTimeEdit * ) hb_gcAllocate( sizeof( QGC_POINTER_QTimeEdit ), gcFuncs() ); + QGC_POINTER_QTimeEdit * p = ( QGC_POINTER_QTimeEdit * ) hb_gcAllocate( sizeof( QGC_POINTER_QTimeEdit ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTimeEdit; @@ -141,7 +141,7 @@ HB_FUNC( QT_QTIMEEDIT ) pObj = (QTimeEdit *) new QTimeEdit( QTime( hbqt_par_QString( 1 ) ), hbqt_par_QWidget( 2 ) ) ; #endif - hb_retptrGC( gcAllocate_QTimeEdit( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTimeEdit( pObj ) ); } /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/QToolBar.cpp b/harbour/contrib/hbqt/qtgui/QToolBar.cpp index 4a066ef625..67b6b06a4f 100644 --- a/harbour/contrib/hbqt/qtgui/QToolBar.cpp +++ b/harbour/contrib/hbqt/qtgui/QToolBar.cpp @@ -122,9 +122,9 @@ QT_G_FUNC( release_QToolBar ) } } -void * gcAllocate_QToolBar( void * pObj ) +void * hbqt_gcAllocate_QToolBar( void * pObj ) { - QGC_POINTER_QToolBar * p = ( QGC_POINTER_QToolBar * ) hb_gcAllocate( sizeof( QGC_POINTER_QToolBar ), gcFuncs() ); + QGC_POINTER_QToolBar * p = ( QGC_POINTER_QToolBar * ) hb_gcAllocate( sizeof( QGC_POINTER_QToolBar ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QToolBar; @@ -142,7 +142,7 @@ HB_FUNC( QT_QTOOLBAR ) else pObj = ( QToolBar* ) new QToolBar( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QToolBar( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QToolBar( pObj ) ); } /* * QAction * actionAt ( const QPoint & p ) const @@ -237,7 +237,7 @@ HB_FUNC( QT_QTOOLBAR_CLEAR ) */ HB_FUNC( QT_QTOOLBAR_ICONSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QToolBar( 1 )->iconSize() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QToolBar( 1 )->iconSize() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QToolBox.cpp b/harbour/contrib/hbqt/qtgui/QToolBox.cpp index 8e307c124c..4c444b674f 100644 --- a/harbour/contrib/hbqt/qtgui/QToolBox.cpp +++ b/harbour/contrib/hbqt/qtgui/QToolBox.cpp @@ -121,9 +121,9 @@ QT_G_FUNC( release_QToolBox ) } } -void * gcAllocate_QToolBox( void * pObj ) +void * hbqt_gcAllocate_QToolBox( void * pObj ) { - QGC_POINTER_QToolBox * p = ( QGC_POINTER_QToolBox * ) hb_gcAllocate( sizeof( QGC_POINTER_QToolBox ), gcFuncs() ); + QGC_POINTER_QToolBox * p = ( QGC_POINTER_QToolBox * ) hb_gcAllocate( sizeof( QGC_POINTER_QToolBox ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QToolBox; @@ -138,7 +138,7 @@ HB_FUNC( QT_QTOOLBOX ) pObj = ( QToolBox* ) new QToolBox( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ; - hb_retptrGC( gcAllocate_QToolBox( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QToolBox( pObj ) ); } /* * int addItem ( QWidget * widget, const QIcon & iconSet, const QString & text ) @@ -217,7 +217,7 @@ HB_FUNC( QT_QTOOLBOX_ISITEMENABLED ) */ HB_FUNC( QT_QTOOLBOX_ITEMICON ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QToolBox( 1 )->itemIcon( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QToolBox( 1 )->itemIcon( hb_parni( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QToolButton.cpp b/harbour/contrib/hbqt/qtgui/QToolButton.cpp index 289c636067..4840168741 100644 --- a/harbour/contrib/hbqt/qtgui/QToolButton.cpp +++ b/harbour/contrib/hbqt/qtgui/QToolButton.cpp @@ -125,9 +125,9 @@ QT_G_FUNC( release_QToolButton ) } } -void * gcAllocate_QToolButton( void * pObj ) +void * hbqt_gcAllocate_QToolButton( void * pObj ) { - QGC_POINTER_QToolButton * p = ( QGC_POINTER_QToolButton * ) hb_gcAllocate( sizeof( QGC_POINTER_QToolButton ), gcFuncs() ); + QGC_POINTER_QToolButton * p = ( QGC_POINTER_QToolButton * ) hb_gcAllocate( sizeof( QGC_POINTER_QToolButton ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QToolButton; @@ -142,7 +142,7 @@ HB_FUNC( QT_QTOOLBUTTON ) pObj = ( QToolButton* ) new QToolButton( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QToolButton( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QToolButton( pObj ) ); } /* * Qt::ArrowType arrowType () const diff --git a/harbour/contrib/hbqt/qtgui/QTransform.cpp b/harbour/contrib/hbqt/qtgui/QTransform.cpp index 9f1ebad33e..2351224670 100644 --- a/harbour/contrib/hbqt/qtgui/QTransform.cpp +++ b/harbour/contrib/hbqt/qtgui/QTransform.cpp @@ -100,9 +100,9 @@ QT_G_FUNC( release_QTransform ) } } -void * gcAllocate_QTransform( void * pObj ) +void * hbqt_gcAllocate_QTransform( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTransform; @@ -116,7 +116,7 @@ HB_FUNC( QT_QTRANSFORM ) pObj = new QTransform() ; - hb_retptrGC( gcAllocate_QTransform( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTransform( pObj ) ); } /* * qreal m11 () const @@ -195,7 +195,7 @@ HB_FUNC( QT_QTRANSFORM_M33 ) */ HB_FUNC( QT_QTRANSFORM_ADJOINT ) { - hb_retptrGC( gcAllocate_QTransform( new QTransform( hbqt_par_QTransform( 1 )->adjoint() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTransform( new QTransform( hbqt_par_QTransform( 1 )->adjoint() ) ) ); } /* @@ -237,7 +237,7 @@ HB_FUNC( QT_QTRANSFORM_INVERTED ) { bool iInvertible = 0; - hb_retptrGC( gcAllocate_QTransform( new QTransform( hbqt_par_QTransform( 1 )->inverted( &iInvertible ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTransform( new QTransform( hbqt_par_QTransform( 1 )->inverted( &iInvertible ) ) ) ); hb_stornl( iInvertible, 2 ); } @@ -309,7 +309,7 @@ HB_FUNC( QT_QTRANSFORM_MAP ) */ HB_FUNC( QT_QTRANSFORM_MAP_1 ) { - hb_retptrGC( gcAllocate_QPointF( new QPointF( hbqt_par_QTransform( 1 )->map( *hbqt_par_QPointF( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPointF( new QPointF( hbqt_par_QTransform( 1 )->map( *hbqt_par_QPointF( 2 ) ) ) ) ); } /* @@ -317,7 +317,7 @@ HB_FUNC( QT_QTRANSFORM_MAP_1 ) */ HB_FUNC( QT_QTRANSFORM_MAP_2 ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QTransform( 1 )->map( *hbqt_par_QPoint( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QTransform( 1 )->map( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* @@ -325,7 +325,7 @@ HB_FUNC( QT_QTRANSFORM_MAP_2 ) */ HB_FUNC( QT_QTRANSFORM_MAP_3 ) { - hb_retptrGC( gcAllocate_QLine( new QLine( hbqt_par_QTransform( 1 )->map( *hbqt_par_QLine( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QLine( new QLine( hbqt_par_QTransform( 1 )->map( *hbqt_par_QLine( 2 ) ) ) ) ); } /* @@ -333,7 +333,7 @@ HB_FUNC( QT_QTRANSFORM_MAP_3 ) */ HB_FUNC( QT_QTRANSFORM_MAP_4 ) { - hb_retptrGC( gcAllocate_QLineF( new QLineF( hbqt_par_QTransform( 1 )->map( *hbqt_par_QLineF( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QLineF( new QLineF( hbqt_par_QTransform( 1 )->map( *hbqt_par_QLineF( 2 ) ) ) ) ); } /* @@ -341,7 +341,7 @@ HB_FUNC( QT_QTRANSFORM_MAP_4 ) */ HB_FUNC( QT_QTRANSFORM_MAP_5 ) { - hb_retptrGC( gcAllocate_QPolygonF( new QPolygonF( hbqt_par_QTransform( 1 )->map( *hbqt_par_QPolygonF( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPolygonF( new QPolygonF( hbqt_par_QTransform( 1 )->map( *hbqt_par_QPolygonF( 2 ) ) ) ) ); } /* @@ -349,7 +349,7 @@ HB_FUNC( QT_QTRANSFORM_MAP_5 ) */ HB_FUNC( QT_QTRANSFORM_MAP_6 ) { - hb_retptrGC( gcAllocate_QPolygon( new QPolygon( hbqt_par_QTransform( 1 )->map( *hbqt_par_QPolygon( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPolygon( new QPolygon( hbqt_par_QTransform( 1 )->map( *hbqt_par_QPolygon( 2 ) ) ) ) ); } /* @@ -357,7 +357,7 @@ HB_FUNC( QT_QTRANSFORM_MAP_6 ) */ HB_FUNC( QT_QTRANSFORM_MAP_7 ) { - hb_retptrGC( gcAllocate_QRegion( new QRegion( hbqt_par_QTransform( 1 )->map( *hbqt_par_QRegion( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRegion( new QRegion( hbqt_par_QTransform( 1 )->map( *hbqt_par_QRegion( 2 ) ) ) ) ); } /* @@ -365,7 +365,7 @@ HB_FUNC( QT_QTRANSFORM_MAP_7 ) */ HB_FUNC( QT_QTRANSFORM_MAP_8 ) { - hb_retptrGC( gcAllocate_QPainterPath( new QPainterPath( hbqt_par_QTransform( 1 )->map( *hbqt_par_QPainterPath( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPainterPath( new QPainterPath( hbqt_par_QTransform( 1 )->map( *hbqt_par_QPainterPath( 2 ) ) ) ) ); } /* @@ -387,7 +387,7 @@ HB_FUNC( QT_QTRANSFORM_MAP_9 ) */ HB_FUNC( QT_QTRANSFORM_MAPRECT ) { - hb_retptrGC( gcAllocate_QRectF( new QRectF( hbqt_par_QTransform( 1 )->mapRect( *hbqt_par_QRectF( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( hbqt_par_QTransform( 1 )->mapRect( *hbqt_par_QRectF( 2 ) ) ) ) ); } /* @@ -395,7 +395,7 @@ HB_FUNC( QT_QTRANSFORM_MAPRECT ) */ HB_FUNC( QT_QTRANSFORM_MAPRECT_1 ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QTransform( 1 )->mapRect( *hbqt_par_QRect( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QTransform( 1 )->mapRect( *hbqt_par_QRect( 2 ) ) ) ) ); } /* @@ -403,7 +403,7 @@ HB_FUNC( QT_QTRANSFORM_MAPRECT_1 ) */ HB_FUNC( QT_QTRANSFORM_MAPTOPOLYGON ) { - hb_retptrGC( gcAllocate_QPolygon( new QPolygon( hbqt_par_QTransform( 1 )->mapToPolygon( *hbqt_par_QRect( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPolygon( new QPolygon( hbqt_par_QTransform( 1 )->mapToPolygon( *hbqt_par_QRect( 2 ) ) ) ) ); } /* @@ -419,7 +419,7 @@ HB_FUNC( QT_QTRANSFORM_RESET ) */ HB_FUNC( QT_QTRANSFORM_ROTATE ) { - hb_retptrGC( gcAllocate_QTransform( new QTransform( hbqt_par_QTransform( 1 )->rotate( hb_parnd( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::Axis ) hb_parni( 3 ) : ( Qt::Axis ) Qt::ZAxis ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTransform( new QTransform( hbqt_par_QTransform( 1 )->rotate( hb_parnd( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::Axis ) hb_parni( 3 ) : ( Qt::Axis ) Qt::ZAxis ) ) ) ) ); } /* @@ -427,7 +427,7 @@ HB_FUNC( QT_QTRANSFORM_ROTATE ) */ HB_FUNC( QT_QTRANSFORM_ROTATERADIANS ) { - hb_retptrGC( gcAllocate_QTransform( new QTransform( hbqt_par_QTransform( 1 )->rotateRadians( hb_parnd( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::Axis ) hb_parni( 3 ) : ( Qt::Axis ) Qt::ZAxis ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTransform( new QTransform( hbqt_par_QTransform( 1 )->rotateRadians( hb_parnd( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::Axis ) hb_parni( 3 ) : ( Qt::Axis ) Qt::ZAxis ) ) ) ) ); } /* @@ -435,7 +435,7 @@ HB_FUNC( QT_QTRANSFORM_ROTATERADIANS ) */ HB_FUNC( QT_QTRANSFORM_SCALE ) { - hb_retptrGC( gcAllocate_QTransform( new QTransform( hbqt_par_QTransform( 1 )->scale( hb_parnd( 2 ), hb_parnd( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTransform( new QTransform( hbqt_par_QTransform( 1 )->scale( hb_parnd( 2 ), hb_parnd( 3 ) ) ) ) ); } /* @@ -451,7 +451,7 @@ HB_FUNC( QT_QTRANSFORM_SETMATRIX ) */ HB_FUNC( QT_QTRANSFORM_SHEAR ) { - hb_retptrGC( gcAllocate_QTransform( new QTransform( hbqt_par_QTransform( 1 )->shear( hb_parnd( 2 ), hb_parnd( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTransform( new QTransform( hbqt_par_QTransform( 1 )->shear( hb_parnd( 2 ), hb_parnd( 3 ) ) ) ) ); } /* @@ -459,7 +459,7 @@ HB_FUNC( QT_QTRANSFORM_SHEAR ) */ HB_FUNC( QT_QTRANSFORM_TOAFFINE ) { - hb_retptrGC( gcAllocate_QMatrix( new QMatrix( hbqt_par_QTransform( 1 )->toAffine() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QMatrix( new QMatrix( hbqt_par_QTransform( 1 )->toAffine() ) ) ); } /* @@ -467,7 +467,7 @@ HB_FUNC( QT_QTRANSFORM_TOAFFINE ) */ HB_FUNC( QT_QTRANSFORM_TRANSLATE ) { - hb_retptrGC( gcAllocate_QTransform( new QTransform( hbqt_par_QTransform( 1 )->translate( hb_parnd( 2 ), hb_parnd( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTransform( new QTransform( hbqt_par_QTransform( 1 )->translate( hb_parnd( 2 ), hb_parnd( 3 ) ) ) ) ); } /* @@ -475,7 +475,7 @@ HB_FUNC( QT_QTRANSFORM_TRANSLATE ) */ HB_FUNC( QT_QTRANSFORM_TRANSPOSED ) { - hb_retptrGC( gcAllocate_QTransform( new QTransform( hbqt_par_QTransform( 1 )->transposed() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTransform( new QTransform( hbqt_par_QTransform( 1 )->transposed() ) ) ); } /* @@ -491,7 +491,7 @@ HB_FUNC( QT_QTRANSFORM_TYPE ) */ HB_FUNC( QT_QTRANSFORM_FROMSCALE ) { - hb_retptrGC( gcAllocate_QTransform( new QTransform( hbqt_par_QTransform( 1 )->fromScale( hb_parnd( 2 ), hb_parnd( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTransform( new QTransform( hbqt_par_QTransform( 1 )->fromScale( hb_parnd( 2 ), hb_parnd( 3 ) ) ) ) ); } /* @@ -499,7 +499,7 @@ HB_FUNC( QT_QTRANSFORM_FROMSCALE ) */ HB_FUNC( QT_QTRANSFORM_FROMTRANSLATE ) { - hb_retptrGC( gcAllocate_QTransform( new QTransform( hbqt_par_QTransform( 1 )->fromTranslate( hb_parnd( 2 ), hb_parnd( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QTransform( new QTransform( hbqt_par_QTransform( 1 )->fromTranslate( hb_parnd( 2 ), hb_parnd( 3 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QTreeView.cpp b/harbour/contrib/hbqt/qtgui/QTreeView.cpp index c2b4f1ef93..94e7bc6c38 100644 --- a/harbour/contrib/hbqt/qtgui/QTreeView.cpp +++ b/harbour/contrib/hbqt/qtgui/QTreeView.cpp @@ -133,9 +133,9 @@ QT_G_FUNC( release_QTreeView ) } } -void * gcAllocate_QTreeView( void * pObj ) +void * hbqt_gcAllocate_QTreeView( void * pObj ) { - QGC_POINTER_QTreeView * p = ( QGC_POINTER_QTreeView * ) hb_gcAllocate( sizeof( QGC_POINTER_QTreeView ), gcFuncs() ); + QGC_POINTER_QTreeView * p = ( QGC_POINTER_QTreeView * ) hb_gcAllocate( sizeof( QGC_POINTER_QTreeView ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTreeView; @@ -150,7 +150,7 @@ HB_FUNC( QT_QTREEVIEW ) pObj = ( QTreeView* ) new QTreeView( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QTreeView( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTreeView( pObj ) ); } /* * bool allColumnsShowFocus () const @@ -221,7 +221,7 @@ HB_FUNC( QT_QTREEVIEW_INDENTATION ) */ HB_FUNC( QT_QTREEVIEW_INDEXABOVE ) { - hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QTreeView( 1 )->indexAbove( *hbqt_par_QModelIndex( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QTreeView( 1 )->indexAbove( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* @@ -229,7 +229,7 @@ HB_FUNC( QT_QTREEVIEW_INDEXABOVE ) */ HB_FUNC( QT_QTREEVIEW_INDEXBELOW ) { - hb_retptrGC( gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QTreeView( 1 )->indexBelow( *hbqt_par_QModelIndex( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QModelIndex( new QModelIndex( hbqt_par_QTreeView( 1 )->indexBelow( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* @@ -469,7 +469,7 @@ HB_FUNC( QT_QTREEVIEW_UNIFORMROWHEIGHTS ) */ HB_FUNC( QT_QTREEVIEW_VISUALRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QTreeView( 1 )->visualRect( *hbqt_par_QModelIndex( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QTreeView( 1 )->visualRect( *hbqt_par_QModelIndex( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QTreeWidget.cpp b/harbour/contrib/hbqt/qtgui/QTreeWidget.cpp index ab154afc01..1227fcaa4c 100644 --- a/harbour/contrib/hbqt/qtgui/QTreeWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QTreeWidget.cpp @@ -133,9 +133,9 @@ QT_G_FUNC( release_QTreeWidget ) } } -void * gcAllocate_QTreeWidget( void * pObj ) +void * hbqt_gcAllocate_QTreeWidget( void * pObj ) { - QGC_POINTER_QTreeWidget * p = ( QGC_POINTER_QTreeWidget * ) hb_gcAllocate( sizeof( QGC_POINTER_QTreeWidget ), gcFuncs() ); + QGC_POINTER_QTreeWidget * p = ( QGC_POINTER_QTreeWidget * ) hb_gcAllocate( sizeof( QGC_POINTER_QTreeWidget ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTreeWidget; @@ -150,7 +150,7 @@ HB_FUNC( QT_QTREEWIDGET ) pObj = ( QTreeWidget* ) new QTreeWidget( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QTreeWidget( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTreeWidget( pObj ) ); } /* * void addTopLevelItem ( QTreeWidgetItem * item ) @@ -413,7 +413,7 @@ HB_FUNC( QT_QTREEWIDGET_TOPLEVELITEMCOUNT ) */ HB_FUNC( QT_QTREEWIDGET_VISUALITEMRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QTreeWidget( 1 )->visualItemRect( hbqt_par_QTreeWidgetItem( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QTreeWidget( 1 )->visualItemRect( hbqt_par_QTreeWidgetItem( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QTreeWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/QTreeWidgetItem.cpp index 8cde9479b3..b523fb4182 100644 --- a/harbour/contrib/hbqt/qtgui/QTreeWidgetItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QTreeWidgetItem.cpp @@ -119,9 +119,9 @@ QT_G_FUNC( release_QTreeWidgetItem ) } } -void * gcAllocate_QTreeWidgetItem( void * pObj ) +void * hbqt_gcAllocate_QTreeWidgetItem( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QTreeWidgetItem; @@ -142,7 +142,7 @@ HB_FUNC( QT_QTREEWIDGETITEM ) pObj = ( QTreeWidgetItem* ) new QTreeWidgetItem( hbqt_par_QTreeWidget( 1 ), hb_parni( 2 ) ) ; } - hb_retptrGC( gcAllocate_QTreeWidgetItem( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QTreeWidgetItem( pObj ) ); } /* * void addChild ( QTreeWidgetItem * child ) @@ -157,7 +157,7 @@ HB_FUNC( QT_QTREEWIDGETITEM_ADDCHILD ) */ HB_FUNC( QT_QTREEWIDGETITEM_BACKGROUND ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QTreeWidgetItem( 1 )->background( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QTreeWidgetItem( 1 )->background( hb_parni( 2 ) ) ) ) ); } /* @@ -213,7 +213,7 @@ HB_FUNC( QT_QTREEWIDGETITEM_COLUMNCOUNT ) */ HB_FUNC( QT_QTREEWIDGETITEM_DATA ) { - hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QTreeWidgetItem( 1 )->data( hb_parni( 2 ), hb_parni( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QTreeWidgetItem( 1 )->data( hb_parni( 2 ), hb_parni( 3 ) ) ) ) ); } /* @@ -229,7 +229,7 @@ HB_FUNC( QT_QTREEWIDGETITEM_FLAGS ) */ HB_FUNC( QT_QTREEWIDGETITEM_FONT ) { - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QTreeWidgetItem( 1 )->font( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QTreeWidgetItem( 1 )->font( hb_parni( 2 ) ) ) ) ); } /* @@ -237,7 +237,7 @@ HB_FUNC( QT_QTREEWIDGETITEM_FONT ) */ HB_FUNC( QT_QTREEWIDGETITEM_FOREGROUND ) { - hb_retptrGC( gcAllocate_QBrush( new QBrush( hbqt_par_QTreeWidgetItem( 1 )->foreground( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QBrush( new QBrush( hbqt_par_QTreeWidgetItem( 1 )->foreground( hb_parni( 2 ) ) ) ) ); } /* @@ -245,7 +245,7 @@ HB_FUNC( QT_QTREEWIDGETITEM_FOREGROUND ) */ HB_FUNC( QT_QTREEWIDGETITEM_ICON ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QTreeWidgetItem( 1 )->icon( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QTreeWidgetItem( 1 )->icon( hb_parni( 2 ) ) ) ) ); } /* @@ -485,7 +485,7 @@ HB_FUNC( QT_QTREEWIDGETITEM_SETWHATSTHIS ) */ HB_FUNC( QT_QTREEWIDGETITEM_SIZEHINT ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QTreeWidgetItem( 1 )->sizeHint( hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QTreeWidgetItem( 1 )->sizeHint( hb_parni( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QVBoxLayout.cpp b/harbour/contrib/hbqt/qtgui/QVBoxLayout.cpp index 6f2d11d4bf..16db598fff 100644 --- a/harbour/contrib/hbqt/qtgui/QVBoxLayout.cpp +++ b/harbour/contrib/hbqt/qtgui/QVBoxLayout.cpp @@ -122,9 +122,9 @@ QT_G_FUNC( release_QVBoxLayout ) } } -void * gcAllocate_QVBoxLayout( void * pObj ) +void * hbqt_gcAllocate_QVBoxLayout( void * pObj ) { - QGC_POINTER_QVBoxLayout * p = ( QGC_POINTER_QVBoxLayout * ) hb_gcAllocate( sizeof( QGC_POINTER_QVBoxLayout ), gcFuncs() ); + QGC_POINTER_QVBoxLayout * p = ( QGC_POINTER_QVBoxLayout * ) hb_gcAllocate( sizeof( QGC_POINTER_QVBoxLayout ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QVBoxLayout; @@ -139,7 +139,7 @@ HB_FUNC( QT_QVBOXLAYOUT ) pObj = ( QVBoxLayout* ) new QVBoxLayout( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QVBoxLayout( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QVBoxLayout( pObj ) ); } /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/QValidator.cpp b/harbour/contrib/hbqt/qtgui/QValidator.cpp index 89459dd795..f8da620b3e 100644 --- a/harbour/contrib/hbqt/qtgui/QValidator.cpp +++ b/harbour/contrib/hbqt/qtgui/QValidator.cpp @@ -92,7 +92,7 @@ HB_FUNC( QT_QVALIDATOR ) */ HB_FUNC( QT_QVALIDATOR_LOCALE ) { - hb_retptrGC( gcAllocate_QLocale( new QLocale( hbqt_par_QValidator( 1 )->locale() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QLocale( new QLocale( hbqt_par_QValidator( 1 )->locale() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QWheelEvent.cpp b/harbour/contrib/hbqt/qtgui/QWheelEvent.cpp index 12555b9d3f..7b9191802a 100644 --- a/harbour/contrib/hbqt/qtgui/QWheelEvent.cpp +++ b/harbour/contrib/hbqt/qtgui/QWheelEvent.cpp @@ -105,7 +105,7 @@ HB_FUNC( QT_QWHEELEVENT_DELTA ) */ HB_FUNC( QT_QWHEELEVENT_GLOBALPOS ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QWheelEvent( 1 )->globalPos() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QWheelEvent( 1 )->globalPos() ) ) ); } /* @@ -137,7 +137,7 @@ HB_FUNC( QT_QWHEELEVENT_ORIENTATION ) */ HB_FUNC( QT_QWHEELEVENT_POS ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QWheelEvent( 1 )->pos() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QWheelEvent( 1 )->pos() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QWidget.cpp b/harbour/contrib/hbqt/qtgui/QWidget.cpp index cc2e9dd4af..842866f402 100644 --- a/harbour/contrib/hbqt/qtgui/QWidget.cpp +++ b/harbour/contrib/hbqt/qtgui/QWidget.cpp @@ -159,9 +159,9 @@ QT_G_FUNC( release_QWidget ) } } -void * gcAllocate_QWidget( void * pObj ) +void * hbqt_gcAllocate_QWidget( void * pObj ) { - QGC_POINTER_QWidget * p = ( QGC_POINTER_QWidget * ) hb_gcAllocate( sizeof( QGC_POINTER_QWidget ), gcFuncs() ); + QGC_POINTER_QWidget * p = ( QGC_POINTER_QWidget * ) hb_gcAllocate( sizeof( QGC_POINTER_QWidget ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QWidget; @@ -176,7 +176,7 @@ HB_FUNC( QT_QWIDGET ) pObj = new QWidget( hbqt_par_QWidget( 1 ), ( Qt::WindowFlags ) hb_parni( 2 ) ) ; - hb_retptrGC( gcAllocate_QWidget( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QWidget( pObj ) ); } /* * bool acceptDrops () const @@ -247,7 +247,7 @@ HB_FUNC( QT_QWIDGET_BACKGROUNDROLE ) */ HB_FUNC( QT_QWIDGET_BASESIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QWidget( 1 )->baseSize() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QWidget( 1 )->baseSize() ) ) ); } /* @@ -271,7 +271,7 @@ HB_FUNC( QT_QWIDGET_CHILDAT_1 ) */ HB_FUNC( QT_QWIDGET_CHILDRENRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QWidget( 1 )->childrenRect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QWidget( 1 )->childrenRect() ) ) ); } /* @@ -279,7 +279,7 @@ HB_FUNC( QT_QWIDGET_CHILDRENRECT ) */ HB_FUNC( QT_QWIDGET_CHILDRENREGION ) { - hb_retptrGC( gcAllocate_QRegion( new QRegion( hbqt_par_QWidget( 1 )->childrenRegion() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRegion( new QRegion( hbqt_par_QWidget( 1 )->childrenRegion() ) ) ); } /* @@ -303,7 +303,7 @@ HB_FUNC( QT_QWIDGET_CLEARMASK ) */ HB_FUNC( QT_QWIDGET_CONTENTSRECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QWidget( 1 )->contentsRect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QWidget( 1 )->contentsRect() ) ) ); } /* @@ -319,7 +319,7 @@ HB_FUNC( QT_QWIDGET_CONTEXTMENUPOLICY ) */ HB_FUNC( QT_QWIDGET_CURSOR ) { - hb_retptrGC( gcAllocate_QCursor( new QCursor( hbqt_par_QWidget( 1 )->cursor() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QCursor( new QCursor( hbqt_par_QWidget( 1 )->cursor() ) ) ); } /* @@ -359,7 +359,7 @@ HB_FUNC( QT_QWIDGET_FOCUSWIDGET ) */ HB_FUNC( QT_QWIDGET_FONT ) { - hb_retptrGC( gcAllocate_QFont( new QFont( hbqt_par_QWidget( 1 )->font() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFont( new QFont( hbqt_par_QWidget( 1 )->font() ) ) ); } /* @@ -367,7 +367,7 @@ HB_FUNC( QT_QWIDGET_FONT ) */ HB_FUNC( QT_QWIDGET_FONTINFO ) { - hb_retptrGC( gcAllocate_QFontInfo( new QFontInfo( hbqt_par_QWidget( 1 )->fontInfo() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFontInfo( new QFontInfo( hbqt_par_QWidget( 1 )->fontInfo() ) ) ); } /* @@ -375,7 +375,7 @@ HB_FUNC( QT_QWIDGET_FONTINFO ) */ HB_FUNC( QT_QWIDGET_FONTMETRICS ) { - hb_retptrGC( gcAllocate_QFontMetrics( new QFontMetrics( hbqt_par_QWidget( 1 )->fontMetrics() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QFontMetrics( new QFontMetrics( hbqt_par_QWidget( 1 )->fontMetrics() ) ) ); } /* @@ -391,7 +391,7 @@ HB_FUNC( QT_QWIDGET_FOREGROUNDROLE ) */ HB_FUNC( QT_QWIDGET_FRAMEGEOMETRY ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QWidget( 1 )->frameGeometry() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QWidget( 1 )->frameGeometry() ) ) ); } /* @@ -399,7 +399,7 @@ HB_FUNC( QT_QWIDGET_FRAMEGEOMETRY ) */ HB_FUNC( QT_QWIDGET_FRAMESIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QWidget( 1 )->frameSize() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QWidget( 1 )->frameSize() ) ) ); } /* @@ -407,7 +407,7 @@ HB_FUNC( QT_QWIDGET_FRAMESIZE ) */ HB_FUNC( QT_QWIDGET_GEOMETRY ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QWidget( 1 )->geometry() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QWidget( 1 )->geometry() ) ) ); } /* @@ -513,7 +513,7 @@ HB_FUNC( QT_QWIDGET_INPUTCONTEXT ) */ HB_FUNC( QT_QWIDGET_INPUTMETHODQUERY ) { - hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QWidget( 1 )->inputMethodQuery( ( Qt::InputMethodQuery ) hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QWidget( 1 )->inputMethodQuery( ( Qt::InputMethodQuery ) hb_parni( 2 ) ) ) ) ); } /* @@ -649,7 +649,7 @@ HB_FUNC( QT_QWIDGET_LAYOUTDIRECTION ) */ HB_FUNC( QT_QWIDGET_LOCALE ) { - hb_retptrGC( gcAllocate_QLocale( new QLocale( hbqt_par_QWidget( 1 )->locale() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QLocale( new QLocale( hbqt_par_QWidget( 1 )->locale() ) ) ); } /* @@ -657,7 +657,7 @@ HB_FUNC( QT_QWIDGET_LOCALE ) */ HB_FUNC( QT_QWIDGET_MAPFROM ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QWidget( 1 )->mapFrom( hbqt_par_QWidget( 2 ), *hbqt_par_QPoint( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QWidget( 1 )->mapFrom( hbqt_par_QWidget( 2 ), *hbqt_par_QPoint( 3 ) ) ) ) ); } /* @@ -665,7 +665,7 @@ HB_FUNC( QT_QWIDGET_MAPFROM ) */ HB_FUNC( QT_QWIDGET_MAPFROMGLOBAL ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QWidget( 1 )->mapFromGlobal( *hbqt_par_QPoint( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QWidget( 1 )->mapFromGlobal( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* @@ -673,7 +673,7 @@ HB_FUNC( QT_QWIDGET_MAPFROMGLOBAL ) */ HB_FUNC( QT_QWIDGET_MAPFROMPARENT ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QWidget( 1 )->mapFromParent( *hbqt_par_QPoint( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QWidget( 1 )->mapFromParent( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* @@ -681,7 +681,7 @@ HB_FUNC( QT_QWIDGET_MAPFROMPARENT ) */ HB_FUNC( QT_QWIDGET_MAPTO ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QWidget( 1 )->mapTo( hbqt_par_QWidget( 2 ), *hbqt_par_QPoint( 3 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QWidget( 1 )->mapTo( hbqt_par_QWidget( 2 ), *hbqt_par_QPoint( 3 ) ) ) ) ); } /* @@ -689,7 +689,7 @@ HB_FUNC( QT_QWIDGET_MAPTO ) */ HB_FUNC( QT_QWIDGET_MAPTOGLOBAL ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QWidget( 1 )->mapToGlobal( *hbqt_par_QPoint( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QWidget( 1 )->mapToGlobal( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* @@ -697,7 +697,7 @@ HB_FUNC( QT_QWIDGET_MAPTOGLOBAL ) */ HB_FUNC( QT_QWIDGET_MAPTOPARENT ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QWidget( 1 )->mapToParent( *hbqt_par_QPoint( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QWidget( 1 )->mapToParent( *hbqt_par_QPoint( 2 ) ) ) ) ); } /* @@ -705,7 +705,7 @@ HB_FUNC( QT_QWIDGET_MAPTOPARENT ) */ HB_FUNC( QT_QWIDGET_MASK ) { - hb_retptrGC( gcAllocate_QRegion( new QRegion( hbqt_par_QWidget( 1 )->mask() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRegion( new QRegion( hbqt_par_QWidget( 1 )->mask() ) ) ); } /* @@ -721,7 +721,7 @@ HB_FUNC( QT_QWIDGET_MAXIMUMHEIGHT ) */ HB_FUNC( QT_QWIDGET_MAXIMUMSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QWidget( 1 )->maximumSize() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QWidget( 1 )->maximumSize() ) ) ); } /* @@ -745,7 +745,7 @@ HB_FUNC( QT_QWIDGET_MINIMUMHEIGHT ) */ HB_FUNC( QT_QWIDGET_MINIMUMSIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QWidget( 1 )->minimumSize() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QWidget( 1 )->minimumSize() ) ) ); } /* @@ -753,7 +753,7 @@ HB_FUNC( QT_QWIDGET_MINIMUMSIZE ) */ HB_FUNC( QT_QWIDGET_MINIMUMSIZEHINT ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QWidget( 1 )->minimumSizeHint() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QWidget( 1 )->minimumSizeHint() ) ) ); } /* @@ -801,7 +801,7 @@ HB_FUNC( QT_QWIDGET_NEXTINFOCUSCHAIN ) */ HB_FUNC( QT_QWIDGET_NORMALGEOMETRY ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QWidget( 1 )->normalGeometry() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QWidget( 1 )->normalGeometry() ) ) ); } /* @@ -825,7 +825,7 @@ HB_FUNC( QT_QWIDGET_PAINTENGINE ) */ HB_FUNC( QT_QWIDGET_PALETTE ) { - hb_retptrGC( gcAllocate_QPalette( new QPalette( hbqt_par_QWidget( 1 )->palette() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPalette( new QPalette( hbqt_par_QWidget( 1 )->palette() ) ) ); } /* @@ -841,7 +841,7 @@ HB_FUNC( QT_QWIDGET_PARENTWIDGET ) */ HB_FUNC( QT_QWIDGET_POS ) { - hb_retptrGC( gcAllocate_QPoint( new QPoint( hbqt_par_QWidget( 1 )->pos() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPoint( new QPoint( hbqt_par_QWidget( 1 )->pos() ) ) ); } /* @@ -849,7 +849,7 @@ HB_FUNC( QT_QWIDGET_POS ) */ HB_FUNC( QT_QWIDGET_RECT ) { - hb_retptrGC( gcAllocate_QRect( new QRect( hbqt_par_QWidget( 1 )->rect() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( hbqt_par_QWidget( 1 )->rect() ) ) ); } /* @@ -937,7 +937,7 @@ HB_FUNC( QT_QWIDGET_RESTOREGEOMETRY ) */ HB_FUNC( QT_QWIDGET_SAVEGEOMETRY ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QWidget( 1 )->saveGeometry() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QWidget( 1 )->saveGeometry() ) ) ); } /* @@ -1425,7 +1425,7 @@ HB_FUNC( QT_QWIDGET_SETWINDOWSTATE ) */ HB_FUNC( QT_QWIDGET_SIZE ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QWidget( 1 )->size() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QWidget( 1 )->size() ) ) ); } /* @@ -1433,7 +1433,7 @@ HB_FUNC( QT_QWIDGET_SIZE ) */ HB_FUNC( QT_QWIDGET_SIZEHINT ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QWidget( 1 )->sizeHint() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QWidget( 1 )->sizeHint() ) ) ); } /* @@ -1441,7 +1441,7 @@ HB_FUNC( QT_QWIDGET_SIZEHINT ) */ HB_FUNC( QT_QWIDGET_SIZEINCREMENT ) { - hb_retptrGC( gcAllocate_QSize( new QSize( hbqt_par_QWidget( 1 )->sizeIncrement() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSize( new QSize( hbqt_par_QWidget( 1 )->sizeIncrement() ) ) ); } /* @@ -1449,7 +1449,7 @@ HB_FUNC( QT_QWIDGET_SIZEINCREMENT ) */ HB_FUNC( QT_QWIDGET_SIZEPOLICY ) { - hb_retptrGC( gcAllocate_QSizePolicy( new QSizePolicy( hbqt_par_QWidget( 1 )->sizePolicy() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QSizePolicy( new QSizePolicy( hbqt_par_QWidget( 1 )->sizePolicy() ) ) ); } /* @@ -1577,7 +1577,7 @@ HB_FUNC( QT_QWIDGET_UPDATESENABLED ) */ HB_FUNC( QT_QWIDGET_VISIBLEREGION ) { - hb_retptrGC( gcAllocate_QRegion( new QRegion( hbqt_par_QWidget( 1 )->visibleRegion() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QRegion( new QRegion( hbqt_par_QWidget( 1 )->visibleRegion() ) ) ); } /* @@ -1625,7 +1625,7 @@ HB_FUNC( QT_QWIDGET_WINDOWFLAGS ) */ HB_FUNC( QT_QWIDGET_WINDOWICON ) { - hb_retptrGC( gcAllocate_QIcon( new QIcon( hbqt_par_QWidget( 1 )->windowIcon() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QIcon( new QIcon( hbqt_par_QWidget( 1 )->windowIcon() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QWidgetAction.cpp b/harbour/contrib/hbqt/qtgui/QWidgetAction.cpp index 9bb03efe6a..9457e21413 100644 --- a/harbour/contrib/hbqt/qtgui/QWidgetAction.cpp +++ b/harbour/contrib/hbqt/qtgui/QWidgetAction.cpp @@ -121,9 +121,9 @@ QT_G_FUNC( release_QWidgetAction ) } } -void * gcAllocate_QWidgetAction( void * pObj ) +void * hbqt_gcAllocate_QWidgetAction( void * pObj ) { - QGC_POINTER_QWidgetAction * p = ( QGC_POINTER_QWidgetAction * ) hb_gcAllocate( sizeof( QGC_POINTER_QWidgetAction ), gcFuncs() ); + QGC_POINTER_QWidgetAction * p = ( QGC_POINTER_QWidgetAction * ) hb_gcAllocate( sizeof( QGC_POINTER_QWidgetAction ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QWidgetAction; @@ -138,7 +138,7 @@ HB_FUNC( QT_QWIDGETACTION ) pObj = ( QWidgetAction* ) new QWidgetAction( hbqt_par_QObject( 1 ) ) ; - hb_retptrGC( gcAllocate_QWidgetAction( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QWidgetAction( pObj ) ); } /* * QWidget * defaultWidget () const diff --git a/harbour/contrib/hbqt/qtgui/QWidgetItem.cpp b/harbour/contrib/hbqt/qtgui/QWidgetItem.cpp index 2f27bdf592..55e84446f5 100644 --- a/harbour/contrib/hbqt/qtgui/QWidgetItem.cpp +++ b/harbour/contrib/hbqt/qtgui/QWidgetItem.cpp @@ -94,9 +94,9 @@ QT_G_FUNC( release_QWidgetItem ) } } -void * gcAllocate_QWidgetItem( void * pObj ) +void * hbqt_gcAllocate_QWidgetItem( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QWidgetItem; @@ -110,7 +110,7 @@ HB_FUNC( QT_QWIDGETITEM ) pObj = ( QWidgetItem* ) new QWidgetItem( hbqt_par_QWidget( 1 ) ) ; - hb_retptrGC( gcAllocate_QWidgetItem( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QWidgetItem( pObj ) ); } /* * virtual bool isEmpty () const diff --git a/harbour/contrib/hbqt/qtgui/QWindowsStyle.cpp b/harbour/contrib/hbqt/qtgui/QWindowsStyle.cpp index 473e1fd496..e4a8f2068a 100644 --- a/harbour/contrib/hbqt/qtgui/QWindowsStyle.cpp +++ b/harbour/contrib/hbqt/qtgui/QWindowsStyle.cpp @@ -122,9 +122,9 @@ QT_G_FUNC( release_QWindowsStyle ) } } -void * gcAllocate_QWindowsStyle( void * pObj ) +void * hbqt_gcAllocate_QWindowsStyle( void * pObj ) { - QGC_POINTER_QWindowsStyle * p = ( QGC_POINTER_QWindowsStyle * ) hb_gcAllocate( sizeof( QGC_POINTER_QWindowsStyle ), gcFuncs() ); + QGC_POINTER_QWindowsStyle * p = ( QGC_POINTER_QWindowsStyle * ) hb_gcAllocate( sizeof( QGC_POINTER_QWindowsStyle ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QWindowsStyle; @@ -139,7 +139,7 @@ HB_FUNC( QT_QWINDOWSSTYLE ) pObj = ( QWindowsStyle* ) new QWindowsStyle() ; - hb_retptrGC( gcAllocate_QWindowsStyle( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QWindowsStyle( pObj ) ); } /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/QWizard.cpp b/harbour/contrib/hbqt/qtgui/QWizard.cpp index 7e61654b72..4f4f13162d 100644 --- a/harbour/contrib/hbqt/qtgui/QWizard.cpp +++ b/harbour/contrib/hbqt/qtgui/QWizard.cpp @@ -141,9 +141,9 @@ QT_G_FUNC( release_QWizard ) } } -void * gcAllocate_QWizard( void * pObj ) +void * hbqt_gcAllocate_QWizard( void * pObj ) { - QGC_POINTER_QWizard * p = ( QGC_POINTER_QWizard * ) hb_gcAllocate( sizeof( QGC_POINTER_QWizard ), gcFuncs() ); + QGC_POINTER_QWizard * p = ( QGC_POINTER_QWizard * ) hb_gcAllocate( sizeof( QGC_POINTER_QWizard ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QWizard; @@ -158,7 +158,7 @@ HB_FUNC( QT_QWIZARD ) pObj = new QWizard( hbqt_par_QWidget( 2 ) ) ; - hb_retptrGC( gcAllocate_QWizard( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QWizard( pObj ) ); } /* * int addPage ( QWizardPage * page ) @@ -205,7 +205,7 @@ HB_FUNC( QT_QWIZARD_CURRENTPAGE ) */ HB_FUNC( QT_QWIZARD_FIELD ) { - hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QWizard( 1 )->field( hbqt_par_QString( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QWizard( 1 )->field( hbqt_par_QString( 2 ) ) ) ) ); } /* @@ -245,7 +245,7 @@ HB_FUNC( QT_QWIZARD_PAGE ) */ HB_FUNC( QT_QWIZARD_PIXMAP ) { - hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QWizard( 1 )->pixmap( ( QWizard::WizardPixmap ) hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( hbqt_par_QWizard( 1 )->pixmap( ( QWizard::WizardPixmap ) hb_parni( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtgui/QWizardPage.cpp b/harbour/contrib/hbqt/qtgui/QWizardPage.cpp index 12d69cbf71..ac24ccfde4 100644 --- a/harbour/contrib/hbqt/qtgui/QWizardPage.cpp +++ b/harbour/contrib/hbqt/qtgui/QWizardPage.cpp @@ -119,9 +119,9 @@ QT_G_FUNC( release_QWizardPage ) } } -void * gcAllocate_QWizardPage( void * pObj ) +void * hbqt_gcAllocate_QWizardPage( void * pObj ) { - QGC_POINTER_QWizardPage * p = ( QGC_POINTER_QWizardPage * ) hb_gcAllocate( sizeof( QGC_POINTER_QWizardPage ), gcFuncs() ); + QGC_POINTER_QWizardPage * p = ( QGC_POINTER_QWizardPage * ) hb_gcAllocate( sizeof( QGC_POINTER_QWizardPage ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QWizardPage; @@ -136,7 +136,7 @@ HB_FUNC( QT_QWIZARDPAGE ) pObj = new QWizardPage() ; - hb_retptrGC( gcAllocate_QWizardPage( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QWizardPage( pObj ) ); } /* * QString buttonText ( QWizard::WizardButton which ) const @@ -199,7 +199,7 @@ HB_FUNC( QT_QWIZARDPAGE_NEXTID ) */ HB_FUNC( QT_QWIZARDPAGE_PIXMAP ) { - hb_retptrGC( gcAllocate_QPixmap( new QPixmap( hbqt_par_QWizardPage( 1 )->pixmap( ( QWizard::WizardPixmap ) hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QPixmap( new QPixmap( hbqt_par_QWizardPage( 1 )->pixmap( ( QWizard::WizardPixmap ) hb_parni( 2 ) ) ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtnetwork/QFtp.cpp b/harbour/contrib/hbqt/qtnetwork/QFtp.cpp index 13e781c080..36fa34a656 100644 --- a/harbour/contrib/hbqt/qtnetwork/QFtp.cpp +++ b/harbour/contrib/hbqt/qtnetwork/QFtp.cpp @@ -144,9 +144,9 @@ QT_G_FUNC( release_QFtp ) } } -void * gcAllocate_QFtp( void * pObj ) +void * hbqt_gcAllocate_QFtp( void * pObj ) { - QGC_POINTER_QFtp * p = ( QGC_POINTER_QFtp * ) hb_gcAllocate( sizeof( QGC_POINTER_QFtp ), gcFuncs() ); + QGC_POINTER_QFtp * p = ( QGC_POINTER_QFtp * ) hb_gcAllocate( sizeof( QGC_POINTER_QFtp ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QFtp; @@ -161,7 +161,7 @@ HB_FUNC( QT_QFTP ) pObj = new QFtp( hbqt_par_QObject( 1 ) ) ; - hb_retptrGC( gcAllocate_QFtp( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QFtp( pObj ) ); } /* * qint64 bytesAvailable () const @@ -312,7 +312,7 @@ HB_FUNC( QT_QFTP_RAWCOMMAND ) */ HB_FUNC( QT_QFTP_READALL ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QFtp( 1 )->readAll() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QFtp( 1 )->readAll() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtnetwork/QHttp.cpp b/harbour/contrib/hbqt/qtnetwork/QHttp.cpp index 6e1c9ee505..e78f6c4385 100644 --- a/harbour/contrib/hbqt/qtnetwork/QHttp.cpp +++ b/harbour/contrib/hbqt/qtnetwork/QHttp.cpp @@ -144,9 +144,9 @@ QT_G_FUNC( release_QHttp ) } } -void * gcAllocate_QHttp( void * pObj ) +void * hbqt_gcAllocate_QHttp( void * pObj ) { - QGC_POINTER_QHttp * p = ( QGC_POINTER_QHttp * ) hb_gcAllocate( sizeof( QGC_POINTER_QHttp ), gcFuncs() ); + QGC_POINTER_QHttp * p = ( QGC_POINTER_QHttp * ) hb_gcAllocate( sizeof( QGC_POINTER_QHttp ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QHttp; @@ -161,7 +161,7 @@ HB_FUNC( QT_QHTTP ) pObj = new QHttp( hbqt_par_QObject( 1 ) ) ; - hb_retptrGC( gcAllocate_QHttp( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QHttp( pObj ) ); } /* * qint64 bytesAvailable () const @@ -208,7 +208,7 @@ HB_FUNC( QT_QHTTP_CURRENTID ) */ HB_FUNC( QT_QHTTP_CURRENTREQUEST ) { - hb_retptrGC( gcAllocate_QHttpRequestHeader( new QHttpRequestHeader( hbqt_par_QHttp( 1 )->currentRequest() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QHttpRequestHeader( new QHttpRequestHeader( hbqt_par_QHttp( 1 )->currentRequest() ) ) ); } /* @@ -264,7 +264,7 @@ HB_FUNC( QT_QHTTP_HEAD ) */ HB_FUNC( QT_QHTTP_LASTRESPONSE ) { - hb_retptrGC( gcAllocate_QHttpResponseHeader( new QHttpResponseHeader( hbqt_par_QHttp( 1 )->lastResponse() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QHttpResponseHeader( new QHttpResponseHeader( hbqt_par_QHttp( 1 )->lastResponse() ) ) ); } /* @@ -288,7 +288,7 @@ HB_FUNC( QT_QHTTP_POST_1 ) */ HB_FUNC( QT_QHTTP_READALL ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QHttp( 1 )->readAll() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QHttp( 1 )->readAll() ) ) ); } /* diff --git a/harbour/contrib/hbqt/qtnetwork/QHttpRequestHeader.cpp b/harbour/contrib/hbqt/qtnetwork/QHttpRequestHeader.cpp index d9f3ab0a51..714a7124a1 100644 --- a/harbour/contrib/hbqt/qtnetwork/QHttpRequestHeader.cpp +++ b/harbour/contrib/hbqt/qtnetwork/QHttpRequestHeader.cpp @@ -96,9 +96,9 @@ QT_G_FUNC( release_QHttpRequestHeader ) } } -void * gcAllocate_QHttpRequestHeader( void * pObj ) +void * hbqt_gcAllocate_QHttpRequestHeader( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QHttpRequestHeader; @@ -112,7 +112,7 @@ HB_FUNC( QT_QHTTPREQUESTHEADER ) pObj = new QHttpRequestHeader() ; - hb_retptrGC( gcAllocate_QHttpRequestHeader( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QHttpRequestHeader( pObj ) ); } /* * virtual int majorVersion () const diff --git a/harbour/contrib/hbqt/qtnetwork/QHttpResponseHeader.cpp b/harbour/contrib/hbqt/qtnetwork/QHttpResponseHeader.cpp index 0e53679dbe..aaa98c9ef5 100644 --- a/harbour/contrib/hbqt/qtnetwork/QHttpResponseHeader.cpp +++ b/harbour/contrib/hbqt/qtnetwork/QHttpResponseHeader.cpp @@ -96,9 +96,9 @@ QT_G_FUNC( release_QHttpResponseHeader ) } } -void * gcAllocate_QHttpResponseHeader( void * pObj ) +void * hbqt_gcAllocate_QHttpResponseHeader( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QHttpResponseHeader; @@ -112,7 +112,7 @@ HB_FUNC( QT_QHTTPRESPONSEHEADER ) pObj = new QHttpResponseHeader() ; - hb_retptrGC( gcAllocate_QHttpResponseHeader( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QHttpResponseHeader( pObj ) ); } /* * virtual int majorVersion () const diff --git a/harbour/contrib/hbqt/qtnetwork/QNetworkRequest.cpp b/harbour/contrib/hbqt/qtnetwork/QNetworkRequest.cpp index db64ffd0e3..23f4200a1c 100644 --- a/harbour/contrib/hbqt/qtnetwork/QNetworkRequest.cpp +++ b/harbour/contrib/hbqt/qtnetwork/QNetworkRequest.cpp @@ -115,9 +115,9 @@ QT_G_FUNC( release_QNetworkRequest ) } } -void * gcAllocate_QNetworkRequest( void * pObj ) +void * hbqt_gcAllocate_QNetworkRequest( void * pObj ) { - QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), gcFuncs() ); + QGC_POINTER * p = ( QGC_POINTER * ) hb_gcAllocate( sizeof( QGC_POINTER ), hbqt_gcFuncs() ); p->ph = pObj; p->func = release_QNetworkRequest; @@ -131,14 +131,14 @@ HB_FUNC( QT_QNETWORKREQUEST ) pObj = new QNetworkRequest() ; - hb_retptrGC( gcAllocate_QNetworkRequest( pObj ) ); + hb_retptrGC( hbqt_gcAllocate_QNetworkRequest( pObj ) ); } /* * QVariant attribute ( Attribute code, const QVariant & defaultValue = QVariant() ) const */ HB_FUNC( QT_QNETWORKREQUEST_ATTRIBUTE ) { - hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QNetworkRequest( 1 )->attribute( ( QNetworkRequest::Attribute ) hb_parni( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QVariant( 3 ) : QVariant() ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QNetworkRequest( 1 )->attribute( ( QNetworkRequest::Attribute ) hb_parni( 2 ), ( HB_ISPOINTER( 3 ) ? *hbqt_par_QVariant( 3 ) : QVariant() ) ) ) ) ); } /* @@ -154,7 +154,7 @@ HB_FUNC( QT_QNETWORKREQUEST_HASRAWHEADER ) */ HB_FUNC( QT_QNETWORKREQUEST_HEADER ) { - hb_retptrGC( gcAllocate_QVariant( new QVariant( hbqt_par_QNetworkRequest( 1 )->header( ( QNetworkRequest::KnownHeaders ) hb_parni( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QVariant( new QVariant( hbqt_par_QNetworkRequest( 1 )->header( ( QNetworkRequest::KnownHeaders ) hb_parni( 2 ) ) ) ) ); } /* @@ -162,7 +162,7 @@ HB_FUNC( QT_QNETWORKREQUEST_HEADER ) */ HB_FUNC( QT_QNETWORKREQUEST_RAWHEADER ) { - hb_retptrGC( gcAllocate_QByteArray( new QByteArray( hbqt_par_QNetworkRequest( 1 )->rawHeader( *hbqt_par_QByteArray( 2 ) ) ) ) ); + hb_retptrGC( hbqt_gcAllocate_QByteArray( new QByteArray( hbqt_par_QNetworkRequest( 1 )->rawHeader( *hbqt_par_QByteArray( 2 ) ) ) ) ); } /* @@ -202,7 +202,7 @@ HB_FUNC( QT_QNETWORKREQUEST_SETURL ) */ HB_FUNC( QT_QNETWORKREQUEST_URL ) { - hb_retptrGC( gcAllocate_QUrl( new QUrl( hbqt_par_QNetworkRequest( 1 )->url() ) ) ); + hb_retptrGC( hbqt_gcAllocate_QUrl( new QUrl( hbqt_par_QNetworkRequest( 1 )->url() ) ) ); }