TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


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

1 files changed, 9 insertions, 9 deletions

diff --git a/kspread/kspread_functions_reference.cc b/kspread/kspread_functions_reference.cc
index d3400c37..7dacb054 100644
--- a/kspread/kspread_functions_reference.cc
+++ b/kspread/kspread_functions_reference.cc
@@ -95,7 +95,7 @@ void RegisterReferenceFunctions()
 Value func_address (valVector args, ValueCalc *calc, FuncExtra *)
 {
   bool r1c1 = false;
-  QString sheetName;
+  TQString sheetName;
   int absNum = 1;
   if (args.count() > 2)
     absNum = calc->conv()->asInteger (args[2]).asInteger();
@@ -104,7 +104,7 @@ Value func_address (valVector args, ValueCalc *calc, FuncExtra *)
   if (args.count() == 5)
     sheetName = calc->conv()->asString (args[4]).asString();
 
-  QString result;
+  TQString result;
   int row = calc->conv()->asInteger (args[0]).asInteger();
   int col = calc->conv()->asInteger (args[1]).asInteger();
 
@@ -124,7 +124,7 @@ Value func_address (valVector args, ValueCalc *calc, FuncExtra *)
     result += 'R';
     if ( !abs )
       result += '[';
-    result += QString::number( row );
+    result += TQString::number( row );
 
     if ( !abs )
       result += ']';
@@ -137,7 +137,7 @@ Value func_address (valVector args, ValueCalc *calc, FuncExtra *)
     result += 'C';
     if ( !abs )
       result += '[';
-    result += QString::number( col );
+    result += TQString::number( col );
 
     if ( !abs )
       result += ']';
@@ -160,13 +160,13 @@ Value func_address (valVector args, ValueCalc *calc, FuncExtra *)
     if ( abs )
       result += '$';
 
-    result += QString::number( row );
+    result += TQString::number( row );
   }
   
   return Value (result);
 }
 
-bool checkRef( QString const & ref )
+bool checkRef( TQString const & ref )
 {
   Range r( ref );
   if ( !r.isValid() )
@@ -188,14 +188,14 @@ Value func_areas (valVector args, ValueCalc *calc, FuncExtra *e)
       return 1;
   }
   
-  QString s = calc->conv()->asString (args[0]).asString();
+  TQString s = calc->conv()->asString (args[0]).asString();
   if ( s[0] != '(' || s[s.length() - 1] != ')' )
     return Value::errorVALUE();
 
   int l = s.length();
 
   int num = 0;
-  QString ref;
+  TQString ref;
   for ( int i = 1; i < l; ++i )
   {
     if ( s[i] == ',' || s[i] == ')' )
@@ -316,7 +316,7 @@ Value func_rows (valVector, ValueCalc *, FuncExtra *e)
 Value func_indirect (valVector args, ValueCalc *calc, FuncExtra *e)
 {
   bool r1c1 = false;
-  QString ref = calc->conv()->asString (args[0]).asString();
+  TQString ref = calc->conv()->asString (args[0]).asString();
   if (args.count() == 2)
     r1c1 = !(calc->conv()->asBoolean (args[1]).asBoolean());