diff options
Diffstat (limited to 'kspread/tests/value_tester.cc')
-rw-r--r-- | kspread/tests/value_tester.cc | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/kspread/tests/value_tester.cc b/kspread/tests/value_tester.cc index ce24b8ba5..84e9e5637 100644 --- a/kspread/tests/value_tester.cc +++ b/kspread/tests/value_tester.cc @@ -25,7 +25,7 @@ #include <kspread_value.h> #define CHECK(x,y) check(__FILE__,__LINE__,#x,x,y) -#define CHECK_DATE(d,x) check(__FILE__,__LINE__,d->asDate().toString().latin1(),d->asFloat(),x) +#define CHECK_DATE(d,x) check(__FILE__,__LINE__,TQString(d->asDate().toString()).latin1(),d->asFloat(),x) using namespace KSpread; @@ -33,9 +33,9 @@ ValueTester::ValueTester(): Tester() { } -QString ValueTester::name() +TQString ValueTester::name() { - return QString("Value"); + return TQString("Value"); } template<typename T> @@ -45,8 +45,8 @@ void ValueTester::check( const char *file, int line, const char* msg, const T& r testCount++; if( result != expected ) { - QString message; - QTextStream ts( &message, IO_WriteOnly ); + TQString message; + TQTextStream ts( &message, IO_WriteOnly ); ts << msg; ts << " Result:"; ts << result; @@ -62,8 +62,8 @@ void ValueTester::check( const char *file, int line, const char* msg, bool resul testCount++; if( result != expected ) { - QString message; - QTextStream ts( &message, IO_WriteOnly ); + TQString message; + TQTextStream ts( &message, IO_WriteOnly ); ts << msg; ts << " Result: "; if( result ) ts << "True"; else ts << "False"; @@ -136,29 +136,29 @@ void ValueTester::run() delete v1; // string value - v1 = new Value( QString("Ailinon" ) ); + v1 = new Value( TQString("Ailinon" ) ); CHECK( v1->type(), Value::String ); - CHECK( v1->asString(), QString("Ailinon" ) ); + CHECK( v1->asString(), TQString("Ailinon" ) ); v1->setValue( 7 ); // dummy - v1->setValue( QString("spreadsheet" ) ); + v1->setValue( TQString("spreadsheet" ) ); CHECK( v1->type(), Value::String ); CHECK( v1->isInteger(), false ); CHECK( v1->isFloat(), false ); CHECK( v1->isString(), true ); CHECK( v1->isNumber(), false ); - CHECK( v1->asString(), QString("spreadsheet" ) ); + CHECK( v1->asString(), TQString("spreadsheet" ) ); delete v1; // check all (valid) dates from 1900 to 2050 // note: bail on first error immediately - QDate refDate( 1899, 12, 31 ); + TQDate refDate( 1899, 12, 31 ); v1 = new Value(); bool date_error = 0; for( unsigned y = 1900; !date_error && y < 2050; y++ ) for( unsigned m = 1; !date_error && m <= 12; m++ ) for( unsigned d = 1; !date_error && d <= 31; d++ ) { - QDate dv1 = QDate( y, m, d ); + TQDate dv1 = TQDate( y, m, d ); if( !dv1.isValid() ) continue; double serialNo = -dv1.daysTo( refDate ) + 1.0; v1->setValue( dv1 ); @@ -168,16 +168,16 @@ void ValueTester::run() // time value v1 = new Value(); - v1->setValue( QTime( 0, 0, 0 ) ); + v1->setValue( TQTime( 0, 0, 0 ) ); CHECK( v1->type(), Value::Integer ); int time_error = 0; // used to save time, bail on first error for( unsigned h = 0; !time_error && h < 24; h++ ) for( unsigned m = 0; !time_error && m < 60; m++ ) for( unsigned s = 0; !time_error && s < 60; s++ ) { - QTime t1 = QTime( h, m, s ); + TQTime t1 = TQTime( h, m, s ); v1->setValue( t1 ); - QTime t2 = v1->asTime(); + TQTime t2 = v1->asTime(); if( t1.hour() != t2.hour() ) time_error++; if( t1.minute() != t2.minute() ) time_error++; if( t1.second() != t2.second() ) time_error++; @@ -188,14 +188,14 @@ void ValueTester::run() // time value (msec) v1 = new Value(); - v1->setValue( QTime( 0, 0, 0 ) ); + v1->setValue( TQTime( 0, 0, 0 ) ); CHECK( v1->type(), Value::Integer ); int msec_error = 0; // used to save time, bail on first error for( unsigned ms= 0;ms < 1000;ms++ ) { - QTime t1 = QTime( 1, 14, 2, ms ); + TQTime t1 = TQTime( 1, 14, 2, ms ); v1->setValue( t1 ); - QTime t2 = v1->asTime(); + TQTime t2 = v1->asTime(); if( t1.hour() != t2.hour() ) msec_error++; if( t1.minute() != t2.minute() ) msec_error++; if( t1.second() != t2.second() ) msec_error++; |