From dd844d7919e7f0f95c010378e7af1434ea904fff Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 1 Mar 2012 13:36:05 -0600
Subject: Rename additional global TQt functions

---
 kompare/tests/diff/unifiedm.diff | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'kompare/tests/diff/unifiedm.diff')

diff --git a/kompare/tests/diff/unifiedm.diff b/kompare/tests/diff/unifiedm.diff
index 7763ce5e..85adad04 100644
--- a/kompare/tests/diff/unifiedm.diff
+++ b/kompare/tests/diff/unifiedm.diff
@@ -87,7 +87,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp
  	}
  	if ( realfunc.isEmpty() )
  	{
- 	    qWarning("no such function");
+ 	    tqWarning("no such function");
 -            exit(1);
 +//            exit(1);
 +	    return;
@@ -109,7 +109,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp
 +
 +    if ( i != args.count() )
 +    {
- 	qWarning( "arguments do not match" );
+ 	tqWarning( "arguments do not match" );
  	exit(1);
      }
 @@ -266,78 +295,479 @@
@@ -667,7 +667,7 @@ diff -aur dcop/client/dcopfind.cpp dcop2/client/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 @@
@@ -679,7 +679,7 @@ diff -aur dcop/client/dcopfind.cpp dcop2/client/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 @@
@@ -711,7 +711,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp
 -           type = "QValueList<QCString>";
 -	if (i >= argc)
 -	{
--	    qWarning("Not enough arguments.");
+-	    tqWarning("Not enough arguments.");
 -            exit(1);
 -        }       
 -        QString s = QString::fromLocal8Bit(argv[i]);
@@ -782,7 +782,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/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 ] );
@@ -793,7 +793,7 @@ diff -aur 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;
@@ -805,14 +805,14 @@ diff -aur 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);
 -	}
 +    if ( type == "int" )
@@ -882,7 +882,7 @@ diff -aur 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 )
@@ -895,7 +895,7 @@ diff -aur 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 )
@@ -903,7 +903,7 @@ diff -aur 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