summaryrefslogtreecommitdiffstats
path: root/kspread/valueparser.cc
diff options
context:
space:
mode:
Diffstat (limited to 'kspread/valueparser.cc')
-rw-r--r--kspread/valueparser.cc26
1 files changed, 13 insertions, 13 deletions
diff --git a/kspread/valueparser.cc b/kspread/valueparser.cc
index 9acd3705..ff5b4b8c 100644
--- a/kspread/valueparser.cc
+++ b/kspread/valueparser.cc
@@ -202,7 +202,7 @@ Value ValueParser::tryParseBool (const TQString& str, bool *ok)
double ValueParser::readNumber(const TQString &_str, bool * ok, bool * isInt)
{
TQString str = _str.stripWhiteSpace();
- bool neg = str.tqfind(parserLocale->negativeSign()) == 0;
+ bool neg = str.find(parserLocale->negativeSign()) == 0;
if (neg)
str.remove( 0, parserLocale->negativeSign().length() );
@@ -212,7 +212,7 @@ double ValueParser::readNumber(const TQString &_str, bool * ok, bool * isInt)
TQString exponentialPart;
int EPos;
- EPos = str.tqfind('E', 0, false);
+ EPos = str.find('E', 0, false);
if (EPos != -1)
{
@@ -220,7 +220,7 @@ double ValueParser::readNumber(const TQString &_str, bool * ok, bool * isInt)
str = str.left(EPos);
}
- int pos = str.tqfind(parserLocale->decimalSymbol());
+ int pos = str.find(parserLocale->decimalSymbol());
TQString major;
TQString minor;
if ( pos == -1 )
@@ -238,7 +238,7 @@ double ValueParser::readNumber(const TQString &_str, bool * ok, bool * isInt)
// Remove thousand separators
int thlen = parserLocale->thousandsSeparator().length();
int lastpos = 0;
- while ( ( pos = major.tqfind( parserLocale->thousandsSeparator() ) ) > 0 )
+ while ( ( pos = major.find( parserLocale->thousandsSeparator() ) ) > 0 )
{
// e.g. 12,,345,,678,,922 Acceptable positions (from the end) are 5, 10, 15... i.e. (3+thlen)*N
int fromEnd = major.length() - pos;
@@ -290,7 +290,7 @@ Value ValueParser::tryParseNumber (const TQString& str, bool *ok)
if (!(*ok))
{
val = str2.toDouble(ok);
- if (str.tqcontains('.'))
+ if (str.contains('.'))
isInt = false;
else
isInt = true;
@@ -315,7 +315,7 @@ Value ValueParser::tryParseNumber (const TQString& str, bool *ok)
else
value.setValue (val);
- if ( str2.tqcontains('E') || str2.tqcontains('e') )
+ if ( str2.contains('E') || str2.contains('e') )
fmtType = Scientific_format;
else
{
@@ -342,7 +342,7 @@ Value ValueParser::tryParseDate (const TQString& str, bool *ok)
// If the year is in the middle, say %m-%Y/%d, we'll remove the sep.
// before it (%m/%d).
TQString fmt = parserLocale->dateFormatShort();
- int yearPos = fmt.tqfind ("%Y", 0, false);
+ int yearPos = fmt.find ("%Y", 0, false);
if ( yearPos > -1 )
{
if ( yearPos == 0 )
@@ -370,7 +370,7 @@ Value ValueParser::tryParseDate (const TQString& str, bool *ok)
// The following fixes the problem, 3/4/1955 will always be 1955
TQString fmt = parserLocale->dateFormatShort();
- if( ( fmt.tqcontains( "%y" ) == 1 ) && ( tmpDate.year() > 2999 ) )
+ if( ( fmt.contains( "%y" ) == 1 ) && ( tmpDate.year() > 2999 ) )
tmpDate = tmpDate.addYears( -1900 );
// this is another HACK !
@@ -388,8 +388,8 @@ Value ValueParser::tryParseDate (const TQString& str, bool *ok)
// if year is 2045, check to see if "2045" isn't there --> actual
// input is "45"
- if( ( str.tqcontains( yearTwoDigits ) >= 1 ) &&
- ( str.tqcontains( yearFourDigits ) == 0 ) )
+ if( ( str.contains( yearTwoDigits ) >= 1 ) &&
+ ( str.contains( yearFourDigits ) == 0 ) )
tmpDate = tmpDate.addYears( -100 );
}
@@ -436,7 +436,7 @@ Value ValueParser::tryParseTime (const TQString& str, bool *ok)
TQString stringPm = parserLocale->translate("pm");
TQString stringAm = parserLocale->translate("am");
int pos=0;
- if((pos=str.tqfind(stringPm))!=-1)
+ if((pos=str.find(stringPm))!=-1)
{
TQString tmp=str.mid(0,str.length()-stringPm.length());
tmp=tmp.simplifyWhiteSpace();
@@ -444,7 +444,7 @@ Value ValueParser::tryParseTime (const TQString& str, bool *ok)
if (!valid)
tm = parserLocale->readTime(tmp+":00 "+stringPm, &valid);
}
- else if((pos=str.tqfind(stringAm))!=-1)
+ else if((pos=str.find(stringAm))!=-1)
{
TQString tmp = str.mid(0,str.length()-stringAm.length());
tmp = tmp.simplifyWhiteSpace();
@@ -482,7 +482,7 @@ TQDateTime ValueParser::readTime (const TQString & intstr, bool withSeconds,
TQString format = parserLocale->timeFormat().simplifyWhiteSpace();
if ( !withSeconds )
{
- int n = format.tqfind("%S");
+ int n = format.find("%S");
format = format.left( n - 1 );
}