1 files changed, 20 insertions, 20 deletions

diff --git a/languages/java/java.store.g b/languages/java/java.store.g
index cc545c64..bf996974 100644
--- a/languages/java/java.store.g
+++ b/languages/java/java.store.g
@@ -72,26 +72,26 @@ public:
 	}
 }
 
-compilationUnit { QString package; QString imp; QStringList imports; }
+compilationUnit { TQString package; TQString imp; QStringList imports; }
 	: { init(); }
 		(package=packageDefinition)?
 		(imp=importDefinition { imports << imp; } )*
 		(typeDefinition)*
 	;
 
-packageDefinition returns [ QString id ]
+packageDefinition returns [ TQString id ]
 	:	#( PACKAGE_DEF id=identifier )
 	;
 
-importDefinition returns [ QString id ]
+importDefinition returns [ TQString id ]
 	:	#( IMPORT id=identifierStar )
 	;
 
-typeDefinition { QStringList bases; QString className; ClassDom klass; QStringList m;}
+typeDefinition { QStringList bases; TQString className; ClassDom klass; QStringList m;}
 	:	#(CLASS_DEF m=modifiers IDENT
 						{
 						klass = m_model->create<ClassModel>();
-						QString name = QString::fromUtf8( #IDENT->getText().c_str(), #IDENT->getText().length() );
+						TQString name = TQString::fromUtf8( #IDENT->getText().c_str(), #IDENT->getText().length() );
 						QStringList path = QStringList::split( ".", name );
 						className = path.back();
 
@@ -125,7 +125,7 @@ typeDefinition { QStringList bases; QString className; ClassDom klass; QStringLi
 	|	#(INTERFACE_DEF m=modifiers IDENT
 						{
 						klass = m_model->create<ClassModel>();
-						QString name = QString::fromUtf8( #IDENT->getText().c_str(), #IDENT->getText().length() );
+						TQString name = TQString::fromUtf8( #IDENT->getText().c_str(), #IDENT->getText().length() );
 						QStringList path = QStringList::split( ".", name );
 						className = path.back();
 
@@ -154,16 +154,16 @@ typeDefinition { QStringList bases; QString className; ClassDom klass; QStringLi
 		)
 	;
 
-typeSpec returns [ QString tp ]
+typeSpec returns [ TQString tp ]
 	:	#(TYPE tp=typeSpecArray)
 	;
 
-typeSpecArray returns [ QString tp ]
+typeSpecArray returns [ TQString tp ]
 	:	#( ARRAY_DECLARATOR tp=typeSpecArray ) { tp += "[]"; }
 	|	tp=type
 	;
 
-type returns [ QString tp ]
+type returns [ TQString tp ]
 	:	tp=identifier
 	|	b:builtInType			{ tp = #b->getText().c_str(); }
 	;
@@ -199,11 +199,11 @@ modifier
     |   "volatile"
     ;
 
-extendsClause returns [ QStringList l ] { QString id; }
+extendsClause returns [ QStringList l ] { TQString id; }
 	:	#(EXTENDS_CLAUSE (id=identifier { l << id; } )* )
 	;
 
-implementsClause returns [ QStringList l ] { QString id; }
+implementsClause returns [ QStringList l ] { TQString id; }
 	:	#(IMPLEMENTS_CLAUSE (id=identifier { l << id; } )* )
 	;
 
@@ -256,7 +256,7 @@ ctorDef returns [ FunctionDom meth ]				{
 
 methodDecl returns [ FunctionDom meth ]  			{
 								QStringList m;
-								QString tp;
+								TQString tp;
 								meth = m_model->create<FunctionModel>();
 								meth->setFileName( m_file->name() );
 								}
@@ -274,7 +274,7 @@ methodDecl returns [ FunctionDom meth ]  			{
 
 methodDef returns [ FunctionDom meth ]  			{
 								QStringList m;
-								QString tp;
+								TQString tp;
 								meth = m_model->create<FunctionModel>();
 								meth->setFileName( m_file->name() );
 								}
@@ -292,7 +292,7 @@ methodDef returns [ FunctionDom meth ]  			{
 
 variableDef returns [ VariableDom attr ] 			{
 								QStringList m;
-								QString tp;
+								TQString tp;
 								attr = m_model->create<VariableModel>();
 								attr->setFileName( m_file->name() );
 								}
@@ -311,7 +311,7 @@ variableDef returns [ VariableDom attr ] 			{
 	;
 
 parameterDef returns [ ArgumentDom arg ] 			{
-								QString tp;
+								TQString tp;
 								arg = m_model->create<ArgumentModel>();
 								}
 	:	#(PARAMETER_DEF modifiers tp=typeSpec IDENT )
@@ -360,21 +360,21 @@ throwsClause
 	:	#( "throws" (identifier)* )
 	;
 
-identifier returns [ QString id ]
+identifier returns [ TQString id ]
 	:	IDENT 						{
 								id = #IDENT->getText().c_str();
 								}
 	|	#( DOT id=identifier IDENT )			{
-								id += QString(".") + #IDENT->getText().c_str();
+								id += TQString(".") + #IDENT->getText().c_str();
 								}
 	;
 
-identifierStar returns [ QString id ]
+identifierStar returns [ TQString id ]
 	:	IDENT						{
 								id = #IDENT->getText().c_str();
 								}
-	|	#( DOT id=identifier (STAR  { id += QString(".") + #STAR->getText().c_str(); } |
-				      IDENT { id += QString(".") + #IDENT->getText().c_str(); }) )
+	|	#( DOT id=identifier (STAR  { id += TQString(".") + #STAR->getText().c_str(); } |
+				      IDENT { id += TQString(".") + #IDENT->getText().c_str(); }) )
 	;
 
 slist