From 2c5871b2ce4b61be3a84f40be1ca77c0ab0baf91 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 19 Dec 2011 11:43:24 -0600
Subject: [PATCH] Remove additional unneeded tq method conversions

---
 qtinterface/convert_qt_tqt2 |  4 +--
 qtinterface/tqt.h.cmake     | 58 ++++++++++++++++++-------------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/qtinterface/convert_qt_tqt2 b/qtinterface/convert_qt_tqt2
index eee091e..d63048c 100755
--- a/qtinterface/convert_qt_tqt2
+++ b/qtinterface/convert_qt_tqt2
@@ -996,12 +996,12 @@ find ./ -type f -iname "*.c*" -exec sed -i 's/TQT_TQT_/TQT_/g' {} \;
 find ./ -type f -iname "*.c*" -exec sed -i 's/TQT_TQT_/TQT_/g' {} \;
 
 # Convert a few items that have changed too subtly to override in the TQT interface layer
-find ./ -type f -iname "*.c*" -exec sed -i 's/->children()/->tqchildren()/g' {} \;
+
 find ./ -type f -iname "*.c*" -exec sed -i 's/access != QMetaData::/tqaccess != QMetaData::/g' {} \;
 find ./ -type f -iname "*.c*" -exec sed -i 's/colorTable()/ptrColorTable()/g' {} \;
 find ./ -type f -iname "*.c*" -exec sed -i 's/QStyleOption::Default/QStyleOption::TQSO_Default/g' {} \;
 find ./ -type f -iname "*.c*" -exec sed -i 's/::qt_cast/tqqt_cast/g' {} \;
-find ./ -type f -iname "*.c*" -exec sed -i 's/mask()/tqmask()/g' {} \;
+
 
 # Back out some common mistakes
 find ./ -type f -iname "*.c*" -exec sed -i 's/\([_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]\)TQ/\1Q/g' {} \;
diff --git a/qtinterface/tqt.h.cmake b/qtinterface/tqt.h.cmake
index 3468c8d..d4a8f8b 100644
--- a/qtinterface/tqt.h.cmake
+++ b/qtinterface/tqt.h.cmake
@@ -956,12 +956,8 @@ Boston, MA 02110-1301, USA.
 #define tqApp	qApp
 
 
-#define tqshape	shape
 
-#define reseStatus	resetStatus
 
-#define tqfind	find
-#define tqchildren	children
 
 
 
@@ -969,28 +965,28 @@ Boston, MA 02110-1301, USA.
 
 
 
-#define tqparent	parent
-#define tqmask	mask
 
-#define tqcontains	contains
+
+
+
+
+
+
+
 #define tqunicode	unicode
 
-#define tqreplace	replace
+
 #define tqsignals	signals
-#define tqslots	slots
 
 
 
 
-#define tqgeometry	geometry
+
+
 
 #define tqlayout	layout
 
-#define tqinvalidate	invalidate
-#define tqalignment	alignment
-#define tqdevice	device
 
-#define tqreceivers	receivers
 
 
 
@@ -1001,7 +997,6 @@ Boston, MA 02110-1301, USA.
 
 
 
-#define tqrepaint	repaint
 
 
 
@@ -1023,15 +1018,20 @@ Boston, MA 02110-1301, USA.
 
 
 
-#define tqreplacement	replacement
 
 
-#define seStatus	setStatus
+
+
+
+
+
+
+
 
 #define tqclipboard	clipboard
-#define tqfamilies	families
 
-#define tqrects	rects
+
+
 
 
 #define tqpalette	palette
@@ -1040,25 +1040,25 @@ Boston, MA 02110-1301, USA.
 
 
 
-#define tqresize	resize
 
-#define tqopen	open
+
+
 #define tqtext	text
 
 #define tqbrush	brush
-#define tqat	at
 
-#define connecStatus	connectStatus
-#define disconnecStatus	disconnectStatus
 
 
 
 
-#define tqarg	arg
-#define tqbegin	begin
 
-#define tqscale	scale
-#define exiStatus	exitStatus
+
+
+
+
+
+
+
 
 
 
@@ -1112,7 +1112,7 @@ Boston, MA 02110-1301, USA.
 #endif
 
 #define tqMakePair	qMakePair
-#define qt_tqfind_obj_child	qt_find_obj_child
+
 #define tqt_ucm_query_verification_data	qt_ucm_query_verification_data
 #define tqmemmove	qmemmove