diff options
Diffstat (limited to 'kbabel/datatools/arguments')
-rw-r--r-- | kbabel/datatools/arguments/main.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/kbabel/datatools/arguments/main.cc b/kbabel/datatools/arguments/main.cc index 4b533061..43ae38b4 100644 --- a/kbabel/datatools/arguments/main.cc +++ b/kbabel/datatools/arguments/main.cc @@ -110,46 +110,46 @@ bool ArgumentTool::run( const TQString& command, void* data, const TQString& dat if( line.startsWith("_n:" )) { // truncate text after first \n to get args only once - line = line.mid(0,line.tqfind("\\n")); + line = line.mid(0,line.find("\\n")); } } - line.tqreplace(_context, ""); - line.tqreplace(TQRegExp("\\n"),""); + line.replace(_context, ""); + line.replace(TQRegExp("\\n"),""); line.simplifyWhiteSpace(); // flag, for GNU only we can allow reordering bool non_gnu = (item->pluralForm() == KDESpecific); - int index=line.tqfind(TQRegExp("%.")); + int index=line.find(TQRegExp("%.")); while(index>=0) { - int endIndex=line.tqfind(TQRegExp("[^\\d]"),index+1); + int endIndex=line.find(TQRegExp("[^\\d]"),index+1); if(endIndex<0) { endIndex=line.length(); } - else if( formatChars.tqcontains(line[endIndex]) ) + else if( formatChars.contains(line[endIndex]) ) { endIndex++; } if(endIndex - index > 1 ) { TQString arg = line.mid(index,endIndex-index); - if( arg.tqcontains( TQRegExp("\\d") ) ) { + if( arg.contains( TQRegExp("\\d") ) ) { non_gnu = true; } argList.append(arg); } - index=line.tqfind(TQRegExp("%."),endIndex); + index=line.find(TQRegExp("%."),endIndex); } if( item->pluralForm()==KDESpecific) { // FIXME: this is KDE specific - if( _checkPlurals && line.startsWith("_n:" ) && !argList.tqcontains("%n") ) + if( _checkPlurals && line.startsWith("_n:" ) && !argList.contains("%n") ) { argList.append("%n"); } @@ -180,7 +180,7 @@ bool ArgumentTool::run( const TQString& command, void* data, const TQString& dat line=(*i); - line.tqreplace(TQRegExp("\\n"),""); + line.replace(TQRegExp("\\n"),""); TQRegExp argdesc( "%((["+formatChars+"])" @@ -196,7 +196,7 @@ bool ArgumentTool::run( const TQString& command, void* data, const TQString& dat if( index == -1 ) break; // do not add a redundant argument, if it is non GNU - if( !non_gnu || !foundArgs.tqcontains( argdesc.cap(0) ) ) + if( !non_gnu || !foundArgs.contains( argdesc.cap(0) ) ) foundArgs.append( argdesc.cap( 0 ) ); } while( true ); @@ -205,7 +205,7 @@ bool ArgumentTool::run( const TQString& command, void* data, const TQString& dat if( non_gnu ) { for ( TQStringList::Iterator it = foundArgs.begin(); it != foundArgs.end(); ++it ) { - if( argList.tqfind( *it ) == argList.end() ) { + if( argList.find( *it ) == argList.end() ) { hasError = true; break; } else { @@ -227,7 +227,7 @@ bool ArgumentTool::run( const TQString& command, void* data, const TQString& dat *oit = TQString(); } else { // try to strip replacement - int index = (*it).tqfind( '$' ); + int index = (*it).find( '$' ); if( index == -1 ) { // there is no replacement, this is wrong hasError = true; |