diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:38:41 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-19 11:38:41 -0600 |
commit | f0de9e167e289ab7dc33e57f077c1f04ec7c68c8 (patch) | |
tree | 1fc538e179833e62caec21956bfe47a252be5a72 /kspread/valueformatter.cc | |
parent | 11191ef0b9908604d1d7aaca382b011ef22c454c (diff) | |
download | koffice-f0de9e167e289ab7dc33e57f077c1f04ec7c68c8.tar.gz koffice-f0de9e167e289ab7dc33e57f077c1f04ec7c68c8.zip |
Remove additional unneeded tq method conversions
Diffstat (limited to 'kspread/valueformatter.cc')
-rw-r--r-- | kspread/valueformatter.cc | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/kspread/valueformatter.cc b/kspread/valueformatter.cc index 9e3c57da..1eda41da 100644 --- a/kspread/valueformatter.cc +++ b/kspread/valueformatter.cc @@ -358,15 +358,15 @@ TQString ValueFormatter::fractionFormat (double value, FormatType fmtType) diff = fabs(result - calc); } } - if( index1 == 0 ) return TQString("%1").tqarg( floor(value) ); - if( index1 == index ) return TQString("%1").tqarg( floor(value)+1 ); + if( index1 == 0 ) return TQString("%1").arg( floor(value) ); + if( index1 == index ) return TQString("%1").arg( floor(value)+1 ); if( floor(value) == 0) - return TQString("%1/%2").tqarg( index1 ).tqarg( index ); + return TQString("%1/%2").arg( index1 ).arg( index ); return TQString("%1 %2/%3") - .tqarg( floor(value) ) - .tqarg( index1 ) - .tqarg( index ); + .arg( floor(value) ) + .arg( index1 ) + .arg( index ); } @@ -407,12 +407,12 @@ TQString ValueFormatter::fractionFormat (double value, FormatType fmtType) else { if ( floor(value) == 0 ) - return TQString("%1/%2").tqarg(numerator).tqarg(denominator); + return TQString("%1/%2").arg(numerator).arg(denominator); else return TQString("%1 %2/%3") - .tqarg(floor(value)) - .tqarg(numerator) - .tqarg(denominator); + .arg(floor(value)) + .arg(numerator) + .arg(denominator); } } @@ -436,35 +436,35 @@ TQString ValueFormatter::timeFormat (const TQDateTime &dt, FormatType fmtType) if (fmtType == Time_format1) { // 9 : 01 AM return TQString("%1:%2 %3") - .tqarg((pm ? h - 12 : h),2) - .tqarg(minute,2) - .tqarg(AMPM); + .arg((pm ? h - 12 : h),2) + .arg(minute,2) + .arg(AMPM); } if (fmtType == Time_format2) { //9:01:05 AM return TQString("%1:%2:%3 %4") - .tqarg((pm ? h-12 : h),2) - .tqarg(minute,2) - .tqarg(second,2) - .tqarg(AMPM); + .arg((pm ? h-12 : h),2) + .arg(minute,2) + .arg(second,2) + .arg(AMPM); } if (fmtType == Time_format3) { return TQString("%1 %2 %3 %4 %5 %6") // 9 h 01 min 28 s - .tqarg(hour,2) - .tqarg(i18n("h")) - .tqarg(minute,2) - .tqarg(i18n("min")) - .tqarg(second,2) - .tqarg(i18n("s")); + .arg(hour,2) + .arg(i18n("h")) + .arg(minute,2) + .arg(i18n("min")) + .arg(second,2) + .arg(i18n("s")); } if (fmtType == Time_format4) { // 9:01 - return TQString("%1:%2").tqarg(hour, 2).tqarg(minute, 2); + return TQString("%1:%2").arg(hour, 2).arg(minute, 2); } if (fmtType == Time_format5) { // 9:01:12 - return TQString("%1:%2:%3").tqarg(hour, 2).tqarg(minute, 2).tqarg(second, 2); + return TQString("%1:%2:%3").arg(hour, 2).arg(minute, 2).arg(second, 2); } TQDate d1(dt.date()); @@ -476,15 +476,15 @@ TQString ValueFormatter::timeFormat (const TQDateTime &dt, FormatType fmtType) if (fmtType == Time_format6) { // [mm]:ss m += (h * 60); - return TQString("%1:%2").tqarg(m, 1).tqarg(second, 2); + return TQString("%1:%2").arg(m, 1).arg(second, 2); } if (fmtType == Time_format7) { // [h]:mm:ss - return TQString("%1:%2:%3").tqarg(h, 1).tqarg(minute, 2).tqarg(second, 2); + return TQString("%1:%2:%3").arg(h, 1).arg(minute, 2).arg(second, 2); } if (fmtType == Time_format8) { // [h]:mm m += (h * 60); - return TQString("%1:%2").tqarg(h, 1).tqarg(minute, 2); + return TQString("%1:%2").arg(h, 1).arg(minute, 2); } return converter->locale()->formatTime( dt.time(), false ); @@ -540,7 +540,7 @@ TQString ValueFormatter::dateFormat (const TQDate &date, FormatType fmtType) tmp += TQString::number(date.year()); } else if (fmtType == date_format10) { /*F-99 */ - tmp = converter->locale()->calendar()->monthString(date, false).tqat(0) + "-"; + tmp = converter->locale()->calendar()->monthString(date, false).at(0) + "-"; tmp += TQString::number(date.year()).right(2); } else if (fmtType == date_format11) { /*18/Feb */ |