diff options
Diffstat (limited to 'qtsharp/src/generator')
| -rw-r--r-- | qtsharp/src/generator/Printer.cs | 2 | ||||
| -rw-r--r-- | qtsharp/src/generator/TQTypeMap.cs | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/qtsharp/src/generator/Printer.cs b/qtsharp/src/generator/Printer.cs index 1289f107..3b852e72 100644 --- a/qtsharp/src/generator/Printer.cs +++ b/qtsharp/src/generator/Printer.cs @@ -518,7 +518,7 @@ namespace QtCSharp { public string DefaultConnections () { if (qtype.IsTQObject) - return "\n\t\t\tConnect (this, TQT_SIGNAL (\"destroyed ()\"), TQT_SLOT (\"NativeDestroyed ()\"));"; + return "\n\t\t\tConnect (this, TQ_SIGNAL (\"destroyed ()\"), TQ_SLOT (\"NativeDestroyed ()\"));"; else return ""; } diff --git a/qtsharp/src/generator/TQTypeMap.cs b/qtsharp/src/generator/TQTypeMap.cs index 8318cca4..378c0d10 100644 --- a/qtsharp/src/generator/TQTypeMap.cs +++ b/qtsharp/src/generator/TQTypeMap.cs @@ -59,7 +59,7 @@ namespace QtCSharp { mastermap.Add ("HPALETTE", "uint"); mastermap.Add ("HRGN", "uint"); mastermap.Add ("Display", "IntPtr"); - mastermap.Add ("Q_REFCOUNT bool", "bool"); + mastermap.Add ("TQ_REFCOUNT bool", "bool"); mastermap.Add ("EventRef", "IntPtr"); mastermap.Add ("MSG", "IntPtr"); mastermap.Add ("XEvent", "IntPtr"); @@ -193,8 +193,6 @@ namespace QtCSharp { mastermap.Add ("Access", "TQMetaData.Access"); 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"); @@ -305,7 +303,6 @@ namespace QtCSharp { //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"); @@ -323,7 +320,6 @@ namespace QtCSharp { //mastermap.Add ("ResizeMode", "TQListView.ResizeMode"); //mastermap.Add ("ResizeMode", "TQListView.ResizeMode"); //mastermap.Add ("EchoMode", "TQLineEdit.EchoMode"); - //mastermap.Add ("EchoMode", "QtMultiLineEdit.EchoMode"); //mastermap.Add ("ColorMode", "TQApplication.ColorMode"); //mastermap.Add ("ColorMode", "TQPrinter.ColorMode"); //mastermap.Add ("ColorMode", "TQPixmap.ColorMode"); @@ -345,9 +341,7 @@ namespace QtCSharp { //mastermap.Add ("Orientation", "TQPrinter.Orientation"); //mastermap.Add ("Orientation", "Qt.Orientation"); //mastermap.Add ("WrapPolicy", "TQTextEdit.WrapPolicy"); - //mastermap.Add ("WrapPolicy", "QtMultiLineEdit.WrapPolicy"); //mastermap.Add ("WordWrap", "TQTextEdit.WordWrap"); - //mastermap.Add ("WordWrap", "QtMultiLineEdit.WordWrap"); // These are here in case we need to override the mastermap pinvoketypes = new Hashtable (); |