diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-01 13:36:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-01 13:36:05 -0600 |
| commit | dd844d7919e7f0f95c010378e7af1434ea904fff (patch) | |
| tree | 50727ca63550e4397ff76e4d039c162e225d59fc /kompare/tests/cvsdiff/unifiedm.diff | |
| parent | 7df4eaa9f8fa84d2b859cc59d21134cc2334651c (diff) | |
| download | tdesdk-dd844d7919e7f0f95c010378e7af1434ea904fff.tar.gz tdesdk-dd844d7919e7f0f95c010378e7af1434ea904fff.zip | |
Rename additional global TQt functions
Diffstat (limited to 'kompare/tests/cvsdiff/unifiedm.diff')
| -rw-r--r-- | kompare/tests/cvsdiff/unifiedm.diff | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/kompare/tests/cvsdiff/unifiedm.diff b/kompare/tests/cvsdiff/unifiedm.diff index e6a6e040..a459066e 100644 --- a/kompare/tests/cvsdiff/unifiedm.diff +++ b/kompare/tests/cvsdiff/unifiedm.diff @@ -91,7 +91,7 @@ diff -u -r1.26 dcop.cpp } if ( realfunc.isEmpty() ) { - qWarning("no such function"); + tqWarning("no such function"); - exit(1); +// exit(1); + return; @@ -113,7 +113,7 @@ diff -u -r1.26 dcop.cpp + + if ( i != args.count() ) + { - qWarning( "arguments do not match" ); + tqWarning( "arguments do not match" ); exit(1); } @@ -265,79 +294,480 @@ @@ -676,7 +676,7 @@ diff -u -r1.2 dcopfind.cpp - if ( (int) types.count() != argc ) { + if ( types.count() != args.count() ) { - qWarning( "arguments do not match" ); + tqWarning( "arguments do not match" ); exit(1); } @@ -128,9 +128,9 @@ @@ -688,7 +688,7 @@ diff -u -r1.2 dcopfind.cpp } - if ( (int) i != argc ) { + if ( (uint) i != args.count() ) { - qWarning( "arguments do not match" ); + tqWarning( "arguments do not match" ); exit(1); } @@ -221,7 +221,11 @@ @@ -724,7 +724,7 @@ diff -u -r1.3 marshall.cpp - type = "QValueList<QCString>"; - if (i >= argc) - { -- qWarning("Not enough arguments."); +- tqWarning("Not enough arguments."); - exit(1); - } - QString s = QString::fromLocal8Bit(argv[i]); @@ -795,7 +795,7 @@ diff -u -r1.3 marshall.cpp + type = "QValueList<QCString>"; + if( i > args.count() ) + { -+ qWarning("Not enough arguments."); ++ tqWarning("Not enough arguments."); + exit(1); + } + QString s = QString::fromLocal8Bit( args[ i ] ); @@ -806,7 +806,7 @@ diff -u -r1.3 marshall.cpp - while (true) { - if (j >= argc) - { -- qWarning("List end-delimiter '%s' not found.", delim.latin1()); +- tqWarning("List end-delimiter '%s' not found.", delim.latin1()); - exit(1); - } - if (argv[j] == delim) break; @@ -818,14 +818,14 @@ diff -u -r1.3 marshall.cpp - while (true) { - if (i >= argc) - { -- qWarning("List end-delimiter '%s' not found.", delim.latin1()); +- tqWarning("List end-delimiter '%s' not found.", delim.latin1()); - exit(1); - } - if (argv[i] == delim) break; - marshall(arg, argc, argv, i, type); - } - } else { -- qWarning( "cannot handle datatype '%s'", type.latin1() ); +- tqWarning( "cannot handle datatype '%s'", type.latin1() ); - exit(1); - } + if ( type == "int" ) @@ -895,7 +895,7 @@ diff -u -r1.3 marshall.cpp + while (true) { + if( j > args.count() ) + { -+ qWarning("List end-delimiter '%s' not found.", delim.latin1()); ++ tqWarning("List end-delimiter '%s' not found.", delim.latin1()); + exit(1); + } + if( QString::fromLocal8Bit( args[ j ] ) == delim ) @@ -908,7 +908,7 @@ diff -u -r1.3 marshall.cpp + while (true) { + if( i > args.count() ) + { -+ qWarning("List end-delimiter '%s' not found.", delim.latin1()); ++ tqWarning("List end-delimiter '%s' not found.", delim.latin1()); + exit(1); + } + if( QString::fromLocal8Bit( args[ i ] ) == delim ) @@ -916,7 +916,7 @@ diff -u -r1.3 marshall.cpp + marshall( arg, args, i, type ); + } + } else { -+ qWarning( "cannot handle datatype '%s'", type.latin1() ); ++ tqWarning( "cannot handle datatype '%s'", type.latin1() ); + exit(1); + } + i++; |