From dd844d7919e7f0f95c010378e7af1434ea904fff Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:36:05 -0600 Subject: Rename additional global TQt functions --- kompare/tests/diff/normalm.diff | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'kompare/tests/diff/normalm.diff') diff --git a/kompare/tests/diff/normalm.diff b/kompare/tests/diff/normalm.diff index 2ce10d6a..d3c9d893 100644 --- a/kompare/tests/diff/normalm.diff +++ b/kompare/tests/diff/normalm.diff @@ -649,7 +649,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp < type = "QValueList"; < if (i >= argc) < { -< qWarning("Not enough arguments."); +< tqWarning("Not enough arguments."); < exit(1); < } < QString s = QString::fromLocal8Bit(argv[i]); @@ -721,7 +721,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp > type = "QValueList"; > if( i > args.count() ) > { -> qWarning("Not enough arguments."); +> tqWarning("Not enough arguments."); > exit(1); > } > QString s = QString::fromLocal8Bit( args[ i ] ); @@ -732,7 +732,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/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; @@ -744,14 +744,14 @@ diff -r dcop/client/marshall.cpp dcop2/client/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); < } --- @@ -822,7 +822,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/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 ) @@ -835,7 +835,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/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 ) @@ -843,7 +843,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/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++; -- cgit v1.2.3