diff options
Diffstat (limited to 'experimental/tqtinterface/qt4/src/tools/tqdir.cpp')
-rw-r--r-- | experimental/tqtinterface/qt4/src/tools/tqdir.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/experimental/tqtinterface/qt4/src/tools/tqdir.cpp b/experimental/tqtinterface/qt4/src/tools/tqdir.cpp index 796162dd5..99c9094e8 100644 --- a/experimental/tqtinterface/qt4/src/tools/tqdir.cpp +++ b/experimental/tqtinterface/qt4/src/tools/tqdir.cpp @@ -304,7 +304,7 @@ void TQDir::setPath( const TQString &path ) \fn TQString TQDir::path() const Returns the path, this may contain symbolic links, but never - tqcontains redundant ".", ".." or multiple separators. + contains redundant ".", ".." or multiple separators. The returned path can be either absolute or relative (see setPath()). @@ -316,7 +316,7 @@ void TQDir::setPath( const TQString &path ) /*! Returns the absolute path (a path that starts with "/" or with a drive specification), which may contain symbolic links, but never - tqcontains redundant ".", ".." or multiple separators. + contains redundant ".", ".." or multiple separators. \sa setPath(), canonicalPath(), exists(), cleanDirPath(), dirName(), absFilePath() @@ -349,7 +349,7 @@ TQString TQDir::absPath() const TQString TQDir::dirName() const { - int pos = dPath.tqfindRev( '/' ); + int pos = dPath.findRev( '/' ); if ( pos == -1 ) return dPath; return dPath.right( dPath.length() - pos - 1 ); @@ -465,7 +465,7 @@ TQString TQDir::convertSeparators( const TQString &pathName ) if ( n[i] == '/' ) n[i] = ':'; } - if(n.tqcontains(':') && n.left(1) != ':') + if(n.contains(':') && n.left(1) != ':') n.prepend(':'); #endif return n; @@ -508,7 +508,7 @@ bool TQDir::cd( const TQString &dirName, bool acceptAbsPath ) } dPath += dirName; - if ( dirName.tqfind('/') >= 0 + if ( dirName.find('/') >= 0 || old == TQString::tqfromLatin1(".") || dirName == TQString::tqfromLatin1("..") ) { dPath = cleanDirPath( dPath ); @@ -1166,8 +1166,8 @@ TQValueList<TQRegExp> qt_makeFilterList( const TQString &filter ) return regExps; TQChar sep( ';' ); - int i = filter.tqfind( sep, 0 ); - if ( i == -1 && filter.tqfind( ' ', 0 ) != -1 ) + int i = filter.find( sep, 0 ); + if ( i == -1 && filter.find( ' ', 0 ) != -1 ) sep = TQChar( ' ' ); TQStringList list = TQStringList::split( sep, filter ); @@ -1263,7 +1263,7 @@ TQString TQDir::cleanDirPath( const TQString &filePath ) upLevel = 0; int len; - while ( pos && (pos = name.tqfindRev('/', pos - 1)) != -1 ) { + while ( pos && (pos = name.findRev('/', pos - 1)) != -1 ) { len = ePos - pos - 1; if ( len == 2 && name.at(pos + 1) == '.' && name.at(pos + 2) == '.' ) { |