diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
commit | f7e71d47719ab6094cf4a9fafffa5ea351973522 (patch) | |
tree | 30834aa632d442019e14f88685001d94657d060b /kdeui/knumvalidator.cpp | |
parent | b31cfd9a1ee986fe2ae9a693f3afd7f171dd897c (diff) | |
download | tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.tar.gz tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.zip |
Initial conversion for TQt for Qt4 3.4.0 TP2
This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase. If it does then it needs to be fixed!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdeui/knumvalidator.cpp')
-rw-r--r-- | kdeui/knumvalidator.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/kdeui/knumvalidator.cpp b/kdeui/knumvalidator.cpp index 436f95431..4dba9d796 100644 --- a/kdeui/knumvalidator.cpp +++ b/kdeui/knumvalidator.cpp @@ -35,7 +35,7 @@ // KIntValidator::KIntValidator ( TQWidget * parent, int base, const char * name ) - : TQValidator(parent, name) + : TQValidator(TQT_TQOBJECT(parent), name) { _base = base; if (_base < 2) _base = 2; @@ -45,7 +45,7 @@ KIntValidator::KIntValidator ( TQWidget * parent, int base, const char * name ) } KIntValidator::KIntValidator ( int bottom, int top, TQWidget * parent, int base, const char * name ) - : TQValidator(parent, name) + : TQValidator(TQT_TQOBJECT(parent), name) { _base = base; if (_base > 36) _base = 36; @@ -67,7 +67,7 @@ TQValidator::State KIntValidator::validate ( TQString &str, int & ) const if (_base > 10) newStr = newStr.upper(); - if (newStr == TQString::fromLatin1("-")) // a special case + if (newStr == TQString::tqfromLatin1("-")) // a special case if ((_min || _max) && _min >= 0) ok = false; else @@ -162,7 +162,7 @@ public: KFloatValidator::KFloatValidator ( TQWidget * parent, const char * name ) - : TQValidator(parent, name) + : TQValidator(TQT_TQOBJECT(parent), name) { d = new KFloatValidatorPrivate; d->acceptLocalizedNumbers=false; @@ -170,7 +170,7 @@ KFloatValidator::KFloatValidator ( TQWidget * parent, const char * name ) } KFloatValidator::KFloatValidator ( double bottom, double top, TQWidget * parent, const char * name ) - : TQValidator(parent, name) + : TQValidator(TQT_TQOBJECT(parent), name) { d = new KFloatValidatorPrivate; d->acceptLocalizedNumbers=false; @@ -179,7 +179,7 @@ KFloatValidator::KFloatValidator ( double bottom, double top, TQWidget * parent, } KFloatValidator::KFloatValidator ( double bottom, double top, bool localeAware, TQWidget * parent, const char * name ) - : TQValidator(parent, name) + : TQValidator(TQT_TQOBJECT(parent), name) { d = new KFloatValidatorPrivate; d->acceptLocalizedNumbers = localeAware; @@ -209,12 +209,12 @@ TQValidator::State KFloatValidator::validate ( TQString &str, int & ) const TQString newStr; newStr = str.stripWhiteSpace(); - if (newStr == TQString::fromLatin1("-")) // a special case + if (newStr == TQString::tqfromLatin1("-")) // a special case if ((_min || _max) && _min >= 0) ok = false; else return TQValidator::Acceptable; - else if (newStr == TQString::fromLatin1(".") || (d->acceptLocalizedNumbers && newStr==KGlobal::locale()->decimalSymbol())) // another special case + else if (newStr == TQString::tqfromLatin1(".") || (d->acceptLocalizedNumbers && newStr==KGlobal::locale()->decimalSymbol())) // another special case return TQValidator::Acceptable; else if (newStr.length()) { @@ -339,17 +339,17 @@ TQValidator::State KDoubleValidator::validate( TQString & input, int & p ) const t = l->thousandsSeparator(); // first, delete p's and t's: if ( !p.isEmpty() ) - for ( int idx = s.find( p ) ; idx >= 0 ; idx = s.find( p, idx ) ) + for ( int idx = s.tqfind( p ) ; idx >= 0 ; idx = s.tqfind( p, idx ) ) s.remove( idx, p.length() ); if ( !t.isEmpty() ) - for ( int idx = s.find( t ) ; idx >= 0 ; idx = s.find( t, idx ) ) + for ( int idx = s.tqfind( t ) ; idx >= 0 ; idx = s.tqfind( t, idx ) ) s.remove( idx, t.length() ); // then, replace the d's and n's - if ( ( !n.isEmpty() && n.find('.') != -1 ) || - ( !d.isEmpty() && d.find('-') != -1 ) ) { + if ( ( !n.isEmpty() && n.tqfind('.') != -1 ) || + ( !d.isEmpty() && d.tqfind('-') != -1 ) ) { // make sure we don't replace something twice: kdWarning() << "KDoubleValidator: decimal symbol contains '-' or " "negative sign contains '.' -> improve algorithm" << endl; @@ -357,11 +357,11 @@ TQValidator::State KDoubleValidator::validate( TQString & input, int & p ) const } if ( !d.isEmpty() && d != "." ) - for ( int idx = s.find( d ) ; idx >= 0 ; idx = s.find( d, idx + 1 ) ) + for ( int idx = s.tqfind( d ) ; idx >= 0 ; idx = s.tqfind( d, idx + 1 ) ) s.replace( idx, d.length(), '.'); if ( !n.isEmpty() && n != "-" ) - for ( int idx = s.find( n ) ; idx >= 0 ; idx = s.find( n, idx + 1 ) ) + for ( int idx = s.tqfind( n ) ; idx >= 0 ; idx = s.tqfind( n, idx + 1 ) ) s.replace( idx, n.length(), '-' ); } |