From 9ba04742771370f59740e32e11c5f3a1e6a1b70a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 5 Dec 2011 15:55:57 -0600 Subject: Initial TQt conversion --- kalyptus/kalyptusCxxToSmoke.pm | 456 ++++++++++++++++++++--------------------- 1 file changed, 228 insertions(+), 228 deletions(-) (limited to 'kalyptus/kalyptusCxxToSmoke.pm') diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm index ec47ea31..8aa6897f 100644 --- a/kalyptus/kalyptusCxxToSmoke.pm +++ b/kalyptus/kalyptusCxxToSmoke.pm @@ -63,19 +63,19 @@ BEGIN # Mapping for iterproto, when making up the munged method names %mungedTypeMap = ( - 'QString' => '$', - 'QString*' => '$', - 'QString&' => '$', - 'QCString' => '$', - 'QCString*' => '$', - 'QCString&' => '$', + 'TQString' => '$', + 'TQString*' => '$', + 'TQString&' => '$', + 'TQCString' => '$', + 'TQCString*' => '$', + 'TQCString&' => '$', 'char*' => '$', - 'QCOORD*' => '?', - 'QRgb*' => '?', + 'TQCOORD*' => '?', + 'TQRgb*' => '?', 'Q_UINT64' => '$', 'Q_INT64' => '$', 'Q_LLONG' => '$', - 'quint64' => '$', + 'tquint64' => '$', 'qint64' => '$', 'long long' => '$', 'qulonglong' => '$', @@ -97,49 +97,49 @@ BEGIN 'unsigned long' => 'ulong', # Anything that is not known is mapped to void*, so no need for those here anymore -# 'QWSEvent*' => 'void*', -# 'QDiskFont*' => 'void*', +# 'TQWSEvent*' => 'void*', +# 'TQDiskFont*' => 'void*', # 'XEvent*' => 'void*', -# 'QStyleHintReturn*' => 'void*', +# 'TQStyleHintReturn*' => 'void*', # 'FILE*' => 'void*', -# 'QUnknownInterface*' => 'void*', +# 'TQUnknownInterface*' => 'void*', # 'GDHandle' => 'void*', # '_NPStream*' => 'void*', -# 'QTextFormat*' => 'void*', -# 'QTextDocument*' => 'void*', -# 'QTextCursor*' => 'void*', -# 'QTextParag**' => 'void*', -# 'QTextParag*' => 'void*', -# 'QRemoteInterface*' => 'void*', -# 'QSqlRecordPrivate*' => 'void*', -# 'QTSMFI' => 'void*', # QTextStream's QTSManip +# 'TQTextFormat*' => 'void*', +# 'TQTextDocument*' => 'void*', +# 'TQTextCursor*' => 'void*', +# 'TQTextParag**' => 'void*', +# 'TQTextParag*' => 'void*', +# 'TQRemoteInterface*' => 'void*', +# 'TQSqlRecordPrivate*' => 'void*', +# 'TQTSMFI' => 'void*', # TQTextStream's TQTSManip # 'const GUID&' => 'void*', -# 'QWidgetMapper*' => 'void*', +# 'TQWidgetMapper*' => 'void*', 'MSG*' => 'void*', -# 'const QSqlFieldInfoList&' => 'void*', # QSqlRecordInfo - TODO (templates) +# 'const TQSqlFieldInfoList&' => 'void*', # TQSqlRecordInfo - TODO (templates) - 'QPtrCollection::Item' => 'void*', # to avoid a warning + 'TQPtrCollection::Item' => 'void*', # to avoid a warning 'void(* )()' => 'void*', 'void (*)(void* )' => 'void*', 'mode_t' => 'long', - 'QProcess::PID' => 'long', - 'size_type' => 'int', # QSqlRecordInfo - 'Qt::ComparisonFlags' => 'uint', - 'Qt::ToolBarDock' => 'int', # compat thing, Qt shouldn't use it - 'QIODevice::Offset' => 'ulong', + 'TQProcess::PID' => 'long', + 'size_type' => 'int', # TQSqlRecordInfo + 'TQt::ComparisonFlags' => 'uint', + 'TQt::ToolBarDock' => 'int', # compat thing, Qt shouldn't use it + 'TQIODevice::Offset' => 'ulong', 'WState' => 'int', 'WId' => 'ulong', - 'QRgb' => 'uint', + 'TQRgb' => 'uint', 'ksocklen_t' => 'uint', - 'QCOORD' => 'int', - 'QTSMFI' => 'int', - 'Qt::WState' => 'int', - 'Qt::WFlags' => 'int', - 'Qt::HANDLE' => 'uint', - 'QEventLoop::ProcessEventsFlags' => 'uint', - 'QStyle::SCFlags' => 'int', - 'QStyle::SFlags' => 'int', + 'TQCOORD' => 'int', + 'TQTSMFI' => 'int', + 'TQt::WState' => 'int', + 'TQt::WFlags' => 'int', + 'TQt::HANDLE' => 'uint', + 'TQEventLoop::ProcessEventsFlags' => 'uint', + 'TQStyle::SCFlags' => 'int', + 'TQStyle::SFlags' => 'int', 'Q_INT16' => 'short', 'qint16' => 'short', 'Q_INT32' => 'int', @@ -149,11 +149,11 @@ BEGIN 'qint8' => 'char', 'Q_LONG' => 'long', 'Q_UINT16' => 'ushort', - 'quint16' => 'ushort', + 'tquint16' => 'ushort', 'Q_UINT32' => 'uint', - 'quint32' => 'uint', + 'tquint32' => 'uint', 'Q_UINT8' => 'uchar', - 'quint8' => 'uchar', + 'tquint8' => 'uchar', 'Q_ULONG' => 'long', 'qreal' => 'double', 'pid_t' => 'int', @@ -164,18 +164,18 @@ BEGIN 'signed long int' => 'long', 'unsigned long int' => 'ulong', 'unsigned short int' => 'ushort', - 'Qt::Alignment' => 'int', - 'Qt::Orientations' => 'int', - 'Qt::DockWidgetAreas' => 'int', - 'Qt::DropActions' => 'int', - 'Qt::ImageConversionFlags' => 'int', - 'Qt::ItemFlags' => 'int', - 'Qt::KeyboardModifiers' => 'int', - 'Qt::MatchFlags' => 'int', - 'Qt::MouseButtons' => 'int', - 'Qt::ToolBarAreas' => 'int', - 'Qt::WindowFlags' => 'int', - 'Qt::WindowStates' => 'int', + 'TQt::Alignment' => 'int', + 'TQt::Orientations' => 'int', + 'TQt::DockWidgetAreas' => 'int', + 'TQt::DropActions' => 'int', + 'TQt::ImageConversionFlags' => 'int', + 'TQt::ItemFlags' => 'int', + 'TQt::KeyboardModifiers' => 'int', + 'TQt::MatchFlags' => 'int', + 'TQt::MouseButtons' => 'int', + 'TQt::ToolBarAreas' => 'int', + 'TQt::WindowFlags' => 'int', + 'TQt::WindowStates' => 'int', 'AutoFormatting' => 'int', 'DirtyFlags' => 'int', 'EditTriggers' => 'int', @@ -193,27 +193,27 @@ BEGIN 'Permissions' => 'int', 'PrintDialogOptions' => 'int', 'ProcessEventsFlags' => 'int', - 'QDir::Filters' => 'int', - 'QDir::SortFlags' => 'int', - 'QFile::Permissions' => 'int', - 'QGL::FormatOptions' => 'int', - 'QIODevice::OpenMode' => 'int', - 'QImageReader::ImageReaderError' => 'int', - 'QItemSelectionModel::SelectionFlags' => 'int', - 'QPaintEngine::DirtyFlags' => 'int', - 'QPainter::RenderHints' => 'int', - 'QSql::ParamType' => 'int', - 'QTextDocument::FindFlags' => 'int', + 'TQDir::Filters' => 'int', + 'TQDir::SortFlags' => 'int', + 'TQFile::Permissions' => 'int', + 'TQGL::FormatOptions' => 'int', + 'TQIODevice::OpenMode' => 'int', + 'TQImageReader::ImageReaderError' => 'int', + 'TQItemSelectionModel::SelectionFlags' => 'int', + 'TQPaintEngine::DirtyFlags' => 'int', + 'TQPainter::RenderHints' => 'int', + 'TQSql::ParamType' => 'int', + 'TQTextDocument::FindFlags' => 'int', 'Q_PID' => 'int', - 'Qt::DropActions' => 'int', - 'Qt::ImageConversionFlags' => 'int', - 'Qt::ItemFlags' => 'int', - 'Qt::KeyboardModifiers' => 'int', - 'Qt::MatchFlags' => 'int', - 'Qt::MouseButtons' => 'int', - 'Qt::ToolBarAreas' => 'int', - 'Qt::WindowFlags' => 'int', - 'Qt::WindowStates' => 'int', + 'TQt::DropActions' => 'int', + 'TQt::ImageConversionFlags' => 'int', + 'TQt::ItemFlags' => 'int', + 'TQt::KeyboardModifiers' => 'int', + 'TQt::MatchFlags' => 'int', + 'TQt::MouseButtons' => 'int', + 'TQt::ToolBarAreas' => 'int', + 'TQt::WindowFlags' => 'int', + 'TQt::WindowStates' => 'int', 'RenderFlags' => 'int', 'RenderHints' => 'int', 'SortFlags' => 'int', @@ -221,13 +221,13 @@ BEGIN 'Sections' => 'int', 'Filters' => 'int', 'SortFlags' => 'int', - 'QDir::Filters' => 'int', - 'QDir::SortFlags' => 'int', - 'QStyle::State' => 'int', - 'QValidator::State' => 'int', - 'QAbstractSpinBox::StepEnabled' => 'int', - 'QDockWidget::DockWidgetFeatures' => 'int', - 'QStyle::SubControls' => 'int', + 'TQDir::Filters' => 'int', + 'TQDir::SortFlags' => 'int', + 'TQStyle::State' => 'int', + 'TQValidator::State' => 'int', + 'TQAbstractSpinBox::StepEnabled' => 'int', + 'TQDockWidget::DockWidgetFeatures' => 'int', + 'TQStyle::SubControls' => 'int', ); $headerSubdirectories = "kio/|tdevelop/|kinterfacedesigner/|kontact/|kate/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/|knewstuff/" @@ -244,10 +244,10 @@ sub writeDoc mkpath( $outputdir ) unless -f $outputdir; - # Define QPtrCollection::Item, for resolveType - unless ( kdocAstUtil::findRef( $rootnode, "QPtrCollection::Item" ) || $main::qt4 ) { - my $cNode = kdocAstUtil::findRef( $rootnode, "QPtrCollection" ); - warn "QPtrCollection not found" if (!$cNode); + # Define TQPtrCollection::Item, for resolveType + unless ( kdocAstUtil::findRef( $rootnode, "TQPtrCollection::Item" ) || $main::qt4 ) { + my $cNode = kdocAstUtil::findRef( $rootnode, "TQPtrCollection" ); + warn "TQPtrCollection not found" if (!$cNode); my $node = Ast::New( 'Item' ); $node->AddProp( "NodeType", "Forward" ); $node->AddProp( "Source", $cNode->{Source} ) if ($cNode); @@ -309,57 +309,57 @@ sub preParseClass if( $#{$classNode->{Kids}} < 0 || $classNode->{Access} eq "private" || - $classNode->{Access} eq "protected" || # e.g. QPixmap::QPixmapData + $classNode->{Access} eq "protected" || # e.g. TQPixmap::TQPixmapData exists $classNode->{Tmpl} || - # Don't generate standard bindings for QString, this class is handled as a native type - $className eq 'QString' || - $className eq 'QStringData' || - $className eq 'QLatin1String' || - $className eq 'QTLWExtra' || - $className eq 'QWExtra' || - $className eq 'QBig5Codec' || - $className eq 'QBig5hkscsCodec' || - $className eq 'QPtrCollection' || - $className eq 'QGCache' || - $className eq 'QConstString' || - $className eq 'QCString' || + # Don't generate standard bindings for TQString, this class is handled as a native type + $className eq 'TQString' || + $className eq 'TQStringData' || + $className eq 'TQLatin1String' || + $className eq 'TQTLWExtra' || + $className eq 'TQWExtra' || + $className eq 'TQBig5Codec' || + $className eq 'TQBig5hkscsCodec' || + $className eq 'TQPtrCollection' || + $className eq 'TQGCache' || + $className eq 'TQConstString' || + $className eq 'TQCString' || # Don't map classes which are really arrays - $className eq 'QStringList' || - $className eq 'QCanvasItemList' || - $className eq 'QWidgetList' || - $className eq 'QObjectList' || - $className eq 'QStrList' || + $className eq 'TQStringList' || + $className eq 'TQCanvasItemList' || + $className eq 'TQWidgetList' || + $className eq 'TQObjectList' || + $className eq 'TQStrList' || $className eq 'KCmdLineOptions' || # Those are template related - $className eq 'QTSManip' || # cause compiler errors with several gcc versions - $className eq 'QGDict' || - $className eq 'QGList' || - $className eq 'QGArray' || - $className eq 'QGVector' || - $className eq 'QStrIList' || - $className eq 'QStrIVec' || - $className eq 'QBitArray' || - $className eq 'QMapData' || - $className eq 'QMetaEnum::Item' || - $className eq 'QWidgetContainerPlugin' || - $className eq 'QGArray::array_data' || - ($className eq 'QMenuItem' and $main::qt_embedded) || - ($className eq 'QSignal' and $main::qt_embedded) || - ($className eq 'QWSEvent' and $main::qt_embedded) || - ($className eq 'QMetaObjectInit' and $main::qt_embedded) || - ($className eq 'QKoi8Codec' and $main::qt_embedded) || + $className eq 'TQTSManip' || # cause compiler errors with several gcc versions + $className eq 'TQGDict' || + $className eq 'TQGList' || + $className eq 'TQGArray' || + $className eq 'TQGVector' || + $className eq 'TQStrIList' || + $className eq 'TQStrIVec' || + $className eq 'TQBitArray' || + $className eq 'TQMapData' || + $className eq 'TQMetaEnum::Item' || + $className eq 'TQWidgetContainerPlugin' || + $className eq 'TQGArray::array_data' || + ($className eq 'TQMenuItem' and $main::qt_embedded) || + ($className eq 'TQSignal' and $main::qt_embedded) || + ($className eq 'TQWSEvent' and $main::qt_embedded) || + ($className eq 'TQMetaObjectInit' and $main::qt_embedded) || + ($className eq 'TQKoi8Codec' and $main::qt_embedded) || $className eq 'KAccelGen' || - ($className eq 'QAbstractUndoItem' and $main::qt4) || - ($className eq 'QAbstractItemDelegate' and $main::qt4) || - ($className eq 'QDebug' and $main::qt4) || - ($className eq 'QNoDebug' and $main::qt4) || - ($className eq 'QObjectData' and $main::qt4) || - ($className eq 'QSysInfo' and $main::qt4) || - ($className eq 'QPNGImageWriter' and $main::qt4) || - ($className eq 'QPNGImagePacker' and $main::qt4) || - ($className eq 'QTextCodec::ConverterState' and $main::qt4) || - ($className eq 'QTextLayout::Selection' and $main::qt4) || - ($className eq 'QTextStreamManipulator' and $main::qt4) || + ($className eq 'TQAbstractUndoItem' and $main::qt4) || + ($className eq 'TQAbstractItemDelegate' and $main::qt4) || + ($className eq 'TQDebug' and $main::qt4) || + ($className eq 'TQNoDebug' and $main::qt4) || + ($className eq 'TQObjectData' and $main::qt4) || + ($className eq 'TQSysInfo' and $main::qt4) || + ($className eq 'TQPNGImageWriter' and $main::qt4) || + ($className eq 'TQPNGImagePacker' and $main::qt4) || + ($className eq 'TQTextCodec::ConverterState' and $main::qt4) || + ($className eq 'TQTextLayout::Selection' and $main::qt4) || + ($className eq 'TQTextStreamManipulator' and $main::qt4) || $className eq 'DCOPArg' || $className eq 'DCOPReply' || $className eq 'KBookmarkMenu::DynMenuInfo' || @@ -416,46 +416,46 @@ sub preParseClass $className eq 'KURL::List' || $className eq 'KWin::Info' || $className eq 'TerminalInterface' || - $className eq 'QForeachContainerBase' || # Qt4 - $className eq 'QInputMethodEvent::Attribute' || # Qt4 - $className eq 'QAbstractTextDocumentLayout::PaintContext' || # Qt4 - $className eq 'QAbstractTextDocumentLayout::Selection' || # Qt4 - $className eq 'QBrushData' || # Qt4 - $className eq 'QIPv6Address' || # Qt4 - $className eq 'QImageTextKeyLang' || # Qt4 - $className eq 'QMap' || # Qt4 - $className eq 'QMap::const_iterator' || # Qt4 - $className eq 'QMap::iterator' || # Qt4 - $className eq 'QMapData' || # Qt4 - $className eq 'QMapData::Node' || # Qt4 - $className eq 'QSharedData' || # Qt4 - $className eq 'QPainterPath::Element' || # Qt4 - $className eq 'QThreadStorageData' || # Qt4 - $className eq 'QVFbHeader' || # Qt4 - $className eq 'QStyleOptionQ3DockWindow' || # Qt4 - $className eq 'QStyleOptionQ3ListView' || # Qt4 - $className eq 'QStyleOptionQ3ListViewItem' || # Qt4 - $className eq 'QStyleOptionQ3ListView' || # Qt4 - $className eq 'QUpdateLaterEvent' || # Qt4 - $className eq 'QVFbKeyData' || # Qt4 - $className eq 'QVariant::Handler' || # Qt4 - $className eq 'QVariant::PrivateShared' || # Qt4 - $className eq 'QVectorData' || # Qt4 - $className eq 'QWidgetData' || # Qt4 - $className eq 'QThread' || # Qt4 - $className eq 'QThreadStorage' || # Qt4 - $className eq 'QMutex' || # Qt4 - $className eq 'QMutexLocker' || # Qt4 - $className eq 'QSemaphore' || # Qt4 - $className eq 'QWaitCondition' || # Qt4 - $className eq 'QReadWriteLock' || # Qt4 - $className eq 'QReadLocker' || # Qt4 - $className eq 'QWriteLocker' || + $className eq 'TQForeachContainerBase' || # Qt4 + $className eq 'TQInputMethodEvent::Attribute' || # Qt4 + $className eq 'TQAbstractTextDocumentLayout::PaintContext' || # Qt4 + $className eq 'TQAbstractTextDocumentLayout::Selection' || # Qt4 + $className eq 'TQBrushData' || # Qt4 + $className eq 'TQIPv6Address' || # Qt4 + $className eq 'TQImageTextKeyLang' || # Qt4 + $className eq 'TQMap' || # Qt4 + $className eq 'TQMap::const_iterator' || # Qt4 + $className eq 'TQMap::iterator' || # Qt4 + $className eq 'TQMapData' || # Qt4 + $className eq 'TQMapData::Node' || # Qt4 + $className eq 'TQSharedData' || # Qt4 + $className eq 'TQPainterPath::Element' || # Qt4 + $className eq 'TQThreadStorageData' || # Qt4 + $className eq 'TQVFbHeader' || # Qt4 + $className eq 'TQStyleOptionQ3DockWindow' || # Qt4 + $className eq 'TQStyleOptionQ3ListView' || # Qt4 + $className eq 'TQStyleOptionQ3ListViewItem' || # Qt4 + $className eq 'TQStyleOptionQ3ListView' || # Qt4 + $className eq 'TQUpdateLaterEvent' || # Qt4 + $className eq 'TQVFbKeyData' || # Qt4 + $className eq 'TQVariant::Handler' || # Qt4 + $className eq 'TQVariant::PrivateShared' || # Qt4 + $className eq 'TQVectorData' || # Qt4 + $className eq 'TQWidgetData' || # Qt4 + $className eq 'TQThread' || # Qt4 + $className eq 'TQThreadStorage' || # Qt4 + $className eq 'TQMutex' || # Qt4 + $className eq 'TQMutexLocker' || # Qt4 + $className eq 'TQSemaphore' || # Qt4 + $className eq 'TQWaitCondition' || # Qt4 + $className eq 'TQReadWriteLock' || # Qt4 + $className eq 'TQReadLocker' || # Qt4 + $className eq 'TQWriteLocker' || $className =~ /.*Private$/ || # Ignore any classes which aren't for public consumption $className =~ /.*Impl$/ || $className =~ /.*Internal.*/ || $classNode->{Deprecated} || - $classNode->{NodeType} eq 'union' # Skip unions for now, e.g. QPDevCmdParam + $classNode->{NodeType} eq 'union' # Skip unions for now, e.g. TQPDevCmdParam ) { print STDERR "Skipping $className\n" if ($debug); print STDERR "Skipping union $className\n" if ( $classNode->{NodeType} eq 'union'); @@ -492,7 +492,7 @@ sub preParseClass my $name = $m->{astNodeName}; if( $m->{NodeType} eq "method" ) { - if ( $m->{ReturnType} eq 'typedef' # QFile's EncoderFn/DecoderFn callback, very badly parsed + if ( $m->{ReturnType} eq 'typedef' # TQFile's EncoderFn/DecoderFn callback, very badly parsed ) { $m->{NodeType} = 'deleted'; next; @@ -604,23 +604,23 @@ sub preParseClass || ($name eq 'handle') # Obsolete - || ($classNode->{astNodeName} eq 'QTextStream' and $name eq 'QTextStream' - and @{$m->{ParamList}} == 2 and $m->{ParamList}[0]->{ArgType} eq 'QString&') + || ($classNode->{astNodeName} eq 'TQTextStream' and $name eq 'TQTextStream' + and @{$m->{ParamList}} == 2 and $m->{ParamList}[0]->{ArgType} eq 'TQString&') # Various methods to skip in Qt/E (Qt 2.3.x) || ($main::qt_embedded - && ( ($classNode->{astNodeName} eq 'QUriDrag' and $name =~ /^decode$|decodeLocalFiles|decodeToUnicodeUris/) - || ($classNode->{astNodeName} eq 'QApplication' and $name =~ /^qwsSetCustomColors|^setArgs$|^winMouseButtonUp|^winFocus|^winMouseButtonUP$|^winVersion$/) - || ($classNode->{astNodeName} eq 'QPrinter' and $name =~ /^setIdle$|^setActive$/) - || ($classNode->{astNodeName} eq 'QDragObject' and $name eq 'dragLink') - || ($classNode->{astNodeName} eq 'QFont' and $name eq 'qwsRenderToDisk') - || ($classNode->{astNodeName} eq 'QFontInfo' and $name eq 'font') - || ($classNode->{astNodeName} eq 'QLineEdit' and $name eq 'getSelection') - || ($classNode->{astNodeName} eq 'QMainWindow' and $name eq 'toolBars') - || ($classNode->{astNodeName} eq 'QMovie' and $name eq 'setDisplayWidget') - || ($classNode->{astNodeName} eq 'QMetaObject' and $name =~ /^new_metaenum_item$|^new_metaaccess$/) - || ($classNode->{astNodeName} eq 'QPainter' and $name eq 'pos') - || ($classNode->{astNodeName} eq 'QPixmap' and $name =~ /^allocCell$|^clut$|^freeCell|^hbm|^isMultiCellPixmap|^multiCellPixmap|^multiCellBitmap|^multiCellHandle|^multiCellOffset|^numCols/) + && ( ($classNode->{astNodeName} eq 'TQUriDrag' and $name =~ /^decode$|decodeLocalFiles|decodeToUnicodeUris/) + || ($classNode->{astNodeName} eq 'TQApplication' and $name =~ /^qwsSetCustomColors|^setArgs$|^winMouseButtonUp|^winFocus|^winMouseButtonUP$|^winVersion$/) + || ($classNode->{astNodeName} eq 'TQPrinter' and $name =~ /^setIdle$|^setActive$/) + || ($classNode->{astNodeName} eq 'TQDragObject' and $name eq 'dragLink') + || ($classNode->{astNodeName} eq 'TQFont' and $name eq 'qwsRenderToDisk') + || ($classNode->{astNodeName} eq 'TQFontInfo' and $name eq 'font') + || ($classNode->{astNodeName} eq 'TQLineEdit' and $name eq 'getSelection') + || ($classNode->{astNodeName} eq 'TQMainWindow' and $name eq 'toolBars') + || ($classNode->{astNodeName} eq 'TQMovie' and $name eq 'setDisplayWidget') + || ($classNode->{astNodeName} eq 'TQMetaObject' and $name =~ /^new_metaenum_item$|^new_metaaccess$/) + || ($classNode->{astNodeName} eq 'TQPainter' and $name eq 'pos') + || ($classNode->{astNodeName} eq 'TQPixmap' and $name =~ /^allocCell$|^clut$|^freeCell|^hbm|^isMultiCellPixmap|^multiCellPixmap|^multiCellBitmap|^multiCellHandle|^multiCellOffset|^numCols/) || ($name eq 'handle') || ($name eq 'resetInputContext') || ($name eq 'propagateUpdates') @@ -642,23 +642,23 @@ sub preParseClass || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'trUtf8') || ($main::qt4 - && ( ($classNode->{astNodeName} eq 'QWidgetListItem' and $name eq 'operator=') - || ($classNode->{astNodeName} eq 'QColormap' and $name eq 'operator=') - || ($classNode->{astNodeName} eq 'QListWidget' and $name eq 'setItemPosition') - || ($classNode->{astNodeName} eq 'QFontMetricsF' and $name eq 'operator=') - || ($classNode->{astNodeName} eq 'QFontMetricsF' and $name eq 'QFontMetricsF' - and $#{$m->{ParamList}} == 0 && $m->{ParamList}[0]->{ArgType} eq 'const QFontMetrics&') - || ($classNode->{astNodeName} eq 'QHttp' and $name eq 'supportedOperations') - || ($classNode->{astNodeName} eq 'QRectF' and $name eq 'setX') - || ($classNode->{astNodeName} eq 'QRectF' and $name eq 'setY') - || ($classNode->{astNodeName} eq 'QTextObject' and $name eq 'formatType') - || ($classNode->{astNodeName} eq 'QUrl' and $name eq 'QUrl' - and $#{$m->{ParamList}} == 0 && $m->{ParamList}[0]->{ArgType} eq 'QUrlPrivate&') - || ($classNode->{astNodeName} eq 'QGlobalSpace' and $name eq 'operator<<' and $m->{ParamList}[0]->{ArgType} =~ /QDebug/) - || ($classNode->{astNodeName} eq 'QGlobalSpace' and $#{$m->{ParamList}} > 0 and $name =~ /operator/ and $m->{ParamList}[1]->{ArgType} =~ /QVariant::Type/) + && ( ($classNode->{astNodeName} eq 'TQWidgetListItem' and $name eq 'operator=') + || ($classNode->{astNodeName} eq 'TQColormap' and $name eq 'operator=') + || ($classNode->{astNodeName} eq 'TQListWidget' and $name eq 'setItemPosition') + || ($classNode->{astNodeName} eq 'TQFontMetricsF' and $name eq 'operator=') + || ($classNode->{astNodeName} eq 'TQFontMetricsF' and $name eq 'TQFontMetricsF' + and $#{$m->{ParamList}} == 0 && $m->{ParamList}[0]->{ArgType} eq 'const TQFontMetrics&') + || ($classNode->{astNodeName} eq 'TQHttp' and $name eq 'supportedOperations') + || ($classNode->{astNodeName} eq 'TQRectF' and $name eq 'setX') + || ($classNode->{astNodeName} eq 'TQRectF' and $name eq 'setY') + || ($classNode->{astNodeName} eq 'TQTextObject' and $name eq 'formatType') + || ($classNode->{astNodeName} eq 'TQUrl' and $name eq 'TQUrl' + and $#{$m->{ParamList}} == 0 && $m->{ParamList}[0]->{ArgType} eq 'TQUrlPrivate&') + || ($classNode->{astNodeName} eq 'TQGlobalSpace' and $name eq 'operator<<' and $m->{ParamList}[0]->{ArgType} =~ /TQDebug/) + || ($classNode->{astNodeName} eq 'TQGlobalSpace' and $#{$m->{ParamList}} > 0 and $name =~ /operator/ and $m->{ParamList}[1]->{ArgType} =~ /TQVariant::Type/) || ($#{$m->{ParamList}} > 0 and $m->{ParamList}[0]->{ArgType} =~ /Private/) - || ($classNode->{astNodeName} eq 'QScrollArea' and $name eq 'alignment') - || ($classNode->{astNodeName} eq 'QScrollArea' and $name eq 'setAlignment') + || ($classNode->{astNodeName} eq 'TQScrollArea' and $name eq 'alignment') + || ($classNode->{astNodeName} eq 'TQScrollArea' and $name eq 'setAlignment') || ($m->{ReturnType} =~ /QT3_SUPPORT/) ) ) || $m->{Deprecated} ) { @@ -668,7 +668,7 @@ sub preParseClass # Hack for fixing up KDE 3.1 KLed where the no arg constructor was ambiguous if ($classNode->{astNodeName} eq 'KLed' and $name eq 'KLed' && $#{$m->{ParamList}} > 0) { - if ($m->{ParamList}[0]->{ArgType} =~ /QColor/ && defined $m->{ParamList}[0]->{DefaultValue}) { + if ($m->{ParamList}[0]->{ArgType} =~ /TQColor/ && defined $m->{ParamList}[0]->{DefaultValue}) { $m->{ParamList}[0]->{DefaultValue} = undef; if (defined $kledAmbiguousConstructor) { $kledAmbiguousConstructor->{ParamList}[0]->{DefaultValue} = undef; @@ -688,12 +688,12 @@ sub preParseClass } if ( $arg->{ArgType} eq '...' # refuse a method with variable arguments - or $arg->{ArgType} eq 'image_io_handler' # QImage's callback - or $arg->{ArgType} eq 'DecoderFn' # QFile's callback - or $arg->{ArgType} eq 'EncoderFn' # QFile's callback - or $arg->{ArgType} =~ /bool \(\*\)\(QObject/ # QMetaObject's ctor - or $arg->{ArgType} eq 'QtStaticMetaObjectFunction' # QMetaObjectCleanUp's ctor with func pointer - or $arg->{ArgType} eq 'const QTextItem&' # ref to a private class in 3.2.0b1 + or $arg->{ArgType} eq 'image_io_handler' # TQImage's callback + or $arg->{ArgType} eq 'DecoderFn' # TQFile's callback + or $arg->{ArgType} eq 'EncoderFn' # TQFile's callback + or $arg->{ArgType} =~ /bool \(\*\)\(TQObject/ # TQMetaObject's ctor + or $arg->{ArgType} eq 'QtStaticMetaObjectFunction' # TQMetaObjectCleanUp's ctor with func pointer + or $arg->{ArgType} eq 'const TQTextItem&' # ref to a private class in 3.2.0b1 or $arg->{ArgType} eq 'FILE*' # won't be able to handle that I think or $arg->{ArgType} eq 'const KKeyNative&' # or $arg->{ArgType} =~ /Node\s*\*/ # @@ -702,8 +702,8 @@ sub preParseClass } else { - # Resolve type in full, e.g. for QSessionManager::RestartHint - # (x_QSessionManager doesn't inherit QSessionManager) + # Resolve type in full, e.g. for TQSessionManager::RestartHint + # (x_QSessionManager doesn't inherit TQSessionManager) $arg->{ArgType} = kalyptusDataDict::resolveType($arg->{ArgType}, $classNode, $rootnode); registerType( $arg->{ArgType} ); $argId++; @@ -734,7 +734,7 @@ sub preParseClass #print STDERR "$fullEnumName is an enum\n"; } elsif( $m->{NodeType} eq 'var' ) { - if ( ($classNode->{astNodeName} eq 'QUuid' and $name eq 'data4') + if ( ($classNode->{astNodeName} eq 'TQUuid' and $name eq 'data4') || ($name eq 'd') || ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'mIncomingMetaData') || ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'mOutgoingMetaData') ) @@ -750,7 +750,7 @@ sub preParseClass $varType =~ s/static\s+//; if ( $m->{Flags} =~ "s" ) { - # We are interested in public static vars, like QColor::blue + # We are interested in public static vars, like TQColor::blue if ( $m->{Access} ne 'private' && $className."::".$m->{astNodeName} ne "KSpell::modalListText" ) { @@ -830,8 +830,8 @@ sub preParseClass $methodNode->AddProp( "Access", "public" ); } - # If we have a private pure virtual, then the class can't be instanciated (e.g. QCanvasItem) - # Same if the class has only private constructors (e.g. QInputDialog) + # If we have a private pure virtual, then the class can't be instanciated (e.g. TQCanvasItem) + # Same if the class has only private constructors (e.g. TQInputDialog) $classNode->AddProp( "CanBeInstanciated", $hasPublicProtectedConstructor && !$hasPrivatePureVirtual ); # We will derive from the class only if it has public or protected constructors. @@ -841,9 +841,9 @@ sub preParseClass # We need a public dtor to destroy the object --- ### aren't protected dtors ok too ?? $classNode->AddProp( "HasPublicDestructor", $hasPublicDestructor ); - # Hack for QAsyncIO. We don't implement the "if a class has no explicit copy ctor, + # Hack for TQAsyncIO. We don't implement the "if a class has no explicit copy ctor, # then all of its member variables must be copiable, otherwise the class isn't copiable". - $hasPrivateCopyConstructor = 1 if ( $className eq 'QAsyncIO' ); + $hasPrivateCopyConstructor = 1 if ( $className eq 'TQAsyncIO' ); # Remember if this class can't be copied - it means all its descendants can't either $classNode->AddProp( "CanBeCopied", !$hasPrivateCopyConstructor ); @@ -973,7 +973,7 @@ my $fhn =1; # static print $fh $switchCode; print $fh "}\n\n"; } - #if ( $className =~ /^(QBrush|QColor|QCursor|QFont|QImage|QPalette|QPixmap|QPoint|QPointArray|QRect|QRegion|QSize|QWMatrix)$/ ) { + #if ( $className =~ /^(TQBrush|TQColor|TQCursor|TQFont|TQImage|TQPalette|TQPixmap|TQPoint|TQPointArray|TQRect|TQRegion|TQSize|TQWMatrix)$/ ) { # print XCPPFILE " const char *{serial} operator << () const : pig_serialize(\$this);\n"; # print XCPPFILE " void operator >> (const char *{serial}) : pig_deserialize(\$this, \$1);\n"; #} @@ -1082,7 +1082,7 @@ sub coerce_type($$$$) { } else { if ( $unionfield eq 's_class' or ( $unionfield eq 's_voidp' and $type ne 'void*' ) - or $type eq 'QString' ) { # hack + or $type eq 'TQString' ) { # hack $type =~ s/^const\s+//; if($new) { $code .= "(void*)new $type($var);\n"; @@ -1098,7 +1098,7 @@ sub coerce_type($$$$) { } # Generate the list of args casted to their real type, e.g. -# (QObject*)x[1].s_class,(QEvent*)x[2].s_class,x[3].s_int +# (TQObject*)x[1].s_class,(TQEvent*)x[2].s_class,x[3].s_int sub makeCastedArgList { my @castedList; @@ -1126,7 +1126,7 @@ sub makeCastedArgList } else { if ( $unionfield eq 's_class' or ( $unionfield eq 's_voidp' and $type ne 'void*' ) - or $type eq 'QString' ) { # hack + or $type eq 'TQString' ) { # hack $cast = "*($type *)"; } else { $cast = "($type)"; @@ -1338,18 +1338,18 @@ sub generateMethod($$$) # # Skip internal methods, which return unknown types # # Hmm, the C# bindings have a list of those too. -# return if ( $returnType =~ m/QGfx\s*\*/ ); +# return if ( $returnType =~ m/TQGfx\s*\*/ ); # return if ( $returnType eq 'CGContextRef' ); -# return if ( $returnType eq 'QWSDisplay *' ); +# return if ( $returnType eq 'TQWSDisplay *' ); # # This stuff needs callback, or ** # return if ( $name eq 'defineIOHandler' or $name eq 'qt_init_internal' ); # # Skip casting operators, but not == < etc. # return if ( $name =~ /operator \w+/ ); -# # QFile's EncoderFn/DecoderFn +# # TQFile's EncoderFn/DecoderFn # return if ( $name =~ /set[ED][ne]codingFunction/ ); -# # How to implement this? (QXmlDefaultHandler/QXmlEntityResolver::resolveEntity, needs A*&) -# return if ( $name eq 'resolveEntity' and $className =~ /^QXml/ ); -# return if ( $className eq 'QBitArray' && $m->{Access} eq 'protected' ); +# # How to implement this? (TQXmlDefaultHandler/TQXmlEntityResolver::resolveEntity, needs A*&) +# return if ( $name eq 'resolveEntity' and $className =~ /^TQXml/ ); +# return if ( $className eq 'TQBitArray' && $m->{Access} eq 'protected' ); #print STDERR "Tests passed, generating.\n"; @@ -1853,7 +1853,7 @@ sub registerType($$) { $type =~ s/\s+const\s*\*$/\*/; # for 'char* const*' $type =~ s/(<[^>]*)\s+([^>]*>)/$1$2/; # Remove embedded space from template types, such as - # 'QMap' + # 'TQMap' return if ( $type eq 'void' or $type eq '' or $type eq '~' ); die if ( $type eq '...' ); # ouch @@ -1871,7 +1871,7 @@ sub registerType($$) { return; } - die if $type eq 'QTextEdit::UndoRedoInfo::Type'; + die if $type eq 'TQTextEdit::UndoRedoInfo::Type'; die if $type eq ''; my $realType = $type; @@ -1912,7 +1912,7 @@ sub findTypeEntry($) { $type =~ s/\s+const\s*\*$/\*/; # for 'char* const*' $type =~ s/(<[^>]*)\s+([^>]*>)/$1$2/; # Remove embedded space from template types, such as - # 'QMap' + # 'TQMap' return undef if ( $type =~ '~' or $type eq 'void' or $type eq '' ); @@ -2009,8 +2009,8 @@ sub prepareCaseDict($) { $ok = 0 if ( $ok && $m->{Flags} =~ "p" ); # Bugfix for Qt-3.0.4: those methods are NOT implemented (report sent). - $ok = 0 if ( $ok && $className eq 'QLineEdit' && ( $name eq 'setPasswordChar' || $name eq 'passwordChar' ) ); - $ok = 0 if ( $ok && $className eq 'QWidgetItem' && $name eq 'widgetSizeHint' ); + $ok = 0 if ( $ok && $className eq 'TQLineEdit' && ( $name eq 'setPasswordChar' || $name eq 'passwordChar' ) ); + $ok = 0 if ( $ok && $className eq 'TQWidgetItem' && $name eq 'widgetSizeHint' ); if ( !$ok ) { @@ -2283,7 +2283,7 @@ sub writeSmokeDataFile($) { # First write the name print OUT "\t{ \"$type\", "; # Then write the classId (and find out the typeid at the same time) - if(exists $classidx{$realType}) { # this one first, we want t_class for QBlah* + if(exists $classidx{$realType}) { # this one first, we want t_class for TQBlah* $typeId = 't_class'; print OUT "$classidx{$realType}, "; } -- cgit v1.2.3