diff options
Diffstat (limited to 'kspread/kspread_util.cc')
| -rw-r--r-- | kspread/kspread_util.cc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/kspread/kspread_util.cc b/kspread/kspread_util.cc index 43c2581b..47edd2ac 100644 --- a/kspread/kspread_util.cc +++ b/kspread/kspread_util.cc @@ -248,7 +248,7 @@ void Point::init(const TQString & _str) } TQString str( _str ); - int n = _str.tqfind( '!' ); + int n = _str.find( '!' ); if ( n != -1 ) { _sheetName = _str.left( n ); @@ -284,7 +284,7 @@ void Point::init(const TQString & _str) //default is error int x = -1; //search for the first character != text - int result = str.tqfind( TQRegExp("[^A-Za-z]+"), p ); + int result = str.find( TQRegExp("[^A-Za-z]+"), p ); //get the colomn number for the character between actual position and the first non text charakter if ( result != -1 ) @@ -381,7 +381,7 @@ Point::Point( const TQString & str, Map * map, { uint p = 0; - int p2 = str.tqfind( '!' ); + int p2 = str.find( '!' ); if ( p2 != -1 ) { _sheetName = str.left( p2++ ); @@ -464,7 +464,7 @@ Range::Range(const TQString & _str) _range.setLeft(-1); _sheet = 0; - int p = _str.tqfind(':'); + int p = _str.find(':'); // if (p == -1) // return; @@ -554,7 +554,7 @@ Range::Range(const TQString & str, Map * map, _sheet = 0; int p = 0; - int p2 = str.tqfind('!'); + int p2 = str.find('!'); if (p2 != -1) { _sheetName = str.left(p2++); @@ -574,7 +574,7 @@ Range::Range(const TQString & str, Map * map, _sheet = sheet; - int p3 = str.tqfind(':', p); + int p3 = str.find(':', p); if (p3 == -1) return; @@ -603,7 +603,7 @@ TQString Range::toString() const //Insert $ characters to show fixed parts of range - int pos=result.tqfind("!")+1; + int pos=result.find("!")+1; Q_ASSERT(pos != -1); if (_leftFixed) @@ -616,7 +616,7 @@ TQString Range::toString() const result.insert(pos+Cell::columnName(_range.left()).length(),'$'); } - pos=result.tqfind(":")+1; + pos=result.find(":")+1; Q_ASSERT(pos != -1); if (_rightFixed) @@ -657,9 +657,9 @@ void Range::getEndPoint(Point* pt) pt->setSheetName(_sheetName); } -bool Range::tqcontains (const Point &cell) const +bool Range::contains (const Point &cell) const { - return _range.tqcontains (cell.pos()); + return _range.contains (cell.pos()); } bool Range::intersects (const Range &r) const @@ -1007,10 +1007,10 @@ TQPen KSpread::convertOasisStringToPen( const TQString &border ) //Return true when it's a reference to cell from sheet. bool KSpread::localReferenceAnchor( const TQString &_ref ) { - bool isLocalRef = (_ref.tqfind("http://") != 0 && - _ref.tqfind("mailto:") != 0 && - _ref.tqfind("ftp://") != 0 && - _ref.tqfind("file:") != 0 ); + bool isLocalRef = (_ref.find("http://") != 0 && + _ref.find("mailto:") != 0 && + _ref.find("ftp://") != 0 && + _ref.find("file:") != 0 ); return isLocalRef; } |