Initial TQt conversion

15 files changed, 442 insertions, 442 deletions

diff --git a/qtsharp/src/generator/Converter.cs b/qtsharp/src/generator/Converter.cs
index 8f6ce3b0..f6bbf06e 100644
--- a/qtsharp/src/generator/Converter.cs
+++ b/qtsharp/src/generator/Converter.cs
@@ -27,12 +27,12 @@ namespace QtCSharp {
 	public class Converter {
 
 		ArrayList qtypes;
-		QType qtype;
-		QTypeMap qmap;
+		TQType qtype;
+		TQTypeMap qmap;
 		StringCollection sigs;
 		StringBuilder sig;
 
-		public Converter (ArrayList qtypes, QType qtype, QTypeMap qmap)
+		public Converter (ArrayList qtypes, TQType qtype, TQTypeMap qmap)
 		{
 			this.qtypes = qtypes;
 			this.qtype = qtype;
@@ -45,14 +45,14 @@ namespace QtCSharp {
 			qtype.IsConverted = true;
 		}
 
-		public QType GetQType ()
+		public TQType GetTQType ()
 		{
 			return qtype;
 		}
 
 		public void Convert ()
 		{
-			foreach (QCtor qctor in qtype.QCtors) {
+			foreach (TQCtor qctor in qtype.TQCtors) {
 				qctor.Name = qmap.ReservedType (qctor.Name);
 				if (!qctor.Overload) {
 					ConvertCSharpParams (qctor.CSharpParams);
@@ -63,7 +63,7 @@ namespace QtCSharp {
 				}
 				CheckSig (qctor);
 			}
-			foreach (QMethod qmethod in qtype.QMethods) {
+			foreach (TQMethod qmethod in qtype.TQMethods) {
 				if (qmethod.Name.StartsWith ("protected_"))
 					qmethod.Name = qmethod.Name.Replace ("protected_", "");
 				qmethod.Name = qmap.ReservedType (qmethod.Name);
@@ -81,10 +81,10 @@ namespace QtCSharp {
 			}
 		}
 
-		public void CheckSig (QMethod qmethod)
+		public void CheckSig (TQMethod qmethod)
 		{
 			sig.Append (qmethod.PascalName);
-			foreach (QParam qparam in qmethod.CSharpParams) {
+			foreach (TQParam qparam in qmethod.CSharpParams) {
 				sig.Append (qparam.Type);
 			}
 			if (!sigs.Contains (sig.ToString ()) && !sigs.Contains ("The"+sig.ToString ())) {
@@ -96,11 +96,11 @@ namespace QtCSharp {
 			sig.Length = 0;
 		}
 
-		public void CheckSig (QCtor qctor)
+		public void CheckSig (TQCtor qctor)
 		{
 			sig.Append (qctor.Name);
-			foreach (QParam qparam in qctor.CSharpParams) {
-				//if (qparam.Type == "TQWidget" && qparam.Name == "parent")
+			foreach (TQParam qparam in qctor.CSharpParams) {
+				//if (qparam.Type == "TTQWidget" && qparam.Name == "parent")
 				if (qparam.Name == "parent")
 					qctor.Parent = true;
 				sig.Append (qparam.Type);
@@ -116,54 +116,54 @@ namespace QtCSharp {
 
 		public void ConvertCSharpParams (ArrayList qparams)
 		{
-			foreach (QParam qparam in qparams) {
+			foreach (TQParam qparam in qparams) {
 				qparam.Type = qmap.ArrayType (qparam.Type);
 				qparam.Type = StripBad (qparam.Type);
 				qparam.Type = qmap.CSharpType (qparam.Type);
-				qparam.Type = ConvertQString (qparam.Type);
+				qparam.Type = ConvertTQString (qparam.Type);
 				qparam.Name = qmap.ReservedType (qparam.Name);
 			}
 		}
 
 		public void ConvertPinvokeCallParams (ArrayList qparams)
 		{
-			foreach (QParam qparam in qparams) {
+			foreach (TQParam qparam in qparams) {
 				qparam.Type = qmap.ArrayType (qparam.Type);
 				qparam.Type = StripBad (qparam.Type);
 				qparam.Type = qmap.CSharpType (qparam.Type);
 				qparam.Name = qmap.ReservedType (qparam.Name);
-				if (IsQObject (qparam.Type))
+				if (IsTQObject (qparam.Type))
 					qparam.Name = qparam.Name + ".RawObject";
-				if (IsIQObject (qparam.Type))
+				if (IsITQObject (qparam.Type))
 					qparam.Name = qparam.Name + "." + StripInterface (qparam.Type) + " ()";
-		/*		if (IsQString (qparam.Type))
-					qparam.Name = "new TQString ("+StripPtr(qparam.Name)+").RawObject";*/
+		/*		if (IsTQString (qparam.Type))
+					qparam.Name = "new TTQString ("+StripPtr(qparam.Name)+").RawObject";*/
 				qparam.Type = "";
 			}
 		}
 
 		public void ConvertPinvokeParams (ArrayList qparams)
 		{
-			foreach (QParam qparam in qparams) {
+			foreach (TQParam qparam in qparams) {
 				qparam.Type = qmap.ArrayType (qparam.Type);
 				qparam.Type = StripBad (qparam.Type);
 				qparam.Type = qmap.PinvokeType (qparam.Type);
 				qparam.Name = qmap.ReservedType (qparam.Name);
-				if (IsQObject (qparam.Type) || IsIQObject (qparam.Type))
+				if (IsTQObject (qparam.Type) || IsITQObject (qparam.Type))
 					qparam.Type = "IntPtr";
 			}
 		}
 
 		public void ConvertOverloadParams (ArrayList qparams)
 		{
-			foreach (QParam qparam in qparams) {
+			foreach (TQParam qparam in qparams) {
 				qparam.Type = qmap.ArrayType (qparam.Type);
 				qparam.Type = StripBad (qparam.Type);
 				qparam.Type = qmap.CSharpType (qparam.Type);
 				OverloadedLastParam (qparam, qparams);
 				OverloadedNull (qparam);
-				OverloadedQString (qparam);
-				OverloadedQObject (qparam);
+				OverloadedTQString (qparam);
+				OverloadedTQObject (qparam);
 				OverloadedNestedEnum (qparam);
 				OverloadedNullString (qparam);
 				OverloadedBool (qparam);
@@ -174,23 +174,23 @@ namespace QtCSharp {
 			}
 		}
 
-		public void OverloadedLastParam (QParam qparam, ArrayList qparams)
+		public void OverloadedLastParam (TQParam qparam, ArrayList qparams)
 		{
 			if (qparams.IndexOf (qparam) != qparams.Count - 1)
 				qparam.Default = null;
 		}
 
-		public void OverloadedNull (QParam qparam)
+		public void OverloadedNull (TQParam qparam)
 		{
 			if (qparam.Default == null)
 				qparam.Type = "";
 		}
 
-		public void OverloadedQString (QParam qparam)
+		public void OverloadedTQString (TQParam qparam)
 		{
-			if (IsQString (qparam.Type)){
-				qparam.Type = "TQString";
-				if (qparam.Default == "TQString::null")
+			if (IsTQString (qparam.Type)){
+				qparam.Type = "TTQString";
+				if (qparam.Default == "TTQString::null")
 					qparam.Default = "null";
 				else if (qparam.Default == "quotquot")
 					qparam.Default = "null";
@@ -199,19 +199,19 @@ namespace QtCSharp {
 			}
 		}
 
-		public void OverloadedQObject (QParam qparam)
+		public void OverloadedTQObject (TQParam qparam)
 		{
-			if (IsQObject (qparam.Type)) {
+			if (IsTQObject (qparam.Type)) {
 				qparam.Name = "new "+qparam.Type+" ()";
 				qparam.Type = "";
 			}
 		}
 
-		public void OverloadedNestedEnum (QParam qparam)
+		public void OverloadedNestedEnum (TQParam qparam)
 		{
-			foreach (QEnum qenum in qtype.QEnums) {
+			foreach (TQEnum qenum in qtype.TQEnums) {
 				if (qparam.Type == qenum.Name) {
-					foreach (QItem qitem in qenum.QItems) {
+					foreach (TQItem qitem in qenum.TQItems) {
 						if (qparam.Default == qitem.Name) {
 							qparam.Name = qparam.Type+"."+qparam.Default;
 							qparam.Type = "";
@@ -221,7 +221,7 @@ namespace QtCSharp {
 			}
 		}
 
-		public void OverloadedNullString (QParam qparam)
+		public void OverloadedNullString (TQParam qparam)
 		{
 			if (qmap.OverloadType (qparam.Type) == "string" && qparam.Default == "0") {
 				qparam.Type = "";
@@ -229,7 +229,7 @@ namespace QtCSharp {
 			}
 		}
 
-		public void OverloadedBool (QParam qparam)
+		public void OverloadedBool (TQParam qparam)
 		{
 			if (qparam.Default == "TRUE") {
 				qparam.Type = "";
@@ -246,7 +246,7 @@ namespace QtCSharp {
 			}
 		}
 
-		public void OverloadedEnum (QParam qparam)
+		public void OverloadedEnum (TQParam qparam)
 		{
 			if (IsEnum (qparam.Type)) {
 				qparam.Name = qparam.Type + "." + EnumValue (qparam.Type, qparam.Default);
@@ -254,7 +254,7 @@ namespace QtCSharp {
 			}
 		}
 
-		public void OverloadedArray (QParam qparam)
+		public void OverloadedArray (TQParam qparam)
 		{
 			if (IsArray (qparam.Type)) {
 				qparam.Name = "new "+qparam.Type+"{"+qparam.Default+"}";
@@ -262,13 +262,13 @@ namespace QtCSharp {
 			}
 		}
 
-		public void OverloadedHex (QParam qparam)
+		public void OverloadedHex (TQParam qparam)
 		{
 			if (qparam.Default == "0xffffffff")
 				qparam.Default = "1";
 		}
 
-		public void OverloadedDefault (QParam qparam)
+		public void OverloadedDefault (TQParam qparam)
 		{
 			if (qparam.Type != "") {
 				qparam.Type = "("+qmap.OverloadType (qparam.Type)+")";
@@ -276,18 +276,18 @@ namespace QtCSharp {
 			}
 		}
 
-		public void ConvertReturnType (QMethod qmethod)
+		public void ConvertReturnType (TQMethod qmethod)
 		{
 			qmethod.Return = qmap.ArrayType (qmethod.Return);
 			qmethod.Return = qmap.PinvokeType (StripBad (qmethod.Return));
-			if (IsQObject(qmethod.Return)) {
+			if (IsTQObject(qmethod.Return)) {
 				qmethod.Boxer = true;
 				qmethod.PinvokeReturn = "IntPtr";
 			} else {
 				qmethod.PinvokeReturn = qmethod.Return;
 			}
-			if (qmethod.Return == "TQString") {
-				qmethod.QStringReturn = true;
+			if (qmethod.Return == "TTQString") {
+				qmethod.TQStringReturn = true;
 			}
 		}
 
@@ -309,10 +309,10 @@ namespace QtCSharp {
 			return str;
 		}
 		
-		public string ConvertQString (string str)
+		public string ConvertTQString (string str)
 		{	
-			if (IsQString (str))
-				return "TQString";
+			if (IsTQString (str))
+				return "TTQString";
 			else
 				return str;
 		}
@@ -344,7 +344,7 @@ namespace QtCSharp {
 		public string ToPascalCase (string name)
 		{
 			string pascal = System.Char.ToUpper (name[0]).ToString ()+name.Substring (1, name.Length -1);
-			foreach (QEnum qenum in qtype.QEnums) {
+			foreach (TQEnum qenum in qtype.TQEnums) {
 				if (pascal == qenum.Name)
 					pascal = "The"+pascal;
 			}
@@ -358,16 +358,16 @@ namespace QtCSharp {
 			value = StripEnum (value);
 
 			// There _has_ to be a better way, but I'm tired...
-			foreach (QType qtype in qtypes) {
-				foreach (QEnum qenum in qtype.QEnums) {
+			foreach (TQType qtype in qtypes) {
+				foreach (TQEnum qenum in qtype.TQEnums) {
 					if (enumname == qenum.Name) {
-						foreach (QItem qitem in qenum.QItems) {
+						foreach (TQItem qitem in qenum.TQItems) {
 							if (value == qitem.Name) {
 								match = true;
 							}
 						}
 						if (!match) {
-							foreach (QItem qitem in qenum.QItems) {
+							foreach (TQItem qitem in qenum.TQItems) {
 								value = qitem.Name;
 								break;
 							}
@@ -380,22 +380,22 @@ namespace QtCSharp {
 
 		public void Ancestors ()
 		{
-			if (qtype.IsInterface || qtype.QAncestors.Count < 2)
+			if (qtype.IsInterface || qtype.TQAncestors.Count < 2)
 			  return;
 
 			string iname = "";
-			foreach (QAncestor qancestor in qtype.QAncestors) {
+			foreach (TQAncestor qancestor in qtype.TQAncestors) {
 				iname = qmap.InterfaceType (qancestor.Name);
-				foreach (QType _qtype in qtypes) {
+				foreach (TQType _qtype in qtypes) {
 					if (_qtype.Name == qancestor.Name && iname != qancestor.Name) {
 						if (!_qtype.IsConverted) {
 							Converter converter = new Converter (qtypes, _qtype, qmap);
 						}
-						qtype.AddQMethod (instPointer (qancestor.Name));
-						qancestor.QMethods = _qtype.QMethods;
+						qtype.AddTQMethod (instPointer (qancestor.Name));
+						qancestor.TQMethods = _qtype.TQMethods;
 						qancestor.IsInterface = true;
 						qancestor.IName = iname;
-						foreach (QMethod qmethod in qancestor.QMethods) {
+						foreach (TQMethod qmethod in qancestor.TQMethods) {
 							CheckSig (qmethod);
 						}
 					}
@@ -403,9 +403,9 @@ namespace QtCSharp {
 			}
 		}
 
-		public QMethod instPointer (string name)
+		public TQMethod instPointer (string name)
 		{
-			QMethod qmethod = new QMethod ();
+			TQMethod qmethod = new TQMethod ();
 			qmethod.Name = name;
 			qmethod.PascalName = name;
 			qmethod.Access = "public";
@@ -415,17 +415,17 @@ namespace QtCSharp {
 			return qmethod;
 		}
 		
-		public bool IsQString (string str)
+		public bool IsTQString (string str)
 		{
-			if (qtype.Name == "TQString")
+			if (qtype.Name == "TTQString")
 				return true;
-			else if (IsQObject (str) && str == "TQString")
+			else if (IsTQObject (str) && str == "TTQString")
 				return true;
 			else
 				return false;
    		}
 
-		public bool IsQObject (string str)
+		public bool IsTQObject (string str)
 		{
 			//IndexOf is a hack to search for a char ;-)
 			if (str.StartsWith ("Q") && str.IndexOf (".") < 0)
@@ -434,7 +434,7 @@ namespace QtCSharp {
 				return false;
    		}
 		
-		public bool IsIQObject (string str)
+		public bool IsITQObject (string str)
 		{
 			//IndexOf is a hack to search for a char ;-)
 			if (str == "IntPtr") return false;
diff --git a/qtsharp/src/generator/Generator.cs b/qtsharp/src/generator/Generator.cs
index 68b1e031..3835f2e1 100644
--- a/qtsharp/src/generator/Generator.cs
+++ b/qtsharp/src/generator/Generator.cs
@@ -85,12 +85,12 @@ namespace QtCSharp {
             		//}
 
 			ParseAPI parseapi = new ParseAPI (xmlfile);
-			QTypeMap qmap = new QTypeMap ();
-			Console.WriteLine ("Parsing "+parseapi.QTypes.Count+" Qt classes...");
+			TQTypeMap qmap = new TQTypeMap ();
+			Console.WriteLine ("Parsing "+parseapi.TQTypes.Count+" Qt classes...");
 
-			foreach (QType qtype in parseapi.QTypes) {
-				Converter converter = new Converter (parseapi.QTypes, qtype, qmap);
-				Printer printer = new Printer (converter.GetQType (), directory);
+			foreach (TQType qtype in parseapi.TQTypes) {
+				Converter converter = new Converter (parseapi.TQTypes, qtype, qmap);
+				Printer printer = new Printer (converter.GetTQType (), directory);
 			}
 		}
 	}
diff --git a/qtsharp/src/generator/ParseAPI.cs b/qtsharp/src/generator/ParseAPI.cs
index a79a8ab9..c6a86182 100644
--- a/qtsharp/src/generator/ParseAPI.cs
+++ b/qtsharp/src/generator/ParseAPI.cs
@@ -35,7 +35,7 @@ namespace QtCSharp {
 			Parse ();
 		}
 
-		public ArrayList QTypes
+		public ArrayList TQTypes
 		{
 			get {return qtypes;}
 		}
@@ -47,7 +47,7 @@ namespace QtCSharp {
 				if (xtr.NodeType != XmlNodeType.EndElement) {
 					switch(xtr.Name) {
 						case "qtype":
-								QType t = AddQType ();
+								TQType t = AddTQType ();
 								typehash[t.Name] = t;
 							continue;
 						default:
@@ -56,31 +56,31 @@ namespace QtCSharp {
 				}
 			}
 
-			foreach (QType t in qtypes) {
-				t.IsQObject = IsQObject(t, typehash);
+			foreach (TQType t in qtypes) {
+				t.IsTQObject = IsTQObject(t, typehash);
 			}
 		}
 
-		public QType AddQType ()
+		public TQType AddTQType ()
 		{
 			Parser parser = new Parser (xtr.ReadOuterXml ());
-			QType type = parser.GetQType ();
+			TQType type = parser.GetTQType ();
 			qtypes.Add (type);
 			return type;
 		}
 
-		private static bool IsQObject(QType t, Hashtable typehash)
+		private static bool IsTQObject(TQType t, Hashtable typehash)
 		{
 			if (t.IsInterface) return false;
-			if (t.Name == "TQObject") return true;
+			if (t.Name == "TTQObject") return true;
 
-			foreach (QAncestor a in t.QAncestors) {
-				QType at = (QType)typehash[a.Name];
+			foreach (TQAncestor a in t.TQAncestors) {
+				TQType at = (TQType)typehash[a.Name];
 				if (at == null)
 					continue;
-				else if (at.Name == "TQObject")
+				else if (at.Name == "TTQObject")
 					return true;
-				else if (IsQObject(at, typehash))
+				else if (IsTQObject(at, typehash))
 					return true;
 			}
 
diff --git a/qtsharp/src/generator/Parser.cs b/qtsharp/src/generator/Parser.cs
index cea811d3..1639b4b6 100644
--- a/qtsharp/src/generator/Parser.cs
+++ b/qtsharp/src/generator/Parser.cs
@@ -26,21 +26,21 @@ namespace QtCSharp {
 	public class Parser {
 
 		XmlTextReader xtr;
-		QType qtype;
+		TQType qtype;
 
 		public Parser (string xmlFragment)
 		{
-			qtype = new QType ();
+			qtype = new TQType ();
 			XmlNameTable nt = new NameTable ();
 			XmlNamespaceManager nsMgr = new XmlNamespaceManager (nt);
 			XmlParserContext parserContext = new XmlParserContext (null, nsMgr, null, XmlSpace.None);
 			xtr = new XmlTextReader (xmlFragment, XmlNodeType.Document, parserContext);
 			Parse ();
 			OverLoad ();
-			NewQCtors ();
+			NewTQCtors ();
 		}
 
-		public QType GetQType ()
+		public TQType GetTQType ()
 		{
 			return qtype;
 		}
@@ -51,22 +51,22 @@ namespace QtCSharp {
 				if (xtr.NodeType != XmlNodeType.EndElement) {
 					switch (xtr.Name) {
 						case "qtype":
-							ParseQType ();
+							ParseTQType ();
 							continue;
 						case "qancestor":
-							ParseQAncestor ();
+							ParseTQAncestor ();
 							continue;
 						case "qenum":
-							ParseQEnum ();
+							ParseTQEnum ();
 							continue;
 						case "qctor":
-							ParseQCtor ();
+							ParseTQCtor ();
 							continue;
 						case "qdctor":
-							ParseQDCtor ();
+							ParseTQDCtor ();
 							continue;
 						case "qmethod":
-							ParseQMethod ();
+							ParseTQMethod ();
 							continue;
 						default:
 							continue;
@@ -75,91 +75,91 @@ namespace QtCSharp {
 			}
 		}
 
-		public void NewQCtors ()
+		public void NewTQCtors ()
 		{
 			// A ctor for inherited classes
-			QCtor _qctor = new QCtor();
+			TQCtor _qctor = new TQCtor();
 			_qctor.Name = qtype.Name;
 			_qctor.Access = "internal";
 			_qctor.Inherited = true;
-			qtype.AddQCtor(_qctor);
+			qtype.AddTQCtor(_qctor);
 
 			// A ctor for type boxing
-			QCtor __qctor = new QCtor();
+			TQCtor __qctor = new TQCtor();
 			__qctor.Name = qtype.Name;
 			__qctor.Access = "internal";
 			__qctor.Boxer = true;
-			QParam qparam = new QParam();
+			TQParam qparam = new TQParam();
 			qparam.Type = "IntPtr";
 			qparam.Name = "_ptr";
 			__qctor.AddCSharpParam(qparam);
-			qtype.AddQCtor(__qctor);
+			qtype.AddTQCtor(__qctor);
 
 			// A dummy ctor
-			QCtor ___qctor = new QCtor();
+			TQCtor ___qctor = new TQCtor();
 			___qctor.Name = qtype.Name;
 			___qctor.Access = "internal";
 			___qctor.Dummy = true;
-			QParam ___qparam = new QParam();
-			___qparam.Type = "QNull";
+			TQParam ___qparam = new TQParam();
+			___qparam.Type = "TQNull";
 			___qparam.Name = "dummy";
 			___qctor.AddCSharpParam(___qparam);
-			qtype.AddQCtor(___qctor);
+			qtype.AddTQCtor(___qctor);
 		}
 
 		public void OverLoad ()
 		{
 			ArrayList additions = new ArrayList ();
 
-			foreach (QCtor qctor in qtype.QCtors){
-				foreach (QParam pinvokeparam in qctor.PinvokeParams) {
+			foreach (TQCtor qctor in qtype.TQCtors){
+				foreach (TQParam pinvokeparam in qctor.PinvokeParams) {
 					if (pinvokeparam.Default != null) {
-						QCtor _qctor = new QCtor();
+						TQCtor _qctor = new TQCtor();
 						_qctor.Name = qctor.Name;
 						_qctor.Access = qctor.Access;
 						_qctor.Overload = true;
 						for (int j = 0; j < qctor.PinvokeParams.IndexOf(pinvokeparam)+1; j++) {
-							_qctor.AddPinvokeParam((QParam)qctor.PinvokeParams[j]);
-							_qctor.AddPinvokeCallParam((QParam)qctor.PinvokeCallParams[j]);
-							_qctor.AddCSharpParam((QParam)qctor.CSharpParams[j]);
-							_qctor.AddOverloadParam((QParam) (( QParam) qctor.CSharpParams[j]).Clone());
+							_qctor.AddPinvokeParam((TQParam)qctor.PinvokeParams[j]);
+							_qctor.AddPinvokeCallParam((TQParam)qctor.PinvokeCallParams[j]);
+							_qctor.AddCSharpParam((TQParam)qctor.CSharpParams[j]);
+							_qctor.AddOverloadParam((TQParam) (( TQParam) qctor.CSharpParams[j]).Clone());
 						}
 						_qctor.CSharpParams.RemoveAt(_qctor.CSharpParams.Count-1);
-						//qtype.AddQCtor(_qctor);
+						//qtype.AddTQCtor(_qctor);
 						additions.Add (_qctor);
 					}
 				}
 			}
 
-			foreach (QCtor ctor in additions) qtype.AddQCtor (ctor);
+			foreach (TQCtor ctor in additions) qtype.AddTQCtor (ctor);
 			additions = new ArrayList ();
 
-			foreach (QMethod qmethod in qtype.QMethods){
-				foreach (QParam pinvokeparam in qmethod.PinvokeParams) {
+			foreach (TQMethod qmethod in qtype.TQMethods){
+				foreach (TQParam pinvokeparam in qmethod.PinvokeParams) {
 					if (pinvokeparam.Default != null) {
-						QMethod _qmethod = new QMethod();
+						TQMethod _qmethod = new TQMethod();
 						_qmethod.Name = qmethod.Name;
 						_qmethod.Access = qmethod.Access;
 						_qmethod.Return = qmethod.Return;
 						_qmethod.Overload = true;
 						for (int j = 0; j < qmethod.PinvokeParams.IndexOf(pinvokeparam)+1; j++) {
-							_qmethod.AddPinvokeParam((QParam)qmethod.PinvokeParams[j]);
-							_qmethod.AddPinvokeCallParam((QParam)qmethod.PinvokeCallParams[j]);
-							_qmethod.AddCSharpParam((QParam)qmethod.CSharpParams[j]);
-							_qmethod.AddOverloadParam((QParam) ((QParam) qmethod.CSharpParams[j]).Clone());
+							_qmethod.AddPinvokeParam((TQParam)qmethod.PinvokeParams[j]);
+							_qmethod.AddPinvokeCallParam((TQParam)qmethod.PinvokeCallParams[j]);
+							_qmethod.AddCSharpParam((TQParam)qmethod.CSharpParams[j]);
+							_qmethod.AddOverloadParam((TQParam) ((TQParam) qmethod.CSharpParams[j]).Clone());
 
 						}
 						_qmethod.CSharpParams.RemoveAt(_qmethod.CSharpParams.Count-1);
-						//qtype.AddQMethod(_qmethod);
+						//qtype.AddTQMethod(_qmethod);
 						additions.Add (_qmethod);
 					}
 				}
 			}
 
-			foreach (QMethod method in additions) qtype.AddQMethod (method);
+			foreach (TQMethod method in additions) qtype.AddTQMethod (method);
 		}
 
-		public void ParseQType ()
+		public void ParseTQType ()
 		{
 			if (xtr.MoveToAttribute("name")) {
 				qtype.Name = xtr.Value;
@@ -170,27 +170,27 @@ namespace QtCSharp {
 			}
 		}
 
-		public void ParseQAncestor ()
+		public void ParseTQAncestor ()
 		{
-			QAncestor qancestor = new QAncestor();
+			TQAncestor qancestor = new TQAncestor();
 			if (xtr.MoveToAttribute("name")) {
 				qancestor.Name = xtr.Value;
 			}
-			qtype.AddQAncestor(qancestor);
+			qtype.AddTQAncestor(qancestor);
 		}
 
-		public void ParseQEnum ()
+		public void ParseTQEnum ()
 		{
 			bool match = false;
-			QEnum qenum = new QEnum();
+			TQEnum qenum = new TQEnum();
 			if (xtr.MoveToAttribute("name"))
 				qenum.Name = xtr.Value;
 			if (xtr.MoveToAttribute("access"))
 				qenum.Access = xtr.Value;
 			while (xtr.Read()) {
 				if (xtr.Name == "qitem") {
-					QItem qitem = ParseQItem();
-					qenum.AddQItem(qitem);
+					TQItem qitem = ParseTQItem();
+					qenum.AddTQItem(qitem);
 					long parse = 0;
 					try {
 						parse = Int64.Parse(qitem.Value);
@@ -203,13 +203,13 @@ namespace QtCSharp {
 					break;
 				}
 			}
-			qtype.AddQEnum(qenum);
+			qtype.AddTQEnum(qenum);
 		}
 
-		public void ParseQCtor ()
+		public void ParseTQCtor ()
 		{
 			bool IsEmpty = xtr.IsEmptyElement;
-			QCtor qctor = new QCtor();
+			TQCtor qctor = new TQCtor();
 			if (xtr.MoveToAttribute("name")) {
 				qctor.Name = xtr.Value;
 			}
@@ -222,22 +222,22 @@ namespace QtCSharp {
 			if (!IsEmpty) {
 				while (xtr.Read()) {
 					if (xtr.Name == "qparam") {
-						qctor.AddPinvokeParam(ParseQParam());
-						qctor.AddPinvokeCallParam(ParseQParam());
-						qctor.AddCSharpParam(ParseQParam());
+						qctor.AddPinvokeParam(ParseTQParam());
+						qctor.AddPinvokeCallParam(ParseTQParam());
+						qctor.AddCSharpParam(ParseTQParam());
 					} else if (xtr.Name == ""){
 					} else {
 						break;
 					}
 				}
 			}
-			qtype.AddQCtor(qctor);
+			qtype.AddTQCtor(qctor);
 		}
 
-		public void ParseQDCtor ()
+		public void ParseTQDCtor ()
 		{
 			bool IsEmpty = xtr.IsEmptyElement;
-			QDCtor qdctor = new QDCtor();
+			TQDCtor qdctor = new TQDCtor();
 			if (xtr.MoveToAttribute("name")) {
 				qdctor.Name = xtr.Value;
 			}
@@ -247,20 +247,20 @@ namespace QtCSharp {
 			if (!IsEmpty) {
 				while (xtr.Read()) {
 					if (xtr.Name == "qparam") {
-						qdctor.AddQParam(ParseQParam());
+						qdctor.AddTQParam(ParseTQParam());
 					} else if (xtr.Name == "") {
 					} else {
 						break;
 					}
 				}
 			}
-			qtype.AddQDCtor(qdctor);
+			qtype.AddTQDCtor(qdctor);
 		}
 
-		public void ParseQMethod ()
+		public void ParseTQMethod ()
 		{
 			bool IsEmpty = xtr.IsEmptyElement;
-			QMethod qmethod = new QMethod();
+			TQMethod qmethod = new TQMethod();
 			if (xtr.MoveToAttribute("name")) {
 				qmethod.Name = xtr.Value;
 			}
@@ -281,21 +281,21 @@ namespace QtCSharp {
 			if (!IsEmpty) {
 				while (xtr.Read()) {
 					if (xtr.Name == "qparam") {
-						qmethod.AddPinvokeParam(ParseQParam());
-						qmethod.AddPinvokeCallParam(ParseQParam());
-						qmethod.AddCSharpParam(ParseQParam());
+						qmethod.AddPinvokeParam(ParseTQParam());
+						qmethod.AddPinvokeCallParam(ParseTQParam());
+						qmethod.AddCSharpParam(ParseTQParam());
 					} else if (xtr.Name == ""){
 					} else {
 						break;
 					}
 				}
 			}
-			qtype.AddQMethod(qmethod);
+			qtype.AddTQMethod(qmethod);
 		}
 
-		public QItem ParseQItem ()
+		public TQItem ParseTQItem ()
 		{
-			QItem qitem = new QItem();
+			TQItem qitem = new TQItem();
 			if (xtr.MoveToAttribute("name")) {
 				qitem.Name = xtr.Value;
 			}
@@ -305,9 +305,9 @@ namespace QtCSharp {
 			return qitem;
 		}
 
-		public QParam ParseQParam ()
+		public TQParam ParseTQParam ()
 		{
-			QParam qparam = new QParam();
+			TQParam qparam = new TQParam();
 			if (xtr.MoveToAttribute("type")) {
 				qparam.Type = xtr.Value;
 			}
diff --git a/qtsharp/src/generator/Printer.cs b/qtsharp/src/generator/Printer.cs
index e6243250..c71bed7c 100644
--- a/qtsharp/src/generator/Printer.cs
+++ b/qtsharp/src/generator/Printer.cs
@@ -25,10 +25,10 @@ namespace QtCSharp {
 
 	public class Printer {
 
-		QType qtype;
+		TQType qtype;
 		string tab, directory;
 
-		public Printer (QType qtype, string directory)
+		public Printer (TQType qtype, string directory)
 		{
 			this.qtype = qtype;
 			this.directory = directory;
@@ -44,15 +44,15 @@ namespace QtCSharp {
 			StreamWriter writer = new StreamWriter(directory + Path.DirectorySeparatorChar +
 				qtype.Name + ".cs", false, new ASCIIEncoding());
 			writer.Write(Header);
-			writer.Write(StartClass(qtype.Name, qtype.Access, new ArrayList(qtype.QAncestors)));
+			writer.Write(StartClass(qtype.Name, qtype.Access, new ArrayList(qtype.TQAncestors)));
 
-			foreach (QEnum qenum in qtype.QEnums) {
+			foreach (TQEnum qenum in qtype.TQEnums) {
 				writer.Write(StartEnum(qenum.Name, qenum.Access, qenum.Type));
-				writer.Write(Items(qenum.QItems));
+				writer.Write(Items(qenum.TQItems));
 				writer.Write(EndMember);
 			}
 
-			foreach (QCtor qctor in qtype.QCtors) {
+			foreach (TQCtor qctor in qtype.TQCtors) {
 				if (qctor.Throttle) {
 				} else if (qctor.Inherited) {
 					writer.Write (WriteInherited (qctor.Name, qctor.Access));
@@ -80,7 +80,7 @@ namespace QtCSharp {
 
 			//writer.Write (DisposePublic ());
 
-			foreach (QDCtor qdctor in qtype.QDCtors) {
+			foreach (TQDCtor qdctor in qtype.TQDCtors) {
 				writer.Write (ImportAttrib);
 				writer.Write (ImportDCtorCall (qdctor.Name));
 			}
@@ -88,18 +88,18 @@ namespace QtCSharp {
 			//writer.Write (DisposeProtected ());
 			writer.Write (Delete ());
 
-			foreach (QMethod qmethod in qtype.QMethods) {
+			foreach (TQMethod qmethod in qtype.TQMethods) {
 				if (qmethod.Throttle) {
 				} else if (!qmethod.Overload) {
 					writer.Write(ImportAttrib);
 					if (qmethod.Access == "public" || qmethod.Access == "protected" || qmethod.Access == "internal") {
 						writer.Write(ImportMethodCall(qtype.Name, qmethod.Name, qmethod.Id, qmethod.PinvokeReturn, qmethod.PinvokeParams));
 						writer.Write(StartMethod(qmethod.PascalName, qmethod.Access, qmethod.Return, qmethod.CSharpParams));
-						writer.Write(MethodCall(qmethod.QStringReturn, qmethod.Boxer, qtype.Name, qmethod.Name, "rawObject", qmethod.Id, qmethod.Return, qmethod.PinvokeCallParams));
+						writer.Write(MethodCall(qmethod.TQStringReturn, qmethod.Boxer, qtype.Name, qmethod.Name, "rawObject", qmethod.Id, qmethod.Return, qmethod.PinvokeCallParams));
 					} else {
 						writer.Write(StaticImportMethodCall(qtype.Name, qmethod.Name, qmethod.Id, qmethod.PinvokeReturn, qmethod.PinvokeParams));
 						writer.Write(StartMethod(qmethod.PascalName, qmethod.Access, qmethod.Return, qmethod.CSharpParams));
-						writer.Write(StaticMethodCall(qmethod.QStringReturn, qmethod.Boxer, qtype.Name, qmethod.Name, qmethod.Id, qmethod.Return, qmethod.PinvokeCallParams));
+						writer.Write(StaticMethodCall(qmethod.TQStringReturn, qmethod.Boxer, qtype.Name, qmethod.Name, qmethod.Id, qmethod.Return, qmethod.PinvokeCallParams));
 					}
 					writer.Write(EndMember);
 				} else {
@@ -107,22 +107,22 @@ namespace QtCSharp {
 				}
 			}
 
-			foreach (QAncestor qancestor in qtype.QAncestors) {
+			foreach (TQAncestor qancestor in qtype.TQAncestors) {
 				writer.Write("\n\n"+tab+tab+"// Begin interface methods.\n");
 				if (qancestor.IsInterface) {
 					Printer printer = new Printer (qancestor, directory);
-					foreach (QMethod qmethod in qancestor.QMethods) {
+					foreach (TQMethod qmethod in qancestor.TQMethods) {
 						if (qmethod.Throttle) {
 						} else if (!qmethod.Overload) {
 							writer.Write(ImportAttrib);
 							if (qmethod.Access == "public" || qmethod.Access == "protected") {
 								writer.Write(ImportMethodCall(qancestor.Name, qmethod.Name, qmethod.Id, qmethod.PinvokeReturn, qmethod.PinvokeParams));
 								writer.Write(StartMethod(qmethod.PascalName, qmethod.Access, qmethod.Return, qmethod.CSharpParams));
-								writer.Write(MethodCall(qmethod.QStringReturn, qmethod.Boxer, qancestor.Name, qmethod.Name, qancestor.Name+" ()", qmethod.Id, qmethod.Return, qmethod.PinvokeCallParams));
+								writer.Write(MethodCall(qmethod.TQStringReturn, qmethod.Boxer, qancestor.Name, qmethod.Name, qancestor.Name+" ()", qmethod.Id, qmethod.Return, qmethod.PinvokeCallParams));
 							} else {
 								writer.Write(StaticImportMethodCall(qancestor.Name, qmethod.Name, qmethod.Id, qmethod.PinvokeReturn, qmethod.PinvokeParams));
 								writer.Write(StartMethod(qmethod.PascalName, qmethod.Access, qmethod.Return, qmethod.CSharpParams));
-								writer.Write(StaticMethodCall(qmethod.QStringReturn, qmethod.Boxer, qancestor.Name, qmethod.Name, qmethod.Id, qmethod.Return, qmethod.PinvokeCallParams));
+								writer.Write(StaticMethodCall(qmethod.TQStringReturn, qmethod.Boxer, qancestor.Name, qmethod.Name, qmethod.Id, qmethod.Return, qmethod.PinvokeCallParams));
 							}
 							writer.Write(EndMember);
 						} else {
@@ -142,9 +142,9 @@ namespace QtCSharp {
 			StreamWriter writer = new StreamWriter(directory + Path.DirectorySeparatorChar +
 				qtype.IName + ".cs", false, new ASCIIEncoding());
 			writer.Write(Header);
-			writer.Write(StartClass(qtype.IName, "public", qtype.QAncestors));
+			writer.Write(StartClass(qtype.IName, "public", qtype.TQAncestors));
 
-			foreach (QMethod qmethod in qtype.QMethods) {
+			foreach (TQMethod qmethod in qtype.TQMethods) {
 				if (qmethod.Throttle || qmethod.Access == "public static" || qmethod.Access == "protected") {
 				} else {
 					writer.Write(IMethod(qmethod.PascalName, qmethod.Return, qmethod.CSharpParams));
@@ -167,7 +167,7 @@ namespace QtCSharp {
 
 			sb.Append(tab+access+" class "+name+" : ");
 			if (qancestors.Count == 0) sb.Append ("QtSupport");
-			foreach (QAncestor qancestor in qancestors) {
+			foreach (TQAncestor qancestor in qancestors) {
 				if (!qancestor.IsInterface) {
 					if (qancestor.Name == "Qt") {
 						sb.Append ("QtSupport");
@@ -180,7 +180,7 @@ namespace QtCSharp {
 				}
 			}
 
-			foreach (QAncestor qancestor in qancestors) {
+			foreach (TQAncestor qancestor in qancestors) {
 				if (qancestor.IsInterface) {
 						sb.Append (", "+qancestor.IName);
 				}
@@ -205,18 +205,18 @@ namespace QtCSharp {
 
 		public string WriteInherited (string name, string access)
 		{
-			return 	"\n\n"+tab+tab+access+" "+name+" () : this (QNull.Instance) {}";
+			return 	"\n\n"+tab+tab+access+" "+name+" () : this (TQNull.Instance) {}";
 		}
 
 		public string WriteDummy (string name, string access)
 		{
-			return 	"\n\n"+tab+tab+access+" "+name+" (QNull dummy) : base (QNull.Instance) {}";
+			return 	"\n\n"+tab+tab+access+" "+name+" (TQNull dummy) : base (TQNull.Instance) {}";
 		}
 
 		public string WriteBoxer (string name, string access)
 		{
 			return 	"\n\n" +
-			        tab+tab+access+" "+name+" (IntPtr ptr) : this (QNull.Instance)\n"+tab+tab+"{\n" +
+			        tab+tab+access+" "+name+" (IntPtr ptr) : this (TQNull.Instance)\n"+tab+tab+"{\n" +
 			        tab+tab+tab+"rawObject = ptr;\n" +
 					tab+tab+tab+"RegisterObject(this);\n" +
 					tab+tab+"}";
@@ -233,7 +233,7 @@ namespace QtCSharp {
 
 		public string StartCtor (string name, string access, ArrayList csharpparams)
 		{
-			return 	"\n"+tab+tab+access+" "+name+" ("+Params(csharpparams)+") : this (QNull.Instance)\n"+tab+tab+"{\n";
+			return 	"\n"+tab+tab+access+" "+name+" ("+Params(csharpparams)+") : this (TQNull.Instance)\n"+tab+tab+"{\n";
 		}
 
 		public string StartDCtor (string name)
@@ -245,7 +245,7 @@ namespace QtCSharp {
 		{
 			string str = "\n"+tab+tab+access+" "+returntype+" "+name+" ("+Params(csharpparams)+")\n"+tab+tab+"{\n";
 
-			// QEvents should never be disposed inside C#
+			// TQEvents should never be disposed inside C#
 			if (access.IndexOf ("static") <= 0)
 				str += "\t\t\tif (disposed)\n\t\t\t\tthrow new ObjectDisposedException (this+\": Attempted use of disposed object\");\n\n";
 
@@ -284,7 +284,7 @@ namespace QtCSharp {
 		{
 			int count = 0;
 			StringBuilder sb = new StringBuilder();
-			foreach (QItem qitem in qitems) {
+			foreach (TQItem qitem in qitems) {
 				count++;
 				sb.Append("\n"+tab+tab+tab+qitem.Name+" = "+qitem.Value);
 				if (count != qitems.Count)
@@ -297,7 +297,7 @@ namespace QtCSharp {
 		{
 			int count = 0;
 			StringBuilder sb = new StringBuilder();
-			foreach (QParam qparam in qparams) {
+			foreach (TQParam qparam in qparams) {
 				count++;
 				if (qparam.Type != "")
 					sb.Append(qparam.Type+" "+qparam.Name);
@@ -347,13 +347,13 @@ namespace QtCSharp {
 
 		public string RawObject (string name, string id, ArrayList qparams)
 		{
-			if (qtype.IsQObject) {
+			if (qtype.IsTQObject) {
 				ArrayList newparams = new ArrayList ();
 
-				foreach (QParam parm in qparams) {
+				foreach (TQParam parm in qparams) {
 					//Console.WriteLine ("--> {0}", parm.Name);
 					if (parm.Name == "parent.RawObject") {
-						QParam newparm = parm.Clone() as QParam;
+						TQParam newparm = parm.Clone() as TQParam;
 						newparm.Name = "parent != null ? parent.RawObject : IntPtr.Zero";
 						newparams.Add (newparm);
 					}
@@ -390,7 +390,7 @@ namespace QtCSharp {
 			string newid = id == "0" ? "" : id;
 
 			if (boxer && qstring) {
-				ret = "\t\t\treturn new TQString (qt_"+type+"_"+name+newid+" ("+instPtr+comma+Params (qparams)+"));\n";
+				ret = "\t\t\treturn new TTQString (qt_"+type+"_"+name+newid+" ("+instPtr+comma+Params (qparams)+"));\n";
 			}
 			else if (boxer) {
 				ret = "\t\t\treturn LookupObject (qt_"+type+"_"+name+newid+" ("+instPtr+comma+Params (qparams)+"), typeof ("+ReturnType+")) as "+ReturnType+";";
@@ -416,7 +416,7 @@ namespace QtCSharp {
 			string newid = id == "0" ? "" : id;
 
 			if (boxer && qstring) {
-				ret = "\t\t\treturn new TQString (qt_"+type+"_"+name+newid+" ("+Params (qparams)+"));\n";
+				ret = "\t\t\treturn new TTQString (qt_"+type+"_"+name+newid+" ("+Params (qparams)+"));\n";
 			}
 			else if (boxer) {
 				ret = "\t\t\treturn LookupObject (qt_"+type+"_"+name+newid+" ("+Params (qparams)+"), typeof ("+ReturnType+")) as "+ReturnType+";\n";
@@ -496,12 +496,12 @@ namespace QtCSharp {
 						 "\t\tinternal override void Delete ()\n" +
 						 "\t\t{\n";
 
-			// Let Qt manage QEvents
+			// Let Qt manage TQEvents
 			if (! (qtype.Name.StartsWith ("Q") && qtype.Name.EndsWith ("Event")))
 			{
 				ret +=  "\t\t\tif (deleted) return;\n\n";
 
-				if (qtype.QDCtors.Count > 0)
+				if (qtype.TQDCtors.Count > 0)
 					ret += "\t\t\tqt_del_"+qtype.Name+" (rawObject);\n";
 				else
 					ret = "\n" + ret + "\t\t\t// libqtc lacks a qt_del_"+qtype.Name+" function\n";
@@ -517,7 +517,7 @@ namespace QtCSharp {
 
 		public string DefaultConnections ()
 		{
-			if (qtype.IsQObject)
+			if (qtype.IsTQObject)
 				return "\n\t\t\tConnect (this, TQT_SIGNAL (\"destroyed ()\"), TQT_SLOT (\"NativeDestroyed ()\"));";
 			else
 				return "";
diff --git a/qtsharp/src/generator/QAncestor.cs b/qtsharp/src/generator/QAncestor.cs
index 5467a902..bb35051b 100644
--- a/qtsharp/src/generator/QAncestor.cs
+++ b/qtsharp/src/generator/QAncestor.cs
@@ -20,7 +20,7 @@ using System;
 
 namespace QtCSharp {
 
-	public class QAncestor : QType {
+	public class TQAncestor : TQType {
 		
 	}
 }
diff --git a/qtsharp/src/generator/QCtor.cs b/qtsharp/src/generator/QCtor.cs
index 880bf13b..8a7ec439 100644
--- a/qtsharp/src/generator/QCtor.cs
+++ b/qtsharp/src/generator/QCtor.cs
@@ -22,7 +22,7 @@ using System.Collections;
 
 namespace QtCSharp {
 
-	public class QCtor : QMember{
+	public class TQCtor : TQMember{
 
 		bool dummy, parent, inherited;
 
diff --git a/qtsharp/src/generator/QDCtor.cs b/qtsharp/src/generator/QDCtor.cs
index 8aef33c0..de70a51e 100644
--- a/qtsharp/src/generator/QDCtor.cs
+++ b/qtsharp/src/generator/QDCtor.cs
@@ -22,17 +22,17 @@ using System.Collections;
 
 namespace QtCSharp {
 
-	public class QDCtor {
+	public class TQDCtor {
 
 		string name, access;
 		ArrayList qparams;
 
-		public QDCtor()
+		public TQDCtor()
 		{
 			qparams = new ArrayList();
 		}
 
-		public void AddQParam(QParam qparam)
+		public void AddTQParam(TQParam qparam)
 		{
 			qparams.Add(qparam);
 		}
@@ -49,7 +49,7 @@ namespace QtCSharp {
 			set {access = value;}
 		}
 
-		public ArrayList QParams
+		public ArrayList TQParams
 		{
 			get {return qparams;}
 		}
diff --git a/qtsharp/src/generator/QEnum.cs b/qtsharp/src/generator/QEnum.cs
index 1be81b41..f2304b02 100644
--- a/qtsharp/src/generator/QEnum.cs
+++ b/qtsharp/src/generator/QEnum.cs
@@ -22,17 +22,17 @@ using System.Collections;
 
 namespace QtCSharp {
 
-	public class QEnum {
+	public class TQEnum {
 
 		string name, access, type;
 		ArrayList qitems;
 
-		public QEnum()
+		public TQEnum()
 		{
 			qitems = new ArrayList();
 		}
 
-		public void AddQItem(QItem qitem)
+		public void AddTQItem(TQItem qitem)
 		{
 			qitems.Add(qitem);
 		}
@@ -55,7 +55,7 @@ namespace QtCSharp {
 			set {type = value;}
 		}
 
-		public ArrayList QItems
+		public ArrayList TQItems
 		{
 			get {return qitems;}
 		}
diff --git a/qtsharp/src/generator/QItem.cs b/qtsharp/src/generator/QItem.cs
index 22e23c63..a678de4d 100644
--- a/qtsharp/src/generator/QItem.cs
+++ b/qtsharp/src/generator/QItem.cs
@@ -21,11 +21,11 @@ using System;
 
 namespace QtCSharp {
 
-	public class QItem {
+	public class TQItem {
 
 		string name, qvalue;
 
-		public QItem()
+		public TQItem()
 		{
 		}
 
diff --git a/qtsharp/src/generator/QMember.cs b/qtsharp/src/generator/QMember.cs
index 95c00280..6fb7b14b 100644
--- a/qtsharp/src/generator/QMember.cs
+++ b/qtsharp/src/generator/QMember.cs
@@ -22,13 +22,13 @@ using System.Collections;
 
 namespace QtCSharp {
 
-	public class QMember {
+	public class TQMember {
 
 		string name, access, id;
 		bool overload, throttle, boxer;
 		ArrayList pinvokeparams, pinvokecallparams, csharpparams, overloadparams;
 
-		public QMember()
+		public TQMember()
 		{
 			pinvokeparams = new ArrayList();
 			pinvokecallparams = new ArrayList();
@@ -37,22 +37,22 @@ namespace QtCSharp {
 		}
 
 
-		public void AddPinvokeParam(QParam pinvokeparam)
+		public void AddPinvokeParam(TQParam pinvokeparam)
 		{
 			pinvokeparams.Add(pinvokeparam);
 		}
 
-		public void AddPinvokeCallParam(QParam pinvokecallparam)
+		public void AddPinvokeCallParam(TQParam pinvokecallparam)
 		{
 			pinvokecallparams.Add(pinvokecallparam);
 		}
 
-		public void AddCSharpParam(QParam csharpparam)
+		public void AddCSharpParam(TQParam csharpparam)
 		{
 			csharpparams.Add(csharpparam);
 		}
 
-		public void AddOverloadParam(QParam overloadparam)
+		public void AddOverloadParam(TQParam overloadparam)
 		{
 			overloadparams.Add(overloadparam);
 		}
diff --git a/qtsharp/src/generator/QMethod.cs b/qtsharp/src/generator/QMethod.cs
index 6bd6eebd..085935c4 100644
--- a/qtsharp/src/generator/QMethod.cs
+++ b/qtsharp/src/generator/QMethod.cs
@@ -22,7 +22,7 @@ using System.Collections;
 
 namespace QtCSharp {
 
-	public class QMethod : QMember {
+	public class TQMethod : TQMember {
 
 		bool qstringreturn;
 		string returntype, pinvokereturn, pascalname;
@@ -39,7 +39,7 @@ namespace QtCSharp {
 			set {pinvokereturn = value;}
 		}
 		
-		public bool QStringReturn
+		public bool TQStringReturn
 		{
 			get {return qstringreturn;}
 			set {qstringreturn = value;}
diff --git a/qtsharp/src/generator/QParam.cs b/qtsharp/src/generator/QParam.cs
index 53212bad..7cf27183 100644
--- a/qtsharp/src/generator/QParam.cs
+++ b/qtsharp/src/generator/QParam.cs
@@ -21,11 +21,11 @@ using System;
 
 namespace QtCSharp {
 
-	public class QParam: ICloneable {
+	public class TQParam: ICloneable {
 
 		string type, name, defaultvalue;
 
-		public QParam()
+		public TQParam()
 		{}
 
 		public object Clone()
diff --git a/qtsharp/src/generator/QType.cs b/qtsharp/src/generator/QType.cs
index 16ba8f56..dd358025 100644
--- a/qtsharp/src/generator/QType.cs
+++ b/qtsharp/src/generator/QType.cs
@@ -22,13 +22,13 @@ using System.Collections;
 
 namespace QtCSharp {
 
-	public class QType {
+	public class TQType {
 
 		string name, access, iname;
-		bool isInterface, isConverted, isQObject;
+		bool isInterface, isConverted, isTQObject;
 		ArrayList qancestors, qenums, qctors, qdctors, qmethods;
 
-		public QType ()
+		public TQType ()
 		{
 			qancestors = new ArrayList ();
 			qenums = new ArrayList ();
@@ -37,27 +37,27 @@ namespace QtCSharp {
 			qmethods = new ArrayList ();
 		}
 
-		public void AddQAncestor (QAncestor qancestor)
+		public void AddTQAncestor (TQAncestor qancestor)
 		{
 			qancestors.Add (qancestor);
 		}
 
-		public void AddQEnum (QEnum qenum)
+		public void AddTQEnum (TQEnum qenum)
 		{
 			qenums.Add (qenum);
 		}
 
-		public void AddQCtor (QCtor qctor)
+		public void AddTQCtor (TQCtor qctor)
 		{
 			qctors.Add (qctor);
 		}
 
-		public void AddQDCtor (QDCtor qdctor)
+		public void AddTQDCtor (TQDCtor qdctor)
 		{
 			qdctors.Add (qdctor);
 		}
 
-		public void AddQMethod (QMethod qmethod)
+		public void AddTQMethod (TQMethod qmethod)
 		{
 			qmethods.Add (qmethod);
 		}
@@ -86,9 +86,9 @@ namespace QtCSharp {
 			set {isConverted = value;}
 		}
 
-		public bool IsQObject {
-			get { return isQObject; }
-			set { isQObject = value; }
+		public bool IsTQObject {
+			get { return isTQObject; }
+			set { isTQObject = value; }
 		}
 
 		public string IName
@@ -97,27 +97,27 @@ namespace QtCSharp {
 			set {iname = value;}
 		}
 
-		public ArrayList QAncestors
+		public ArrayList TQAncestors
 		{
 			get {return qancestors;}
 		}
 
-		public ArrayList QEnums
+		public ArrayList TQEnums
 		{
 			get {return qenums;}
 		}
 
-		public ArrayList QCtors
+		public ArrayList TQCtors
 		{
 			get {return qctors;}
 		}
 
-		public ArrayList QDCtors
+		public ArrayList TQDCtors
 		{
 			get {return qdctors;}
 		}
 
-		public ArrayList QMethods
+		public ArrayList TQMethods
 		{
 			get {return qmethods;}
 			set {qmethods = value;}
diff --git a/qtsharp/src/generator/QTypeMap.cs b/qtsharp/src/generator/QTypeMap.cs
index 321c4738..05a7afa2 100644
--- a/qtsharp/src/generator/QTypeMap.cs
+++ b/qtsharp/src/generator/QTypeMap.cs
@@ -21,11 +21,11 @@ using System.Collections;
 
 namespace QtCSharp {
 
-	public class QTypeMap {
+	public class TQTypeMap {
 
 		Hashtable arraymap, mastermap, pinvoketypes, pinvokecalltypes, csharptypes, overloadtypes, reserved, interfaces;
 
-		public QTypeMap ()
+		public TQTypeMap ()
 		{
 			arraymap = new Hashtable ();
 			arraymap.Add ("void*", "int[]");
@@ -44,8 +44,8 @@ namespace QtCSharp {
 
 			mastermap = new Hashtable ();
 			mastermap.Add ("void", "void");
-		//	mastermap.Add ("TQByteArray", "byte[]");
-			mastermap.Add ("TQBitArray", "byte[]");
+		//	mastermap.Add ("TTQByteArray", "byte[]");
+			mastermap.Add ("TTQBitArray", "byte[]");
 			mastermap.Add ("uchar", "string");
 			mastermap.Add ("unsigned int", "uint");
 			mastermap.Add ("unsigned short", "ushort");
@@ -63,17 +63,17 @@ namespace QtCSharp {
 			mastermap.Add ("EventRef", "IntPtr");
 			mastermap.Add ("MSG", "IntPtr");
 			mastermap.Add ("XEvent", "IntPtr");
-			mastermap.Add ("QWSEvent", "IntPtr");
+			mastermap.Add ("TQWSEvent", "IntPtr");
 			mastermap.Add ("GDHandle", "IntPtr");
-			mastermap.Add ("QRgb", "int");
-			mastermap.Add ("QWSDecoration", "IntPtr");
-			mastermap.Add ("QTextParag", "IntPtr");
+			mastermap.Add ("TQRgb", "int");
+			mastermap.Add ("TQWSDecoration", "IntPtr");
+			mastermap.Add ("TQTextParag", "IntPtr");
 			mastermap.Add ("Qt.HANDLE", "IntPtr");
-			mastermap.Add ("QUObject", "IntPtr");
-			mastermap.Add ("QGfx", "IntPtr");
-			mastermap.Add ("QRESULT", "long");
-			mastermap.Add ("QUnknownInterface", "IntPtr");
-			mastermap.Add ("TQPtrCollection.Item", "int");
+			mastermap.Add ("TQUObject", "IntPtr");
+			mastermap.Add ("TQGfx", "IntPtr");
+			mastermap.Add ("TQRESULT", "long");
+			mastermap.Add ("TQUnknownInterface", "IntPtr");
+			mastermap.Add ("TTQPtrCollection.Item", "int");
 			mastermap.Add ("type", "IntPtr");
 			mastermap.Add ("array_data", "IntPtr");
 			mastermap.Add ("bitarr_data", "IntPtr");
@@ -87,14 +87,14 @@ namespace QtCSharp {
 			mastermap.Add ("Q_UINT32", "uint");
 			mastermap.Add ("Q_UINT8", "char");
 			mastermap.Add ("Q_ULONG", "long");
-			mastermap.Add ("QStyleHintReturn", "IntPtr");
-			mastermap.Add ("QFileInfoList", "IntPtr");
-			mastermap.Add ("QDomNodePrivate", "IntPtr");
+			mastermap.Add ("TQStyleHintReturn", "IntPtr");
+			mastermap.Add ("TQFileInfoList", "IntPtr");
+			mastermap.Add ("TQDomNodePrivate", "IntPtr");
 			mastermap.Add ("GUID", "System.Guid");
 			mastermap.Add ("FILE", "string");
 			mastermap.Add ("EncoderFn", "int");
 			mastermap.Add ("DecoderFn", "int");
-			mastermap.Add ("QDiskFont", "IntPtr");
+			mastermap.Add ("TQDiskFont", "IntPtr");
 			mastermap.Add ("pointer", "IntPtr");
 			mastermap.Add ("T", "IntPtr");
 			mastermap.Add ("T1", "IntPtr");
@@ -105,31 +105,31 @@ namespace QtCSharp {
 			mastermap.Add ("reference", "IntPtr");
 			mastermap.Add ("_reference", "IntPtr");
 			mastermap.Add ("ConstIterator", "int");
-			mastermap.Add ("QWSDisplay", "IntPtr");
+			mastermap.Add ("TQWSDisplay", "IntPtr");
 			mastermap.Add ("CGContextRef", "IntPtr");
 			mastermap.Add ("WId", "uint");
-			mastermap.Add ("QWidgetMapper", "IntPtr");
+			mastermap.Add ("TQWidgetMapper", "IntPtr");
 			mastermap.Add ("size_type", "int");
 			mastermap.Add ("Item", "IntPtr");
 			mastermap.Add ("image_io_handler", "int");
-			mastermap.Add ("QCOORD", "short");
+			mastermap.Add ("TQCOORD", "short");
 			mastermap.Add ("key_type", "IntPtr");
 			mastermap.Add ("K", "IntPtr");
 			mastermap.Add ("NodePtr", "int");
-			mastermap.Add ("QTextFormat", "IntPtr");
-			mastermap.Add ("QTextDocument", "IntPtr");
-			mastermap.Add ("QTextCursor", "IntPtr");
+			mastermap.Add ("TQTextFormat", "IntPtr");
+			mastermap.Add ("TQTextDocument", "IntPtr");
+			mastermap.Add ("TQTextCursor", "IntPtr");
 			mastermap.Add ("_NPStream", "IntPtr");
 			mastermap.Add ("PID", "long");
 			mastermap.Add ("Region", "int");
 			mastermap.Add ("RgnHandle", "IntPtr");
-			mastermap.Add ("QRemoteInterface", "IntPtr");
+			mastermap.Add ("TQRemoteInterface", "IntPtr");
 			mastermap.Add ("mode_t", "int");
-			mastermap.Add ("TQSqlFieldInfo", "IntPtr");
-			mastermap.Add ("TQSqlRecordInfo", "IntPtr");
-			mastermap.Add ("QSqlRecordPrivate", "IntPtr");
-			mastermap.Add ("QTSMFI", "int");
-			mastermap.Add ("Widget", "TQWidget");
+			mastermap.Add ("TTQSqlFieldInfo", "IntPtr");
+			mastermap.Add ("TTQSqlRecordInfo", "IntPtr");
+			mastermap.Add ("TQSqlRecordPrivate", "IntPtr");
+			mastermap.Add ("TQTSMFI", "int");
+			mastermap.Add ("Widget", "TTQWidget");
 			mastermap.Add ("WidgetClass", "int");
 			mastermap.Add ("ArgList", "int");
 			mastermap.Add ("Cardinal", "int");
@@ -138,117 +138,117 @@ namespace QtCSharp {
 			mastermap.Add ("ULONG_MAX", "UInt64.MaxValue");
 
 			// Enums
-			mastermap.Add ("Event", "TQAccessible.Event");
-			mastermap.Add ("Role", "TQAccessible.Role");
-			mastermap.Add ("NavDirection", "TQAccessible.NavDirection");
-			mastermap.Add ("Text", "TQAccessible.Text");
-			mastermap.Add ("ColorSpec", "TQApplication.ColorSpec");
-			mastermap.Add ("ToggleState", "TQButton.ToggleState");
-			mastermap.Add ("RttiValues", "TQCanvasItem.RttiValues");
-			mastermap.Add ("FrameAnimationType", "TQCanvasSprite.FrameAnimationType");
-			mastermap.Add ("Category", "TQChar.Category");
-			mastermap.Add ("Decomposition", "TQChar.Decomposition");
-			mastermap.Add ("Joining", "TQChar.Joining");
-			mastermap.Add ("CombiningClass", "TQChar.CombiningClass");
-			mastermap.Add ("Spec", "TQColor.Spec");
-			mastermap.Add ("ColorRole", "TQColorGroup.ColorRole");
-			mastermap.Add ("Boundary", "TQDataBrowser.Boundary");
-			mastermap.Add ("ByteOrder", "TQDataStream.ByteOrder");
-			mastermap.Add ("Refresh", "TQDataTable.Refresh");
-			mastermap.Add ("Order", "QDateEdit.Order");
-			mastermap.Add ("DialogCode", "TQDialog.DialogCode");
-			mastermap.Add ("FilterSpec", "TQDir.FilterSpec");
-			mastermap.Add ("SortSpec", "TQDir.SortSpec");
-			mastermap.Add ("RecordType", "TQDns.RecordType");
-			mastermap.Add ("HandlePosition", "TQDockArea.HandlePosition");
-			mastermap.Add ("Place", "TQDockWindow.Place");
-			mastermap.Add ("CloseMode", "TQDockWindow.CloseMode");
-			mastermap.Add ("NodeType", "TQDomNode.NodeType");
-			mastermap.Add ("DragMode", "TQDragObject.DragMode");
-			mastermap.Add ("Action", "TQDropEvent.Action");
-			mastermap.Add ("ViewMode", "TQFileDialog.ViewMode");
-			mastermap.Add ("PreviewMode", "TQFileDialog.PreviewMode");
-			mastermap.Add ("PermissionSpec", "TQFileInfo.PermissionSpec");
-			mastermap.Add ("StyleStrategy", "TQFont.StyleStrategy");
-			mastermap.Add ("Weight", "TQFont.Weight");
-			mastermap.Add ("Script", "TQFont.Script");
-			mastermap.Add ("Shadow", "TQFrame.Shadow");
-			mastermap.Add ("FormatOption", "TQGL.FormatOption");
-			mastermap.Add ("Corner", "TQGridLayout.Corner");
-			mastermap.Add ("Size", "TQIconSet.Size");
-			mastermap.Add ("Arrangement", "TQIconView.Arrangement");
-			mastermap.Add ("ItemTextPos", "TQIconView.ItemTextPos");
-			mastermap.Add ("Endian", "TQImage.Endian");
-			mastermap.Add ("ScaleMode", "TQImage.ScaleMode");
-			mastermap.Add ("PaintDeviceFlags", "TQInternal.PaintDeviceFlags");
-			mastermap.Add ("Rules", "TQJpUnicodeConv.Rules");
-			mastermap.Add ("SegmentStyle", "QLCDNumber.SegmentStyle");
-			mastermap.Add ("LayoutMode", "TQListBox.LayoutMode");
-			mastermap.Add ("WidthMode", "TQListView.WidthMode");
-			mastermap.Add ("RenameAction", "TQListView.RenameAction");
-			mastermap.Add ("DockWindows", "TQMainWindow.DockWindows");
-			mastermap.Add ("Color", "QMapNodeBase.Color");
-			mastermap.Add ("Separator", "TQMenuBar.Separator");
-			mastermap.Add ("Icon", "TQMessageBox.Icon");
-			mastermap.Add ("Access", "QMetaData.Access");
-			mastermap.Add ("Flags", "TQMetaProperty.Flags");
-			mastermap.Add ("Status", "TQMovie.Status");
-			mastermap.Add ("InstanceMode", "QNPInstance.InstanceMode");
-			mastermap.Add ("StreamMode", "QNPInstance.StreamMode");
-			mastermap.Add ("Operation", "TQNetworkProtocol.Operation");
-			mastermap.Add ("ConnectionState", "TQNetworkProtocol.ConnectionState");
-			mastermap.Add ("DisposalMethod", "QPNGImageWriter.DisposalMethod");
-			mastermap.Add ("PDevCmd", "TQPaintDevice.PDevCmd");
-			mastermap.Add ("CoordinateMode", "TQPainter.CoordinateMode");
-			mastermap.Add ("TextDirection", "TQPainter.TextDirection");
-			mastermap.Add ("ColorGroup", "TQPalette.ColorGroup");
-			mastermap.Add ("Optimization", "TQPixmap.Optimization");
-			mastermap.Add ("Edge", "TQPolygonScanner.Edge");
-			mastermap.Add ("PrinterMode", "TQPrinter.PrinterMode");
-			mastermap.Add ("PageSize", "TQPrinter.PageSize");
-			mastermap.Add ("PageOrder", "TQPrinter.PageOrder");
-			mastermap.Add ("PaperSource", "TQPrinter.PaperSource");
-			mastermap.Add ("Communication", "TQProcess.Communication");
-			mastermap.Add ("RegionType", "TQRegion.RegionType");
-			mastermap.Add ("ResizePolicy", "TQScrollView.ResizePolicy");
-			mastermap.Add ("ScrollBarMode", "TQScrollView.ScrollBarMode");
-			mastermap.Add ("RestartHint", "QSessionManager.RestartHint");
-			mastermap.Add ("System", "TQSettings.System");
-			mastermap.Add ("SizeType", "TQSizePolicy.SizeType");
-			mastermap.Add ("ExpandData", "TQSizePolicy.ExpandData");
-			mastermap.Add ("TickSetting", "TQSlider.TickSetting");
-			mastermap.Add ("Op", "TQSql.Op");
-			mastermap.Add ("Location", "TQSql.Location");
-			mastermap.Add ("Confirm", "TQSql.Confirm");
-			mastermap.Add ("DriverFeature", "TQSqlDriver.DriverFeature");
-			mastermap.Add ("SectionFlags", "TQString.SectionFlags");
-			mastermap.Add ("PrimitiveElement", "TQStyle.PrimitiveElement");
-			mastermap.Add ("StyleFlags", "TQStyle.StyleFlags");
-			mastermap.Add ("SFlags", "TQStyle.StyleFlags");
-			mastermap.Add ("ControlElement", "TQStyle.ControlElement");
-			mastermap.Add ("SubRect", "TQStyle.SubRect");
-			mastermap.Add ("ComplexControl", "TQStyle.ComplexControl");
-			mastermap.Add ("SubControl", "TQStyle.SubControl");
-			mastermap.Add ("SCFlags", "TQStyle.SubControl");
-			mastermap.Add ("PixelMetric", "TQStyle.PixelMetric");
-			mastermap.Add ("ContentsType", "TQStyle.ContentsType");
-			mastermap.Add ("StylePixmap", "TQStyle.StylePixmap");
-			mastermap.Add ("StyleOptionDefault", "TQStyleOption.StyleOptionDefault");
-			mastermap.Add ("AdditionalStyleValues", "TQStyleSheetItem.AdditionalStyleValues");
-			mastermap.Add ("DisplayMode", "TQStyleSheetItem.DisplayMode");
-			mastermap.Add ("WhiteSpaceMode", "TQStyleSheetItem.WhiteSpaceMode");
-			mastermap.Add ("Margin", "TQStyleSheetItem.Margin");
-			mastermap.Add ("ListStyle", "TQStyleSheetItem.ListStyle");
-			mastermap.Add ("FocusStyle", "TQTable.FocusStyle");
-			mastermap.Add ("EditMode", "TQTable.EditMode");
-			mastermap.Add ("EditType", "TQTableItem.EditType");
-			mastermap.Add ("TabletDevice", "TQTabletEvent.TabletDevice");
-			mastermap.Add ("KeyboardAction", "TQTextEdit.KeyboardAction");
-			mastermap.Add ("CursorAction", "TQTextEdit.CursorAction");
-			mastermap.Add ("SaveMode", "QTranslator.SaveMode");
-			mastermap.Add ("Prefix", "QTranslatorMessage.Prefix");
-			mastermap.Add ("FocusPolicy", "TQWidget.FocusPolicy");
-			mastermap.Add ("BackgroundOrigin", "TQWidget.BackgroundOrigin");
+			mastermap.Add ("Event", "TTQAccessible.Event");
+			mastermap.Add ("Role", "TTQAccessible.Role");
+			mastermap.Add ("NavDirection", "TTQAccessible.NavDirection");
+			mastermap.Add ("Text", "TTQAccessible.Text");
+			mastermap.Add ("ColorSpec", "TTQApplication.ColorSpec");
+			mastermap.Add ("ToggleState", "TTQButton.ToggleState");
+			mastermap.Add ("RttiValues", "TTQCanvasItem.RttiValues");
+			mastermap.Add ("FrameAnimationType", "TTQCanvasSprite.FrameAnimationType");
+			mastermap.Add ("Category", "TTQChar.Category");
+			mastermap.Add ("Decomposition", "TTQChar.Decomposition");
+			mastermap.Add ("Joining", "TTQChar.Joining");
+			mastermap.Add ("CombiningClass", "TTQChar.CombiningClass");
+			mastermap.Add ("Spec", "TTQColor.Spec");
+			mastermap.Add ("ColorRole", "TTQColorGroup.ColorRole");
+			mastermap.Add ("Boundary", "TTQDataBrowser.Boundary");
+			mastermap.Add ("ByteOrder", "TTQDataStream.ByteOrder");
+			mastermap.Add ("Refresh", "TTQDataTable.Refresh");
+			mastermap.Add ("Order", "TQDateEdit.Order");
+			mastermap.Add ("DialogCode", "TTQDialog.DialogCode");
+			mastermap.Add ("FilterSpec", "TTQDir.FilterSpec");
+			mastermap.Add ("SortSpec", "TTQDir.SortSpec");
+			mastermap.Add ("RecordType", "TTQDns.RecordType");
+			mastermap.Add ("HandlePosition", "TTQDockArea.HandlePosition");
+			mastermap.Add ("Place", "TTQDockWindow.Place");
+			mastermap.Add ("CloseMode", "TTQDockWindow.CloseMode");
+			mastermap.Add ("NodeType", "TTQDomNode.NodeType");
+			mastermap.Add ("DragMode", "TTQDragObject.DragMode");
+			mastermap.Add ("Action", "TTQDropEvent.Action");
+			mastermap.Add ("ViewMode", "TTQFileDialog.ViewMode");
+			mastermap.Add ("PreviewMode", "TTQFileDialog.PreviewMode");
+			mastermap.Add ("PermissionSpec", "TTQFileInfo.PermissionSpec");
+			mastermap.Add ("StyleStrategy", "TTQFont.StyleStrategy");
+			mastermap.Add ("Weight", "TTQFont.Weight");
+			mastermap.Add ("Script", "TTQFont.Script");
+			mastermap.Add ("Shadow", "TTQFrame.Shadow");
+			mastermap.Add ("FormatOption", "TTQGL.FormatOption");
+			mastermap.Add ("Corner", "TTQGridLayout.Corner");
+			mastermap.Add ("Size", "TTQIconSet.Size");
+			mastermap.Add ("Arrangement", "TTQIconView.Arrangement");
+			mastermap.Add ("ItemTextPos", "TTQIconView.ItemTextPos");
+			mastermap.Add ("Endian", "TTQImage.Endian");
+			mastermap.Add ("ScaleMode", "TTQImage.ScaleMode");
+			mastermap.Add ("PaintDeviceFlags", "TTQInternal.PaintDeviceFlags");
+			mastermap.Add ("Rules", "TTQJpUnicodeConv.Rules");
+			mastermap.Add ("SegmentStyle", "TQLCDNumber.SegmentStyle");
+			mastermap.Add ("LayoutMode", "TTQListBox.LayoutMode");
+			mastermap.Add ("WidthMode", "TTQListView.WidthMode");
+			mastermap.Add ("RenameAction", "TTQListView.RenameAction");
+			mastermap.Add ("DockWindows", "TTQMainWindow.DockWindows");
+			mastermap.Add ("Color", "TQMapNodeBase.Color");
+			mastermap.Add ("Separator", "TTQMenuBar.Separator");
+			mastermap.Add ("Icon", "TTQMessageBox.Icon");
+			mastermap.Add ("Access", "TQMetaData.Access");
+			mastermap.Add ("Flags", "TTQMetaProperty.Flags");
+			mastermap.Add ("Status", "TTQMovie.Status");
+			mastermap.Add ("InstanceMode", "TQNPInstance.InstanceMode");
+			mastermap.Add ("StreamMode", "TQNPInstance.StreamMode");
+			mastermap.Add ("Operation", "TTQNetworkProtocol.Operation");
+			mastermap.Add ("ConnectionState", "TTQNetworkProtocol.ConnectionState");
+			mastermap.Add ("DisposalMethod", "TQPNGImageWriter.DisposalMethod");
+			mastermap.Add ("PDevCmd", "TTQPaintDevice.PDevCmd");
+			mastermap.Add ("CoordinateMode", "TTQPainter.CoordinateMode");
+			mastermap.Add ("TextDirection", "TTQPainter.TextDirection");
+			mastermap.Add ("ColorGroup", "TTQPalette.ColorGroup");
+			mastermap.Add ("Optimization", "TTQPixmap.Optimization");
+			mastermap.Add ("Edge", "TTQPolygonScanner.Edge");
+			mastermap.Add ("PrinterMode", "TTQPrinter.PrinterMode");
+			mastermap.Add ("PageSize", "TTQPrinter.PageSize");
+			mastermap.Add ("PageOrder", "TTQPrinter.PageOrder");
+			mastermap.Add ("PaperSource", "TTQPrinter.PaperSource");
+			mastermap.Add ("Communication", "TTQProcess.Communication");
+			mastermap.Add ("RegionType", "TTQRegion.RegionType");
+			mastermap.Add ("ResizePolicy", "TTQScrollView.ResizePolicy");
+			mastermap.Add ("ScrollBarMode", "TTQScrollView.ScrollBarMode");
+			mastermap.Add ("RestartHint", "TQSessionManager.RestartHint");
+			mastermap.Add ("System", "TTQSettings.System");
+			mastermap.Add ("SizeType", "TTQSizePolicy.SizeType");
+			mastermap.Add ("ExpandData", "TTQSizePolicy.ExpandData");
+			mastermap.Add ("TickSetting", "TTQSlider.TickSetting");
+			mastermap.Add ("Op", "TTQSql.Op");
+			mastermap.Add ("Location", "TTQSql.Location");
+			mastermap.Add ("Confirm", "TTQSql.Confirm");
+			mastermap.Add ("DriverFeature", "TTQSqlDriver.DriverFeature");
+			mastermap.Add ("SectionFlags", "TTQString.SectionFlags");
+			mastermap.Add ("PrimitiveElement", "TTQStyle.PrimitiveElement");
+			mastermap.Add ("StyleFlags", "TTQStyle.StyleFlags");
+			mastermap.Add ("SFlags", "TTQStyle.StyleFlags");
+			mastermap.Add ("ControlElement", "TTQStyle.ControlElement");
+			mastermap.Add ("SubRect", "TTQStyle.SubRect");
+			mastermap.Add ("ComplexControl", "TTQStyle.ComplexControl");
+			mastermap.Add ("SubControl", "TTQStyle.SubControl");
+			mastermap.Add ("SCFlags", "TTQStyle.SubControl");
+			mastermap.Add ("PixelMetric", "TTQStyle.PixelMetric");
+			mastermap.Add ("ContentsType", "TTQStyle.ContentsType");
+			mastermap.Add ("StylePixmap", "TTQStyle.StylePixmap");
+			mastermap.Add ("StyleOptionDefault", "TTQStyleOption.StyleOptionDefault");
+			mastermap.Add ("AdditionalStyleValues", "TTQStyleSheetItem.AdditionalStyleValues");
+			mastermap.Add ("DisplayMode", "TTQStyleSheetItem.DisplayMode");
+			mastermap.Add ("WhiteSpaceMode", "TTQStyleSheetItem.WhiteSpaceMode");
+			mastermap.Add ("Margin", "TTQStyleSheetItem.Margin");
+			mastermap.Add ("ListStyle", "TTQStyleSheetItem.ListStyle");
+			mastermap.Add ("FocusStyle", "TTQTable.FocusStyle");
+			mastermap.Add ("EditMode", "TTQTable.EditMode");
+			mastermap.Add ("EditType", "TTQTableItem.EditType");
+			mastermap.Add ("TabletDevice", "TTQTabletEvent.TabletDevice");
+			mastermap.Add ("KeyboardAction", "TTQTextEdit.KeyboardAction");
+			mastermap.Add ("CursorAction", "TTQTextEdit.CursorAction");
+			mastermap.Add ("SaveMode", "TQTranslator.SaveMode");
+			mastermap.Add ("Prefix", "TQTranslatorMessage.Prefix");
+			mastermap.Add ("FocusPolicy", "TTQWidget.FocusPolicy");
+			mastermap.Add ("BackgroundOrigin", "TTQWidget.BackgroundOrigin");
 			mastermap.Add ("ButtonState", "Qt.ButtonState");
 			mastermap.Add ("AlignmentFlags", "Qt.AlignmentFlags");
 			mastermap.Add ("TextFlags", "Qt.TextFlags");
@@ -278,75 +278,75 @@ namespace QtCSharp {
 			mastermap.Add ("StringComparisonMode", "Qt.StringComparisonMode");
 			mastermap.Add ("ComparisonFlags", "Qt.StringComparisonMode");
 			
-			// We need to make sure all params use the interfaces, ie IQPaintDevice
-			/*mastermap.Add ("QAccessibleFactoryInterface", "IQAccessibleFactory");
-			mastermap.Add ("QAccessibleInterface", "IQAccessible");*/
-			mastermap.Add ("TQPaintDevice", "IQPaintDevice");
-			/*mastermap.Add ("TQMenuData", "IQMenuData");
-			mastermap.Add ("TQRangeControl", "IQRangeControl");
-			mastermap.Add ("TQMimeSource", "IQMimeSource");
-			mastermap.Add ("TQLayoutItem", "IQLayoutItem");
-			mastermap.Add ("TQUrl", "IQUrl");
-			mastermap.Add ("QIODevice", "IQIODevice");
-			mastermap.Add ("TQXmlContentHandler", "IQXmlContentHandler");
-			mastermap.Add ("TQXmlErrorHandler", "IQXmlErrorHandler");
-			mastermap.Add ("TQXmlDTDHandler", "IQXmlDTDHandler");
-			mastermap.Add ("TQXmlEntityResolver", "IQXmlEntityResolver");
-			//mastermap.Add ("TQXmlLexicalHandler", "IQXmlLexicalHandler");
-			mastermap.Add ("TQXmlDeclHandler", "IQXmlDeclHandler");
+			// We need to make sure all params use the interfaces, ie ITQPaintDevice
+			/*mastermap.Add ("TQAccessibleFactoryInterface", "ITQAccessibleFactory");
+			mastermap.Add ("TQAccessibleInterface", "ITQAccessible");*/
+			mastermap.Add ("TTQPaintDevice", "ITQPaintDevice");
+			/*mastermap.Add ("TTQMenuData", "ITQMenuData");
+			mastermap.Add ("TTQRangeControl", "ITQRangeControl");
+			mastermap.Add ("TTQMimeSource", "ITQMimeSource");
+			mastermap.Add ("TTQLayoutItem", "ITQLayoutItem");
+			mastermap.Add ("TTQUrl", "ITQUrl");
+			mastermap.Add ("TQIODevice", "ITQIODevice");
+			mastermap.Add ("TTQXmlContentHandler", "ITQXmlContentHandler");
+			mastermap.Add ("TTQXmlErrorHandler", "ITQXmlErrorHandler");
+			mastermap.Add ("TTQXmlDTDHandler", "ITQXmlDTDHandler");
+			mastermap.Add ("TTQXmlEntityResolver", "ITQXmlEntityResolver");
+			//mastermap.Add ("TTQXmlLexicalHandler", "ITQXmlLexicalHandler");
+			mastermap.Add ("TTQXmlDeclHandler", "ITQXmlDeclHandler");
 			mastermap.Add ("QwAbsSpriteFieldView", "IQwAbsSpriteFieldView");
-			mastermap.Add ("TQSqlQuery", "IQSqlQuery");
-			mastermap.Add ("QFeatureListInterface", "IQFeatureList");
-			mastermap.Add ("QUnknownInterface", "IQUnknown");
-			mastermap.Add ("QShared", "IQShared");*/
+			mastermap.Add ("TTQSqlQuery", "ITQSqlQuery");
+			mastermap.Add ("TQFeatureListInterface", "ITQFeatureList");
+			mastermap.Add ("TQUnknownInterface", "ITQUnknown");
+			mastermap.Add ("TQShared", "ITQShared");*/
 
 			// Key Duplication
-			//mastermap.Add ("Direction", "TQBoxLayout.Direction");
-			//mastermap.Add ("Direction", "TQChar.Direction");
-			//mastermap.Add ("Reason", "TQContextMenuEvent.Reason");
-			//mastermap.Add ("Reason", "TQFocusEvent.Reason");
-			//mastermap.Add ("Reason", "QNPInstance.Reason");
-			//mastermap.Add ("Mode", "TQFileDialog.Mode");
-			//mastermap.Add ("Mode", "TQIconSet.Mode");
-			//mastermap.Add ("Mode", "QLCDNumber.Mode");
-			//mastermap.Add ("Mode", "TQSqlCursor.Mode");
-			//mastermap.Add ("Shape", "TQFrame.Shape");
-			//mastermap.Add ("Shape", "TQTabBar.Shape");
-			//mastermap.Add ("KeyType", "TQGCache.KeyType");
-			//mastermap.Add ("KeyType", "TQGDict.KeyType");
-			//mastermap.Add ("State", "TQAccessible.State");
-			//mastermap.Add ("State", "TQNetworkProtocol.State");
-			//mastermap.Add ("State", "TQSocket.State");
-			//mastermap.Add ("State", "TQValidator.State");
-			//mastermap.Add ("ResizeMode", "TQIconView.ResizeMode");
-			//mastermap.Add ("ResizeMode", "TQLayout.ResizeMode");
-			//mastermap.Add ("ResizeMode", "TQListView.ResizeMode");
-			//mastermap.Add ("ResizeMode", "TQListView.ResizeMode");
-			//mastermap.Add ("EchoMode", "TQLineEdit.EchoMode");
+			//mastermap.Add ("Direction", "TTQBoxLayout.Direction");
+			//mastermap.Add ("Direction", "TTQChar.Direction");
+			//mastermap.Add ("Reason", "TTQContextMenuEvent.Reason");
+			//mastermap.Add ("Reason", "TTQFocusEvent.Reason");
+			//mastermap.Add ("Reason", "TQNPInstance.Reason");
+			//mastermap.Add ("Mode", "TTQFileDialog.Mode");
+			//mastermap.Add ("Mode", "TTQIconSet.Mode");
+			//mastermap.Add ("Mode", "TQLCDNumber.Mode");
+			//mastermap.Add ("Mode", "TTQSqlCursor.Mode");
+			//mastermap.Add ("Shape", "TTQFrame.Shape");
+			//mastermap.Add ("Shape", "TTQTabBar.Shape");
+			//mastermap.Add ("KeyType", "TTQGCache.KeyType");
+			//mastermap.Add ("KeyType", "TTQGDict.KeyType");
+			//mastermap.Add ("State", "TTQAccessible.State");
+			//mastermap.Add ("State", "TTQNetworkProtocol.State");
+			//mastermap.Add ("State", "TTQSocket.State");
+			//mastermap.Add ("State", "TTQValidator.State");
+			//mastermap.Add ("ResizeMode", "TTQIconView.ResizeMode");
+			//mastermap.Add ("ResizeMode", "TTQLayout.ResizeMode");
+			//mastermap.Add ("ResizeMode", "TTQListView.ResizeMode");
+			//mastermap.Add ("ResizeMode", "TTQListView.ResizeMode");
+			//mastermap.Add ("EchoMode", "TTQLineEdit.EchoMode");
 			//mastermap.Add ("EchoMode", "QtMultiLineEdit.EchoMode");
-			//mastermap.Add ("ColorMode", "TQApplication.ColorMode");
-			//mastermap.Add ("ColorMode", "TQPrinter.ColorMode");
-			//mastermap.Add ("ColorMode", "TQPixmap.ColorMode");
-			//mastermap.Add ("SelectionMode", "TQIconView.SelectionMode");
-			//mastermap.Add ("SelectionMode", "TQListBox.SelectionMode");
-			//mastermap.Add ("SelectionMode", "TQListView.SelectionMode");
-			//mastermap.Add ("SelectionMode", "TQTable.SelectionMode");
-			//mastermap.Add ("Error", "TQSocket.Error");
-			//mastermap.Add ("Error", "TQSocketDevice.Error");
-			//mastermap.Add ("Error", "TQNetworkProtocol.Error");
-			//mastermap.Add ("ButtonSymbols", "TQSpinBox.ButtonSymbols");
-			//mastermap.Add ("ButtonSymbols", "TQSpinWidget.ButtonSymbols");
-			//mastermap.Add ("StyleHint", "TQStyle.StyleHint");
-			//mastermap.Add ("StyleHint", "TQFont.StyleHint");
-			//mastermap.Add ("Encoding", "TQApplication.Encoding");
-			//mastermap.Add ("Encoding", "TQTextStream.Encoding");
-			//mastermap.Add ("VerticalAlignment", "TQTextEdit.VerticalAlignment");
-			//mastermap.Add ("VerticalAlignment", "TQStyleSheetItem.VerticalAlignment");
-			//mastermap.Add ("Orientation", "TQPrinter.Orientation");
+			//mastermap.Add ("ColorMode", "TTQApplication.ColorMode");
+			//mastermap.Add ("ColorMode", "TTQPrinter.ColorMode");
+			//mastermap.Add ("ColorMode", "TTQPixmap.ColorMode");
+			//mastermap.Add ("SelectionMode", "TTQIconView.SelectionMode");
+			//mastermap.Add ("SelectionMode", "TTQListBox.SelectionMode");
+			//mastermap.Add ("SelectionMode", "TTQListView.SelectionMode");
+			//mastermap.Add ("SelectionMode", "TTQTable.SelectionMode");
+			//mastermap.Add ("Error", "TTQSocket.Error");
+			//mastermap.Add ("Error", "TTQSocketDevice.Error");
+			//mastermap.Add ("Error", "TTQNetworkProtocol.Error");
+			//mastermap.Add ("ButtonSymbols", "TTQSpinBox.ButtonSymbols");
+			//mastermap.Add ("ButtonSymbols", "TTQSpinWidget.ButtonSymbols");
+			//mastermap.Add ("StyleHint", "TTQStyle.StyleHint");
+			//mastermap.Add ("StyleHint", "TTQFont.StyleHint");
+			//mastermap.Add ("Encoding", "TTQApplication.Encoding");
+			//mastermap.Add ("Encoding", "TTQTextStream.Encoding");
+			//mastermap.Add ("VerticalAlignment", "TTQTextEdit.VerticalAlignment");
+			//mastermap.Add ("VerticalAlignment", "TTQStyleSheetItem.VerticalAlignment");
+			//mastermap.Add ("Orientation", "TTQPrinter.Orientation");
 			//mastermap.Add ("Orientation", "Qt.Orientation");
-			//mastermap.Add ("WrapPolicy", "TQTextEdit.WrapPolicy");
+			//mastermap.Add ("WrapPolicy", "TTQTextEdit.WrapPolicy");
 			//mastermap.Add ("WrapPolicy", "QtMultiLineEdit.WrapPolicy");
-			//mastermap.Add ("WordWrap", "TQTextEdit.WordWrap");
+			//mastermap.Add ("WordWrap", "TTQTextEdit.WordWrap");
 			//mastermap.Add ("WordWrap", "QtMultiLineEdit.WordWrap");
 
 			// These are here in case we need to override the mastermap
@@ -367,26 +367,26 @@ namespace QtCSharp {
 
 			// The allowed interfaces
 			interfaces = new Hashtable ();
-			interfaces.Add ("QAccessibleFactoryInterface", "IQAccessibleFactory");
-			interfaces.Add ("QAccessibleInterface", "IQAccessible");
-			interfaces.Add ("TQPaintDevice", "IQPaintDevice");
-			interfaces.Add ("TQMenuData", "IQMenuData");
-			interfaces.Add ("TQRangeControl", "IQRangeControl");
-			interfaces.Add ("TQMimeSource", "IQMimeSource");
-			interfaces.Add ("TQLayoutItem", "IQLayoutItem");
-			interfaces.Add ("TQUrl", "IQUrl");
-			interfaces.Add ("QIODevice", "IQIODevice");
-			interfaces.Add ("TQXmlContentHandler", "IQXmlContentHandler");
-			interfaces.Add ("TQXmlErrorHandler", "IQXmlErrorHandler");
-			interfaces.Add ("TQXmlDTDHandler", "IQXmlDTDHandler");
-			interfaces.Add ("TQXmlEntityResolver", "IQXmlEntityResolver");
-			//interfaces.Add ("TQXmlLexicalHandler", "IQXmlLexicalHandler");
-			interfaces.Add ("TQXmlDeclHandler", "IQXmlDeclHandler");
+			interfaces.Add ("TQAccessibleFactoryInterface", "ITQAccessibleFactory");
+			interfaces.Add ("TQAccessibleInterface", "ITQAccessible");
+			interfaces.Add ("TTQPaintDevice", "ITQPaintDevice");
+			interfaces.Add ("TTQMenuData", "ITQMenuData");
+			interfaces.Add ("TTQRangeControl", "ITQRangeControl");
+			interfaces.Add ("TTQMimeSource", "ITQMimeSource");
+			interfaces.Add ("TTQLayoutItem", "ITQLayoutItem");
+			interfaces.Add ("TTQUrl", "ITQUrl");
+			interfaces.Add ("TQIODevice", "ITQIODevice");
+			interfaces.Add ("TTQXmlContentHandler", "ITQXmlContentHandler");
+			interfaces.Add ("TTQXmlErrorHandler", "ITQXmlErrorHandler");
+			interfaces.Add ("TTQXmlDTDHandler", "ITQXmlDTDHandler");
+			interfaces.Add ("TTQXmlEntityResolver", "ITQXmlEntityResolver");
+			//interfaces.Add ("TTQXmlLexicalHandler", "ITQXmlLexicalHandler");
+			interfaces.Add ("TTQXmlDeclHandler", "ITQXmlDeclHandler");
 			interfaces.Add ("QwAbsSpriteFieldView", "IQwAbsSpriteFieldView");
-			interfaces.Add ("TQSqlQuery", "IQSqlQuery");
-			interfaces.Add ("QFeatureListInterface", "IQFeatureList");
-			interfaces.Add ("QUnknownInterface", "IQUnknown");
-			interfaces.Add ("QShared", "IQShared");
+			interfaces.Add ("TTQSqlQuery", "ITQSqlQuery");
+			interfaces.Add ("TQFeatureListInterface", "ITQFeatureList");
+			interfaces.Add ("TQUnknownInterface", "ITQUnknown");
+			interfaces.Add ("TQShared", "ITQShared");
 		}
 
 		public string PinvokeType (string str)