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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

1 files changed, 16 insertions, 16 deletions

diff --git a/kformula/fsparser.cc b/kformula/fsparser.cc
index 863cc9eb..3d425a16 100644
--- a/kformula/fsparser.cc
+++ b/kformula/fsparser.cc
@@ -50,20 +50,20 @@ public:
     //virtual void output( ostream& stream ) { stream << "PrimaryNode {" << m_primary << "}" << endl; }
     virtual void buildXML( TQDomDocument& doc, TQDomElement element );
     virtual bool isSimple() { return true; }
-    void setUnicode( TQChar unicode ) { m_unicode = unicode; }
+    void setUnicode( TQChar tqunicode ) { m_tqunicode = tqunicode; }
     void setFunctionName( bool functionName ) { m_functionName = functionName; }
     TQString primary() const { return m_primary; }
 private:
     TQString m_primary;
-    TQChar m_unicode;
+    TQChar m_tqunicode;
     bool m_functionName;
 };
 
 void PrimaryNode::buildXML( TQDomDocument& doc, TQDomElement element )
 {
-    if ( m_unicode != TQChar::null ) {
+    if ( m_tqunicode != TQChar::null ) {
         TQDomElement de = doc.createElement( "TEXT" );
-        de.setAttribute( "CHAR", TQString( m_unicode ) );
+        de.setAttribute( "CHAR", TQString( m_tqunicode ) );
         de.setAttribute( "SYMBOL", "3" );
         element.appendChild( de );
     }
@@ -447,7 +447,7 @@ TQDomDocument FormulaStringParser::parse()
     head = parseAssign();
     //head->output( cout );
     if ( !eol() ) {
-        error( TQString( i18n( "Aborted parsing at %1:%2" ) ).arg( line ).arg( column ) );
+        error( TQString( i18n( "Aborted parsing at %1:%2" ) ).tqarg( line ).tqarg( column ) );
     }
 
     TQDomDocument doc = KFormula::Document::createDomDocument();
@@ -543,7 +543,7 @@ ParserNode* FormulaStringParser::parsePrimary()
     }
     case NAME: {
         PrimaryNode* node = new PrimaryNode( current );
-        node->setUnicode( m_symbolTable.unicode( current ) );
+        node->setUnicode( m_symbolTable.tqunicode( current ) );
         nextToken();
         if ( currentType == LP ) {
             nextToken();
@@ -556,7 +556,7 @@ ParserNode* FormulaStringParser::parsePrimary()
                     nextToken();
                 }
             }
-            expect( RP, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( ")" ) );
+            expect( RP, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( ")" ) );
             node->setFunctionName( true );
             return new FunctionNode( node, args );
         }
@@ -571,7 +571,7 @@ ParserNode* FormulaStringParser::parsePrimary()
     case LP: {
         nextToken();
         ParserNode* node = parseExpr();
-        expect( RP, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( ")" ) );
+        expect( RP, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( ")" ) );
         return node;
     }
     case LB: {
@@ -582,7 +582,7 @@ ParserNode* FormulaStringParser::parsePrimary()
         m_newlineIsSpace = innerBrackets;
         while ( ( currentType != EOL ) && ( currentType != RB ) ) {
             if ( innerBrackets ) {
-                expect( LB, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( "[" ) );
+                expect( LB, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( "[" ) );
             }
             TQPtrList<ParserNode> row;
             row.setAutoDelete( false );
@@ -594,7 +594,7 @@ ParserNode* FormulaStringParser::parsePrimary()
                 }
             }
             if ( innerBrackets ) {
-                expect( RB, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( "]" ) );
+                expect( RB, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( "]" ) );
                 if ( currentType == COMMA ) {
                     nextToken();
                 }
@@ -605,20 +605,20 @@ ParserNode* FormulaStringParser::parsePrimary()
                         nextToken();
                     }
                     else {
-                        expect( SEMIC, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( ";" ) );
+                        expect( SEMIC, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( ";" ) );
                     }
                 }
             }
             rows.append( new RowNode( row ) );
         }
         m_newlineIsSpace = true;
-        expect( RB, TQString( i18n( "'%3' expected at %1:%2" ) ).arg( line ).arg( column ).arg( "]" ) );
+        expect( RB, TQString( i18n( "'%3' expected at %1:%2" ) ).tqarg( line ).tqarg( column ).tqarg( "]" ) );
         MatrixNode* node = new MatrixNode( rows );
         if ( node->columns() == 0 ) {
-            error( TQString( i18n( "Null columns in Matrix at %1:%2" ) ).arg( line ).arg( column ) );
+            error( TQString( i18n( "Null columns in Matrix at %1:%2" ) ).tqarg( line ).tqarg( column ) );
         }
         if ( node->rows() == 0 ) {
-            error( TQString( i18n( "Null rows in Matrix at %1:%2" ) ).arg( line ).arg( column ) );
+            error( TQString( i18n( "Null rows in Matrix at %1:%2" ) ).tqarg( line ).tqarg( column ) );
         }
         return node;
     }
@@ -628,7 +628,7 @@ ParserNode* FormulaStringParser::parsePrimary()
         return node;
     }
     default:
-        error( TQString( i18n( "Unexpected token at %1:%2" ) ).arg( line ).arg( column ) );
+        error( TQString( i18n( "Unexpected token at %1:%2" ) ).tqarg( line ).tqarg( column ) );
         return new PrimaryNode( "?" );
     }
 }
@@ -773,7 +773,7 @@ void FormulaStringParser::readNumber()
                 readDigits();
             }
             else if ( !digitsBeforeDot ) {
-                error( TQString( i18n( "A single '.' is not a number at %1:%2" ) ).arg( line ).arg( column ) );
+                error( TQString( i18n( "A single '.' is not a number at %1:%2" ) ).tqarg( line ).tqarg( column ) );
                 return;
             }
         }