diff options
Diffstat (limited to 'kompare')
23 files changed, 99 insertions, 99 deletions
diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp index a8c5e8f2..87e8ce2b 100644 --- a/kompare/komparenavtreepart/komparenavtreepart.cpp +++ b/kompare/komparenavtreepart/komparenavtreepart.cpp @@ -551,8 +551,8 @@ void KDirLVI::addModel( TQString& path, DiffModel* model, TQPtrDict<KDirLVI>* mo if ( !m_dirName.isEmpty() ) { - if ( path.tqfind( m_dirName ) > -1 ) - path = path.tqreplace( path.tqfind( m_dirName ), m_dirName.length(), "" ); + if ( path.find( m_dirName ) > -1 ) + path = path.replace( path.find( m_dirName ), m_dirName.length(), "" ); } // kdDebug(8105) << "Path after removal of own dir (\"" << m_dirName << "\") = " << path << endl; @@ -565,7 +565,7 @@ void KDirLVI::addModel( TQString& path, DiffModel* model, TQPtrDict<KDirLVI>* mo KDirLVI* child; - TQString dir = path.mid( 0, path.tqfind( "/", 0 ) + 1 ); + TQString dir = path.mid( 0, path.find( "/", 0 ) + 1 ); child = findChild( dir ); if ( !child ) { diff --git a/kompare/komparepart/komparelistview.cpp b/kompare/komparepart/komparelistview.cpp index 5bf8e910..f52191a6 100644 --- a/kompare/komparepart/komparelistview.cpp +++ b/kompare/komparepart/komparelistview.cpp @@ -154,7 +154,7 @@ int KompareListView::firstVisibleDifference() } if( item ) - return m_items.tqfindIndex( ((KompareListViewLineItem*)item)->diffItemParent() ); + return m_items.findIndex( ((KompareListViewLineItem*)item)->diffItemParent() ); return -1; } @@ -177,7 +177,7 @@ int KompareListView::lastVisibleDifference() } if( item ) - return m_items.tqfindIndex( ((KompareListViewLineItem*)item)->diffItemParent() ); + return m_items.findIndex( ((KompareListViewLineItem*)item)->diffItemParent() ); return -1; } @@ -658,7 +658,7 @@ void KompareListViewLineItem::paintText( TQPainter* p, const TQColor& bg, int co // kdDebug(8104) << "TextChunk = \"" << textChunk << "\"" << endl; // kdDebug(8104) << "c->offset() = " << c->offset() << endl; // kdDebug(8104) << "prevValue = " << prevValue << endl; - textChunk.tqreplace( TQChar('\t'), kompareListView()->spaces() ); + textChunk.replace( TQChar('\t'), kompareListView()->spaces() ); prevValue = m->offset(); if ( m->type() == Marker::End ) { @@ -688,7 +688,7 @@ void KompareListViewLineItem::paintText( TQPainter* p, const TQColor& bg, int co { // Still have to draw some string without changes textChunk = m_text->string().mid( prevValue, kMax( ( unsigned int )1, m_text->string().length() - prevValue ) ); - textChunk.tqreplace( TQChar('\t'), kompareListView()->spaces() ); + textChunk.replace( TQChar('\t'), kompareListView()->spaces() ); // kdDebug(8104) << "TextChunk = \"" << textChunk << "\"" << endl; TQFont font( p->font() ); font.setBold( false ); diff --git a/kompare/libdiff2/cvsdiffparser.cpp b/kompare/libdiff2/cvsdiffparser.cpp index f29e422c..47c79a0f 100644 --- a/kompare/libdiff2/cvsdiffparser.cpp +++ b/kompare/libdiff2/cvsdiffparser.cpp @@ -53,27 +53,27 @@ enum Kompare::Format CVSDiffParser::determineFormat() while( it != m_diffLines.end() ) { - if( (*it).tqfind( normalRE, 0 ) == 0 ) + if( (*it).find( normalRE, 0 ) == 0 ) { // kdDebug(8101) << "Difflines are from a Normal diff..." << endl; return Kompare::Normal; } - else if( (*it).tqfind( unifiedRE, 0 ) == 0 ) + else if( (*it).find( unifiedRE, 0 ) == 0 ) { // kdDebug(8101) << "Difflines are from a Unified diff..." << endl; return Kompare::Unified; } - else if( (*it).tqfind( contextRE, 0 ) == 0 ) + else if( (*it).find( contextRE, 0 ) == 0 ) { // kdDebug(8101) << "Difflines are from a Context diff..." << endl; return Kompare::Context; } - else if( (*it).tqfind( rcsRE, 0 ) == 0 ) + else if( (*it).find( rcsRE, 0 ) == 0 ) { // kdDebug(8101) << "Difflines are from a RCS diff..." << endl; return Kompare::RCS; } - else if( (*it).tqfind( edRE, 0 ) == 0 ) + else if( (*it).find( edRE, 0 ) == 0 ) { // kdDebug(8101) << "Difflines are from an ED diff..." << endl; return Kompare::Ed; diff --git a/kompare/libdiff2/diffmodel.cpp b/kompare/libdiff2/diffmodel.cpp index 438055c6..cd348dfc 100644 --- a/kompare/libdiff2/diffmodel.cpp +++ b/kompare/libdiff2/diffmodel.cpp @@ -79,10 +79,10 @@ void DiffModel::splitSourceInPathAndFileName() { int pos; - if( ( pos = m_source.tqfindRev( "/" ) ) >= 0 ) + if( ( pos = m_source.findRev( "/" ) ) >= 0 ) m_sourcePath = m_source.mid( 0, pos+1 ); - if( ( pos = m_source.tqfindRev( "/" ) ) >= 0 ) + if( ( pos = m_source.findRev( "/" ) ) >= 0 ) m_sourceFile = m_source.mid( pos+1, m_source.length() - pos ); else m_sourceFile = m_source; @@ -94,10 +94,10 @@ void DiffModel::splitDestinationInPathAndFileName() { int pos; - if( ( pos = m_destination.tqfindRev( "/" ) )>= 0 ) + if( ( pos = m_destination.findRev( "/" ) )>= 0 ) m_destinationPath = m_destination.mid( 0, pos+1 ); - if( ( pos = m_destination.tqfindRev( "/" ) ) >= 0 ) + if( ( pos = m_destination.findRev( "/" ) ) >= 0 ) m_destinationFile = m_destination.mid( pos+1, m_destination.length() - pos ); else m_destinationFile = m_source; @@ -393,10 +393,10 @@ bool DiffModel::setSelectedDifference( Difference* diff ) if ( diff != m_selectedDifference ) { - if ( ( m_differences.tqfindIndex( diff ) ) == -1 ) + if ( ( m_differences.findIndex( diff ) ) == -1 ) return false; // Dont set m_diffIndex if it cant be found - m_diffIndex = m_differences.tqfindIndex( diff ); + m_diffIndex = m_differences.findIndex( diff ); kdDebug( 8101 ) << "m_diffIndex = " << m_diffIndex << endl; m_selectedDifference = diff; } diff --git a/kompare/libdiff2/diffmodel.h b/kompare/libdiff2/diffmodel.h index 3467b55b..493403f2 100644 --- a/kompare/libdiff2/diffmodel.h +++ b/kompare/libdiff2/diffmodel.h @@ -61,7 +61,7 @@ public: DifferenceList* allDifferences(); - int findDifference( Difference* diff ) const { return m_differences.tqfindIndex( diff ); } + int findDifference( Difference* diff ) const { return m_differences.findIndex( diff ); } Difference* firstDifference(); Difference* lastDifference(); diff --git a/kompare/libdiff2/diffparser.cpp b/kompare/libdiff2/diffparser.cpp index b077ec20..d85256d2 100644 --- a/kompare/libdiff2/diffparser.cpp +++ b/kompare/libdiff2/diffparser.cpp @@ -49,27 +49,27 @@ enum Kompare::Format DiffParser::determineFormat() while( it != m_diffLines.end() ) { kdDebug(8101) << (*it) << endl; - if( (*it).tqfind( normalRE, 0 ) == 0 ) + if( (*it).find( normalRE, 0 ) == 0 ) { kdDebug(8101) << "Difflines are from a Normal diff..." << endl; return Kompare::Normal; } - else if( (*it).tqfind( unifiedRE, 0 ) == 0 ) + else if( (*it).find( unifiedRE, 0 ) == 0 ) { kdDebug(8101) << "Difflines are from a Unified diff..." << endl; return Kompare::Unified; } - else if( (*it).tqfind( contextRE, 0 ) == 0 ) + else if( (*it).find( contextRE, 0 ) == 0 ) { kdDebug(8101) << "Difflines are from a Context diff..." << endl; return Kompare::Context; } - else if( (*it).tqfind( rcsRE, 0 ) == 0 ) + else if( (*it).find( rcsRE, 0 ) == 0 ) { kdDebug(8101) << "Difflines are from an RCS diff..." << endl; return Kompare::RCS; } - else if( (*it).tqfind( edRE, 0 ) == 0 ) + else if( (*it).find( edRE, 0 ) == 0 ) { kdDebug(8101) << "Difflines are from an ED diff..." << endl; return Kompare::Ed; diff --git a/kompare/libdiff2/kompare.h b/kompare/libdiff2/kompare.h index 1c21db07..ded4c5a6 100644 --- a/kompare/libdiff2/kompare.h +++ b/kompare/libdiff2/kompare.h @@ -135,7 +135,7 @@ public: relative += "../"; } - relative += TQString( to ).tqreplace( 0, root.path(1).length(), "" ); + relative += TQString( to ).replace( 0, root.path(1).length(), "" ); return relative; } diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp index dc39c1bc..ada2b949 100644 --- a/kompare/libdiff2/komparemodellist.cpp +++ b/kompare/libdiff2/komparemodellist.cpp @@ -494,7 +494,7 @@ TQStringList KompareModelList::split( const TQString& fileContents ) #else const char split = '\n'; #endif - while ( ( pos = contents.tqfind( split, oldpos ) ) >= 0 ) + while ( ( pos = contents.find( split, oldpos ) ) >= 0 ) { list.append( contents.mid( oldpos, pos - oldpos + 1 ) ); oldpos = pos + 1; @@ -637,7 +637,7 @@ void KompareModelList::slotSelectionChanged( const Diff2::DiffModel* model, cons // kdDebug(8101) << kdBacktrace() << endl; m_selectedModel = const_cast<DiffModel*>(model); - m_modelIndex = m_models->tqfindIndex( m_selectedModel ); + m_modelIndex = m_models->findIndex( m_selectedModel ); kdDebug( 8101 ) << "m_modelIndex = " << m_modelIndex << endl; m_selectedDifference = const_cast<Difference*>(diff); @@ -1255,10 +1255,10 @@ bool KompareModelList::setSelectedModel( DiffModel* model ) if ( model != m_selectedModel ) { - if ( m_models->tqfindIndex( model ) == -1 ) + if ( m_models->findIndex( model ) == -1 ) return false; kdDebug(8101) << "m_selectedModel (was) = " << m_selectedModel << endl; - m_modelIndex = m_models->tqfindIndex( model ); + m_modelIndex = m_models->findIndex( model ); kdDebug(8101) << "m_selectedModel (is) = " << m_selectedModel << endl; m_selectedModel = model; } diff --git a/kompare/libdiff2/komparemodellist.h b/kompare/libdiff2/komparemodellist.h index 3b7b6bff..f4fb797e 100644 --- a/kompare/libdiff2/komparemodellist.h +++ b/kompare/libdiff2/komparemodellist.h @@ -88,11 +88,11 @@ public: int appliedCount() const; const DiffModel* modelAt( int i ) const { return *( m_models->at( i ) ); }; - int findModel( DiffModel* model ) const { return m_models->tqfindIndex( model ); }; + int findModel( DiffModel* model ) const { return m_models->findIndex( model ); }; bool isModified() const; - int currentModel() const { return m_models->tqfindIndex( m_selectedModel ); }; + int currentModel() const { return m_models->findIndex( m_selectedModel ); }; int currentDifference() const { return m_selectedModel ? m_selectedModel->findDifference( m_selectedDifference ) : -1; }; const DiffModel* selectedModel() const { return m_selectedModel; }; diff --git a/kompare/libdiff2/parser.cpp b/kompare/libdiff2/parser.cpp index 67386508..1e3efc8a 100644 --- a/kompare/libdiff2/parser.cpp +++ b/kompare/libdiff2/parser.cpp @@ -50,7 +50,7 @@ int Parser::cleanUpCrap( TQStringList& diffLines ) // correcting the advance of the iterator because of the remove --it; TQString temp( *it ); - temp.truncate( temp.tqfind( '\n' ) ); + temp.truncate( temp.find( '\n' ) ); *it = temp; ++nol; } diff --git a/kompare/libdiff2/perforceparser.cpp b/kompare/libdiff2/perforceparser.cpp index 59a2dae2..b0d54157 100644 --- a/kompare/libdiff2/perforceparser.cpp +++ b/kompare/libdiff2/perforceparser.cpp @@ -53,22 +53,22 @@ enum Kompare::Format PerforceParser::determineFormat() while( it != m_diffLines.end() ) { - if( (*it).tqfind( unifiedRE, 0 ) == 0 ) + if( (*it).find( unifiedRE, 0 ) == 0 ) { kdDebug(8101) << "Difflines are from a Unified diff..." << endl; return Kompare::Unified; } - else if( (*it).tqfind( contextRE, 0 ) == 0 ) + else if( (*it).find( contextRE, 0 ) == 0 ) { kdDebug(8101) << "Difflines are from a Context diff..." << endl; return Kompare::Context; } - else if( (*it).tqfind( normalRE, 0 ) == 0 ) + else if( (*it).find( normalRE, 0 ) == 0 ) { kdDebug(8101) << "Difflines are from a Normal diff..." << endl; return Kompare::Normal; } - else if( (*it).tqfind( rcsRE, 0 ) == 0 ) + else if( (*it).find( rcsRE, 0 ) == 0 ) { kdDebug(8101) << "Difflines are from a RCS diff..." << endl; return Kompare::RCS; diff --git a/kompare/tests/cvsdiff/context.diff b/kompare/tests/cvsdiff/context.diff index eab790d0..8773139c 100644 --- a/kompare/tests/cvsdiff/context.diff +++ b/kompare/tests/cvsdiff/context.diff @@ -13,7 +13,7 @@ diff -c -r1.2 dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) { QString f = func; // Qt is better with tqunicode strings, so use one. - int left = f.tqfind( '(' ); + int left = f.find( '(' ); --- 36,42 ---- static bool bAppIdOnly = 0; static bool bLaunchApp = 0; @@ -21,7 +21,7 @@ diff -c -r1.2 dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { QString f = func; // Qt is better with tqunicode strings, so use one. - int left = f.tqfind( '(' ); + int left = f.find( '(' ); *************** *** 118,124 **** f = fc; diff --git a/kompare/tests/cvsdiff/contextm.diff b/kompare/tests/cvsdiff/contextm.diff index cde99b5e..090c4c71 100644 --- a/kompare/tests/cvsdiff/contextm.diff +++ b/kompare/tests/cvsdiff/contextm.diff @@ -83,8 +83,8 @@ diff -c -r1.26 dcop.cpp { - QString f = func; // Qt is better with tqunicode strings, so use one. - int left = f.tqfind( '(' ); - int right = f.tqfind( ')' ); + int left = f.find( '(' ); + int right = f.find( ')' ); --- 146,153 ---- } } @@ -92,8 +92,8 @@ diff -c -r1.26 dcop.cpp ! void callFunction( const char* app, const char* obj, const char* func, const QCStringList args ) { QString f = func; // Qt is better with tqunicode strings, so use one. - int left = f.tqfind( '(' ); - int right = f.tqfind( ')' ); + int left = f.find( '(' ); + int right = f.find( ')' ); *************** *** 136,142 **** bool ok = false; @@ -116,7 +116,7 @@ diff -c -r1.26 dcop.cpp if ( l > 0 && (*it).mid( s, l - s ) == func ) { realfunc = (*it).mid( s ); -! int a = (*it).tqcontains(','); +! int a = (*it).contains(','); ! if ( ( a == 0 && argc == 0) || ( a > 0 && a + 1 == argc ) ) break; } @@ -127,12 +127,12 @@ diff -c -r1.26 dcop.cpp ! exit(1); } f = realfunc; - left = f.tqfind( '(' ); + left = f.find( '(' ); --- 180,195 ---- if ( l > 0 && (*it).mid( s, l - s ) == func ) { realfunc = (*it).mid( s ); -! uint a = (*it).tqcontains(','); +! uint a = (*it).contains(','); ! if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) break; } @@ -144,7 +144,7 @@ diff -c -r1.26 dcop.cpp ! return; } f = realfunc; - left = f.tqfind( '(' ); + left = f.find( '(' ); *************** *** 243,253 **** QCString replyType; @@ -363,13 +363,13 @@ diff -c -r1.26 dcop.cpp QCString function; ! QCStringList params; ! DCOPClient *client = 0L; -! if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) +! if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) { ! // WARNING: This part (until the closing '}') could very ! // well be broken now. As I don't know how to trigger and test ! // dcoprefs this code is *not* tested. It compiles and it looks ! // ok to me, but that's all I can say - Martijn (2001/12/24) -! int delimPos = args[ 0 ].tqfindRev( ',' ); +! int delimPos = args[ 0 ].findRev( ',' ); ! if( delimPos == -1 ) ! { ! cerr << "Error: '" << args[ 0 ] @@ -748,7 +748,7 @@ diff -c -r1.2 dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) { QString f = func; // Qt is better with tqunicode strings, so use one. - int left = f.tqfind( '(' ); + int left = f.find( '(' ); --- 36,42 ---- static bool bAppIdOnly = 0; static bool bLaunchApp = 0; @@ -756,7 +756,7 @@ diff -c -r1.2 dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { QString f = func; // Qt is better with tqunicode strings, so use one. - int left = f.tqfind( '(' ); + int left = f.find( '(' ); *************** *** 118,124 **** f = fc; diff --git a/kompare/tests/cvsdiff/edm.diff b/kompare/tests/cvsdiff/edm.diff index a5672a1c..a3c7d41a 100644 --- a/kompare/tests/cvsdiff/edm.diff +++ b/kompare/tests/cvsdiff/edm.diff @@ -352,7 +352,7 @@ int main( int argc, char** argv ) // well be broken now. As I don't know how to trigger and test // dcoprefs this code is *not* tested. It compiles and it looks // ok to me, but that's all I can say - Martijn (2001/12/24) - int delimPos = args[ 0 ].tqfindRev( ',' ); + int delimPos = args[ 0 ].findRev( ',' ); if( delimPos == -1 ) { cerr << "Error: '" << args[ 0 ] @@ -376,7 +376,7 @@ int main( int argc, char** argv ) 286,287c QCStringList params; DCOPClient *client = 0L; - if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) + if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) . 282a /** @@ -498,7 +498,7 @@ void showHelp( int exitCode = 0 ) return; . 156,157c - uint a = (*it).tqcontains(','); + uint a = (*it).contains(','); if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) . 139c diff --git a/kompare/tests/cvsdiff/normalm.diff b/kompare/tests/cvsdiff/normalm.diff index b191cb2c..ee47044e 100644 --- a/kompare/tests/cvsdiff/normalm.diff +++ b/kompare/tests/cvsdiff/normalm.diff @@ -60,10 +60,10 @@ diff -r1.26 dcop.cpp --- > if ( !ok && args.isEmpty() ) 156,157c183,184 -< int a = (*it).tqcontains(','); +< int a = (*it).contains(','); < if ( ( a == 0 && argc == 0) || ( a > 0 && a + 1 == argc ) ) --- -> uint a = (*it).tqcontains(','); +> uint a = (*it).contains(','); > if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) 164c191,192 < exit(1); @@ -201,7 +201,7 @@ diff -r1.26 dcop.cpp --- > QCStringList params; > DCOPClient *client = 0L; -> if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) +> if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) 289,304c406,429 < char *delim = strchr(argv[1], ','); < if (!delim) @@ -224,7 +224,7 @@ diff -r1.26 dcop.cpp > // well be broken now. As I don't know how to trigger and test > // dcoprefs this code is *not* tested. It compiles and it looks > // ok to me, but that's all I can say - Martijn (2001/12/24) -> int delimPos = args[ 0 ].tqfindRev( ',' ); +> int delimPos = args[ 0 ].findRev( ',' ); > if( delimPos == -1 ) > { > cerr << "Error: '" << args[ 0 ] diff --git a/kompare/tests/cvsdiff/rcsm.diff b/kompare/tests/cvsdiff/rcsm.diff index a67d7e54..9b8f2ae3 100644 --- a/kompare/tests/cvsdiff/rcsm.diff +++ b/kompare/tests/cvsdiff/rcsm.diff @@ -53,7 +53,7 @@ a139 1 if ( !ok && args.isEmpty() ) d156 2 a157 2 - uint a = (*it).tqcontains(','); + uint a = (*it).contains(','); if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) d164 1 a164 2 @@ -175,14 +175,14 @@ d286 2 a287 3 QCStringList params; DCOPClient *client = 0L; - if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) + if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) d289 16 a304 24 // WARNING: This part (until the closing '}') could very // well be broken now. As I don't know how to trigger and test // dcoprefs this code is *not* tested. It compiles and it looks // ok to me, but that's all I can say - Martijn (2001/12/24) - int delimPos = args[ 0 ].tqfindRev( ',' ); + int delimPos = args[ 0 ].findRev( ',' ); if( delimPos == -1 ) { cerr << "Error: '" << args[ 0 ] diff --git a/kompare/tests/cvsdiff/unified.diff b/kompare/tests/cvsdiff/unified.diff index ab69a295..c9e56db8 100644 --- a/kompare/tests/cvsdiff/unified.diff +++ b/kompare/tests/cvsdiff/unified.diff @@ -13,7 +13,7 @@ diff -u -r1.2 dcopfind.cpp +bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { QString f = func; // Qt is better with tqunicode strings, so use one. - int left = f.tqfind( '(' ); + int left = f.find( '(' ); @@ -118,7 +118,7 @@ f = fc; } diff --git a/kompare/tests/cvsdiff/unifiedm.diff b/kompare/tests/cvsdiff/unifiedm.diff index b4e8b2a1..3331435c 100644 --- a/kompare/tests/cvsdiff/unifiedm.diff +++ b/kompare/tests/cvsdiff/unifiedm.diff @@ -67,8 +67,8 @@ diff -u -r1.26 dcop.cpp { - QString f = func; // Qt is better with tqunicode strings, so use one. - int left = f.tqfind( '(' ); - int right = f.tqfind( ')' ); + int left = f.find( '(' ); + int right = f.find( ')' ); @@ -136,7 +163,7 @@ bool ok = false; QCStringList funcs = dcop->remoteFunctions( app, obj, &ok ); @@ -82,9 +82,9 @@ diff -u -r1.26 dcop.cpp if ( l > 0 && (*it).mid( s, l - s ) == func ) { realfunc = (*it).mid( s ); -- int a = (*it).tqcontains(','); +- int a = (*it).contains(','); - if ( ( a == 0 && argc == 0) || ( a > 0 && a + 1 == argc ) ) -+ uint a = (*it).tqcontains(','); ++ uint a = (*it).contains(','); + if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) break; } @@ -97,7 +97,7 @@ diff -u -r1.26 dcop.cpp + return; } f = realfunc; - left = f.tqfind( '(' ); + left = f.find( '(' ); @@ -243,11 +271,12 @@ QCString replyType; QDataStream arg(data, IO_WriteOnly); @@ -237,7 +237,7 @@ diff -u -r1.26 dcop.cpp - if ((argc > 1) && (strncmp(argv[1], "DCOPRef(", 8)) == 0) + QCStringList params; + DCOPClient *client = 0L; -+ if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) ++ if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) { - char *delim = strchr(argv[1], ','); - if (!delim) @@ -259,7 +259,7 @@ diff -u -r1.26 dcop.cpp + // well be broken now. As I don't know how to trigger and test + // dcoprefs this code is *not* tested. It compiles and it looks + // ok to me, but that's all I can say - Martijn (2001/12/24) -+ int delimPos = args[ 0 ].tqfindRev( ',' ); ++ int delimPos = args[ 0 ].findRev( ',' ); + if( delimPos == -1 ) + { + cerr << "Error: '" << args[ 0 ] @@ -669,7 +669,7 @@ diff -u -r1.2 dcopfind.cpp +bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { QString f = func; // Qt is better with tqunicode strings, so use one. - int left = f.tqfind( '(' ); + int left = f.find( '(' ); @@ -118,7 +118,7 @@ f = fc; } diff --git a/kompare/tests/diff/contextm.diff b/kompare/tests/diff/contextm.diff index 1833fa06..76c3f974 100644 --- a/kompare/tests/diff/contextm.diff +++ b/kompare/tests/diff/contextm.diff @@ -79,8 +79,8 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp { - QString f = func; // Qt is better with tqunicode strings, so use one. - int left = f.tqfind( '(' ); - int right = f.tqfind( ')' ); + int left = f.find( '(' ); + int right = f.find( ')' ); --- 146,153 ---- } } @@ -88,8 +88,8 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp ! void callFunction( const char* app, const char* obj, const char* func, const QCStringList args ) { QString f = func; // Qt is better with tqunicode strings, so use one. - int left = f.tqfind( '(' ); - int right = f.tqfind( ')' ); + int left = f.find( '(' ); + int right = f.find( ')' ); *************** *** 136,142 **** bool ok = false; @@ -112,7 +112,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp if ( l > 0 && (*it).mid( s, l - s ) == func ) { realfunc = (*it).mid( s ); -! int a = (*it).tqcontains(','); +! int a = (*it).contains(','); ! if ( ( a == 0 && argc == 0) || ( a > 0 && a + 1 == argc ) ) break; } @@ -123,12 +123,12 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp ! exit(1); } f = realfunc; - left = f.tqfind( '(' ); + left = f.find( '(' ); --- 180,195 ---- if ( l > 0 && (*it).mid( s, l - s ) == func ) { realfunc = (*it).mid( s ); -! uint a = (*it).tqcontains(','); +! uint a = (*it).contains(','); ! if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) break; } @@ -140,7 +140,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp ! return; } f = realfunc; - left = f.tqfind( '(' ); + left = f.find( '(' ); *************** *** 243,253 **** QCString replyType; @@ -357,13 +357,13 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp QCString function; ! QCStringList params; ! DCOPClient *client = 0L; -! if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) +! if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) { ! // WARNING: This part (until the closing '}') could very ! // well be broken now. As I don't know how to trigger and test ! // dcoprefs this code is *not* tested. It compiles and it looks ! // ok to me, but that's all I can say - Martijn (2001/12/24) -! int delimPos = args[ 0 ].tqfindRev( ',' ); +! int delimPos = args[ 0 ].findRev( ',' ); ! if( delimPos == -1 ) ! { ! cerr << "Error: '" << args[ 0 ] @@ -738,7 +738,7 @@ diff -cr dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) { QString f = func; // Qt is better with tqunicode strings, so use one. - int left = f.tqfind( '(' ); + int left = f.find( '(' ); --- 36,42 ---- static bool bAppIdOnly = 0; static bool bLaunchApp = 0; @@ -746,7 +746,7 @@ diff -cr dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { QString f = func; // Qt is better with tqunicode strings, so use one. - int left = f.tqfind( '(' ); + int left = f.find( '(' ); *************** *** 118,124 **** f = fc; diff --git a/kompare/tests/diff/edm.diff b/kompare/tests/diff/edm.diff index e2ad0672..2d802765 100644 --- a/kompare/tests/diff/edm.diff +++ b/kompare/tests/diff/edm.diff @@ -348,7 +348,7 @@ int main( int argc, char** argv ) // well be broken now. As I don't know how to trigger and test // dcoprefs this code is *not* tested. It compiles and it looks // ok to me, but that's all I can say - Martijn (2001/12/24) - int delimPos = args[ 0 ].tqfindRev( ',' ); + int delimPos = args[ 0 ].findRev( ',' ); if( delimPos == -1 ) { cerr << "Error: '" << args[ 0 ] @@ -372,7 +372,7 @@ int main( int argc, char** argv ) 286,287c QCStringList params; DCOPClient *client = 0L; - if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) + if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) . 282a /** @@ -494,7 +494,7 @@ void showHelp( int exitCode = 0 ) return; . 156,157c - uint a = (*it).tqcontains(','); + uint a = (*it).contains(','); if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) . 139c diff --git a/kompare/tests/diff/normalm.diff b/kompare/tests/diff/normalm.diff index c08da23b..2ce10d6a 100644 --- a/kompare/tests/diff/normalm.diff +++ b/kompare/tests/diff/normalm.diff @@ -56,10 +56,10 @@ diff -r dcop/client/dcop.cpp dcop2/client/dcop.cpp --- > if ( !ok && args.isEmpty() ) 156,157c183,184 -< int a = (*it).tqcontains(','); +< int a = (*it).contains(','); < if ( ( a == 0 && argc == 0) || ( a > 0 && a + 1 == argc ) ) --- -> uint a = (*it).tqcontains(','); +> uint a = (*it).contains(','); > if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) 164c191,192 < exit(1); @@ -197,7 +197,7 @@ diff -r dcop/client/dcop.cpp dcop2/client/dcop.cpp --- > QCStringList params; > DCOPClient *client = 0L; -> if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) +> if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) 289,304c406,429 < char *delim = strchr(argv[1], ','); < if (!delim) @@ -220,7 +220,7 @@ diff -r dcop/client/dcop.cpp dcop2/client/dcop.cpp > // well be broken now. As I don't know how to trigger and test > // dcoprefs this code is *not* tested. It compiles and it looks > // ok to me, but that's all I can say - Martijn (2001/12/24) -> int delimPos = args[ 0 ].tqfindRev( ',' ); +> int delimPos = args[ 0 ].findRev( ',' ); > if( delimPos == -1 ) > { > cerr << "Error: '" << args[ 0 ] diff --git a/kompare/tests/diff/rcsm.diff b/kompare/tests/diff/rcsm.diff index 9df85d76..ac8061f5 100644 --- a/kompare/tests/diff/rcsm.diff +++ b/kompare/tests/diff/rcsm.diff @@ -49,7 +49,7 @@ a139 1 if ( !ok && args.isEmpty() ) d156 2 a157 2 - uint a = (*it).tqcontains(','); + uint a = (*it).contains(','); if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) d164 1 a164 2 @@ -171,14 +171,14 @@ d286 2 a287 3 QCStringList params; DCOPClient *client = 0L; - if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) + if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) d289 16 a304 24 // WARNING: This part (until the closing '}') could very // well be broken now. As I don't know how to trigger and test // dcoprefs this code is *not* tested. It compiles and it looks // ok to me, but that's all I can say - Martijn (2001/12/24) - int delimPos = args[ 0 ].tqfindRev( ',' ); + int delimPos = args[ 0 ].findRev( ',' ); if( delimPos == -1 ) { cerr << "Error: '" << args[ 0 ] diff --git a/kompare/tests/diff/unifiedm.diff b/kompare/tests/diff/unifiedm.diff index e4fbd157..4296e44f 100644 --- a/kompare/tests/diff/unifiedm.diff +++ b/kompare/tests/diff/unifiedm.diff @@ -63,8 +63,8 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp { - QString f = func; // Qt is better with tqunicode strings, so use one. - int left = f.tqfind( '(' ); - int right = f.tqfind( ')' ); + int left = f.find( '(' ); + int right = f.find( ')' ); @@ -136,7 +163,7 @@ bool ok = false; QCStringList funcs = dcop->remoteFunctions( app, obj, &ok ); @@ -78,9 +78,9 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp if ( l > 0 && (*it).mid( s, l - s ) == func ) { realfunc = (*it).mid( s ); -- int a = (*it).tqcontains(','); +- int a = (*it).contains(','); - if ( ( a == 0 && argc == 0) || ( a > 0 && a + 1 == argc ) ) -+ uint a = (*it).tqcontains(','); ++ uint a = (*it).contains(','); + if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) break; } @@ -93,7 +93,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp + return; } f = realfunc; - left = f.tqfind( '(' ); + left = f.find( '(' ); @@ -243,11 +271,12 @@ QCString replyType; QDataStream arg(data, IO_WriteOnly); @@ -232,7 +232,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp - if ((argc > 1) && (strncmp(argv[1], "DCOPRef(", 8)) == 0) + QCStringList params; + DCOPClient *client = 0L; -+ if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) ++ if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) { - char *delim = strchr(argv[1], ','); - if (!delim) @@ -254,7 +254,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp + // well be broken now. As I don't know how to trigger and test + // dcoprefs this code is *not* tested. It compiles and it looks + // ok to me, but that's all I can say - Martijn (2001/12/24) -+ int delimPos = args[ 0 ].tqfindRev( ',' ); ++ int delimPos = args[ 0 ].findRev( ',' ); + if( delimPos == -1 ) + { + cerr << "Error: '" << args[ 0 ] @@ -660,7 +660,7 @@ diff -aur dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp +bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { QString f = func; // Qt is better with tqunicode strings, so use one. - int left = f.tqfind( '(' ); + int left = f.find( '(' ); @@ -118,7 +118,7 @@ f = fc; } |