Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebindings@1157645 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

4 files changed, 195 insertions, 195 deletions

diff --git a/qtsharp/src/generator/Converter.cs b/qtsharp/src/generator/Converter.cs
index 143aa9da..8f6ce3b0 100644
--- a/qtsharp/src/generator/Converter.cs
+++ b/qtsharp/src/generator/Converter.cs
@@ -100,7 +100,7 @@ namespace QtCSharp {
 		{
 			sig.Append (qctor.Name);
 			foreach (QParam qparam in qctor.CSharpParams) {
-				//if (qparam.Type == "QWidget" && qparam.Name == "parent")
+				//if (qparam.Type == "TQWidget" && qparam.Name == "parent")
 				if (qparam.Name == "parent")
 					qctor.Parent = true;
 				sig.Append (qparam.Type);
@@ -137,7 +137,7 @@ namespace QtCSharp {
 				if (IsIQObject (qparam.Type))
 					qparam.Name = qparam.Name + "." + StripInterface (qparam.Type) + " ()";
 		/*		if (IsQString (qparam.Type))
-					qparam.Name = "new QString ("+StripPtr(qparam.Name)+").RawObject";*/
+					qparam.Name = "new TQString ("+StripPtr(qparam.Name)+").RawObject";*/
 				qparam.Type = "";
 			}
 		}
@@ -189,8 +189,8 @@ namespace QtCSharp {
 		public void OverloadedQString (QParam qparam)
 		{
 			if (IsQString (qparam.Type)){
-				qparam.Type = "QString";
-				if (qparam.Default == "QString::null")
+				qparam.Type = "TQString";
+				if (qparam.Default == "TQString::null")
 					qparam.Default = "null";
 				else if (qparam.Default == "quotquot")
 					qparam.Default = "null";
@@ -286,7 +286,7 @@ namespace QtCSharp {
 			} else {
 				qmethod.PinvokeReturn = qmethod.Return;
 			}
-			if (qmethod.Return == "QString") {
+			if (qmethod.Return == "TQString") {
 				qmethod.QStringReturn = true;
 			}
 		}
@@ -312,7 +312,7 @@ namespace QtCSharp {
 		public string ConvertQString (string str)
 		{	
 			if (IsQString (str))
-				return "QString";
+				return "TQString";
 			else
 				return str;
 		}
@@ -417,9 +417,9 @@ namespace QtCSharp {
 		
 		public bool IsQString (string str)
 		{
-			if (qtype.Name == "QString")
+			if (qtype.Name == "TQString")
 				return true;
-			else if (IsQObject (str) && str == "QString")
+			else if (IsQObject (str) && str == "TQString")
 				return true;
 			else
 				return false;
diff --git a/qtsharp/src/generator/ParseAPI.cs b/qtsharp/src/generator/ParseAPI.cs
index 57569c7b..a79a8ab9 100644
--- a/qtsharp/src/generator/ParseAPI.cs
+++ b/qtsharp/src/generator/ParseAPI.cs
@@ -72,13 +72,13 @@ namespace QtCSharp {
 		private static bool IsQObject(QType t, Hashtable typehash)
 		{
 			if (t.IsInterface) return false;
-			if (t.Name == "QObject") return true;
+			if (t.Name == "TQObject") return true;
 
 			foreach (QAncestor a in t.QAncestors) {
 				QType at = (QType)typehash[a.Name];
 				if (at == null)
 					continue;
-				else if (at.Name == "QObject")
+				else if (at.Name == "TQObject")
 					return true;
 				else if (IsQObject(at, typehash))
 					return true;
diff --git a/qtsharp/src/generator/Printer.cs b/qtsharp/src/generator/Printer.cs
index c4f6df87..cdf705fe 100644
--- a/qtsharp/src/generator/Printer.cs
+++ b/qtsharp/src/generator/Printer.cs
@@ -390,7 +390,7 @@ namespace QtCSharp {
 			string newid = id == "0" ? "" : id;
 
 			if (boxer && qstring) {
-				ret = "\t\t\treturn new QString (qt_"+type+"_"+name+newid+" ("+instPtr+comma+Params (qparams)+"));\n";
+				ret = "\t\t\treturn new TQString (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 QString (qt_"+type+"_"+name+newid+" ("+Params (qparams)+"));\n";
+				ret = "\t\t\treturn new TQString (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";
@@ -518,7 +518,7 @@ namespace QtCSharp {
 		public string DefaultConnections ()
 		{
 			if (qtype.IsQObject)
-				return "\n\t\t\tConnect (this, SIGNAL (\"destroyed ()\"), SLOT (\"NativeDestroyed ()\"));";
+				return "\n\t\t\tConnect (this, TQT_SIGNAL (\"destroyed ()\"), TQT_SLOT (\"NativeDestroyed ()\"));";
 			else
 				return "";
 		}
diff --git a/qtsharp/src/generator/QTypeMap.cs b/qtsharp/src/generator/QTypeMap.cs
index 241dc825..fdba1342 100644
--- a/qtsharp/src/generator/QTypeMap.cs
+++ b/qtsharp/src/generator/QTypeMap.cs
@@ -44,8 +44,8 @@ namespace QtCSharp {
 
 			mastermap = new Hashtable ();
 			mastermap.Add ("void", "void");
-		//	mastermap.Add ("QByteArray", "byte[]");
-			mastermap.Add ("QBitArray", "byte[]");
+		//	mastermap.Add ("TQByteArray", "byte[]");
+			mastermap.Add ("TQBitArray", "byte[]");
 			mastermap.Add ("uchar", "string");
 			mastermap.Add ("unsigned int", "uint");
 			mastermap.Add ("unsigned short", "ushort");
@@ -73,7 +73,7 @@ namespace QtCSharp {
 			mastermap.Add ("QGfx", "IntPtr");
 			mastermap.Add ("QRESULT", "long");
 			mastermap.Add ("QUnknownInterface", "IntPtr");
-			mastermap.Add ("QPtrCollection.Item", "int");
+			mastermap.Add ("TQPtrCollection.Item", "int");
 			mastermap.Add ("type", "IntPtr");
 			mastermap.Add ("array_data", "IntPtr");
 			mastermap.Add ("bitarr_data", "IntPtr");
@@ -125,11 +125,11 @@ namespace QtCSharp {
 			mastermap.Add ("RgnHandle", "IntPtr");
 			mastermap.Add ("QRemoteInterface", "IntPtr");
 			mastermap.Add ("mode_t", "int");
-			mastermap.Add ("QSqlFieldInfo", "IntPtr");
-			mastermap.Add ("QSqlRecordInfo", "IntPtr");
+			mastermap.Add ("TQSqlFieldInfo", "IntPtr");
+			mastermap.Add ("TQSqlRecordInfo", "IntPtr");
 			mastermap.Add ("QSqlRecordPrivate", "IntPtr");
 			mastermap.Add ("QTSMFI", "int");
-			mastermap.Add ("Widget", "QWidget");
+			mastermap.Add ("Widget", "TQWidget");
 			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", "QAccessible.Event");
-			mastermap.Add ("Role", "QAccessible.Role");
-			mastermap.Add ("NavDirection", "QAccessible.NavDirection");
-			mastermap.Add ("Text", "QAccessible.Text");
-			mastermap.Add ("ColorSpec", "QApplication.ColorSpec");
-			mastermap.Add ("ToggleState", "QButton.ToggleState");
-			mastermap.Add ("RttiValues", "QCanvasItem.RttiValues");
-			mastermap.Add ("FrameAnimationType", "QCanvasSprite.FrameAnimationType");
-			mastermap.Add ("Category", "QChar.Category");
-			mastermap.Add ("Decomposition", "QChar.Decomposition");
-			mastermap.Add ("Joining", "QChar.Joining");
-			mastermap.Add ("CombiningClass", "QChar.CombiningClass");
-			mastermap.Add ("Spec", "QColor.Spec");
-			mastermap.Add ("ColorRole", "QColorGroup.ColorRole");
-			mastermap.Add ("Boundary", "QDataBrowser.Boundary");
-			mastermap.Add ("ByteOrder", "QDataStream.ByteOrder");
-			mastermap.Add ("Refresh", "QDataTable.Refresh");
+			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", "QDialog.DialogCode");
-			mastermap.Add ("FilterSpec", "QDir.FilterSpec");
-			mastermap.Add ("SortSpec", "QDir.SortSpec");
-			mastermap.Add ("RecordType", "QDns.RecordType");
-			mastermap.Add ("HandlePosition", "QDockArea.HandlePosition");
-			mastermap.Add ("Place", "QDockWindow.Place");
-			mastermap.Add ("CloseMode", "QDockWindow.CloseMode");
-			mastermap.Add ("NodeType", "QDomNode.NodeType");
-			mastermap.Add ("DragMode", "QDragObject.DragMode");
-			mastermap.Add ("Action", "QDropEvent.Action");
-			mastermap.Add ("ViewMode", "QFileDialog.ViewMode");
-			mastermap.Add ("PreviewMode", "QFileDialog.PreviewMode");
-			mastermap.Add ("PermissionSpec", "QFileInfo.PermissionSpec");
-			mastermap.Add ("StyleStrategy", "QFont.StyleStrategy");
-			mastermap.Add ("Weight", "QFont.Weight");
-			mastermap.Add ("Script", "QFont.Script");
-			mastermap.Add ("Shadow", "QFrame.Shadow");
-			mastermap.Add ("FormatOption", "QGL.FormatOption");
-			mastermap.Add ("Corner", "QGridLayout.Corner");
-			mastermap.Add ("Size", "QIconSet.Size");
-			mastermap.Add ("Arrangement", "QIconView.Arrangement");
-			mastermap.Add ("ItemTextPos", "QIconView.ItemTextPos");
-			mastermap.Add ("Endian", "QImage.Endian");
-			mastermap.Add ("ScaleMode", "QImage.ScaleMode");
-			mastermap.Add ("PaintDeviceFlags", "QInternal.PaintDeviceFlags");
-			mastermap.Add ("Rules", "QJpUnicodeConv.Rules");
-			mastermap.Add ("SegmentStyle", "QLCDNumber.SegmentStyle");
-			mastermap.Add ("LayoutMode", "QListBox.LayoutMode");
-			mastermap.Add ("WidthMode", "QListView.WidthMode");
-			mastermap.Add ("RenameAction", "QListView.RenameAction");
-			mastermap.Add ("DockWindows", "QMainWindow.DockWindows");
+			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", "TQLCDNumber.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", "QMenuBar.Separator");
-			mastermap.Add ("Icon", "QMessageBox.Icon");
+			mastermap.Add ("Separator", "TQMenuBar.Separator");
+			mastermap.Add ("Icon", "TQMessageBox.Icon");
 			mastermap.Add ("Access", "QMetaData.Access");
-			mastermap.Add ("Flags", "QMetaProperty.Flags");
-			mastermap.Add ("Status", "QMovie.Status");
-			mastermap.Add ("InstanceMode", "QNPInstance.InstanceMode");
-			mastermap.Add ("StreamMode", "QNPInstance.StreamMode");
-			mastermap.Add ("Operation", "QNetworkProtocol.Operation");
-			mastermap.Add ("ConnectionState", "QNetworkProtocol.ConnectionState");
-			mastermap.Add ("DisposalMethod", "QPNGImageWriter.DisposalMethod");
-			mastermap.Add ("PDevCmd", "QPaintDevice.PDevCmd");
-			mastermap.Add ("CoordinateMode", "QPainter.CoordinateMode");
-			mastermap.Add ("TextDirection", "QPainter.TextDirection");
-			mastermap.Add ("ColorGroup", "QPalette.ColorGroup");
-			mastermap.Add ("Optimization", "QPixmap.Optimization");
-			mastermap.Add ("Edge", "QPolygonScanner.Edge");
-			mastermap.Add ("PrinterMode", "QPrinter.PrinterMode");
-			mastermap.Add ("PageSize", "QPrinter.PageSize");
-			mastermap.Add ("PageOrder", "QPrinter.PageOrder");
-			mastermap.Add ("PaperSource", "QPrinter.PaperSource");
-			mastermap.Add ("Communication", "QProcess.Communication");
-			mastermap.Add ("RegionType", "QRegion.RegionType");
-			mastermap.Add ("ResizePolicy", "QScrollView.ResizePolicy");
-			mastermap.Add ("ScrollBarMode", "QScrollView.ScrollBarMode");
+			mastermap.Add ("Flags", "TQMetaProperty.Flags");
+			mastermap.Add ("Status", "TQMovie.Status");
+			mastermap.Add ("InstanceMode", "TQNPInstance.InstanceMode");
+			mastermap.Add ("StreamMode", "TQNPInstance.StreamMode");
+			mastermap.Add ("Operation", "TQNetworkProtocol.Operation");
+			mastermap.Add ("ConnectionState", "TQNetworkProtocol.ConnectionState");
+			mastermap.Add ("DisposalMethod", "TQPNGImageWriter.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", "QSettings.System");
-			mastermap.Add ("SizeType", "QSizePolicy.SizeType");
-			mastermap.Add ("ExpandData", "QSizePolicy.ExpandData");
-			mastermap.Add ("TickSetting", "QSlider.TickSetting");
-			mastermap.Add ("Op", "QSql.Op");
-			mastermap.Add ("Location", "QSql.Location");
-			mastermap.Add ("Confirm", "QSql.Confirm");
-			mastermap.Add ("DriverFeature", "QSqlDriver.DriverFeature");
-			mastermap.Add ("SectionFlags", "QString.SectionFlags");
-			mastermap.Add ("PrimitiveElement", "QStyle.PrimitiveElement");
-			mastermap.Add ("StyleFlags", "QStyle.StyleFlags");
-			mastermap.Add ("SFlags", "QStyle.StyleFlags");
-			mastermap.Add ("ControlElement", "QStyle.ControlElement");
-			mastermap.Add ("SubRect", "QStyle.SubRect");
-			mastermap.Add ("ComplexControl", "QStyle.ComplexControl");
-			mastermap.Add ("SubControl", "QStyle.SubControl");
-			mastermap.Add ("SCFlags", "QStyle.SubControl");
-			mastermap.Add ("PixelMetric", "QStyle.PixelMetric");
-			mastermap.Add ("ContentsType", "QStyle.ContentsType");
-			mastermap.Add ("StylePixmap", "QStyle.StylePixmap");
-			mastermap.Add ("StyleOptionDefault", "QStyleOption.StyleOptionDefault");
-			mastermap.Add ("AdditionalStyleValues", "QStyleSheetItem.AdditionalStyleValues");
-			mastermap.Add ("DisplayMode", "QStyleSheetItem.DisplayMode");
-			mastermap.Add ("WhiteSpaceMode", "QStyleSheetItem.WhiteSpaceMode");
-			mastermap.Add ("Margin", "QStyleSheetItem.Margin");
-			mastermap.Add ("ListStyle", "QStyleSheetItem.ListStyle");
-			mastermap.Add ("FocusStyle", "QTable.FocusStyle");
-			mastermap.Add ("EditMode", "QTable.EditMode");
-			mastermap.Add ("EditType", "QTableItem.EditType");
-			mastermap.Add ("TabletDevice", "QTabletEvent.TabletDevice");
-			mastermap.Add ("KeyboardAction", "QTextEdit.KeyboardAction");
-			mastermap.Add ("CursorAction", "QTextEdit.CursorAction");
+			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", "QWidget.FocusPolicy");
-			mastermap.Add ("BackgroundOrigin", "QWidget.BackgroundOrigin");
+			mastermap.Add ("FocusPolicy", "TQWidget.FocusPolicy");
+			mastermap.Add ("BackgroundOrigin", "TQWidget.BackgroundOrigin");
 			mastermap.Add ("ButtonState", "Qt.ButtonState");
 			mastermap.Add ("AlignmentFlags", "Qt.AlignmentFlags");
 			mastermap.Add ("TextFlags", "Qt.TextFlags");
@@ -281,72 +281,72 @@ namespace QtCSharp {
 			// We need to make sure all params use the interfaces, ie IQPaintDevice
 			/*mastermap.Add ("QAccessibleFactoryInterface", "IQAccessibleFactory");
 			mastermap.Add ("QAccessibleInterface", "IQAccessible");*/
-			mastermap.Add ("QPaintDevice", "IQPaintDevice");
-			/*mastermap.Add ("QMenuData", "IQMenuData");
-			mastermap.Add ("QRangeControl", "IQRangeControl");
-			mastermap.Add ("QMimeSource", "IQMimeSource");
-			mastermap.Add ("QLayoutItem", "IQLayoutItem");
-			mastermap.Add ("QUrl", "IQUrl");
-			mastermap.Add ("QIODevice", "IQIODevice");
-			mastermap.Add ("QXmlContentHandler", "IQXmlContentHandler");
-			mastermap.Add ("QXmlErrorHandler", "IQXmlErrorHandler");
-			mastermap.Add ("QXmlDTDHandler", "IQXmlDTDHandler");
-			mastermap.Add ("QXmlEntityResolver", "IQXmlEntityResolver");
-			//mastermap.Add ("QXmlLexicalHandler", "IQXmlLexicalHandler");
-			mastermap.Add ("QXmlDeclHandler", "IQXmlDeclHandler");
+			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 ("TQIODevice", "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");
 			mastermap.Add ("QwAbsSpriteFieldView", "IQwAbsSpriteFieldView");
-			mastermap.Add ("QSqlQuery", "IQSqlQuery");
+			mastermap.Add ("TQSqlQuery", "IQSqlQuery");
 			mastermap.Add ("QFeatureListInterface", "IQFeatureList");
 			mastermap.Add ("QUnknownInterface", "IQUnknown");
 			mastermap.Add ("QShared", "IQShared");*/
 
 			// Key Duplication
-			//mastermap.Add ("Direction", "QBoxLayout.Direction");
-			//mastermap.Add ("Direction", "QChar.Direction");
-			//mastermap.Add ("Reason", "QContextMenuEvent.Reason");
-			//mastermap.Add ("Reason", "QFocusEvent.Reason");
-			//mastermap.Add ("Reason", "QNPInstance.Reason");
-			//mastermap.Add ("Mode", "QFileDialog.Mode");
-			//mastermap.Add ("Mode", "QIconSet.Mode");
-			//mastermap.Add ("Mode", "QLCDNumber.Mode");
-			//mastermap.Add ("Mode", "QSqlCursor.Mode");
-			//mastermap.Add ("Shape", "QFrame.Shape");
-			//mastermap.Add ("Shape", "QTabBar.Shape");
-			//mastermap.Add ("KeyType", "QGCache.KeyType");
-			//mastermap.Add ("KeyType", "QGDict.KeyType");
-			//mastermap.Add ("State", "QAccessible.State");
-			//mastermap.Add ("State", "QNetworkProtocol.State");
-			//mastermap.Add ("State", "QSocket.State");
-			//mastermap.Add ("State", "QValidator.State");
-			//mastermap.Add ("ResizeMode", "QIconView.ResizeMode");
-			//mastermap.Add ("ResizeMode", "QLayout.ResizeMode");
-			//mastermap.Add ("ResizeMode", "QListView.ResizeMode");
-			//mastermap.Add ("ResizeMode", "QListView.ResizeMode");
-			//mastermap.Add ("EchoMode", "QLineEdit.EchoMode");
+			//mastermap.Add ("Direction", "TQBoxLayout.Direction");
+			//mastermap.Add ("Direction", "TQChar.Direction");
+			//mastermap.Add ("Reason", "TQContextMenuEvent.Reason");
+			//mastermap.Add ("Reason", "TQFocusEvent.Reason");
+			//mastermap.Add ("Reason", "TQNPInstance.Reason");
+			//mastermap.Add ("Mode", "TQFileDialog.Mode");
+			//mastermap.Add ("Mode", "TQIconSet.Mode");
+			//mastermap.Add ("Mode", "TQLCDNumber.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 ("EchoMode", "QtMultiLineEdit.EchoMode");
-			//mastermap.Add ("ColorMode", "QApplication.ColorMode");
-			//mastermap.Add ("ColorMode", "QPrinter.ColorMode");
-			//mastermap.Add ("ColorMode", "QPixmap.ColorMode");
-			//mastermap.Add ("SelectionMode", "QIconView.SelectionMode");
-			//mastermap.Add ("SelectionMode", "QListBox.SelectionMode");
-			//mastermap.Add ("SelectionMode", "QListView.SelectionMode");
-			//mastermap.Add ("SelectionMode", "QTable.SelectionMode");
-			//mastermap.Add ("Error", "QSocket.Error");
-			//mastermap.Add ("Error", "QSocketDevice.Error");
-			//mastermap.Add ("Error", "QNetworkProtocol.Error");
-			//mastermap.Add ("ButtonSymbols", "QSpinBox.ButtonSymbols");
-			//mastermap.Add ("ButtonSymbols", "QSpinWidget.ButtonSymbols");
-			//mastermap.Add ("StyleHint", "QStyle.StyleHint");
-			//mastermap.Add ("StyleHint", "QFont.StyleHint");
-			//mastermap.Add ("Encoding", "QApplication.Encoding");
-			//mastermap.Add ("Encoding", "QTextStream.Encoding");
-			//mastermap.Add ("VerticalAlignment", "QTextEdit.VerticalAlignment");
-			//mastermap.Add ("VerticalAlignment", "QStyleSheetItem.VerticalAlignment");
-			//mastermap.Add ("Orientation", "QPrinter.Orientation");
+			//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 ("Orientation", "Qt.Orientation");
-			//mastermap.Add ("WrapPolicy", "QTextEdit.WrapPolicy");
+			//mastermap.Add ("WrapPolicy", "TQTextEdit.WrapPolicy");
 			//mastermap.Add ("WrapPolicy", "QtMultiLineEdit.WrapPolicy");
-			//mastermap.Add ("WordWrap", "QTextEdit.WordWrap");
+			//mastermap.Add ("WordWrap", "TQTextEdit.WordWrap");
 			//mastermap.Add ("WordWrap", "QtMultiLineEdit.WordWrap");
 
 			// These are here in case we need to override the mastermap
@@ -369,21 +369,21 @@ namespace QtCSharp {
 			interfaces = new Hashtable ();
 			interfaces.Add ("QAccessibleFactoryInterface", "IQAccessibleFactory");
 			interfaces.Add ("QAccessibleInterface", "IQAccessible");
-			interfaces.Add ("QPaintDevice", "IQPaintDevice");
-			interfaces.Add ("QMenuData", "IQMenuData");
-			interfaces.Add ("QRangeControl", "IQRangeControl");
-			interfaces.Add ("QMimeSource", "IQMimeSource");
-			interfaces.Add ("QLayoutItem", "IQLayoutItem");
-			interfaces.Add ("QUrl", "IQUrl");
-			interfaces.Add ("QIODevice", "IQIODevice");
-			interfaces.Add ("QXmlContentHandler", "IQXmlContentHandler");
-			interfaces.Add ("QXmlErrorHandler", "IQXmlErrorHandler");
-			interfaces.Add ("QXmlDTDHandler", "IQXmlDTDHandler");
-			interfaces.Add ("QXmlEntityResolver", "IQXmlEntityResolver");
-			//interfaces.Add ("QXmlLexicalHandler", "IQXmlLexicalHandler");
-			interfaces.Add ("QXmlDeclHandler", "IQXmlDeclHandler");
+			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 ("TQIODevice", "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 ("QwAbsSpriteFieldView", "IQwAbsSpriteFieldView");
-			interfaces.Add ("QSqlQuery", "IQSqlQuery");
+			interfaces.Add ("TQSqlQuery", "IQSqlQuery");
 			interfaces.Add ("QFeatureListInterface", "IQFeatureList");
 			interfaces.Add ("QUnknownInterface", "IQUnknown");
 			interfaces.Add ("QShared", "IQShared");