diff options
Diffstat (limited to 'kspread/kspread_functions_engineering.cc')
-rw-r--r-- | kspread/kspread_functions_engineering.cc | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/kspread/kspread_functions_engineering.cc b/kspread/kspread_functions_engineering.cc index 8ae0bf2f..ddcda561 100644 --- a/kspread/kspread_functions_engineering.cc +++ b/kspread/kspread_functions_engineering.cc @@ -718,16 +718,16 @@ static TQString func_create_complex( double real,double imag ) TQString tmp,tmp2; if(imag ==0) { - return KGlobal::locale()->formatNumber( real); + return TDEGlobal::locale()->formatNumber( real); } if(real!=0) - tmp=KGlobal::locale()->formatNumber(real); + tmp=TDEGlobal::locale()->formatNumber(real); else - return KGlobal::locale()->formatNumber(imag)+"i"; + return TDEGlobal::locale()->formatNumber(imag)+"i"; if (imag >0) - tmp=tmp+"+"+KGlobal::locale()->formatNumber(imag)+"i"; + tmp=tmp+"+"+TDEGlobal::locale()->formatNumber(imag)+"i"; else - tmp=tmp+KGlobal::locale()->formatNumber(imag)+"i"; + tmp=tmp+TDEGlobal::locale()->formatNumber(imag)+"i"; return tmp; } @@ -741,7 +741,7 @@ Value func_complex (valVector args, ValueCalc *calc, FuncExtra *) double im = calc->conv()->asFloat (args[1]).asFloat (); TQString tmp=func_create_complex (re, im); bool ok; - double result = KGlobal::locale()->readNumber(tmp, &ok); + double result = TDEGlobal::locale()->readNumber(tmp, &ok); if (ok) return Value (result); return Value (tmp); @@ -779,7 +779,7 @@ else if( tmp.length()==2 ) else if(tmp[0].isDigit()) { //5i ok=true; - return KGlobal::locale()->readNumber(tmp.left(1)); + return TDEGlobal::locale()->readNumber(tmp.left(1)); } else { @@ -805,7 +805,7 @@ else else { tmpStr=tmp.mid(pos2,(pos1-pos2)); - val=KGlobal::locale()->readNumber(tmpStr, &ok); + val=TDEGlobal::locale()->readNumber(tmpStr, &ok); if(!ok) val=0; return val; @@ -821,7 +821,7 @@ else else { tmpStr=tmp.mid(pos2,(pos1-pos2)); - val=KGlobal::locale()->readNumber(tmpStr, &ok); + val=TDEGlobal::locale()->readNumber(tmpStr, &ok); if(!ok) val=0; return val; @@ -830,7 +830,7 @@ else else {//15.55i tmpStr=tmp.left(pos1); - val=KGlobal::locale()->readNumber(tmpStr, &ok); + val=TDEGlobal::locale()->readNumber(tmpStr, &ok); if(!ok) val=0; return val; @@ -861,7 +861,7 @@ TQString tmp=str; TQString tmpStr; if((pos1=tmp.find('i'))==-1) { //12.5 - val=KGlobal::locale()->readNumber(tmp, &ok); + val=TDEGlobal::locale()->readNumber(tmp, &ok); if(!ok) val=0; return val; @@ -871,7 +871,7 @@ else if((pos2=tmp.findRev('-'))!=-1 && pos2!=0) { tmpStr=tmp.left(pos2); - val=KGlobal::locale()->readNumber(tmpStr, &ok); + val=TDEGlobal::locale()->readNumber(tmpStr, &ok); if(!ok) val=0; return val; @@ -879,7 +879,7 @@ else else if((pos2=tmp.findRev('+'))!=-1) { tmpStr=tmp.left(pos2); - val=KGlobal::locale()->readNumber(tmpStr, &ok); + val=TDEGlobal::locale()->readNumber(tmpStr, &ok); if(!ok) val=0; return val; @@ -959,7 +959,7 @@ Value func_imsum (valVector args, ValueCalc *calc, FuncExtra *) bool ok; TQString res = calc->conv()->asString (result).asString(); - double val=KGlobal::locale()->readNumber(res, &ok); + double val=TDEGlobal::locale()->readNumber(res, &ok); if (ok) return Value (val); return Value (result); @@ -973,7 +973,7 @@ Value func_imsub (valVector args, ValueCalc *calc, FuncExtra *) bool ok; TQString res = calc->conv()->asString (result).asString(); - double val=KGlobal::locale()->readNumber(res, &ok); + double val=TDEGlobal::locale()->readNumber(res, &ok); if (ok) return Value (val); return Value (result); @@ -987,7 +987,7 @@ Value func_improduct (valVector args, ValueCalc *calc, FuncExtra *) bool ok; TQString res = calc->conv()->asString (result).asString(); - double val=KGlobal::locale()->readNumber(res, &ok); + double val=TDEGlobal::locale()->readNumber(res, &ok); if (ok) return Value (val); return Value (result); @@ -1001,7 +1001,7 @@ Value func_imdiv (valVector args, ValueCalc *calc, FuncExtra *) bool ok; TQString res = calc->conv()->asString (result).asString(); - double val=KGlobal::locale()->readNumber(res, &ok); + double val=TDEGlobal::locale()->readNumber(res, &ok); if (ok) return Value (val); return Value (result); @@ -1021,7 +1021,7 @@ Value func_imconjugate (valVector args, ValueCalc *calc, FuncExtra *) tmp=func_create_complex(real,-imag); - double result=KGlobal::locale()->readNumber(tmp, &ok); + double result=TDEGlobal::locale()->readNumber(tmp, &ok); if(ok) return Value (result); @@ -1079,7 +1079,7 @@ Value func_imcos (valVector args, ValueCalc *calc, FuncExtra *) tmp=func_create_complex(real_res,-imag_res); - double result=KGlobal::locale()->readNumber(tmp, &ok); + double result=TDEGlobal::locale()->readNumber(tmp, &ok); if(ok) return Value (result); @@ -1103,7 +1103,7 @@ Value func_imsin (valVector args, ValueCalc *calc, FuncExtra *) tmp=func_create_complex(real_res,imag_res); - double result=KGlobal::locale()->readNumber(tmp, &ok); + double result=TDEGlobal::locale()->readNumber(tmp, &ok); if(ok) return Value (result); @@ -1127,7 +1127,7 @@ Value func_imln (valVector args, ValueCalc *calc, FuncExtra *) double imag_res=atan(imag/real); tmp=func_create_complex(real_res,imag_res); - double result=KGlobal::locale()->readNumber(tmp, &ok); + double result=TDEGlobal::locale()->readNumber(tmp, &ok); if(ok) return Value (result); @@ -1151,7 +1151,7 @@ Value func_imexp (valVector args, ValueCalc *calc, FuncExtra *) tmp=func_create_complex(real_res,imag_res); - double result=KGlobal::locale()->readNumber(tmp, &ok); + double result=TDEGlobal::locale()->readNumber(tmp, &ok); if(ok) return Value (result); @@ -1177,7 +1177,7 @@ Value func_imsqrt (valVector args, ValueCalc *calc, FuncExtra *) tmp=func_create_complex(real_res,imag_res); - double result=KGlobal::locale()->readNumber(tmp, &ok); + double result=TDEGlobal::locale()->readNumber(tmp, &ok); if(ok) return Value (result); @@ -1205,7 +1205,7 @@ Value func_impower (valVector args, ValueCalc *calc, FuncExtra *) tmp=func_create_complex(real_res,imag_res); - double result=KGlobal::locale()->readNumber(tmp, &ok); + double result=TDEGlobal::locale()->readNumber(tmp, &ok); if(ok) return Value (result); |