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, 9 insertions, 9 deletions

diff --git a/lib/cppparser/ast.cpp b/lib/cppparser/ast.cpp
index 209a8a99..8fe6b82f 100644
--- a/lib/cppparser/ast.cpp
+++ b/lib/cppparser/ast.cpp
@@ -125,7 +125,7 @@ TQString nodeTypeToString( int type )
 	return "Custom";
     }
 
-    return TQString::null;
+    return TQString();
 }
 
 
@@ -136,7 +136,7 @@ AST::AST()
       m_endLine( 0 ), m_endColumn( 0 )
 {
 #ifndef CPPPARSER_NO_CHILDREN
-    m_children.setAutoDelete( false );
+    m_tqchildren.setAutoDelete( false );
 #endif
 }
 
@@ -178,14 +178,14 @@ void AST::getEndPosition( int* line, int* col ) const
         * col = m_endColumn;
 }
 
-void AST::setParent( AST* parent )
+void AST::setParent( AST* tqparent )
 {
 #ifndef CPPPARSER_NO_CHILDREN
     if( m_parent )
 	m_parent->removeChild( this );
 #endif
 
-    m_parent = parent;
+    m_parent = tqparent;
 
 #ifndef CPPPARSER_NO_CHILDREN
     if( m_parent )
@@ -196,12 +196,12 @@ void AST::setParent( AST* parent )
 #ifndef CPPPARSER_NO_CHILDREN
 void AST::appendChild( AST* child )
 {
-    m_children.append( child );
+    m_tqchildren.append( child );
 }
 
 void AST::removeChild( AST* child )
 {
-    m_children.remove( child );
+    m_tqchildren.remove( child );
 }
 #endif
 
@@ -235,7 +235,7 @@ void NameAST::addClassOrNamespaceName( ClassOrNamespaceNameAST::Node& classOrNam
 TQString NameAST::text() const
 {
     if( !m_unqualifiedName.get() )
-        return TQString::null;
+        return TQString();
 
     TQString str;
 
@@ -470,11 +470,11 @@ void ClassOrNamespaceNameAST::setTemplateArgumentList( TemplateArgumentListAST::
 TQString ClassOrNamespaceNameAST::text() const
 {
     if( !m_name.get() )
-        return TQString::null;
+        return TQString();
 
     TQString str = m_name->text();
     if( m_templateArgumentList.get() )
-        str += TQString::fromLatin1("< ") + m_templateArgumentList->text() + TQString::fromLatin1(" >");
+        str += TQString::tqfromLatin1("< ") + m_templateArgumentList->text() + TQString::tqfromLatin1(" >");
 
     return str;
 }