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

1 files changed, 20 insertions, 20 deletions

diff --git a/lib/kformula/symboltable.cc b/lib/kformula/symboltable.cc
index 42c4a8e6..369cf6c3 100644
--- a/lib/kformula/symboltable.cc
+++ b/lib/kformula/symboltable.cc
@@ -23,7 +23,7 @@
 #include <tqregexp.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqfontmetrics.h>
 
 #include <kconfig.h>
@@ -44,12 +44,12 @@ KFORMULA_NAMESPACE_BEGIN
 SymbolFontHelper::SymbolFontHelper()
     : greek("abgdezhqiklmnxpvrstufjcywGDTQLXPSUFYVW")
 {
-    for ( uint i = 0; symbolMap[ i ].tqunicode != 0; i++ ) {
-        compatibility[ symbolMap[ i ].pos ] = symbolMap[ i ].tqunicode;
+    for ( uint i = 0; symbolMap[ i ].unicode != 0; i++ ) {
+        compatibility[ symbolMap[ i ].pos ] = symbolMap[ i ].unicode;
     }
 }
 
-TQChar SymbolFontHelper::tqunicodeFromSymbolFont( TQChar pos ) const
+TQChar SymbolFontHelper::unicodeFromSymbolFont( TQChar pos ) const
 {
     if ( compatibility.contains( pos ) ) {
         return compatibility[ pos.latin1() ];
@@ -66,17 +66,17 @@ SymbolTable::SymbolTable()
 void SymbolTable::init( const TQFont& font )
 {
     backupFont = font;
-    for ( int i=0; operatorTable[i].tqunicode != 0; ++i ) {
-        names[TQChar( operatorTable[i].tqunicode )] = get_name( operatorTable[i] );
-        entries[get_name( operatorTable[i] )] = TQChar( operatorTable[i].tqunicode );
+    for ( int i=0; operatorTable[i].unicode != 0; ++i ) {
+        names[TQChar( operatorTable[i].unicode )] = get_name( operatorTable[i] );
+        entries[get_name( operatorTable[i] )] = TQChar( operatorTable[i].unicode );
     }
-    for ( int i=0; arrowTable[i].tqunicode != 0; ++i ) {
-        names[TQChar( arrowTable[i].tqunicode )] = get_name( arrowTable[i] );
-        entries[get_name( arrowTable[i] )] = TQChar( arrowTable[i].tqunicode );
+    for ( int i=0; arrowTable[i].unicode != 0; ++i ) {
+        names[TQChar( arrowTable[i].unicode )] = get_name( arrowTable[i] );
+        entries[get_name( arrowTable[i] )] = TQChar( arrowTable[i].unicode );
     }
-    for ( int i=0; greekTable[i].tqunicode != 0; ++i ) {
-        names[TQChar( greekTable[i].tqunicode )] = get_name( greekTable[i] );
-        entries[get_name( greekTable[i] )] = TQChar( greekTable[i].tqunicode );
+    for ( int i=0; greekTable[i].unicode != 0; ++i ) {
+        names[TQChar( greekTable[i].unicode )] = get_name( greekTable[i] );
+        entries[get_name( greekTable[i] )] = TQChar( greekTable[i].unicode );
     }
 }
 
@@ -85,7 +85,7 @@ bool SymbolTable::contains(TQString name) const
     return entries.find( name ) != entries.end();
 }
 
-TQChar SymbolTable::tqunicode(TQString name) const
+TQChar SymbolTable::unicode(TQString name) const
 {
     return entries[ name ];
 }
@@ -112,9 +112,9 @@ CharClass SymbolTable::charClass( TQChar symbol ) const
 }
 
 
-TQChar SymbolTable::tqunicodeFromSymbolFont( TQChar pos ) const
+TQChar SymbolTable::unicodeFromSymbolFont( TQChar pos ) const
 {
-    return symbolFontHelper.tqunicodeFromSymbolFont( pos );
+    return symbolFontHelper.unicodeFromSymbolFont( pos );
 }
 
 
@@ -128,13 +128,13 @@ TQStringList SymbolTable::allNames() const
 {
     TQStringList list;
 
-    for ( int i=0; operatorTable[i].tqunicode != 0; ++i ) {
+    for ( int i=0; operatorTable[i].unicode != 0; ++i ) {
         list.append( get_name( operatorTable[i] ));
     }
-    for ( int i=0; arrowTable[i].tqunicode != 0; ++i ) {
+    for ( int i=0; arrowTable[i].unicode != 0; ++i ) {
         list.append( get_name( arrowTable[i] ));
     }
-    for ( int i=0; greekTable[i].tqunicode != 0; ++i ) {
+    for ( int i=0; greekTable[i].unicode != 0; ++i ) {
         list.append( get_name( greekTable[i] ) );
     }
     return list;
@@ -144,7 +144,7 @@ TQStringList SymbolTable::allNames() const
 TQString SymbolTable::get_name( struct UnicodeNameTable entry ) const
 {
     if ( !*entry.name ) {
-        return "U" + TQString( "%1" ).tqarg( entry.tqunicode, 4, 16 ).upper();
+        return "U" + TQString( "%1" ).arg( entry.unicode, 4, 16 ).upper();
     }
     return entry.name;
 }