diff options
Diffstat (limited to 'krecipes/src/tests/checks.h')
| -rw-r--r-- | krecipes/src/tests/checks.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/krecipes/src/tests/checks.h b/krecipes/src/tests/checks.h index f115f98..038395f 100644 --- a/krecipes/src/tests/checks.h +++ b/krecipes/src/tests/checks.h @@ -14,9 +14,9 @@ #include <cmath> #include <iostream> -#include <qstring.h> -#include <qpixmap.h> -#include <qimage.h> +#include <ntqstring.h> +#include <ntqpixmap.h> +#include <ntqimage.h> #include "datablocks/categorytree.h" #include "datablocks/rating.h" @@ -27,7 +27,7 @@ using std::endl; void check( const RatingList &rating, const RatingList &base ); -bool check(const QString &txt, const QString &a, const QString &b) +bool check(const TQString &txt, const TQString &a, const TQString &b) { if ( a != b ) { cout << "ERROR: Tested " << txt.latin1() << ", expected" << endl; @@ -40,7 +40,7 @@ bool check(const QString &txt, const QString &a, const QString &b) return true; } -bool check(const QString &txt, int a, int b) +bool check(const TQString &txt, int a, int b) { if ( a != b ) { cout << "ERROR: Tested " << txt.latin1() << ", expected" << endl; @@ -53,7 +53,7 @@ bool check(const QString &txt, int a, int b) return true; } -bool check(const QString &txt, double a, double b) +bool check(const TQString &txt, double a, double b) { if ( fabs(a - b) > 1e-10 ) { cout << "ERROR: Tested " << txt.latin1() << ", expected" << endl; @@ -66,7 +66,7 @@ bool check(const QString &txt, double a, double b) return true; } -bool check(const QString &txt, const QPixmap &a, const QPixmap &b) +bool check(const TQString &txt, const TQPixmap &a, const TQPixmap &b) { if ( a.size() != b.size() ) { @@ -79,17 +79,17 @@ bool check(const QString &txt, const QPixmap &a, const QPixmap &b) void check( const IngredientData &ing, const IngredientData &base_ing, int ing_num ) { - check( QString::number(ing_num)+": Ingredient name", ing.name, base_ing.name ); - check( QString::number(ing_num)+": Ingredient amount", ing.amount,base_ing.amount ); - check( QString::number(ing_num)+": Ingredient amount_offset", ing.amount_offset,base_ing.amount_offset ); - check( QString::number(ing_num)+": Ingredient singular unit", ing.units.name, base_ing.units.name ); - check( QString::number(ing_num)+": Ingredient plural unit", ing.units.plural, base_ing.units.plural ); - check( QString::number(ing_num)+": Ingredient group", ing.group, base_ing.group ); + check( TQString::number(ing_num)+": Ingredient name", ing.name, base_ing.name ); + check( TQString::number(ing_num)+": Ingredient amount", ing.amount,base_ing.amount ); + check( TQString::number(ing_num)+": Ingredient amount_offset", ing.amount_offset,base_ing.amount_offset ); + check( TQString::number(ing_num)+": Ingredient singular unit", ing.units.name, base_ing.units.name ); + check( TQString::number(ing_num)+": Ingredient plural unit", ing.units.plural, base_ing.units.plural ); + check( TQString::number(ing_num)+": Ingredient group", ing.group, base_ing.group ); ElementList::const_iterator prep_it = ing.prepMethodList.begin(); ElementList::const_iterator base_prep_it = base_ing.prepMethodList.begin(); for ( ; prep_it != ing.prepMethodList.end(); ++prep_it, ++base_prep_it ) { - check( QString::number(ing_num)+": Ingredient prep_method", (*prep_it).name, (*base_prep_it).name ); + check( TQString::number(ing_num)+": Ingredient prep_method", (*prep_it).name, (*base_prep_it).name ); } } @@ -108,7 +108,7 @@ void check( const Recipe &recipe, const Recipe &base ) ElementList::const_iterator cat_it = recipe.categoryList.begin(); ElementList::const_iterator base_cat_it = base.categoryList.begin(); for ( ; cat_it != recipe.categoryList.end() || base_cat_it != base.categoryList.end(); ++cat_it, ++base_cat_it ) { - check( QString::number(cat_num)+": Category", (*cat_it).name, (*base_cat_it).name ); + check( TQString::number(cat_num)+": Category", (*cat_it).name, (*base_cat_it).name ); ++cat_num; } check( "category count", cat_num-1, base.categoryList.count() ); @@ -117,7 +117,7 @@ void check( const Recipe &recipe, const Recipe &base ) ElementList::const_iterator author_it = recipe.authorList.begin(); ElementList::const_iterator base_author_it = base.authorList.begin(); for ( ; author_it != recipe.authorList.end() || base_author_it != base.authorList.end(); ++author_it, ++base_author_it ) { - check( QString::number(author_num)+": Author", (*author_it).name, (*base_author_it).name ); + check( TQString::number(author_num)+": Author", (*author_it).name, (*base_author_it).name ); ++author_num; } check( "author count", author_num-1, base.authorList.count() ); @@ -128,8 +128,8 @@ void check( const Recipe &recipe, const Recipe &base ) for ( ; ing_it != recipe.ingList.end() || base_ing_it != base.ingList.end(); ++ing_it, ++base_ing_it ) { check( *ing_it, *base_ing_it, ing_num ); - QValueList<IngredientData>::const_iterator base_sub_it = (*base_ing_it).substitutes.begin(); - for ( QValueList<IngredientData>::const_iterator sub_it = (*ing_it).substitutes.begin(); sub_it != (*ing_it).substitutes.end(); ++sub_it, ++base_sub_it ) { + TQValueList<IngredientData>::const_iterator base_sub_it = (*base_ing_it).substitutes.begin(); + for ( TQValueList<IngredientData>::const_iterator sub_it = (*ing_it).substitutes.begin(); sub_it != (*ing_it).substitutes.end(); ++sub_it, ++base_sub_it ) { check( *sub_it, *base_sub_it, ing_num+1000 ); } |