From 3b34e5cf56262c9f54a3bcf02ee5ad93ca0fb05b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 10:00:09 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit d6331f1b56eb6dca7a1950658b2932f208015da0.
---
 kompare/tests/diff/contextm.diff | 8 ++++----
 kompare/tests/diff/unifiedm.diff | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kompare/tests/diff')

diff --git a/kompare/tests/diff/contextm.diff b/kompare/tests/diff/contextm.diff
index 38db371e..76c3f974 100644
--- a/kompare/tests/diff/contextm.diff
+++ b/kompare/tests/diff/contextm.diff
@@ -78,7 +78,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp
 ! void callFunction( 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.
+      QString f = func; // Qt is better with tqunicode strings, so use one.
       int left = f.find( '(' );
       int right = f.find( ')' );
 --- 146,153 ----
@@ -87,7 +87,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp
   
 ! void callFunction( const char* app, const char* obj, const char* func, const QCStringList args )
   {
-      QString f = func; // Qt is better with unicode strings, so use one.
+      QString f = func; // Qt is better with tqunicode strings, so use one.
       int left = f.find( '(' );
       int right = f.find( ')' );
 ***************
@@ -737,7 +737,7 @@ diff -cr dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp
   
 ! 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.
+      QString f = func; // Qt is better with tqunicode strings, so use one.
       int left = f.find( '(' );
 --- 36,42 ----
   static bool bAppIdOnly = 0;
@@ -745,7 +745,7 @@ diff -cr dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp
   
 ! 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.
+      QString f = func; // Qt is better with tqunicode strings, so use one.
       int left = f.find( '(' );
 ***************
 *** 118,124 ****
diff --git a/kompare/tests/diff/unifiedm.diff b/kompare/tests/diff/unifiedm.diff
index 7763ce5e..4296e44f 100644
--- a/kompare/tests/diff/unifiedm.diff
+++ b/kompare/tests/diff/unifiedm.diff
@@ -62,7 +62,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp
 +void callFunction( const char* app, const char* obj, const char* func, const QCStringList args )
  {
 -
-     QString f = func; // Qt is better with unicode strings, so use one.
+     QString f = func; // Qt is better with tqunicode strings, so use one.
      int left = f.find( '(' );
      int right = f.find( ')' );
 @@ -136,7 +163,7 @@
@@ -659,7 +659,7 @@ diff -aur dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp
 -bool findObject( const char* app, const char* obj, const char* func, int argc, char** args )
 +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.
+     QString f = func; // Qt is better with tqunicode strings, so use one.
      int left = f.find( '(' );
 @@ -118,7 +118,7 @@
  	f = fc;
-- 
cgit v1.2.1