summaryrefslogtreecommitdiffstats
path: root/kompare/tests/cvsdiff/context.diff
blob: c9a7f85532aaf362deaf53e9484d9cb54cb36658 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
Index: client/dcopfind.cpp
===================================================================
RCS file: /home/kde/kdelibs/dcop/client/dcopfind.cpp,v
retrieving revision 1.2
diff -c -r1.2 dcopfind.cpp
*** client/dcopfind.cpp	2001/10/31 01:17:39	1.2
--- client/dcopfind.cpp	2002/01/16 18:07:13
***************
*** 36,42 ****
  static bool bAppIdOnly = 0;
  static bool bLaunchApp = 0;
  
! bool findObject( const char* app, const char* obj, const char* func, int argc, char** args )
  {
      QString f = func; // Qt is better with unicode strings, so use one.
      int left = f.find( '(' );
--- 36,42 ----
  static bool bAppIdOnly = 0;
  static bool bLaunchApp = 0;
  
! bool findObject( const char* app, const char* obj, const char* func, QCStringList args )
  {
      QString f = func; // Qt is better with unicode strings, so use one.
      int left = f.find( '(' );
***************
*** 118,124 ****
  	f = fc;
      }
  
!     if ( (int) types.count() != argc ) {
  	qWarning( "arguments do not match" );
  	exit(1);
      }
--- 118,124 ----
  	f = fc;
      }
  
!     if ( types.count() != args.count() ) {
  	qWarning( "arguments do not match" );
  	exit(1);
      }
***************
*** 128,136 ****
  
      int i = 0;
      for ( QStringList::Iterator it = types.begin(); it != types.end(); ++it ) {
!         marshall(arg, argc, args, i, *it);
      }
!     if ( (int) i != argc ) {
  	qWarning( "arguments do not match" );
  	exit(1);
      }
--- 128,136 ----
  
      int i = 0;
      for ( QStringList::Iterator it = types.begin(); it != types.end(); ++it ) {
!         marshall(arg, args, i, *it);
      }
!     if ( (uint) i != args.count() ) {
  	qWarning( "arguments do not match" );
  	exit(1);
      }
***************
*** 221,227 ****
         argc = 0;
      }
  
!     findObject( app, objid, function, argc, args );
  
      return 0;
  }
--- 221,231 ----
         argc = 0;
      }
  
!     QCStringList params;
!     for( int i = 0; i < argc; i++ )
! 	    params.append( args[ i ] );
!     
!     findObject( app, objid, function, params );
  
      return 0;
  }