tests/cvsdiff/context.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 -c -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:13
0008 ***************
0009 *** 36,42 ****
0010   static bool bAppIdOnly = 0;
0011   static bool bLaunchApp = 0;
0012
0013 ! bool findObject( const char* app, const char* obj, const char* func, int argc, char** args )
0014   {
0015       QString f = func; // Qt is better with unicode strings, so use one.
0016       int left = f.find( '(' );
0017 --- 36,42 ----
0018   static bool bAppIdOnly = 0;
0019   static bool bLaunchApp = 0;
0020
0021 ! bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
0022   {
0023       QString f = func; // Qt is better with unicode strings, so use one.
0024       int left = f.find( '(' );
0025 ***************
0026 *** 118,124 ****
0027         f = fc;
0028       }
0029
0030 !     if ( (int) types.count() != argc ) {
0031         qWarning( "arguments do not match" );
0032         exit(1);
0033       }
0034 --- 118,124 ----
0035         f = fc;
0036       }
0037
0038 !     if ( types.count() != args.count() ) {
0039         qWarning( "arguments do not match" );
0040         exit(1);
0041       }
0042 ***************
0043 *** 128,136 ****
0044
0045       int i = 0;
0046       for ( QStringList::Iterator it = types.begin(); it != types.end(); ++it ) {
0047 !         marshall(arg, argc, args, i, *it);
0048       }
0049 !     if ( (int) i != argc ) {
0050         qWarning( "arguments do not match" );
0051         exit(1);
0052       }
0053 --- 128,136 ----
0054
0055       int i = 0;
0056       for ( QStringList::Iterator it = types.begin(); it != types.end(); ++it ) {
0057 !         marshall(arg, args, i, *it);
0058       }
0059 !     if ( (uint) i != args.count() ) {
0060         qWarning( "arguments do not match" );
0061         exit(1);
0062       }
0063 ***************
0064 *** 221,227 ****
0065          argc = 0;
0066       }
0067
0068 !     findObject( app, objid, function, argc, args );
0069
0070       return 0;
0071   }
0072 --- 221,231 ----
0073          argc = 0;
0074       }
0075
0076 !     QCStringList params;
0077 !     for( int i = 0; i < argc; i++ )
0078 !           params.append( args[ i ] );
0079 !
0080 !     findObject( app, objid, function, params );
0081
0082       return 0;
0083   }