Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

2 files changed, 6 insertions, 6 deletions

diff --git a/lib/kformula/scripts/bycodes.py b/lib/kformula/scripts/bycodes.py
index 16d71959..35b79a55 100755
--- a/lib/kformula/scripts/bycodes.py
+++ b/lib/kformula/scripts/bycodes.py
@@ -25,11 +25,11 @@ import qt
 def decode( fd, font, line ):
 	begin = string.find( line, '"' )
 	end = string.find( line, '"', begin + 1)
-	unicode = line[begin + 2:end] # Remove 'U' from string aswell
+	tqunicode = line[begin + 2:end] # Remove 'U' from string aswell
 	char_list = []
-	separation = string.find( unicode, '-' )
+	separation = string.find( tqunicode, '-' )
 	if separation != -1:
-		second = unicode
+		second = tqunicode
 		while separation != -1:
 			first = second[0:separation]
 			second = second[separation + 2:]
@@ -38,13 +38,13 @@ def decode( fd, font, line ):
 			if separation == -1:
 				char_list.append( string.atoi( second, 16 ) )
 	else:
-		char_list.append( string.atoi ( unicode, 16 ) )
+		char_list.append( string.atoi ( tqunicode, 16 ) )
 	fm = qt.QFontMetrics( qt.QFont( font ) )
 	in_font = True
 	for c in char_list:
 		if not fm.inFont( qt.QChar( c ) ):
 			in_font = False
-	fd.write( unicode + ' ' + str( in_font ) + '\n')
+	fd.write( tqunicode + ' ' + str( in_font ) + '\n')
 
 def parse( file, font ):
 	fd = open( file )
diff --git a/lib/kformula/scripts/bynames.py b/lib/kformula/scripts/bynames.py
index afb9ece5..0829cf90 100755
--- a/lib/kformula/scripts/bynames.py
+++ b/lib/kformula/scripts/bynames.py
@@ -66,7 +66,7 @@ struct entityMap {
 	    return qstrcmp( name, right ) < 0;
     }
 	const char* name;
-	const uint unicode;
+	const uint tqunicode;
 };
 	
 extern const entityMap entities[];