diff options
Diffstat (limited to 'krecipes/src/datablocks/ingredient.cpp')
| -rw-r--r-- | krecipes/src/datablocks/ingredient.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/krecipes/src/datablocks/ingredient.cpp b/krecipes/src/datablocks/ingredient.cpp index a078f84..19d66e6 100644 --- a/krecipes/src/datablocks/ingredient.cpp +++ b/krecipes/src/datablocks/ingredient.cpp @@ -12,14 +12,14 @@ #include "datablocks/ingredient.h" -#include <qstringlist.h> +#include <ntqstringlist.h> #include "mixednumber.h" IngredientData::IngredientData() : amount( 0 ), amount_offset( 0 ), groupID( -1 ) {} -IngredientData::IngredientData( const QString &_name, double _amount, const Unit &_units, int _unitID, int _ingredientID ) : +IngredientData::IngredientData( const TQString &_name, double _amount, const Unit &_units, int _unitID, int _ingredientID ) : ingredientID( _ingredientID ), name( _name ), amount( _amount ), @@ -39,29 +39,29 @@ bool IngredientData::operator==( const IngredientData &ing ) const Ingredient::Ingredient() : IngredientData() {} -Ingredient::Ingredient( const QString &_name, double _amount, const Unit &_units, int _unitID, int _ingredientID ) : +Ingredient::Ingredient( const TQString &_name, double _amount, const Unit &_units, int _unitID, int _ingredientID ) : IngredientData(_name,_amount,_units,_unitID,_ingredientID) {} Ingredient::Ingredient( const IngredientData &d ) : IngredientData(d) {} -void Ingredient::setAmount( const QString &range, bool *ok ) +void Ingredient::setAmount( const TQString &range, bool *ok ) { if ( range.isEmpty() ) { if ( ok ) *ok = true; return; } - QStringList ranges = QStringList::split('-',range); + TQStringList ranges = TQStringList::split('-',range); - QString amount_min = ranges[0]; + TQString amount_min = ranges[0]; if ( amount_min.isEmpty() ) { if ( ok ) *ok = false; return; } - QString amount_max; + TQString amount_max; switch ( ranges.count() ) { case 0: case 1: break; @@ -91,5 +91,5 @@ bool Ingredient::operator==( const Ingredient &ing ) const bool Ingredient::operator<( const Ingredient &ing ) const { - return ( QString::localeAwareCompare( name, ing.name ) < 0 ); + return ( TQString::localeAwareCompare( name, ing.name ) < 0 ); } |