Rename a number of old tq methods that are no longer tq specific

11 files changed, 29 insertions, 29 deletions

diff --git a/umbrello/umbrello/codeimport/classimport.cpp b/umbrello/umbrello/codeimport/classimport.cpp
index 469e4030..e32758dd 100644
--- a/umbrello/umbrello/codeimport/classimport.cpp
+++ b/umbrello/umbrello/codeimport/classimport.cpp
@@ -32,7 +32,7 @@ void ClassImport::importFiles(const TQStringList &fileList) {
             fileIT != fileList.end(); ++fileIT) {
         TQString fileName = (*fileIT);
         umldoc->writeToStatusBar(i18n("Importing file: %1 Progress: %2/%3").
-                                 tqarg(fileName).tqarg(processedFilesCount).tqarg(fileList.size()));
+                                 arg(fileName).arg(processedFilesCount).arg(fileList.size()));
         parseFile(fileName);
         processedFilesCount++;
     }
diff --git a/umbrello/umbrello/codeimport/import_utils.cpp b/umbrello/umbrello/codeimport/import_utils.cpp
index 4e38a1aa..6b87f493 100644
--- a/umbrello/umbrello/codeimport/import_utils.cpp
+++ b/umbrello/umbrello/codeimport/import_utils.cpp
@@ -178,7 +178,7 @@ UMLObject *createUMLObject(Uml::Object_Type type,
                         /* We know std and TQt are namespaces */
                         if (scopeName != "std" && scopeName != "TQt") {
                             wantNamespace = KMessageBox::questionYesNo(NULL,
-                                        i18n("Is the scope %1 a namespace or a class?").tqarg(scopeName),
+                                        i18n("Is the scope %1 a namespace or a class?").arg(scopeName),
                                         i18n("C++ Import Requests Your Help"),
                                         i18n("Namespace"), i18n("Class"));
                         }
diff --git a/umbrello/umbrello/codeimport/javaimport.cpp b/umbrello/umbrello/codeimport/javaimport.cpp
index 7f62a1a9..0b90d5a0 100644
--- a/umbrello/umbrello/codeimport/javaimport.cpp
+++ b/umbrello/umbrello/codeimport/javaimport.cpp
@@ -14,7 +14,7 @@
 
 // qt/kde includes
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqstringlist.h>
 #include <tqregexp.h>
 #include <kdebug.h>
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
index ebb10af4..2c962e5d 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp
@@ -128,7 +128,7 @@ AST::AST()
       m_endLine( 0 ), m_endColumn( 0 )
 {
 #ifndef CPPPARSER_NO_CHILDREN
-    m_tqchildren.setAutoDelete( false );
+    m_children.setAutoDelete( false );
 #endif
 }
 
@@ -188,12 +188,12 @@ void AST::setParent( AST* parent )
 #ifndef CPPPARSER_NO_CHILDREN
 void AST::appendChild( AST* child )
 {
-    m_tqchildren.append( child );
+    m_children.append( child );
 }
 
 void AST::removeChild( AST* child )
 {
-    m_tqchildren.remove( child );
+    m_children.remove( child );
 }
 #endif
 
@@ -466,7 +466,7 @@ TQString ClassOrNamespaceNameAST::text() const
 
     TQString str = m_name->text();
     if( m_templateArgumentList.get() )
-        str += TQString::tqfromLatin1("< ") + m_templateArgumentList->text() + TQString::tqfromLatin1(" >");
+        str += TQString::fromLatin1("< ") + m_templateArgumentList->text() + TQString::fromLatin1(" >");
 
     return str;
 }
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.h b/umbrello/umbrello/codeimport/kdevcppparser/ast.h
index 49520e33..3c96da9e 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast.h
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.h
@@ -232,7 +232,7 @@ public:
     void getEndPosition( int* line, int* col ) const;
 
 #ifndef CPPPARSER_NO_CHILDREN
-    TQPtrList<AST> tqchildren() { return m_tqchildren; }
+    TQPtrList<AST> children() { return m_children; }
     void appendChild( AST* child );
     void removeChild( AST* child );
 #endif
@@ -266,7 +266,7 @@ private:
     int m_endLine, m_endColumn;
     Slice m_slice;
 #ifndef CPPPARSER_NO_CHILDREN
-    TQPtrList<AST> m_tqchildren;
+    TQPtrList<AST> m_children;
 #endif
     TQString m_comment;
 
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
index ee6937ac..44c10f82 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
@@ -35,8 +35,8 @@ AST* findNodeAt( AST* node, int line, int column )
     if( (line > startLine || (line == startLine && column >= startColumn)) &&
         (line < endLine || (line == endLine && column < endColumn)) ){
 
-        TQPtrList<AST> tqchildren = node->tqchildren();
-	TQPtrListIterator<AST> it( tqchildren );
+        TQPtrList<AST> children = node->children();
+	TQPtrListIterator<AST> it( children );
 	while( it.current() ){
 	    AST* a = it.current();
 	    ++it;
@@ -66,7 +66,7 @@ void scopeOfNode( AST* ast, TQStringList& scope )
     case NodeType_ClassSpecifier:
         if( ((ClassSpecifierAST*)ast)->name() ){
 	    s = ((ClassSpecifierAST*)ast)->name()->text();
-	    s = s.isEmpty() ? TQString::tqfromLatin1("<unnamed>") : s;
+	    s = s.isEmpty() ? TQString::fromLatin1("<unnamed>") : s;
 	    scope.push_back( s );
 	}
 	break;
@@ -74,7 +74,7 @@ void scopeOfNode( AST* ast, TQStringList& scope )
     case NodeType_Namespace:
     {
         AST* namespaceName = ((NamespaceAST*)ast)->namespaceName();
-	s = namespaceName ? namespaceName->text() : TQString::tqfromLatin1("<unnamed>");
+	s = namespaceName ? namespaceName->text() : TQString::fromLatin1("<unnamed>");
 	scope.push_back( s );
     }
     break;
@@ -131,7 +131,7 @@ TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, b
    text += scope;
 
    if( declarator->subDeclarator() )
-       text += TQString::tqfromLatin1("(") + declaratorToString(declarator->subDeclarator()) + TQString::tqfromLatin1(")");
+       text += TQString::fromLatin1("(") + declaratorToString(declarator->subDeclarator()) + TQString::fromLatin1(")");
 
    if( declarator->declaratorId() )
        text += declarator->declaratorId()->text();
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
index f91813f1..eb3c4b6a 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
@@ -175,7 +175,7 @@ int Lexer::toInt( const Token& token )
 	int i = s[0] == 'L' ? 2 : 1; // wide char ?
 	if( s[i] == '\\' ){
 	    // escaped char
-	    int c = s[i+1].tqunicode();
+	    int c = s[i+1].unicode();
 	    switch( c ) {
 	    case '0':
 		return 0;
@@ -186,7 +186,7 @@ int Lexer::toInt( const Token& token )
 		return c;
 	    }
 	} else {
-	    return s[i].tqunicode();
+	    return s[i].unicode();
 	}
     } else {
 	return 0;
@@ -374,21 +374,21 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline )
                 TQString tokText = tok.text();
                 TQString str = (tok == Token_identifier && d->hasBind(tokText)) ? d->apply( tokText ) : tokText;
                 if( str == ide ){
-                    //Problem p( i18n("unsafe use of macro '%1'").tqarg(ide), m_currentLine, m_currentColumn );
+                    //Problem p( i18n("unsafe use of macro '%1'").arg(ide), m_currentLine, m_currentColumn );
                     //m_driver->addProblem( m_driver->currentFileName(), p );
                     m_driver->removeMacro( ide );
                     // str = TQString();
                 }
 
                 if( stringify ) {
-                    textToInsert.append( TQString::tqfromLatin1("\"") + str + TQString::tqfromLatin1("\" ") );
+                    textToInsert.append( TQString::fromLatin1("\"") + str + TQString::fromLatin1("\" ") );
                 } else if( merge ){
                     textToInsert.truncate( textToInsert.length() - 1 );
                     textToInsert.append( str );
                 } else if( tok == Token_ellipsis && d->hasBind("...") ){
                     textToInsert.append( ellipsisArg );
                 } else {
-                    textToInsert.append( str + TQString::tqfromLatin1(" ") );
+                    textToInsert.append( str + TQString::fromLatin1(" ") );
                 }
             }
 
@@ -465,7 +465,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline )
 	tk.setStartPosition( startLine, startColumn );
 	tk.setEndPosition( m_currentLine, m_currentColumn );
     } else {
-	tk = CREATE_TOKEN( ch.tqunicode(), currentPosition(), 1 );
+	tk = CREATE_TOKEN( ch.unicode(), currentPosition(), 1 );
 	nextChar();
 	tk.setStartPosition( startLine, startColumn );
 	tk.setEndPosition( m_currentLine, m_currentColumn );
@@ -808,7 +808,7 @@ int Lexer::macroPrimary()
 {
     readWhiteSpaces( false );
     int result = 0;
-    switch( currentChar().tqunicode() ) {
+    switch( currentChar().unicode() ) {
     case '(':
 	nextChar();
 	result = macroExpression();
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp
index a05a7ddf..2d009294 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp
@@ -71,7 +71,7 @@ const HashEntry* Lookup::findEntry( const struct HashTable *table,
 const HashEntry* Lookup::findEntry( const struct HashTable *table,
 				    const TQString &s )
 {
-    return findEntry( table, s.tqunicode(), s.length() );
+    return findEntry( table, s.unicode(), s.length() );
 }
 
 int Lookup::find(const struct HashTable *table,
@@ -85,7 +85,7 @@ int Lookup::find(const struct HashTable *table,
 
 int Lookup::find(const struct HashTable *table, const TQString &s)
 {
-  return find(table, s.tqunicode(), s.length());
+  return find(table, s.unicode(), s.length());
 }
 
 unsigned int Lookup::hash(const TQChar *c, unsigned int len)
@@ -100,7 +100,7 @@ unsigned int Lookup::hash(const TQChar *c, unsigned int len)
 
 unsigned int Lookup::hash(const TQString &key)
 {
-    return hash(key.tqunicode(), key.length());
+    return hash(key.unicode(), key.length());
 }
 
 unsigned int Lookup::hash(const char *s)
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
index 51837b1e..b724faba 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
@@ -37,7 +37,7 @@ using namespace std;
 { \
   const Token& token = lex->lookAhead( 0 ); \
   if( token != tk ){ \
-      reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \
+      reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \
       return false; \
   } \
   lex->nextToken(); \
@@ -47,7 +47,7 @@ using namespace std;
 { \
   const Token& token = lex->lookAhead( 0 ); \
   if( token != tk ){ \
-      reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \
+      reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \
   } \
   else \
       lex->nextToken(); \
@@ -137,7 +137,7 @@ bool Parser::reportError( const Error& err )
 	if( s.isEmpty() )
 	    s = i18n( "<eof>" );
 
-	m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.tqarg(s), line, col) );
+	m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.arg(s), line, col) );
     }
 
     return true;
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
index 8b8cc8eb..3e6dde46 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp
@@ -294,7 +294,7 @@ TQString URLUtil::envExpand ( const TQString& str )
       if (pos < 0)
         pos = len;
 
-      char* ret = getenv( TQConstString(str.tqunicode()+1, pos-1).string().local8Bit().data() );
+      char* ret = getenv( TQConstString(str.unicode()+1, pos-1).string().local8Bit().data() );
 
       if (ret)
       {
diff --git a/umbrello/umbrello/codeimport/nativeimportbase.cpp b/umbrello/umbrello/codeimport/nativeimportbase.cpp
index b2f7dac3..5005bd1e 100644
--- a/umbrello/umbrello/codeimport/nativeimportbase.cpp
+++ b/umbrello/umbrello/codeimport/nativeimportbase.cpp
@@ -14,7 +14,7 @@
 
 // qt/kde includes
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 #include <klocale.h>
 #include <kdebug.h>