Rename obsolete tq methods to standard names

5 files changed, 9 insertions, 9 deletions

diff --git a/languages/java/JavaRecognizer.hpp b/languages/java/JavaRecognizer.hpp
index 4dafc60e..fab59972 100644
--- a/languages/java/JavaRecognizer.hpp
+++ b/languages/java/JavaRecognizer.hpp
@@ -103,7 +103,7 @@
  *		o  supports UNICODE?
  *		   Using Unicode charVocabulay makes code file big, but only
  *		   in the bitsets at the end. I need to make ANTLR generate
- *		   tqunicode bitsets more efficiently.
+ *		   unicode bitsets more efficiently.
  * Version 1.19 (April 25, 2002)
  *		Terence added in nice fixes by John Pybus concerning floating
  *		constants and problems with super() calls.  John did a nice
diff --git a/languages/java/app_templates/kappjava/appview.java b/languages/java/app_templates/kappjava/appview.java
index fc25a273..1ead5458 100644
--- a/languages/java/app_templates/kappjava/appview.java
+++ b/languages/java/app_templates/kappjava/appview.java
@@ -25,7 +25,7 @@ public class %{APPNAME}View extends QWidget
 public %{APPNAME}View(QWidget parent)
 {
     super(parent, null);
-    // setup our tqlayout manager to automatically add our widgets
+    // setup our layout manager to automatically add our widgets
     top_layout = new QHBoxLayout(this);
     top_layout.setAutoAdd(true);
 
diff --git a/languages/java/app_templates/kappjava/pref.java b/languages/java/app_templates/kappjava/pref.java
index 48e1ca6a..a50fdb31 100644
--- a/languages/java/app_templates/kappjava/pref.java
+++ b/languages/java/app_templates/kappjava/pref.java
@@ -31,8 +31,8 @@ public class %{APPNAME}PrefPageOne extends QFrame {
 public %{APPNAME}PrefPageOne(QWidget parent)
 {
     super(parent);
-    QHBoxLayout tqlayout = new QHBoxLayout(this);
-    tqlayout.setAutoAdd(true);
+    QHBoxLayout layout = new QHBoxLayout(this);
+    layout.setAutoAdd(true);
 
     new QLabel("Add something here", this);
 }
@@ -42,8 +42,8 @@ public class %{APPNAME}PrefPageTwo extends QFrame {
 public %{APPNAME}PrefPageTwo(QWidget parent)
 {
     super(parent);
-    QHBoxLayout tqlayout = new QHBoxLayout(this);
-    tqlayout.setAutoAdd(true);
+    QHBoxLayout layout = new QHBoxLayout(this);
+    layout.setAutoAdd(true);
 
     new QLabel("Add something here", this);
 }
diff --git a/languages/java/configproblemreporter.ui b/languages/java/configproblemreporter.ui
index 8475a284..a4852fd5 100644
--- a/languages/java/configproblemreporter.ui
+++ b/languages/java/configproblemreporter.ui
@@ -32,7 +32,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/languages/java/java.g b/languages/java/java.g
index 64902409..1f825ec5 100644
--- a/languages/java/java.g
+++ b/languages/java/java.g
@@ -97,7 +97,7 @@ options {
  *		o  supports UNICODE?
  *		   Using Unicode charVocabulay makes code file big, but only
  *		   in the bitsets at the end. I need to make ANTLR generate
- *		   tqunicode bitsets more efficiently.
+ *		   unicode bitsets more efficiently.
  * Version 1.19 (April 25, 2002)
  *		Terence added in nice fixes by John Pybus concerning floating
  *		constants and problems with super() calls.  John did a nice
@@ -1050,7 +1050,7 @@ options {
 	k=4;                   // four characters of lookahead
 //	charVocabulary='\u0003'..'\uFFFF';
 	charVocabulary='\u0003'..'\u00FF';
-	// without inlining some bitset tests, couldn't do tqunicode;
+	// without inlining some bitset tests, couldn't do unicode;
 	// I need to make ANTLR generate smaller bitsets; see
 	// bottom of JavaLexer.java
 	codeGenBitsetTestThreshold=20;