diff options
Diffstat (limited to 'qtsharp/src')
28 files changed, 128 insertions, 493 deletions
diff --git a/qtsharp/src/api/qt.xml b/qtsharp/src/api/qt.xml index e2e84dad..9cf58705 100644 --- a/qtsharp/src/api/qt.xml +++ b/qtsharp/src/api/qt.xml @@ -305,7 +305,7 @@ <qparam type="TQUuidamp" name="arg1"/> <qparam type="TQUnknownInterface**" name="arg2"/> </qmethod> - <qmethod name="isValid" access="public" return="Q_REFCOUNT bool" id="0"/> + <qmethod name="isValid" access="public" return="TQ_REFCOUNT bool" id="0"/> <qmethod name="protected_object" access="protected" return="TQObject*" id="0"/> </qtype> <qtype name="TQAction" access="public"> <qancestor name="TQObject"/> @@ -1187,10 +1187,6 @@ id="0"> <qmethod name="isDown" access="public" return="bool" id="0"/> <qmethod name="isOn" access="public" return="bool" id="0"/> <qmethod name="state" access="public" return="ToggleState" id="0"/> - <qmethod name="autoResize" access="public" return="bool" id="0"/> - <qmethod name="setAutoResize" access="public" return="void" id="0"> - <qparam type="bool" name="arg1"/> - </qmethod> <qmethod name="autoRepeat" access="public" return="bool" id="0"/> <qmethod name="setAutoRepeat" access="public" return="void" id="0"> <qparam type="bool" name="arg1"/> @@ -9318,14 +9314,6 @@ id="0"/> <qparam type="int" name="arg4"/> </qmethod> <qmethod name="alignment" access="public" return="int" id="0"/> - <qmethod name="cursorLeft" access="public" return="void" id="0"> - <qparam type="bool" name="mark"/> - <qparam type="int" name="steps" default="1"/> - </qmethod> - <qmethod name="cursorRight" access="public" return="void" id="0"> - <qparam type="bool" name="mark"/> - <qparam type="int" name="steps" default="1"/> - </qmethod> <qmethod name="cursorForward" access="public" return="void" id="0"> <qparam type="bool" name="mark"/> <qparam type="int" name="steps" default="1"/> @@ -9360,8 +9348,6 @@ id="0"/> </qmethod> <qmethod name="isUndoAvailable" access="public" return="bool" id="0"/> <qmethod name="isRedoAvailable" access="public" return="bool" id="0"/> - <qmethod name="hasMarkedText" access="public" return="bool" id="0"/> - <qmethod name="markedText" access="public" return="TQString" id="0"/> <qmethod name="setPasswordChar" access="public" return="void" id="0"> <qparam type="TQChar" name="c"/> </qmethod> @@ -9426,10 +9412,6 @@ id="0"/> <qmethod name="protected_drawContents" access="protected" return="void" id="0"> <qparam type="TQPainter*" name="painter"/> </qmethod> - <qmethod name="protected_repaintArea" access="protected" return="void" id="0"> - <qparam type="int" name="arg1"/> - <qparam type="int" name="arg2"/> - </qmethod> <qmethod name="protected_createPopupMenu" access="protected" return="TQPopupMenu*" id="0"/> <qmethod name="protected_windowActivationChange" access="protected" @@ -13088,7 +13070,6 @@ id="0"> <qmethod name="active" access="public" return="TQColorGroupamp" id="0"/> <qmethod name="disabled" access="public" return="TQColorGroupamp" id="0"/> <qmethod name="inactive" access="public" return="TQColorGroupamp" id="0"/> - <qmethod name="normal" access="public" return="TQColorGroupamp" id="0"/> <qmethod name="setActive" access="public" return="void" id="0"> <qparam type="TQColorGroupamp" name="arg1"/> </qmethod> @@ -13098,9 +13079,6 @@ id="0"> <qmethod name="setInactive" access="public" return="void" id="0"> <qparam type="TQColorGroupamp" name="arg1"/> </qmethod> - <qmethod name="setNormal" access="public" return="void" id="0"> - <qparam type="TQColorGroupamp" name="cg"/> - </qmethod> <qmethod name="isCopyOf" access="public" return="bool" id="0"> <qparam type="TQPaletteamp" name="arg1"/> </qmethod> @@ -15189,14 +15167,6 @@ id="0"> <qmethod name="tryAccess" access="public" return="bool" id="0"> <qparam type="int" name="arg1"/> </qmethod> -</qtype> <qtype name="TQSemiModal" access="public"> - <qancestor name="TQDialog"/> - <qctor name="TQSemiModal" access="public" id="0"> - <qparam type="TQWidget*" name="parent" default="0"/> - <qparam type="char*" name="name" default="0"/> - <qparam type="bool" name="modal" default="FALSE"/> - <qparam type="WFlags" name="f" default="0"/> - </qctor> </qtype> <qtype name="TQSenderObject" access="public"> <qancestor name="TQObject"/> <qmethod name="setSender" access="public" return="void" id="0"> @@ -15372,14 +15342,6 @@ id="0"> <qparam type="char*" name="member" default="0"/> </qmethod> <qmethod name="activate" access="public" return="void" id="0"/> - <qmethod name="isBlocked" access="public" return="bool" id="0"/> - <qmethod name="block" access="public" return="void" id="0"> - <qparam type="bool" name="b"/> - </qmethod> - <qmethod name="setParameter" access="public" return="void" id="0"> - <qparam type="int" name="value"/> - </qmethod> - <qmethod name="parameter" access="public" return="int" id="0"/> <qmethod name="setValue" access="public" return="void" id="0"> <qparam type="TQVariantamp" name="value"/> </qmethod> @@ -15878,14 +15840,6 @@ id="0"> <qmethod name="protected_event" access="protected" return="bool" id="0"> <qparam type="TQEvent*" name="arg1"/> </qmethod> -</qtype> <qtype name="TQSortedList" access="public"> - <qancestor name="TQPtrList"/> - <qctor name="TQSortedList" access="public" id="0"/> - <qdctor name="TQSortedList" access="public"/> - <qmethod name="compareItems" access="public" return="int" id="0"> - <qparam type="TQPtrCollection::Item" name="s1"/> - <qparam type="TQPtrCollection::Item" name="s2"/> - </qmethod> </qtype> <qtype name="TQSound" access="public"> <qancestor name="TQObject"/> <qctor name="TQSound" access="public" id="0"> @@ -22888,270 +22842,5 @@ value="AlignLeft|AlignRight|AlignHCenter|AlignJustify"/> <qitem name="Contains" value="8"/> <qitem name="ExactMatch" value="16"/> </qenum> -</qtype> <qtype name="QtMultiLineEdit" access="public"> - <qancestor name="QtTableView"/> - <qenum name="EchoMode" access="public"> - <qitem name="Normal" value="0"/> - <qitem name="NoEcho" value="1"/> - <qitem name="Password" value="2"/> - </qenum> - <qenum name="WordWrap" access="public"> - <qitem name="NoWrap" value="0"/> - <qitem name="WidgetWidth" value="1"/> - <qitem name="FixedPixelWidth" value="2"/> - <qitem name="FixedColumnWidth" value="3"/> - </qenum> - <qenum name="WrapPolicy" access="public"> - <qitem name="AtWhiteSpace" value="0"/> - <qitem name="Anywhere" value="1"/> - </qenum> - <qctor name="QtMultiLineEdit" access="public" id="0"> - <qparam type="TQWidget*" name="parent" default="0"/> - <qparam type="char*" name="name" default="0"/> - </qctor> - <qdctor name="QtMultiLineEdit" access="public"/> - <qmethod name="textLine" access="public" return="TQString" id="0"> - <qparam type="int" name="line"/> - </qmethod> - <qmethod name="numLines" access="public" return="int" id="0"/> - <qmethod name="sizeHint" access="public" return="TQSize" id="0"/> - <qmethod name="minimumSizeHint" access="public" return="TQSize" id="0"/> - <qmethod name="sizePolicy" access="public" return="TQSizePolicy" id="0"/> - <qmethod name="setFont" access="public" return="void" id="0"> - <qparam type="TQFontamp" name="font"/> - </qmethod> - <qmethod name="insertLine" access="public" return="void" id="0"> - <qparam type="TQStringamp" name="s"/> - <qparam type="int" name="line" default="-1"/> - </qmethod> - <qmethod name="insertAt" access="public" return="void" id="0"> - <qparam type="TQStringamp" name="s"/> - <qparam type="int" name="line"/> - <qparam type="int" name="col"/> - <qparam type="bool" name="mark" default="FALSE"/> - </qmethod> - <qmethod name="removeLine" access="public" return="void" id="0"> - <qparam type="int" name="line"/> - </qmethod> - <qmethod name="cursorPosition" access="public" return="void" id="0"> - <qparam type="int*" name="line"/> - <qparam type="int*" name="col"/> - </qmethod> - <qmethod name="setCursorPosition" access="public" return="void" id="0"> - <qparam type="int" name="line"/> - <qparam type="int" name="col"/> - <qparam type="bool" name="mark" default="FALSE"/> - </qmethod> - <qmethod name="getCursorPosition" access="public" return="void" id="0"> - <qparam type="int*" name="line"/> - <qparam type="int*" name="col"/> - </qmethod> - <qmethod name="atBeginning" access="public" return="bool" id="0"/> - <qmethod name="atEnd" access="public" return="bool" id="0"/> - <qmethod name="setFixedVisibleLines" access="public" return="void" id="0"> - <qparam type="int" name="lines"/> - </qmethod> - <qmethod name="maxLineWidth" access="public" return="int" id="0"/> - <qmethod name="setAlignment" access="public" return="void" id="0"> - <qparam type="int" name="flags"/> - </qmethod> - <qmethod name="alignment" access="public" return="int" id="0"/> - <qmethod name="setValidator" access="public" return="void" id="0"> - <qparam type="TQValidator*" name="arg1"/> - </qmethod> - <qmethod name="validator" access="public" return="TQValidator*" id="0"/> - <qmethod name="setEdited" access="public" return="void" id="0"> - <qparam type="bool" name="arg1"/> - </qmethod> - <qmethod name="edited" access="public" return="bool" id="0"/> - <qmethod name="cursorWordForward" access="public" return="void" id="0"> - <qparam type="bool" name="mark"/> - </qmethod> - <qmethod name="cursorWordBackward" access="public" return="void" id="0"> - <qparam type="bool" name="mark"/> - </qmethod> - <qmethod name="setEchoMode" access="public" return="void" id="0"> - <qparam type="EchoMode" name="arg1"/> - </qmethod> - <qmethod name="echoMode" access="public" return="EchoMode" id="0"/> - <qmethod name="setMaxLength" access="public" return="void" id="0"> - <qparam type="int" name="arg1"/> - </qmethod> - <qmethod name="maxLength" access="public" return="int" id="0"/> - <qmethod name="setMaxLineLength" access="public" return="void" id="0"> - <qparam type="int" name="arg1"/> - </qmethod> - <qmethod name="maxLineLength" access="public" return="int" id="0"/> - <qmethod name="setMaxLines" access="public" return="void" id="0"> - <qparam type="int" name="arg1"/> - </qmethod> - <qmethod name="maxLines" access="public" return="int" id="0"/> - <qmethod name="setHMargin" access="public" return="void" id="0"> - <qparam type="int" name="arg1"/> - </qmethod> - <qmethod name="hMargin" access="public" return="int" id="0"/> - <qmethod name="setSelection" access="public" return="void" id="0"> - <qparam type="int" name="row_from"/> - <qparam type="int" name="col_from"/> - <qparam type="int" name="row_to"/> - <qparam type="int" name="col_t"/> - </qmethod> - <qmethod name="setWordWrap" access="public" return="void" id="0"> - <qparam type="WordWrap" name="mode"/> - </qmethod> - <qmethod name="wordWrap" access="public" return="WordWrap" id="0"/> - <qmethod name="setWrapColumnOrWidth" access="public" return="void" id="0"> - <qparam type="int" name="arg1"/> - </qmethod> - <qmethod name="wrapColumnOrWidth" access="public" return="int" id="0"/> - <qmethod name="setWrapPolicy" access="public" return="void" id="0"> - <qparam type="WrapPolicy" name="policy"/> - </qmethod> - <qmethod name="wrapPolicy" access="public" return="WrapPolicy" id="0"/> - <qmethod name="autoUpdate" access="public" return="bool" id="0"/> - <qmethod name="setAutoUpdate" access="public" return="void" id="0"> - <qparam type="bool" name="arg1"/> - </qmethod> - <qmethod name="setUndoEnabled" access="public" return="void" id="0"> - <qparam type="bool" name="arg1"/> - </qmethod> - <qmethod name="isUndoEnabled" access="public" return="bool" id="0"/> - <qmethod name="setUndoDepth" access="public" return="void" id="0"> - <qparam type="int" name="arg1"/> - </qmethod> - <qmethod name="undoDepth" access="public" return="int" id="0"/> - <qmethod name="isReadOnly" access="public" return="bool" id="0"/> - <qmethod name="isOverwriteMode" access="public" return="bool" id="0"/> - <qmethod name="text" access="public" return="TQString" id="0"/> - <qmethod name="length" access="public" return="int" id="0"/> - <qmethod name="setText" access="public" return="void" id="0"> - <qparam type="TQStringamp" name="arg1"/> - </qmethod> - <qmethod name="setReadOnly" access="public" return="void" id="0"> - <qparam type="bool" name="arg1"/> - </qmethod> - <qmethod name="setOverwriteMode" access="public" return="void" id="0"> - <qparam type="bool" name="arg1"/> - </qmethod> - <qmethod name="clear" access="public" return="void" id="0"/> - <qmethod name="append" access="public" return="void" id="0"> - <qparam type="TQStringamp" name="arg1"/> - </qmethod> - <qmethod name="deselect" access="public" return="void" id="0"/> - <qmethod name="selectAll" access="public" return="void" id="0"/> - <qmethod name="paste" access="public" return="void" id="0"/> - <qmethod name="pasteSubType" access="public" return="void" id="0"> - <qparam type="TQCStringamp" name="subtype"/> - </qmethod> - <qmethod name="copyText" access="public" return="void" id="0"/> - <qmethod name="copy" access="public" return="void" id="0"/> - <qmethod name="cut" access="public" return="void" id="0"/> - <qmethod name="insert" access="public" return="void" id="0"> - <qparam type="TQStringamp" name="arg1"/> - </qmethod> - <qmethod name="undo" access="public" return="void" id="0"/> - <qmethod name="redo" access="public" return="void" id="0"/> - <qmethod name="setDefaultTabStop" access="public static" return="void" id="0"> - <qparam type="int" name="ex"/> - </qmethod> - <qmethod name="defaultTabStop" access="public static" return="int" id="0"/> - <qmethod name="protected_paintCell" access="protected" return="void" id="0"> - <qparam type="TQPainter*" name="arg1"/> - <qparam type="int" name="row"/> - <qparam type="int" name="col"/> - </qmethod> - <qmethod name="protected_event" access="protected" return="bool" id="0"> - <qparam type="TQEvent*" name="arg1"/> - </qmethod> - <qmethod name="protected_focusNextPrevChild" access="protected" return="bool" id="0"> - <qparam type="bool" name="arg1"/> - </qmethod> - <qmethod name="protected_hasMarkedText" access="protected" return="bool" id="0"/> - <qmethod name="protected_markedText" access="protected" return="TQString" id="0"/> - <qmethod name="protected_textWidth" access="protected" return="int" id="0"> - <qparam type="int" name="arg1"/> - </qmethod> - <qmethod name="protected_textWidth" access="protected" return="int" id="1"> - <qparam type="TQStringamp" name="arg1"/> - </qmethod> - <qmethod name="protected_cursorPoint" access="protected" return="TQPoint" id="0"/> - <qmethod name="protected_insert" access="protected" return="void" id="1"> - <qparam type="TQStringamp" name="arg1"/> - <qparam type="bool" name="mark"/> - </qmethod> - <qmethod name="protected_newLine" access="protected" return="void" id="0"/> - <qmethod name="protected_killLine" access="protected" return="void" id="0"/> - <qmethod name="protected_pageUp" access="protected" return="void" id="0"> - <qparam type="bool" name="mark" default="FALSE"/> - </qmethod> - <qmethod name="protected_pageDown" access="protected" return="void" id="0"> - <qparam type="bool" name="mark" default="FALSE"/> - </qmethod> - <qmethod name="protected_cursorLeft" access="protected" return="void" id="0"> - <qparam type="bool" name="mark" default="FALSE"/> - <qparam type="bool" name="wrap" default="TRUE"/> - </qmethod> - <qmethod name="protected_cursorRight" access="protected" return="void" id="0"> - <qparam type="bool" name="mark" default="FALSE"/> - <qparam type="bool" name="wrap" default="TRUE"/> - </qmethod> - <qmethod name="protected_cursorUp" access="protected" return="void" id="0"> - <qparam type="bool" name="mark" default="FALSE"/> - </qmethod> - <qmethod name="protected_cursorDown" access="protected" return="void" id="0"> - <qparam type="bool" name="mark" default="FALSE"/> - </qmethod> - <qmethod name="protected_backspace" access="protected" return="void" id="0"/> - <qmethod name="protected_del" access="protected" return="void" id="0"/> - <qmethod name="protected_home" access="protected" return="void" id="0"> - <qparam type="bool" name="mark" default="FALSE"/> - </qmethod> - <qmethod name="protected_end" access="protected" return="void" id="0"> - <qparam type="bool" name="mark" default="FALSE"/> - </qmethod> - <qmethod name="protected_getMarkedRegion" access="protected" return="bool" id="0"> - <qparam type="int*" name="line1"/> - <qparam type="int*" name="col1"/> - <qparam type="int*" name="line2"/> - <qparam type="int*" name="col2"/> - </qmethod> - <qmethod name="protected_lineLength" access="protected" return="int" id="0"> - <qparam type="int" name="row"/> - </qmethod> - <qmethod name="protected_getString" access="protected" return="TQString*" id="0"> - <qparam type="int" name="row"/> - </qmethod> - <qmethod name="protected_isEndOfParagraph" access="protected" return="bool" id="0"> - <qparam type="int" name="row"/> - </qmethod> - <qmethod name="protected_stringShown" access="protected" return="TQString" id="0"> - <qparam type="int" name="row"/> - </qmethod> - <qmethod name="protected_insertChar" access="protected" return="void" id="0"> - <qparam type="TQChar" name="arg1"/> - </qmethod> -</qtype> <qtype name="QtTableView" access="public"> - <qancestor name="TQFrame"/> - <qmethod name="setBackgroundColor" access="public" return="void" id="0"> - <qparam type="TQColoramp" name="arg1"/> - </qmethod> - <qmethod name="setPalette" access="public" return="void" id="0"> - <qparam type="TQPaletteamp" name="arg1"/> - </qmethod> - <qmethod name="show" access="public" return="void" id="0"/> - <qmethod name="repaint" access="public" return="void" id="0"> - <qparam type="bool" name="erase" default="TRUE"/> - </qmethod> - <qmethod name="repaint" access="public" return="void" id="1"> - <qparam type="int" name="x"/> - <qparam type="int" name="y"/> - <qparam type="int" name="w"/> - <qparam type="int" name="h"/> - <qparam type="bool" name="erase" default="TRUE"/> - </qmethod> - <qmethod name="repaint" access="public" return="void" id="2"> - <qparam type="TQRectamp" name="arg1"/> - <qparam type="bool" name="erase" default="TRUE"/> - </qmethod> </qtype> </qtypes> diff --git a/qtsharp/src/bindings/qt.build b/qtsharp/src/bindings/qt.build index 1481dddd..ec782f49 100644 --- a/qtsharp/src/bindings/qt.build +++ b/qtsharp/src/bindings/qt.build @@ -332,7 +332,6 @@ <file name="TQScrollBar.cs" /> <file name="TQScrollView.cs" /> <file name="TQSemaphore.cs" /> - <file name="TQSemiModal.cs" /> <file name="TQSenderObject.cs" /> <file name="TQServerSocket.cs" /> <file name="TQSessionManager.cs" /> @@ -352,7 +351,6 @@ <file name="TQSocket.cs" /> <file name="TQSocketDevice.cs" /> <file name="TQSocketNotifier.cs" /> - <file name="TQSortedList.cs" /> <file name="TQSound.cs" /> <file name="TQSpacerItem.cs" /> <file name="TQSpinBox.cs" /> @@ -463,9 +461,7 @@ <file name="TQXmlSimpleReader.cs" /> <file name="TQXtApplication.cs" /> <file name="TQXtWidget.cs" /> - <file name="QtMultiLineEdit.cs" /> <file name="QtSupport.cs" /> - <file name="QtTableView.cs" /> <file name="RasterOp.cs" /> <file name="StringComparisonMode.cs" /> <file name="TextFlags.cs" /> diff --git a/qtsharp/src/bindings/static/QtSignal.cs b/qtsharp/src/bindings/static/QtSignal.cs index 6660de87..6a76ed09 100644 --- a/qtsharp/src/bindings/static/QtSignal.cs +++ b/qtsharp/src/bindings/static/QtSignal.cs @@ -162,120 +162,120 @@ namespace Qt { switch (slotobj.Args) { case "()": del = Delegate.CreateDelegate (typeof (del_void), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_void (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_void (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(bool)": del = Delegate.CreateDelegate (typeof (del_bool), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_bool (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_bool (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(short)": del = Delegate.CreateDelegate (typeof (del_short), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_short (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_short (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(int)": del = Delegate.CreateDelegate (typeof (del_int), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_int (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_int (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(long)": del = Delegate.CreateDelegate (typeof (del_long), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_long (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_long (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(float)": del = Delegate.CreateDelegate (typeof (del_float), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_float (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_float (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(double)": del = Delegate.CreateDelegate (typeof (del_double), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_double (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_double (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(TQString)": realsignal = sigobj.Name + "(const TQString&)"; Console.WriteLine("Connecting signal, sigobj.Name = {0}, realsignal = {1}", sigobj.Name, realsignal); del = Delegate.CreateDelegate (typeof (del_QString), slotobj, "SlotBridge_QString"); - slotobj.WrapperPtr = csharp_connect_QString (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QString (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQDockWindow)": realsignal = sigobj.Name + "(TQDockWindow*)"; del = Delegate.CreateDelegate (typeof (del_QDockWindow), slotobj, "SlotBridge_QDockWindow"); - slotobj.WrapperPtr = csharp_connect_QDockWindow (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QDockWindow (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQDropEvent)": realsignal = sigobj.Name + "(TQDropEvent*)"; del = Delegate.CreateDelegate (typeof (del_QDropEvent), slotobj, "SlotBridge_QDropEvent"); - slotobj.WrapperPtr = csharp_connect_QDropEvent (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QDropEvent (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQDropEvent,TQListViewItem)": realsignal = sigobj.Name + "(TQDropEvent*,TQListViewItem*)"; del = Delegate.CreateDelegate (typeof (del_QDropEventTQListViewItem), slotobj, "SlotBridge_QDropEventTQListViewItem"); - slotobj.WrapperPtr = csharp_connect_QDropEventTQListViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QDropEventTQListViewItem (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQIconViewItem)": realsignal = sigobj.Name + "(TQIconViewItem*)"; del = Delegate.CreateDelegate (typeof (del_QIconViewItem), slotobj, "SlotBridge_QIconViewItem"); - slotobj.WrapperPtr = csharp_connect_QIconViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QIconViewItem (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQListBoxItem)": realsignal = sigobj.Name + "(TQListBoxItem*)"; del = Delegate.CreateDelegate (typeof (del_QListBoxItem), slotobj, "SlotBridge_QListBoxItem"); - slotobj.WrapperPtr = csharp_connect_QListBoxItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QListBoxItem (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQListViewItem)": realsignal = sigobj.Name + "(TQListViewItem*)"; del = Delegate.CreateDelegate (typeof (del_QListViewItem), slotobj, "SlotBridge_QListViewItem"); - slotobj.WrapperPtr = csharp_connect_QListViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QListViewItem (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQListViewItem,TQListViewItem)": realsignal = sigobj.Name + "(TQListViewItem*,TQListViewItem*)"; del = Delegate.CreateDelegate (typeof (del_QListViewItemTQListViewItem), slotobj, "SlotBridge_QListViewItemTQListViewItem"); - slotobj.WrapperPtr = csharp_connect_QListViewItemTQListViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QListViewItemTQListViewItem (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQListViewItem,TQListViewItem,TQListViewItem)": realsignal = sigobj.Name + "(TQListViewItem*,TQListViewItem*,TQListViewItem*)"; del = Delegate.CreateDelegate (typeof (del_QListViewItemTQListViewItemTQListViewItem), slotobj, "SlotBridge_QListViewItemTQListViewItemTQListViewItem"); - slotobj.WrapperPtr = csharp_connect_QListViewItemTQListViewItemTQListViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QListViewItemTQListViewItemTQListViewItem (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQNetworkOperation)": realsignal = sigobj.Name + "(TQNetworkOperation*)"; del = Delegate.CreateDelegate (typeof (del_QNetworkOperation), slotobj, "SlotBridge_QNetworkOperation"); - slotobj.WrapperPtr = csharp_connect_QNetworkOperation (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QNetworkOperation (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQObject)": realsignal = sigobj.Name + "(TQObject*)"; del = Delegate.CreateDelegate (typeof (del_QObject), slotobj, "SlotBridge_QObject"); - slotobj.WrapperPtr = csharp_connect_QObject (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QObject (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQToolBar)": realsignal = sigobj.Name + "(TQToolBar*)"; del = Delegate.CreateDelegate (typeof (del_QToolBar), slotobj, "SlotBridge_QToolBar"); - slotobj.WrapperPtr = csharp_connect_QToolBar (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QToolBar (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(TQWidget)": realsignal = sigobj.Name + "(TQWidget*)"; del = Delegate.CreateDelegate (typeof (del_QWidget), slotobj, "SlotBridge_QWidget"); - slotobj.WrapperPtr = csharp_connect_QWidget (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_QWidget (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(int,TQIconViewItem)": realsignal = sigobj.Name + "(int,TQIconViewItem*)"; del = Delegate.CreateDelegate (typeof (del_intTQIconViewItem), slotobj, "SlotBridge_intTQIconViewItem"); - slotobj.WrapperPtr = csharp_connect_intTQIconViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_intTQIconViewItem (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(int,TQListBoxItem)": realsignal = sigobj.Name + "(int,TQListBoxItem*)"; del = Delegate.CreateDelegate (typeof (del_intTQListBoxItem), slotobj, "SlotBridge_intTQListBoxItem"); - slotobj.WrapperPtr = csharp_connect_intTQListBoxItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_intTQListBoxItem (sender.RawObject, TQ_SIGNAL (realsignal), receiver.RawObject, del); break; case "(int,bool)": del = Delegate.CreateDelegate (typeof (del_intbool), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_intbool (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_intbool (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(int,int)": del = Delegate.CreateDelegate (typeof (del_intint), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_intint (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_intint (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; case "(int,int,int)": del = Delegate.CreateDelegate (typeof (del_intintint), receiver, slotobj.Name); - slotobj.WrapperPtr = csharp_connect_intintint (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); + slotobj.WrapperPtr = csharp_connect_intintint (sender.RawObject, TQ_SIGNAL (signal), receiver.RawObject, del); break; default: throw new ArgumentException ("Unsupported method prototype for C++ signal -> C# slot connection: " + slotobj.Args); @@ -292,7 +292,7 @@ namespace Qt { // ...a C++ slot. C++ slots are C# methods, so we should never get here. else { throw new ArgumentException(receiver+" has no slot '"+slot+"'"); - // return qt_QObject_connect1(sender.RawObject, TQT_SIGNAL(signal), receiver.RawObject, TQT_SLOT(slot)); + // return qt_QObject_connect1(sender.RawObject, TQ_SIGNAL(signal), receiver.RawObject, TQ_SLOT(slot)); } } } @@ -330,11 +330,11 @@ namespace Qt { string mangle = MangleArgs(args); // HACK Wrap target signal in a slot and connect the slot to the sender. - return Connect(sender, TQT_SIGNAL(signal), targetobj, TQT_SLOT("Emit_"+mangle+args)); + return Connect(sender, TQ_SIGNAL(signal), targetobj, TQ_SLOT("Emit_"+mangle+args)); } // ...a C++ signal else - return qt_QObject_connect1(sender.RawObject, TQT_SIGNAL(signal), receiver.RawObject, TQT_SIGNAL(target)); + return qt_QObject_connect1(sender.RawObject, TQ_SIGNAL(signal), receiver.RawObject, TQ_SIGNAL(target)); } } @@ -410,7 +410,7 @@ namespace Qt { // ...a C++ slot. C++ slots are C# methods, so we should never get here. else { throw new ArgumentException(receiver+" has no slot '"+slot+"'"); - // return qt_QObject_disconnect2(sender.RawObject, TQT_SIGNAL(signal), receiver.RawObject, TQT_SLOT(slot)); + // return qt_QObject_disconnect2(sender.RawObject, TQ_SIGNAL(signal), receiver.RawObject, TQ_SLOT(slot)); } } } @@ -449,11 +449,11 @@ namespace Qt { if (receiver.CsSignalMap.Contains(target)) { QtSignal targetobj = receiver.CsSignalMap[target]; string args = "(" + target.Split(new char[] {'('})[1]; - return Disconnect(sender, TQT_SIGNAL(signal), targetobj, TQT_SLOT("emit_"+args)); + return Disconnect(sender, TQ_SIGNAL(signal), targetobj, TQ_SLOT("emit_"+args)); } // ...a C++ signal else { - return qt_QObject_disconnect2(sender.RawObject, TQT_SIGNAL(signal), receiver.RawObject, TQT_SLOT(target)); + return qt_QObject_disconnect2(sender.RawObject, TQ_SIGNAL(signal), receiver.RawObject, TQ_SLOT(target)); } } } @@ -474,7 +474,7 @@ namespace Qt { foreach (QtSignal signal in signals) foreach (QtSlot slot in new ArrayList (signal.Slots)) - Disconnect (sender, TQT_SIGNAL (signal.Signal), slot.Receiver, TQT_SLOT (slot.Slot)); + Disconnect (sender, TQ_SIGNAL (signal.Signal), slot.Receiver, TQ_SLOT (slot.Slot)); return true; } @@ -495,7 +495,7 @@ namespace Qt { foreach (QtSignal signal in signals) foreach (QtSlot slot in new ArrayList (signal.Slots)) - Disconnect (signal.Sender, TQT_SIGNAL (signal.Name), receiver, TQT_SLOT (slot.Name)); + Disconnect (signal.Sender, TQ_SIGNAL (signal.Name), receiver, TQ_SLOT (slot.Name)); return true; } @@ -509,7 +509,7 @@ namespace Qt { QtSignal sig = map[signal]; if (sig != null) { foreach (QtSlot slot in new ArrayList (sig.Slots)) - Disconnect (sender, TQT_SIGNAL(signal), slot.Receiver, TQT_SLOT(slot.Slot)); + Disconnect (sender, TQ_SIGNAL(signal), slot.Receiver, TQ_SLOT(slot.Slot)); } } @@ -527,7 +527,7 @@ namespace Qt { if (sig != null) { foreach (QtSlot slot in new ArrayList (sig.Slots)) if (slot.Receiver == receiver) - Disconnect (sender, signal, receiver, TQT_SLOT (slot.Name)); + Disconnect (sender, signal, receiver, TQ_SLOT (slot.Name)); } } diff --git a/qtsharp/src/bindings/static/QtSupport.cs b/qtsharp/src/bindings/static/QtSupport.cs index 155bdd62..d7cddad0 100644 --- a/qtsharp/src/bindings/static/QtSupport.cs +++ b/qtsharp/src/bindings/static/QtSupport.cs @@ -165,7 +165,7 @@ namespace Qt { Console.WriteLine (format, arg); } - public static string TQT_SIGNAL (string signal) + public static string TQ_SIGNAL (string signal) { return "2"+ Regex.Replace (signal, @"\s*\(\s*\)", "()"); @@ -173,7 +173,7 @@ namespace Qt { } - public static string TQT_SLOT (string slot) + public static string TQ_SLOT (string slot) { return "1" + Regex.Replace (slot, @"\s*\(\s*\)", "()"); diff --git a/qtsharp/src/bindings/static/TQToolButton.cs b/qtsharp/src/bindings/static/TQToolButton.cs index 6f3d7dfa..54a3410a 100644 --- a/qtsharp/src/bindings/static/TQToolButton.cs +++ b/qtsharp/src/bindings/static/TQToolButton.cs @@ -38,7 +38,7 @@ namespace Qt { qparent.AddChild (this); RegisterObject (this); - Connect (this, TQT_SIGNAL ("destroyed ()"), TQT_SLOT ("NativeDestroyed ()")); + Connect (this, TQ_SIGNAL ("destroyed ()"), TQ_SLOT ("NativeDestroyed ()")); } [DllImport("libtqtc", CharSet=CharSet.Ansi)] @@ -46,14 +46,14 @@ namespace Qt { public TQToolButton (TQIconSet iconSet, TQString textLabel, TQString groupText, TQObject receiver, string slot, TQToolBar parent, string name) : this (TQNull.Instance) { rawObject = qt_new_QToolButton1 (iconSet.RawObject, textLabel.RawObject, groupText.RawObject, IntPtr.Zero, null, parent != null ? parent.RawObject : IntPtr.Zero, name); - Connect( this, TQT_SIGNAL("clicked()"), receiver, slot ); + Connect( this, TQ_SIGNAL("clicked()"), receiver, slot ); if ((qparent = parent) != null) qparent.AddChild (this); RegisterObject (this); - Connect (this, TQT_SIGNAL ("destroyed ()"), TQT_SLOT ("NativeDestroyed ()")); + Connect (this, TQ_SIGNAL ("destroyed ()"), TQ_SLOT ("NativeDestroyed ()")); } [DllImport("libtqtc", CharSet=CharSet.Ansi)] @@ -66,7 +66,7 @@ namespace Qt { qparent.AddChild (this); RegisterObject (this); - Connect (this, TQT_SIGNAL ("destroyed ()"), TQT_SLOT ("NativeDestroyed ()")); + Connect (this, TQ_SIGNAL ("destroyed ()"), TQ_SLOT ("NativeDestroyed ()")); } public TQToolButton (TQWidget parent) : this (parent, "") {} @@ -175,26 +175,6 @@ namespace Qt { } [DllImport("libtqtc", CharSet=CharSet.Ansi)] - private static extern void qt_QToolButton_setIconSet1 (IntPtr raw, IntPtr set, bool on); - public void SetIconSet (TQIconSet set, bool on) - { - if (disposed) - throw new ObjectDisposedException (this+": Attempted use of disposed object"); - - qt_QToolButton_setIconSet1 (rawObject, set.RawObject, on); - } - - [DllImport("libtqtc", CharSet=CharSet.Ansi)] - private static extern IntPtr qt_QToolButton_iconSet (IntPtr raw, bool on); - public TQIconSet IconSet (bool on) - { - if (disposed) - throw new ObjectDisposedException (this+": Attempted use of disposed object"); - - return LookupObject (qt_QToolButton_iconSet (rawObject, on), typeof (TQIconSet)) as TQIconSet; - } - - [DllImport("libtqtc", CharSet=CharSet.Ansi)] private static extern void qt_QToolButton_setPopupDelay (IntPtr raw, int delay); public void SetPopupDelay (int delay) { diff --git a/qtsharp/src/examples/samples/display.cs b/qtsharp/src/examples/samples/display.cs index daf8daa0..8d94b5f8 100644 --- a/qtsharp/src/examples/samples/display.cs +++ b/qtsharp/src/examples/samples/display.cs @@ -26,10 +26,10 @@ namespace QtSamples { public Display () { filemenu = new TQPopupMenu (null, "filemenu"); - filemenu.InsertItem ("&Quit", tqApp, TQT_SLOT ("quit()")); + filemenu.InsertItem ("&Quit", tqApp, TQ_SLOT ("quit()")); aboutmenu = new TQPopupMenu(null, "aboutmenu"); - aboutmenu.InsertItem("&About Qt-Sharp", this, TQT_SLOT("slotAbout()")); + aboutmenu.InsertItem("&About Qt-Sharp", this, TQ_SLOT("slotAbout()")); menubar = new TQMenuBar(this, ""); menubar.InsertItem("&File", filemenu); diff --git a/qtsharp/src/examples/samples/emit.cs b/qtsharp/src/examples/samples/emit.cs index 125166a2..08a27555 100644 --- a/qtsharp/src/examples/samples/emit.cs +++ b/qtsharp/src/examples/samples/emit.cs @@ -13,8 +13,8 @@ namespace QtSamples { { TQPushButton pb = new TQPushButton ("Papa Smurf", this); - Connect (pb, TQT_SIGNAL ("clicked ()"), TQT_SLOT ("DoEmit ()")); - Connect (this, TQT_SIGNAL ("MySignal ()"), TQT_SLOT ("PrintStuff ()")); + Connect (pb, TQ_SIGNAL ("clicked ()"), TQ_SLOT ("DoEmit ()")); + Connect (this, TQ_SIGNAL ("MySignal ()"), TQ_SLOT ("PrintStuff ()")); } public void DoEmit () diff --git a/qtsharp/src/examples/samples/hello.cs b/qtsharp/src/examples/samples/hello.cs index 1039aa34..524c4d4c 100644 --- a/qtsharp/src/examples/samples/hello.cs +++ b/qtsharp/src/examples/samples/hello.cs @@ -25,7 +25,7 @@ namespace QtSamples { public HelloWorld () : base (null) { TQPushButton pb = new TQPushButton ("Hello Qt-Sharp-0.7!", this); - TQObject.Connect (pb, TQT_SIGNAL ("clicked()"), this, TQT_SLOT("SlotClicked()")); + TQObject.Connect (pb, TQ_SIGNAL ("clicked()"), this, TQ_SLOT("SlotClicked()")); } public void SlotClicked () diff --git a/qtsharp/src/examples/samples/mandelbrot.cs b/qtsharp/src/examples/samples/mandelbrot.cs index 3850b781..77acb98d 100644 --- a/qtsharp/src/examples/samples/mandelbrot.cs +++ b/qtsharp/src/examples/samples/mandelbrot.cs @@ -213,7 +213,7 @@ public class ImageDialog : TQDialog { pixmapLabel.SetScaledContents (true); dialogLayout.AddWidget (pixmapLabel); - TQObject.Connect (redrawButton, TQT_SIGNAL ("clicked()"), this, TQT_SLOT ("Redraw()")); + TQObject.Connect (redrawButton, TQ_SIGNAL ("clicked()"), this, TQ_SLOT ("Redraw()")); Redraw (); } diff --git a/qtsharp/src/examples/samples/mandelbrot2.cs b/qtsharp/src/examples/samples/mandelbrot2.cs index 175ef9bc..08f7bc56 100644 --- a/qtsharp/src/examples/samples/mandelbrot2.cs +++ b/qtsharp/src/examples/samples/mandelbrot2.cs @@ -272,7 +272,7 @@ public class ImageDialog : TQDialog { //pixmapLabel.SetPixmap( new TQPixmap( image ) ); - TQObject.Connect (redrawButton, TQT_SIGNAL ("clicked()"), pixmapLabel, TQT_SLOT ("Repaint()")); + TQObject.Connect (redrawButton, TQ_SIGNAL ("clicked()"), pixmapLabel, TQ_SLOT ("Repaint()")); //Redraw (); } diff --git a/qtsharp/src/examples/samples/qstring-slot.cs b/qtsharp/src/examples/samples/qstring-slot.cs index c0559f5b..be807ea0 100644 --- a/qtsharp/src/examples/samples/qstring-slot.cs +++ b/qtsharp/src/examples/samples/qstring-slot.cs @@ -15,7 +15,7 @@ public class MyWidget : TQVBox label = new TQLabel( this, "label" ); label.SetText("Default"); - TQObject.Connect( lineEdit, TQT_SIGNAL("textChanged(TQString)"), + TQObject.Connect( lineEdit, TQ_SIGNAL("textChanged(TQString)"), label, "SetText(TQString)" ); } diff --git a/qtsharp/src/examples/samples/quantumfractals.cs b/qtsharp/src/examples/samples/quantumfractals.cs index 3020eae6..a213f948 100644 --- a/qtsharp/src/examples/samples/quantumfractals.cs +++ b/qtsharp/src/examples/samples/quantumfractals.cs @@ -37,9 +37,9 @@ namespace Qf { //Setup the filemenu filemenu = new TQPopupMenu (null, "filemenu"); - filemenu.InsertItem ("&Screenshot", display, TQT_SLOT ("SlotScreenshot()")); + filemenu.InsertItem ("&Screenshot", display, TQ_SLOT ("SlotScreenshot()")); filemenu.InsertSeparator (); - filemenu.InsertItem ("&Quit", tqApp, TQT_SLOT ("quit()")); + filemenu.InsertItem ("&Quit", tqApp, TQ_SLOT ("quit()")); //Setup the shapemenu shapemenu = new TQPopupMenu (null, "typemenu"); @@ -52,12 +52,12 @@ namespace Qf { shapemenu.InsertItem( "&Icosidodecahedron", 6); //Connect the shapemenu - TQObject.Connect (shapemenu, TQT_SIGNAL ("activated(int)"), - display, TQT_SLOT("SlotShapeMenu(int)")); + TQObject.Connect (shapemenu, TQ_SIGNAL ("activated(int)"), + display, TQ_SLOT("SlotShapeMenu(int)")); //Setup the settingsmenu settingsmenu = new TQPopupMenu (null, "settingsmenu"); - settingsmenu.InsertItem ("&Alpha", display, TQT_SLOT ("SlotSetAlpha()")); + settingsmenu.InsertItem ("&Alpha", display, TQ_SLOT ("SlotSetAlpha()")); //Setup the menubar menubar = new TQMenuBar (this, ""); @@ -144,20 +144,20 @@ namespace Qf { buttons.AddWidget (intense); //Connect the buttons and SlotQuit - TQObject.Connect (start, TQT_SIGNAL ("clicked()"), - this, TQT_SLOT ("SlotStart()")); - TQObject.Connect (stop, TQT_SIGNAL ("clicked()"), - this, TQT_SLOT ("SlotStop()")); - TQObject.Connect (reset, TQT_SIGNAL ("clicked()"), - this, TQT_SLOT ("SlotReset()")); - TQObject.Connect (gray, TQT_SIGNAL ("clicked()"), - this, TQT_SLOT ("SlotGray()")); - TQObject.Connect (intense, TQT_SIGNAL ("clicked()"), - this, TQT_SLOT ("SlotIntense()")); - TQObject.Connect (buffer, TQT_SIGNAL ("Painted()"), - this, TQT_SLOT ("SlotSetLabels()")); - TQObject.Connect (tqApp, TQT_SIGNAL ("lastWindowClosed ()"), - this, TQT_SLOT ("SlotQuit ()")); + TQObject.Connect (start, TQ_SIGNAL ("clicked()"), + this, TQ_SLOT ("SlotStart()")); + TQObject.Connect (stop, TQ_SIGNAL ("clicked()"), + this, TQ_SLOT ("SlotStop()")); + TQObject.Connect (reset, TQ_SIGNAL ("clicked()"), + this, TQ_SLOT ("SlotReset()")); + TQObject.Connect (gray, TQ_SIGNAL ("clicked()"), + this, TQ_SLOT ("SlotGray()")); + TQObject.Connect (intense, TQ_SIGNAL ("clicked()"), + this, TQ_SLOT ("SlotIntense()")); + TQObject.Connect (buffer, TQ_SIGNAL ("Painted()"), + this, TQ_SLOT ("SlotSetLabels()")); + TQObject.Connect (tqApp, TQ_SIGNAL ("lastWindowClosed ()"), + this, TQ_SLOT ("SlotQuit ()")); //Layout labels labels = new TQVBoxLayout (layout); diff --git a/qtsharp/src/examples/samples/scribblewindow.cs b/qtsharp/src/examples/samples/scribblewindow.cs index 405b0e31..e078387c 100644 --- a/qtsharp/src/examples/samples/scribblewindow.cs +++ b/qtsharp/src/examples/samples/scribblewindow.cs @@ -36,18 +36,18 @@ namespace QtSamples { ScribbleWindow () : base (null, null) { filemenu = new TQPopupMenu (null, "filemenu"); - filemenu.InsertItem ("&Load", this, TQT_SLOT ("SlotLoad()") ); - filemenu.InsertItem ("&Save", this, TQT_SLOT ("SlotSave()") ); + filemenu.InsertItem ("&Load", this, TQ_SLOT ("SlotLoad()") ); + filemenu.InsertItem ("&Save", this, TQ_SLOT ("SlotSave()") ); filemenu.InsertSeparator (); - filemenu.InsertItem ("&Quit", tqApp, TQT_SLOT ("quit()")); + filemenu.InsertItem ("&Quit", tqApp, TQ_SLOT ("quit()")); aboutmenu = new TQPopupMenu (null, "helpmenu"); - aboutmenu.InsertItem ("&About Qt-Sharp", this, TQT_SLOT ("SlotAboutQtSharp()")); - aboutmenu.InsertItem ("&About Qt", this, TQT_SLOT ("SlotAboutQt()")); + aboutmenu.InsertItem ("&About Qt-Sharp", this, TQ_SLOT ("SlotAboutQtSharp()")); + aboutmenu.InsertItem ("&About Qt", this, TQ_SLOT ("SlotAboutQt()")); menubar = new TQMenuBar (this, ""); menubar.InsertItem ("&File", filemenu); - menubar.InsertItem ("&Color", this, TQT_SLOT("SlotColorChooser()")); + menubar.InsertItem ("&Color", this, TQ_SLOT("SlotColorChooser()")); menubar.InsertItem ("&About", aboutmenu); scrollview = new TQScrollView (this); @@ -58,12 +58,12 @@ namespace QtSamples { this.SetCentralWidget (scrollview); SetMaximumSize (Width (), Height () - menubar.Height ()); - TQObject.Connect (this, TQT_SIGNAL ("colorChanged(TQColor)"), - scribblearea, TQT_SLOT ("SlotSetColor(TQColor)") ); - TQObject.Connect (this, TQT_SIGNAL ("load(TQString)"), - scribblearea, TQT_SLOT ("PerformLoad(TQString)") ); - TQObject.Connect (this, TQT_SIGNAL ("save(TQString)"), - scribblearea, TQT_SLOT ("PerformSave(TQString)") ); + TQObject.Connect (this, TQ_SIGNAL ("colorChanged(TQColor)"), + scribblearea, TQ_SLOT ("SlotSetColor(TQColor)") ); + TQObject.Connect (this, TQ_SIGNAL ("load(TQString)"), + scribblearea, TQ_SLOT ("PerformLoad(TQString)") ); + TQObject.Connect (this, TQ_SIGNAL ("save(TQString)"), + scribblearea, TQ_SLOT ("PerformSave(TQString)") ); } public void SlotLoad () @@ -123,7 +123,7 @@ namespace QtSamples { SetBackgroundMode (Qt.BackgroundMode.NoBackground); popupmenu = new TQPopupMenu(); - popupmenu.InsertItem ("&Clear", this, TQT_SLOT ("SlotClearArea()") ); + popupmenu.InsertItem ("&Clear", this, TQ_SLOT ("SlotClearArea()") ); mouseMoveEvent += new MouseMoveEvent (MouseMoved); mousePressEvent += new MousePressEvent (MousePressed); diff --git a/qtsharp/src/examples/tutorials/t2.cs b/qtsharp/src/examples/tutorials/t2.cs index 5dbe07d1..3692e8f4 100644 --- a/qtsharp/src/examples/tutorials/t2.cs +++ b/qtsharp/src/examples/tutorials/t2.cs @@ -18,8 +18,8 @@ public class Example { quit.SetFont (new TQFont ("Times", 18, TQFont.Weight.Bold)); // In C++, TQFont::Bold is sufficient - TQObject.Connect ( quit, QtSupport.TQT_SIGNAL ("clicked()"), a, QtSupport.TQT_SLOT ("Quit()") ); - // TQT_SIGNAL and TQT_SLOT are static functions of QtSupport + TQObject.Connect ( quit, QtSupport.TQ_SIGNAL ("clicked()"), a, QtSupport.TQ_SLOT ("Quit()") ); + // TQ_SIGNAL and TQ_SLOT are static functions of QtSupport a.SetMainWidget (quit); quit.Show (); diff --git a/qtsharp/src/examples/tutorials/t3.cs b/qtsharp/src/examples/tutorials/t3.cs index 26fece72..90e9b803 100644 --- a/qtsharp/src/examples/tutorials/t3.cs +++ b/qtsharp/src/examples/tutorials/t3.cs @@ -19,8 +19,8 @@ public class Example { quit.SetFont (new TQFont ("Times", 18, TQFont.Weight.Bold)); // In C++, TQFont::Bold is sufficient - TQObject.Connect ( quit, QtSupport.TQT_SIGNAL ("clicked()"), a, QtSupport.TQT_SLOT ("Quit()") ); - // TQT_SIGNAL and TQT_SLOT are static functions of QtSupport + TQObject.Connect ( quit, QtSupport.TQ_SIGNAL ("clicked()"), a, QtSupport.TQ_SLOT ("Quit()") ); + // TQ_SIGNAL and TQ_SLOT are static functions of QtSupport a.SetMainWidget (box); box.Show (); diff --git a/qtsharp/src/examples/tutorials/t4.cs b/qtsharp/src/examples/tutorials/t4.cs index b3e66a07..1e182bb2 100644 --- a/qtsharp/src/examples/tutorials/t4.cs +++ b/qtsharp/src/examples/tutorials/t4.cs @@ -17,7 +17,7 @@ public class MyWidget : TQWidget { quit.SetGeometry (62, 40, 75, 30); quit.SetFont (new TQFont ("Times", 18, TQFont.Weight.Bold) ); - Connect ( quit, TQT_SIGNAL ("clicked()"), tqApp, TQT_SLOT ("Quit()") ); + Connect ( quit, TQ_SIGNAL ("clicked()"), tqApp, TQ_SLOT ("Quit()") ); // In C++, tqApp is a global variable. Here it's a property of the TQObject // class, which we inherit, giving the same effect. We also inherit the // static method connect(). diff --git a/qtsharp/src/examples/tutorials/t5.cs b/qtsharp/src/examples/tutorials/t5.cs index 05ff5e96..4500af56 100644 --- a/qtsharp/src/examples/tutorials/t5.cs +++ b/qtsharp/src/examples/tutorials/t5.cs @@ -13,7 +13,7 @@ public class MyWidget : TQVBox { TQPushButton quit = new TQPushButton ("Quit", this, "quit"); quit.SetFont ( new TQFont ("Times", 18, TQFont.Weight.Bold) ); - TQObject.Connect ( quit, TQT_SIGNAL ("clicked()"), tqApp, TQT_SLOT ("Quit()") ); + TQObject.Connect ( quit, TQ_SIGNAL ("clicked()"), tqApp, TQ_SLOT ("Quit()") ); TQLCDNumber lcd = new TQLCDNumber (2, this, "lcd" ); @@ -22,7 +22,7 @@ public class MyWidget : TQVBox { slider.SetRange (0, 99); slider.SetValue (0); - Connect ( slider, TQT_SIGNAL ("valueChanged(int)"), lcd, TQT_SLOT ("Display(int)") ); + Connect ( slider, TQ_SIGNAL ("valueChanged(int)"), lcd, TQ_SLOT ("Display(int)") ); } public MyWidget (TQWidget parent) : this (parent, "") {} diff --git a/qtsharp/src/examples/tutorials/t6.cs b/qtsharp/src/examples/tutorials/t6.cs index 910d13d1..90d94b5b 100644 --- a/qtsharp/src/examples/tutorials/t6.cs +++ b/qtsharp/src/examples/tutorials/t6.cs @@ -15,7 +15,7 @@ public class LCDRange : TQVBox { slider.SetRange (0, 99); slider.SetValue (0); - Connect ( slider, TQT_SIGNAL ("valueChanged(int)"), lcd, TQT_SLOT ("Display(int)") ); + Connect ( slider, TQ_SIGNAL ("valueChanged(int)"), lcd, TQ_SLOT ("Display(int)") ); } public LCDRange (TQWidget parent) : this (parent, "") {} @@ -31,7 +31,7 @@ public class MyWidget : TQVBox { TQPushButton quit = new TQPushButton ("Quit", this, "quit"); quit.SetFont ( new TQFont ("Times", 18, TQFont.Weight.Bold) ); - Connect ( quit, TQT_SIGNAL ("clicked()"), tqApp, TQT_SLOT ("Quit()") ); + Connect ( quit, TQ_SIGNAL ("clicked()"), tqApp, TQ_SLOT ("Quit()") ); TQGrid grid = new TQGrid (4, this); diff --git a/qtsharp/src/examples/tutorials/t7.cs b/qtsharp/src/examples/tutorials/t7.cs index 1372bf15..ecc9b244 100644 --- a/qtsharp/src/examples/tutorials/t7.cs +++ b/qtsharp/src/examples/tutorials/t7.cs @@ -21,8 +21,8 @@ public class LCDRange : TQVBox { slider.SetRange (0, 99); slider.SetValue (0); - Connect ( slider, TQT_SIGNAL ("valueChanged(int)"), lcd, TQT_SLOT ("Display(int)") ); - Connect ( slider, TQT_SIGNAL ("valueChanged(int)"), TQT_SIGNAL ("valueChanged(int)")); + Connect ( slider, TQ_SIGNAL ("valueChanged(int)"), lcd, TQ_SLOT ("Display(int)") ); + Connect ( slider, TQ_SIGNAL ("valueChanged(int)"), TQ_SIGNAL ("valueChanged(int)")); } public LCDRange (TQWidget parent) : this (parent, "") {} @@ -43,7 +43,7 @@ public class MyWidget : TQVBox { TQPushButton quit = new TQPushButton ("Quit", this, "quit"); quit.SetFont ( new TQFont ("Times", 18, TQFont.Weight.Bold) ); - Connect ( quit, TQT_SIGNAL ("clicked()"), tqApp, TQT_SLOT ("Quit()") ); + Connect ( quit, TQ_SIGNAL ("clicked()"), tqApp, TQ_SLOT ("Quit()") ); TQGrid grid = new TQGrid (4, this); @@ -53,8 +53,8 @@ public class MyWidget : TQVBox { for ( int r = 0; r < 4; r++ ) { LCDRange lr = new LCDRange (grid); if (previous != null) - Connect (lr, TQT_SIGNAL ("valueChanged(int)"), - previous, TQT_SLOT ("SetValue(int)") ); + Connect (lr, TQ_SIGNAL ("valueChanged(int)"), + previous, TQ_SLOT ("SetValue(int)") ); previous = lr; } } 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..3acda3c7 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"); @@ -323,7 +323,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 +344,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 (); diff --git a/qtsharp/src/libtqtsharp/customslot.h b/qtsharp/src/libtqtsharp/customslot.h index eda314ee..1c1bcc08 100644 --- a/qtsharp/src/libtqtsharp/customslot.h +++ b/qtsharp/src/libtqtsharp/customslot.h @@ -31,7 +31,7 @@ class CustomSlot: public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/qtsharp/src/libtqtsharp/qtsharp.cpp b/qtsharp/src/libtqtsharp/qtsharp.cpp index 7f433d76..bf3dc28f 100644 --- a/qtsharp/src/libtqtsharp/qtsharp.cpp +++ b/qtsharp/src/libtqtsharp/qtsharp.cpp @@ -22,7 +22,7 @@ void qtsharp_QObject_registerEventDelegate (qtsharp_EventDelegate delegate) TQObject *csharp_connect_void (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(void)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (void)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (void)))) { delete cs; cs = 0L; } @@ -32,7 +32,7 @@ TQObject *csharp_connect_void (TQObject *sender, const char *signal, TQObject *r TQObject *csharp_connect_item_void (TQMenuData *instance, int id, TQObject *receiver, void (*ptr)(void)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! instance->connectItem (id, cs, TQT_SLOT (callback (void)))) { + if (! instance->connectItem (id, cs, TQ_SLOT (callback (void)))) { delete cs; cs = 0L; } @@ -42,7 +42,7 @@ TQObject *csharp_connect_item_void (TQMenuData *instance, int id, TQObject *rece TQObject *csharp_connect_bool (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(bool)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (bool)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (bool)))) { delete cs; cs = 0L; } @@ -52,7 +52,7 @@ TQObject *csharp_connect_bool (TQObject *sender, const char *signal, TQObject *r TQObject *csharp_connect_short (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(short)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (short)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (short)))) { delete cs; cs = 0L; } @@ -62,7 +62,7 @@ TQObject *csharp_connect_short (TQObject *sender, const char *signal, TQObject * TQObject *csharp_connect_int (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (int)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (int)))) { delete cs; cs = 0L; } @@ -72,7 +72,7 @@ TQObject *csharp_connect_int (TQObject *sender, const char *signal, TQObject *re TQObject *csharp_connect_item_int (TQMenuData *instance, int id, TQObject *receiver, void (*ptr)(int)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! instance->connectItem (id, cs, TQT_SLOT (callback (int)))) { + if (! instance->connectItem (id, cs, TQ_SLOT (callback (int)))) { delete cs; cs = 0L; } @@ -82,7 +82,7 @@ TQObject *csharp_connect_item_int (TQMenuData *instance, int id, TQObject *recei TQObject *csharp_connect_long (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(long)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (long)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (long)))) { delete cs; cs = 0L; } @@ -92,7 +92,7 @@ TQObject *csharp_connect_long (TQObject *sender, const char *signal, TQObject *r TQObject *csharp_connect_float (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(float)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (float)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (float)))) { delete cs; cs = 0L; } @@ -102,7 +102,7 @@ TQObject *csharp_connect_float (TQObject *sender, const char *signal, TQObject * TQObject *csharp_connect_double (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(double)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (double)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (double)))) { delete cs; cs = 0L; } @@ -112,7 +112,7 @@ TQObject *csharp_connect_double (TQObject *sender, const char *signal, TQObject TQObject *csharp_connect_QString (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(const TQString&)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (const TQString&)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (const TQString&)))) { delete cs; cs = 0L; } @@ -122,7 +122,7 @@ TQObject *csharp_connect_QString (TQObject *sender, const char *signal, TQObject TQObject *csharp_connect_QDockWindow (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQDockWindow*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQDockWindow*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQDockWindow*)))) { delete cs; cs = 0L; } @@ -132,7 +132,7 @@ TQObject *csharp_connect_QDockWindow (TQObject *sender, const char *signal, TQOb TQObject *csharp_connect_QDropEvent (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQDropEvent*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQDropEvent*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQDropEvent*)))) { delete cs; cs = 0L; } @@ -142,7 +142,7 @@ TQObject *csharp_connect_QDropEvent (TQObject *sender, const char *signal, TQObj TQObject *csharp_connect_QDropEventTQListViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQDropEvent*,TQListViewItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQDropEvent*,TQListViewItem*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQDropEvent*,TQListViewItem*)))) { delete cs; cs = 0L; } @@ -152,7 +152,7 @@ TQObject *csharp_connect_QDropEventTQListViewItem (TQObject *sender, const char TQObject *csharp_connect_QIconViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQIconViewItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQIconViewItem*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQIconViewItem*)))) { delete cs; cs = 0L; } @@ -162,7 +162,7 @@ TQObject *csharp_connect_QIconViewItem (TQObject *sender, const char *signal, TQ TQObject *csharp_connect_QListBoxItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQListBoxItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQListBoxItem*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQListBoxItem*)))) { delete cs; cs = 0L; } @@ -172,7 +172,7 @@ TQObject *csharp_connect_QListBoxItem (TQObject *sender, const char *signal, TQO TQObject *csharp_connect_QListViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQListViewItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQListViewItem*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQListViewItem*)))) { delete cs; cs = 0L; } @@ -182,7 +182,7 @@ TQObject *csharp_connect_QListViewItem (TQObject *sender, const char *signal, TQ TQObject *csharp_connect_QListViewItemTQListViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQListViewItem*,TQListViewItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQListViewItem*,TQListViewItem*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQListViewItem*,TQListViewItem*)))) { delete cs; cs = 0L; } @@ -192,7 +192,7 @@ TQObject *csharp_connect_QListViewItemTQListViewItem (TQObject *sender, const ch TQObject *csharp_connect_QListViewItemTQListViewItemTQListViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQListViewItem*,TQListViewItem*,TQListViewItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQListViewItem*,TQListViewItem*,TQListViewItem*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQListViewItem*,TQListViewItem*,TQListViewItem*)))) { delete cs; cs = 0L; } @@ -202,7 +202,7 @@ TQObject *csharp_connect_QListViewItemTQListViewItemTQListViewItem (TQObject *se TQObject *csharp_connect_QNetworkOperation (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQNetworkOperation*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQNetworkOperation*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQNetworkOperation*)))) { delete cs; cs = 0L; } @@ -212,7 +212,7 @@ TQObject *csharp_connect_QNetworkOperation (TQObject *sender, const char *signal TQObject *csharp_connect_QObject (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQObject*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQObject*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQObject*)))) { delete cs; cs = 0L; } @@ -222,7 +222,7 @@ TQObject *csharp_connect_QObject (TQObject *sender, const char *signal, TQObject TQObject *csharp_connect_QToolBar (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQToolBar*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQToolBar*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQToolBar*)))) { delete cs; cs = 0L; } @@ -232,7 +232,7 @@ TQObject *csharp_connect_QToolBar (TQObject *sender, const char *signal, TQObjec TQObject *csharp_connect_QWidget (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQWidget*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQWidget*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (TQWidget*)))) { delete cs; cs = 0L; } @@ -242,7 +242,7 @@ TQObject *csharp_connect_QWidget (TQObject *sender, const char *signal, TQObject TQObject *csharp_connect_intTQIconViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int,TQIconViewItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (int,TQIconViewItem*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (int,TQIconViewItem*)))) { delete cs; cs = 0L; } @@ -252,7 +252,7 @@ TQObject *csharp_connect_intTQIconViewItem (TQObject *sender, const char *signal TQObject *csharp_connect_intTQListBoxItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int,TQListBoxItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (int,TQListBoxItem*)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (int,TQListBoxItem*)))) { delete cs; cs = 0L; } @@ -262,7 +262,7 @@ TQObject *csharp_connect_intTQListBoxItem (TQObject *sender, const char *signal, TQObject *csharp_connect_intbool (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int,bool)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (int,bool)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (int,bool)))) { delete cs; cs = 0L; } @@ -272,7 +272,7 @@ TQObject *csharp_connect_intbool (TQObject *sender, const char *signal, TQObject TQObject *csharp_connect_intint (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int,int)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (int,int)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (int,int)))) { delete cs; cs = 0L; } @@ -282,7 +282,7 @@ TQObject *csharp_connect_intint (TQObject *sender, const char *signal, TQObject TQObject *csharp_connect_intintint (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int,int,int)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (int,int,int)))) { + if (! TQObject::connect (sender, signal, cs, TQ_SLOT (callback (int,int,int)))) { delete cs; cs = 0L; } diff --git a/qtsharp/src/tests/lookuptest.cs b/qtsharp/src/tests/lookuptest.cs index bfcae6c3..ce3ac8b9 100644 --- a/qtsharp/src/tests/lookuptest.cs +++ b/qtsharp/src/tests/lookuptest.cs @@ -28,7 +28,7 @@ namespace Qt { if (size.GetHashCode () != size2.GetHashCode ()) Console.WriteLine ("ERROR: Hash codes differ for size and size2!"); - Connect (button, TQT_SIGNAL ("clicked()"), TQObject.qApp, TQT_SLOT ("Quit()")); + Connect (button, TQ_SIGNAL ("clicked()"), TQObject.qApp, TQ_SLOT ("Quit()")); } public static void Main (string[] args) diff --git a/qtsharp/src/uicsharp/tests/form5.ui b/qtsharp/src/uicsharp/tests/form5.ui index bb998334..46308250 100644 --- a/qtsharp/src/uicsharp/tests/form5.ui +++ b/qtsharp/src/uicsharp/tests/form5.ui @@ -125,9 +125,6 @@ <property name="menuText"> <string>Save &As...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -156,9 +153,6 @@ <property name="menuText"> <string>E&xit</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -272,9 +266,6 @@ <property name="menuText"> <string>&Contents...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -286,9 +277,6 @@ <property name="menuText"> <string>&Index...</string> </property> - <property name="accel"> - <string></string> - </property> </action> <action> <property name="name"> @@ -300,9 +288,6 @@ <property name="menuText"> <string>&About</string> </property> - <property name="accel"> - <string></string> - </property> </action> </actions> <images> diff --git a/qtsharp/src/uicsharp/tests/form6.ui b/qtsharp/src/uicsharp/tests/form6.ui index bcc04572..f97aa87e 100644 --- a/qtsharp/src/uicsharp/tests/form6.ui +++ b/qtsharp/src/uicsharp/tests/form6.ui @@ -85,9 +85,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -102,9 +99,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/qtsharp/src/uicsharp/tests/form9.ui b/qtsharp/src/uicsharp/tests/form9.ui index 3ba562c7..33c6e5f3 100644 --- a/qtsharp/src/uicsharp/tests/form9.ui +++ b/qtsharp/src/uicsharp/tests/form9.ui @@ -165,9 +165,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -182,9 +179,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/qtsharp/src/uicsharp/uicsharp.cs b/qtsharp/src/uicsharp/uicsharp.cs index b6306a1e..b0483258 100644 --- a/qtsharp/src/uicsharp/uicsharp.cs +++ b/qtsharp/src/uicsharp/uicsharp.cs @@ -334,7 +334,7 @@ namespace QtSharp { tmp=tmp.NextSibling as XmlElement; String slot=tmp.InnerText; - writer.WriteLine("\t\tTQObject.Connect({0},TQT_SIGNAL(\"{1}\"),{2},TQT_SLOT(\"{3}\"));", + writer.WriteLine("\t\tTQObject.Connect({0},TQ_SIGNAL(\"{1}\"),{2},TQ_SLOT(\"{3}\"));", sender,signal,receiver,slot); } break; |