TQt4 port kdevelop

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 66 insertions, 66 deletions

diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp
index 334c7d6c..2fa5e2d8 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -191,8 +191,8 @@ public:
 };
 
 
-CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStringList &args )
-: KDevLanguageSupport( CppSupportFactory::info(), parent, name ? name : "KDevCppSupport" ), m_backgroundParser(0),
+CppSupportPart::CppSupportPart( TQObject *tqparent, const char *name, const TQStringList &args )
+: KDevLanguageSupport( CppSupportFactory::info(), tqparent, name ? name : "KDevCppSupport" ), m_backgroundParser(0),
 	m_activeDocument( 0 ), m_activeView( 0 ), m_activeSelection( 0 ), m_activeEditor( 0 ), m_activeViewCursor( 0 ),
 	m_projectClosed( true ), m_projectClosing( false ), m_valid( false ), m_isTyping( false ), m_hadErrors( false ),
 	_jd(0)
@@ -205,7 +205,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri
 		this, TQT_SLOT( splitHeaderSourceConfigStored() ) );
 	connect( m_pCompletionConfig, TQT_SIGNAL( stored() ),
 	         this, TQT_SLOT( codeCompletionConfigStored() ) );
-	m_qtBuildConfig = new QtBuildConfig( this, projectDom() );
+	m_qtBuildConfig = new TQtBuildConfig( this, projectDom() );
     m_qtBuildConfig->store();
 
 	m_backgroundParserConfig = new BackgroundParserConfig;
@@ -480,7 +480,7 @@ void CppSupportPart::activePartChanged( KParts::Part *part )
 	m_activeSelection = dynamic_cast<KTextEditor::SelectionInterface*>( part );
 	m_activeViewCursor = dynamic_cast<KTextEditor::ViewCursorInterface*>( m_activeView );
 
-	m_activeFileName = TQString::null;
+	m_activeFileName = TQString();
 
 	if ( m_activeDocument )
 	{
@@ -688,7 +688,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 		if ( !text.isEmpty() )
 		{
 			id = popup->insertItem( i18n( "Make Member" ), this, TQT_SLOT( slotMakeMember() ) );
-			popup->setWhatsThis( id, i18n( "<b>Make member</b><p>Creates a class member function in implementation file "
+			popup->tqsetWhatsThis( id, i18n( "<b>Make member</b><p>Creates a class member function in implementation file "
 			                               "based on the member declaration at the current line." ) );
 		}
 
@@ -737,7 +737,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 			{
 				TQPopupMenu * m2 = new TQPopupMenu( popup );
 				id = popup->insertItem( i18n( "Go to Declaration" ), m2 );
-				popup->setWhatsThis( id, i18n( "<b>Go to declaration</b><p>Provides a menu to select available function declarations "
+				popup->tqsetWhatsThis( id, i18n( "<b>Go to declaration</b><p>Provides a menu to select available function declarations "
 				                               "in the current file and in the corresponding header (if the current file is an implementation) or source (if the current file is a header) file." ) );
 
 				FileDom file2 = codeModel() ->fileByName( candidate );
@@ -753,7 +753,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 						text += "::";
 					}
 					text += formatModelItem( *it, true );
-					text = text.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&&" ) );
+					text = text.tqreplace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&&" ) );
 					int id = m2->insertItem( text, this, TQT_SLOT( gotoDeclarationLine( int ) ) );
 					int line, column;
 					( *it ) ->getStartPosition( &line, &column );
@@ -781,7 +781,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 			{
 				TQPopupMenu * m = new TQPopupMenu( popup );
 				id = popup->insertItem( i18n( "Go to Definition" ), m );
-				popup->setWhatsThis( id, i18n( "<b>Go to definition</b><p>Provides a menu to select available function definitions "
+				popup->tqsetWhatsThis( id, i18n( "<b>Go to definition</b><p>Provides a menu to select available function definitions "
 				                               "in the current file and in the corresponding header (if the current file is an implementation) or source (if the current file is a header) file." ) );
 
 				const FileDom file = codeModel() ->fileByName( candidate1 );
@@ -794,7 +794,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 						text += "::";
 					}
 					text += formatModelItem( *it, true );
-					text = text.replace( TQString::fromLatin1( "&" ), TQString::fromLatin1( "&&" ) );
+					text = text.tqreplace( TQString::tqfromLatin1( "&" ), TQString::tqfromLatin1( "&&" ) );
 					int id = m->insertItem( text, this, TQT_SLOT( gotoLine( int ) ) );
 					int line, column;
 					( *it ) ->getStartPosition( &line, &column );
@@ -822,7 +822,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 		{
 			m_activeClass = ( ClassModel* ) mcontext->item();
 			int id = popup->insertItem( i18n( "Extract Interface..." ), this, TQT_SLOT( slotExtractInterface() ) );
-			popup->setWhatsThis( id, i18n( "<b>Extract interface</b><p>Extracts interface from the selected class and creates a new class with this interface. "
+			popup->tqsetWhatsThis( id, i18n( "<b>Extract interface</b><p>Extracts interface from the selected class and creates a new class with this interface. "
 			                               "No implementation code is extracted and no implementation code is created." ) );
 		}
 		else if ( mcontext->item() ->isFunction() )
@@ -840,7 +840,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context )
 		{
 			m_contextFileName = url.path();
 			int id = popup->insertItem( i18n( "Create or Select Implementation..." ), this, TQT_SLOT( slotCreateSubclass() ) );
-			popup->setWhatsThis( id, i18n( "<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner." ) );
+			popup->tqsetWhatsThis( id, i18n( "<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner." ) );
 		}
 	}
 }
@@ -850,7 +850,7 @@ TQStringList makeListUnique( const TQStringList& rhs ) {
 	TQMap<TQString, bool> map;
 	TQStringList ret;
 	for( TQStringList::const_iterator it = rhs.begin(); it != rhs.end(); ++it ) {
-		if( map.find( *it ) == map.end() ) {
+		if( map.tqfind( *it ) == map.end() ) {
 			ret << *it;
 			map.insert( *it, true );
 		}
@@ -871,14 +871,14 @@ TQStringList CppSupportPart::reorder( const TQStringList &list )
 	for ( it = list.begin(); it != list.end(); ++it )
 	{
 		TQString filePath = *it;
-		// brilliant stuff.. this method is apparently called both with
+		// brilliant stuff.. this method is aptqparently called both with
 		// relative and absolute paths..
 		if ( !filePath.startsWith("/") )
 		{
 			filePath = projectPath + "/" + filePath;
 		}
 		if( !isValidSource( filePath ) ) continue;
-		if ( headerExtensions.contains( TQFileInfo( filePath ).extension() ) )
+		if ( headerExtensions.tqcontains( TQFileInfo( filePath ).extension() ) )
 			headers << ( filePath );
 		else
 			others << ( filePath );
@@ -945,7 +945,7 @@ void CppSupportPart::savedFile( const KURL &file )
 
 	kdDebug( 9007 ) << "savedFile(): " << fileName.mid ( m_projectDirectory.length() + 1 ) << endl;
 
-	if ( m_projectFileList.contains( fileName.mid ( m_projectDirectory.length() + 1 ) ) )
+	if ( m_projectFileList.tqcontains( fileName.mid ( m_projectDirectory.length() + 1 ) ) )
 	{
 		maybeParse( fileName );
 		emit addedSourceInfo( fileName );
@@ -962,7 +962,7 @@ TQString CppSupportPart::findSourceFile()
 	// extract the base path (full path without '.' and extension)
 	TQString base = path.left( path.length() - ext.length() - 1 );
 	TQStringList candidates;
-	if ( TQStringList::split( ',', "h,H,hh,hxx,hpp,tlh" ).contains( ext ) )
+	if ( TQStringList::split( ',', "h,H,hh,hxx,hpp,tlh" ).tqcontains( ext ) )
 	{
 		candidates << ( base + ".c" );
 		candidates << ( base + ".cc" );
@@ -997,7 +997,7 @@ TQString CppSupportPart::sourceOrHeaderCandidate( const KURL &url )
 		KTextEditor::Document * doc =
 			dynamic_cast<KTextEditor::Document*>( partController() ->activePart() );
 		if ( !doc )
-			return TQString::null;
+			return TQString();
 		urlPath = doc->url().path();
 	}
 	else
@@ -1010,14 +1010,14 @@ TQString CppSupportPart::sourceOrHeaderCandidate( const KURL &url )
 	// extract the exension
 	TQString ext = fi.extension();
 	if ( ext.isEmpty() )
-		return TQString::null;
+		return TQString();
 	// extract the base path (full path without '.' and extension)
 	TQString base = path.left( path.length() - ext.length() - 1 );
 	//kdDebug( 9007 ) << "base: " << base << ", ext: " << ext << endl;
 	// just the filename without the extension
 	TQString fileNameWoExt = fi.fileName();
 	if ( !ext.isEmpty() )
-		fileNameWoExt.replace( "." + ext, "" );
+		fileNameWoExt.tqreplace( "." + ext, "" );
 	TQString possibleExts;
 	// depending on the current extension assemble a list of
 	// candidate files to look for
@@ -1026,13 +1026,13 @@ TQString CppSupportPart::sourceOrHeaderCandidate( const KURL &url )
 	if ( path.endsWith( "_impl.h" ) )
 	{
 		TQString headerpath = path;
-		headerpath.replace( "_impl.h", ".h" );
+		headerpath.tqreplace( "_impl.h", ".h" );
 		candidates << headerpath;
-		fileNameWoExt.replace( "_impl", "" );
+		fileNameWoExt.tqreplace( "_impl", "" );
 		possibleExts = "h";
 	}
 	// if file is a header file search for implementation file
-	else if ( TQStringList::split( ',', "h,H,hh,hxx,hpp,tlh" ).contains( ext ) )
+	else if ( TQStringList::split( ',', "h,H,hh,hxx,hpp,tlh" ).tqcontains( ext ) )
 	{
 		candidates << ( base + ".c" );
 		candidates << ( base + ".cc" );
@@ -1048,7 +1048,7 @@ TQString CppSupportPart::sourceOrHeaderCandidate( const KURL &url )
 		possibleExts = "c,cc,cpp,c++,cxx,C,m,mm,M,inl,_impl.h";
 	}
 	// if file is an implementation file, search for header file
-	else if ( TQStringList::split( ',', "c,cc,cpp,c++,cxx,C,m,mm,M,inl" ).contains( ext ) )
+	else if ( TQStringList::split( ',', "c,cc,cpp,c++,cxx,C,m,mm,M,inl" ).tqcontains( ext ) )
 	{
 		candidates << ( base + ".h" );
 		candidates << ( base + ".H" );
@@ -1059,7 +1059,7 @@ TQString CppSupportPart::sourceOrHeaderCandidate( const KURL &url )
 		possibleExts = "h,H,hh,hxx,hpp,tlh";
 	}
         // search for files from the assembled candidate lists, return the first
-        // candidate file that actually exists or TQString::null if nothing is found.
+        // candidate file that actually exists or TQString() if nothing is found.
         TQStringList::ConstIterator it;
         for ( it = candidates.begin(); it != candidates.end(); ++it )
         {
@@ -1081,10 +1081,10 @@ TQString CppSupportPart::sourceOrHeaderCandidate( const KURL &url )
 		candidateFileWoExt.setFile(*fileIt);
 		//kdDebug( 9007 ) << "candidate file: " << *fileIt << endl;
 		if( !candidateFileWoExt.extension().isEmpty() )
-			candidateFileWoExtString = candidateFileWoExt.fileName().replace( "." + candidateFileWoExt.extension(), "" );
+			candidateFileWoExtString = candidateFileWoExt.fileName().tqreplace( "." + candidateFileWoExt.extension(), "" );
 		if ( candidateFileWoExtString == fileNameWoExt )
 		{
-			if ( possibleExtsList.contains( candidateFileWoExt.extension() ) || candidateFileWoExt.extension().isEmpty() )
+			if ( possibleExtsList.tqcontains( candidateFileWoExt.extension() ) || candidateFileWoExt.extension().isEmpty() )
 			{
 				//kdDebug( 9007 ) << "checking if " << *fileIt << " exists" << endl;
 				if ( TQFileInfo( *fileIt ).exists() )
@@ -1093,7 +1093,7 @@ TQString CppSupportPart::sourceOrHeaderCandidate( const KURL &url )
 			}
 		}
 	}
-	return TQString::null;
+	return TQString();
 }
 
 void CppSupportPart::slotSaveMemory() {
@@ -1354,13 +1354,13 @@ KDevLanguageSupport::Features CppSupportPart::features()
 TQString CppSupportPart::formatClassName( const TQString &name )
 {
 	TQString n = name;
-	return n.replace( ".", "::" );
+	return n.tqreplace( ".", "::" );
 }
 
 TQString CppSupportPart::unformatClassName( const TQString &name )
 {
 	TQString n = name;
-	return n.replace( "::", "." );
+	return n.tqreplace( "::", "." );
 }
 
 bool CppSupportPart::shouldSplitDocument(const KURL &url)
@@ -1506,7 +1506,7 @@ bool CppSupportPart::parseProject( bool force )
 				uint offset;
 
 				_jd->stream >> fn >> ts >> offset;
-				_jd->pcs[ fn ] = qMakePair( ts, offset );
+				_jd->pcs[ fn ] = tqMakePair( ts, offset );
 			}
 		}
 	}
@@ -1554,11 +1554,11 @@ void CppSupportPart::slotParseFiles()
 			{
 				TQDateTime t = fileInfo.lastModified();
 
-				if ( ! ( m_timestamp.contains( absFilePath ) && m_timestamp[ absFilePath ] == t ) )
+				if ( ! ( m_timestamp.tqcontains( absFilePath ) && m_timestamp[ absFilePath ] == t ) )
 				{
-					if ( _jd->pcs.contains( absFilePath ) )
+					if ( _jd->pcs.tqcontains( absFilePath ) )
 					{
-						_jd->stream.device() ->at( _jd->pcs[ absFilePath ].second );
+						_jd->stream.tqdevice() ->at( _jd->pcs[ absFilePath ].second );
 						FileDom file = codeModel() ->create<FileModel>();
 						file->read( _jd->stream );
 						codeModel() ->addFile( file );
@@ -1678,7 +1678,7 @@ void CppSupportPart::maybeParse( const TQString& fn, bool background  )
 	if ( !fileInfo.exists() )
 		return;
 
-	TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.find( path );
+	TQMap<TQString, TQDateTime>::Iterator it = m_timestamp.tqfind( path );
 	if ( codeModel()->hasFile( fn ) && it != m_timestamp.end() && *it == t )
 		return;
 
@@ -1705,7 +1705,7 @@ void CppSupportPart::slotNeedTextHint( int line, int column, TQString& textHint
 	{
 
 		while ( node && node->nodeType() != NodeType_FunctionDefinition )
-			node = node->parent();
+			node = node->tqparent();
 
 		if ( node )
 		{
@@ -1747,11 +1747,11 @@ void CppSupportPart::MakeMemberHelper( TQString& text, int& atLine, int& atColum
 		{
 			if ( currentNode->nodeType() == NodeType_Declarator )
 				declarator = ( DeclaratorAST* ) currentNode;
-			currentNode = currentNode->parent();
+			currentNode = currentNode->tqparent();
 		}
 		SimpleDeclarationAST* decl = currentNode ? ( SimpleDeclarationAST* ) currentNode : 0;
 
-		if ( decl && decl->storageSpecifier() && decl->storageSpecifier()->text().contains("friend") )
+		if ( decl && decl->storageSpecifier() && decl->storageSpecifier()->text().tqcontains("friend") )
 		{
 			kdDebug(9007) << "this is a friend declaration, don't create any definition" << endl;
 			fail = true;
@@ -1777,7 +1777,7 @@ void CppSupportPart::MakeMemberHelper( TQString& text, int& atLine, int& atColum
 			TQString declStr = declaratorToString( declarator, scopeStr ).simplifyWhiteSpace();
 			if ( declarator->exceptionSpecification() )
 			{
-				declStr += TQString::fromLatin1( " throw( " );
+				declStr += TQString::tqfromLatin1( " throw( " );
 				TQPtrList<AST> l = declarator->exceptionSpecification() ->nodeList();
 				TQPtrListIterator<AST> type_it( l );
 				while ( type_it.current() )
@@ -1786,10 +1786,10 @@ void CppSupportPart::MakeMemberHelper( TQString& text, int& atLine, int& atColum
 					++type_it;
 
 					if ( type_it.current() )
-						declStr += TQString::fromLatin1( ", " );
+						declStr += TQString::tqfromLatin1( ", " );
 				}
 
-				declStr += TQString::fromLatin1( " )" );
+				declStr += TQString::tqfromLatin1( " )" );
 			}
 
 			text += "\n\n";
@@ -1903,7 +1903,7 @@ TQStringList CppSupportPart::modifiedFileList()
 
 		TQDateTime t = fileInfo.lastModified();
 
-		TQMap<TQString, TQDateTime>::Iterator dictIt = m_timestamp.find( path );
+		TQMap<TQString, TQDateTime>::Iterator dictIt = m_timestamp.tqfind( path );
 		if ( fileInfo.exists() && dictIt != m_timestamp.end() && *dictIt == t )
 			continue;
 
@@ -1983,7 +1983,7 @@ void CppSupportPart::setupCatalog( )
 		kdDebug( 9007 ) << "CppSupportPart::setupCatalog()2 " << *it << endl;
 		Catalog * catalog = new Catalog();
 		catalog->open( *it );
-		catalog->setEnabled( enabledPCSs.contains( TQFileInfo( *it ).baseName(true) ) );
+		catalog->setEnabled( enabledPCSs.tqcontains( TQFileInfo( *it ).baseName(true) ) );
 		++it;
 
 		for ( TQStringList::Iterator idxIt = indexList.begin(); idxIt != indexList.end(); ++idxIt )
@@ -2034,10 +2034,10 @@ TQString CppSupportPart::formatTag( const Tag & inputTag )
 	switch ( tag.kind() )
 	{
 	case Tag::Kind_Namespace:
-		return TQString::fromLatin1( "namespace " ) + tag.name();
+		return TQString::tqfromLatin1( "namespace " ) + tag.name();
 
 	case Tag::Kind_Class:
-		return TQString::fromLatin1( "class " ) + tag.name();
+		return TQString::tqfromLatin1( "class " ) + tag.name();
 
 	case Tag::Kind_Function:
 	case Tag::Kind_FunctionDeclaration:
@@ -2179,25 +2179,25 @@ void CppSupportPart::saveProjectSourceInfo()
 	{
 		const FileDom dom = ( *it );
 		stream << dom->name() << m_timestamp[ dom->name() ].toTime_t();
-		if( m_timestamp.find( dom->name() ) == m_timestamp.end() ) {
+		if( m_timestamp.tqfind( dom->name() ) == m_timestamp.end() ) {
 		  kdDebug( 9007 ) << dom->name() << ": timestamp is missing "  << endl;
 		}
-		offsets.insert( dom->name(), stream.device() ->at() );
+		offsets.insert( dom->name(), stream.tqdevice() ->at() );
 		stream << ( uint ) 0; // dummy offset
 	}
 
 	for ( FileList::ConstIterator it = fileList.begin(); it != fileList.end(); ++it )
 	{
 		const FileDom dom = ( *it );
-		int offset = stream.device() ->at();
+		int offset = stream.tqdevice() ->at();
 
 		dom->write( stream );
 
-		int end = stream.device() ->at();
+		int end = stream.tqdevice() ->at();
 
-		stream.device() ->at( offsets[ dom->name() ] );
+		stream.tqdevice() ->at( offsets[ dom->name() ] );
 		stream << offset;
-		stream.device() ->at( end );
+		stream.tqdevice() ->at( end );
 	}
 
 	TQFile::remove(  project() ->projectDirectory() + "/"
@@ -2259,7 +2259,7 @@ void CppSupportPart::slotExtractInterface( )
 	TQString ifaceFileName = fileInfo.dirPath( true ) + "/" + m_activeClass->name().lower() + "_interface.h";
 	if ( TQFile::exists( ifaceFileName ) )
 	{
-		KMessageBox::error( mainWindow() ->main(), i18n( "File %1 already exists" ).arg( ifaceFileName ),
+		KMessageBox::error( mainWindow() ->main(), i18n( "File %1 already exists" ).tqarg( ifaceFileName ),
 		                    i18n( "C++ Support" ) );
 	}
 	else
@@ -2323,7 +2323,7 @@ int CppSupportPart::parseFilesAndDependencies( TQStringList files, bool backgrou
 		int cgroup = nextGroup;
 		nextGroup++;
 
-		if( fileGroups.find( *it ) != fileGroups.end() )
+		if( fileGroups.tqfind( *it ) != fileGroups.end() )
 			cgroup = fileGroups[*it];
 
 		for( TQStringList::iterator lit = lst.begin(); lit != lst.end(); ++lit )
@@ -2575,19 +2575,19 @@ void CppSupportPart::emitFileParsed( TQStringList l )
 bool CppSupportPart::isHeader( const TQString& fileName ) const
 {
 	/*KMimeType::Ptr ptr = KMimeType::findByPath( fileName );
-	if ( ptr && m_headerMimeTypes.contains( ptr->name() ) )
+	if ( ptr && m_headerMimeTypes.tqcontains( ptr->name() ) )
 		return true;*/
 
-	return ( m_headerExtensions.findIndex( TQFileInfo( fileName ).extension() ) != -1 );
+	return ( m_headerExtensions.tqfindIndex( TQFileInfo( fileName ).extension() ) != -1 );
 }
 
 bool CppSupportPart::isSource( const TQString& fileName ) const
 {
 	/*KMimeType::Ptr ptr = KMimeType::findByPath( fileName );
-	if ( ptr && m_sourceMimeTypes.contains( ptr->name() ) )
+	if ( ptr && m_sourceMimeTypes.tqcontains( ptr->name() ) )
 		return true;*/
 
-	return ( m_sourceExtensions.findIndex( TQFileInfo( fileName ).extension() ) != -1 );
+	return ( m_sourceExtensions.tqfindIndex( TQFileInfo( fileName ).extension() ) != -1 );
 }
 
 void CppSupportPart::gotoDeclarationLine( int line )
@@ -2759,12 +2759,12 @@ KDevDesignerIntegration * CppSupportPart::designer( KInterfaceDesigner::Designer
 	switch ( type )
 	{
 	case KInterfaceDesigner::Glade:
-	case KInterfaceDesigner::QtDesigner:
+	case KInterfaceDesigner::TQtDesigner:
 		des = m_designers[ type ];
 		if ( des == 0 )
 		{
 			CppImplementationWidget * impl = new CppImplementationWidget( this );
-			des = new QtDesignerCppIntegration( this, impl );
+			des = new TQtDesignerCppIntegration( this, impl );
 			des->loadSettings( *project() ->projectDom(), "kdevcppsupport/designerintegration" );
 			m_designers[ type ] = des;
 		}
@@ -2791,7 +2791,7 @@ void CppSupportPart::slotCreateSubclass()
 	TQFileInfo fi( m_contextFileName );
 	if ( fi.extension( false ) != "ui" )
 		return ;
-	QtDesignerCppIntegration *des = dynamic_cast<QtDesignerCppIntegration*>( designer( KInterfaceDesigner::QtDesigner ) );
+	TQtDesignerCppIntegration *des = dynamic_cast<TQtDesignerCppIntegration*>( designer( KInterfaceDesigner::TQtDesigner ) );
 	if ( des )
 		des->selectImplementation( m_contextFileName );
 }
@@ -2825,7 +2825,7 @@ void CppSupportPart::addMethod( ClassDom aClass, const TQString& name, const TQS
 		indentString = sourceFormatter->indentString();
 
 	editIface->insertText( findInsertionLineMethod( aClass, accessType ), 0,
-	                       finalDeclaration.replace( "\n", "\n\t" ) + "\n" );
+	                       finalDeclaration.tqreplace( "\n", "\n\t" ) + "\n" );
 
 	backgroundParser() ->addFile( aClass->fileName() );
 	if ( isInline || isPureVirtual )
@@ -2856,7 +2856,7 @@ void CppSupportPart::addMethod( ClassDom aClass, const TQString& name, const TQS
 	if ( !editIface )
 		return ; //@fixme errorverdoedelung
 
-	editIface->insertLine( editIface->numLines(), TQString::fromLatin1( "" ) );
+	editIface->insertLine( editIface->numLines(), TQString::tqfromLatin1( "" ) );
 	editIface->insertText( editIface->numLines() - 1, 0, definitionString );
 	backgroundParser() ->addFile( implementationFile );
 }
@@ -3118,7 +3118,7 @@ void CppSupportPart::addToRepository( ParsedFilePointer file ) {
 	w.parseTranslationUnit( *file );
 	codeRepository()->touchCatalog( catalog );
 
-	m_safeProjectFiles.insert( file->fileName() + "||" + TQString("%1").arg(file->usedMacros().valueHash()) + "||" + TQString("%1").arg(file->usedMacros().idHash()) );
+	m_safeProjectFiles.insert( file->fileName() + "||" + TQString("%1").tqarg(file->usedMacros().valueHash()) + "||" + TQString("%1").tqarg(file->usedMacros().idHash()) );
 }
 
 TQString CppSupportPart::findHeaderSimple( const TQString &header )
@@ -3133,17 +3133,17 @@ TQString CppSupportPart::findHeaderSimple( const TQString &header )
                         return s;
         }
 
-        return TQString::null;
+        return TQString();
 }
 
-UIBlockTester::UIBlockTesterThread::UIBlockTesterThread( UIBlockTester& parent ) : TQThread(), m_parent( parent ), m_stop(false) {
+UIBlockTester::UIBlockTesterThread::UIBlockTesterThread( UIBlockTester& tqparent ) : TQThread(), m_parent( tqparent ), m_stop(false) {
 }
 
 void UIBlockTester::UIBlockTesterThread::run() {
   while(!m_stop) {
 	  msleep( m_parent.m_msecs / 10 );
 	  m_parent.m_timeMutex.lock();
-	  TQDateTime t = TQDateTime::currentDateTime();
+	  TQDateTime t = TQDateTime::tqcurrentDateTime();
 	  uint msecs = m_parent.m_lastTime.time().msecsTo( t.time() );
 	  if( msecs > m_parent.m_msecs ) {
 		  m_parent.lockup();
@@ -3171,7 +3171,7 @@ UIBlockTester::~UIBlockTester() {
 
 void UIBlockTester::timer() {
 	m_timeMutex.lock();
-	m_lastTime = TQDateTime::currentDateTime();
+	m_lastTime = TQDateTime::tqcurrentDateTime();
 	m_timeMutex.unlock();
 }