summaryrefslogtreecommitdiffstats
path: root/kspread/kspread_functions_engineering.cc
diff options
context:
space:
mode:
Diffstat (limited to 'kspread/kspread_functions_engineering.cc')
-rw-r--r--kspread/kspread_functions_engineering.cc236
1 files changed, 118 insertions, 118 deletions
diff --git a/kspread/kspread_functions_engineering.cc b/kspread/kspread_functions_engineering.cc
index 3f2e8bd21..8e2a47d9e 100644
--- a/kspread/kspread_functions_engineering.cc
+++ b/kspread/kspread_functions_engineering.cc
@@ -26,7 +26,7 @@
#include "valueconverter.h"
// used by the CONVERT function
-#include <qmap.h>
+#include <tqmap.h>
// these are needed for complex functions, while we handle them in the old way
#include <kglobal.h>
@@ -305,13 +305,13 @@ Value func_hex2oct (valVector args, ValueCalc *calc, FuncExtra *)
// return prefix factor found in unit, or 1.0 for no prefix
// also modify the unit, i.e stripping the prefix from it
// example: "kPa" will return 1e3 and change unit into "Pa"
-static double kspread_convert_prefix( QMap<QString,double> map, QString& unit )
+static double kspread_convert_prefix( TQMap<TQString,double> map, TQString& unit )
{
- if( map.contains( unit ) )
+ if( map.tqcontains( unit ) )
return 1.0;
// initialize prefix mapping if necessary
- static QMap<char,double> prefixMap;
+ static TQMap<char,double> prefixMap;
if( prefixMap.isEmpty() )
{
prefixMap[ 'E' ] = 1e18; // exa
@@ -334,7 +334,7 @@ static double kspread_convert_prefix( QMap<QString,double> map, QString& unit )
// check for possible prefix
char prefix = unit[0].latin1();
- if( prefixMap.contains( prefix ) )
+ if( prefixMap.tqcontains( prefix ) )
{
unit.remove( 0, 1 );
return prefixMap[ prefix ];
@@ -344,10 +344,10 @@ static double kspread_convert_prefix( QMap<QString,double> map, QString& unit )
return 0.0;
}
-static bool kspread_convert_mass( const QString& fromUnit,
- const QString& toUnit, double value, double& result )
+static bool kspread_convert_mass( const TQString& fromUnit,
+ const TQString& toUnit, double value, double& result )
{
- static QMap<QString, double> massMap;
+ static TQMap<TQString, double> massMap;
// first-time initialization
if( massMap.isEmpty() )
@@ -366,14 +366,14 @@ static bool kspread_convert_mass( const QString& fromUnit,
massMap[ "brton" ] = 9.842065E-07; // Gross Registered Ton
}
- QString fromU = fromUnit;
- QString toU = toUnit;
+ TQString fromU = fromUnit;
+ TQString toU = toUnit;
double fromPrefix = kspread_convert_prefix( massMap, fromU );
double toPrefix = kspread_convert_prefix( massMap, toU );
if( fromPrefix == 0.0 ) return false;
if( toPrefix == 0.0 ) return false;
- if( !massMap.contains( fromU ) ) return false;
- if( !massMap.contains( toU ) ) return false;
+ if( !massMap.tqcontains( fromU ) ) return false;
+ if( !massMap.tqcontains( toU ) ) return false;
result = value * fromPrefix * massMap[toU] / (massMap[fromU] * toPrefix);
@@ -381,10 +381,10 @@ static bool kspread_convert_mass( const QString& fromUnit,
}
-static bool kspread_convert_distance( const QString& fromUnit,
- const QString& toUnit, double value, double& result )
+static bool kspread_convert_distance( const TQString& fromUnit,
+ const TQString& toUnit, double value, double& result )
{
- static QMap<QString, double> distanceMap;
+ static TQMap<TQString, double> distanceMap;
// first-time initialization
if( distanceMap.isEmpty() )
@@ -400,24 +400,24 @@ static bool kspread_convert_distance( const QString& fromUnit,
distanceMap[ "lightyear" ] = 1.057023455773293e-16; // lightyear
}
- QString fromU = fromUnit;
- QString toU = toUnit;
+ TQString fromU = fromUnit;
+ TQString toU = toUnit;
double fromPrefix = kspread_convert_prefix( distanceMap, fromU );
double toPrefix = kspread_convert_prefix( distanceMap, toU );
if( fromPrefix == 0.0 ) return false;
if( toPrefix == 0.0 ) return false;
- if( !distanceMap.contains( fromU ) ) return false;
- if( !distanceMap.contains( toU ) ) return false;
+ if( !distanceMap.tqcontains( fromU ) ) return false;
+ if( !distanceMap.tqcontains( toU ) ) return false;
result = value * fromPrefix * distanceMap[toU] / (distanceMap[fromU] * toPrefix);
return true;
}
-static bool kspread_convert_pressure( const QString& fromUnit,
- const QString& toUnit, double value, double& result )
+static bool kspread_convert_pressure( const TQString& fromUnit,
+ const TQString& toUnit, double value, double& result )
{
- static QMap<QString, double> pressureMap;
+ static TQMap<TQString, double> pressureMap;
// first-time initialization
if( pressureMap.isEmpty() )
@@ -429,24 +429,24 @@ static bool kspread_convert_pressure( const QString& fromUnit,
pressureMap[ "Torr" ] = 1 / 133.32237;
}
- QString fromU = fromUnit;
- QString toU = toUnit;
+ TQString fromU = fromUnit;
+ TQString toU = toUnit;
double fromPrefix = kspread_convert_prefix( pressureMap, fromU );
double toPrefix = kspread_convert_prefix( pressureMap, toU );
if( fromPrefix == 0.0 ) return false;
if( toPrefix == 0.0 ) return false;
- if( !pressureMap.contains( fromU ) ) return false;
- if( !pressureMap.contains( toU ) ) return false;
+ if( !pressureMap.tqcontains( fromU ) ) return false;
+ if( !pressureMap.tqcontains( toU ) ) return false;
result = value * fromPrefix * pressureMap[toU] / (pressureMap[fromU] * toPrefix);
return true;
}
-static bool kspread_convert_force( const QString& fromUnit,
- const QString& toUnit, double value, double& result )
+static bool kspread_convert_force( const TQString& fromUnit,
+ const TQString& toUnit, double value, double& result )
{
- static QMap<QString, double> forceMap;
+ static TQMap<TQString, double> forceMap;
// first-time initialization
if( forceMap.isEmpty() )
@@ -456,24 +456,24 @@ static bool kspread_convert_force( const QString& fromUnit,
forceMap[ "pond" ] = 1.019716e2; // pond
}
- QString fromU = fromUnit;
- QString toU = toUnit;
+ TQString fromU = fromUnit;
+ TQString toU = toUnit;
double fromPrefix = kspread_convert_prefix( forceMap, fromU );
double toPrefix = kspread_convert_prefix( forceMap, toU );
if( fromPrefix == 0.0 ) return false;
if( toPrefix == 0.0 ) return false;
- if( !forceMap.contains( fromU ) ) return false;
- if( !forceMap.contains( toU ) ) return false;
+ if( !forceMap.tqcontains( fromU ) ) return false;
+ if( !forceMap.tqcontains( toU ) ) return false;
result = value * fromPrefix * forceMap[toU] / (forceMap[fromU] * toPrefix);
return true;
}
-static bool kspread_convert_energy( const QString& fromUnit,
- const QString& toUnit, double value, double& result )
+static bool kspread_convert_energy( const TQString& fromUnit,
+ const TQString& toUnit, double value, double& result )
{
- static QMap<QString, double> energyMap;
+ static TQMap<TQString, double> energyMap;
// first-time initialization
if( energyMap.isEmpty() )
@@ -489,24 +489,24 @@ static bool kspread_convert_energy( const QString& fromUnit,
energyMap[ "BTU" ] = 9.47815067349015e-4; // British Thermal Unit
}
- QString fromU = fromUnit;
- QString toU = toUnit;
+ TQString fromU = fromUnit;
+ TQString toU = toUnit;
double fromPrefix = kspread_convert_prefix( energyMap, fromU );
double toPrefix = kspread_convert_prefix( energyMap, toU );
if( fromPrefix == 0.0 ) return false;
if( toPrefix == 0.0 ) return false;
- if( !energyMap.contains( fromU ) ) return false;
- if( !energyMap.contains( toU ) ) return false;
+ if( !energyMap.tqcontains( fromU ) ) return false;
+ if( !energyMap.tqcontains( toU ) ) return false;
result = value * fromPrefix * energyMap[toU] / (energyMap[fromU] * toPrefix);
return true;
}
-static bool kspread_convert_power( const QString& fromUnit,
- const QString& toUnit, double value, double& result )
+static bool kspread_convert_power( const TQString& fromUnit,
+ const TQString& toUnit, double value, double& result )
{
- static QMap<QString, double> powerMap;
+ static TQMap<TQString, double> powerMap;
// first-time initialization
if( powerMap.isEmpty() )
@@ -516,24 +516,24 @@ static bool kspread_convert_power( const QString& fromUnit,
powerMap[ "PS" ] = 1.359622e-3; // Pferdestärke (German)
}
- QString fromU = fromUnit;
- QString toU = toUnit;
+ TQString fromU = fromUnit;
+ TQString toU = toUnit;
double fromPrefix = kspread_convert_prefix( powerMap, fromU );
double toPrefix = kspread_convert_prefix( powerMap, toU );
if( fromPrefix == 0.0 ) return false;
if( toPrefix == 0.0 ) return false;
- if( !powerMap.contains( fromU ) ) return false;
- if( !powerMap.contains( toU ) ) return false;
+ if( !powerMap.tqcontains( fromU ) ) return false;
+ if( !powerMap.tqcontains( toU ) ) return false;
result = value * fromPrefix * powerMap[toU] / (powerMap[fromU] * toPrefix);
return true;
}
-static bool kspread_convert_magnetism( const QString& fromUnit,
- const QString& toUnit, double value, double& result )
+static bool kspread_convert_magnetism( const TQString& fromUnit,
+ const TQString& toUnit, double value, double& result )
{
- static QMap<QString, double> magnetismMap;
+ static TQMap<TQString, double> magnetismMap;
// first-time initialization
if( magnetismMap.isEmpty() )
@@ -542,25 +542,25 @@ static bool kspread_convert_magnetism( const QString& fromUnit,
magnetismMap[ "ga" ] = 1.0e4; // Gauss
}
- QString fromU = fromUnit;
- QString toU = toUnit;
+ TQString fromU = fromUnit;
+ TQString toU = toUnit;
double fromPrefix = kspread_convert_prefix( magnetismMap, fromU );
double toPrefix = kspread_convert_prefix( magnetismMap, toU );
if( fromPrefix == 0.0 ) return false;
if( toPrefix == 0.0 ) return false;
- if( !magnetismMap.contains( fromU ) ) return false;
- if( !magnetismMap.contains( toU ) ) return false;
+ if( !magnetismMap.tqcontains( fromU ) ) return false;
+ if( !magnetismMap.tqcontains( toU ) ) return false;
result = value * fromPrefix * magnetismMap[toU] / (magnetismMap[fromU] * toPrefix);
return true;
}
-static bool kspread_convert_temperature( const QString& fromUnit,
- const QString& toUnit, double value, double& result )
+static bool kspread_convert_temperature( const TQString& fromUnit,
+ const TQString& toUnit, double value, double& result )
{
- static QMap<QString, double> tempFactorMap;
- static QMap<QString, double> tempOffsetMap;
+ static TQMap<TQString, double> tempFactorMap;
+ static TQMap<TQString, double> tempOffsetMap;
// first-time initialization
if( tempFactorMap.isEmpty() || tempOffsetMap.isEmpty() )
@@ -570,10 +570,10 @@ static bool kspread_convert_temperature( const QString& fromUnit,
tempFactorMap[ "K" ] = 1.0; tempOffsetMap[ "K" ] = -273.15;
}
- if( !tempFactorMap.contains( fromUnit ) ) return false;
- if( !tempOffsetMap.contains( fromUnit ) ) return false;
- if( !tempFactorMap.contains( toUnit ) ) return false;
- if( !tempOffsetMap.contains( toUnit ) ) return false;
+ if( !tempFactorMap.tqcontains( fromUnit ) ) return false;
+ if( !tempOffsetMap.tqcontains( fromUnit ) ) return false;
+ if( !tempFactorMap.tqcontains( toUnit ) ) return false;
+ if( !tempOffsetMap.tqcontains( toUnit ) ) return false;
result = ( value + tempOffsetMap[ fromUnit ] )* tempFactorMap[ fromUnit ];
result = ( result / tempFactorMap[ toUnit ] ) - tempOffsetMap[ toUnit ];
@@ -581,10 +581,10 @@ static bool kspread_convert_temperature( const QString& fromUnit,
return true;
}
-static bool kspread_convert_volume( const QString& fromUnit,
- const QString& toUnit, double value, double& result )
+static bool kspread_convert_volume( const TQString& fromUnit,
+ const TQString& toUnit, double value, double& result )
{
- static QMap<QString, double> volumeMap;
+ static TQMap<TQString, double> volumeMap;
// first-time initialization
if( volumeMap.isEmpty() )
@@ -606,24 +606,24 @@ static bool kspread_convert_volume( const QString& fromUnit,
volumeMap[ "barrel" ] = 6.289811E-03; // barrel
}
- QString fromU = fromUnit;
- QString toU = toUnit;
+ TQString fromU = fromUnit;
+ TQString toU = toUnit;
double fromPrefix = kspread_convert_prefix( volumeMap, fromU );
double toPrefix = kspread_convert_prefix( volumeMap, toU );
if( fromPrefix == 0.0 ) return false;
if( toPrefix == 0.0 ) return false;
- if( !volumeMap.contains( fromU ) ) return false;
- if( !volumeMap.contains( toU ) ) return false;
+ if( !volumeMap.tqcontains( fromU ) ) return false;
+ if( !volumeMap.tqcontains( toU ) ) return false;
result = value * fromPrefix * volumeMap[toU] / (volumeMap[fromU] * toPrefix);
return true;
}
-static bool kspread_convert_area( const QString& fromUnit,
- const QString& toUnit, double value, double& result )
+static bool kspread_convert_area( const TQString& fromUnit,
+ const TQString& toUnit, double value, double& result )
{
- static QMap<QString, double> areaMap;
+ static TQMap<TQString, double> areaMap;
// first-time initialization
if( areaMap.isEmpty() )
@@ -638,24 +638,24 @@ static bool kspread_convert_area( const QString& fromUnit,
areaMap[ "ha" ] = 1.0e4; // hectare
}
- QString fromU = fromUnit;
- QString toU = toUnit;
+ TQString fromU = fromUnit;
+ TQString toU = toUnit;
double fromPrefix = kspread_convert_prefix( areaMap, fromU );
double toPrefix = kspread_convert_prefix( areaMap, toU );
if( fromPrefix == 0.0 ) return false;
if( toPrefix == 0.0 ) return false;
- if( !areaMap.contains( fromU ) ) return false;
- if( !areaMap.contains( toU ) ) return false;
+ if( !areaMap.tqcontains( fromU ) ) return false;
+ if( !areaMap.tqcontains( toU ) ) return false;
result = value * fromPrefix * areaMap[toU] / (areaMap[fromU] * toPrefix);
return true;
}
-static bool kspread_convert_speed( const QString& fromUnit,
- const QString& toUnit, double value, double& result )
+static bool kspread_convert_speed( const TQString& fromUnit,
+ const TQString& toUnit, double value, double& result )
{
- static QMap<QString, double> speedMap;
+ static TQMap<TQString, double> speedMap;
// first-time initialization
if( speedMap.isEmpty() )
@@ -666,14 +666,14 @@ static bool kspread_convert_speed( const QString& fromUnit,
speedMap[ "kn" ] = 1.9438444924406048; // knot
}
- QString fromU = fromUnit;
- QString toU = toUnit;
+ TQString fromU = fromUnit;
+ TQString toU = toUnit;
double fromPrefix = kspread_convert_prefix( speedMap, fromU );
double toPrefix = kspread_convert_prefix( speedMap, toU );
if( fromPrefix == 0.0 ) return false;
if( toPrefix == 0.0 ) return false;
- if( !speedMap.contains( fromU ) ) return false;
- if( !speedMap.contains( toU ) ) return false;
+ if( !speedMap.tqcontains( fromU ) ) return false;
+ if( !speedMap.tqcontains( toU ) ) return false;
result = value * fromPrefix * speedMap[toU] / (speedMap[fromU] * toPrefix);
@@ -687,8 +687,8 @@ Value func_convert (valVector args, ValueCalc *calc, FuncExtra *)
// This function won't support arbitrary precision.
double value = calc->conv()->asFloat (args[0]).asFloat ();
- QString fromUnit = calc->conv()->asString (args[1]).asString();
- QString toUnit = calc->conv()->asString (args[2]).asString();
+ TQString fromUnit = calc->conv()->asString (args[1]).asString();
+ TQString toUnit = calc->conv()->asString (args[2]).asString();
double result = value;
@@ -713,9 +713,9 @@ Value func_convert (valVector args, ValueCalc *calc, FuncExtra *)
// these may eventually end up being merged into ValueCalc and friends
// then complex numbers will be handled transparently in most functions
-static QString func_create_complex( double real,double imag )
+static TQString func_create_complex( double real,double imag )
{
- QString tmp,tmp2;
+ TQString tmp,tmp2;
if(imag ==0)
{
return KGlobal::locale()->formatNumber( real);
@@ -739,7 +739,7 @@ Value func_complex (valVector args, ValueCalc *calc, FuncExtra *)
return args[0];
double re = calc->conv()->asFloat (args[0]).asFloat ();
double im = calc->conv()->asFloat (args[1]).asFloat ();
- QString tmp=func_create_complex (re, im);
+ TQString tmp=func_create_complex (re, im);
bool ok;
double result = KGlobal::locale()->readNumber(tmp, &ok);
if (ok)
@@ -748,10 +748,10 @@ Value func_complex (valVector args, ValueCalc *calc, FuncExtra *)
}
-static double imag_complexe(QString str, bool &ok)
+static double imag_complexe(TQString str, bool &ok)
{
-QString tmp=str;
-if(tmp.find('i')==-1)
+TQString tmp=str;
+if(tmp.tqfind('i')==-1)
{ //not a complex
ok=true;
return 0;
@@ -766,12 +766,12 @@ else if( tmp.length()==2 )
{
//-i,+i,
int pos1;
- if((pos1=tmp.find('+'))!=-1&& pos1==0)
+ if((pos1=tmp.tqfind('+'))!=-1&& pos1==0)
{
ok=true;
return 1;
}
- else if( (pos1=tmp.find('-'))!=-1 && pos1==0 )
+ else if( (pos1=tmp.tqfind('-'))!=-1 && pos1==0 )
{
ok=true;
return -1;
@@ -790,12 +790,12 @@ else if( tmp.length()==2 )
else
{//12+12i
int pos1,pos2;
- if((pos1=tmp.find('i'))!=-1)
+ if((pos1=tmp.tqfind('i'))!=-1)
{
double val;
- QString tmpStr;
+ TQString tmpStr;
- if((pos2=tmp.findRev('+'))!=-1 && pos2!=0)
+ if((pos2=tmp.tqfindRev('+'))!=-1 && pos2!=0)
{
if((pos1-pos2)==1)
{
@@ -811,7 +811,7 @@ else
return val;
}
}
- else if( (pos2=tmp.findRev('-'))!=-1&& pos2!=0)
+ else if( (pos2=tmp.tqfindRev('-'))!=-1&& pos2!=0)
{
if((pos1-pos2)==1)
{
@@ -844,7 +844,7 @@ return 0;
// Function: IMAGINARY
Value func_complex_imag (valVector args, ValueCalc *calc, FuncExtra *)
{
- QString tmp = calc->conv()->asString (args[0]).asString ();
+ TQString tmp = calc->conv()->asString (args[0]).asString ();
bool good;
double result=imag_complexe(tmp, good);
if (good)
@@ -853,13 +853,13 @@ Value func_complex_imag (valVector args, ValueCalc *calc, FuncExtra *)
}
-static double real_complexe(QString str, bool &ok)
+static double real_complexe(TQString str, bool &ok)
{
double val;
int pos1,pos2;
-QString tmp=str;
-QString tmpStr;
-if((pos1=tmp.find('i'))==-1)
+TQString tmp=str;
+TQString tmpStr;
+if((pos1=tmp.tqfind('i'))==-1)
{ //12.5
val=KGlobal::locale()->readNumber(tmp, &ok);
if(!ok)
@@ -868,7 +868,7 @@ if((pos1=tmp.find('i'))==-1)
}
else
{ //15-xi
- if((pos2=tmp.findRev('-'))!=-1 && pos2!=0)
+ if((pos2=tmp.tqfindRev('-'))!=-1 && pos2!=0)
{
tmpStr=tmp.left(pos2);
val=KGlobal::locale()->readNumber(tmpStr, &ok);
@@ -876,7 +876,7 @@ else
val=0;
return val;
} //15+xi
- else if((pos2=tmp.findRev('+'))!=-1)
+ else if((pos2=tmp.tqfindRev('+'))!=-1)
{
tmpStr=tmp.left(pos2);
val=KGlobal::locale()->readNumber(tmpStr, &ok);
@@ -898,7 +898,7 @@ return 0;
// Function: IMREAL
Value func_complex_real (valVector args, ValueCalc *calc, FuncExtra *)
{
- QString tmp = calc->conv()->asString (args[0]).asString ();
+ TQString tmp = calc->conv()->asString (args[0]).asString ();
bool good;
double result=real_complexe(tmp, good);
if (good)
@@ -958,7 +958,7 @@ Value func_imsum (valVector args, ValueCalc *calc, FuncExtra *)
calc->arrayWalk (args, result, awImSum, 0);
bool ok;
- QString res = calc->conv()->asString (result).asString();
+ TQString res = calc->conv()->asString (result).asString();
double val=KGlobal::locale()->readNumber(res, &ok);
if (ok)
return Value (val);
@@ -972,7 +972,7 @@ Value func_imsub (valVector args, ValueCalc *calc, FuncExtra *)
calc->arrayWalk (args, result, awImSub, 0);
bool ok;
- QString res = calc->conv()->asString (result).asString();
+ TQString res = calc->conv()->asString (result).asString();
double val=KGlobal::locale()->readNumber(res, &ok);
if (ok)
return Value (val);
@@ -986,7 +986,7 @@ Value func_improduct (valVector args, ValueCalc *calc, FuncExtra *)
calc->arrayWalk (args, result, awImMul, 0);
bool ok;
- QString res = calc->conv()->asString (result).asString();
+ TQString res = calc->conv()->asString (result).asString();
double val=KGlobal::locale()->readNumber(res, &ok);
if (ok)
return Value (val);
@@ -1000,7 +1000,7 @@ Value func_imdiv (valVector args, ValueCalc *calc, FuncExtra *)
calc->arrayWalk (args, result, awImDiv, 0);
bool ok;
- QString res = calc->conv()->asString (result).asString();
+ TQString res = calc->conv()->asString (result).asString();
double val=KGlobal::locale()->readNumber(res, &ok);
if (ok)
return Value (val);
@@ -1010,7 +1010,7 @@ Value func_imdiv (valVector args, ValueCalc *calc, FuncExtra *)
// Function: IMCONJUGATE
Value func_imconjugate (valVector args, ValueCalc *calc, FuncExtra *)
{
- QString tmp = calc->conv()->asString (args[0]).asString();
+ TQString tmp = calc->conv()->asString (args[0]).asString();
bool ok;
double real=real_complexe(tmp,ok);
if (!ok)
@@ -1031,7 +1031,7 @@ Value func_imconjugate (valVector args, ValueCalc *calc, FuncExtra *)
// Function: IMARGUMENT
Value func_imargument (valVector args, ValueCalc *calc, FuncExtra *)
{
- QString tmp = calc->conv()->asString (args[0]).asString();
+ TQString tmp = calc->conv()->asString (args[0]).asString();
bool ok;
double real=real_complexe(tmp,ok);
if (!ok)
@@ -1049,7 +1049,7 @@ Value func_imargument (valVector args, ValueCalc *calc, FuncExtra *)
// Function: IMABS
Value func_imabs (valVector args, ValueCalc *calc, FuncExtra *)
{
- QString tmp = calc->conv()->asString (args[0]).asString();
+ TQString tmp = calc->conv()->asString (args[0]).asString();
bool ok;
double real=real_complexe(tmp,ok);
if(!ok)
@@ -1065,7 +1065,7 @@ Value func_imabs (valVector args, ValueCalc *calc, FuncExtra *)
// Function: IMCOS
Value func_imcos (valVector args, ValueCalc *calc, FuncExtra *)
{
- QString tmp = calc->conv()->asString (args[0]).asString();
+ TQString tmp = calc->conv()->asString (args[0]).asString();
bool ok;
double real=real_complexe(tmp,ok);
if(!ok)
@@ -1089,7 +1089,7 @@ Value func_imcos (valVector args, ValueCalc *calc, FuncExtra *)
// Function: IMSIN
Value func_imsin (valVector args, ValueCalc *calc, FuncExtra *)
{
- QString tmp = calc->conv()->asString (args[0]).asString();
+ TQString tmp = calc->conv()->asString (args[0]).asString();
bool ok;
double real=real_complexe(tmp,ok);
if(!ok)
@@ -1113,7 +1113,7 @@ Value func_imsin (valVector args, ValueCalc *calc, FuncExtra *)
// Function: IMLN
Value func_imln (valVector args, ValueCalc *calc, FuncExtra *)
{
- QString tmp = calc->conv()->asString (args[0]).asString();
+ TQString tmp = calc->conv()->asString (args[0]).asString();
bool ok;
double real=real_complexe(tmp,ok);
if(!ok)
@@ -1137,7 +1137,7 @@ Value func_imln (valVector args, ValueCalc *calc, FuncExtra *)
// Function: IMEXP
Value func_imexp (valVector args, ValueCalc *calc, FuncExtra *)
{
- QString tmp = calc->conv()->asString (args[0]).asString();
+ TQString tmp = calc->conv()->asString (args[0]).asString();
bool ok;
double real=real_complexe(tmp,ok);
if(!ok)
@@ -1161,7 +1161,7 @@ Value func_imexp (valVector args, ValueCalc *calc, FuncExtra *)
// Function: IMSQRT
Value func_imsqrt (valVector args, ValueCalc *calc, FuncExtra *)
{
- QString tmp = calc->conv()->asString (args[0]).asString();
+ TQString tmp = calc->conv()->asString (args[0]).asString();
bool ok;
double real=real_complexe(tmp,ok);
if(!ok)
@@ -1187,7 +1187,7 @@ Value func_imsqrt (valVector args, ValueCalc *calc, FuncExtra *)
// Function: IMPOWER
Value func_impower (valVector args, ValueCalc *calc, FuncExtra *)
{
- QString tmp = calc->conv()->asString (args[0]).asString();
+ TQString tmp = calc->conv()->asString (args[0]).asString();
double val2 = calc->conv()->asFloat (args[1]).asFloat();
bool ok;
double real=real_complexe(tmp,ok);