tests/cvsdiff/unified.diff

0001 Index: client/dcopfind.cpp
0002 ===================================================================
0003 RCS file: /home/kde/kdelibs/dcop/client/dcopfind.cpp,v
0004 retrieving revision 1.2
0005 diff -u -r1.2 dcopfind.cpp
0006 --- client/dcopfind.cpp 2001/10/31 01:17:39     1.2
0007 +++ client/dcopfind.cpp 2002/01/16 18:07:51
0008 @@ -36,7 +36,7 @@
0009  static bool bAppIdOnly = 0;
0010  static bool bLaunchApp = 0;
0011
0012 -bool findObject( const char* app, const char* obj, const char* func, int argc, char** args )
0013 +bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
0014  {
0015      QString f = func; // Qt is better with unicode strings, so use one.
0016      int left = f.find( '(' );
0017 @@ -118,7 +118,7 @@
0018         f = fc;
0019      }
0020
0021 -    if ( (int) types.count() != argc ) {
0022 +    if ( types.count() != args.count() ) {
0023         qWarning( "arguments do not match" );
0024         exit(1);
0025      }
0026 @@ -128,9 +128,9 @@
0027
0028      int i = 0;
0029      for ( QStringList::Iterator it = types.begin(); it != types.end(); ++it ) {
0030 -        marshall(arg, argc, args, i, *it);
0031 +        marshall(arg, args, i, *it);
0032      }
0033 -    if ( (int) i != argc ) {
0034 +    if ( (uint) i != args.count() ) {
0035         qWarning( "arguments do not match" );
0036         exit(1);
0037      }
0038 @@ -221,7 +221,11 @@
0039         argc = 0;
0040      }
0041
0042 -    findObject( app, objid, function, argc, args );
0043 +    QCStringList params;
0044 +    for( int i = 0; i < argc; i++ )
0045 +           params.append( args[ i ] );
0046 +
0047 +    findObject( app, objid, function, params );
0048
0049      return 0;
0050  }