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

This reverts commit b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04.

10 files changed, 24 insertions, 24 deletions

diff --git a/languages/java/JavaRecognizer.hpp b/languages/java/JavaRecognizer.hpp
index fab59972..4dafc60e 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
- *		   unicode bitsets more efficiently.
+ *		   tqunicode 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/README.dox b/languages/java/README.dox
index 7050482e..0cb5898b 100644
--- a/languages/java/README.dox
+++ b/languages/java/README.dox
@@ -13,7 +13,7 @@ and images.
 \maintainer <a href="mailto:roberto AT tdevelop.org">Roberto Raggi</a> Copyright (C) 2002-2003
 
 \feature Java language support
-\feature Consult \ref LangSupportStatus for a up to date features/status of this programming language support part.
+\feature Consult \ref LangSupporttqStatus for a up to date features/status of this programming language support part.
 
 \bug bugs in <a href="http://bugs.kde.org/buglist.cgi?product=tdevelop&component=javasupport&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&order=Bug+Number">javasupport component at Bugzilla database</a>
 \bug Describe a the 1st bug that you know of, but probably hasn't been reported yet.
diff --git a/languages/java/app_templates/kappjava/appview.java b/languages/java/app_templates/kappjava/appview.java
index 1ead5458..fc25a273 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 layout manager to automatically add our widgets
+    // setup our tqlayout 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 a50fdb31..48e1ca6a 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 layout = new QHBoxLayout(this);
-    layout.setAutoAdd(true);
+    QHBoxLayout tqlayout = new QHBoxLayout(this);
+    tqlayout.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 layout = new QHBoxLayout(this);
-    layout.setAutoAdd(true);
+    QHBoxLayout tqlayout = new QHBoxLayout(this);
+    tqlayout.setAutoAdd(true);
 
     new QLabel("Add something here", this);
 }
diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp
index 20195d8b..14471290 100644
--- a/languages/java/backgroundparser.cpp
+++ b/languages/java/backgroundparser.cpp
@@ -32,7 +32,7 @@
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 class KDevSourceProvider: public SourceProvider
 {
diff --git a/languages/java/configproblemreporter.ui b/languages/java/configproblemreporter.ui
index a4852fd5..bf0333ef 100644
--- a/languages/java/configproblemreporter.ui
+++ b/languages/java/configproblemreporter.ui
@@ -32,7 +32,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout2</cstring>
+                        <cstring>tqlayout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -61,7 +61,7 @@
                             <property name="text">
                                 <string>msec</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignVCenter|AlignLeft</set>
                             </property>
                         </widget>
@@ -132,7 +132,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>61</height>
diff --git a/languages/java/configproblemreporter.ui.h b/languages/java/configproblemreporter.ui.h
index 6d289931..1da526ca 100644
--- a/languages/java/configproblemreporter.ui.h
+++ b/languages/java/configproblemreporter.ui.h
@@ -46,7 +46,7 @@ void ConfigureProblemReporter::bgParserCheckbox_toggled( bool b )
 
 void ConfigureProblemReporter::setDelayLabel( int delay )
 {
-    delayLabel->setText( i18n( "delay: %1 msec" ).arg( delay ) );
+    delayLabel->setText( i18n( "delay: %1 msec" ).tqarg( delay ) );
 }
 
 
diff --git a/languages/java/java.g b/languages/java/java.g
index 1f825ec5..64902409 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
- *		   unicode bitsets more efficiently.
+ *		   tqunicode 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 unicode;
+	// without inlining some bitset tests, couldn't do tqunicode;
 	// I need to make ANTLR generate smaller bitsets; see
 	// bottom of JavaLexer.java
 	codeGenBitsetTestThreshold=20;
diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp
index 5e936422..e4aeb27f 100644
--- a/languages/java/javasupportpart.cpp
+++ b/languages/java/javasupportpart.cpp
@@ -560,7 +560,7 @@ JavaSupportPart::parseProject( )
 		    continue;
 
 		if( pcs.contains(absFilePath) && t.toTime_t() == pcs[absFilePath].first ){
-		    stream.device()->at( pcs[absFilePath].second );
+		    stream.tqdevice()->at( pcs[absFilePath].second );
 		    FileDom file = codeModel()->create<FileModel>();
 		    file->read( stream );
 		    codeModel()->addFile( file );
@@ -860,21 +860,21 @@ void JavaSupportPart::saveProjectSourceInfo( )
     for( FileList::ConstIterator it=fileList.begin(); it!=fileList.end(); ++it ){
 	const FileDom dom = (*it);
   stream << dom->name() << m_timestamp[ dom->name() ].toTime_t();
-	offsets.insert( dom->name(), stream.device()->at() );
+	offsets.insert( dom->name(), stream.tqdevice()->at() );
 	stream << (uint)0; // dummy offset
     }
 
     for( FileList::ConstIterator it=fileList.begin(); it!=fileList.end(); ++it ){
 	const FileDom dom = (*it);
-	int offset = stream.device()->at();
+	int offset = stream.tqdevice()->at();
 
 	dom->write( stream );
 
-	int end = stream.device()->at();
+	int end = stream.tqdevice()->at();
 
-	stream.device()->at( offsets[dom->name()] );
+	stream.tqdevice()->at( offsets[dom->name()] );
 	stream << offset;
-	stream.device()->at( end );
+	stream.tqdevice()->at( end );
     }
 }
 
diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp
index a3206595..53517ced 100644
--- a/languages/java/problemreporter.cpp
+++ b/languages/java/problemreporter.cpp
@@ -267,13 +267,13 @@ TQString ProblemReporter::levelToString( int level ) const
     switch( level )
     {
     case Problem::Level_Error:
-	return TQString::fromLatin1( "Error" );
+	return TQString::tqfromLatin1( "Error" );
     case Problem::Level_Warning:
-	return TQString::fromLatin1( "Warning" );
+	return TQString::tqfromLatin1( "Warning" );
     case Problem::Level_Todo:
-	return TQString::fromLatin1( "Todo" );
+	return TQString::tqfromLatin1( "Todo" );
     case Problem::Level_Fixme:
-	return TQString::fromLatin1( "Fixme" );
+	return TQString::tqfromLatin1( "Fixme" );
     default:
         return TQString();
     }