From 9ba04742771370f59740e32e11c5f3a1e6a1b70a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 5 Dec 2011 15:55:57 -0600 Subject: Initial TQt conversion --- qtsharp/TODO | 22 +- qtsharp/doc/dtd/annotation.dtd | 28 +- qtsharp/doc/dtd/api.dtd | 30 +- qtsharp/src/api/qt.xml | 13726 +++++++++---------- qtsharp/src/bindings/Makefile.am | 4 +- qtsharp/src/bindings/qt.build | 874 +- qtsharp/src/bindings/static/AlignmentFlags.cs | 2 +- qtsharp/src/bindings/static/ArrowType.cs | 2 +- qtsharp/src/bindings/static/BGMode.cs | 2 +- qtsharp/src/bindings/static/BackgroundMode.cs | 2 +- qtsharp/src/bindings/static/BrushStyle.cs | 2 +- qtsharp/src/bindings/static/ButtonState.cs | 2 +- qtsharp/src/bindings/static/CursorShape.cs | 2 +- qtsharp/src/bindings/static/DateFormat.cs | 2 +- qtsharp/src/bindings/static/Dock.cs | 2 +- qtsharp/src/bindings/static/GUIStyle.cs | 2 +- qtsharp/src/bindings/static/IQMenuData.cs | 128 +- .../src/bindings/static/ImageConversionFlags.cs | 2 +- qtsharp/src/bindings/static/Key.cs | 2 +- qtsharp/src/bindings/static/Modifier.cs | 2 +- qtsharp/src/bindings/static/Orientation.cs | 2 +- qtsharp/src/bindings/static/PaintUnit.cs | 2 +- qtsharp/src/bindings/static/PenCapStyle.cs | 2 +- qtsharp/src/bindings/static/PenJoinStyle.cs | 2 +- qtsharp/src/bindings/static/PenStyle.cs | 2 +- qtsharp/src/bindings/static/QApplication.cs | 202 +- qtsharp/src/bindings/static/QByteArray.cs | 18 +- qtsharp/src/bindings/static/QCallBack.cs | 6 +- qtsharp/src/bindings/static/QEventArgs.cs | 10 +- qtsharp/src/bindings/static/QEventList.cs | 6 +- qtsharp/src/bindings/static/QGL.cs | 4 +- qtsharp/src/bindings/static/QMenuBar.cs | 282 +- qtsharp/src/bindings/static/QMenuData.cs | 192 +- qtsharp/src/bindings/static/QNull.cs | 10 +- qtsharp/src/bindings/static/QObject.cs | 126 +- qtsharp/src/bindings/static/QPopupMenu.cs | 278 +- qtsharp/src/bindings/static/QString.cs | 490 +- qtsharp/src/bindings/static/QStyle.cs | 180 +- qtsharp/src/bindings/static/QToolButton.cs | 38 +- qtsharp/src/bindings/static/QWidgetStack.cs | 44 +- qtsharp/src/bindings/static/QtSignal.cs | 140 +- qtsharp/src/bindings/static/QtSignalMap.cs | 6 +- qtsharp/src/bindings/static/QtSlot.cs | 56 +- qtsharp/src/bindings/static/QtSupport.cs | 318 +- qtsharp/src/bindings/static/RasterOp.cs | 2 +- .../src/bindings/static/StringComparisonMode.cs | 2 +- qtsharp/src/bindings/static/TextFlags.cs | 2 +- qtsharp/src/bindings/static/TextFormat.cs | 2 +- qtsharp/src/bindings/static/UIEffect.cs | 2 +- qtsharp/src/bindings/static/WidgetFlags.cs | 2 +- qtsharp/src/bindings/static/WidgetState.cs | 2 +- qtsharp/src/bindings/static/WindowsVersion.cs | 2 +- qtsharp/src/examples/samples/display.cs | 26 +- qtsharp/src/examples/samples/emit.cs | 8 +- qtsharp/src/examples/samples/eventhandling.cs | 16 +- qtsharp/src/examples/samples/hello.cs | 10 +- qtsharp/src/examples/samples/mandelbrot.cs | 84 +- qtsharp/src/examples/samples/mandelbrot2.cs | 90 +- qtsharp/src/examples/samples/qstring-slot.cs | 22 +- qtsharp/src/examples/samples/quantumfractals.cs | 130 +- qtsharp/src/examples/samples/scribblewindow.cs | 112 +- qtsharp/src/examples/test-results.html | 4 +- qtsharp/src/examples/tutorials/t1.cs | 4 +- qtsharp/src/examples/tutorials/t2.cs | 10 +- qtsharp/src/examples/tutorials/t3.cs | 12 +- qtsharp/src/examples/tutorials/t4.cs | 14 +- qtsharp/src/examples/tutorials/t5.cs | 18 +- qtsharp/src/examples/tutorials/t6.cs | 24 +- qtsharp/src/examples/tutorials/t7.cs | 26 +- qtsharp/src/generator/Converter.cs | 130 +- qtsharp/src/generator/Generator.cs | 10 +- qtsharp/src/generator/ParseAPI.cs | 24 +- qtsharp/src/generator/Parser.cs | 134 +- qtsharp/src/generator/Printer.cs | 66 +- qtsharp/src/generator/QAncestor.cs | 2 +- qtsharp/src/generator/QCtor.cs | 2 +- qtsharp/src/generator/QDCtor.cs | 8 +- qtsharp/src/generator/QEnum.cs | 8 +- qtsharp/src/generator/QItem.cs | 4 +- qtsharp/src/generator/QMember.cs | 12 +- qtsharp/src/generator/QMethod.cs | 4 +- qtsharp/src/generator/QParam.cs | 4 +- qtsharp/src/generator/QType.cs | 32 +- qtsharp/src/generator/QTypeMap.cs | 444 +- qtsharp/src/libqtsharp/customslot.cpp | 80 +- qtsharp/src/libqtsharp/customslot.h | 112 +- qtsharp/src/libqtsharp/qtsharp.cpp | 158 +- qtsharp/src/libqtsharp/qtsharp.h | 54 +- qtsharp/src/tests/lookuptest.cs | 16 +- qtsharp/src/uicsharp/tests/form1.ui | 8 +- qtsharp/src/uicsharp/tests/form10.ui | 20 +- qtsharp/src/uicsharp/tests/form2.ui | 28 +- qtsharp/src/uicsharp/tests/form3.ui | 42 +- qtsharp/src/uicsharp/tests/form4.ui | 46 +- qtsharp/src/uicsharp/tests/form5.ui | 2 +- qtsharp/src/uicsharp/tests/form6.ui | 16 +- qtsharp/src/uicsharp/tests/form7.ui | 42 +- qtsharp/src/uicsharp/tests/form8.ui | 8 +- qtsharp/src/uicsharp/tests/form9.ui | 26 +- qtsharp/src/uicsharp/uicsharp.cs | 72 +- 100 files changed, 9747 insertions(+), 9747 deletions(-) (limited to 'qtsharp') diff --git a/qtsharp/TODO b/qtsharp/TODO index 71d412f1..ba8c7926 100644 --- a/qtsharp/TODO +++ b/qtsharp/TODO @@ -13,7 +13,7 @@ o Qt reflection methods that are useless in C#, like those relating to o Maybe translation methods? I don't know if these could be useful from C# or not, but I kind of doubt it, especially since Rhys gave Mono his I18N code. -o Superfluous event handling methods in QObject. +o Superfluous event handling methods in TQObject. o There should be no trace of connection code in any class except QtSignal and QtSlot. @@ -24,25 +24,25 @@ o Signals and slots should be identified in the API XML representation. In particular, signal information must be present so we know to DllImport them so we can connect C# signals to C++ signals. o Tools should identify what underlying type enums should use in C#. - For example. the QStyle enum problem. + For example. the TQStyle enum problem. ** Classes needing converted to C# types moving in and out of methods -QDate, QTime, QDateTime, QDir, QFile*, QDict*, QDns, QFtp, QHttp, -QUrl*, QHostAddress, QGL*, QInt*, QIODevice, QString*, QMap +TTQDate, TQTime, TQDateTime, TQDir, TQFile*, TQDict*, TQDns, TQFtp, TQHttp, +TTQUrl*, TQHostAddress, TQGL*, TQInt*, TQIODevice, TQString*, TQMap -o QPROPERTYs +o TQPROPERTYs ** Classes needing attention, discussion or throttling -QTimeEdit, QDateTimeEdit, QHebrewCodec, QJisCodec, QTsciiCodec, QPtr*, -QHeader (needed?), QLibrary (hehe), QNetwork*, QInt*, QNS*, QStr*, -QText*Stream, QTextCodec*, QText[En|De]coder, QThread, QWaitCondition, -QTimer, QValidator, QValue*, QWidgetStack, QXml*, QXt* +TTQTimeEdit, TQDateTimeEdit, TQHebrewCodec, TQJisCodec, TQTsciiCodec, TQPtr*, +TTQHeader (needed?), TQLibrary (hehe), TQNetwork*, TQInt*, TQNS*, TQStr*, +TTQText*Stream, TQTextCodec*, TQText[En|De]coder, TQThread, TQWaitCondition, +TTQTimer, TQValidator, TQValue*, TQWidgetStack, TQXml*, TQXt* ** MI Classes (very incomplete list) -o Some QGL* classes +o Some TQGL* classes ** Build Environment todo @@ -66,5 +66,5 @@ o Use method access to determine what connections are allowed. ** Object model o Ctors aren't the only way children can be added to a parent; for example, - QBoxLayout.AddLayout adds a layout as a child. Need to identify all such + TQBoxLayout.AddLayout adds a layout as a child. Need to identify all such instances and code accordingly. diff --git a/qtsharp/doc/dtd/annotation.dtd b/qtsharp/doc/dtd/annotation.dtd index 29e004d6..f6d00593 100644 --- a/qtsharp/doc/dtd/annotation.dtd +++ b/qtsharp/doc/dtd/annotation.dtd @@ -12,26 +12,26 @@ - + - + - + @@ -40,8 +40,8 @@ @@ -54,11 +54,11 @@ diff --git a/qtsharp/doc/dtd/api.dtd b/qtsharp/doc/dtd/api.dtd index c0b9506d..6f55ecda 100644 --- a/qtsharp/doc/dtd/api.dtd +++ b/qtsharp/doc/dtd/api.dtd @@ -3,34 +3,34 @@ - + - + - + @@ -49,8 +49,8 @@ diff --git a/qtsharp/src/api/qt.xml b/qtsharp/src/api/qt.xml index 8d2b2f0e..12db6433 100644 --- a/qtsharp/src/api/qt.xml +++ b/qtsharp/src/api/qt.xml @@ -1,34 +1,34 @@ - - - - + + + + - - - + + + - + - + - + - + @@ -39,40 +39,40 @@ - + - + - + - + - - + + - - + + - - + + - - + + - + @@ -227,59 +227,59 @@ - - - + + + - + - - - - - - - - - - - + + + + + + + + + + + - + - + - - + + - + - + - + - + @@ -294,72 +294,72 @@ - - - - - + + + + + - - - - + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -367,10 +367,10 @@ - + - + @@ -380,34 +380,34 @@ - - + + - + - - - - + + + + - + - + - + - + @@ -417,43 +417,43 @@ - + - + - + - + - + - + - - - + + + - - + + - - + + - + - - + + @@ -472,45 +472,45 @@ - + - + - + - + - + - + - + - + - + - - + + @@ -521,20 +521,20 @@ - - + + - + - + - + - + - + @@ -550,29 +550,29 @@ - + - + - + - + - + - + - + @@ -583,30 +583,30 @@ - + - + - + - + - - + + - + - + - + id="0"> - - + + - + - - + + - + - - - - - - - - + + + + + + + + - - + + - + - + @@ -667,9 +667,9 @@ id="0"> - + - + @@ -687,18 +687,18 @@ id="0"> - + - + - + - + - + - + @@ -716,38 +716,38 @@ id="0"> - + - + - + - + - - - + + + - - + + - - - + + + - + @@ -774,8 +774,8 @@ id="0"> - - + + @@ -784,14 +784,14 @@ id="0"> - - - + + + - + @@ -817,70 +817,70 @@ id="0"> - - - + + + - - - + + + - - - + + + - - + + - + - - - - - + + + + + - + - + - + - + - - - - + + + + - + - + - - - + + + - - + + - - - + + + - + @@ -891,14 +891,14 @@ id="0"> - - - - + + + + - - + + @@ -909,7 +909,7 @@ id="0"> - + @@ -934,49 +934,49 @@ id="0"> - - - - + + + + - - - - + + + + - + - - + + - + - + - - + + - - + + - - + + - - + + - - + + @@ -985,27 +985,27 @@ id="0"> - - + + - - + + - + - + - + @@ -1018,12 +1018,12 @@ id="0"> - + - + @@ -1039,83 +1039,83 @@ id="0"> - + - + - + - + - - - + + + - + - + - + - + - + - + - - + + - - + + - - - + + + - - + + - + - + - + - + - + - - - - - + + + + + - - + + - + @@ -1136,7 +1136,7 @@ id="0"> - + @@ -1149,8 +1149,8 @@ id="0"> - - + + @@ -1161,23 +1161,23 @@ id="0"> - - + + - - + + - + - + - + - + - + @@ -1196,7 +1196,7 @@ id="0"> - + @@ -1212,42 +1212,42 @@ id="0"> - + - + - + - - - - + + + + - - - + + + - + - + - + - - + + - + @@ -1257,17 +1257,17 @@ id="0"> - + - + - + - + @@ -1276,63 +1276,63 @@ id="0"> - + - - - - + + + + - - - + + + - + - + - - - - + + + + - + - - - + + + - + - - - - + + + + - - + + - + - + - + @@ -1346,7 +1346,7 @@ id="0"> - + @@ -1358,7 +1358,7 @@ id="0"> - + @@ -1372,7 +1372,7 @@ id="0"> - + @@ -1384,57 +1384,57 @@ id="0"> - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - - + + @@ -1461,33 +1461,33 @@ id="0"> - + - + - + - + - + - + - + - + - + @@ -1496,14 +1496,14 @@ id="0"> - - - + + + - + @@ -1514,24 +1514,24 @@ id="0"> - + - + - + - + - - + + @@ -1539,40 +1539,40 @@ id="0"> - - - - - + + + + + - + - - + + - + - + - + - + - + - + @@ -1592,21 +1592,21 @@ id="0"> - - + + - + - + @@ -1629,76 +1629,76 @@ id="0"> - + - + - + - + - + - + - - - + + + - - + + - - - + + + - - + + - + - + - - + + - - - + + + - + - + - + - + @@ -1712,31 +1712,31 @@ id="0"> - - + + - - + + - - - - + + + + - + - + - + - + - + @@ -1749,15 +1749,15 @@ id="0"> - + - + - + - + @@ -1770,7 +1770,7 @@ id="0"> - + @@ -1811,16 +1811,16 @@ id="0"> - + - + - + - + @@ -1845,177 +1845,177 @@ id="0"> - - - - - + + + + + - + - - - - + + + + - + - - + + - + - + - - - - - + + + + + - - + + - - - + + + - + - - - - + + + + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - - - + + + - + - + - + - - - - - + + + + + - - - - + + + + - - - + + + - + - + - + - - - + + + - + - + - - - - - + + + + + - + - + - + - - + + - - - + + + - + - + @@ -2037,9 +2037,9 @@ id="0"> - + - + @@ -2058,44 +2058,44 @@ id="0"> - - - + + + - + - - - - + + + + - - - + + + - - - - + + + + - + - + - + - + - - - + + + @@ -2104,46 +2104,46 @@ id="0"> - + - + - + - - - - + + + + - - - + + + - - + + - + - - + + - + - + - - + + @@ -2246,41 +2246,41 @@ id="0"> - - + + - + - + - - + + - + - + - + - + - - + + - - + + @@ -2305,7 +2305,7 @@ id="0"> - + @@ -2318,27 +2318,27 @@ id="0"> - - - - - + + + + + - - - + + + - - - - + + + + - - - + + + @@ -2351,60 +2351,60 @@ id="0"> - + - + - - + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - + - - + + - - - + + + - - + + @@ -2413,8 +2413,8 @@ id="0"> - - + + @@ -2423,20 +2423,20 @@ id="0"> - - - - - + + + + + - + - + - - - + + + @@ -2444,19 +2444,19 @@ id="0"> - - - + + + - + - + - - - - + + + + @@ -2465,8 +2465,8 @@ id="0"> - - + + @@ -2475,38 +2475,38 @@ id="0"> - + - + - - - + + + - + - - + + - + - + - + - - - + + + - + @@ -2515,50 +2515,50 @@ id="0"> - - + + - + - - + + - - + + - + - - + + - + - + - + - + @@ -2578,10 +2578,10 @@ id="0"> - + - + @@ -2594,63 +2594,63 @@ id="0"> - + - + - + - - - - - + + + + + - - + + - + - + - + - - - - - + + + + + - - + + - + - + - - + + - + @@ -2670,63 +2670,63 @@ id="0"> - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -2735,28 +2735,28 @@ id="0"> - - + + - + - + - + - + - - + + @@ -2764,27 +2764,27 @@ id="0"> - + - + - + - - + + - - + + - + @@ -2801,77 +2801,77 @@ id="0"> - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - - - + + + - + - + - + @@ -2879,159 +2879,159 @@ id="0"> - + - - - - + + + + - - - + + + - + - - - - + + + + - + - - - - + + + + - + - + - - - - + + + + - + - - - - + + + + - + - + - + - - - + + + - + - + - - - + + + - - - + + + - + - - + + - - - + + + - + - - - - + + + + - + - - - + + + - + - + - - - - - - - - - + + + + + + + + + - - - - + + + + - + - - + + - + - + - - + + @@ -3039,67 +3039,67 @@ id="0"> - + - - + + - - - + + + - - + + - - + + - + - - - + + + - + - + - + - + - + - - - + + + - + @@ -3107,17 +3107,17 @@ id="0"> - + - + - + - - + + @@ -3125,9 +3125,9 @@ id="0"> - - - + + + @@ -3136,37 +3136,37 @@ id="0"> - - + + - + - + - + - + - + - + - + - + - + - + @@ -3215,23 +3215,23 @@ id="0"> - - + + - - + + - + - - - - - + + + + + - - + + @@ -3239,11 +3239,11 @@ id="0"> - - + + - + @@ -3252,23 +3252,23 @@ id="0"> - + - - - + + + - - + + - - + + - + @@ -3285,59 +3285,59 @@ id="0"> - + - + - + - + - - + + - - + + - - + + - + - + - - + + - + - - + + - + - - - + + + @@ -3346,22 +3346,22 @@ id="0"> - - + + - + - + - + - + - + @@ -3388,13 +3388,13 @@ id="0"> - + - + - + @@ -3404,20 +3404,20 @@ id="0"> - + - + - + - + - + @@ -3428,11 +3428,11 @@ id="0"> - + - + @@ -3450,24 +3450,24 @@ id="0"> - - + + - - + + - + - + - - + + @@ -3475,7 +3475,7 @@ id="0"> - + @@ -3486,28 +3486,28 @@ id="0"> - + - + - + - + - - - + + + - + @@ -3515,14 +3515,14 @@ id="0"> - + - + @@ -3531,36 +3531,36 @@ id="0"> - + - + - - - - + + + + - + - + - + - + - + - + - - - + + + @@ -3574,51 +3574,51 @@ id="0"> - - + + - - + + - + - + - + - + - + - + - + - + - + - + - - - - + + + + @@ -3639,30 +3639,30 @@ id="0"> - - + + - - + + - - - + + + - - - + + + - + - + @@ -3672,27 +3672,27 @@ id="0"> - + - + - + - + - - + + - + - + - + - + @@ -3721,77 +3721,77 @@ id="0"> - - - - + + + + - - - + + + - - + + - + - + - - + + - - + + - + - + - + - + - + - + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - + - - - + + + @@ -3799,17 +3799,17 @@ id="0"> - + - + - - + + - + @@ -3821,45 +3821,45 @@ id="0"> - - - - + + + + - + - + - + - + - - - - - + + + + + - + - + - + @@ -3868,8 +3868,8 @@ id="0"> - - + + @@ -3906,21 +3906,21 @@ id="0"> - + - - + + - - + + - + @@ -3929,14 +3929,14 @@ id="0"> - + - + @@ -3945,18 +3945,18 @@ id="0"> - + - + - - - + + + @@ -3966,11 +3966,11 @@ id="0"> - - + + - + @@ -3980,55 +3980,55 @@ id="0"> - - - + + + - + - + - + - + - + - + - - - + + + - - - + + + - - - + + + - - + + @@ -4057,40 +4057,40 @@ id="0"> - - - - + + + + - - + + - + - - - - - - - - + + + + + + + + - - + + - + - + - + @@ -4105,39 +4105,39 @@ id="0"> - + - - + + - + - - + + - + - - + + - + - + @@ -4146,49 +4146,49 @@ id="0"> - + - - + + - + - - + + - + - - - - - - - - + + + + + + + + - - + + - - + + - - + + - + - - - + + + @@ -4199,113 +4199,113 @@ id="0"> - - - + + + - - + + - + - + - + - + - - - - + + + + - - - - + + + + - + - + - + - - + + - + - + - + - - - + + + - + - + - + - + - - + + - + - + - - - + + + - + @@ -4314,17 +4314,17 @@ id="0"> - - - - + + + + - + - - + + @@ -4335,19 +4335,19 @@ id="0"> - + - + - + - + - + - + @@ -4388,27 +4388,27 @@ id="0"> - + - - - - + + + + - - + + - + - + @@ -4416,56 +4416,56 @@ id="0"> - + - + - + - - - - - + + + + + - - + + - - + + - + - + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - + - + @@ -4474,284 +4474,284 @@ id="0"> - + - + - + - + - - - - - - - - + + + + + + + + - - - - - + + + + + - - + + - - + + - - - + + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - - + + + - - - + + + - - - + + + - - + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - + + + + + - - - - + + + + - - + + - + - + - + - + - - + + - - + + - - + + - - + + - + - - - - + + + + - - - + + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - + - + - - + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - + + + - - + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - - + + - - + + - + - - - + + + - - + + - - - + + + - + - + @@ -4768,58 +4768,58 @@ id="0"> - - - + + + - - - - + + + + - - - + + + - - - + + + - - + + - - + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - + - + - + @@ -4835,107 +4835,107 @@ id="0"> /** - Shortcut to avoid dealing with QDomNodeList + Shortcut to avoid dealing with TQDomNodeList all the time. */ - - + + - - + - - - + - - + - - - + + + - - + - + - + - - - - + + + + - - + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + - + - + - - - - - - - - + + + + + + + + - + - - - - + + + + - + - + - - - + + + @@ -4955,36 +4955,36 @@ id="0"/> - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - + - + - - - + + + @@ -4992,41 +4992,41 @@ id="0"/> - - + + - + - + - - + + - - - - + + + + - + - - - + + + - - - + + + @@ -5034,11 +5034,11 @@ id="0"/> - - + + - + @@ -5052,70 +5052,70 @@ id="0"/> - + - + - + - + - - - + + + - - - - - + + + + + - - - - + + + + - - + - - - - + + + + - + - + - - - + + - - - + + + - + @@ -5126,19 +5126,19 @@ id="0"/> - - - - + + + + - - - + + + - + @@ -5149,7 +5149,7 @@ id="0"/> - + @@ -5217,22 +5217,22 @@ id="0"/> - + - + - - - - - - - - + + + + + + + + - + @@ -5264,14 +5264,14 @@ id="0"/> - + - + @@ -5282,11 +5282,11 @@ id="0"/> - - + + - - + + @@ -5295,13 +5295,13 @@ id="0"/> - + - + - - + + @@ -5318,39 +5318,39 @@ id="0"/> - - - - + + + + - - + + - - - + + + - + - + - - + + - + - + @@ -5370,8 +5370,8 @@ id="0"/> - - + + @@ -5382,106 +5382,106 @@ id="0"/> - - + + - - + + - + - + - + - + - + - + - + - - - - + + + + - - + + - - - - + + + + - - + + - - - + + - + - - - - + + + - - + + - + - - - - + + + - + - + - + - - - - + + + + - - + + - + @@ -5493,30 +5493,30 @@ id="0"> - - - + + + - - + + - - - + + + - - + + - + - + - + - - + + @@ -5524,19 +5524,19 @@ id="0"> - - - - + + + + - + - + - + @@ -5547,30 +5547,30 @@ id="0"> - - + + - + - - - - + + + + - + - - - - - + + + + + - - + + @@ -5580,7 +5580,7 @@ id="0"> - + @@ -5590,7 +5590,7 @@ id="0"> - + @@ -5682,20 +5682,20 @@ id="0"> - - - + + + - - + + - - + + - + @@ -5751,201 +5751,201 @@ id="0"> - + - + - + - - - + + + - + - - - - - + + + + + - - + + - - - + + - - + + - + - + - + - - - - - - - - - - - - + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - - + + + - - - + + + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - + - - - + + + - - + + - + - + - - + + - - - - - - - + + - - + - - - + + + - - + + - - + + @@ -5954,17 +5954,17 @@ throttle="true"/> - + - - - + + + - - + + - + @@ -5974,60 +5974,60 @@ throttle="true"/> - + - + - + - + - + - + - - + + - - + + - + - + - + - + - + - + - - + + @@ -6049,8 +6049,8 @@ throttle="true"/> - - + + @@ -6059,9 +6059,9 @@ throttle="true"/> - + - + @@ -6082,47 +6082,47 @@ throttle="true"/> - + - + - + - + - - - - + + + + - - + + - + - + - + - + - + - + @@ -6142,25 +6142,25 @@ id="0"> - - - + + + - + - - + + - + - + @@ -6170,18 +6170,18 @@ id="0"> - - + + - + - - + - @@ -6196,7 +6196,7 @@ id="0"/> id="0"> - @@ -6235,27 +6235,27 @@ id="0"/> - + - - + + - + - - + + - + @@ -6265,69 +6265,69 @@ id="0"/> - - + + - + - + - + - + - - - + + + - - + + - + +return="TQPtrCollection::Item" id="0"/> - + - - - + + @@ -6336,75 +6336,75 @@ id="0"/> - - - + + - + - + - + - + - + - + - - + + - - + + - + - - + + - + - - + + - + - + - + - + +return="TQPtrCollection::Item" id="0"> +return="TQPtrCollection::Item" id="0"> @@ -6412,95 +6412,95 @@ return="QPtrCollection::Item" id="0"> - + - - - + + - - - + + - - - + + + - - + + - - - - + + + + - - - - + + + + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - - + + - + - - - + + - + - + - + - - - + + + @@ -6586,82 +6586,82 @@ id="0"> - + - + - - + - - - - + + + + - + - - - + + + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - - + + @@ -6686,47 +6686,47 @@ id="0"> id="0"/> - - - - - - - - + + + + + + + + - - + + - - + + - - - + + + - + - + - + - + - + - + - + - + @@ -6734,121 +6734,121 @@ id="0"/> - +return="TQPtrCollection::Item" id="0"> + - +return="TQPtrCollection::Item" id="0"> - + - + - + - + - - - - + - - - - - + - - + + - - - + + - - - + + - - - + + + - - + + - + +return="TQPtrCollection::Item" id="0"/> - + - - - - + + + + - - + + - + - - - - + + + + - - + + - - + + - - + + - + @@ -6896,30 +6896,30 @@ id="0"/> - + - - + - - + - - - + + + - - - + + + - + @@ -6930,59 +6930,59 @@ id="1"> - - - + + + - + - + - + - + - - + + - - + + - + - - + + - - - - + + + + @@ -6999,7 +6999,7 @@ id="1"> - + @@ -7007,19 +7007,19 @@ id="1"> - - + - + - + @@ -7027,13 +7027,13 @@ id="0"/> - + - + @@ -7041,12 +7041,12 @@ id="0"/> - + - + @@ -7069,23 +7069,23 @@ id="0"/> - + - + - + - + - - - + + + @@ -7102,12 +7102,12 @@ id="0"/> - - + + - + @@ -7127,37 +7127,37 @@ id="0"/> - - - - + + + + - - - + + + - + - + - + - - + + - + - + @@ -7182,35 +7182,35 @@ id="0"/> - + - + - + - - - + + + - + - - - - - - - - + + + + + + + + - + - - - - + + + + @@ -7218,78 +7218,78 @@ id="0"/> - + - - + + - + - - - - + + + + - - + + - + - - - - - + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - + + + + + - + - + - + - + - - + + @@ -7297,19 +7297,19 @@ id="0"/> - + - - + + - + - + @@ -7364,7 +7364,7 @@ id="0"/> - + @@ -7381,7 +7381,7 @@ id="0"/> - + @@ -7413,30 +7413,30 @@ id="0"/> - + - + - + - + - + - - + + - - + + - + @@ -7444,21 +7444,21 @@ id="0"> - - - - - - + + + + + + - + - - + + - + @@ -7466,36 +7466,36 @@ id="0"> - + - - - - - + + + + + - + - + - - - + + + - + - + - - + + @@ -7539,9 +7539,9 @@ id="0"> - + - + @@ -7549,16 +7549,16 @@ id="0"> - - - - + + + + - + - + @@ -7566,35 +7566,35 @@ id="0"> - - - - + + + + - + - - - + + + - + - + - - - - + + + + - + - + @@ -7609,46 +7609,46 @@ id="0"> - - - + + + - - - + + + - - + + - + - + - + - + - + - + - + @@ -7659,13 +7659,13 @@ id="0"> - + - + - - + + @@ -7684,30 +7684,30 @@ id="0"> - - + + - + - - + + - + - + - - - + + + - + - + @@ -7716,11 +7716,11 @@ id="0"> - - + + - - + + @@ -7729,18 +7729,18 @@ id="0"> - + - + - - + - - + @@ -7760,9 +7760,9 @@ id="0"> - + - + @@ -7802,23 +7802,23 @@ id="0"> - - + + - - + + - + - + - + @@ -7830,41 +7830,41 @@ id="0"> - + - + - - + - - + + - + - + - +return="TQIconViewItem*" id="0"> + - + @@ -7873,47 +7873,47 @@ return="void" id="0"> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7923,16 +7923,16 @@ return="void" id="0"> - - - - + + + + - - - + + + @@ -7956,86 +7956,86 @@ return="void" id="0"> - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - + - + - + - + @@ -8046,79 +8046,79 @@ id="0"/> - - + + - - + + - - + + - + - - + + - + - + - + - + - - + + - + - - + + - - + + - - + + - + - + @@ -8134,10 +8134,10 @@ id="0"/> - + - + @@ -8146,7 +8146,7 @@ id="0"/> - + @@ -8158,63 +8158,63 @@ id="0"/> - + - + - + - + - + - + - - + + - + - - + + - + - + - - + + - + - + - - + + - + - + @@ -8223,11 +8223,11 @@ id="0"/> - + - + @@ -8239,7 +8239,7 @@ id="0"/> - + @@ -8256,44 +8256,44 @@ id="0"/> - + - + - - - + + + - - + + - + - + - - - + + - - + - + - - + + @@ -8305,12 +8305,12 @@ id="0"/> - - - + + + - - + + @@ -8319,104 +8319,104 @@ id="0"/> - + - + - + - + - - - - - + + + + + - - + + - + - + - + - + - - + + - - + + - - + + - - + + - - - - + + + + - - - + + + - - - + + + - + - - - + + + - - - - + + + + - - + + - - + + - - + + - + - + @@ -8425,16 +8425,16 @@ id="0"> - + - + - + @@ -8445,13 +8445,13 @@ id="0"> - + - + - - + + @@ -8459,70 +8459,70 @@ id="0"> - - + + - - - - - - - - + + + + + + + + - + - - + + - + - - + + - + - - - - + + + + - + - - - + + + - - + + - - - + + + - + @@ -8549,8 +8549,8 @@ id="0"> - - + + @@ -8559,12 +8559,12 @@ id="0"> - - - + + + - + @@ -8590,39 +8590,39 @@ id="0"> - - - + + - - - + + - - - + + + - - - - + + + + - + - + - - - + + + @@ -8637,186 +8637,186 @@ id="0"> - - - + + + - + - + - + - + - - + + - - - - + + + + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - - + + - + - + - + - - + + - + - + - - + + @@ -8828,17 +8828,17 @@ id="0"/> - - + + - - - + + + - + @@ -8849,9 +8849,9 @@ id="0"/> - - - + + + @@ -8963,21 +8963,21 @@ id="0"/> - - + - - - + + + - + @@ -8986,31 +8986,31 @@ id="0"> - + - + - - - + + + - + - - + + - - - + + + - - + + @@ -9026,16 +9026,16 @@ id="0"> - - + + - + - + - + @@ -9057,12 +9057,12 @@ id="0"> - + - + @@ -9075,35 +9075,35 @@ id="0"> - - - - - - - - + + + + + + + + - - - + + + - - - - + + + + - - - - - + + + + + @@ -9124,29 +9124,29 @@ id="0"> - - + + - + - + - + - + - + - + - + @@ -9156,20 +9156,20 @@ id="0"> - + - + - - - + + + - + @@ -9189,86 +9189,86 @@ id="0"> - + - - + + - + - + - + - - - + + - + - + - - - - + + + + - - - - - - + + + + + - + - + - - - - + + + + - - - + + + - - + + - - - + + + - - - + + + - + @@ -9279,40 +9279,40 @@ id="0"/> - + - + - - + + - - + + - - - + + + - - - + + + - - - + + + - + @@ -9353,7 +9353,7 @@ id="0"/> - + @@ -9361,24 +9361,24 @@ id="0"/> - + - + - + - + - + - + @@ -9396,13 +9396,13 @@ id="0"/> - + - + - + @@ -9421,23 +9421,23 @@ id="0"/> - + - + +return="TQPopupMenu*" id="0"/> - - + + @@ -9450,22 +9450,22 @@ return="void" id="0"> - - + + - + - + - + - + @@ -9474,63 +9474,63 @@ return="void" id="0"> - + - - + + - + - + - - + + - + - + - + - + - + - - + + - + - + - + @@ -9550,7 +9550,7 @@ return="void" id="0"> - + @@ -9561,18 +9561,18 @@ return="void" id="0"> - + - - - + + + - + - - + + @@ -9582,7 +9582,7 @@ return="void" id="0"> - + @@ -9644,10 +9644,10 @@ return="void" id="0"> - + - + @@ -9661,13 +9661,13 @@ return="void" id="0"> - - + + - - + + - + @@ -9679,21 +9679,21 @@ return="void" id="0"> - - + + - + - + @@ -9715,96 +9715,96 @@ return="void" id="0"> - - - - + + + + - + - + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - - - - - + + + + + - - + + - - - - + + + + - + - + - + - + - - + + @@ -9824,33 +9824,33 @@ id="0"/> - - + + - + - + - + - + - + - + - - + + @@ -9858,14 +9858,14 @@ id="0"/> - + - - + + - + @@ -9891,20 +9891,20 @@ id="0"/> - - + + - - + + - + - + - + @@ -9916,26 +9916,26 @@ id="0"/> - + - + - + - + - + - + - - - + + + @@ -9955,17 +9955,17 @@ id="0"/> - + - + - - + + - - + + @@ -9978,8 +9978,8 @@ id="0"/> - - + + @@ -10000,12 +10000,12 @@ id="0"/> - - + @@ -10015,11 +10015,11 @@ id="0"> - - + + - + @@ -10028,84 +10028,84 @@ return="void" id="0"> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - - + + @@ -10114,24 +10114,24 @@ id="0"/> - + - + - + - + - + - + @@ -10150,31 +10150,31 @@ id="0"/> - - + + - - + + - - - - - - - - - + + + + + + + + + - + @@ -10186,7 +10186,7 @@ id="0"/> - + @@ -10197,7 +10197,7 @@ id="0"/> - + @@ -10229,10 +10229,10 @@ id="0"/> - + - + @@ -10244,65 +10244,65 @@ id="0"/> - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + - + - + - + - + - - + + - - + + - - - - + + + + - + - + @@ -10311,60 +10311,60 @@ id="0"> - + - + - + - - + + - + - - + + - + - + - + - - + + - - + + - + @@ -10375,49 +10375,49 @@ id="0"> - + - + - - + + - + - + - + - - + + - - - - + + + + - + - @@ -10441,7 +10441,7 @@ id="0"> - + @@ -10449,25 +10449,25 @@ id="0"> - + - + - + - + /** API */ - - + + @@ -10516,51 +10516,51 @@ id="0"/> */ - + /** Functions */ - + - + /** Functions */ - + - - - + + + - + - - + + - - - - + + + + /** Functions */ - - + + @@ -10579,7 +10579,7 @@ id="0"/> - + @@ -10589,8 +10589,8 @@ id="0"/> - - + + /** @@ -10599,13 +10599,13 @@ id="0"/> */ - + - - - - - + + + + + /** Implementations of basic tree algorithms @@ -10613,31 +10613,31 @@ id="0"/> */ - - + + - - + + - - + + - - - - - - - - - - + + + + + + + + + - + @@ -10677,30 +10677,30 @@ id="0"> - + - - - + + + - - + + - + - - + + @@ -10714,133 +10714,133 @@ id="0"> - - - + + + - + - + - + - + - + - - - + + + - - + + - + - - - + + + - + - - + + - + - - - + + + - + - + - - + + - - + + - - - + + + - + - - + + - - + + - - - + + + - + - - + + - + @@ -10854,58 +10854,58 @@ id="0"/> - + - + - + - + - + - + - + - + - + - - + + - - + + - + - + - - + + @@ -10940,12 +10940,12 @@ id="0"/> - + - + @@ -10955,15 +10955,15 @@ id="0"/> - + - + - + - - + + @@ -10974,39 +10974,39 @@ id="0"/> - + - + - - - + + + - - - - - - - - - + + + + + + + + + - + - + - - + + @@ -11027,44 +11027,44 @@ id="0"/> - - + + - - - + + + - + - - + + - + - + - + - + - + - + @@ -11072,120 +11072,120 @@ id="0"/> - - - + + + - - - - - - + + + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - - + + + + + + - - - + + + - - + + - - - - + + + + - - - - - + + + + + - + - + - + - + - + - - + + - - + + - + - + - + - + - + - + @@ -11203,18 +11203,18 @@ id="0"/> - + - + - + - + @@ -11223,7 +11223,7 @@ id="0"/> - + @@ -11231,7 +11231,7 @@ id="0"/> - + @@ -11240,35 +11240,35 @@ id="0"/> - + - - + + - + - + - + - - - + + + - + - + @@ -11283,7 +11283,7 @@ id="0"/> - + @@ -11291,22 +11291,22 @@ id="0"/> - + - + - + - + - + - + @@ -11314,244 +11314,244 @@ id="0"/> - - + + - + - - - - - + + + + + - - - + + + - - - + + + - - + + - - + + - - + + - - + + - + - + - + - + +return="TQMimeSourceFactory*" id="0"/> - + - + - + - - - + + + - + - + - + - + - + - + - - - + + + - + - - - - + + + + - + - + - + - - - - + + + + - + - + - + - + - + - - - + + + - - + + - - - + + + - + - + - + - + - + - - - + + + - + - - - - + + + + - + - - - - + + + + - + - + - + - + - + - + - - - + + + - + - + - + - - + + - - - + + + - - - + + + - + - + - - + + - - + + @@ -11562,15 +11562,15 @@ id="0"/> - - - - - - - - - + + + + + + + + + @@ -11580,38 +11580,38 @@ id="0"/> - - + + - - + + - - + + - - + + - - + + - + - + - + - - - + + + @@ -11630,49 +11630,49 @@ id="0"/> - + - + - + - + - + - + - + - - - - + + + + - - + + - + - + @@ -11696,7 +11696,7 @@ id="0"/> - + @@ -11714,10 +11714,10 @@ id="0"/> - - + @@ -11759,17 +11759,17 @@ id="0"> - - + + - + - - + + @@ -11787,7 +11787,7 @@ id="0"> - + @@ -11800,23 +11800,23 @@ id="0"> - - + + - + - + - + - + @@ -11837,13 +11837,13 @@ id="0"> - + - + @@ -11854,11 +11854,11 @@ id="0"> - + - - - + + + @@ -11874,9 +11874,9 @@ id="0"> - - - + + + @@ -11887,26 +11887,26 @@ id="0"> - - - - + + + + - - - + + + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - + - + - + - - - + + - + - + - - + + @@ -12002,10 +12002,10 @@ id="0"/> - - + + - + @@ -12014,80 +12014,80 @@ id="0"/> - + - - + - - + + - +return="TQNetworkProtocol*" id="0"> + - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - - + + - + - + - + - + - + - - + + @@ -12115,83 +12115,83 @@ id="0"> - + - - + + - + - + - + - + - + - + - + - + - + - + - - + - + - + - + - + - + - + - + - + @@ -12210,7 +12210,7 @@ id="2"> - + @@ -12219,10 +12219,10 @@ id="0"> - - + + - + @@ -12233,39 +12233,39 @@ id="0"> - + - - - - - - + + + + + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -12273,19 +12273,19 @@ id="0"> - + - + - - + + - + @@ -12299,25 +12299,25 @@ id="0"> - + - + - + - + - - + + @@ -12369,7 +12369,7 @@ id="0"> - + @@ -12378,15 +12378,15 @@ id="0"> - - - - + + + + - + @@ -12394,7 +12394,7 @@ id="0"> - + @@ -12403,7 +12403,7 @@ id="0"> - + @@ -12413,56 +12413,56 @@ id="0"> - - + + - + - + - + - + - - + + - + - + - + - + - + - + @@ -12475,8 +12475,8 @@ id="0"> - - + + @@ -12488,22 +12488,22 @@ id="0"> - - - - - - + + + + + + - - + + - - + + - + @@ -12514,67 +12514,67 @@ id="0"> - - - + + + - - - + + + - + - + - - + + - - + + - + - - - + + + - + - + - + - + - + - + - + - - + + - + @@ -12584,22 +12584,22 @@ id="0"> - + - + - + - + @@ -12607,9 +12607,9 @@ id="0"> - + - + @@ -12620,9 +12620,9 @@ id="0"> - + - + @@ -12645,31 +12645,31 @@ id="0"> - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -12677,11 +12677,11 @@ id="0"> - + - + @@ -12692,7 +12692,7 @@ id="0"> - + @@ -12700,10 +12700,10 @@ id="0"> - + - + @@ -12712,14 +12712,14 @@ id="0"> - + - + @@ -12728,8 +12728,8 @@ id="0"> - - + + @@ -12738,7 +12738,7 @@ id="0"> - + @@ -12751,14 +12751,14 @@ id="0"> - + - + - - + + @@ -12769,7 +12769,7 @@ id="0"> - + @@ -12780,7 +12780,7 @@ id="0"> - + @@ -12791,7 +12791,7 @@ id="0"> - + @@ -12804,7 +12804,7 @@ id="0"> - + @@ -12817,61 +12817,61 @@ id="0"> - + - + - + - + - + - + - + - - - + + + - - + + - - + + - + @@ -12879,60 +12879,60 @@ id="0"> - - - + + + - - + + - - + + - + - - - + + + - - + + - + - + - - + + - + - - + + @@ -12941,32 +12941,32 @@ id="0"> - + - + - - + + - + - - + + @@ -12977,35 +12977,35 @@ id="0"> - + - - + + - + - + - - + + - + - + - + - - + + - + - + @@ -13018,8 +13018,8 @@ id="0"> - - + + @@ -13027,13 +13027,13 @@ id="0"> id="0"> - - - + + + - + @@ -13041,100 +13041,100 @@ id="0"> - - - + + + - - - + + + - - - - + + + + - - + + - - + + - + - + - + - - + + - - + + - - + + - - - - - - - - + + + + + + + + - + - + - + - + - + - +return="TQColorGroup::ColorRole" id="0"> + - +return="TQColorGroup::ColorRole" id="0"> + - + - - + + - - + + - - + + - - + + - + @@ -13143,9 +13143,9 @@ return="QColorGroup::ColorRole" id="0"> - + - + @@ -13155,15 +13155,15 @@ return="QColorGroup::ColorRole" id="0"> - - - + + + - - + + - + @@ -13172,37 +13172,37 @@ return="QColorGroup::ColorRole" id="0"> - + - + - + - + - + - + - - + + - - - + + + @@ -13216,93 +13216,93 @@ return="QColorGroup::ColorRole" id="0"> - - - + + + - + - - + + - - + + - - + + - + - - + + - - + + - + - - + + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - + @@ -13319,12 +13319,12 @@ return="QColorGroup::ColorRole" id="0"> - + - + @@ -13335,7 +13335,7 @@ return="QColorGroup::ColorRole" id="0"> - + @@ -13344,40 +13344,40 @@ return="QColorGroup::ColorRole" id="0"> - + - + - + - - + + - - + + - + @@ -13388,7 +13388,7 @@ id="0"> - + @@ -13397,92 +13397,92 @@ id="0"> - + - - + + - - + + - - + + - - + + - - - - - - - + + + + + + + - - - + + + - + - - - - + + + + - + - - - - + + + + - + - + - + - + - + - + - + - - - + + + - + - + - - - + + + @@ -13496,32 +13496,32 @@ id="0"> - - - - - - - - + + + + + + + + - + - + - + - + - + @@ -13531,21 +13531,21 @@ id="0"> - + - + - + - + @@ -13569,15 +13569,15 @@ id="0"> - + - + - + @@ -13585,20 +13585,20 @@ id="0"> - + - + - + @@ -13606,19 +13606,19 @@ id="0"> - + - - - - - + + + + + - + - + @@ -13629,24 +13629,24 @@ id="0"> - + - + - + - + @@ -13656,19 +13656,19 @@ id="0"> - + - + - + - + @@ -13676,10 +13676,10 @@ id="0"> - + - + - + - - - - - + + + + + - + - + - + - + - - + + - + - - + + @@ -13783,37 +13783,37 @@ id="0"> - + - - + + - + - + - + - + - + - + - + - + - + - + - + @@ -13840,7 +13840,7 @@ id="0"> - + @@ -13869,7 +13869,7 @@ id="0"> - + @@ -13877,82 +13877,82 @@ id="0"> - - + + - - + + - - + + - - - + + + - - - + + + - - + + - + - + - + - + - + - - + + - - + + - - + + - - + + - + - + @@ -13962,24 +13962,24 @@ id="0"> id="0"> - - - - + + + + - + - + - - - + + + @@ -14001,48 +14001,48 @@ id="0"> - + - + - + - - - - + + + + - - - + + + - + - + - + - + - + - - + + @@ -14061,39 +14061,39 @@ id="0"> - + - + - + - - - + + + - - + + - + - - - + + + - + @@ -14119,28 +14119,28 @@ id="0"> - - - + + - - - + + - - - + + + - - - - + + + + @@ -14167,7 +14167,7 @@ id="0"> - + @@ -14176,7 +14176,7 @@ id="0"> - + @@ -14203,7 +14203,7 @@ id="0"> - + @@ -14211,25 +14211,25 @@ id="0"> - + - - + + - - - + + - - - + + - - - + + + @@ -14237,10 +14237,10 @@ id="0"> - - - - + + + + @@ -14255,20 +14255,20 @@ id="0"> - - - + + - - - + + - - - - + + + + @@ -14283,23 +14283,23 @@ id="0"> - - - + + - - - + + - - - - + + + + - + @@ -14345,54 +14345,54 @@ id="0"> - + - - + + - - - + + - - - + + - - - - + + + + - - - + + + - - - - + + + + - - + + - + - + @@ -14401,7 +14401,7 @@ id="0"> - + @@ -14419,13 +14419,13 @@ id="0"> - + - + - + - + @@ -14434,22 +14434,22 @@ id="0"> - + - + - - - - + + + + - - - + + + @@ -14457,25 +14457,25 @@ id="0"> - + - + - + - - - + + + - + @@ -14523,17 +14523,17 @@ id="0"> - - - - - + + + + + - - - + + + - + @@ -14542,15 +14542,15 @@ id="0"> - + - - - - + + + + @@ -14571,11 +14571,11 @@ id="0"> - - - - - + + + + + @@ -14589,19 +14589,19 @@ id="0"> - + - + - + - + - + @@ -14625,7 +14625,7 @@ id="0"> - + @@ -14635,10 +14635,10 @@ id="0"> - + - + @@ -14647,34 +14647,34 @@ id="0"> - + - - + + - - + + - + - - - - + + + + - - + + - + - + - + @@ -14689,220 +14689,220 @@ id="0"> - + - + - + - + - - + + - - - - + + + + - - - + + + - - - + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - - + + - - + + - - + + - - + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - - - + + + - + - - - - + + + + - + - - - - + + + + - + - + - + - - - + + + - + - + - + - + - + - - - - - - - - + + + + + + + + - + - + - + - + @@ -14915,9 +14915,9 @@ id="0"> - + - + @@ -14936,7 +14936,7 @@ id="0"> - + @@ -14944,10 +14944,10 @@ id="0"> - + - - + + @@ -14959,43 +14959,43 @@ id="0"> - - + + - + - + - + - + - + - + - + - + - + @@ -15006,15 +15006,15 @@ id="0"> - + - + - - - - + + + @@ -15026,7 +15026,7 @@ id="0"/> - + @@ -15036,7 +15036,7 @@ id="0"/> - + @@ -15047,7 +15047,7 @@ id="0"/> - + @@ -15065,11 +15065,11 @@ id="0"/> - - + + - - + + @@ -15078,14 +15078,14 @@ id="0"/> - + - - + + - + @@ -15128,7 +15128,7 @@ id="0"/> - + @@ -15136,7 +15136,7 @@ id="0"/> - + @@ -15161,7 +15161,7 @@ id="0"> - + @@ -15169,61 +15169,61 @@ id="0"> - + - - + + - - + + - + - - - - + + + + - - + + - + - - - + + + - + - - + + - + @@ -15234,117 +15234,117 @@ id="0"> - + - + - + - + - - + + - - + + - + - - + + - + - + - + - + - - + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - - + + + - + - + - + - + - + - + - - + + - - - + + + - + - + @@ -15353,22 +15353,22 @@ id="0"> - - - - - - - + + + + + + + - + - + - + @@ -15381,103 +15381,103 @@ id="0"> - + - - - - - + + + + + - + - + - - + + - + - - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - + - + - + - + - - - + + + - + - - - + + + - - - + + + - + - - - + + + - - - + + + @@ -15493,27 +15493,27 @@ id="0"> - - - - - - - - - - - - + + + + + + + + + + + + - - + + - - + + - + @@ -15528,13 +15528,13 @@ id="0"> - - + + - + @@ -15566,17 +15566,17 @@ id="0"> - - + + - - - + + + - + @@ -15587,11 +15587,11 @@ id="0"> - - - - - + + + + + @@ -15600,22 +15600,22 @@ id="0"> - - + + - + - + - + - + @@ -15627,13 +15627,13 @@ id="0"> - + - - - - + + + + @@ -15665,13 +15665,13 @@ id="0"> - + - - - + + + @@ -15685,25 +15685,25 @@ id="0"> - - + + - + - + - + - + - + @@ -15740,17 +15740,17 @@ id="0"> - + - - + + - - + + @@ -15767,14 +15767,14 @@ id="0"> - + - + - + @@ -15810,11 +15810,11 @@ id="0"> - + - + @@ -15837,7 +15837,7 @@ id="0"> - + @@ -15849,26 +15849,26 @@ id="0"> - - + + - - + + - + - + - + @@ -15876,94 +15876,94 @@ id="0"> - + - - - - + + + + - - - - - - - - + + + + + + + + - + - + - + - - - + + + - - + + - - - - - - - + + + + + + - + - - - - - + + + + + - - + + - + - + - - - - - + + + + + - + - + @@ -15973,11 +15973,11 @@ id="0"/> - + - - - + + + @@ -15991,16 +15991,16 @@ id="0"/> - - + + - + - + @@ -16008,47 +16008,47 @@ id="0"/> - - - + - - + + - + - - + + - - + + - + - + - - - + + + @@ -16065,34 +16065,34 @@ id="0"/> - + - - + + - - + + - + - + - + - + @@ -16100,33 +16100,33 @@ id="0"/> - + - + - - + + - + - + - + - - - - - + + + + + - + @@ -16140,7 +16140,7 @@ id="0"/> - + @@ -16156,10 +16156,10 @@ id="0"/> - - - - + + + + @@ -16167,61 +16167,61 @@ id="0"/> - - + + - + - - + + - - + + - - + + - + - - + + - - + + - + - + - + - + - + - + - - - + + + @@ -16236,18 +16236,18 @@ id="0"/> - + - + - + - + @@ -16255,228 +16255,228 @@ id="0"/> - + - - + + - - + + - + - + - + - + - + - + - + - - + - + - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + - - - - - + + + + + - - + - - + + - - + + - + - + - + - - + + - - - - + + + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - + - - - - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - + + + + - - - + + + +return="TQSqlEditorFactory*" id="0"/> - + - + @@ -16484,23 +16484,23 @@ id="0"> - - - + + + - - + + - - + + - + - + - + @@ -16510,23 +16510,23 @@ id="0"> - - - - + + + + - - + + - + - + - + - + - + @@ -16536,42 +16536,42 @@ id="0"> - - - - - + + + + + - + - - + + - + - + - - + + - - + + - + - + - + - + @@ -16580,36 +16580,36 @@ id="0"> - - + + - + - - - - - + + + + + - - + + - + - + - + - + - + - + - + @@ -16619,65 +16619,65 @@ id="0"> - - + + - - - + + + - - - - - + + + + + - - + + - - + + - + - - + - - - + + + - - - + + + - - + + - + - + - + - - + + - + - + @@ -16690,34 +16690,34 @@ id="0"/> - - - - + + + + - - + + - - + + - + - - + + - + - + @@ -16728,146 +16728,146 @@ id="0"/> - + - + - + - + - + - - + + - + - - + + - + - + - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - - - + + + - + - + - + - + - - - + + + - - - - - + + + + + - - - - + + + + - - + + - - - - - - + + + + + + @@ -16875,85 +16875,85 @@ id="0"/> - - - + + + - - + + - - + + - - + + - + - + - - + + - - + + - + - + - + - + - + - + - - + + - - + + - + - + @@ -16963,12 +16963,12 @@ id="0"/> - + - + @@ -16976,7 +16976,7 @@ id="0"/> - + @@ -16986,12 +16986,12 @@ id="0"/> - + - + @@ -16999,7 +16999,7 @@ id="0"/> - + @@ -17011,119 +17011,119 @@ id="0"/> - + - + - - + + - + - + - - + + - - + + - + - + - + - + - + - + - + - - - - - + + + + + - + - + - + - + - + - + - + - - + + - - + + - + - - + + - - + + - + - + - + - + - + - - - + + + @@ -17155,192 +17155,192 @@ id="0"/> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - - - + + + + + - + - - + + - - + + - - + + - - + + - - - + + + - - - + + + - - - + + + - - + + @@ -17584,246 +17584,246 @@ id="0"/> - + - + - + - + - + - + - + - - - + + + - - + + - - + + - + - - + + - + - - - + + + - + - - - - + + + + - + - - - - + + + + - + - + - - - - + + + + - + - - - - + + + + - + - + - + - - - + + + - + - + - - - + + + - - - + + + - + - - + + - + - - - - + + + + - - - + + + - - - - + + + + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + - - + + - + - + - + - - + - - + + - - - + + - + - + @@ -17862,17 +17862,17 @@ default="QStyleSheetItem::WhiteSpacePre"/> - - - + + + - - + + - - - - + + + + @@ -17902,17 +17902,17 @@ id="0"/> - + - + - + - + @@ -17943,12 +17943,12 @@ id="0"/> - + - + - + @@ -17958,38 +17958,38 @@ id="0"/> - - - - + + + + - + - + - - - - + + + + - - - + + + - + - + - + - + - + - + @@ -17998,33 +17998,33 @@ id="0"/> - - + + - - + + - + - + - + - + @@ -18033,14 +18033,14 @@ id="0"/> - - + + - + - + @@ -18048,98 +18048,98 @@ id="0"/> - - + + - + - + - + - - + + - - - + + + - + - + - - - - + + + + - + - + - - + + - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - - + + + - + - + @@ -18150,52 +18150,52 @@ id="0"/> - + - + - - + + - + - + - + - + - + - + - + - + - + - - - + + + @@ -18204,58 +18204,58 @@ id="0"/> - - + + - - + + - - - + + + - - + + - - - + + + - - + + - + - + - + - + - + - - + + - - + + @@ -18272,19 +18272,19 @@ id="0"/> - - + + - + - + - - - + + + @@ -18292,27 +18292,27 @@ id="0"/> - + - + - + - + - + - + @@ -18320,7 +18320,7 @@ id="0"/> - + @@ -18349,8 +18349,8 @@ id="0"/> - - + + @@ -18371,14 +18371,14 @@ id="0"/> - + - + - + @@ -18394,14 +18394,14 @@ id="0"/> - + - + - + @@ -18409,30 +18409,30 @@ id="0"/> - + - + - + - + - + - + - - + + - + @@ -18570,7 +18570,7 @@ id="0"/> - + @@ -18581,12 +18581,12 @@ id="0"/> - - + @@ -18594,7 +18594,7 @@ id="0"> - @@ -18605,7 +18605,7 @@ return="void" id="0"> - + @@ -18622,7 +18622,7 @@ return="void" id="0"> - + @@ -18659,7 +18659,7 @@ id="0"> - + @@ -18667,43 +18667,43 @@ id="0"> - - + + - + - - + + - - + + - - - + + + - + - + - + - + - + - - + + @@ -18719,9 +18719,9 @@ id="0"> - - - + + + @@ -18733,8 +18733,8 @@ id="0"> - - + + @@ -18750,8 +18750,8 @@ id="0"> - - + + @@ -18761,8 +18761,8 @@ id="0"> - - + + @@ -18771,68 +18771,68 @@ id="0"> - - - - + + + + - - + + - + - + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + @@ -18841,108 +18841,108 @@ id="0"> - - + + - + - - + + - - + - + - + - - - - + - - + - + - + - - - - - - + + + + + + - + - - - + + + - - - - - + + + + + - - + + - + - + - + - + - + - - + + - - - + + + - - + + @@ -18979,27 +18979,27 @@ id="0"> - - - - + + + + - - + + - + - + - - + + - - + + @@ -19008,7 +19008,7 @@ id="0"> - + @@ -19025,39 +19025,39 @@ id="0"> - + - + - + - - + - + - + - - + + - + @@ -19067,52 +19067,52 @@ id="0"/> - + - - + + - - + + - - + + - - + + - + - - + + - + - + - + - + @@ -19128,14 +19128,14 @@ id="0"/> - + - + - - + + @@ -19166,7 +19166,7 @@ id="0"/> - + @@ -19181,16 +19181,16 @@ id="0"/> - + - + - + @@ -19199,8 +19199,8 @@ id="0"/> - - + + @@ -19215,7 +19215,7 @@ id="0"/> - + @@ -19226,13 +19226,13 @@ id="0"/> - + - - + + @@ -19248,20 +19248,20 @@ id="0"/> - + - + - + @@ -19269,13 +19269,13 @@ id="0"/> - + - + @@ -19287,32 +19287,32 @@ id="0"> id="0"/> - + - + - - - + - +return="TQPopupMenu*" id="0"> + +return="TQPopupMenu*" id="1"/> @@ -19322,43 +19322,43 @@ return="void" id="0"> - - - - + + + + - - - - + + + + - - + + - + - - - - + + + + - - + + - + - - - + + + - - - + + + - + @@ -19388,46 +19388,46 @@ id="0"/> - + - - - + + + - - + + - - + + - - + + - + - - + + - + - + - + - - + + @@ -19456,25 +19456,25 @@ id="0"/> - - - + + + - + - - - - + + + @@ -19486,11 +19486,11 @@ id="0"/> - - + + - - + + @@ -19498,25 +19498,25 @@ id="0"/> - + - + - + - + - - - - + + + + @@ -19524,51 +19524,51 @@ id="0"/> - - - - + + + + - - - + + + - - - + + + - + - + - + - + - + - + - - + + - + - + - + +return="TQString" id="0"> @@ -19599,13 +19599,13 @@ id="0"> - - - - + + + + - + @@ -19617,50 +19617,50 @@ id="0"/> - + - + - - - + + + - - - - - - + + + + + + - - + + - + - + - + - + - + - + - - + + @@ -19669,26 +19669,26 @@ id="0"/> - + - - - - + + + + - - - - - + + + + + - + - + - + @@ -19698,7 +19698,7 @@ id="0"/> - + @@ -19709,16 +19709,16 @@ id="0"/> - + - + - + - + @@ -19731,61 +19731,61 @@ id="0"/> - + - - + + - + - + - - + + - - + + - - - - + + + + - + - - - + + + - - - - - + + + + + - - + + - - - + + + - + - + - + - + @@ -19795,13 +19795,13 @@ id="0"/> - - - - + + + + - + @@ -19810,48 +19810,48 @@ id="0"/> - - + + - - + + - - + + - + - - - - + + + + - + - + - + - + @@ -19866,7 +19866,7 @@ id="0"/> - + @@ -19874,44 +19874,44 @@ id="0"/> - - + + - + - - + + - - + + - + - + - + - + - - + + - - + + - + @@ -19922,88 +19922,88 @@ id="0"/> - - - - - + + + + + - - + + - + - + - + - + - + - + - - + + - + - - + + - + - - + + - - + + - - + + - - - - + + + + - - + + - - - + + + - - + + - + - + - + - + - + - + - + @@ -20011,71 +20011,71 @@ id="0"/> - + - + - + - + - + - - + + - + - + - + - - - + + + - + - + - + - + - - - - - + + + + + - - + + - - + + - - + + - - + + @@ -20083,14 +20083,14 @@ id="0"/> - - + + - - + + - - + + @@ -20098,9 +20098,9 @@ id="0"/> - + - + @@ -20112,10 +20112,10 @@ id="0"/> - + - + @@ -20130,16 +20130,16 @@ id="0"/> - + - + - - + + - - + + @@ -20147,78 +20147,78 @@ id="0"/> - - + + - - + + - - + + - - - - - - + + + + + + - - + + - - - + + + - + - + - - - + + - - + + - - - + + + - - + + - - - + + + - - + + - + - - - + + + - + @@ -20226,32 +20226,32 @@ id="0"/> id="0"/> - - + + - - + + - - + + - - - + + + - - - + + + @@ -20264,92 +20264,92 @@ id="0"/> - - + + - - + + - + - + - - - - + + + + - - - - + + + + - - + + - + - - - - - + + + + + - - - + + + - - - - - - - + + + + + + + - - - + + + - - - + + + - + - + - + - + /** API */ - - + + @@ -20437,42 +20437,42 @@ id="0"/> */ - + /** Functions */ - - + + - + /** Functions */ - - + + - - + + - - - - + + + + /** Functions */ - + - + @@ -20498,23 +20498,23 @@ id="0"/> - - - - + + + + - - - + + + - + @@ -20559,14 +20559,14 @@ id="0"/> - - - - + + + + - + @@ -20583,7 +20583,7 @@ id="0"/> - + @@ -20618,104 +20618,104 @@ id="0"/> - - - - + + + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - - + + @@ -20727,30 +20727,30 @@ id="0"/> - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -20761,41 +20761,41 @@ id="0"/> - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + @@ -20803,10 +20803,10 @@ id="0"/> - - - - + + + + @@ -20840,109 +20840,109 @@ id="0"/> - - + + - - + + - - + + - - + + - + - + - + - + - + - - - + + + - + - + - - + + - - - + + + - + - - + + - + - - - + + + - - + - - - + + + - - - - - - - - + + + + + + + + - - - + + + - - + + @@ -20952,9 +20952,9 @@ id="0"> - - - + + + @@ -20967,22 +20967,22 @@ id="0"> - - + + - + - + - + - - + + @@ -20991,36 +20991,36 @@ id="0"> - + - - + + - - - + + + - - - - - + + + + + - + - + @@ -21038,24 +21038,24 @@ id="0"> - + - + - + - + - + @@ -21067,27 +21067,27 @@ id="0"> - - + + - - + + - - + + - - + + - - - + + + - - - + + + - + @@ -21096,71 +21096,71 @@ id="0"> - - + + - + - + - + - - + + - + - - + - - + - - + - - + + - + - - - + + + - + - - - + + + - + - + - + - + - + - + @@ -21171,19 +21171,19 @@ id="0"/> - + - + - + - + @@ -21191,18 +21191,18 @@ id="0"/> - + - + - - - + + + - + @@ -21213,23 +21213,23 @@ id="0"/> - + - + - + - - + + - + - + @@ -21240,10 +21240,10 @@ id="0"/> - + - + @@ -21252,19 +21252,19 @@ id="0"/> - + - + - - + + - - + + @@ -21279,7 +21279,7 @@ id="0"/> - + @@ -21288,19 +21288,19 @@ id="0"/> - + - - + + - + - + @@ -21310,11 +21310,11 @@ id="0"/> - + - + @@ -21324,13 +21324,13 @@ id="0"/> - + - + - + @@ -21348,7 +21348,7 @@ id="0"/> - + @@ -21362,11 +21362,11 @@ id="0"/> - + - + @@ -21382,21 +21382,21 @@ id="0"/> - + - + - + @@ -21405,21 +21405,21 @@ id="0"/> - + - - + + - - + - + - + - + @@ -21428,16 +21428,16 @@ id="0"> - + - + - + @@ -21475,11 +21475,11 @@ id="0"/> id="0"> - - - @@ -21491,134 +21491,134 @@ id="0"> - + - - - - - - + + + + + + - + - - + + - - - - + + + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - + - - - - + + + + - + - + - + - - + + - + - + - + - + - + - - + + @@ -21634,18 +21634,18 @@ id="0"/> - - + + - - + + - + @@ -21655,677 +21655,677 @@ id="0"/> - - - - + + + + - + - - - + + + - + - - - - + + + + - + - - - - + + + + - + - + - + - - - + + + - - - + + + - + - - + + - - - - + + + + - + - + - - + + - - + + - + - - + + - - + + - + - + - + - - + + - + - + - + - - - - - + + + + + - - + + - + - + - + - + - + - + - - + + - - - - + + + + - - - - + + + + - + - + - + - - + + - - - + + + - + - - + + - + - + - + - + - - + + - - - + + + - + - - + + - - - + + + - - - - + + + + - + - + - - + + - + - - - - + + + + - - - + + + - + - + - - + + - + - - + + - - - + + + - - - - + + + + - - + + - - - - - + + + + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - + + - + - - - - + + + + - - - + + + - + - + - - + + - + - + - + - + - - - + + + - - - - + + + + - - - + + + - - - + + + - + - + - + - - - - - + + + + + - - + + - - - + + + - - + + - - - + + + - - + + - + - + - + - - - - - + + + + + - - + + - - + + - + - + - + - - + + - - + - + - - - + + + - + - + - + - - - + + + - - - + + + - - + + - - + + - - + + - - - + + + - + - - + + - - - + + + - - - + + + - - + + - - - - + + + + - + - + - + - + - + - + - + - - + - + - + - - + - + - + - - + - + - + - + - - - - + + + + - + - + - + - + - + - + - + - - + - + - + - - + - + - + - - + - + - + - + - + - - - + + + - + - + - - - - + + + + - + - + - + @@ -22906,26 +22906,26 @@ value="AlignLeft|AlignRight|AlignHCenter|AlignJustify"/> - + - + - - - + + + - + - + - + @@ -22957,9 +22957,9 @@ value="AlignLeft|AlignRight|AlignHCenter|AlignJustify"/> - + - + @@ -23022,10 +23022,10 @@ value="AlignLeft|AlignRight|AlignHCenter|AlignJustify"/> - + - + @@ -23035,19 +23035,19 @@ value="AlignLeft|AlignRight|AlignHCenter|AlignJustify"/> - + - + - + @@ -23056,27 +23056,27 @@ value="AlignLeft|AlignRight|AlignHCenter|AlignJustify"/> - + - + - + - + - + - + @@ -23118,25 +23118,25 @@ value="AlignLeft|AlignRight|AlignHCenter|AlignJustify"/> - + - + - + - + - + - + @@ -23150,7 +23150,7 @@ value="AlignLeft|AlignRight|AlignHCenter|AlignJustify"/> - + diff --git a/qtsharp/src/bindings/Makefile.am b/qtsharp/src/bindings/Makefile.am index 9732e2ec..9fffe16d 100644 --- a/qtsharp/src/bindings/Makefile.am +++ b/qtsharp/src/bindings/Makefile.am @@ -1,9 +1,9 @@ all: Qt.dll -QWidget.cs: +TTQWidget.cs: $(CLI) ../generator/generator.exe -f ../api/qt.xml -d . -Qt.dll: QWidget.cs $(wildcard *.cs) $(wildcard static/*.cs) +Qt.dll: TQWidget.cs $(wildcard *.cs) $(wildcard static/*.cs) cp static/*.cs . csant -D$(CSC_NAME)=$(CSC) -C $(CSC_NAME) diff --git a/qtsharp/src/bindings/qt.build b/qtsharp/src/bindings/qt.build index 46ca68ae..1481dddd 100644 --- a/qtsharp/src/bindings/qt.build +++ b/qtsharp/src/bindings/qt.build @@ -23,20 +23,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -46,423 +46,423 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -474,16 +474,16 @@ - + - - - - - + + + + + diff --git a/qtsharp/src/bindings/static/AlignmentFlags.cs b/qtsharp/src/bindings/static/AlignmentFlags.cs index 520c7ad0..7f02b873 100644 --- a/qtsharp/src/bindings/static/AlignmentFlags.cs +++ b/qtsharp/src/bindings/static/AlignmentFlags.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // diff --git a/qtsharp/src/bindings/static/ArrowType.cs b/qtsharp/src/bindings/static/ArrowType.cs index d11bbf45..e7e924ac 100644 --- a/qtsharp/src/bindings/static/ArrowType.cs +++ b/qtsharp/src/bindings/static/ArrowType.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // diff --git a/qtsharp/src/bindings/static/BGMode.cs b/qtsharp/src/bindings/static/BGMode.cs index c92a54bf..1b6d879b 100644 --- a/qtsharp/src/bindings/static/BGMode.cs +++ b/qtsharp/src/bindings/static/BGMode.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // diff --git a/qtsharp/src/bindings/static/BackgroundMode.cs b/qtsharp/src/bindings/static/BackgroundMode.cs index 81c80a59..16c57a3e 100644 --- a/qtsharp/src/bindings/static/BackgroundMode.cs +++ b/qtsharp/src/bindings/static/BackgroundMode.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // diff --git a/qtsharp/src/bindings/static/BrushStyle.cs b/qtsharp/src/bindings/static/BrushStyle.cs index 7fb5831a..7431cc4d 100644 --- a/qtsharp/src/bindings/static/BrushStyle.cs +++ b/qtsharp/src/bindings/static/BrushStyle.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // diff --git a/qtsharp/src/bindings/static/ButtonState.cs b/qtsharp/src/bindings/static/ButtonState.cs index 3cca899f..7a8eff58 100644 --- a/qtsharp/src/bindings/static/ButtonState.cs +++ b/qtsharp/src/bindings/static/ButtonState.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // diff --git a/qtsharp/src/bindings/static/CursorShape.cs b/qtsharp/src/bindings/static/CursorShape.cs index 5d73d689..857f8782 100644 --- a/qtsharp/src/bindings/static/CursorShape.cs +++ b/qtsharp/src/bindings/static/CursorShape.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // diff --git a/qtsharp/src/bindings/static/DateFormat.cs b/qtsharp/src/bindings/static/DateFormat.cs index 1b2e93c2..75d90ef1 100644 --- a/qtsharp/src/bindings/static/DateFormat.cs +++ b/qtsharp/src/bindings/static/DateFormat.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // diff --git a/qtsharp/src/bindings/static/Dock.cs b/qtsharp/src/bindings/static/Dock.cs index 34875514..ec6c0dcd 100644 --- a/qtsharp/src/bindings/static/Dock.cs +++ b/qtsharp/src/bindings/static/Dock.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // diff --git a/qtsharp/src/bindings/static/GUIStyle.cs b/qtsharp/src/bindings/static/GUIStyle.cs index 6fe4a287..a3aca26e 100644 --- a/qtsharp/src/bindings/static/GUIStyle.cs +++ b/qtsharp/src/bindings/static/GUIStyle.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // diff --git a/qtsharp/src/bindings/static/IQMenuData.cs b/qtsharp/src/bindings/static/IQMenuData.cs index b9db26e8..f4653547 100644 --- a/qtsharp/src/bindings/static/IQMenuData.cs +++ b/qtsharp/src/bindings/static/IQMenuData.cs @@ -1,4 +1,4 @@ -// TQMenuData.cs - A Qt to C# binding. +// TTQMenuData.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // @@ -24,42 +24,42 @@ namespace Qt { using System; using System.Collections; - public interface IQMenuData { + public interface ITQMenuData { Hashtable MenuConnections { get; } uint Count (); - int InsertItem (string text, TQObject receiver, string member, TQKeySequence accel, int identifier, int index); - int InsertItem (TQIconSet icon, string text, TQObject receiver, string member, TQKeySequence accel, int identifier, int index); - int InsertItem (TQPixmap pixmap, TQObject receiver, string member, TQKeySequence accel, int identifier, int index); - int InsertItem (TQIconSet icon, TQPixmap pixmap, TQObject receiver, string member, TQKeySequence accel, int identifier, int index); + int InsertItem (string text, TTQObject receiver, string member, TTQKeySequence accel, int identifier, int index); + int InsertItem (TTQIconSet icon, string text, TTQObject receiver, string member, TTQKeySequence accel, int identifier, int index); + int InsertItem (TTQPixmap pixmap, TTQObject receiver, string member, TTQKeySequence accel, int identifier, int index); + int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQObject receiver, string member, TTQKeySequence accel, int identifier, int index); int InsertItem (string text, int identifier, int index); - int InsertItem (TQIconSet icon, string text, int identifier, int index); - int InsertItem (string text, TQPopupMenu popup, int identifier, int index); - int InsertItem (TQIconSet icon, string text, TQPopupMenu popup, int identifier, int index); - int InsertItem (TQPixmap pixmap, int identifier, int index); - int InsertItem (TQIconSet icon, TQPixmap pixmap, int identifier, int index); - int InsertItem (TQPixmap pixmap, TQPopupMenu popup, int identifier, int index); - int InsertItem (TQIconSet icon, TQPixmap pixmap, TQPopupMenu popup, int identifier, int index); - int InsertItem (TQWidget widget, int identifier, int index); - int InsertItem (TQIconSet icon, TQCustomMenuItem custom, int identifier, int index); - int InsertItem (TQCustomMenuItem custom, int identifier, int index); + int InsertItem (TTQIconSet icon, string text, int identifier, int index); + int InsertItem (string text, TTQPopupMenu popup, int identifier, int index); + int InsertItem (TTQIconSet icon, string text, TTQPopupMenu popup, int identifier, int index); + int InsertItem (TTQPixmap pixmap, int identifier, int index); + int InsertItem (TTQIconSet icon, TTQPixmap pixmap, int identifier, int index); + int InsertItem (TTQPixmap pixmap, TTQPopupMenu popup, int identifier, int index); + int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQPopupMenu popup, int identifier, int index); + int InsertItem (TTQWidget widget, int identifier, int index); + int InsertItem (TTQIconSet icon, TTQCustomMenuItem custom, int identifier, int index); + int InsertItem (TTQCustomMenuItem custom, int identifier, int index); int InsertSeparator (int index); void RemoveItem (int identifier); void RemoveItemAt (int index); void Clear (); - TQKeySequence Accel (int identifier); - void SetAccel (TQKeySequence key, int identifier); - TQIconSet IconSet (int identifier); + TTQKeySequence Accel (int identifier); + void SetAccel (TTQKeySequence key, int identifier); + TTQIconSet IconSet (int identifier); string Text (int identifier); - TQPixmap Pixmap (int identifier); + TTQPixmap Pixmap (int identifier); void SetWhatsThis (int identifier, string arg1); string WhatsThis (int identifier); void ChangeItem (int identifier, string text); - void ChangeItem (int identifier, TQPixmap pixmap); - void ChangeItem (int identifier, TQIconSet icon, string text); - void ChangeItem (int identifier, TQIconSet icon, TQPixmap pixmap); + void ChangeItem (int identifier, TTQPixmap pixmap); + void ChangeItem (int identifier, TTQIconSet icon, string text); + void ChangeItem (int identifier, TTQIconSet icon, TTQPixmap pixmap); void ChangeItem (string text, int identifier); - void ChangeItem (TQPixmap pixmap, int identifier); - void ChangeItem (TQIconSet icon, string text, int identifier); + void ChangeItem (TTQPixmap pixmap, int identifier); + void ChangeItem (TTQIconSet icon, string text, int identifier); bool IsItemActive (int identifier); bool IsItemEnabled (int identifier); void SetItemEnabled (int identifier, bool enable); @@ -67,49 +67,49 @@ namespace Qt { void SetItemChecked (int identifier, bool check); int IndexOf (int identifier); void SetId (int index, int identifier); - bool ConnectItem (int identifier, TQObject receiver, string member); - bool DisconnectItem (int identifier, TQObject receiver, string member); + bool ConnectItem (int identifier, TTQObject receiver, string member); + bool DisconnectItem (int identifier, TTQObject receiver, string member); bool SetItemParameter (int identifier, int param); int ItemParameter (int identifier); - TQMenuItem FindItem (int identifier); - TQMenuItem FindItem (int identifier, TQMenuData parent); - TQMenuItem FindPopup (TQPopupMenu arg1, int[] index); - int InsertItem (string text, TQObject receiver, string member); - int InsertItem (string text, TQObject receiver, string member, TQKeySequence accel); - int InsertItem (string text, TQObject receiver, string member, TQKeySequence accel, int identifier); - int InsertItem (TQIconSet icon, string text, TQObject receiver, string member); - int InsertItem (TQIconSet icon, string text, TQObject receiver, string member, TQKeySequence accel); - int InsertItem (TQIconSet icon, string text, TQObject receiver, string member, TQKeySequence accel, int identifier); - int InsertItem (TQPixmap pixmap, TQObject receiver, string member); - int InsertItem (TQPixmap pixmap, TQObject receiver, string member, TQKeySequence accel); - int InsertItem (TQPixmap pixmap, TQObject receiver, string member, TQKeySequence accel, int identifier); - int InsertItem (TQIconSet icon, TQPixmap pixmap, TQObject receiver, string member); - int InsertItem (TQIconSet icon, TQPixmap pixmap, TQObject receiver, string member, TQKeySequence accel); - int InsertItem (TQIconSet icon, TQPixmap pixmap, TQObject receiver, string member, TQKeySequence accel, int identifier); + TTQMenuItem FindItem (int identifier); + TTQMenuItem FindItem (int identifier, TTQMenuData parent); + TTQMenuItem FindPopup (TTQPopupMenu arg1, int[] index); + int InsertItem (string text, TTQObject receiver, string member); + int InsertItem (string text, TTQObject receiver, string member, TTQKeySequence accel); + int InsertItem (string text, TTQObject receiver, string member, TTQKeySequence accel, int identifier); + int InsertItem (TTQIconSet icon, string text, TTQObject receiver, string member); + int InsertItem (TTQIconSet icon, string text, TTQObject receiver, string member, TTQKeySequence accel); + int InsertItem (TTQIconSet icon, string text, TTQObject receiver, string member, TTQKeySequence accel, int identifier); + int InsertItem (TTQPixmap pixmap, TTQObject receiver, string member); + int InsertItem (TTQPixmap pixmap, TTQObject receiver, string member, TTQKeySequence accel); + int InsertItem (TTQPixmap pixmap, TTQObject receiver, string member, TTQKeySequence accel, int identifier); + int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQObject receiver, string member); + int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQObject receiver, string member, TTQKeySequence accel); + int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQObject receiver, string member, TTQKeySequence accel, int identifier); int InsertItem (string text); int InsertItem (string text, int identifier); - int InsertItem (TQIconSet icon, string text); - int InsertItem (TQIconSet icon, string text, int identifier); - int InsertItem (string text, TQPopupMenu popup); - int InsertItem (string text, TQPopupMenu popup, int identifier); - int InsertItem (TQIconSet icon, string text, TQPopupMenu popup); - int InsertItem (TQIconSet icon, string text, TQPopupMenu popup, int identifier); - int InsertItem (TQPixmap pixmap); - int InsertItem (TQPixmap pixmap, int identifier); - int InsertItem (TQIconSet icon, TQPixmap pixmap); - int InsertItem (TQIconSet icon, TQPixmap pixmap, int identifier); - int InsertItem (TQPixmap pixmap, TQPopupMenu popup); - int InsertItem (TQPixmap pixmap, TQPopupMenu popup, int identifier); - int InsertItem (TQIconSet icon, TQPixmap pixmap, TQPopupMenu popup); - int InsertItem (TQIconSet icon, TQPixmap pixmap, TQPopupMenu popup, int identifier); - int InsertItem (TQWidget widget); - int InsertItem (TQWidget widget, int identifier); - int InsertItem (TQIconSet icon, TQCustomMenuItem custom); - int InsertItem (TQIconSet icon, TQCustomMenuItem custom, int identifier); - int InsertItem (TQCustomMenuItem custom); - int InsertItem (TQCustomMenuItem custom, int identifier); + int InsertItem (TTQIconSet icon, string text); + int InsertItem (TTQIconSet icon, string text, int identifier); + int InsertItem (string text, TTQPopupMenu popup); + int InsertItem (string text, TTQPopupMenu popup, int identifier); + int InsertItem (TTQIconSet icon, string text, TTQPopupMenu popup); + int InsertItem (TTQIconSet icon, string text, TTQPopupMenu popup, int identifier); + int InsertItem (TTQPixmap pixmap); + int InsertItem (TTQPixmap pixmap, int identifier); + int InsertItem (TTQIconSet icon, TTQPixmap pixmap); + int InsertItem (TTQIconSet icon, TTQPixmap pixmap, int identifier); + int InsertItem (TTQPixmap pixmap, TTQPopupMenu popup); + int InsertItem (TTQPixmap pixmap, TTQPopupMenu popup, int identifier); + int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQPopupMenu popup); + int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQPopupMenu popup, int identifier); + int InsertItem (TTQWidget widget); + int InsertItem (TTQWidget widget, int identifier); + int InsertItem (TTQIconSet icon, TTQCustomMenuItem custom); + int InsertItem (TTQIconSet icon, TTQCustomMenuItem custom, int identifier); + int InsertItem (TTQCustomMenuItem custom); + int InsertItem (TTQCustomMenuItem custom, int identifier); int InsertSeparator (); - TQMenuItem FindPopup (TQPopupMenu arg1); - //IntPtr TQMenuData (); + TTQMenuItem FindPopup (TTQPopupMenu arg1); + //IntPtr TTQMenuData (); } } diff --git a/qtsharp/src/bindings/static/ImageConversionFlags.cs b/qtsharp/src/bindings/static/ImageConversionFlags.cs index 349b4e7a..e8da5314 100644 --- a/qtsharp/src/bindings/static/ImageConversionFlags.cs +++ b/qtsharp/src/bindings/static/ImageConversionFlags.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // diff --git a/qtsharp/src/bindings/static/Key.cs b/qtsharp/src/bindings/static/Key.cs index a1b0883b..eb17cd6e 100644 --- a/qtsharp/src/bindings/static/Key.cs +++ b/qtsharp/src/bindings/static/Key.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // diff --git a/qtsharp/src/bindings/static/Modifier.cs b/qtsharp/src/bindings/static/Modifier.cs index 722bb37b..ed6765ba 100644 --- a/qtsharp/src/bindings/static/Modifier.cs +++ b/qtsharp/src/bindings/static/Modifier.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // diff --git a/qtsharp/src/bindings/static/Orientation.cs b/qtsharp/src/bindings/static/Orientation.cs index 757adef7..c943cbcb 100644 --- a/qtsharp/src/bindings/static/Orientation.cs +++ b/qtsharp/src/bindings/static/Orientation.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // diff --git a/qtsharp/src/bindings/static/PaintUnit.cs b/qtsharp/src/bindings/static/PaintUnit.cs index 92ffd012..97e6e665 100644 --- a/qtsharp/src/bindings/static/PaintUnit.cs +++ b/qtsharp/src/bindings/static/PaintUnit.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // diff --git a/qtsharp/src/bindings/static/PenCapStyle.cs b/qtsharp/src/bindings/static/PenCapStyle.cs index c7898c03..b7bdb6d5 100644 --- a/qtsharp/src/bindings/static/PenCapStyle.cs +++ b/qtsharp/src/bindings/static/PenCapStyle.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // diff --git a/qtsharp/src/bindings/static/PenJoinStyle.cs b/qtsharp/src/bindings/static/PenJoinStyle.cs index ee8906f0..7aaef279 100644 --- a/qtsharp/src/bindings/static/PenJoinStyle.cs +++ b/qtsharp/src/bindings/static/PenJoinStyle.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // diff --git a/qtsharp/src/bindings/static/PenStyle.cs b/qtsharp/src/bindings/static/PenStyle.cs index 1ed224b2..6fcd7690 100644 --- a/qtsharp/src/bindings/static/PenStyle.cs +++ b/qtsharp/src/bindings/static/PenStyle.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // diff --git a/qtsharp/src/bindings/static/QApplication.cs b/qtsharp/src/bindings/static/QApplication.cs index 61dd8019..6d8accd4 100644 --- a/qtsharp/src/bindings/static/QApplication.cs +++ b/qtsharp/src/bindings/static/QApplication.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // @@ -25,7 +25,7 @@ namespace Qt { using System.Collections; using System.Runtime.InteropServices; - public class TQApplication : TQObject, IDisposable { + public class TTQApplication : TTQObject, IDisposable { public enum Type { Tty = 0, @@ -51,9 +51,9 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_new_QApplication (int argc, string[] argv); - public TQApplication (string[] argv) : this (QNull.Instance) + public TTQApplication (string[] argv) : this (TQNull.Instance) { - TQObject.qApp = this; + TTQObject.qApp = this; qparent = null; argv = ParseArguments (argv); rawObject = qt_new_QApplication (argv.Length, argv); @@ -63,9 +63,9 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_new_QApplication1 (int argc, string[] argv, bool GUIenabled); - public TQApplication (string[] argv, bool GUIenabled) : this (QNull.Instance) + public TTQApplication (string[] argv, bool GUIenabled) : this (TQNull.Instance) { - TQObject.qApp = this; + TTQObject.qApp = this; qparent = null; argv = ParseArguments (argv); rawObject = qt_new_QApplication1 (argv.Length, argv, GUIenabled); @@ -75,9 +75,9 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_new_QApplication2 (int argc, string[] argv, Type arg1); - public TQApplication (string[] argv, Type arg1) : this (QNull.Instance) + public TTQApplication (string[] argv, Type arg1) : this (TQNull.Instance) { - TQObject.qApp = this; + TTQObject.qApp = this; qparent = null; argv = ParseArguments (argv); rawObject = qt_new_QApplication2 (argv.Length, argv, arg1); @@ -87,9 +87,9 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_new_QApplication3 (IntPtr dpy, uint visual, uint cmap); - public TQApplication (IntPtr dpy, uint visual, uint cmap) : this (QNull.Instance) + public TTQApplication (IntPtr dpy, uint visual, uint cmap) : this (TQNull.Instance) { - TQObject.qApp = this; + TTQObject.qApp = this; qparent = null; rawObject = qt_new_QApplication3 (dpy, visual, cmap); RegisterObject (this); @@ -98,9 +98,9 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_new_QApplication4 (IntPtr dpy, int argc, string[] argv, uint visual, uint cmap); - public TQApplication (IntPtr dpy, string[] argv, uint visual, uint cmap) : this (QNull.Instance) + public TTQApplication (IntPtr dpy, string[] argv, uint visual, uint cmap) : this (TQNull.Instance) { - TQObject.qApp = this; + TTQObject.qApp = this; qparent = null; argv = ParseArguments (argv); rawObject = qt_new_QApplication4 (dpy, argv.Length, argv, visual, cmap); @@ -108,19 +108,19 @@ namespace Qt { RegisterEventDelegate (); } - public TQApplication (IntPtr dpy) : this (dpy, (uint) 0) {} + public TTQApplication (IntPtr dpy) : this (dpy, (uint) 0) {} - public TQApplication (IntPtr dpy, uint visual) : this (dpy, visual, (uint) 0) {} + public TTQApplication (IntPtr dpy, uint visual) : this (dpy, visual, (uint) 0) {} - public TQApplication (IntPtr dpy, string[] argv) : this (dpy, argv, (uint) 0) {} + public TTQApplication (IntPtr dpy, string[] argv) : this (dpy, argv, (uint) 0) {} - public TQApplication (IntPtr dpy, string[] argv, uint visual) : this (dpy, argv, visual, (uint) 0) {} + public TTQApplication (IntPtr dpy, string[] argv, uint visual) : this (dpy, argv, visual, (uint) 0) {} - internal TQApplication () : this (QNull.Instance) {} + internal TTQApplication () : this (TQNull.Instance) {} - internal TQApplication (QNull dummy) : base (QNull.Instance) {} + internal TTQApplication (TQNull dummy) : base (TQNull.Instance) {} - ~TQApplication () + ~TTQApplication () { Dispose (false); } @@ -204,37 +204,37 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QApplication_mainWidget (IntPtr raw); - public TQWidget MainWidget () + public TTQWidget MainWidget () { - return (TQWidget)LookupObject (qt_QApplication_mainWidget (rawObject), typeof(TQWidget)); + return (TTQWidget)LookupObject (qt_QApplication_mainWidget (rawObject), typeof(TTQWidget)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QApplication_setMainWidget (IntPtr raw, IntPtr arg1); - public void SetMainWidget (TQWidget arg1) + public void SetMainWidget (TTQWidget arg1) { qt_QApplication_setMainWidget (rawObject, arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QApplication_polish (IntPtr raw, IntPtr arg1); - public void Polish (TQWidget arg1) + public void Polish (TTQWidget arg1) { qt_QApplication_polish (rawObject, arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QApplication_focusWidget (IntPtr raw); - public TQWidget FocusWidget () + public TTQWidget FocusWidget () { - return (TQWidget)LookupObject (qt_QApplication_focusWidget (rawObject), typeof(TQWidget)); + return (TTQWidget)LookupObject (qt_QApplication_focusWidget (rawObject), typeof(TTQWidget)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QApplication_activeWindow (IntPtr raw); - public TQWidget ActiveWindow () + public TTQWidget ActiveWindow () { - return (TQWidget)LookupObject (qt_QApplication_activeWindow (rawObject), typeof(TQWidget)); + return (TTQWidget)LookupObject (qt_QApplication_activeWindow (rawObject), typeof(TTQWidget)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] @@ -288,35 +288,35 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern bool qt_QApplication_notify (IntPtr raw, IntPtr arg1, IntPtr arg2); - public bool Notify (TQObject arg1, TQEvent arg2) + public bool Notify (TTQObject arg1, TTQEvent arg2) { return qt_QApplication_notify (rawObject, arg1.RawObject, arg2.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QApplication_setDefaultCodec (IntPtr raw, IntPtr arg1); - public void SetDefaultCodec (TQTextCodec arg1) + public void SetDefaultCodec (TTQTextCodec arg1) { qt_QApplication_setDefaultCodec (rawObject, arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QApplication_defaultCodec (IntPtr raw); - public TQTextCodec DefaultCodec () + public TTQTextCodec DefaultCodec () { - return (TQTextCodec)LookupObject (qt_QApplication_defaultCodec (rawObject), typeof(TQTextCodec)); + return (TTQTextCodec)LookupObject (qt_QApplication_defaultCodec (rawObject), typeof(TTQTextCodec)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QApplication_installTranslator (IntPtr raw, IntPtr arg1); - public void InstallTranslator (QTranslator arg1) + public void InstallTranslator (TQTranslator arg1) { qt_QApplication_installTranslator (rawObject, arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QApplication_removeTranslator (IntPtr raw, IntPtr arg1); - public void RemoveTranslator (QTranslator arg1) + public void RemoveTranslator (TQTranslator arg1) { qt_QApplication_removeTranslator (rawObject, arg1.RawObject); } @@ -325,7 +325,7 @@ namespace Qt { private static extern IntPtr qt_QApplication_translate (IntPtr raw, string context, string key, string comment, Encoding encoding); public string Translate (string context, string key, string comment, Encoding encoding) { - TQString qstr = new TQString (qt_QApplication_translate (rawObject, context, key, comment, encoding)); + TTQString qstr = new TTQString (qt_QApplication_translate (rawObject, context, key, comment, encoding)); string str = qstr.Latin1 (); qstr.Dispose (); return str; @@ -354,7 +354,7 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QApplication_x11ClientMessage (IntPtr raw, IntPtr arg1, IntPtr arg2, bool passive_only); - public int X11ClientMessage (TQWidget arg1, IntPtr arg2, bool passive_only) + public int X11ClientMessage (TTQWidget arg1, IntPtr arg2, bool passive_only) { return qt_QApplication_x11ClientMessage (rawObject, arg1.RawObject, arg2, passive_only); } @@ -375,7 +375,7 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QApplication_winFocus (IntPtr raw, IntPtr arg1, bool arg2); - public void WinFocus (TQWidget arg1, bool arg2) + public void WinFocus (TTQWidget arg1, bool arg2) { qt_QApplication_winFocus (rawObject, arg1.RawObject, arg2); } @@ -391,7 +391,7 @@ namespace Qt { private static extern IntPtr qt_QApplication_sessionId (IntPtr raw); public string SessionId () { - TQString qstr = new TQString (qt_QApplication_sessionId (rawObject)); + TTQString qstr = new TTQString (qt_QApplication_sessionId (rawObject)); string str = qstr.Latin1 (); qstr.Dispose (); return str; @@ -399,14 +399,14 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QApplication_commitData (IntPtr raw, IntPtr sm); - public void CommitData (QSessionManager sm) + public void CommitData (TQSessionManager sm) { qt_QApplication_commitData (rawObject, sm.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QApplication_saveState (IntPtr raw, IntPtr sm); - public void SaveState (QSessionManager sm) + public void SaveState (TQSessionManager sm) { qt_QApplication_saveState (rawObject, sm.RawObject); } @@ -448,7 +448,7 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QApplication_setEnableRemoteControl (IntPtr raw, bool enable, IntPtr appId); - public void SetEnableRemoteControl (bool enable, QUuid appId) + public void SetEnableRemoteControl (bool enable, TQUuid appId) { qt_QApplication_setEnableRemoteControl (rawObject, enable, appId.RawObject); } @@ -462,9 +462,9 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QApplication_applicationId (IntPtr raw); - public QUuid ApplicationId () + public TQUuid ApplicationId () { - return (QUuid)LookupObject (qt_QApplication_applicationId (rawObject), typeof(QUuid)); + return (TQUuid)LookupObject (qt_QApplication_applicationId (rawObject), typeof(TQUuid)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] @@ -483,23 +483,23 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QApplication_style (); - public static TQStyle Style () + public static TTQStyle Style () { - return (TQStyle)LookupObject (qt_QApplication_style (), typeof(TQStyle)); + return (TTQStyle)LookupObject (qt_QApplication_style (), typeof(TTQStyle)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QApplication_setStyle (IntPtr arg1); - public static void SetStyle (TQStyle arg1) + public static void SetStyle (TTQStyle arg1) { qt_QApplication_setStyle (arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QApplication_setStyle1 (IntPtr arg1); - public static TQStyle SetStyle (string arg1) + public static TTQStyle SetStyle (string arg1) { - return (TQStyle)LookupObject (qt_QApplication_setStyle1 (new TQString (arg1).RawObject), typeof(TQStyle)); + return (TTQStyle)LookupObject (qt_QApplication_setStyle1 (new TTQString (arg1).RawObject), typeof(TTQStyle)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] @@ -510,8 +510,8 @@ namespace Qt { } [DllImport("libqtc", CharSet=CharSet.Ansi)] - private static extern void qt_QApplication_setColorMode (TQApplication.ColorMode arg1); - public static void SetColorMode (TQApplication.ColorMode arg1) + private static extern void qt_QApplication_setColorMode (TTQApplication.ColorMode arg1); + public static void SetColorMode (TTQApplication.ColorMode arg1) { qt_QApplication_setColorMode (arg1); } @@ -532,14 +532,14 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QApplication_overrideCursor (); - public static TQCursor OverrideCursor () + public static TTQCursor OverrideCursor () { - return (TQCursor)LookupObject (qt_QApplication_overrideCursor (), typeof(TQCursor)); + return (TTQCursor)LookupObject (qt_QApplication_overrideCursor (), typeof(TTQCursor)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QApplication_setOverrideCursor (IntPtr arg1, bool replace); - public static void SetOverrideCursor (TQCursor arg1, bool replace) + public static void SetOverrideCursor (TTQCursor arg1, bool replace) { qt_QApplication_setOverrideCursor (arg1.RawObject, replace); } @@ -567,93 +567,93 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QApplication_palette (IntPtr arg1); - public static TQPalette Palette (TQWidget arg1) + public static TTQPalette Palette (TTQWidget arg1) { - return (TQPalette)LookupObject (qt_QApplication_palette (arg1.RawObject), typeof(TQPalette)); + return (TTQPalette)LookupObject (qt_QApplication_palette (arg1.RawObject), typeof(TTQPalette)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QApplication_setPalette (IntPtr arg1, bool informWidgets, string className); - public static void SetPalette (TQPalette arg1, bool informWidgets, string className) + public static void SetPalette (TTQPalette arg1, bool informWidgets, string className) { qt_QApplication_setPalette (arg1.RawObject, informWidgets, className); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QApplication_font (IntPtr arg1); - public static TQFont Font (TQWidget arg1) + public static TTQFont Font (TTQWidget arg1) { - return (TQFont)LookupObject (qt_QApplication_font (arg1.RawObject), typeof(TQFont)); + return (TTQFont)LookupObject (qt_QApplication_font (arg1.RawObject), typeof(TTQFont)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QApplication_setFont (IntPtr arg1, bool informWidgets, string className); - public static void SetFont (TQFont arg1, bool informWidgets, string className) + public static void SetFont (TTQFont arg1, bool informWidgets, string className) { qt_QApplication_setFont (arg1.RawObject, informWidgets, className); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QApplication_fontMetrics (); - public static TQFontMetrics FontMetrics () + public static TTQFontMetrics FontMetrics () { - return (TQFontMetrics)LookupObject (qt_QApplication_fontMetrics (), typeof(TQFontMetrics)); + return (TTQFontMetrics)LookupObject (qt_QApplication_fontMetrics (), typeof(TTQFontMetrics)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QApplication_allWidgets (); - public static TQWidgetList AllWidgets () + public static TTQWidgetList AllWidgets () { - return (TQWidgetList)LookupObject (qt_QApplication_allWidgets (), typeof(TQWidgetList)); + return (TTQWidgetList)LookupObject (qt_QApplication_allWidgets (), typeof(TTQWidgetList)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QApplication_topLevelWidgets (); - public static TQWidgetList TopLevelWidgets () + public static TTQWidgetList TopLevelWidgets () { - return (TQWidgetList)LookupObject (qt_QApplication_topLevelWidgets (), typeof(TQWidgetList)); + return (TTQWidgetList)LookupObject (qt_QApplication_topLevelWidgets (), typeof(TTQWidgetList)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QApplication_desktop (); - public static TQDesktopWidget Desktop () + public static TTQDesktopWidget Desktop () { - return (TQDesktopWidget)LookupObject (qt_QApplication_desktop (), typeof(TQDesktopWidget)); + return (TTQDesktopWidget)LookupObject (qt_QApplication_desktop (), typeof(TTQDesktopWidget)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QApplication_activePopupWidget (); - public static TQWidget ActivePopupWidget () + public static TTQWidget ActivePopupWidget () { - return (TQWidget)LookupObject (qt_QApplication_activePopupWidget (), typeof(TQWidget)); + return (TTQWidget)LookupObject (qt_QApplication_activePopupWidget (), typeof(TTQWidget)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QApplication_activeModalWidget (); - public static TQWidget ActiveModalWidget () + public static TTQWidget ActiveModalWidget () { - return (TQWidget)LookupObject (qt_QApplication_activeModalWidget (), typeof(TQWidget)); + return (TTQWidget)LookupObject (qt_QApplication_activeModalWidget (), typeof(TTQWidget)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QApplication_clipboard (); - public static QClipboard Clipboard () + public static TQClipboard Clipboard () { - return (QClipboard)LookupObject (qt_QApplication_clipboard (), typeof(QClipboard)); + return (TQClipboard)LookupObject (qt_QApplication_clipboard (), typeof(TQClipboard)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QApplication_widgetAt (int x, int y, bool child); - public static TQWidget WidgetAt (int x, int y, bool child) + public static TTQWidget WidgetAt (int x, int y, bool child) { - return (TQWidget)LookupObject (qt_QApplication_widgetAt (x, y, child), typeof(TQWidget)); + return (TTQWidget)LookupObject (qt_QApplication_widgetAt (x, y, child), typeof(TTQWidget)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QApplication_widgetAt1 (IntPtr arg1, bool child); - public static TQWidget WidgetAt (TQPoint arg1, bool child) + public static TTQWidget WidgetAt (TTQPoint arg1, bool child) { - return (TQWidget)LookupObject (qt_QApplication_widgetAt1 (arg1.RawObject, child), typeof(TQWidget)); + return (TTQWidget)LookupObject (qt_QApplication_widgetAt1 (arg1.RawObject, child), typeof(TTQWidget)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] @@ -665,7 +665,7 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QApplication_sendPostedEvents (IntPtr receiver, int event_type); - public static void SendPostedEvents (TQObject receiver, int event_type) + public static void SendPostedEvents (TTQObject receiver, int event_type) { qt_QApplication_sendPostedEvents (receiver.RawObject, event_type); } @@ -679,7 +679,7 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QApplication_removePostedEvents (IntPtr receiver); - public static void RemovePostedEvents (TQObject receiver) + public static void RemovePostedEvents (TTQObject receiver) { qt_QApplication_removePostedEvents (receiver.RawObject); } @@ -728,16 +728,16 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QApplication_setWinStyleHighlightColor (IntPtr c); - public static void SetWinStyleHighlightColor (TQColor c) + public static void SetWinStyleHighlightColor (TTQColor c) { qt_QApplication_setWinStyleHighlightColor (c.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QApplication_winStyleHighlightColor (); - public static TQColor WinStyleHighlightColor () + public static TTQColor WinStyleHighlightColor () { - return (TQColor)LookupObject (qt_QApplication_winStyleHighlightColor (), typeof(TQColor)); + return (TTQColor)LookupObject (qt_QApplication_winStyleHighlightColor (), typeof(TTQColor)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] @@ -798,44 +798,44 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QApplication_setGlobalStrut (IntPtr arg1); - public static void SetGlobalStrut (TQSize arg1) + public static void SetGlobalStrut (TTQSize arg1) { qt_QApplication_setGlobalStrut (arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QApplication_globalStrut (); - public static TQSize GlobalStrut () + public static TTQSize GlobalStrut () { - return (TQSize)LookupObject (qt_QApplication_globalStrut (), typeof(TQSize)); + return (TTQSize)LookupObject (qt_QApplication_globalStrut (), typeof(TTQSize)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QApplication_setLibraryPaths (IntPtr arg1); - public static void SetLibraryPaths (TQStringList arg1) + public static void SetLibraryPaths (TTQStringList arg1) { qt_QApplication_setLibraryPaths (arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QApplication_libraryPaths (); - public static TQStringList LibraryPaths () + public static TTQStringList LibraryPaths () { - return (TQStringList)LookupObject (qt_QApplication_libraryPaths (), typeof(TQStringList)); + return (TTQStringList)LookupObject (qt_QApplication_libraryPaths (), typeof(TTQStringList)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QApplication_addLibraryPath (IntPtr arg1); public static void AddLibraryPath (string arg1) { - qt_QApplication_addLibraryPath (new TQString (arg1).RawObject); + qt_QApplication_addLibraryPath (new TTQString (arg1).RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QApplication_removeLibraryPath (IntPtr arg1); public static void RemoveLibraryPath (string arg1) { - qt_QApplication_removeLibraryPath (new TQString (arg1).RawObject); + qt_QApplication_removeLibraryPath (new TTQString (arg1).RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] @@ -967,50 +967,50 @@ namespace Qt { public void SetEnableRemoteControl (bool enable) { - SetEnableRemoteControl(enable, new QUuid ()); + SetEnableRemoteControl(enable, new TQUuid ()); } - public static void SetOverrideCursor (TQCursor arg1) + public static void SetOverrideCursor (TTQCursor arg1) { SetOverrideCursor(arg1, false); } - public static TQPalette Palette () + public static TTQPalette Palette () { - return Palette(new TQWidget ()); + return Palette(new TTQWidget ()); } - public static void SetPalette (TQPalette arg1) + public static void SetPalette (TTQPalette arg1) { SetPalette(arg1, false); } - public static void SetPalette (TQPalette arg1, bool informWidgets) + public static void SetPalette (TTQPalette arg1, bool informWidgets) { SetPalette(arg1, informWidgets, ""); } - public static TQFont Font () + public static TTQFont Font () { - return Font(new TQWidget ()); + return Font(new TTQWidget ()); } - public static void SetFont (TQFont arg1) + public static void SetFont (TTQFont arg1) { SetFont(arg1, false); } - public static void SetFont (TQFont arg1, bool informWidgets) + public static void SetFont (TTQFont arg1, bool informWidgets) { SetFont(arg1, informWidgets, ""); } - public static TQWidget WidgetAt (int x, int y) + public static TTQWidget WidgetAt (int x, int y) { return WidgetAt(x, y, false); } - public static TQWidget WidgetAt (TQPoint arg1) + public static TTQWidget WidgetAt (TTQPoint arg1) { return WidgetAt(arg1, false); } diff --git a/qtsharp/src/bindings/static/QByteArray.cs b/qtsharp/src/bindings/static/QByteArray.cs index ca910191..05f55be0 100644 --- a/qtsharp/src/bindings/static/QByteArray.cs +++ b/qtsharp/src/bindings/static/QByteArray.cs @@ -1,4 +1,4 @@ -// TQByteArray.cs - A Qt to C# binding. +// TTQByteArray.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // @@ -24,11 +24,11 @@ namespace Qt { using System; using System.Runtime.InteropServices; - public class TQByteArray : TQMemArray, IDisposable { + public class TTQByteArray : TTQMemArray, IDisposable { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_new_QByteArray (); - public TQByteArray () : this (QNull.Instance) + public TTQByteArray () : this (TQNull.Instance) { rawObject = qt_new_QByteArray (); RegisterObject (this); @@ -36,21 +36,21 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_new_QByteArray1 (int size); - public TQByteArray (int size) : this (QNull.Instance) + public TTQByteArray (int size) : this (TQNull.Instance) { rawObject = qt_new_QByteArray1 (size); RegisterObject (this); } - internal TQByteArray (IntPtr ptr) : this (QNull.Instance) + internal TTQByteArray (IntPtr ptr) : this (TQNull.Instance) { rawObject = ptr; RegisterObject(this); } - internal TQByteArray (QNull dummy) : base (QNull.Instance) {} + internal TTQByteArray (TQNull dummy) : base (TQNull.Instance) {} - ~TQByteArray () + ~TTQByteArray () { Dispose (false); } @@ -69,9 +69,9 @@ namespace Qt { (IntPtr rawObject, [MarshalAs(UnmanagedType.LPArray)] byte[] b, uint length ); - public static implicit operator TQByteArray (byte[] bArray) + public static implicit operator TTQByteArray (byte[] bArray) { - TQByteArray qbArray = new TQByteArray (bArray.Length); + TTQByteArray qbArray = new TTQByteArray (bArray.Length); qbArray.rawObject = qt_QByteArray_assign1 (qbArray.rawObject, bArray, (uint) bArray.Length); GC.KeepAlive (bArray); diff --git a/qtsharp/src/bindings/static/QCallBack.cs b/qtsharp/src/bindings/static/QCallBack.cs index e3ae5c94..44740752 100644 --- a/qtsharp/src/bindings/static/QCallBack.cs +++ b/qtsharp/src/bindings/static/QCallBack.cs @@ -1,4 +1,4 @@ -// QCallBack.cs - A Qt to C# binding. +// TQCallBack.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // @@ -23,12 +23,12 @@ namespace Qt { using System; using System.Reflection; - public class QCallBack { + public class TQCallBack { public Object receiver; public MethodInfo info; - public QCallBack (Object receiver, MethodInfo info) + public TQCallBack (Object receiver, MethodInfo info) { this.receiver = receiver; this.info = info; diff --git a/qtsharp/src/bindings/static/QEventArgs.cs b/qtsharp/src/bindings/static/QEventArgs.cs index d7f07570..89521be7 100644 --- a/qtsharp/src/bindings/static/QEventArgs.cs +++ b/qtsharp/src/bindings/static/QEventArgs.cs @@ -1,4 +1,4 @@ -// QEventArgs.cs - QEventArgs c-sharp support file +// TQEventArgs.cs - TQEventArgs c-sharp support file // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // @@ -22,11 +22,11 @@ namespace Qt { using Qt; using System; - public class QEventArgs : EventArgs { - private TQEvent qevent; + public class TQEventArgs : EventArgs { + private TTQEvent qevent; private string name; - public TQEvent Event { + public TTQEvent Event { get { return qevent; } } @@ -34,7 +34,7 @@ namespace Qt { get { return name; } } - public QEventArgs(string n, TQEvent e) { + public TQEventArgs(string n, TTQEvent e) { qevent = e; name = n; } diff --git a/qtsharp/src/bindings/static/QEventList.cs b/qtsharp/src/bindings/static/QEventList.cs index d10afb71..eb2d9d0d 100644 --- a/qtsharp/src/bindings/static/QEventList.cs +++ b/qtsharp/src/bindings/static/QEventList.cs @@ -22,11 +22,11 @@ namespace Qt { using System; using System.Collections; - internal class QEventList + internal class TQEventList { private Hashtable events; - internal QEventList () + internal TQEventList () { events = new Hashtable (); } @@ -47,7 +47,7 @@ namespace Qt { ((ArrayList)events [name]).Remove (handler); } - internal ArrayList QEventHandlers (String name) + internal ArrayList TQEventHandlers (String name) { return (ArrayList)events [name]; } diff --git a/qtsharp/src/bindings/static/QGL.cs b/qtsharp/src/bindings/static/QGL.cs index 6a994fb0..d43aebe2 100644 --- a/qtsharp/src/bindings/static/QGL.cs +++ b/qtsharp/src/bindings/static/QGL.cs @@ -1,4 +1,4 @@ -// TQGL.cs - A Qt to C# binding. +// TTQGL.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // @@ -22,7 +22,7 @@ namespace Qt { using Qt; - public class TQGL { + public class TTQGL { public enum FormatOption { DoubleBuffer = 1, diff --git a/qtsharp/src/bindings/static/QMenuBar.cs b/qtsharp/src/bindings/static/QMenuBar.cs index 1c6993bb..228cff7f 100644 --- a/qtsharp/src/bindings/static/QMenuBar.cs +++ b/qtsharp/src/bindings/static/QMenuBar.cs @@ -1,4 +1,4 @@ -// TQMenuBar.cs - A Qt to C# binding. +// TTQMenuBar.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // @@ -28,7 +28,7 @@ namespace Qt { using System.Collections; using System.Runtime.InteropServices; - public class TQMenuBar : TQFrame, IQMenuData, IDisposable { + public class TTQMenuBar : TTQFrame, ITQMenuData, IDisposable { private Hashtable menuConnections; @@ -43,31 +43,31 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_new_QMenuBar (IntPtr parent, string name); - public TQMenuBar (TQWidget parent, string name) : this (QNull.Instance) + public TTQMenuBar (TTQWidget parent, string name) : this (TQNull.Instance) { qparent = parent; - if (qparent == null) parent = new TQWidget (IntPtr.Zero); + if (qparent == null) parent = new TTQWidget (IntPtr.Zero); rawObject = qt_new_QMenuBar (parent.RawObject, name); if (qparent == null) RegisterObject (this); else qparent.AddChild (this); } - public TQMenuBar () : this (new TQWidget ()) {} + public TTQMenuBar () : this (new TTQWidget ()) {} - public TQMenuBar (TQWidget parent) : this (parent, "") {} + public TTQMenuBar (TTQWidget parent) : this (parent, "") {} - internal TQMenuBar (IntPtr ptr) : this (QNull.Instance) + internal TTQMenuBar (IntPtr ptr) : this (TQNull.Instance) { rawObject = ptr; RegisterObject(this); } - internal TQMenuBar (QNull dummy) : base (QNull.Instance) + internal TTQMenuBar (TQNull dummy) : base (TQNull.Instance) { menuConnections = new Hashtable(); } - ~TQMenuBar () + ~TTQMenuBar () { Dispose (false); } @@ -105,7 +105,7 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern bool qt_QMenuBar_eventFilter (IntPtr raw, IntPtr arg1, IntPtr arg2); - public bool EventFilter (TQObject arg1, TQEvent arg2) + public bool EventFilter (TTQObject arg1, TTQEvent arg2) { return qt_QMenuBar_eventFilter (rawObject, arg1.RawObject, arg2.RawObject); } @@ -118,15 +118,15 @@ namespace Qt { } [DllImport("libqtc", CharSet=CharSet.Ansi)] - private static extern TQMenuBar.Separator qt_QMenuBar_separator (IntPtr raw); - public TQMenuBar.Separator TheSeparator () + private static extern TTQMenuBar.Separator qt_QMenuBar_separator (IntPtr raw); + public TTQMenuBar.Separator TheSeparator () { return qt_QMenuBar_separator (rawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] - private static extern void qt_QMenuBar_setSeparator (IntPtr raw, TQMenuBar.Separator when); - public void SetSeparator (TQMenuBar.Separator when) + private static extern void qt_QMenuBar_setSeparator (IntPtr raw, TTQMenuBar.Separator when); + public void SetSeparator (TTQMenuBar.Separator when) { qt_QMenuBar_setSeparator (rawObject, when); } @@ -154,23 +154,23 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuBar_sizeHint (IntPtr raw); - public TQSize SizeHint () + public TTQSize SizeHint () { - return (TQSize)LookupObject (qt_QMenuBar_sizeHint (rawObject), typeof(TQSize)); + return (TTQSize)LookupObject (qt_QMenuBar_sizeHint (rawObject), typeof(TTQSize)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuBar_minimumSize (IntPtr raw); - public TQSize MinimumSize () + public TTQSize MinimumSize () { - return (TQSize)LookupObject (qt_QMenuBar_minimumSize (rawObject), typeof(TQSize)); + return (TTQSize)LookupObject (qt_QMenuBar_minimumSize (rawObject), typeof(TTQSize)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuBar_minimumSizeHint (IntPtr raw); - public TQSize MinimumSizeHint () + public TTQSize MinimumSizeHint () { - return (TQSize)LookupObject (qt_QMenuBar_minimumSizeHint (rawObject), typeof(TQSize)); + return (TTQSize)LookupObject (qt_QMenuBar_minimumSizeHint (rawObject), typeof(TTQSize)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] @@ -196,14 +196,14 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuBar_drawContents (IntPtr raw, IntPtr arg1); - protected void DrawContents (TQPainter arg1) + protected void DrawContents (TTQPainter arg1) { qt_QMenuBar_drawContents (rawObject, arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuBar_fontChange (IntPtr raw, IntPtr arg1); - protected void FontChange (TQFont arg1) + protected void FontChange (TTQFont arg1) { qt_QMenuBar_fontChange (rawObject, arg1.RawObject); } @@ -224,14 +224,14 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuBar_styleChange (IntPtr raw, IntPtr arg1); - protected void StyleChange (TQStyle arg1) + protected void StyleChange (TTQStyle arg1) { qt_QMenuBar_styleChange (rawObject, arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuBar_itemAtPos (IntPtr raw, IntPtr arg1); - protected int ItemAtPos (TQPoint arg1) + protected int ItemAtPos (TTQPoint arg1) { return qt_QMenuBar_itemAtPos (rawObject, arg1.RawObject); } @@ -245,14 +245,14 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuBar_itemRect (IntPtr raw, int item); - protected TQRect ItemRect (int item) + protected TTQRect ItemRect (int item) { - return (TQRect)LookupObject (qt_QMenuBar_itemRect (rawObject, item), typeof(TQRect)); + return (TTQRect)LookupObject (qt_QMenuBar_itemRect (rawObject, item), typeof(TTQRect)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuBar_QMenuData (IntPtr raw); - public IntPtr TQMenuData () + public IntPtr TTQMenuData () { return qt_QMenuBar_QMenuData (rawObject); } @@ -265,7 +265,7 @@ namespace Qt { // This makes my brain hurt! // :-) Mine too! - public int InsertItem (string text, TQObject receiver, string member, TQKeySequence accel, int identifier, int index) + public int InsertItem (string text, TTQObject receiver, string member, TTQKeySequence accel, int identifier, int index) { int id = InsertItem (text, identifier, index); SetAccel (accel, id); @@ -273,7 +273,7 @@ namespace Qt { return id; } - public int InsertItem (TQIconSet icon, string text, TQObject receiver, string member, TQKeySequence accel, int identifier, int index) + public int InsertItem (TTQIconSet icon, string text, TTQObject receiver, string member, TTQKeySequence accel, int identifier, int index) { int id = InsertItem (icon, text, identifier, index); SetAccel (accel, id); @@ -281,7 +281,7 @@ namespace Qt { return id; } - public int InsertItem (TQPixmap pixmap, TQObject receiver, string member, TQKeySequence accel, int identifier, int index) + public int InsertItem (TTQPixmap pixmap, TTQObject receiver, string member, TTQKeySequence accel, int identifier, int index) { int id = InsertItem (pixmap, identifier, index); SetAccel (accel, id); @@ -289,7 +289,7 @@ namespace Qt { return id; } - public int InsertItem (TQIconSet icon, TQPixmap pixmap, TQObject receiver, string member, TQKeySequence accel, int identifier, int index) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQObject receiver, string member, TTQKeySequence accel, int identifier, int index) { int id = InsertItem (icon, pixmap, identifier, index); SetAccel (accel, id); @@ -297,15 +297,15 @@ namespace Qt { return id; } - public bool ConnectItem (int identifier, TQObject receiver, string member) + public bool ConnectItem (int identifier, TTQObject receiver, string member) { - return Qt.TQMenuData.ConnectItem (this, TQMenuData (), identifier, receiver, member); + return Qt.TTQMenuData.ConnectItem (this, TTQMenuData (), identifier, receiver, member); } - public bool DisconnectItem (int identifier, TQObject receiver, string member) + public bool DisconnectItem (int identifier, TTQObject receiver, string member) { - return Qt.TQMenuData.DisconnectItem (this, TQMenuData (), identifier, receiver, member); + return Qt.TTQMenuData.DisconnectItem (this, TTQMenuData (), identifier, receiver, member); } //********************* A temporary hack to divert connections to CSharpConnect *****************// @@ -315,140 +315,140 @@ namespace Qt { private static extern uint qt_QMenuData_count (IntPtr raw); public uint Count () { - return qt_QMenuData_count (TQMenuData ()); + return qt_QMenuData_count (TTQMenuData ()); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem4 (IntPtr raw, IntPtr text, int identifier, int index); public int InsertItem (string text, int identifier, int index) { - return qt_QMenuData_insertItem4 (TQMenuData (), new TQString (text).RawObject, identifier, index); + return qt_QMenuData_insertItem4 (TTQMenuData (), new TTQString (text).RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem5 (IntPtr raw, IntPtr icon, IntPtr text, int identifier, int index); - public int InsertItem (TQIconSet icon, string text, int identifier, int index) + public int InsertItem (TTQIconSet icon, string text, int identifier, int index) { - return qt_QMenuData_insertItem5 (TQMenuData (), icon.RawObject, new TQString (text).RawObject, identifier, index); + return qt_QMenuData_insertItem5 (TTQMenuData (), icon.RawObject, new TTQString (text).RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem6 (IntPtr raw, IntPtr text, IntPtr popup, int identifier, int index); - public int InsertItem (string text, TQPopupMenu popup, int identifier, int index) + public int InsertItem (string text, TTQPopupMenu popup, int identifier, int index) { - return qt_QMenuData_insertItem6 (TQMenuData (), new TQString (text).RawObject, popup.RawObject, identifier, index); + return qt_QMenuData_insertItem6 (TTQMenuData (), new TTQString (text).RawObject, popup.RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem7 (IntPtr raw, IntPtr icon, IntPtr text, IntPtr popup, int identifier, int index); - public int InsertItem (TQIconSet icon, string text, TQPopupMenu popup, int identifier, int index) + public int InsertItem (TTQIconSet icon, string text, TTQPopupMenu popup, int identifier, int index) { - return qt_QMenuData_insertItem7 (TQMenuData (), icon.RawObject, new TQString (text).RawObject, popup.RawObject, identifier, index); + return qt_QMenuData_insertItem7 (TTQMenuData (), icon.RawObject, new TTQString (text).RawObject, popup.RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem8 (IntPtr raw, IntPtr pixmap, int identifier, int index); - public int InsertItem (TQPixmap pixmap, int identifier, int index) + public int InsertItem (TTQPixmap pixmap, int identifier, int index) { - return qt_QMenuData_insertItem8 (TQMenuData (), pixmap.RawObject, identifier, index); + return qt_QMenuData_insertItem8 (TTQMenuData (), pixmap.RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem9 (IntPtr raw, IntPtr icon, IntPtr pixmap, int identifier, int index); - public int InsertItem (TQIconSet icon, TQPixmap pixmap, int identifier, int index) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, int identifier, int index) { - return qt_QMenuData_insertItem9 (TQMenuData (), icon.RawObject, pixmap.RawObject, identifier, index); + return qt_QMenuData_insertItem9 (TTQMenuData (), icon.RawObject, pixmap.RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem10 (IntPtr raw, IntPtr pixmap, IntPtr popup, int identifier, int index); - public int InsertItem (TQPixmap pixmap, TQPopupMenu popup, int identifier, int index) + public int InsertItem (TTQPixmap pixmap, TTQPopupMenu popup, int identifier, int index) { - return qt_QMenuData_insertItem10 (TQMenuData (), pixmap.RawObject, popup.RawObject, identifier, index); + return qt_QMenuData_insertItem10 (TTQMenuData (), pixmap.RawObject, popup.RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem11 (IntPtr raw, IntPtr icon, IntPtr pixmap, IntPtr popup, int identifier, int index); - public int InsertItem (TQIconSet icon, TQPixmap pixmap, TQPopupMenu popup, int identifier, int index) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQPopupMenu popup, int identifier, int index) { - return qt_QMenuData_insertItem11 (TQMenuData (), icon.RawObject, pixmap.RawObject, popup.RawObject, identifier, index); + return qt_QMenuData_insertItem11 (TTQMenuData (), icon.RawObject, pixmap.RawObject, popup.RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem12 (IntPtr raw, IntPtr widget, int identifier, int index); - public int InsertItem (TQWidget widget, int identifier, int index) + public int InsertItem (TTQWidget widget, int identifier, int index) { - return qt_QMenuData_insertItem12 (TQMenuData (), widget.RawObject, identifier, index); + return qt_QMenuData_insertItem12 (TTQMenuData (), widget.RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem13 (IntPtr raw, IntPtr icon, IntPtr custom, int identifier, int index); - public int InsertItem (TQIconSet icon, TQCustomMenuItem custom, int identifier, int index) + public int InsertItem (TTQIconSet icon, TTQCustomMenuItem custom, int identifier, int index) { - return qt_QMenuData_insertItem13 (TQMenuData (), icon.RawObject, custom.RawObject, identifier, index); + return qt_QMenuData_insertItem13 (TTQMenuData (), icon.RawObject, custom.RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem14 (IntPtr raw, IntPtr custom, int identifier, int index); - public int InsertItem (TQCustomMenuItem custom, int identifier, int index) + public int InsertItem (TTQCustomMenuItem custom, int identifier, int index) { - return qt_QMenuData_insertItem14 (TQMenuData (), custom.RawObject, identifier, index); + return qt_QMenuData_insertItem14 (TTQMenuData (), custom.RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertSeparator (IntPtr raw, int index); public int InsertSeparator (int index) { - return qt_QMenuData_insertSeparator (TQMenuData (), index); + return qt_QMenuData_insertSeparator (TTQMenuData (), index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_removeItem (IntPtr raw, int identifier); public void RemoveItem (int identifier) { - qt_QMenuData_removeItem (TQMenuData (), identifier); + qt_QMenuData_removeItem (TTQMenuData (), identifier); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_removeItemAt (IntPtr raw, int index); public void RemoveItemAt (int index) { - qt_QMenuData_removeItemAt (TQMenuData (), index); + qt_QMenuData_removeItemAt (TTQMenuData (), index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_clear (IntPtr raw); public void Clear () { - qt_QMenuData_clear (TQMenuData ()); + qt_QMenuData_clear (TTQMenuData ()); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuData_accel (IntPtr raw, int identifier); - public TQKeySequence Accel (int identifier) + public TTQKeySequence Accel (int identifier) { - return (TQKeySequence)LookupObject (qt_QMenuData_accel (TQMenuData (), identifier), typeof(TQKeySequence)); + return (TTQKeySequence)LookupObject (qt_QMenuData_accel (TTQMenuData (), identifier), typeof(TTQKeySequence)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_setAccel (IntPtr raw, IntPtr key, int identifier); - public void SetAccel (TQKeySequence key, int identifier) + public void SetAccel (TTQKeySequence key, int identifier) { - qt_QMenuData_setAccel (TQMenuData (), key.RawObject, identifier); + qt_QMenuData_setAccel (TTQMenuData (), key.RawObject, identifier); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuData_iconSet (IntPtr raw, int identifier); - public TQIconSet IconSet (int identifier) + public TTQIconSet IconSet (int identifier) { - return (TQIconSet)LookupObject (qt_QMenuData_iconSet (TQMenuData (), identifier), typeof(TQIconSet)); + return (TTQIconSet)LookupObject (qt_QMenuData_iconSet (TTQMenuData (), identifier), typeof(TTQIconSet)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuData_text (IntPtr raw, int identifier); public string Text (int identifier) { - TQString qstr = new TQString (qt_QMenuData_text (TQMenuData (), identifier)); + TTQString qstr = new TTQString (qt_QMenuData_text (TTQMenuData (), identifier)); string str = qstr.Latin1 (); qstr.Dispose (); return str; @@ -456,23 +456,23 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuData_pixmap (IntPtr raw, int identifier); - public TQPixmap Pixmap (int identifier) + public TTQPixmap Pixmap (int identifier) { - return (TQPixmap)LookupObject (qt_QMenuData_pixmap (TQMenuData (), identifier), typeof(TQPixmap)); + return (TTQPixmap)LookupObject (qt_QMenuData_pixmap (TTQMenuData (), identifier), typeof(TTQPixmap)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_setWhatsThis (IntPtr raw, int identifier, IntPtr arg1); public void SetWhatsThis (int identifier, string arg1) { - qt_QMenuData_setWhatsThis (TQMenuData (), identifier, new TQString (arg1).RawObject); + qt_QMenuData_setWhatsThis (TTQMenuData (), identifier, new TTQString (arg1).RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuData_whatsThis (IntPtr raw, int identifier); public string WhatsThis (int identifier) { - TQString qstr = new TQString (qt_QMenuData_whatsThis (TQMenuData (), identifier)); + TTQString qstr = new TTQString (qt_QMenuData_whatsThis (TTQMenuData (), identifier)); string str = qstr.Latin1 (); qstr.Dispose (); return str; @@ -482,212 +482,212 @@ namespace Qt { private static extern void qt_QMenuData_changeItem (IntPtr raw, int identifier, IntPtr text); public void ChangeItem (int identifier, string text) { - qt_QMenuData_changeItem (TQMenuData (), identifier, new TQString (text).RawObject); + qt_QMenuData_changeItem (TTQMenuData (), identifier, new TTQString (text).RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_changeItem1 (IntPtr raw, int identifier, IntPtr pixmap); - public void ChangeItem (int identifier, TQPixmap pixmap) + public void ChangeItem (int identifier, TTQPixmap pixmap) { - qt_QMenuData_changeItem1 (TQMenuData (), identifier, pixmap.RawObject); + qt_QMenuData_changeItem1 (TTQMenuData (), identifier, pixmap.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_changeItem2 (IntPtr raw, int identifier, IntPtr icon, IntPtr text); - public void ChangeItem (int identifier, TQIconSet icon, string text) + public void ChangeItem (int identifier, TTQIconSet icon, string text) { - qt_QMenuData_changeItem2 (TQMenuData (), identifier, icon.RawObject, new TQString (text).RawObject); + qt_QMenuData_changeItem2 (TTQMenuData (), identifier, icon.RawObject, new TTQString (text).RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_changeItem3 (IntPtr raw, int identifier, IntPtr icon, IntPtr pixmap); - public void ChangeItem (int identifier, TQIconSet icon, TQPixmap pixmap) + public void ChangeItem (int identifier, TTQIconSet icon, TTQPixmap pixmap) { - qt_QMenuData_changeItem3 (TQMenuData (), identifier, icon.RawObject, pixmap.RawObject); + qt_QMenuData_changeItem3 (TTQMenuData (), identifier, icon.RawObject, pixmap.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_changeItem4 (IntPtr raw, IntPtr text, int identifier); public void ChangeItem (string text, int identifier) { - qt_QMenuData_changeItem4 (TQMenuData (), new TQString (text).RawObject, identifier); + qt_QMenuData_changeItem4 (TTQMenuData (), new TTQString (text).RawObject, identifier); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_changeItem5 (IntPtr raw, IntPtr pixmap, int identifier); - public void ChangeItem (TQPixmap pixmap, int identifier) + public void ChangeItem (TTQPixmap pixmap, int identifier) { - qt_QMenuData_changeItem5 (TQMenuData (), pixmap.RawObject, identifier); + qt_QMenuData_changeItem5 (TTQMenuData (), pixmap.RawObject, identifier); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_changeItem6 (IntPtr raw, IntPtr icon, IntPtr text, int identifier); - public void ChangeItem (TQIconSet icon, string text, int identifier) + public void ChangeItem (TTQIconSet icon, string text, int identifier) { - qt_QMenuData_changeItem6 (TQMenuData (), icon.RawObject, new TQString (text).RawObject, identifier); + qt_QMenuData_changeItem6 (TTQMenuData (), icon.RawObject, new TTQString (text).RawObject, identifier); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern bool qt_QMenuData_isItemActive (IntPtr raw, int identifier); public bool IsItemActive (int identifier) { - return qt_QMenuData_isItemActive (TQMenuData (), identifier); + return qt_QMenuData_isItemActive (TTQMenuData (), identifier); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern bool qt_QMenuData_isItemEnabled (IntPtr raw, int identifier); public bool IsItemEnabled (int identifier) { - return qt_QMenuData_isItemEnabled (TQMenuData (), identifier); + return qt_QMenuData_isItemEnabled (TTQMenuData (), identifier); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_setItemEnabled (IntPtr raw, int identifier, bool enable); public void SetItemEnabled (int identifier, bool enable) { - qt_QMenuData_setItemEnabled (TQMenuData (), identifier, enable); + qt_QMenuData_setItemEnabled (TTQMenuData (), identifier, enable); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern bool qt_QMenuData_isItemChecked (IntPtr raw, int identifier); public bool IsItemChecked (int identifier) { - return qt_QMenuData_isItemChecked (TQMenuData (), identifier); + return qt_QMenuData_isItemChecked (TTQMenuData (), identifier); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_setItemChecked (IntPtr raw, int identifier, bool check); public void SetItemChecked (int identifier, bool check) { - qt_QMenuData_setItemChecked (TQMenuData (), identifier, check); + qt_QMenuData_setItemChecked (TTQMenuData (), identifier, check); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_indexOf (IntPtr raw, int identifier); public int IndexOf (int identifier) { - return qt_QMenuData_indexOf (TQMenuData (), identifier); + return qt_QMenuData_indexOf (TTQMenuData (), identifier); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_idAt (IntPtr raw, int index); public int IdAt (int index) { - return qt_QMenuData_idAt (TQMenuData (), index); + return qt_QMenuData_idAt (TTQMenuData (), index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_setId (IntPtr raw, int index, int identifier); public void SetId (int index, int identifier) { - qt_QMenuData_setId (TQMenuData (), index, identifier); + qt_QMenuData_setId (TTQMenuData (), index, identifier); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern bool qt_QMenuData_setItemParameter (IntPtr raw, int identifier, int param); public bool SetItemParameter (int identifier, int param) { - return qt_QMenuData_setItemParameter (TQMenuData (), identifier, param); + return qt_QMenuData_setItemParameter (TTQMenuData (), identifier, param); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_itemParameter (IntPtr raw, int identifier); public int ItemParameter (int identifier) { - return qt_QMenuData_itemParameter (TQMenuData (), identifier); + return qt_QMenuData_itemParameter (TTQMenuData (), identifier); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuData_findItem (IntPtr raw, int identifier); - public TQMenuItem FindItem (int identifier) + public TTQMenuItem FindItem (int identifier) { - return (TQMenuItem)LookupObject (qt_QMenuData_findItem (TQMenuData (), identifier), typeof(TQMenuItem)); + return (TTQMenuItem)LookupObject (qt_QMenuData_findItem (TTQMenuData (), identifier), typeof(TTQMenuItem)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuData_findItem1 (IntPtr raw, int identifier, IntPtr parent); - public TQMenuItem FindItem (int identifier, TQMenuData parent) + public TTQMenuItem FindItem (int identifier, TTQMenuData parent) { - return (TQMenuItem)LookupObject (qt_QMenuData_findItem1 (TQMenuData (), identifier, parent.RawObject), typeof(TQMenuItem)); + return (TTQMenuItem)LookupObject (qt_QMenuData_findItem1 (TTQMenuData (), identifier, parent.RawObject), typeof(TTQMenuItem)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuData_findPopup (IntPtr raw, IntPtr arg1, int[] index); - public TQMenuItem FindPopup (TQPopupMenu arg1, int[] index) + public TTQMenuItem FindPopup (TTQPopupMenu arg1, int[] index) { - return (TQMenuItem)LookupObject (qt_QMenuData_findPopup (TQMenuData (), arg1.RawObject, index), typeof(TQMenuItem)); + return (TTQMenuItem)LookupObject (qt_QMenuData_findPopup (TTQMenuData (), arg1.RawObject, index), typeof(TTQMenuItem)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_menuInsPopup (IntPtr raw, IntPtr arg1); - protected void MenuInsPopup (TQPopupMenu arg1) + protected void MenuInsPopup (TTQPopupMenu arg1) { - qt_QMenuData_menuInsPopup (TQMenuData (), arg1.RawObject); + qt_QMenuData_menuInsPopup (TTQMenuData (), arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_menuDelPopup (IntPtr raw, IntPtr arg1); - protected void MenuDelPopup (TQPopupMenu arg1) + protected void MenuDelPopup (TTQPopupMenu arg1) { - qt_QMenuData_menuDelPopup (TQMenuData (), arg1.RawObject); + qt_QMenuData_menuDelPopup (TTQMenuData (), arg1.RawObject); } - public int InsertItem (string text, TQObject receiver, string member) + public int InsertItem (string text, TTQObject receiver, string member) { - return InsertItem(text, receiver, member, new TQKeySequence ()); + return InsertItem(text, receiver, member, new TTQKeySequence ()); } - public int InsertItem (string text, TQObject receiver, string member, TQKeySequence accel) + public int InsertItem (string text, TTQObject receiver, string member, TTQKeySequence accel) { return InsertItem(text, receiver, member, accel, (int) -1); } - public int InsertItem (string text, TQObject receiver, string member, TQKeySequence accel, int identifier) + public int InsertItem (string text, TTQObject receiver, string member, TTQKeySequence accel, int identifier) { return InsertItem(text, receiver, member, accel, identifier, (int) -1); } - public int InsertItem (TQIconSet icon, string text, TQObject receiver, string member) + public int InsertItem (TTQIconSet icon, string text, TTQObject receiver, string member) { - return InsertItem(icon, text, receiver, member, new TQKeySequence ()); + return InsertItem(icon, text, receiver, member, new TTQKeySequence ()); } - public int InsertItem (TQIconSet icon, string text, TQObject receiver, string member, TQKeySequence accel) + public int InsertItem (TTQIconSet icon, string text, TTQObject receiver, string member, TTQKeySequence accel) { return InsertItem(icon, text, receiver, member, accel, (int) -1); } - public int InsertItem (TQIconSet icon, string text, TQObject receiver, string member, TQKeySequence accel, int identifier) + public int InsertItem (TTQIconSet icon, string text, TTQObject receiver, string member, TTQKeySequence accel, int identifier) { return InsertItem(icon, text, receiver, member, accel, identifier, (int) -1); } - public int InsertItem (TQPixmap pixmap, TQObject receiver, string member) + public int InsertItem (TTQPixmap pixmap, TTQObject receiver, string member) { - return InsertItem(pixmap, receiver, member, new TQKeySequence ()); + return InsertItem(pixmap, receiver, member, new TTQKeySequence ()); } - public int InsertItem (TQPixmap pixmap, TQObject receiver, string member, TQKeySequence accel) + public int InsertItem (TTQPixmap pixmap, TTQObject receiver, string member, TTQKeySequence accel) { return InsertItem(pixmap, receiver, member, accel, (int) -1); } - public int InsertItem (TQPixmap pixmap, TQObject receiver, string member, TQKeySequence accel, int identifier) + public int InsertItem (TTQPixmap pixmap, TTQObject receiver, string member, TTQKeySequence accel, int identifier) { return InsertItem(pixmap, receiver, member, accel, identifier, (int) -1); } - public int InsertItem (TQIconSet icon, TQPixmap pixmap, TQObject receiver, string member) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQObject receiver, string member) { - return InsertItem(icon, pixmap, receiver, member, new TQKeySequence ()); + return InsertItem(icon, pixmap, receiver, member, new TTQKeySequence ()); } - public int InsertItem (TQIconSet icon, TQPixmap pixmap, TQObject receiver, string member, TQKeySequence accel) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQObject receiver, string member, TTQKeySequence accel) { return InsertItem(icon, pixmap, receiver, member, accel, (int) -1); } - public int InsertItem (TQIconSet icon, TQPixmap pixmap, TQObject receiver, string member, TQKeySequence accel, int identifier) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQObject receiver, string member, TTQKeySequence accel, int identifier) { return InsertItem(icon, pixmap, receiver, member, accel, identifier, (int) -1); } @@ -702,102 +702,102 @@ namespace Qt { return InsertItem(text, identifier, (int) -1); } - public int InsertItem (TQIconSet icon, string text) + public int InsertItem (TTQIconSet icon, string text) { return InsertItem(icon, text, (int) -1); } - public int InsertItem (TQIconSet icon, string text, int identifier) + public int InsertItem (TTQIconSet icon, string text, int identifier) { return InsertItem(icon, text, identifier, (int) -1); } - public int InsertItem (string text, TQPopupMenu popup) + public int InsertItem (string text, TTQPopupMenu popup) { return InsertItem(text, popup, (int) -1); } - public int InsertItem (string text, TQPopupMenu popup, int identifier) + public int InsertItem (string text, TTQPopupMenu popup, int identifier) { return InsertItem(text, popup, identifier, (int) -1); } - public int InsertItem (TQIconSet icon, string text, TQPopupMenu popup) + public int InsertItem (TTQIconSet icon, string text, TTQPopupMenu popup) { return InsertItem(icon, text, popup, (int) -1); } - public int InsertItem (TQIconSet icon, string text, TQPopupMenu popup, int identifier) + public int InsertItem (TTQIconSet icon, string text, TTQPopupMenu popup, int identifier) { return InsertItem(icon, text, popup, identifier, (int) -1); } - public int InsertItem (TQPixmap pixmap) + public int InsertItem (TTQPixmap pixmap) { return InsertItem(pixmap, (int) -1); } - public int InsertItem (TQPixmap pixmap, int identifier) + public int InsertItem (TTQPixmap pixmap, int identifier) { return InsertItem(pixmap, identifier, (int) -1); } - public int InsertItem (TQIconSet icon, TQPixmap pixmap) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap) { return InsertItem(icon, pixmap, (int) -1); } - public int InsertItem (TQIconSet icon, TQPixmap pixmap, int identifier) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, int identifier) { return InsertItem(icon, pixmap, identifier, (int) -1); } - public int InsertItem (TQPixmap pixmap, TQPopupMenu popup) + public int InsertItem (TTQPixmap pixmap, TTQPopupMenu popup) { return InsertItem(pixmap, popup, (int) -1); } - public int InsertItem (TQPixmap pixmap, TQPopupMenu popup, int identifier) + public int InsertItem (TTQPixmap pixmap, TTQPopupMenu popup, int identifier) { return InsertItem(pixmap, popup, identifier, (int) -1); } - public int InsertItem (TQIconSet icon, TQPixmap pixmap, TQPopupMenu popup) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQPopupMenu popup) { return InsertItem(icon, pixmap, popup, (int) -1); } - public int InsertItem (TQIconSet icon, TQPixmap pixmap, TQPopupMenu popup, int identifier) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQPopupMenu popup, int identifier) { return InsertItem(icon, pixmap, popup, identifier, (int) -1); } - public int InsertItem (TQWidget widget) + public int InsertItem (TTQWidget widget) { return InsertItem(widget, (int) -1); } - public int InsertItem (TQWidget widget, int identifier) + public int InsertItem (TTQWidget widget, int identifier) { return InsertItem(widget, identifier, (int) -1); } - public int InsertItem (TQIconSet icon, TQCustomMenuItem custom) + public int InsertItem (TTQIconSet icon, TTQCustomMenuItem custom) { return InsertItem(icon, custom, (int) -1); } - public int InsertItem (TQIconSet icon, TQCustomMenuItem custom, int identifier) + public int InsertItem (TTQIconSet icon, TTQCustomMenuItem custom, int identifier) { return InsertItem(icon, custom, identifier, (int) -1); } - public int InsertItem (TQCustomMenuItem custom) + public int InsertItem (TTQCustomMenuItem custom) { return InsertItem(custom, (int) -1); } - public int InsertItem (TQCustomMenuItem custom, int identifier) + public int InsertItem (TTQCustomMenuItem custom, int identifier) { return InsertItem(custom, identifier, (int) -1); } @@ -807,7 +807,7 @@ namespace Qt { return InsertSeparator((int) -1); } - public TQMenuItem FindPopup (TQPopupMenu arg1) + public TTQMenuItem FindPopup (TTQPopupMenu arg1) { return FindPopup(arg1, new int[]{0}); } diff --git a/qtsharp/src/bindings/static/QMenuData.cs b/qtsharp/src/bindings/static/QMenuData.cs index ed28b69f..c83c91b7 100644 --- a/qtsharp/src/bindings/static/QMenuData.cs +++ b/qtsharp/src/bindings/static/QMenuData.cs @@ -1,4 +1,4 @@ -// TQMenuData.cs - A Qt to C# binding. +// TTQMenuData.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // @@ -19,7 +19,7 @@ // Regenerated by Adam Treat on August 03 2002 // // TODO -// o The QMenu* and TQPopupMenu classes need serious analysis. I've only added +// o The TQMenu* and TTQPopupMenu classes need serious analysis. I've only added // functionality for C# slot support - I've not made sure its all working. :-) namespace Qt { @@ -29,7 +29,7 @@ namespace Qt { using System.Collections; using System.Runtime.InteropServices; - public class TQMenuData : QtSupport, IQMenuData, IDisposable { + public class TTQMenuData : QtSupport, ITQMenuData, IDisposable { private Hashtable menuConnections; @@ -39,24 +39,24 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_new_QMenuData (); - public TQMenuData () : this (QNull.Instance) + public TTQMenuData () : this (TQNull.Instance) { rawObject = qt_new_QMenuData (); RegisterObject (this); } - internal TQMenuData (IntPtr ptr) : this (QNull.Instance) + internal TTQMenuData (IntPtr ptr) : this (TQNull.Instance) { rawObject = ptr; RegisterObject(this); } - internal TQMenuData (QNull dummy) : base (QNull.Instance) + internal TTQMenuData (TQNull dummy) : base (TQNull.Instance) { menuConnections = new Hashtable(); } - ~TQMenuData () + ~TTQMenuData () { Dispose(false); } @@ -71,12 +71,12 @@ namespace Qt { deleted = true; } - // The next two static methods are here to service all IQMenuData implementors. + // The next two static methods are here to service all ITQMenuData implementors. [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern bool qt_QMenuData_connectItem (IntPtr raw, int identifier, IntPtr receiver, string member); - internal static bool ConnectItem (IQMenuData menu, IntPtr menudata, int id, TQObject receiver, string slot) + internal static bool ConnectItem (ITQMenuData menu, IntPtr menudata, int id, TTQObject receiver, string slot) { if (QtSignal.traceConnects) ErrMsg ("ConnectItem: ({0}) {1}, {2}, ({3}) {4}, {5}", menudata, menu, id, receiver.RawObject, receiver, slot); @@ -125,7 +125,7 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_del_QObject (IntPtr raw); - internal static bool DisconnectItem (IQMenuData menu, IntPtr menudata, int id, TQObject receiver, string slot) + internal static bool DisconnectItem (ITQMenuData menu, IntPtr menudata, int id, TTQObject receiver, string slot) { if (QtSignal.traceConnects) ErrMsg ("DisconnectItem: ({0}) {1}, {2}, ({3}) {4}, {5}", menudata, menu, id, receiver.RawObject, receiver, slot); @@ -146,7 +146,7 @@ namespace Qt { if (cxlist.Count == 0) menu.MenuConnections.Remove (cxlist); - // FIXME Make sure QObject's dtor auto-disconnects menu items. + // FIXME Make sure TQObject's dtor auto-disconnects menu items. qt_del_QObject (slotobj.WrapperPtr); return true; } @@ -155,7 +155,7 @@ namespace Qt { } } - // Hack so TQMenuData implements IQMenuData... + // Hack so TTQMenuData implements ITQMenuData... public bool setItemParameter (int identifier, int param) { @@ -173,75 +173,75 @@ namespace Qt { private static extern int qt_QMenuData_insertItem4 (IntPtr raw, IntPtr text, int identifier, int index); public int InsertItem (string text, int identifier, int index) { - return qt_QMenuData_insertItem4 (rawObject, new TQString (text).RawObject, identifier, index); + return qt_QMenuData_insertItem4 (rawObject, new TTQString (text).RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem5 (IntPtr raw, IntPtr icon, IntPtr text, int identifier, int index); - public int InsertItem (TQIconSet icon, string text, int identifier, int index) + public int InsertItem (TTQIconSet icon, string text, int identifier, int index) { - return qt_QMenuData_insertItem5 (rawObject, icon.RawObject, new TQString (text).RawObject, identifier, index); + return qt_QMenuData_insertItem5 (rawObject, icon.RawObject, new TTQString (text).RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem6 (IntPtr raw, IntPtr text, IntPtr popup, int identifier, int index); - public int InsertItem (string text, TQPopupMenu popup, int identifier, int index) + public int InsertItem (string text, TTQPopupMenu popup, int identifier, int index) { - return qt_QMenuData_insertItem6 (rawObject, new TQString (text).RawObject, popup.RawObject, identifier, index); + return qt_QMenuData_insertItem6 (rawObject, new TTQString (text).RawObject, popup.RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem7 (IntPtr raw, IntPtr icon, IntPtr text, IntPtr popup, int identifier, int index); - public int InsertItem (TQIconSet icon, string text, TQPopupMenu popup, int identifier, int index) + public int InsertItem (TTQIconSet icon, string text, TTQPopupMenu popup, int identifier, int index) { - return qt_QMenuData_insertItem7 (rawObject, icon.RawObject, new TQString (text).RawObject, popup.RawObject, identifier, index); + return qt_QMenuData_insertItem7 (rawObject, icon.RawObject, new TTQString (text).RawObject, popup.RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem8 (IntPtr raw, IntPtr pixmap, int identifier, int index); - public int InsertItem (TQPixmap pixmap, int identifier, int index) + public int InsertItem (TTQPixmap pixmap, int identifier, int index) { return qt_QMenuData_insertItem8 (rawObject, pixmap.RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem9 (IntPtr raw, IntPtr icon, IntPtr pixmap, int identifier, int index); - public int InsertItem (TQIconSet icon, TQPixmap pixmap, int identifier, int index) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, int identifier, int index) { return qt_QMenuData_insertItem9 (rawObject, icon.RawObject, pixmap.RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem10 (IntPtr raw, IntPtr pixmap, IntPtr popup, int identifier, int index); - public int InsertItem (TQPixmap pixmap, TQPopupMenu popup, int identifier, int index) + public int InsertItem (TTQPixmap pixmap, TTQPopupMenu popup, int identifier, int index) { return qt_QMenuData_insertItem10 (rawObject, pixmap.RawObject, popup.RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem11 (IntPtr raw, IntPtr icon, IntPtr pixmap, IntPtr popup, int identifier, int index); - public int InsertItem (TQIconSet icon, TQPixmap pixmap, TQPopupMenu popup, int identifier, int index) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQPopupMenu popup, int identifier, int index) { return qt_QMenuData_insertItem11 (rawObject, icon.RawObject, pixmap.RawObject, popup.RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem12 (IntPtr raw, IntPtr widget, int identifier, int index); - public int InsertItem (TQWidget widget, int identifier, int index) + public int InsertItem (TTQWidget widget, int identifier, int index) { return qt_QMenuData_insertItem12 (rawObject, widget.RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem13 (IntPtr raw, IntPtr icon, IntPtr custom, int identifier, int index); - public int InsertItem (TQIconSet icon, TQCustomMenuItem custom, int identifier, int index) + public int InsertItem (TTQIconSet icon, TTQCustomMenuItem custom, int identifier, int index) { return qt_QMenuData_insertItem13 (rawObject, icon.RawObject, custom.RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem14 (IntPtr raw, IntPtr custom, int identifier, int index); - public int InsertItem (TQCustomMenuItem custom, int identifier, int index) + public int InsertItem (TTQCustomMenuItem custom, int identifier, int index) { return qt_QMenuData_insertItem14 (rawObject, custom.RawObject, identifier, index); } @@ -276,30 +276,30 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuData_accel (IntPtr raw, int identifier); - public TQKeySequence Accel (int identifier) + public TTQKeySequence Accel (int identifier) { - return (TQKeySequence)LookupObject (qt_QMenuData_accel (rawObject, identifier), typeof(TQKeySequence)); + return (TTQKeySequence)LookupObject (qt_QMenuData_accel (rawObject, identifier), typeof(TTQKeySequence)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_setAccel (IntPtr raw, IntPtr key, int identifier); - public void SetAccel (TQKeySequence key, int identifier) + public void SetAccel (TTQKeySequence key, int identifier) { qt_QMenuData_setAccel (rawObject, key.RawObject, identifier); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuData_iconSet (IntPtr raw, int identifier); - public TQIconSet IconSet (int identifier) + public TTQIconSet IconSet (int identifier) { - return (TQIconSet)LookupObject (qt_QMenuData_iconSet (rawObject, identifier), typeof(TQIconSet)); + return (TTQIconSet)LookupObject (qt_QMenuData_iconSet (rawObject, identifier), typeof(TTQIconSet)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuData_text (IntPtr raw, int identifier); public string Text (int identifier) { - TQString qstr = new TQString (qt_QMenuData_text (rawObject, identifier)); + TTQString qstr = new TTQString (qt_QMenuData_text (rawObject, identifier)); string str = qstr.Latin1 (); qstr.Dispose (); return str; @@ -307,23 +307,23 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuData_pixmap (IntPtr raw, int identifier); - public TQPixmap Pixmap (int identifier) + public TTQPixmap Pixmap (int identifier) { - return (TQPixmap)LookupObject (qt_QMenuData_pixmap (rawObject, identifier), typeof(TQPixmap)); + return (TTQPixmap)LookupObject (qt_QMenuData_pixmap (rawObject, identifier), typeof(TTQPixmap)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_setWhatsThis (IntPtr raw, int identifier, IntPtr arg1); public void SetWhatsThis (int identifier, string arg1) { - qt_QMenuData_setWhatsThis (rawObject, identifier, new TQString (arg1).RawObject); + qt_QMenuData_setWhatsThis (rawObject, identifier, new TTQString (arg1).RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuData_whatsThis (IntPtr raw, int identifier); public string WhatsThis (int identifier) { - TQString qstr = new TQString (qt_QMenuData_whatsThis (rawObject, identifier)); + TTQString qstr = new TTQString (qt_QMenuData_whatsThis (rawObject, identifier)); string str = qstr.Latin1 (); qstr.Dispose (); return str; @@ -333,26 +333,26 @@ namespace Qt { private static extern void qt_QMenuData_changeItem (IntPtr raw, int identifier, IntPtr text); public void ChangeItem (int identifier, string text) { - qt_QMenuData_changeItem (rawObject, identifier, new TQString (text).RawObject); + qt_QMenuData_changeItem (rawObject, identifier, new TTQString (text).RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_changeItem1 (IntPtr raw, int identifier, IntPtr pixmap); - public void ChangeItem (int identifier, TQPixmap pixmap) + public void ChangeItem (int identifier, TTQPixmap pixmap) { qt_QMenuData_changeItem1 (rawObject, identifier, pixmap.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_changeItem2 (IntPtr raw, int identifier, IntPtr icon, IntPtr text); - public void ChangeItem (int identifier, TQIconSet icon, string text) + public void ChangeItem (int identifier, TTQIconSet icon, string text) { - qt_QMenuData_changeItem2 (rawObject, identifier, icon.RawObject, new TQString (text).RawObject); + qt_QMenuData_changeItem2 (rawObject, identifier, icon.RawObject, new TTQString (text).RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_changeItem3 (IntPtr raw, int identifier, IntPtr icon, IntPtr pixmap); - public void ChangeItem (int identifier, TQIconSet icon, TQPixmap pixmap) + public void ChangeItem (int identifier, TTQIconSet icon, TTQPixmap pixmap) { qt_QMenuData_changeItem3 (rawObject, identifier, icon.RawObject, pixmap.RawObject); } @@ -361,21 +361,21 @@ namespace Qt { private static extern void qt_QMenuData_changeItem4 (IntPtr raw, IntPtr text, int identifier); public void ChangeItem (string text, int identifier) { - qt_QMenuData_changeItem4 (rawObject, new TQString (text).RawObject, identifier); + qt_QMenuData_changeItem4 (rawObject, new TTQString (text).RawObject, identifier); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_changeItem5 (IntPtr raw, IntPtr pixmap, int identifier); - public void ChangeItem (TQPixmap pixmap, int identifier) + public void ChangeItem (TTQPixmap pixmap, int identifier) { qt_QMenuData_changeItem5 (rawObject, pixmap.RawObject, identifier); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_changeItem6 (IntPtr raw, IntPtr icon, IntPtr text, int identifier); - public void ChangeItem (TQIconSet icon, string text, int identifier) + public void ChangeItem (TTQIconSet icon, string text, int identifier) { - qt_QMenuData_changeItem6 (rawObject, icon.RawObject, new TQString (text).RawObject, identifier); + qt_QMenuData_changeItem6 (rawObject, icon.RawObject, new TTQString (text).RawObject, identifier); } [DllImport("libqtc", CharSet=CharSet.Ansi)] @@ -436,17 +436,17 @@ namespace Qt { //********************* A temporary hack to divert connections to CSharpConnect *****************// - public bool ConnectItem (int identifier, TQObject receiver, string slot) + public bool ConnectItem (int identifier, TTQObject receiver, string slot) { return ConnectItem (this, this.RawObject, identifier, receiver, slot); } - public bool DisconnectItem (int identifier, TQObject receiver, string slot) + public bool DisconnectItem (int identifier, TTQObject receiver, string slot) { return DisconnectItem (this, this.RawObject, identifier, receiver, slot); } - public int InsertItem (string text, TQObject receiver, string member, TQKeySequence accel, int identifier, int index) + public int InsertItem (string text, TTQObject receiver, string member, TTQKeySequence accel, int identifier, int index) { int id = InsertItem (text, identifier, index); SetAccel (accel, id); @@ -454,7 +454,7 @@ namespace Qt { return id; } - public int InsertItem (TQIconSet icon, string text, TQObject receiver, string member, TQKeySequence accel, int identifier, int index) + public int InsertItem (TTQIconSet icon, string text, TTQObject receiver, string member, TTQKeySequence accel, int identifier, int index) { int id = InsertItem (icon, text, identifier, index); SetAccel (accel, id); @@ -462,7 +462,7 @@ namespace Qt { return id; } - public int InsertItem (TQPixmap pixmap, TQObject receiver, string member, TQKeySequence accel, int identifier, int index) + public int InsertItem (TTQPixmap pixmap, TTQObject receiver, string member, TTQKeySequence accel, int identifier, int index) { int id = InsertItem (pixmap, identifier, index); SetAccel (accel, id); @@ -470,7 +470,7 @@ namespace Qt { return id; } - public int InsertItem (TQIconSet icon, TQPixmap pixmap, TQObject receiver, string member, TQKeySequence accel, int identifier, int index) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQObject receiver, string member, TTQKeySequence accel, int identifier, int index) { int id = InsertItem (icon, pixmap, identifier, index); SetAccel (accel, id); @@ -496,95 +496,95 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuData_findItem (IntPtr raw, int identifier); - public TQMenuItem FindItem (int identifier) + public TTQMenuItem FindItem (int identifier) { - return (TQMenuItem)LookupObject (qt_QMenuData_findItem (rawObject, identifier), typeof(TQMenuItem)); + return (TTQMenuItem)LookupObject (qt_QMenuData_findItem (rawObject, identifier), typeof(TTQMenuItem)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuData_findItem1 (IntPtr raw, int identifier, IntPtr parent); - public TQMenuItem FindItem (int identifier, TQMenuData parent) + public TTQMenuItem FindItem (int identifier, TTQMenuData parent) { - return (TQMenuItem)LookupObject (qt_QMenuData_findItem1 (rawObject, identifier, parent.RawObject), typeof(TQMenuItem)); + return (TTQMenuItem)LookupObject (qt_QMenuData_findItem1 (rawObject, identifier, parent.RawObject), typeof(TTQMenuItem)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuData_findPopup (IntPtr raw, IntPtr arg1, int[] index); - public TQMenuItem FindPopup (TQPopupMenu arg1, int[] index) + public TTQMenuItem FindPopup (TTQPopupMenu arg1, int[] index) { - return (TQMenuItem)LookupObject (qt_QMenuData_findPopup (rawObject, arg1.RawObject, index), typeof(TQMenuItem)); + return (TTQMenuItem)LookupObject (qt_QMenuData_findPopup (rawObject, arg1.RawObject, index), typeof(TTQMenuItem)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_menuInsPopup (IntPtr raw, IntPtr arg1); - protected void MenuInsPopup (TQPopupMenu arg1) + protected void MenuInsPopup (TTQPopupMenu arg1) { qt_QMenuData_menuInsPopup (rawObject, arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_menuDelPopup (IntPtr raw, IntPtr arg1); - protected void MenuDelPopup (TQPopupMenu arg1) + protected void MenuDelPopup (TTQPopupMenu arg1) { qt_QMenuData_menuDelPopup (rawObject, arg1.RawObject); } - public int InsertItem (string text, TQObject receiver, string member) + public int InsertItem (string text, TTQObject receiver, string member) { - return InsertItem(text, receiver, member, new TQKeySequence ()); + return InsertItem(text, receiver, member, new TTQKeySequence ()); } - public int InsertItem (string text, TQObject receiver, string member, TQKeySequence accel) + public int InsertItem (string text, TTQObject receiver, string member, TTQKeySequence accel) { return InsertItem(text, receiver, member, accel, (int) -1); } - public int InsertItem (string text, TQObject receiver, string member, TQKeySequence accel, int identifier) + public int InsertItem (string text, TTQObject receiver, string member, TTQKeySequence accel, int identifier) { return InsertItem(text, receiver, member, accel, identifier, (int) -1); } - public int InsertItem (TQIconSet icon, string text, TQObject receiver, string member) + public int InsertItem (TTQIconSet icon, string text, TTQObject receiver, string member) { - return InsertItem(icon, text, receiver, member, new TQKeySequence ()); + return InsertItem(icon, text, receiver, member, new TTQKeySequence ()); } - public int InsertItem (TQIconSet icon, string text, TQObject receiver, string member, TQKeySequence accel) + public int InsertItem (TTQIconSet icon, string text, TTQObject receiver, string member, TTQKeySequence accel) { return InsertItem(icon, text, receiver, member, accel, (int) -1); } - public int InsertItem (TQIconSet icon, string text, TQObject receiver, string member, TQKeySequence accel, int identifier) + public int InsertItem (TTQIconSet icon, string text, TTQObject receiver, string member, TTQKeySequence accel, int identifier) { return InsertItem(icon, text, receiver, member, accel, identifier, (int) -1); } - public int InsertItem (TQPixmap pixmap, TQObject receiver, string member) + public int InsertItem (TTQPixmap pixmap, TTQObject receiver, string member) { - return InsertItem(pixmap, receiver, member, new TQKeySequence ()); + return InsertItem(pixmap, receiver, member, new TTQKeySequence ()); } - public int InsertItem (TQPixmap pixmap, TQObject receiver, string member, TQKeySequence accel) + public int InsertItem (TTQPixmap pixmap, TTQObject receiver, string member, TTQKeySequence accel) { return InsertItem(pixmap, receiver, member, accel, (int) -1); } - public int InsertItem (TQPixmap pixmap, TQObject receiver, string member, TQKeySequence accel, int identifier) + public int InsertItem (TTQPixmap pixmap, TTQObject receiver, string member, TTQKeySequence accel, int identifier) { return InsertItem(pixmap, receiver, member, accel, identifier, (int) -1); } - public int InsertItem (TQIconSet icon, TQPixmap pixmap, TQObject receiver, string member) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQObject receiver, string member) { - return InsertItem(icon, pixmap, receiver, member, new TQKeySequence ()); + return InsertItem(icon, pixmap, receiver, member, new TTQKeySequence ()); } - public int InsertItem (TQIconSet icon, TQPixmap pixmap, TQObject receiver, string member, TQKeySequence accel) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQObject receiver, string member, TTQKeySequence accel) { return InsertItem(icon, pixmap, receiver, member, accel, (int) -1); } - public int InsertItem (TQIconSet icon, TQPixmap pixmap, TQObject receiver, string member, TQKeySequence accel, int identifier) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQObject receiver, string member, TTQKeySequence accel, int identifier) { return InsertItem(icon, pixmap, receiver, member, accel, identifier, (int) -1); } @@ -599,102 +599,102 @@ namespace Qt { return InsertItem(text, identifier, (int) -1); } - public int InsertItem (TQIconSet icon, string text) + public int InsertItem (TTQIconSet icon, string text) { return InsertItem(icon, text, (int) -1); } - public int InsertItem (TQIconSet icon, string text, int identifier) + public int InsertItem (TTQIconSet icon, string text, int identifier) { return InsertItem(icon, text, identifier, (int) -1); } - public int InsertItem (string text, TQPopupMenu popup) + public int InsertItem (string text, TTQPopupMenu popup) { return InsertItem(text, popup, (int) -1); } - public int InsertItem (string text, TQPopupMenu popup, int identifier) + public int InsertItem (string text, TTQPopupMenu popup, int identifier) { return InsertItem(text, popup, identifier, (int) -1); } - public int InsertItem (TQIconSet icon, string text, TQPopupMenu popup) + public int InsertItem (TTQIconSet icon, string text, TTQPopupMenu popup) { return InsertItem(icon, text, popup, (int) -1); } - public int InsertItem (TQIconSet icon, string text, TQPopupMenu popup, int identifier) + public int InsertItem (TTQIconSet icon, string text, TTQPopupMenu popup, int identifier) { return InsertItem(icon, text, popup, identifier, (int) -1); } - public int InsertItem (TQPixmap pixmap) + public int InsertItem (TTQPixmap pixmap) { return InsertItem(pixmap, (int) -1); } - public int InsertItem (TQPixmap pixmap, int identifier) + public int InsertItem (TTQPixmap pixmap, int identifier) { return InsertItem(pixmap, identifier, (int) -1); } - public int InsertItem (TQIconSet icon, TQPixmap pixmap) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap) { return InsertItem(icon, pixmap, (int) -1); } - public int InsertItem (TQIconSet icon, TQPixmap pixmap, int identifier) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, int identifier) { return InsertItem(icon, pixmap, identifier, (int) -1); } - public int InsertItem (TQPixmap pixmap, TQPopupMenu popup) + public int InsertItem (TTQPixmap pixmap, TTQPopupMenu popup) { return InsertItem(pixmap, popup, (int) -1); } - public int InsertItem (TQPixmap pixmap, TQPopupMenu popup, int identifier) + public int InsertItem (TTQPixmap pixmap, TTQPopupMenu popup, int identifier) { return InsertItem(pixmap, popup, identifier, (int) -1); } - public int InsertItem (TQIconSet icon, TQPixmap pixmap, TQPopupMenu popup) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQPopupMenu popup) { return InsertItem(icon, pixmap, popup, (int) -1); } - public int InsertItem (TQIconSet icon, TQPixmap pixmap, TQPopupMenu popup, int identifier) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQPopupMenu popup, int identifier) { return InsertItem(icon, pixmap, popup, identifier, (int) -1); } - public int InsertItem (TQWidget widget) + public int InsertItem (TTQWidget widget) { return InsertItem(widget, (int) -1); } - public int InsertItem (TQWidget widget, int identifier) + public int InsertItem (TTQWidget widget, int identifier) { return InsertItem(widget, identifier, (int) -1); } - public int InsertItem (TQIconSet icon, TQCustomMenuItem custom) + public int InsertItem (TTQIconSet icon, TTQCustomMenuItem custom) { return InsertItem(icon, custom, (int) -1); } - public int InsertItem (TQIconSet icon, TQCustomMenuItem custom, int identifier) + public int InsertItem (TTQIconSet icon, TTQCustomMenuItem custom, int identifier) { return InsertItem(icon, custom, identifier, (int) -1); } - public int InsertItem (TQCustomMenuItem custom) + public int InsertItem (TTQCustomMenuItem custom) { return InsertItem(custom, (int) -1); } - public int InsertItem (TQCustomMenuItem custom, int identifier) + public int InsertItem (TTQCustomMenuItem custom, int identifier) { return InsertItem(custom, identifier, (int) -1); } @@ -704,7 +704,7 @@ namespace Qt { return InsertSeparator((int) -1); } - public TQMenuItem FindPopup (TQPopupMenu arg1) + public TTQMenuItem FindPopup (TTQPopupMenu arg1) { return FindPopup(arg1, new int[]{0}); } diff --git a/qtsharp/src/bindings/static/QNull.cs b/qtsharp/src/bindings/static/QNull.cs index d017da1c..95ede04b 100644 --- a/qtsharp/src/bindings/static/QNull.cs +++ b/qtsharp/src/bindings/static/QNull.cs @@ -1,4 +1,4 @@ -// QNull.cs - A Qt to C# binding. +// TQNull.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // @@ -22,13 +22,13 @@ namespace Qt { using Qt; using System; - internal struct QNull { + internal struct TQNull { - private static readonly QNull instance = new QNull (null); + private static readonly TQNull instance = new TQNull (null); - private QNull (Object dummy) {} + private TQNull (Object dummy) {} - internal static QNull Instance { + internal static TQNull Instance { get {return instance;} } } diff --git a/qtsharp/src/bindings/static/QObject.cs b/qtsharp/src/bindings/static/QObject.cs index ca571f03..351db720 100644 --- a/qtsharp/src/bindings/static/QObject.cs +++ b/qtsharp/src/bindings/static/QObject.cs @@ -1,4 +1,4 @@ -// TQObject.cs - A Qt to C# binding. +// TTQObject.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // @@ -35,15 +35,15 @@ namespace Qt { using System.Collections; using System.Runtime.InteropServices; - //[DeclareQtSignal ("ChildDestroyed(TQObject)")] - public class TQObject : QtSupport, IDisposable { + //[DeclareQtSignal ("ChildDestroyed(TTQObject)")] + public class TTQObject : QtSupport, IDisposable { - // Hold an instance of the TQApplication object - private static TQApplication qapp; + // Hold an instance of the TTQApplication object + private static TTQApplication qapp; private QtSignalMap csSignalMap; private QtSignalMap cppSignalMap; - public static TQApplication qApp { + public static TTQApplication qApp { get {return qapp;} set {qapp = value;} } @@ -58,12 +58,12 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_new_QObject (IntPtr parent, string name); - public TQObject (TQObject parent, string name) : this (QNull.Instance) + public TTQObject (TTQObject parent, string name) : this (TQNull.Instance) { qparent = parent; if (qparent == null) - parent = new TQWidget (IntPtr.Zero); + parent = new TTQWidget (IntPtr.Zero); else qparent.AddChild (this); @@ -71,29 +71,29 @@ namespace Qt { RegisterObject (this); } - public TQObject (TQObject parent) : this (parent, "") {} + public TTQObject (TTQObject parent) : this (parent, "") {} - internal TQObject () : this (QNull.Instance) {} + internal TTQObject () : this (TQNull.Instance) {} - internal TQObject (IntPtr ptr) : this (QNull.Instance) + internal TTQObject (IntPtr ptr) : this (TQNull.Instance) { rawObject = ptr; RegisterObject (this); } - internal TQObject (QNull dummy) : base (QNull.Instance) + internal TTQObject (TQNull dummy) : base (TQNull.Instance) { InitSignals (); } // FIXME This ctor used only by QtSignal - internal TQObject (NoSignalInit dummy) : base (QNull.Instance) + internal TTQObject (NoSignalInit dummy) : base (TQNull.Instance) { rawObject = qt_new_QObject (IntPtr.Zero, ""); RegisterObject (this); } - ~TQObject () + ~TTQObject () { Dispose(false); } @@ -172,25 +172,25 @@ namespace Qt { Dispose (); } - public TQObject QtCast() + public TTQObject QtCast() { string QtType = this.ClassName(); Type newType = Type.GetType( "Qt." + QtType ); object[] paramArray = { this.RawObject }; - return (TQObject) Activator.CreateInstance( newType, paramArray ); + return (TTQObject) Activator.CreateInstance( newType, paramArray ); } - public static bool Connect(TQObject sender, string signal, TQObject receiver, string slot) + public static bool Connect(TTQObject sender, string signal, TTQObject receiver, string slot) { return QtSignal.Connect(sender, signal, receiver, slot); } - public bool Connect (TQObject sender, string signal, string member) + public bool Connect (TTQObject sender, string signal, string member) { return Connect (sender, signal, this, member); } - public static bool Disconnect(TQObject sender, string signal, TQObject receiver, string slot) + public static bool Disconnect(TTQObject sender, string signal, TTQObject receiver, string slot) { return QtSignal.Disconnect(sender, signal, receiver, slot); } @@ -200,12 +200,12 @@ namespace Qt { return Disconnect (this, null, null, null); } - public bool Disconnect (string signal, TQObject receiver, string member) + public bool Disconnect (string signal, TTQObject receiver, string member) { return Disconnect(this, signal, receiver, member); } - public bool Disconnect (TQObject receiver, string slot) + public bool Disconnect (TTQObject receiver, string slot) { return Disconnect (this, null, receiver, slot); } @@ -240,7 +240,7 @@ namespace Qt { private static extern IntPtr qt_QObject_tr (IntPtr raw, string arg1, string arg2); public string Tr (string arg1, string arg2) { - TQString qstr = new TQString (qt_QObject_tr (rawObject, arg1, arg2)); + TTQString qstr = new TTQString (qt_QObject_tr (rawObject, arg1, arg2)); string str = qstr.Latin1 (); qstr.Dispose (); return str; @@ -250,7 +250,7 @@ namespace Qt { private static extern IntPtr qt_QObject_trUtf8 (IntPtr raw, string arg1, string arg2); public string TrUtf8 (string arg1, string arg2) { - TQString qstr = new TQString (qt_QObject_trUtf8 (rawObject, arg1, arg2)); + TTQString qstr = new TTQString (qt_QObject_trUtf8 (rawObject, arg1, arg2)); string str = qstr.Latin1 (); qstr.Dispose (); return str; @@ -258,21 +258,21 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QObject_metaObject (IntPtr raw); - public TQMetaObject MetaObject () + public TTQMetaObject MetaObject () { - return (TQMetaObject)LookupObject (qt_QObject_metaObject (rawObject), typeof(TQMetaObject)); + return (TTQMetaObject)LookupObject (qt_QObject_metaObject (rawObject), typeof(TTQMetaObject)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern bool qt_QObject_event (IntPtr raw, IntPtr arg1); - public bool Q_event (TQEvent arg1) + public bool Q_event (TTQEvent arg1) { return qt_QObject_event (rawObject, arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern bool qt_QObject_eventFilter (IntPtr raw, IntPtr arg1, IntPtr arg2); - public bool EventFilter (TQObject arg1, TQEvent arg2) + public bool EventFilter (TTQObject arg1, TTQEvent arg2) { return qt_QObject_eventFilter (rawObject, arg1.RawObject, arg2.RawObject); } @@ -363,49 +363,49 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QObject_child (IntPtr raw, string objName, string inheritsClass, bool recursiveSearch); - public TQObject Child (string objName, string inheritsClass, bool recursiveSearch) + public TTQObject Child (string objName, string inheritsClass, bool recursiveSearch) { - return (TQObject)LookupObject (qt_QObject_child (rawObject, objName, inheritsClass, recursiveSearch), typeof(TQObject)); + return (TTQObject)LookupObject (qt_QObject_child (rawObject, objName, inheritsClass, recursiveSearch), typeof(TTQObject)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QObject_children (IntPtr raw); - public TQObjectList Children () + public TTQObjectList Children () { - return (TQObjectList)LookupObject (qt_QObject_children (rawObject), typeof(TQObjectList)); + return (TTQObjectList)LookupObject (qt_QObject_children (rawObject), typeof(TTQObjectList)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QObject_queryList (IntPtr raw, string inheritsClass, string objName, bool regexpMatch, bool recursiveSearch); - public TQObjectList QueryList (string inheritsClass, string objName, bool regexpMatch, bool recursiveSearch) + public TTQObjectList QueryList (string inheritsClass, string objName, bool regexpMatch, bool recursiveSearch) { - return (TQObjectList)LookupObject (qt_QObject_queryList (rawObject, inheritsClass, objName, regexpMatch, recursiveSearch), typeof(TQObjectList)); + return (TTQObjectList)LookupObject (qt_QObject_queryList (rawObject, inheritsClass, objName, regexpMatch, recursiveSearch), typeof(TTQObjectList)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QObject_insertChild (IntPtr raw, IntPtr arg1); - public void InsertChild (TQObject arg1) + public void InsertChild (TTQObject arg1) { qt_QObject_insertChild (rawObject, arg1.RawObject); } /*[DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QObject_removeChild (IntPtr raw, IntPtr arg1); - public void RemoveChild (TQObject arg1) + public void RemoveChild (TTQObject arg1) { qt_QObject_removeChild (rawObject, arg1.RawObject); }*/ [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QObject_installEventFilter (IntPtr raw, IntPtr arg1); - public void InstallEventFilter (TQObject arg1) + public void InstallEventFilter (TTQObject arg1) { qt_QObject_installEventFilter (rawObject, arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QObject_removeEventFilter (IntPtr raw, IntPtr arg1); - public void RemoveEventFilter (TQObject arg1) + public void RemoveEventFilter (TTQObject arg1) { qt_QObject_removeEventFilter (rawObject, arg1.RawObject); } @@ -426,23 +426,23 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern bool qt_QObject_setProperty (IntPtr raw, string name, IntPtr value); - public bool SetProperty (string name, TQVariant value) + public bool SetProperty (string name, TTQVariant value) { return qt_QObject_setProperty (rawObject, name, value.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QObject_property (IntPtr raw, string name); - public TQVariant Property (string name) + public TTQVariant Property (string name) { - return (TQVariant)LookupObject (qt_QObject_property (rawObject, name), typeof(TQVariant)); + return (TTQVariant)LookupObject (qt_QObject_property (rawObject, name), typeof(TTQVariant)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QObject_parent (IntPtr raw); - public TQObject Parent () + public TTQObject Parent () { - return (TQObject)LookupObject (qt_QObject_parent (rawObject), typeof(TQObject)); + return (TTQObject)LookupObject (qt_QObject_parent (rawObject), typeof(TTQObject)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] @@ -454,15 +454,15 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QObject_objectTrees (); - public static TQObjectList ObjectTrees () + public static TTQObjectList ObjectTrees () { - return (TQObjectList)LookupObject (qt_QObject_objectTrees (), typeof(TQObjectList)); + return (TTQObjectList)LookupObject (qt_QObject_objectTrees (), typeof(TTQObjectList)); } /*FIXME [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QObject_connectInternal (IntPtr sender, int signal_index, IntPtr receiver, int membcode, int member_index); - public static void ConnectInternal (TQObject sender, int signal_index, TQObject receiver, int membcode, int member_index) + public static void ConnectInternal (TTQObject sender, int signal_index, TTQObject receiver, int membcode, int member_index) { qt_QObject_connectInternal (sender.RawObject, signal_index, receiver.RawObject, membcode, member_index); } @@ -470,23 +470,23 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern bool qt_QObject_activate_filters (IntPtr raw, IntPtr arg1); - protected bool Activate_filters (TQEvent arg1) + protected bool Activate_filters (TTQEvent arg1) { return qt_QObject_activate_filters (rawObject, arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QObject_receivers (IntPtr raw, string signal); - protected TQConnectionList Receivers (string signal) + protected TTQConnectionList Receivers (string signal) { - return (TQConnectionList)LookupObject (qt_QObject_receivers (rawObject, signal), typeof(TQConnectionList)); + return (TTQConnectionList)LookupObject (qt_QObject_receivers (rawObject, signal), typeof(TTQConnectionList)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QObject_receivers1 (IntPtr raw, int signal); - protected TQConnectionList Receivers (int signal) + protected TTQConnectionList Receivers (int signal) { - return (TQConnectionList)LookupObject (qt_QObject_receivers1 (rawObject, signal), typeof(TQConnectionList)); + return (TTQConnectionList)LookupObject (qt_QObject_receivers1 (rawObject, signal), typeof(TTQConnectionList)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] @@ -514,7 +514,7 @@ namespace Qt { private static extern void qt_QObject_activate_signal3 (IntPtr raw, int signal, IntPtr arg1); protected void Activate_signal (int signal, string arg1) { - qt_QObject_activate_signal3 (rawObject, signal, new TQString (arg1).RawObject); + qt_QObject_activate_signal3 (rawObject, signal, new TTQString (arg1).RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] @@ -527,7 +527,7 @@ namespace Qt { /* [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QObject_activate_signal4 (IntPtr raw, IntPtr clist, IntPtr o); - protected void Activate_signal (TQConnectionList clist, IntPtr o) + protected void Activate_signal (TTQConnectionList clist, IntPtr o) { qt_QObject_activate_signal4 (rawObject, clist.RawObject, o); } @@ -535,9 +535,9 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QObject_sender (IntPtr raw); - protected TQObject Sender () + protected TTQObject Sender () { - return (TQObject)LookupObject (qt_QObject_sender (rawObject), typeof(TQObject)); + return (TTQObject)LookupObject (qt_QObject_sender (rawObject), typeof(TTQObject)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] @@ -556,7 +556,7 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern bool qt_QObject_checkConnectArgs (IntPtr raw, string signal, IntPtr receiver, string member); - protected bool CheckConnectArgs (string signal, TQObject receiver, string member) + protected bool CheckConnectArgs (string signal, TTQObject receiver, string member) { return qt_QObject_checkConnectArgs (rawObject, signal, receiver.RawObject, member); } @@ -564,38 +564,38 @@ namespace Qt { /* [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QObject_normalizeSignalSlot (string signalSlot); - protected static TQCString NormalizeSignalSlot (string signalSlot) + protected static TTQCString NormalizeSignalSlot (string signalSlot) { - return (TQCString)LookupObject (qt_QObject_normalizeSignalSlot (signalSlot), typeof(TQCString)); + return (TTQCString)LookupObject (qt_QObject_normalizeSignalSlot (signalSlot), typeof(TTQCString)); } */ - public TQObject Child (string objName) + public TTQObject Child (string objName) { return Child(objName, null); } - public TQObject Child (string objName, string inheritsClass) + public TTQObject Child (string objName, string inheritsClass) { return Child(objName, inheritsClass, true); } - public TQObjectList QueryList () + public TTQObjectList QueryList () { return QueryList(""); } - public TQObjectList QueryList (string inheritsClass) + public TTQObjectList QueryList (string inheritsClass) { return QueryList(inheritsClass, ""); } - public TQObjectList QueryList (string inheritsClass, string objName) + public TTQObjectList QueryList (string inheritsClass, string objName) { return QueryList(inheritsClass, objName, true); } - public TQObjectList QueryList (string inheritsClass, string objName, bool regexpMatch) + public TTQObjectList QueryList (string inheritsClass, string objName, bool regexpMatch) { return QueryList(inheritsClass, objName, regexpMatch, true); } diff --git a/qtsharp/src/bindings/static/QPopupMenu.cs b/qtsharp/src/bindings/static/QPopupMenu.cs index cbee5f97..584d258e 100644 --- a/qtsharp/src/bindings/static/QPopupMenu.cs +++ b/qtsharp/src/bindings/static/QPopupMenu.cs @@ -1,4 +1,4 @@ -// TQPopupMenu.cs - A Qt to C# binding. +// TTQPopupMenu.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // @@ -28,7 +28,7 @@ namespace Qt { using System.Collections; using System.Runtime.InteropServices; - public class TQPopupMenu : TQFrame, IQMenuData, IDisposable { + public class TTQPopupMenu : TTQFrame, ITQMenuData, IDisposable { private Hashtable menuConnections; @@ -38,31 +38,31 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_new_QPopupMenu (IntPtr parent, string name); - public TQPopupMenu (TQWidget parent, string name) : this (QNull.Instance) + public TTQPopupMenu (TTQWidget parent, string name) : this (TQNull.Instance) { qparent = parent; - if (qparent == null) parent = new TQWidget (IntPtr.Zero); + if (qparent == null) parent = new TTQWidget (IntPtr.Zero); rawObject = qt_new_QPopupMenu (parent.RawObject, name); if (qparent == null) RegisterObject (this); else qparent.AddChild (this); } - public TQPopupMenu () : this (new TQWidget ()) {} + public TTQPopupMenu () : this (new TTQWidget ()) {} - public TQPopupMenu (TQWidget parent) : this (parent, "") {} + public TTQPopupMenu (TTQWidget parent) : this (parent, "") {} - internal TQPopupMenu (IntPtr ptr) : this (QNull.Instance) + internal TTQPopupMenu (IntPtr ptr) : this (TQNull.Instance) { rawObject = ptr; RegisterObject(this); } - internal TQPopupMenu (QNull dummy) : base (QNull.Instance) + internal TTQPopupMenu (TQNull dummy) : base (TQNull.Instance) { menuConnections = new Hashtable(); } - ~TQPopupMenu () + ~TTQPopupMenu () { Dispose (false); } @@ -79,7 +79,7 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QPopupMenu_popup (IntPtr raw, IntPtr pos, int indexAtPoint); - public void Popup (TQPoint pos, int indexAtPoint) + public void Popup (TTQPoint pos, int indexAtPoint) { qt_QPopupMenu_popup (rawObject, pos.RawObject, indexAtPoint); } @@ -107,7 +107,7 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QPopupMenu_setFont (IntPtr raw, IntPtr arg1); - public void SetFont (TQFont arg1) + public void SetFont (TTQFont arg1) { qt_QPopupMenu_setFont (rawObject, arg1.RawObject); } @@ -135,7 +135,7 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QPopupMenu_exec1 (IntPtr raw, IntPtr pos, int indexAtPoint); - public int Exec (TQPoint pos, int indexAtPoint) + public int Exec (TTQPoint pos, int indexAtPoint) { return qt_QPopupMenu_exec1 (rawObject, pos.RawObject, indexAtPoint); } @@ -149,9 +149,9 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QPopupMenu_sizeHint (IntPtr raw); - public TQSize SizeHint () + public TTQSize SizeHint () { - return (TQSize)LookupObject (qt_QPopupMenu_sizeHint (rawObject), typeof(TQSize)); + return (TTQSize)LookupObject (qt_QPopupMenu_sizeHint (rawObject), typeof(TTQSize)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] @@ -163,7 +163,7 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QPopupMenu_idAt1 (IntPtr raw, IntPtr pos); - public int IdAt (TQPoint pos) + public int IdAt (TTQPoint pos) { return qt_QPopupMenu_idAt1 (rawObject, pos.RawObject); } @@ -191,9 +191,9 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QPopupMenu_itemGeometry (IntPtr raw, int index); - public TQRect ItemGeometry (int index) + public TTQRect ItemGeometry (int index) { - return (TQRect)LookupObject (qt_QPopupMenu_itemGeometry (rawObject, index), typeof(TQRect)); + return (TTQRect)LookupObject (qt_QPopupMenu_itemGeometry (rawObject, index), typeof(TTQRect)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] @@ -205,28 +205,28 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QPopupMenu_itemHeight1 (IntPtr raw, IntPtr mi); - protected int ItemHeight (TQMenuItem mi) + protected int ItemHeight (TTQMenuItem mi) { return qt_QPopupMenu_itemHeight1 (rawObject, mi.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QPopupMenu_drawItem (IntPtr raw, IntPtr p, int tab, IntPtr mi, bool act, int x, int y, int w, int h); - protected void DrawItem (TQPainter p, int tab, TQMenuItem mi, bool act, int x, int y, int w, int h) + protected void DrawItem (TTQPainter p, int tab, TTQMenuItem mi, bool act, int x, int y, int w, int h) { qt_QPopupMenu_drawItem (rawObject, p.RawObject, tab, mi.RawObject, act, x, y, w, h); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QPopupMenu_drawContents (IntPtr raw, IntPtr arg1); - protected void DrawContents (TQPainter arg1) + protected void DrawContents (TTQPainter arg1) { qt_QPopupMenu_drawContents (rawObject, arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QPopupMenu_styleChange (IntPtr raw, IntPtr arg1); - protected void StyleChange (TQStyle arg1) + protected void StyleChange (TTQStyle arg1) { qt_QPopupMenu_styleChange (rawObject, arg1.RawObject); } @@ -247,17 +247,17 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QPopupMenu_itemAtPos (IntPtr raw, IntPtr arg1, bool ignoreSeparator); - protected int ItemAtPos (TQPoint arg1, bool ignoreSeparator) + protected int ItemAtPos (TTQPoint arg1, bool ignoreSeparator) { return qt_QPopupMenu_itemAtPos (rawObject, arg1.RawObject, ignoreSeparator); } - public void Popup (TQPoint pos) + public void Popup (TTQPoint pos) { Popup(pos, (int) 0); } - public int Exec (TQPoint pos) + public int Exec (TTQPoint pos) { return Exec(pos, (int) 0); } @@ -272,14 +272,14 @@ namespace Qt { return InsertTearOffHandle(identifier, (int) -1); } - protected int ItemAtPos (TQPoint arg1) + protected int ItemAtPos (TTQPoint arg1) { return ItemAtPos(arg1, true); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QPopupMenu_QMenuData (IntPtr raw); - public IntPtr TQMenuData () + public IntPtr TTQMenuData () { return qt_QPopupMenu_QMenuData (rawObject); } @@ -289,7 +289,7 @@ namespace Qt { //********************* A temporary hack to divert connections to CSharpConnect *****************// - public int InsertItem (string text, TQObject receiver, string member, TQKeySequence accel, int identifier, int index) + public int InsertItem (string text, TTQObject receiver, string member, TTQKeySequence accel, int identifier, int index) { int id = InsertItem (text, identifier, index); SetAccel (accel, id); @@ -297,7 +297,7 @@ namespace Qt { return id; } - public int InsertItem (TQIconSet icon, string text, TQObject receiver, string member, TQKeySequence accel, int identifier, int index) + public int InsertItem (TTQIconSet icon, string text, TTQObject receiver, string member, TTQKeySequence accel, int identifier, int index) { int id = InsertItem (icon, text, identifier, index); SetAccel (accel, id); @@ -305,7 +305,7 @@ namespace Qt { return id; } - public int InsertItem (TQPixmap pixmap, TQObject receiver, string member, TQKeySequence accel, int identifier, int index) + public int InsertItem (TTQPixmap pixmap, TTQObject receiver, string member, TTQKeySequence accel, int identifier, int index) { int id = InsertItem (pixmap, identifier, index); SetAccel (accel, id); @@ -313,7 +313,7 @@ namespace Qt { return id; } - public int InsertItem (TQIconSet icon, TQPixmap pixmap, TQObject receiver, string member, TQKeySequence accel, int identifier, int index) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQObject receiver, string member, TTQKeySequence accel, int identifier, int index) { int id = InsertItem (icon, pixmap, identifier, index); SetAccel (accel, id); @@ -321,14 +321,14 @@ namespace Qt { return id; } - public bool ConnectItem (int identifier, TQObject receiver, string member) + public bool ConnectItem (int identifier, TTQObject receiver, string member) { - return Qt.TQMenuData.ConnectItem (this, TQMenuData (), identifier, receiver, member); + return Qt.TTQMenuData.ConnectItem (this, TTQMenuData (), identifier, receiver, member); } - public bool DisconnectItem (int identifier, TQObject receiver, string member) + public bool DisconnectItem (int identifier, TTQObject receiver, string member) { - return Qt.TQMenuData.DisconnectItem (this, TQMenuData (), identifier, receiver, member); + return Qt.TTQMenuData.DisconnectItem (this, TTQMenuData (), identifier, receiver, member); } //********************* A temporary hack to divert connections to CSharpConnect *****************// @@ -337,140 +337,140 @@ namespace Qt { private static extern uint qt_QMenuData_count (IntPtr raw); public uint Count () { - return qt_QMenuData_count (TQMenuData ()); + return qt_QMenuData_count (TTQMenuData ()); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem4 (IntPtr raw, IntPtr text, int identifier, int index); public int InsertItem (string text, int identifier, int index) { - return qt_QMenuData_insertItem4 (TQMenuData (), new TQString (text).RawObject, identifier, index); + return qt_QMenuData_insertItem4 (TTQMenuData (), new TTQString (text).RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem5 (IntPtr raw, IntPtr icon, IntPtr text, int identifier, int index); - public int InsertItem (TQIconSet icon, string text, int identifier, int index) + public int InsertItem (TTQIconSet icon, string text, int identifier, int index) { - return qt_QMenuData_insertItem5 (TQMenuData (), icon.RawObject, new TQString (text).RawObject, identifier, index); + return qt_QMenuData_insertItem5 (TTQMenuData (), icon.RawObject, new TTQString (text).RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem6 (IntPtr raw, IntPtr text, IntPtr popup, int identifier, int index); - public int InsertItem (string text, TQPopupMenu popup, int identifier, int index) + public int InsertItem (string text, TTQPopupMenu popup, int identifier, int index) { - return qt_QMenuData_insertItem6 (TQMenuData (), new TQString (text).RawObject, popup.RawObject, identifier, index); + return qt_QMenuData_insertItem6 (TTQMenuData (), new TTQString (text).RawObject, popup.RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem7 (IntPtr raw, IntPtr icon, IntPtr text, IntPtr popup, int identifier, int index); - public int InsertItem (TQIconSet icon, string text, TQPopupMenu popup, int identifier, int index) + public int InsertItem (TTQIconSet icon, string text, TTQPopupMenu popup, int identifier, int index) { - return qt_QMenuData_insertItem7 (TQMenuData (), icon.RawObject, new TQString (text).RawObject, popup.RawObject, identifier, index); + return qt_QMenuData_insertItem7 (TTQMenuData (), icon.RawObject, new TTQString (text).RawObject, popup.RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem8 (IntPtr raw, IntPtr pixmap, int identifier, int index); - public int InsertItem (TQPixmap pixmap, int identifier, int index) + public int InsertItem (TTQPixmap pixmap, int identifier, int index) { - return qt_QMenuData_insertItem8 (TQMenuData (), pixmap.RawObject, identifier, index); + return qt_QMenuData_insertItem8 (TTQMenuData (), pixmap.RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem9 (IntPtr raw, IntPtr icon, IntPtr pixmap, int identifier, int index); - public int InsertItem (TQIconSet icon, TQPixmap pixmap, int identifier, int index) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, int identifier, int index) { - return qt_QMenuData_insertItem9 (TQMenuData (), icon.RawObject, pixmap.RawObject, identifier, index); + return qt_QMenuData_insertItem9 (TTQMenuData (), icon.RawObject, pixmap.RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem10 (IntPtr raw, IntPtr pixmap, IntPtr popup, int identifier, int index); - public int InsertItem (TQPixmap pixmap, TQPopupMenu popup, int identifier, int index) + public int InsertItem (TTQPixmap pixmap, TTQPopupMenu popup, int identifier, int index) { - return qt_QMenuData_insertItem10 (TQMenuData (), pixmap.RawObject, popup.RawObject, identifier, index); + return qt_QMenuData_insertItem10 (TTQMenuData (), pixmap.RawObject, popup.RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem11 (IntPtr raw, IntPtr icon, IntPtr pixmap, IntPtr popup, int identifier, int index); - public int InsertItem (TQIconSet icon, TQPixmap pixmap, TQPopupMenu popup, int identifier, int index) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQPopupMenu popup, int identifier, int index) { - return qt_QMenuData_insertItem11 (TQMenuData (), icon.RawObject, pixmap.RawObject, popup.RawObject, identifier, index); + return qt_QMenuData_insertItem11 (TTQMenuData (), icon.RawObject, pixmap.RawObject, popup.RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem12 (IntPtr raw, IntPtr widget, int identifier, int index); - public int InsertItem (TQWidget widget, int identifier, int index) + public int InsertItem (TTQWidget widget, int identifier, int index) { - return qt_QMenuData_insertItem12 (TQMenuData (), widget.RawObject, identifier, index); + return qt_QMenuData_insertItem12 (TTQMenuData (), widget.RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem13 (IntPtr raw, IntPtr icon, IntPtr custom, int identifier, int index); - public int InsertItem (TQIconSet icon, TQCustomMenuItem custom, int identifier, int index) + public int InsertItem (TTQIconSet icon, TTQCustomMenuItem custom, int identifier, int index) { - return qt_QMenuData_insertItem13 (TQMenuData (), icon.RawObject, custom.RawObject, identifier, index); + return qt_QMenuData_insertItem13 (TTQMenuData (), icon.RawObject, custom.RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertItem14 (IntPtr raw, IntPtr custom, int identifier, int index); - public int InsertItem (TQCustomMenuItem custom, int identifier, int index) + public int InsertItem (TTQCustomMenuItem custom, int identifier, int index) { - return qt_QMenuData_insertItem14 (TQMenuData (), custom.RawObject, identifier, index); + return qt_QMenuData_insertItem14 (TTQMenuData (), custom.RawObject, identifier, index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_insertSeparator (IntPtr raw, int index); public int InsertSeparator (int index) { - return qt_QMenuData_insertSeparator (TQMenuData (), index); + return qt_QMenuData_insertSeparator (TTQMenuData (), index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_removeItem (IntPtr raw, int identifier); public void RemoveItem (int identifier) { - qt_QMenuData_removeItem (TQMenuData (), identifier); + qt_QMenuData_removeItem (TTQMenuData (), identifier); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_removeItemAt (IntPtr raw, int index); public void RemoveItemAt (int index) { - qt_QMenuData_removeItemAt (TQMenuData (), index); + qt_QMenuData_removeItemAt (TTQMenuData (), index); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_clear (IntPtr raw); public void Clear () { - qt_QMenuData_clear (TQMenuData ()); + qt_QMenuData_clear (TTQMenuData ()); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuData_accel (IntPtr raw, int identifier); - public TQKeySequence Accel (int identifier) + public TTQKeySequence Accel (int identifier) { - return (TQKeySequence)LookupObject (qt_QMenuData_accel (TQMenuData (), identifier), typeof(TQKeySequence)); + return (TTQKeySequence)LookupObject (qt_QMenuData_accel (TTQMenuData (), identifier), typeof(TTQKeySequence)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_setAccel (IntPtr raw, IntPtr key, int identifier); - public void SetAccel (TQKeySequence key, int identifier) + public void SetAccel (TTQKeySequence key, int identifier) { - qt_QMenuData_setAccel (TQMenuData (), key.RawObject, identifier); + qt_QMenuData_setAccel (TTQMenuData (), key.RawObject, identifier); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuData_iconSet (IntPtr raw, int identifier); - public TQIconSet IconSet (int identifier) + public TTQIconSet IconSet (int identifier) { - return (TQIconSet)LookupObject (qt_QMenuData_iconSet (TQMenuData (), identifier), typeof(TQIconSet)); + return (TTQIconSet)LookupObject (qt_QMenuData_iconSet (TTQMenuData (), identifier), typeof(TTQIconSet)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuData_text (IntPtr raw, int identifier); public string Text (int identifier) { - TQString qstr = new TQString (qt_QMenuData_text (TQMenuData (), identifier)); + TTQString qstr = new TTQString (qt_QMenuData_text (TTQMenuData (), identifier)); string str = qstr.Latin1 (); qstr.Dispose (); return str; @@ -478,23 +478,23 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuData_pixmap (IntPtr raw, int identifier); - public TQPixmap Pixmap (int identifier) + public TTQPixmap Pixmap (int identifier) { - return (TQPixmap)LookupObject (qt_QMenuData_pixmap (TQMenuData (), identifier), typeof(TQPixmap)); + return (TTQPixmap)LookupObject (qt_QMenuData_pixmap (TTQMenuData (), identifier), typeof(TTQPixmap)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_setWhatsThis (IntPtr raw, int identifier, IntPtr arg1); public void SetWhatsThis (int identifier, string arg1) { - qt_QMenuData_setWhatsThis (TQMenuData (), identifier, new TQString (arg1).RawObject); + qt_QMenuData_setWhatsThis (TTQMenuData (), identifier, new TTQString (arg1).RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuData_whatsThis (IntPtr raw, int identifier); public string WhatsThis (int identifier) { - TQString qstr = new TQString (qt_QMenuData_whatsThis (TQMenuData (), identifier)); + TTQString qstr = new TTQString (qt_QMenuData_whatsThis (TTQMenuData (), identifier)); string str = qstr.Latin1 (); qstr.Dispose (); return str; @@ -504,205 +504,205 @@ namespace Qt { private static extern void qt_QMenuData_changeItem (IntPtr raw, int identifier, IntPtr text); public void ChangeItem (int identifier, string text) { - qt_QMenuData_changeItem (TQMenuData (), identifier, new TQString (text).RawObject); + qt_QMenuData_changeItem (TTQMenuData (), identifier, new TTQString (text).RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_changeItem1 (IntPtr raw, int identifier, IntPtr pixmap); - public void ChangeItem (int identifier, TQPixmap pixmap) + public void ChangeItem (int identifier, TTQPixmap pixmap) { - qt_QMenuData_changeItem1 (TQMenuData (), identifier, pixmap.RawObject); + qt_QMenuData_changeItem1 (TTQMenuData (), identifier, pixmap.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_changeItem2 (IntPtr raw, int identifier, IntPtr icon, IntPtr text); - public void ChangeItem (int identifier, TQIconSet icon, string text) + public void ChangeItem (int identifier, TTQIconSet icon, string text) { - qt_QMenuData_changeItem2 (TQMenuData (), identifier, icon.RawObject, new TQString (text).RawObject); + qt_QMenuData_changeItem2 (TTQMenuData (), identifier, icon.RawObject, new TTQString (text).RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_changeItem3 (IntPtr raw, int identifier, IntPtr icon, IntPtr pixmap); - public void ChangeItem (int identifier, TQIconSet icon, TQPixmap pixmap) + public void ChangeItem (int identifier, TTQIconSet icon, TTQPixmap pixmap) { - qt_QMenuData_changeItem3 (TQMenuData (), identifier, icon.RawObject, pixmap.RawObject); + qt_QMenuData_changeItem3 (TTQMenuData (), identifier, icon.RawObject, pixmap.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_changeItem4 (IntPtr raw, IntPtr text, int identifier); public void ChangeItem (string text, int identifier) { - qt_QMenuData_changeItem4 (TQMenuData (), new TQString (text).RawObject, identifier); + qt_QMenuData_changeItem4 (TTQMenuData (), new TTQString (text).RawObject, identifier); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_changeItem5 (IntPtr raw, IntPtr pixmap, int identifier); - public void ChangeItem (TQPixmap pixmap, int identifier) + public void ChangeItem (TTQPixmap pixmap, int identifier) { - qt_QMenuData_changeItem5 (TQMenuData (), pixmap.RawObject, identifier); + qt_QMenuData_changeItem5 (TTQMenuData (), pixmap.RawObject, identifier); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_changeItem6 (IntPtr raw, IntPtr icon, IntPtr text, int identifier); - public void ChangeItem (TQIconSet icon, string text, int identifier) + public void ChangeItem (TTQIconSet icon, string text, int identifier) { - qt_QMenuData_changeItem6 (TQMenuData (), icon.RawObject, new TQString (text).RawObject, identifier); + qt_QMenuData_changeItem6 (TTQMenuData (), icon.RawObject, new TTQString (text).RawObject, identifier); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern bool qt_QMenuData_isItemActive (IntPtr raw, int identifier); public bool IsItemActive (int identifier) { - return qt_QMenuData_isItemActive (TQMenuData (), identifier); + return qt_QMenuData_isItemActive (TTQMenuData (), identifier); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern bool qt_QMenuData_isItemEnabled (IntPtr raw, int identifier); public bool IsItemEnabled (int identifier) { - return qt_QMenuData_isItemEnabled (TQMenuData (), identifier); + return qt_QMenuData_isItemEnabled (TTQMenuData (), identifier); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_setItemEnabled (IntPtr raw, int identifier, bool enable); public void SetItemEnabled (int identifier, bool enable) { - qt_QMenuData_setItemEnabled (TQMenuData (), identifier, enable); + qt_QMenuData_setItemEnabled (TTQMenuData (), identifier, enable); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern bool qt_QMenuData_isItemChecked (IntPtr raw, int identifier); public bool IsItemChecked (int identifier) { - return qt_QMenuData_isItemChecked (TQMenuData (), identifier); + return qt_QMenuData_isItemChecked (TTQMenuData (), identifier); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_setItemChecked (IntPtr raw, int identifier, bool check); public void SetItemChecked (int identifier, bool check) { - qt_QMenuData_setItemChecked (TQMenuData (), identifier, check); + qt_QMenuData_setItemChecked (TTQMenuData (), identifier, check); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_indexOf (IntPtr raw, int identifier); public int IndexOf (int identifier) { - return qt_QMenuData_indexOf (TQMenuData (), identifier); + return qt_QMenuData_indexOf (TTQMenuData (), identifier); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_setId (IntPtr raw, int index, int identifier); public void SetId (int index, int identifier) { - qt_QMenuData_setId (TQMenuData (), index, identifier); + qt_QMenuData_setId (TTQMenuData (), index, identifier); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern bool qt_QMenuData_setItemParameter (IntPtr raw, int identifier, int param); public bool SetItemParameter (int identifier, int param) { - return qt_QMenuData_setItemParameter (TQMenuData (), identifier, param); + return qt_QMenuData_setItemParameter (TTQMenuData (), identifier, param); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QMenuData_itemParameter (IntPtr raw, int identifier); public int ItemParameter (int identifier) { - return qt_QMenuData_itemParameter (TQMenuData (), identifier); + return qt_QMenuData_itemParameter (TTQMenuData (), identifier); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuData_findItem (IntPtr raw, int identifier); - public TQMenuItem FindItem (int identifier) + public TTQMenuItem FindItem (int identifier) { - return (TQMenuItem)LookupObject (qt_QMenuData_findItem (TQMenuData (), identifier), typeof(TQMenuItem)); + return (TTQMenuItem)LookupObject (qt_QMenuData_findItem (TTQMenuData (), identifier), typeof(TTQMenuItem)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuData_findItem1 (IntPtr raw, int identifier, IntPtr parent); - public TQMenuItem FindItem (int identifier, TQMenuData parent) + public TTQMenuItem FindItem (int identifier, TTQMenuData parent) { - return (TQMenuItem)LookupObject (qt_QMenuData_findItem1 (TQMenuData (), identifier, parent.RawObject), typeof(TQMenuItem)); + return (TTQMenuItem)LookupObject (qt_QMenuData_findItem1 (TTQMenuData (), identifier, parent.RawObject), typeof(TTQMenuItem)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QMenuData_findPopup (IntPtr raw, IntPtr arg1, int[] index); - public TQMenuItem FindPopup (TQPopupMenu arg1, int[] index) + public TTQMenuItem FindPopup (TTQPopupMenu arg1, int[] index) { - return (TQMenuItem)LookupObject (qt_QMenuData_findPopup (TQMenuData (), arg1.RawObject, index), typeof(TQMenuItem)); + return (TTQMenuItem)LookupObject (qt_QMenuData_findPopup (TTQMenuData (), arg1.RawObject, index), typeof(TTQMenuItem)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_menuInsPopup (IntPtr raw, IntPtr arg1); - protected void MenuInsPopup (TQPopupMenu arg1) + protected void MenuInsPopup (TTQPopupMenu arg1) { - qt_QMenuData_menuInsPopup (TQMenuData (), arg1.RawObject); + qt_QMenuData_menuInsPopup (TTQMenuData (), arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QMenuData_menuDelPopup (IntPtr raw, IntPtr arg1); - protected void MenuDelPopup (TQPopupMenu arg1) + protected void MenuDelPopup (TTQPopupMenu arg1) { - qt_QMenuData_menuDelPopup (TQMenuData (), arg1.RawObject); + qt_QMenuData_menuDelPopup (TTQMenuData (), arg1.RawObject); } - public int InsertItem (string text, TQObject receiver, string member) + public int InsertItem (string text, TTQObject receiver, string member) { - return InsertItem(text, receiver, member, new TQKeySequence ()); + return InsertItem(text, receiver, member, new TTQKeySequence ()); } - public int InsertItem (string text, TQObject receiver, string member, TQKeySequence accel) + public int InsertItem (string text, TTQObject receiver, string member, TTQKeySequence accel) { return InsertItem(text, receiver, member, accel, (int) -1); } - public int InsertItem (string text, TQObject receiver, string member, TQKeySequence accel, int identifier) + public int InsertItem (string text, TTQObject receiver, string member, TTQKeySequence accel, int identifier) { return InsertItem(text, receiver, member, accel, identifier, (int) -1); } - public int InsertItem (TQIconSet icon, string text, TQObject receiver, string member) + public int InsertItem (TTQIconSet icon, string text, TTQObject receiver, string member) { - return InsertItem(icon, text, receiver, member, new TQKeySequence ()); + return InsertItem(icon, text, receiver, member, new TTQKeySequence ()); } - public int InsertItem (TQIconSet icon, string text, TQObject receiver, string member, TQKeySequence accel) + public int InsertItem (TTQIconSet icon, string text, TTQObject receiver, string member, TTQKeySequence accel) { return InsertItem(icon, text, receiver, member, accel, (int) -1); } - public int InsertItem (TQIconSet icon, string text, TQObject receiver, string member, TQKeySequence accel, int identifier) + public int InsertItem (TTQIconSet icon, string text, TTQObject receiver, string member, TTQKeySequence accel, int identifier) { return InsertItem(icon, text, receiver, member, accel, identifier, (int) -1); } - public int InsertItem (TQPixmap pixmap, TQObject receiver, string member) + public int InsertItem (TTQPixmap pixmap, TTQObject receiver, string member) { - return InsertItem(pixmap, receiver, member, new TQKeySequence ()); + return InsertItem(pixmap, receiver, member, new TTQKeySequence ()); } - public int InsertItem (TQPixmap pixmap, TQObject receiver, string member, TQKeySequence accel) + public int InsertItem (TTQPixmap pixmap, TTQObject receiver, string member, TTQKeySequence accel) { return InsertItem(pixmap, receiver, member, accel, (int) -1); } - public int InsertItem (TQPixmap pixmap, TQObject receiver, string member, TQKeySequence accel, int identifier) + public int InsertItem (TTQPixmap pixmap, TTQObject receiver, string member, TTQKeySequence accel, int identifier) { return InsertItem(pixmap, receiver, member, accel, identifier, (int) -1); } - public int InsertItem (TQIconSet icon, TQPixmap pixmap, TQObject receiver, string member) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQObject receiver, string member) { - return InsertItem(icon, pixmap, receiver, member, new TQKeySequence ()); + return InsertItem(icon, pixmap, receiver, member, new TTQKeySequence ()); } - public int InsertItem (TQIconSet icon, TQPixmap pixmap, TQObject receiver, string member, TQKeySequence accel) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQObject receiver, string member, TTQKeySequence accel) { return InsertItem(icon, pixmap, receiver, member, accel, (int) -1); } - public int InsertItem (TQIconSet icon, TQPixmap pixmap, TQObject receiver, string member, TQKeySequence accel, int identifier) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQObject receiver, string member, TTQKeySequence accel, int identifier) { return InsertItem(icon, pixmap, receiver, member, accel, identifier, (int) -1); } @@ -717,102 +717,102 @@ namespace Qt { return InsertItem(text, identifier, (int) -1); } - public int InsertItem (TQIconSet icon, string text) + public int InsertItem (TTQIconSet icon, string text) { return InsertItem(icon, text, (int) -1); } - public int InsertItem (TQIconSet icon, string text, int identifier) + public int InsertItem (TTQIconSet icon, string text, int identifier) { return InsertItem(icon, text, identifier, (int) -1); } - public int InsertItem (string text, TQPopupMenu popup) + public int InsertItem (string text, TTQPopupMenu popup) { return InsertItem(text, popup, (int) -1); } - public int InsertItem (string text, TQPopupMenu popup, int identifier) + public int InsertItem (string text, TTQPopupMenu popup, int identifier) { return InsertItem(text, popup, identifier, (int) -1); } - public int InsertItem (TQIconSet icon, string text, TQPopupMenu popup) + public int InsertItem (TTQIconSet icon, string text, TTQPopupMenu popup) { return InsertItem(icon, text, popup, (int) -1); } - public int InsertItem (TQIconSet icon, string text, TQPopupMenu popup, int identifier) + public int InsertItem (TTQIconSet icon, string text, TTQPopupMenu popup, int identifier) { return InsertItem(icon, text, popup, identifier, (int) -1); } - public int InsertItem (TQPixmap pixmap) + public int InsertItem (TTQPixmap pixmap) { return InsertItem(pixmap, (int) -1); } - public int InsertItem (TQPixmap pixmap, int identifier) + public int InsertItem (TTQPixmap pixmap, int identifier) { return InsertItem(pixmap, identifier, (int) -1); } - public int InsertItem (TQIconSet icon, TQPixmap pixmap) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap) { return InsertItem(icon, pixmap, (int) -1); } - public int InsertItem (TQIconSet icon, TQPixmap pixmap, int identifier) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, int identifier) { return InsertItem(icon, pixmap, identifier, (int) -1); } - public int InsertItem (TQPixmap pixmap, TQPopupMenu popup) + public int InsertItem (TTQPixmap pixmap, TTQPopupMenu popup) { return InsertItem(pixmap, popup, (int) -1); } - public int InsertItem (TQPixmap pixmap, TQPopupMenu popup, int identifier) + public int InsertItem (TTQPixmap pixmap, TTQPopupMenu popup, int identifier) { return InsertItem(pixmap, popup, identifier, (int) -1); } - public int InsertItem (TQIconSet icon, TQPixmap pixmap, TQPopupMenu popup) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQPopupMenu popup) { return InsertItem(icon, pixmap, popup, (int) -1); } - public int InsertItem (TQIconSet icon, TQPixmap pixmap, TQPopupMenu popup, int identifier) + public int InsertItem (TTQIconSet icon, TTQPixmap pixmap, TTQPopupMenu popup, int identifier) { return InsertItem(icon, pixmap, popup, identifier, (int) -1); } - public int InsertItem (TQWidget widget) + public int InsertItem (TTQWidget widget) { return InsertItem(widget, (int) -1); } - public int InsertItem (TQWidget widget, int identifier) + public int InsertItem (TTQWidget widget, int identifier) { return InsertItem(widget, identifier, (int) -1); } - public int InsertItem (TQIconSet icon, TQCustomMenuItem custom) + public int InsertItem (TTQIconSet icon, TTQCustomMenuItem custom) { return InsertItem(icon, custom, (int) -1); } - public int InsertItem (TQIconSet icon, TQCustomMenuItem custom, int identifier) + public int InsertItem (TTQIconSet icon, TTQCustomMenuItem custom, int identifier) { return InsertItem(icon, custom, identifier, (int) -1); } - public int InsertItem (TQCustomMenuItem custom) + public int InsertItem (TTQCustomMenuItem custom) { return InsertItem(custom, (int) -1); } - public int InsertItem (TQCustomMenuItem custom, int identifier) + public int InsertItem (TTQCustomMenuItem custom, int identifier) { return InsertItem(custom, identifier, (int) -1); } @@ -822,7 +822,7 @@ namespace Qt { return InsertSeparator((int) -1); } - public TQMenuItem FindPopup (TQPopupMenu arg1) + public TTQMenuItem FindPopup (TTQPopupMenu arg1) { return FindPopup(arg1, new int[]{0}); } diff --git a/qtsharp/src/bindings/static/QString.cs b/qtsharp/src/bindings/static/QString.cs index df25945e..e47c52ba 100644 --- a/qtsharp/src/bindings/static/QString.cs +++ b/qtsharp/src/bindings/static/QString.cs @@ -1,4 +1,4 @@ -// TQString.cs - A Qt to C# binding. +// TTQString.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // @@ -26,7 +26,7 @@ namespace Qt { using System; using System.Runtime.InteropServices; - public class TQString : QtSupport, IDisposable { + public class TTQString : QtSupport, IDisposable { public enum SectionFlags { SectionDefault = 0, @@ -39,47 +39,47 @@ namespace Qt { [DllImport("libqtc")] private static extern IntPtr qt_QString_null (); - public static readonly TQString Null = new TQString (qt_QString_null ()); + public static readonly TTQString Null = new TTQString (qt_QString_null ()); // TODO: Is there a good reason why this C# constructor is public? [DllImport("libqtc")] private static extern IntPtr qt_new_QString (); - public TQString () : this (QNull.Instance) + public TTQString () : this (TQNull.Instance) { rawObject = qt_new_QString (); } - // TODO: Make sure there is a TQChar constructor that + // TODO: Make sure there is a TTQChar constructor that // handles unicode conversion [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_new_QString1 (IntPtr arg1); - public TQString (TQChar arg1) : this (QNull.Instance) + public TTQString (TTQChar arg1) : this (TQNull.Instance) { rawObject = qt_new_QString1 (arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_new_QString2 (IntPtr arg1); - public TQString (TQString arg1) : this (QNull.Instance) + public TTQString (TTQString arg1) : this (TQNull.Instance) { rawObject = qt_new_QString2 (arg1.RawObject); } // TODO: Verify that this works. We have weak support for - // QByteArray + // TQByteArray [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_new_QString3 (IntPtr arg1); - public TQString (TQByteArray arg1) : this (QNull.Instance) + public TTQString (TTQByteArray arg1) : this (TQNull.Instance) { rawObject = qt_new_QString3 (arg1.RawObject); } // TODO: This signature is wrong. The C++ version is - // takes a pointer to a sequence of QChars, not a single - // QChar + // takes a pointer to a sequence of TQChars, not a single + // TQChar [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_new_QString4 (IntPtr unicode, uint length); - public TQString (TQChar unicode, uint length) : this (QNull.Instance) + public TTQString (TTQChar unicode, uint length) : this (TQNull.Instance) { rawObject = qt_new_QString4 (unicode.RawObject, length); @@ -91,25 +91,25 @@ namespace Qt { [MarshalAs(UnmanagedType.LPWStr)] string s, uint len); - public TQString( string s ): this( QNull.Instance ) + public TTQString( string s ): this( TQNull.Instance ) { rawObject = qt_new_QString (); rawObject = qt_QString_setUnicodeCodes( rawObject, s, (uint) s.Length ); } - internal TQString (IntPtr ptr) : this (QNull.Instance) + internal TTQString (IntPtr ptr) : this (TQNull.Instance) { rawObject = ptr; } - internal TQString (QNull dummy) : base (QNull.Instance) {} + internal TTQString (TQNull dummy) : base (TQNull.Instance) {} [DllImport("libqtc")] private static extern void qt_del_QString (IntPtr str); - ~TQString () + ~TTQString () { qt_del_QString (rawObject); } @@ -127,7 +127,7 @@ namespace Qt { } } - public static implicit operator string ( TQString s ) + public static implicit operator string ( TTQString s ) { int length = (int) s.Length(); char[] t = new char[length]; @@ -138,9 +138,9 @@ namespace Qt { return new String(t); } - public static implicit operator TQString ( string s ) + public static implicit operator TTQString ( string s ) { - return new TQString(s); + return new TTQString(s); } public override string ToString () @@ -148,9 +148,9 @@ namespace Qt { return (string) this; } - public static TQString operator + ( TQString a, TQString b ) + public static TTQString operator + ( TTQString a, TTQString b ) { - TQString result = new TQString (qt_new_QString2( a.rawObject )); + TTQString result = new TTQString (qt_new_QString2( a.rawObject )); result.rawObject = qt_QString_append2( result.rawObject, b.rawObject ); return result; @@ -188,92 +188,92 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_fill (IntPtr raw, IntPtr c, int len); - public TQString Fill (TQChar c, int len) + public TTQString Fill (TTQChar c, int len) { - return new TQString (qt_QString_fill (rawObject, c.RawObject, len)); + return new TTQString (qt_QString_fill (rawObject, c.RawObject, len)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_arg (IntPtr raw, long a, int fieldwidth, int Q_base); - public TQString Arg (long a, int fieldwidth, int Q_base) + public TTQString Arg (long a, int fieldwidth, int Q_base) { - return new TQString (qt_QString_arg (rawObject, a, fieldwidth, Q_base)); + return new TTQString (qt_QString_arg (rawObject, a, fieldwidth, Q_base)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_arg1 (IntPtr raw, ulong a, int fieldwidth, int Q_base); - public TQString Arg (ulong a, int fieldwidth, int Q_base) + public TTQString Arg (ulong a, int fieldwidth, int Q_base) { - return new TQString (qt_QString_arg1 (rawObject, a, fieldwidth, Q_base)); + return new TTQString (qt_QString_arg1 (rawObject, a, fieldwidth, Q_base)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_arg2 (IntPtr raw, int a, int fieldwidth, int Q_base); - public TQString Arg (int a, int fieldwidth, int Q_base) + public TTQString Arg (int a, int fieldwidth, int Q_base) { - return new TQString (qt_QString_arg2 (rawObject, a, fieldwidth, Q_base)); + return new TTQString (qt_QString_arg2 (rawObject, a, fieldwidth, Q_base)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_arg3 (IntPtr raw, uint a, int fieldwidth, int Q_base); - public TQString Arg (uint a, int fieldwidth, int Q_base) + public TTQString Arg (uint a, int fieldwidth, int Q_base) { - return new TQString (qt_QString_arg3 (rawObject, a, fieldwidth, Q_base)); + return new TTQString (qt_QString_arg3 (rawObject, a, fieldwidth, Q_base)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_arg4 (IntPtr raw, short a, int fieldwidth, int Q_base); - public TQString Arg (short a, int fieldwidth, int Q_base) + public TTQString Arg (short a, int fieldwidth, int Q_base) { - return new TQString (qt_QString_arg4 (rawObject, a, fieldwidth, Q_base)); + return new TTQString (qt_QString_arg4 (rawObject, a, fieldwidth, Q_base)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_arg5 (IntPtr raw, ushort a, int fieldwidth, int Q_base); - public TQString Arg (ushort a, int fieldwidth, int Q_base) + public TTQString Arg (ushort a, int fieldwidth, int Q_base) { - return new TQString (qt_QString_arg5 (rawObject, a, fieldwidth, Q_base)); + return new TTQString (qt_QString_arg5 (rawObject, a, fieldwidth, Q_base)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_arg6 (IntPtr raw, char a, int fieldwidth); - public TQString Arg (char a, int fieldwidth) + public TTQString Arg (char a, int fieldwidth) { - return new TQString (qt_QString_arg6 (rawObject, a, fieldwidth)); + return new TTQString (qt_QString_arg6 (rawObject, a, fieldwidth)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_arg7 (IntPtr raw, IntPtr a, int fieldwidth); - public TQString Arg (TQChar a, int fieldwidth) + public TTQString Arg (TTQChar a, int fieldwidth) { - return new TQString (qt_QString_arg7 (rawObject, a.RawObject, fieldwidth)); + return new TTQString (qt_QString_arg7 (rawObject, a.RawObject, fieldwidth)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_arg8 (IntPtr raw, IntPtr a, int fieldwidth); - public TQString Arg (TQString a, int fieldwidth) + public TTQString Arg (TTQString a, int fieldwidth) { - return new TQString (qt_QString_arg8 (rawObject, a.RawObject, fieldwidth)); + return new TTQString (qt_QString_arg8 (rawObject, a.RawObject, fieldwidth)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_arg9 (IntPtr raw, double a, int fieldwidth, char fmt, int prec); - public TQString Arg (double a, int fieldwidth, char fmt, int prec) + public TTQString Arg (double a, int fieldwidth, char fmt, int prec) { - return new TQString (qt_QString_arg9 (rawObject, a, fieldwidth, fmt, prec)); + return new TTQString (qt_QString_arg9 (rawObject, a, fieldwidth, fmt, prec)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QString_find (IntPtr raw, IntPtr c, int index, bool cs); - public int Find (TQChar c, int index, bool cs) + public int Find (TTQChar c, int index, bool cs) { return qt_QString_find (rawObject, c.RawObject, index, cs); } @@ -287,14 +287,14 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QString_find2 (IntPtr raw, IntPtr str, int index, bool cs); - public int Find (TQString str, int index, bool cs) + public int Find (TTQString str, int index, bool cs) { return qt_QString_find2 (rawObject, str.RawObject, index, cs); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QString_find3 (IntPtr raw, IntPtr arg1, int index); - public int Find (TQRegExp arg1, int index) + public int Find (TTQRegExp arg1, int index) { return qt_QString_find3 (rawObject, arg1.RawObject, index); } @@ -308,7 +308,7 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QString_findRev (IntPtr raw, IntPtr c, int index, bool cs); - public int FindRev (TQChar c, int index, bool cs) + public int FindRev (TTQChar c, int index, bool cs) { return qt_QString_findRev (rawObject, c.RawObject, index, cs); } @@ -322,14 +322,14 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QString_findRev2 (IntPtr raw, IntPtr str, int index, bool cs); - public int FindRev (TQString str, int index, bool cs) + public int FindRev (TTQString str, int index, bool cs) { return qt_QString_findRev2 (rawObject, str.RawObject, index, cs); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QString_findRev3 (IntPtr raw, IntPtr arg1, int index); - public int FindRev (TQRegExp arg1, int index) + public int FindRev (TTQRegExp arg1, int index) { return qt_QString_findRev3 (rawObject, arg1.RawObject, index); } @@ -343,7 +343,7 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QString_contains (IntPtr raw, IntPtr c, bool cs); - public int Contains (TQChar c, bool cs) + public int Contains (TTQChar c, bool cs) { return qt_QString_contains (rawObject, c.RawObject, cs); } @@ -364,213 +364,213 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QString_contains3 (IntPtr raw, IntPtr str, bool cs); - public int Contains (TQString str, bool cs) + public int Contains (TTQString str, bool cs) { return qt_QString_contains3 (rawObject, str.RawObject, cs); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QString_contains4 (IntPtr raw, IntPtr arg1); - public int Contains (TQRegExp arg1) + public int Contains (TTQRegExp arg1) { return qt_QString_contains4 (rawObject, arg1.RawObject); } - // TODO: This is wrong. sep should be a TQChar* in C++ terms + // TODO: This is wrong. sep should be a TTQChar* in C++ terms [DllImport("libqtc", CharSet=CharSet.Ansi)] - private static extern IntPtr qt_QString_section (IntPtr raw, IntPtr sep, int start, int end, TQString.SectionFlags SectionFlags); - public TQString Section (TQChar sep, int start, int end, TQString.SectionFlags SectionFlags) + private static extern IntPtr qt_QString_section (IntPtr raw, IntPtr sep, int start, int end, TTQString.SectionFlags SectionFlags); + public TTQString Section (TTQChar sep, int start, int end, TTQString.SectionFlags SectionFlags) { - return new TQString (qt_QString_section (rawObject, sep.RawObject, start, end, SectionFlags)); + return new TTQString (qt_QString_section (rawObject, sep.RawObject, start, end, SectionFlags)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] - private static extern IntPtr qt_QString_section1 (IntPtr raw, char sep, int start, int end, TQString.SectionFlags SectionFlags); - public TQString Section (char sep, int start, int end, TQString.SectionFlags SectionFlags) + private static extern IntPtr qt_QString_section1 (IntPtr raw, char sep, int start, int end, TTQString.SectionFlags SectionFlags); + public TTQString Section (char sep, int start, int end, TTQString.SectionFlags SectionFlags) { - return new TQString (qt_QString_section1 (rawObject, sep, start, end, SectionFlags)); + return new TTQString (qt_QString_section1 (rawObject, sep, start, end, SectionFlags)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] - private static extern IntPtr qt_QString_section2 (IntPtr raw, string in_sep, int start, int end, TQString.SectionFlags SectionFlags); - public TQString Section (string in_sep, int start, int end, TQString.SectionFlags SectionFlags) + private static extern IntPtr qt_QString_section2 (IntPtr raw, string in_sep, int start, int end, TTQString.SectionFlags SectionFlags); + public TTQString Section (string in_sep, int start, int end, TTQString.SectionFlags SectionFlags) { - return new TQString (qt_QString_section2 (rawObject, in_sep, start, end, SectionFlags)); + return new TTQString (qt_QString_section2 (rawObject, in_sep, start, end, SectionFlags)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] - private static extern IntPtr qt_QString_section3 (IntPtr raw, IntPtr in_sep, int start, int end, TQString.SectionFlags SectionFlags); - public TQString Section (TQString in_sep, int start, int end, TQString.SectionFlags SectionFlags) + private static extern IntPtr qt_QString_section3 (IntPtr raw, IntPtr in_sep, int start, int end, TTQString.SectionFlags SectionFlags); + public TTQString Section (TTQString in_sep, int start, int end, TTQString.SectionFlags SectionFlags) { - return new TQString (qt_QString_section3 (rawObject, in_sep.RawObject, start, end, SectionFlags)); + return new TTQString (qt_QString_section3 (rawObject, in_sep.RawObject, start, end, SectionFlags)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] - private static extern IntPtr qt_QString_section4 (IntPtr raw, IntPtr reg, int start, int end, TQString.SectionFlags SectionFlags); - public TQString Section (TQRegExp reg, int start, int end, TQString.SectionFlags SectionFlags) + private static extern IntPtr qt_QString_section4 (IntPtr raw, IntPtr reg, int start, int end, TTQString.SectionFlags SectionFlags); + public TTQString Section (TTQRegExp reg, int start, int end, TTQString.SectionFlags SectionFlags) { - return new TQString (qt_QString_section4 (rawObject, reg.RawObject, start, end, SectionFlags)); + return new TTQString (qt_QString_section4 (rawObject, reg.RawObject, start, end, SectionFlags)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_left (IntPtr raw, uint len); - public TQString Left (uint len) + public TTQString Left (uint len) { - return new TQString (qt_QString_left (rawObject, len)); + return new TTQString (qt_QString_left (rawObject, len)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_right (IntPtr raw, uint len); - public TQString Right (uint len) + public TTQString Right (uint len) { - return new TQString (qt_QString_right (rawObject, len)); + return new TTQString (qt_QString_right (rawObject, len)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_mid (IntPtr raw, uint index, uint len); - public TQString Mid (uint index, uint len) + public TTQString Mid (uint index, uint len) { - return new TQString (qt_QString_mid (rawObject, index, len)); + return new TTQString (qt_QString_mid (rawObject, index, len)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_leftJustify (IntPtr raw, uint width, IntPtr fill, bool trunc); - public TQString LeftJustify (uint width, TQChar fill, bool trunc) + public TTQString LeftJustify (uint width, TTQChar fill, bool trunc) { - return new TQString (qt_QString_leftJustify (rawObject, width, fill.RawObject, trunc)); + return new TTQString (qt_QString_leftJustify (rawObject, width, fill.RawObject, trunc)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_rightJustify (IntPtr raw, uint width, IntPtr fill, bool trunc); - public TQString RightJustify (uint width, TQChar fill, bool trunc) + public TTQString RightJustify (uint width, TTQChar fill, bool trunc) { - return new TQString (qt_QString_rightJustify (rawObject, width, fill.RawObject, trunc)); + return new TTQString (qt_QString_rightJustify (rawObject, width, fill.RawObject, trunc)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_lower (IntPtr raw); - public TQString Lower () + public TTQString Lower () { - return new TQString (qt_QString_lower (rawObject)); + return new TTQString (qt_QString_lower (rawObject)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_upper (IntPtr raw); - public TQString Upper () + public TTQString Upper () { - return new TQString (qt_QString_upper (rawObject)); + return new TTQString (qt_QString_upper (rawObject)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_stripWhiteSpace (IntPtr raw); - public TQString StripWhiteSpace () + public TTQString StripWhiteSpace () { - return new TQString (qt_QString_stripWhiteSpace (rawObject)); + return new TTQString (qt_QString_stripWhiteSpace (rawObject)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_simplifyWhiteSpace (IntPtr raw); - public TQString SimplifyWhiteSpace () + public TTQString SimplifyWhiteSpace () { - return new TQString (qt_QString_simplifyWhiteSpace (rawObject)); + return new TTQString (qt_QString_simplifyWhiteSpace (rawObject)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_insert (IntPtr raw, uint index, IntPtr arg1); - public TQString Insert (uint index, TQString arg1) + public TTQString Insert (uint index, TTQString arg1) { - return new TQString (qt_QString_insert (rawObject, index, arg1.RawObject)); + return new TTQString (qt_QString_insert (rawObject, index, arg1.RawObject)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_insert1 (IntPtr raw, uint index, IntPtr arg1, uint len); - public TQString Insert (uint index, TQChar arg1, uint len) + public TTQString Insert (uint index, TTQChar arg1, uint len) { - return new TQString (qt_QString_insert1 (rawObject, index, arg1.RawObject, len)); + return new TTQString (qt_QString_insert1 (rawObject, index, arg1.RawObject, len)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_insert2 (IntPtr raw, uint index, IntPtr arg1); - public TQString Insert (uint index, TQChar arg1) + public TTQString Insert (uint index, TTQChar arg1) { - return new TQString (qt_QString_insert2 (rawObject, index, arg1.RawObject)); + return new TTQString (qt_QString_insert2 (rawObject, index, arg1.RawObject)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_insert3 (IntPtr raw, uint index, char c); - public TQString Insert (uint index, char c) + public TTQString Insert (uint index, char c) { - return new TQString (qt_QString_insert3 (rawObject, index, c)); + return new TTQString (qt_QString_insert3 (rawObject, index, c)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_append (IntPtr raw, char arg1); - public TQString Append (char arg1) + public TTQString Append (char arg1) { - return new TQString (qt_QString_append (rawObject, arg1)); + return new TTQString (qt_QString_append (rawObject, arg1)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_append1 (IntPtr raw, IntPtr arg1); - public TQString Append (TQChar arg1) + public TTQString Append (TTQChar arg1) { - return new TQString (qt_QString_append1 (rawObject, arg1.RawObject)); + return new TTQString (qt_QString_append1 (rawObject, arg1.RawObject)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_append2 (IntPtr raw, IntPtr arg1); - public TQString Append (TQString arg1) + public TTQString Append (TTQString arg1) { - return new TQString (qt_QString_append2 (rawObject, arg1.RawObject)); + return new TTQString (qt_QString_append2 (rawObject, arg1.RawObject)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_prepend (IntPtr raw, char arg1); - public TQString Prepend (char arg1) + public TTQString Prepend (char arg1) { - return new TQString (qt_QString_prepend (rawObject, arg1)); + return new TTQString (qt_QString_prepend (rawObject, arg1)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_prepend1 (IntPtr raw, IntPtr arg1); - public TQString Prepend (TQChar arg1) + public TTQString Prepend (TTQChar arg1) { - return new TQString (qt_QString_prepend1 (rawObject, arg1.RawObject)); + return new TTQString (qt_QString_prepend1 (rawObject, arg1.RawObject)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_prepend2 (IntPtr raw, IntPtr arg1); - public TQString Prepend (TQString arg1) + public TTQString Prepend (TTQString arg1) { - return new TQString (qt_QString_prepend2 (rawObject, arg1.RawObject)); + return new TTQString (qt_QString_prepend2 (rawObject, arg1.RawObject)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_remove (IntPtr raw, uint index, uint len); - public TQString Remove (uint index, uint len) + public TTQString Remove (uint index, uint len) { - return new TQString (qt_QString_remove (rawObject, index, len)); + return new TTQString (qt_QString_remove (rawObject, index, len)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_replace (IntPtr raw, uint index, uint len, IntPtr arg1); - public TQString Replace (uint index, uint len, TQString arg1) + public TTQString Replace (uint index, uint len, TTQString arg1) { - return new TQString (qt_QString_replace (rawObject, index, len, arg1.RawObject)); + return new TTQString (qt_QString_replace (rawObject, index, len, arg1.RawObject)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_replace1 (IntPtr raw, uint index, uint len, IntPtr arg1, uint clen); - public TQString Replace (uint index, uint len, TQChar arg1, uint clen) + public TTQString Replace (uint index, uint len, TTQChar arg1, uint clen) { - return new TQString (qt_QString_replace1 (rawObject, index, len, arg1.RawObject, clen)); + return new TTQString (qt_QString_replace1 (rawObject, index, len, arg1.RawObject, clen)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_replace2 (IntPtr raw, IntPtr arg1, IntPtr arg2); - public TQString Replace (TQRegExp arg1, TQString arg2) + public TTQString Replace (TTQRegExp arg1, TTQString arg2) { - return new TQString (qt_QString_replace2 (rawObject, arg1.RawObject, arg2.RawObject)); + return new TTQString (qt_QString_replace2 (rawObject, arg1.RawObject, arg2.RawObject)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] @@ -631,95 +631,95 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_setNum (IntPtr raw, short arg1, int Q_base); - public TQString SetNum (short arg1, int Q_base) + public TTQString SetNum (short arg1, int Q_base) { - return new TQString (qt_QString_setNum (rawObject, arg1, Q_base)); + return new TTQString (qt_QString_setNum (rawObject, arg1, Q_base)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_setNum1 (IntPtr raw, ushort arg1, int Q_base); - public TQString SetNum (ushort arg1, int Q_base) + public TTQString SetNum (ushort arg1, int Q_base) { - return new TQString (qt_QString_setNum1 (rawObject, arg1, Q_base)); + return new TTQString (qt_QString_setNum1 (rawObject, arg1, Q_base)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_setNum2 (IntPtr raw, int arg1, int Q_base); - public TQString SetNum (int arg1, int Q_base) + public TTQString SetNum (int arg1, int Q_base) { - return new TQString (qt_QString_setNum2 (rawObject, arg1, Q_base)); + return new TTQString (qt_QString_setNum2 (rawObject, arg1, Q_base)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_setNum3 (IntPtr raw, uint arg1, int Q_base); - public TQString SetNum (uint arg1, int Q_base) + public TTQString SetNum (uint arg1, int Q_base) { - return new TQString (qt_QString_setNum3 (rawObject, arg1, Q_base)); + return new TTQString (qt_QString_setNum3 (rawObject, arg1, Q_base)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_setNum4 (IntPtr raw, long arg1, int Q_base); - public TQString SetNum (long arg1, int Q_base) + public TTQString SetNum (long arg1, int Q_base) { - return new TQString (qt_QString_setNum4 (rawObject, arg1, Q_base)); + return new TTQString (qt_QString_setNum4 (rawObject, arg1, Q_base)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_setNum5 (IntPtr raw, ulong arg1, int Q_base); - public TQString SetNum (ulong arg1, int Q_base) + public TTQString SetNum (ulong arg1, int Q_base) { - return new TQString (qt_QString_setNum5 (rawObject, arg1, Q_base)); + return new TTQString (qt_QString_setNum5 (rawObject, arg1, Q_base)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_setNum6 (IntPtr raw, float arg1, char f, int prec); - public TQString SetNum (float arg1, char f, int prec) + public TTQString SetNum (float arg1, char f, int prec) { - return new TQString (qt_QString_setNum6 (rawObject, arg1, f, prec)); + return new TTQString (qt_QString_setNum6 (rawObject, arg1, f, prec)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_setNum7 (IntPtr raw, double arg1, char f, int prec); - public TQString SetNum (double arg1, char f, int prec) + public TTQString SetNum (double arg1, char f, int prec) { - return new TQString (qt_QString_setNum7 (rawObject, arg1, f, prec)); + return new TTQString (qt_QString_setNum7 (rawObject, arg1, f, prec)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QString_setExpand (IntPtr raw, uint index, IntPtr c); - public void SetExpand (uint index, TQChar c) + public void SetExpand (uint index, TTQChar c) { qt_QString_setExpand (rawObject, index, c.RawObject); } - // TODO: The TQChar functions need to get fixed + // TODO: The TTQChar functions need to get fixed [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_at (IntPtr raw, uint i); - public TQChar At (uint i) + public TTQChar At (uint i) { - return LookupObject (qt_QString_at (rawObject, i), typeof (TQChar)) as TQChar; + return LookupObject (qt_QString_at (rawObject, i), typeof (TTQChar)) as TTQChar; } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_constref (IntPtr raw, uint i); - public TQChar Constref (uint i) + public TTQChar Constref (uint i) { - return LookupObject (qt_QString_constref (rawObject, i), typeof (TQChar)) as TQChar; + return LookupObject (qt_QString_constref (rawObject, i), typeof (TTQChar)) as TTQChar; } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_ref (IntPtr raw, uint i); - public TQChar Q_ref (uint i) + public TTQChar Q_ref (uint i) { - return LookupObject (qt_QString_ref (rawObject, i), typeof (TQChar)) as TQChar; + return LookupObject (qt_QString_ref (rawObject, i), typeof (TTQChar)) as TTQChar; } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_unicode (IntPtr raw); - public TQChar Unicode () + public TTQChar Unicode () { - return LookupObject (qt_QString_unicode (rawObject), typeof (TQChar)) as TQChar; + return LookupObject (qt_QString_unicode (rawObject), typeof (TTQChar)) as TTQChar; } [DllImport("libqtc", CharSet=CharSet.Ansi)] @@ -738,42 +738,42 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_utf8 (IntPtr raw); - public TQCString Utf8 () + public TTQCString Utf8 () { - return LookupObject (qt_QString_utf8 (rawObject), typeof (TQCString)) as TQCString; + return LookupObject (qt_QString_utf8 (rawObject), typeof (TTQCString)) as TTQCString; } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_local8Bit (IntPtr raw); - public TQCString Local8Bit () + public TTQCString Local8Bit () { - return LookupObject (qt_QString_local8Bit (rawObject), typeof (TQCString)) as TQCString; + return LookupObject (qt_QString_local8Bit (rawObject), typeof (TTQCString)) as TTQCString; } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_setUnicode (IntPtr raw, IntPtr unicode, uint len); - public TQString SetUnicode (TQChar unicode, uint len) + public TTQString SetUnicode (TTQChar unicode, uint len) { - return new TQString (qt_QString_setUnicode (rawObject, unicode.RawObject, len)); + return new TTQString (qt_QString_setUnicode (rawObject, unicode.RawObject, len)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_setLatin1 (IntPtr raw, string arg1, int len); - public TQString SetLatin1 (string arg1, int len) + public TTQString SetLatin1 (string arg1, int len) { - return new TQString (qt_QString_setLatin1 (rawObject, arg1, len)); + return new TTQString (qt_QString_setLatin1 (rawObject, arg1, len)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QString_compare (IntPtr raw, IntPtr s); - public int Compare (TQString s) + public int Compare (TTQString s) { return qt_QString_compare (rawObject, s.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QString_localeAwareCompare (IntPtr raw, IntPtr s); - public int LocaleAwareCompare (TQString s) + public int LocaleAwareCompare (TTQString s) { return qt_QString_localeAwareCompare (rawObject, s.RawObject); } @@ -794,14 +794,14 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern bool qt_QString_startsWith (IntPtr raw, IntPtr arg1); - public bool StartsWith (TQString arg1) + public bool StartsWith (TTQString arg1) { return qt_QString_startsWith (rawObject, arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern bool qt_QString_endsWith (IntPtr raw, IntPtr arg1); - public bool EndsWith (TQString arg1) + public bool EndsWith (TTQString arg1) { return qt_QString_endsWith (rawObject, arg1.RawObject); } @@ -829,175 +829,175 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_number (long arg1, int Q_base); - public static TQString Number (long arg1, int Q_base) + public static TTQString Number (long arg1, int Q_base) { - return new TQString (qt_QString_number (arg1, Q_base)); + return new TTQString (qt_QString_number (arg1, Q_base)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_number1 (ulong arg1, int Q_base); - public static TQString Number (ulong arg1, int Q_base) + public static TTQString Number (ulong arg1, int Q_base) { - return new TQString (qt_QString_number1 (arg1, Q_base)); + return new TTQString (qt_QString_number1 (arg1, Q_base)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_number2 (int arg1, int Q_base); - public static TQString Number (int arg1, int Q_base) + public static TTQString Number (int arg1, int Q_base) { - return new TQString (qt_QString_number2 (arg1, Q_base)); + return new TTQString (qt_QString_number2 (arg1, Q_base)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_number3 (uint arg1, int Q_base); - public static TQString Number (uint arg1, int Q_base) + public static TTQString Number (uint arg1, int Q_base) { - return new TQString (qt_QString_number3 (arg1, Q_base)); + return new TTQString (qt_QString_number3 (arg1, Q_base)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_number4 (double arg1, char f, int prec); - public static TQString Number (double arg1, char f, int prec) + public static TTQString Number (double arg1, char f, int prec) { - return new TQString (qt_QString_number4 (arg1, f, prec)); + return new TTQString (qt_QString_number4 (arg1, f, prec)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QString_fromLatin1 (string arg1, int len); - public static TQString FromLatin1 (string arg1, int len) + public static TTQString FromLatin1 (string arg1, int len) { - return new TQString (qt_QString_fromLatin1 (arg1, len)); + return new TTQString (qt_QString_fromLatin1 (arg1, len)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] - private static extern IntPtr qt_QString_fromUtf8 (TQString arg1, int len); - public static TQString FromUtf8 (string arg1, int len) + private static extern IntPtr qt_QString_fromUtf8 (TTQString arg1, int len); + public static TTQString FromUtf8 (string arg1, int len) { - return new TQString (qt_QString_fromUtf8 (arg1, len)); + return new TTQString (qt_QString_fromUtf8 (arg1, len)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] - private static extern IntPtr qt_QString_fromLocal8Bit (TQString arg1, int len); - public static TQString FromLocal8Bit (string arg1, int len) + private static extern IntPtr qt_QString_fromLocal8Bit (TTQString arg1, int len); + public static TTQString FromLocal8Bit (string arg1, int len) { - return new TQString (qt_QString_fromLocal8Bit (arg1, len)); + return new TTQString (qt_QString_fromLocal8Bit (arg1, len)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QString_compare1 (IntPtr s1, IntPtr s2); - public static int Compare (TQString s1, TQString s2) + public static int Compare (TTQString s1, TTQString s2) { return qt_QString_compare1 (s1.RawObject, s2.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QString_localeAwareCompare1 (IntPtr s1, IntPtr s2); - public static int LocaleAwareCompare (TQString s1, TQString s2) + public static int LocaleAwareCompare (TTQString s1, TTQString s2) { return qt_QString_localeAwareCompare1 (s1.RawObject, s2.RawObject); } - public TQString Fill (TQChar c) + public TTQString Fill (TTQChar c) { return Fill(c, (int) -1); } - public TQString Arg (long a) + public TTQString Arg (long a) { return Arg(a, (int) 0); } - public TQString Arg (long a, int fieldwidth) + public TTQString Arg (long a, int fieldwidth) { return Arg(a, fieldwidth, (int) 10); } - public TQString Arg (ulong a) + public TTQString Arg (ulong a) { return Arg(a, (int) 0); } - public TQString Arg (ulong a, int fieldwidth) + public TTQString Arg (ulong a, int fieldwidth) { return Arg(a, fieldwidth, (int) 10); } - public TQString Arg (int a) + public TTQString Arg (int a) { return Arg(a, (int) 0); } - public TQString Arg (int a, int fieldwidth) + public TTQString Arg (int a, int fieldwidth) { return Arg(a, fieldwidth, (int) 10); } - public TQString Arg (uint a) + public TTQString Arg (uint a) { return Arg(a, (int) 0); } - public TQString Arg (uint a, int fieldwidth) + public TTQString Arg (uint a, int fieldwidth) { return Arg(a, fieldwidth, (int) 10); } - public TQString Arg (short a) + public TTQString Arg (short a) { return Arg(a, (int) 0); } - public TQString Arg (short a, int fieldwidth) + public TTQString Arg (short a, int fieldwidth) { return Arg(a, fieldwidth, (int) 10); } - public TQString Arg (ushort a) + public TTQString Arg (ushort a) { return Arg(a, (int) 0); } - public TQString Arg (ushort a, int fieldwidth) + public TTQString Arg (ushort a, int fieldwidth) { return Arg(a, fieldwidth, (int) 10); } - public TQString Arg (char a) + public TTQString Arg (char a) { return Arg(a, (int) 0); } - public TQString Arg (TQChar a) + public TTQString Arg (TTQChar a) { return Arg(a, (int) 0); } - public TQString Arg (TQString a) + public TTQString Arg (TTQString a) { return Arg(a, (int) 0); } - public TQString Arg (double a) + public TTQString Arg (double a) { return Arg(a, (int) 0); } - public TQString Arg (double a, int fieldwidth) + public TTQString Arg (double a, int fieldwidth) { return Arg(a, fieldwidth, (char) 'g'); } - public TQString Arg (double a, int fieldwidth, char fmt) + public TTQString Arg (double a, int fieldwidth, char fmt) { return Arg(a, fieldwidth, fmt, (int) -1); } - public int Find (TQChar c) + public int Find (TTQChar c) { return Find(c, (int) 0); } - public int Find (TQChar c, int index) + public int Find (TTQChar c, int index) { return Find(c, index, true); } @@ -1012,17 +1012,17 @@ namespace Qt { return Find(c, index, true); } - public int Find (TQString str) + public int Find (TTQString str) { return Find(str, (int) 0); } - public int Find (TQString str, int index) + public int Find (TTQString str, int index) { return Find(str, index, true); } - public int Find (TQRegExp arg1) + public int Find (TTQRegExp arg1) { return Find(arg1, (int) 0); } @@ -1032,12 +1032,12 @@ namespace Qt { return Find(str, (int) 0); } - public int FindRev (TQChar c) + public int FindRev (TTQChar c) { return FindRev(c, (int) -1); } - public int FindRev (TQChar c, int index) + public int FindRev (TTQChar c, int index) { return FindRev(c, index, true); } @@ -1052,17 +1052,17 @@ namespace Qt { return FindRev(c, index, true); } - public int FindRev (TQString str) + public int FindRev (TTQString str) { return FindRev(str, (int) -1); } - public int FindRev (TQString str, int index) + public int FindRev (TTQString str, int index) { return FindRev(str, index, true); } - public int FindRev (TQRegExp arg1) + public int FindRev (TTQRegExp arg1) { return FindRev(arg1, (int) -1); } @@ -1072,7 +1072,7 @@ namespace Qt { return FindRev(str, (int) -1); } - public int Contains (TQChar c) + public int Contains (TTQChar c) { return Contains(c, true); } @@ -1082,7 +1082,7 @@ namespace Qt { return Contains(c, true); } - public int Contains (TQString str) + public int Contains (TTQString str) { return Contains(str, true); } @@ -1092,77 +1092,77 @@ namespace Qt { return Contains(str, true); } - public TQString Section (TQChar sep, int start) + public TTQString Section (TTQChar sep, int start) { return Section(sep, start, (int) 1); } - public TQString Section (TQChar sep, int start, int end) + public TTQString Section (TTQChar sep, int start, int end) { - return Section(sep, start, end, TQString.SectionFlags.SectionDefault); + return Section(sep, start, end, TTQString.SectionFlags.SectionDefault); } - public TQString Section (char sep, int start) + public TTQString Section (char sep, int start) { return Section(sep, start, (int) 1); } - public TQString Section (char sep, int start, int end) + public TTQString Section (char sep, int start, int end) { - return Section(sep, start, end, TQString.SectionFlags.SectionDefault); + return Section(sep, start, end, TTQString.SectionFlags.SectionDefault); } - public TQString Section (TQString in_sep, int start) + public TTQString Section (TTQString in_sep, int start) { return Section(in_sep, start, (int) 1); } - public TQString Section (TQString in_sep, int start, int end) + public TTQString Section (TTQString in_sep, int start, int end) { - return Section(in_sep, start, end, TQString.SectionFlags.SectionDefault); + return Section(in_sep, start, end, TTQString.SectionFlags.SectionDefault); } - public TQString Section (string in_sep, int start) + public TTQString Section (string in_sep, int start) { return Section(in_sep, start, (int) 1); } - public TQString Section (string in_sep, int start, int end) + public TTQString Section (string in_sep, int start, int end) { - return Section(in_sep, start, end, TQString.SectionFlags.SectionDefault); + return Section(in_sep, start, end, TTQString.SectionFlags.SectionDefault); } - public TQString Section (TQRegExp reg, int start) + public TTQString Section (TTQRegExp reg, int start) { return Section(reg, start, (int) 1); } - public TQString Section (TQRegExp reg, int start, int end) + public TTQString Section (TTQRegExp reg, int start, int end) { - return Section(reg, start, end, TQString.SectionFlags.SectionDefault); + return Section(reg, start, end, TTQString.SectionFlags.SectionDefault); } - public TQString Mid (uint index) + public TTQString Mid (uint index) { return Mid(index, (uint) 1); } - public TQString LeftJustify (uint width) + public TTQString LeftJustify (uint width) { - return LeftJustify(width, new TQChar ()); + return LeftJustify(width, new TTQChar ()); } - public TQString LeftJustify (uint width, TQChar fill) + public TTQString LeftJustify (uint width, TTQChar fill) { return LeftJustify(width, fill, false); } - public TQString RightJustify (uint width) + public TTQString RightJustify (uint width) { - return RightJustify(width, new TQChar ()); + return RightJustify(width, new TTQChar ()); } - public TQString RightJustify (uint width, TQChar fill) + public TTQString RightJustify (uint width, TTQChar fill) { return RightJustify(width, fill, false); } @@ -1237,102 +1237,102 @@ namespace Qt { return ToDouble(false); } - public TQString SetNum (short arg1) + public TTQString SetNum (short arg1) { return SetNum(arg1, (int) 10); } - public TQString SetNum (ushort arg1) + public TTQString SetNum (ushort arg1) { return SetNum(arg1, (int) 10); } - public TQString SetNum (int arg1) + public TTQString SetNum (int arg1) { return SetNum(arg1, (int) 10); } - public TQString SetNum (uint arg1) + public TTQString SetNum (uint arg1) { return SetNum(arg1, (int) 10); } - public TQString SetNum (long arg1) + public TTQString SetNum (long arg1) { return SetNum(arg1, (int) 10); } - public TQString SetNum (ulong arg1) + public TTQString SetNum (ulong arg1) { return SetNum(arg1, (int) 10); } - public TQString SetNum (float arg1) + public TTQString SetNum (float arg1) { return SetNum(arg1, (char) 'g'); } - public TQString SetNum (float arg1, char f) + public TTQString SetNum (float arg1, char f) { return SetNum(arg1, f, (int) 6); } - public TQString SetNum (double arg1) + public TTQString SetNum (double arg1) { return SetNum(arg1, (char) 'g'); } - public TQString SetNum (double arg1, char f) + public TTQString SetNum (double arg1, char f) { return SetNum(arg1, f, (int) 6); } - public TQString SetLatin1 (TQString arg1) + public TTQString SetLatin1 (TTQString arg1) { return SetLatin1(arg1, (int) -1); } - public static TQString Number (long arg1) + public static TTQString Number (long arg1) { return Number(arg1, (int) 10); } - public static TQString Number (ulong arg1) + public static TTQString Number (ulong arg1) { return Number(arg1, (int) 10); } - public static TQString Number (int arg1) + public static TTQString Number (int arg1) { return Number(arg1, (int) 10); } - public static TQString Number (uint arg1) + public static TTQString Number (uint arg1) { return Number(arg1, (int) 10); } - public static TQString Number (double arg1) + public static TTQString Number (double arg1) { return Number(arg1, (char) 'g'); } - public static TQString Number (double arg1, char f) + public static TTQString Number (double arg1, char f) { return Number(arg1, f, (int) 6); } - public static TQString FromLatin1 (TQString arg1) + public static TTQString FromLatin1 (TTQString arg1) { return FromLatin1(arg1, (int) -1); } - public static TQString FromUtf8 (TQString arg1) + public static TTQString FromUtf8 (TTQString arg1) { return FromUtf8(arg1, (int) -1); } - public static TQString FromLocal8Bit (TQString arg1) + public static TTQString FromLocal8Bit (TTQString arg1) { return FromLocal8Bit(arg1, (int) -1); } diff --git a/qtsharp/src/bindings/static/QStyle.cs b/qtsharp/src/bindings/static/QStyle.cs index 1068433b..8db46fd9 100644 --- a/qtsharp/src/bindings/static/QStyle.cs +++ b/qtsharp/src/bindings/static/QStyle.cs @@ -1,4 +1,4 @@ -// TQStyle.cs - A Qt to C# binding. +// TTQStyle.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // @@ -24,7 +24,7 @@ namespace Qt { using System; using System.Runtime.InteropServices; - public class TQStyle : TQObject, IDisposable { + public class TTQStyle : TTQObject, IDisposable { public enum PrimitiveElement: long { PE_ButtonCommand = 0, @@ -279,17 +279,17 @@ namespace Qt { SP_CustomBase = 4026531840 } - internal TQStyle () : this (QNull.Instance) {} + internal TTQStyle () : this (TQNull.Instance) {} - internal TQStyle (IntPtr ptr) : this (QNull.Instance) + internal TTQStyle (IntPtr ptr) : this (TQNull.Instance) { rawObject = ptr; RegisterObject(this); } - internal TQStyle (QNull dummy) : base (QNull.Instance) {} + internal TTQStyle (TQNull dummy) : base (TQNull.Instance) {} - ~TQStyle () + ~TTQStyle () { Dispose(false); } @@ -306,142 +306,142 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QStyle_polish (IntPtr raw, IntPtr arg1); - public void polish (TQWidget arg1) + public void polish (TTQWidget arg1) { qt_QStyle_polish (rawObject, arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QStyle_unPolish (IntPtr raw, IntPtr arg1); - public void unPolish (TQWidget arg1) + public void unPolish (TTQWidget arg1) { qt_QStyle_unPolish (rawObject, arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QStyle_polish1 (IntPtr raw, IntPtr arg1); - public void polish (TQApplication arg1) + public void polish (TTQApplication arg1) { qt_QStyle_polish1 (rawObject, arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QStyle_unPolish1 (IntPtr raw, IntPtr arg1); - public void unPolish (TQApplication arg1) + public void unPolish (TTQApplication arg1) { qt_QStyle_unPolish1 (rawObject, arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QStyle_polish2 (IntPtr raw, IntPtr arg1); - public void polish (TQPalette arg1) + public void polish (TTQPalette arg1) { qt_QStyle_polish2 (rawObject, arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QStyle_polishPopupMenu (IntPtr raw, IntPtr arg1); - public void polishPopupMenu (TQPopupMenu arg1) + public void polishPopupMenu (TTQPopupMenu arg1) { qt_QStyle_polishPopupMenu (rawObject, arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QStyle_itemRect (IntPtr raw, IntPtr p, IntPtr r, int flags, bool enabled, IntPtr pixmap, IntPtr text, int len); - public TQRect itemRect (TQPainter p, TQRect r, int flags, bool enabled, TQPixmap pixmap, string text, int len) + public TTQRect itemRect (TTQPainter p, TTQRect r, int flags, bool enabled, TTQPixmap pixmap, string text, int len) { - return (TQRect)LookupObject (qt_QStyle_itemRect (rawObject, p.RawObject, r.RawObject, flags, enabled, pixmap.RawObject, new TQString (text).RawObject, len), typeof(TQRect)); + return (TTQRect)LookupObject (qt_QStyle_itemRect (rawObject, p.RawObject, r.RawObject, flags, enabled, pixmap.RawObject, new TTQString (text).RawObject, len), typeof(TTQRect)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QStyle_drawItem (IntPtr raw, IntPtr p, IntPtr r, int flags, IntPtr g, bool enabled, IntPtr pixmap, IntPtr text, int len, IntPtr penColor); - public void drawItem (TQPainter p, TQRect r, int flags, TQColorGroup g, bool enabled, TQPixmap pixmap, string text, int len, TQColor penColor) + public void drawItem (TTQPainter p, TTQRect r, int flags, TTQColorGroup g, bool enabled, TTQPixmap pixmap, string text, int len, TTQColor penColor) { - qt_QStyle_drawItem (rawObject, p.RawObject, r.RawObject, flags, g.RawObject, enabled, pixmap.RawObject, new TQString (text).RawObject, len, penColor.RawObject); + qt_QStyle_drawItem (rawObject, p.RawObject, r.RawObject, flags, g.RawObject, enabled, pixmap.RawObject, new TTQString (text).RawObject, len, penColor.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] - private static extern void qt_QStyle_drawPrimitive (IntPtr raw, TQStyle.PrimitiveElement pe, IntPtr p, IntPtr r, IntPtr cg, TQStyle.StyleFlags flags, IntPtr arg1); - public void drawPrimitive (TQStyle.PrimitiveElement pe, TQPainter p, TQRect r, TQColorGroup cg, TQStyle.StyleFlags flags, TQStyleOption arg1) + private static extern void qt_QStyle_drawPrimitive (IntPtr raw, TTQStyle.PrimitiveElement pe, IntPtr p, IntPtr r, IntPtr cg, TTQStyle.StyleFlags flags, IntPtr arg1); + public void drawPrimitive (TTQStyle.PrimitiveElement pe, TTQPainter p, TTQRect r, TTQColorGroup cg, TTQStyle.StyleFlags flags, TTQStyleOption arg1) { qt_QStyle_drawPrimitive (rawObject, pe, p.RawObject, r.RawObject, cg.RawObject, flags, arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] - private static extern void qt_QStyle_drawControl (IntPtr raw, TQStyle.ControlElement element, IntPtr p, IntPtr widget, IntPtr r, IntPtr cg, TQStyle.StyleFlags how, IntPtr arg1); - public void drawControl (TQStyle.ControlElement element, TQPainter p, TQWidget widget, TQRect r, TQColorGroup cg, TQStyle.StyleFlags how, TQStyleOption arg1) + private static extern void qt_QStyle_drawControl (IntPtr raw, TTQStyle.ControlElement element, IntPtr p, IntPtr widget, IntPtr r, IntPtr cg, TTQStyle.StyleFlags how, IntPtr arg1); + public void drawControl (TTQStyle.ControlElement element, TTQPainter p, TTQWidget widget, TTQRect r, TTQColorGroup cg, TTQStyle.StyleFlags how, TTQStyleOption arg1) { qt_QStyle_drawControl (rawObject, element, p.RawObject, widget.RawObject, r.RawObject, cg.RawObject, how, arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] - private static extern void qt_QStyle_drawControlMask (IntPtr raw, TQStyle.ControlElement element, IntPtr p, IntPtr widget, IntPtr r, IntPtr arg1); - public void drawControlMask (TQStyle.ControlElement element, TQPainter p, TQWidget widget, TQRect r, TQStyleOption arg1) + private static extern void qt_QStyle_drawControlMask (IntPtr raw, TTQStyle.ControlElement element, IntPtr p, IntPtr widget, IntPtr r, IntPtr arg1); + public void drawControlMask (TTQStyle.ControlElement element, TTQPainter p, TTQWidget widget, TTQRect r, TTQStyleOption arg1) { qt_QStyle_drawControlMask (rawObject, element, p.RawObject, widget.RawObject, r.RawObject, arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] - private static extern IntPtr qt_QStyle_subRect (IntPtr raw, TQStyle.SubRect r, IntPtr widget); - public TQRect subRect (TQStyle.SubRect r, TQWidget widget) + private static extern IntPtr qt_QStyle_subRect (IntPtr raw, TTQStyle.SubRect r, IntPtr widget); + public TTQRect subRect (TTQStyle.SubRect r, TTQWidget widget) { - return (TQRect)LookupObject (qt_QStyle_subRect (rawObject, r, widget.RawObject), typeof(TQRect)); + return (TTQRect)LookupObject (qt_QStyle_subRect (rawObject, r, widget.RawObject), typeof(TTQRect)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] - private static extern void qt_QStyle_drawComplexControl (IntPtr raw, TQStyle.ComplexControl control, IntPtr p, IntPtr widget, IntPtr r, IntPtr cg, TQStyle.StyleFlags how, TQStyle.SubControl sub, TQStyle.SubControl subActive, IntPtr arg1); - public void drawComplexControl (TQStyle.ComplexControl control, TQPainter p, TQWidget widget, TQRect r, TQColorGroup cg, TQStyle.StyleFlags how, TQStyle.SubControl sub, TQStyle.SubControl subActive, TQStyleOption arg1) + private static extern void qt_QStyle_drawComplexControl (IntPtr raw, TTQStyle.ComplexControl control, IntPtr p, IntPtr widget, IntPtr r, IntPtr cg, TTQStyle.StyleFlags how, TTQStyle.SubControl sub, TTQStyle.SubControl subActive, IntPtr arg1); + public void drawComplexControl (TTQStyle.ComplexControl control, TTQPainter p, TTQWidget widget, TTQRect r, TTQColorGroup cg, TTQStyle.StyleFlags how, TTQStyle.SubControl sub, TTQStyle.SubControl subActive, TTQStyleOption arg1) { qt_QStyle_drawComplexControl (rawObject, control, p.RawObject, widget.RawObject, r.RawObject, cg.RawObject, how, sub, subActive, arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] - private static extern void qt_QStyle_drawComplexControlMask (IntPtr raw, TQStyle.ComplexControl control, IntPtr p, IntPtr widget, IntPtr r, IntPtr arg1); - public void drawComplexControlMask (TQStyle.ComplexControl control, TQPainter p, TQWidget widget, TQRect r, TQStyleOption arg1) + private static extern void qt_QStyle_drawComplexControlMask (IntPtr raw, TTQStyle.ComplexControl control, IntPtr p, IntPtr widget, IntPtr r, IntPtr arg1); + public void drawComplexControlMask (TTQStyle.ComplexControl control, TTQPainter p, TTQWidget widget, TTQRect r, TTQStyleOption arg1) { qt_QStyle_drawComplexControlMask (rawObject, control, p.RawObject, widget.RawObject, r.RawObject, arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] - private static extern IntPtr qt_QStyle_querySubControlMetrics (IntPtr raw, TQStyle.ComplexControl control, IntPtr widget, TQStyle.SubControl sc, IntPtr arg1); - public TQRect querySubControlMetrics (TQStyle.ComplexControl control, TQWidget widget, TQStyle.SubControl sc, TQStyleOption arg1) + private static extern IntPtr qt_QStyle_querySubControlMetrics (IntPtr raw, TTQStyle.ComplexControl control, IntPtr widget, TTQStyle.SubControl sc, IntPtr arg1); + public TTQRect querySubControlMetrics (TTQStyle.ComplexControl control, TTQWidget widget, TTQStyle.SubControl sc, TTQStyleOption arg1) { - return (TQRect)LookupObject (qt_QStyle_querySubControlMetrics (rawObject, control, widget.RawObject, sc, arg1.RawObject), typeof(TQRect)); + return (TTQRect)LookupObject (qt_QStyle_querySubControlMetrics (rawObject, control, widget.RawObject, sc, arg1.RawObject), typeof(TTQRect)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] - private static extern TQStyle.SubControl qt_QStyle_querySubControl (IntPtr raw, TQStyle.ComplexControl control, IntPtr widget, IntPtr pos, IntPtr arg1); - public TQStyle.SubControl querySubControl (TQStyle.ComplexControl control, TQWidget widget, TQPoint pos, TQStyleOption arg1) + private static extern TTQStyle.SubControl qt_QStyle_querySubControl (IntPtr raw, TTQStyle.ComplexControl control, IntPtr widget, IntPtr pos, IntPtr arg1); + public TTQStyle.SubControl querySubControl (TTQStyle.ComplexControl control, TTQWidget widget, TTQPoint pos, TTQStyleOption arg1) { return qt_QStyle_querySubControl (rawObject, control, widget.RawObject, pos.RawObject, arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] - private static extern int qt_QStyle_pixelMetric (IntPtr raw, TQStyle.PixelMetric metric, IntPtr widget); - public int pixelMetric (TQStyle.PixelMetric metric, TQWidget widget) + private static extern int qt_QStyle_pixelMetric (IntPtr raw, TTQStyle.PixelMetric metric, IntPtr widget); + public int pixelMetric (TTQStyle.PixelMetric metric, TTQWidget widget) { return qt_QStyle_pixelMetric (rawObject, metric, widget.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] - private static extern IntPtr qt_QStyle_sizeFromContents (IntPtr raw, TQStyle.ContentsType contents, IntPtr widget, IntPtr contentsSize, IntPtr arg1); - public TQSize sizeFromContents (TQStyle.ContentsType contents, TQWidget widget, TQSize contentsSize, TQStyleOption arg1) + private static extern IntPtr qt_QStyle_sizeFromContents (IntPtr raw, TTQStyle.ContentsType contents, IntPtr widget, IntPtr contentsSize, IntPtr arg1); + public TTQSize sizeFromContents (TTQStyle.ContentsType contents, TTQWidget widget, TTQSize contentsSize, TTQStyleOption arg1) { - return (TQSize)LookupObject (qt_QStyle_sizeFromContents (rawObject, contents, widget.RawObject, contentsSize.RawObject, arg1.RawObject), typeof(TQSize)); + return (TTQSize)LookupObject (qt_QStyle_sizeFromContents (rawObject, contents, widget.RawObject, contentsSize.RawObject, arg1.RawObject), typeof(TTQSize)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QStyle_styleHint (IntPtr raw, StyleHint stylehint, IntPtr widget, IntPtr arg1, IntPtr returnData); - public int styleHint (StyleHint stylehint, TQWidget widget, TQStyleOption arg1, IntPtr returnData) + public int styleHint (StyleHint stylehint, TTQWidget widget, TTQStyleOption arg1, IntPtr returnData) { return qt_QStyle_styleHint (rawObject, stylehint, widget.RawObject, arg1.RawObject, returnData); } [DllImport("libqtc", CharSet=CharSet.Ansi)] - private static extern IntPtr qt_QStyle_stylePixmap (IntPtr raw, TQStyle.StylePixmap stylepixmap, IntPtr widget, IntPtr arg1); - public TQPixmap stylePixmap (TQStyle.StylePixmap stylepixmap, TQWidget widget, TQStyleOption arg1) + private static extern IntPtr qt_QStyle_stylePixmap (IntPtr raw, TTQStyle.StylePixmap stylepixmap, IntPtr widget, IntPtr arg1); + public TTQPixmap stylePixmap (TTQStyle.StylePixmap stylepixmap, TTQWidget widget, TTQStyleOption arg1) { - return (TQPixmap)LookupObject (qt_QStyle_stylePixmap (rawObject, stylepixmap, widget.RawObject, arg1.RawObject), typeof(TQPixmap)); + return (TTQPixmap)LookupObject (qt_QStyle_stylePixmap (rawObject, stylepixmap, widget.RawObject, arg1.RawObject), typeof(TTQPixmap)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] @@ -453,140 +453,140 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QStyle_tabbarMetrics (IntPtr raw, IntPtr t, int hf, int vf, int ov); - public void tabbarMetrics (TQWidget t, int hf, int vf, int ov) + public void tabbarMetrics (TTQWidget t, int hf, int vf, int ov) { qt_QStyle_tabbarMetrics (rawObject, t.RawObject, hf, vf, ov); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QStyle_scrollBarExtent (IntPtr raw); - public TQSize scrollBarExtent () + public TTQSize scrollBarExtent () { - return (TQSize)LookupObject (qt_QStyle_scrollBarExtent (rawObject), typeof(TQSize)); + return (TTQSize)LookupObject (qt_QStyle_scrollBarExtent (rawObject), typeof(TTQSize)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QStyle_visualRect (IntPtr logical, IntPtr w); - public static TQRect visualRect (TQRect logical, TQWidget w) + public static TTQRect visualRect (TTQRect logical, TTQWidget w) { - return (TQRect)LookupObject (qt_QStyle_visualRect (logical.RawObject, w.RawObject), typeof(TQRect)); + return (TTQRect)LookupObject (qt_QStyle_visualRect (logical.RawObject, w.RawObject), typeof(TTQRect)); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QStyle_visualRect1 (IntPtr logical, IntPtr bounding); - public static TQRect visualRect (TQRect logical, TQRect bounding) + public static TTQRect visualRect (TTQRect logical, TTQRect bounding) { - return (TQRect)LookupObject (qt_QStyle_visualRect1 (logical.RawObject, bounding.RawObject), typeof(TQRect)); + return (TTQRect)LookupObject (qt_QStyle_visualRect1 (logical.RawObject, bounding.RawObject), typeof(TTQRect)); } - public TQRect itemRect (TQPainter p, TQRect r, int flags, bool enabled, TQPixmap pixmap, string text) + public TTQRect itemRect (TTQPainter p, TTQRect r, int flags, bool enabled, TTQPixmap pixmap, string text) { return itemRect(p, r, flags, enabled, pixmap, text, (int) -1); } - public void drawItem (TQPainter p, TQRect r, int flags, TQColorGroup g, bool enabled, TQPixmap pixmap, string text) + public void drawItem (TTQPainter p, TTQRect r, int flags, TTQColorGroup g, bool enabled, TTQPixmap pixmap, string text) { drawItem(p, r, flags, g, enabled, pixmap, text, (int) -1); } - public void drawItem (TQPainter p, TQRect r, int flags, TQColorGroup g, bool enabled, TQPixmap pixmap, string text, int len) + public void drawItem (TTQPainter p, TTQRect r, int flags, TTQColorGroup g, bool enabled, TTQPixmap pixmap, string text, int len) { - drawItem(p, r, flags, g, enabled, pixmap, text, len, new TQColor ()); + drawItem(p, r, flags, g, enabled, pixmap, text, len, new TTQColor ()); } - public void drawPrimitive (TQStyle.PrimitiveElement pe, TQPainter p, TQRect r, TQColorGroup cg) + public void drawPrimitive (TTQStyle.PrimitiveElement pe, TTQPainter p, TTQRect r, TTQColorGroup cg) { - drawPrimitive(pe, p, r, cg, TQStyle.StyleFlags.Style_Default); + drawPrimitive(pe, p, r, cg, TTQStyle.StyleFlags.Style_Default); } - public void drawPrimitive (TQStyle.PrimitiveElement pe, TQPainter p, TQRect r, TQColorGroup cg, TQStyle.StyleFlags flags) + public void drawPrimitive (TTQStyle.PrimitiveElement pe, TTQPainter p, TTQRect r, TTQColorGroup cg, TTQStyle.StyleFlags flags) { - drawPrimitive(pe, p, r, cg, flags, new TQStyleOption ()); + drawPrimitive(pe, p, r, cg, flags, new TTQStyleOption ()); } - public void drawControl (TQStyle.ControlElement element, TQPainter p, TQWidget widget, TQRect r, TQColorGroup cg) + public void drawControl (TTQStyle.ControlElement element, TTQPainter p, TTQWidget widget, TTQRect r, TTQColorGroup cg) { - drawControl(element, p, widget, r, cg, TQStyle.StyleFlags.Style_Default); + drawControl(element, p, widget, r, cg, TTQStyle.StyleFlags.Style_Default); } - public void drawControl (TQStyle.ControlElement element, TQPainter p, TQWidget widget, TQRect r, TQColorGroup cg, TQStyle.StyleFlags how) + public void drawControl (TTQStyle.ControlElement element, TTQPainter p, TTQWidget widget, TTQRect r, TTQColorGroup cg, TTQStyle.StyleFlags how) { - drawControl(element, p, widget, r, cg, how, new TQStyleOption ()); + drawControl(element, p, widget, r, cg, how, new TTQStyleOption ()); } - public void drawControlMask (TQStyle.ControlElement element, TQPainter p, TQWidget widget, TQRect r) + public void drawControlMask (TTQStyle.ControlElement element, TTQPainter p, TTQWidget widget, TTQRect r) { - drawControlMask(element, p, widget, r, new TQStyleOption ()); + drawControlMask(element, p, widget, r, new TTQStyleOption ()); } - public void drawComplexControl (TQStyle.ComplexControl control, TQPainter p, TQWidget widget, TQRect r, TQColorGroup cg) + public void drawComplexControl (TTQStyle.ComplexControl control, TTQPainter p, TTQWidget widget, TTQRect r, TTQColorGroup cg) { - drawComplexControl(control, p, widget, r, cg, TQStyle.StyleFlags.Style_Default); + drawComplexControl(control, p, widget, r, cg, TTQStyle.StyleFlags.Style_Default); } - public void drawComplexControl (TQStyle.ComplexControl control, TQPainter p, TQWidget widget, TQRect r, TQColorGroup cg, TQStyle.StyleFlags how) + public void drawComplexControl (TTQStyle.ComplexControl control, TTQPainter p, TTQWidget widget, TTQRect r, TTQColorGroup cg, TTQStyle.StyleFlags how) { - drawComplexControl(control, p, widget, r, cg, how, TQStyle.SubControl.SC_All); + drawComplexControl(control, p, widget, r, cg, how, TTQStyle.SubControl.SC_All); } - public void drawComplexControl (TQStyle.ComplexControl control, TQPainter p, TQWidget widget, TQRect r, TQColorGroup cg, TQStyle.StyleFlags how, TQStyle.SubControl sub) + public void drawComplexControl (TTQStyle.ComplexControl control, TTQPainter p, TTQWidget widget, TTQRect r, TTQColorGroup cg, TTQStyle.StyleFlags how, TTQStyle.SubControl sub) { - drawComplexControl(control, p, widget, r, cg, how, sub, TQStyle.SubControl.SC_None); + drawComplexControl(control, p, widget, r, cg, how, sub, TTQStyle.SubControl.SC_None); } - public void drawComplexControl (TQStyle.ComplexControl control, TQPainter p, TQWidget widget, TQRect r, TQColorGroup cg, TQStyle.StyleFlags how, TQStyle.SubControl sub, TQStyle.SubControl subActive) + public void drawComplexControl (TTQStyle.ComplexControl control, TTQPainter p, TTQWidget widget, TTQRect r, TTQColorGroup cg, TTQStyle.StyleFlags how, TTQStyle.SubControl sub, TTQStyle.SubControl subActive) { - drawComplexControl(control, p, widget, r, cg, how, sub, subActive, new TQStyleOption ()); + drawComplexControl(control, p, widget, r, cg, how, sub, subActive, new TTQStyleOption ()); } - public void drawComplexControlMask (TQStyle.ComplexControl control, TQPainter p, TQWidget widget, TQRect r) + public void drawComplexControlMask (TTQStyle.ComplexControl control, TTQPainter p, TTQWidget widget, TTQRect r) { - drawComplexControlMask(control, p, widget, r, new TQStyleOption ()); + drawComplexControlMask(control, p, widget, r, new TTQStyleOption ()); } - public TQRect querySubControlMetrics (TQStyle.ComplexControl control, TQWidget widget, TQStyle.SubControl sc) + public TTQRect querySubControlMetrics (TTQStyle.ComplexControl control, TTQWidget widget, TTQStyle.SubControl sc) { - return querySubControlMetrics(control, widget, sc, new TQStyleOption ()); + return querySubControlMetrics(control, widget, sc, new TTQStyleOption ()); } - public TQStyle.SubControl querySubControl (TQStyle.ComplexControl control, TQWidget widget, TQPoint pos) + public TTQStyle.SubControl querySubControl (TTQStyle.ComplexControl control, TTQWidget widget, TTQPoint pos) { - return querySubControl(control, widget, pos, new TQStyleOption ()); + return querySubControl(control, widget, pos, new TTQStyleOption ()); } - public int pixelMetric (TQStyle.PixelMetric metric) + public int pixelMetric (TTQStyle.PixelMetric metric) { - return pixelMetric(metric, new TQWidget ()); + return pixelMetric(metric, new TTQWidget ()); } - public TQSize sizeFromContents (TQStyle.ContentsType contents, TQWidget widget, TQSize contentsSize) + public TTQSize sizeFromContents (TTQStyle.ContentsType contents, TTQWidget widget, TTQSize contentsSize) { - return sizeFromContents(contents, widget, contentsSize, new TQStyleOption ()); + return sizeFromContents(contents, widget, contentsSize, new TTQStyleOption ()); } public int styleHint (StyleHint stylehint) { - return styleHint(stylehint, new TQWidget ()); + return styleHint(stylehint, new TTQWidget ()); } - public int styleHint (StyleHint stylehint, TQWidget widget) + public int styleHint (StyleHint stylehint, TTQWidget widget) { - return styleHint(stylehint, widget, new TQStyleOption ()); + return styleHint(stylehint, widget, new TTQStyleOption ()); } - public int styleHint (StyleHint stylehint, TQWidget widget, TQStyleOption arg1) + public int styleHint (StyleHint stylehint, TTQWidget widget, TTQStyleOption arg1) { return styleHint(stylehint, widget, arg1, (IntPtr) 0); } - public TQPixmap stylePixmap (TQStyle.StylePixmap stylepixmap) + public TTQPixmap stylePixmap (TTQStyle.StylePixmap stylepixmap) { - return stylePixmap(stylepixmap, new TQWidget ()); + return stylePixmap(stylepixmap, new TTQWidget ()); } - public TQPixmap stylePixmap (TQStyle.StylePixmap stylepixmap, TQWidget widget) + public TTQPixmap stylePixmap (TTQStyle.StylePixmap stylepixmap, TTQWidget widget) { - return stylePixmap(stylepixmap, widget, new TQStyleOption ()); + return stylePixmap(stylepixmap, widget, new TTQStyleOption ()); } // Begin interface methods. diff --git a/qtsharp/src/bindings/static/QToolButton.cs b/qtsharp/src/bindings/static/QToolButton.cs index e4779111..200c0c99 100644 --- a/qtsharp/src/bindings/static/QToolButton.cs +++ b/qtsharp/src/bindings/static/QToolButton.cs @@ -1,4 +1,4 @@ -// TQToolButton.cs - A Qt to C# binding. +// TTQToolButton.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // @@ -26,11 +26,11 @@ namespace Qt { using System; using System.Runtime.InteropServices; - public class TQToolButton : TQButton, IDisposable { + public class TTQToolButton : TTQButton, IDisposable { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_new_QToolButton (IntPtr parent, string name); - public TQToolButton (TQWidget parent, string name) : this (QNull.Instance) + public TTQToolButton (TTQWidget parent, string name) : this (TQNull.Instance) { rawObject = qt_new_QToolButton (parent != null ? parent.RawObject : IntPtr.Zero, name); @@ -43,7 +43,7 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_new_QToolButton1 (IntPtr iconSet, IntPtr textLabel, IntPtr groupText, IntPtr receiver, string slot, IntPtr parent, string name); - public TQToolButton (TQIconSet iconSet, TQString textLabel, TQString groupText, TQObject receiver, string slot, TQToolBar parent, string name) : this (QNull.Instance) + public TTQToolButton (TTQIconSet iconSet, TTQString textLabel, TTQString groupText, TTQObject receiver, string slot, TTQToolBar 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 ); @@ -58,7 +58,7 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_new_QToolButton2 (Qt.ArrowType type, IntPtr parent, string name); - public TQToolButton (Qt.ArrowType type, TQWidget parent, string name) : this (QNull.Instance) + public TTQToolButton (Qt.ArrowType type, TTQWidget parent, string name) : this (TQNull.Instance) { rawObject = qt_new_QToolButton2 (type, parent != null ? parent.RawObject : IntPtr.Zero, name); @@ -69,19 +69,19 @@ namespace Qt { Connect (this, TQT_SIGNAL ("destroyed ()"), TQT_SLOT ("NativeDestroyed ()")); } - public TQToolButton (TQWidget parent) : this (parent, "") {} + public TTQToolButton (TTQWidget parent) : this (parent, "") {} - internal TQToolButton () : this (QNull.Instance) {} + internal TTQToolButton () : this (TQNull.Instance) {} - internal TQToolButton (IntPtr ptr) : this (QNull.Instance) + internal TTQToolButton (IntPtr ptr) : this (TQNull.Instance) { rawObject = ptr; RegisterObject(this); } - internal TQToolButton (QNull dummy) : base (QNull.Instance) {} + internal TTQToolButton (TQNull dummy) : base (TQNull.Instance) {} - ~TQToolButton () + ~TTQToolButton () { Dispose (false); } @@ -116,7 +116,7 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QToolButton_setTextLabel (IntPtr raw, IntPtr arg1, bool arg2); - public void SetTextLabel (TQString arg1, bool arg2) + public void SetTextLabel (TTQString arg1, bool arg2) { if (disposed) throw new ObjectDisposedException (this+": Attempted use of disposed object"); @@ -156,7 +156,7 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QToolButton_setTextLabel1 (IntPtr raw, IntPtr arg1); - public void SetTextLabel (TQString arg1) + public void SetTextLabel (TTQString arg1) { if (disposed) throw new ObjectDisposedException (this+": Attempted use of disposed object"); @@ -166,7 +166,7 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QToolButton_setIconSet (IntPtr raw, IntPtr set); - public void SetIconSet (TQIconSet set) + public void SetIconSet (TTQIconSet set) { if (disposed) throw new ObjectDisposedException (this+": Attempted use of disposed object"); @@ -176,7 +176,7 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QToolButton_setIconSet1 (IntPtr raw, IntPtr set, bool on); - public void SetIconSet (TQIconSet set, bool on) + public void SetIconSet (TTQIconSet set, bool on) { if (disposed) throw new ObjectDisposedException (this+": Attempted use of disposed object"); @@ -186,12 +186,12 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QToolButton_iconSet (IntPtr raw, bool on); - public TQIconSet IconSet (bool on) + public TTQIconSet 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; + return LookupObject (qt_QToolButton_iconSet (rawObject, on), typeof (TTQIconSet)) as TTQIconSet; } [DllImport("libqtc", CharSet=CharSet.Ansi)] @@ -246,7 +246,7 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QToolButton_drawButtonLabel (IntPtr raw, IntPtr arg1); - protected void DrawButtonLabel (TQPainter arg1) + protected void DrawButtonLabel (TTQPainter arg1) { if (disposed) throw new ObjectDisposedException (this+": Attempted use of disposed object"); @@ -266,7 +266,7 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern bool qt_QToolButton_eventFilter (IntPtr raw, IntPtr o, IntPtr e); - protected bool EventFilter (TQObject o, TQEvent e) + protected bool EventFilter (TTQObject o, TTQEvent e) { if (disposed) throw new ObjectDisposedException (this+": Attempted use of disposed object"); @@ -276,7 +276,7 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QToolButton_paletteChange (IntPtr raw, IntPtr arg1); - protected void PaletteChange (TQPalette arg1) + protected void PaletteChange (TTQPalette arg1) { if (disposed) throw new ObjectDisposedException (this+": Attempted use of disposed object"); diff --git a/qtsharp/src/bindings/static/QWidgetStack.cs b/qtsharp/src/bindings/static/QWidgetStack.cs index aed0b6c2..417731ef 100644 --- a/qtsharp/src/bindings/static/QWidgetStack.cs +++ b/qtsharp/src/bindings/static/QWidgetStack.cs @@ -1,4 +1,4 @@ -// TQWidgetStack.cs - A Qt to C# binding. +// TTQWidgetStack.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // @@ -25,13 +25,13 @@ namespace Qt { using System.Collections; using System.Runtime.InteropServices; - public class TQWidgetStack : TQFrame, IDisposable { + public class TTQWidgetStack : TTQFrame, IDisposable { private ArrayList widgets; [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_new_QWidgetStack (IntPtr parent, string name); - public TQWidgetStack (TQWidget parent, string name) : this (QNull.Instance) + public TTQWidgetStack (TTQWidget parent, string name) : this (TQNull.Instance) { if ((qparent = parent) != null) qparent.AddChild (this); @@ -39,22 +39,22 @@ namespace Qt { RegisterObject (this); } - public TQWidgetStack () : this (new TQWidget ()) {} + public TTQWidgetStack () : this (new TTQWidget ()) {} - public TQWidgetStack (TQWidget parent) : this (parent, "") {} + public TTQWidgetStack (TTQWidget parent) : this (parent, "") {} - internal TQWidgetStack (IntPtr ptr) : this (QNull.Instance) + internal TTQWidgetStack (IntPtr ptr) : this (TQNull.Instance) { rawObject = ptr; RegisterObject(this); } - internal TQWidgetStack (QNull dummy) : base (QNull.Instance) + internal TTQWidgetStack (TQNull dummy) : base (TQNull.Instance) { widgets = new ArrayList (); } - ~TQWidgetStack () + ~TTQWidgetStack () { Dispose (false); } @@ -71,7 +71,7 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QWidgetStack_addWidget (IntPtr raw, IntPtr arg1, int arg2); - public int AddWidget (TQWidget arg1, int arg2) + public int AddWidget (TTQWidget arg1, int arg2) { if (! widgets.Contains (arg1)) widgets.Add (arg1); return qt_QWidgetStack_addWidget (RawObject, arg1.RawObject, arg2); @@ -79,7 +79,7 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QWidgetStack_removeWidget (IntPtr raw, IntPtr arg1); - public void RemoveWidget (TQWidget arg1) + public void RemoveWidget (TTQWidget arg1) { widgets.Remove (arg1); qt_QWidgetStack_removeWidget (RawObject, arg1.RawObject); @@ -87,16 +87,16 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QWidgetStack_sizeHint (IntPtr raw); - public TQSize SizeHint () + public TTQSize SizeHint () { - return LookupObject (qt_QWidgetStack_sizeHint (RawObject), typeof(TQSize)) as TQSize; + return LookupObject (qt_QWidgetStack_sizeHint (RawObject), typeof(TTQSize)) as TTQSize; } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QWidgetStack_minimumSizeHint (IntPtr raw); - public TQSize MinimumSizeHint () + public TTQSize MinimumSizeHint () { - return LookupObject (qt_QWidgetStack_minimumSizeHint (RawObject), typeof(TQSize)) as TQSize; + return LookupObject (qt_QWidgetStack_minimumSizeHint (RawObject), typeof(TTQSize)) as TTQSize; } [DllImport("libqtc", CharSet=CharSet.Ansi)] @@ -108,28 +108,28 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QWidgetStack_widget (IntPtr raw, int arg1); - public TQWidget Widget (int arg1) + public TTQWidget Widget (int arg1) { - return LookupObject (qt_QWidgetStack_widget (RawObject, arg1), typeof(TQWidget)) as TQWidget; + return LookupObject (qt_QWidgetStack_widget (RawObject, arg1), typeof(TTQWidget)) as TTQWidget; } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern int qt_QWidgetStack_id (IntPtr raw, IntPtr arg1); - public int Id (TQWidget arg1) + public int Id (TTQWidget arg1) { return qt_QWidgetStack_id (RawObject, arg1.RawObject); } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern IntPtr qt_QWidgetStack_visibleWidget (IntPtr raw); - public TQWidget VisibleWidget () + public TTQWidget VisibleWidget () { - return LookupObject (qt_QWidgetStack_visibleWidget (RawObject), typeof(TQWidget)) as TQWidget; + return LookupObject (qt_QWidgetStack_visibleWidget (RawObject), typeof(TTQWidget)) as TTQWidget; } [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QWidgetStack_setFrameRect (IntPtr raw, IntPtr arg1); - public void SetFrameRect (TQRect arg1) + public void SetFrameRect (TTQRect arg1) { qt_QWidgetStack_setFrameRect (RawObject, arg1.RawObject); } @@ -143,7 +143,7 @@ namespace Qt { [DllImport("libqtc", CharSet=CharSet.Ansi)] private static extern void qt_QWidgetStack_raiseWidget1 (IntPtr raw, IntPtr arg1); - public void RaiseWidget (TQWidget arg1) + public void RaiseWidget (TTQWidget arg1) { qt_QWidgetStack_raiseWidget1 (RawObject, arg1.RawObject); } @@ -162,7 +162,7 @@ namespace Qt { qt_QWidgetStack_setChildGeometries (RawObject); } - public int AddWidget (TQWidget arg1) + public int AddWidget (TTQWidget arg1) { return AddWidget(arg1, (int) -1); } diff --git a/qtsharp/src/bindings/static/QtSignal.cs b/qtsharp/src/bindings/static/QtSignal.cs index 0889f3b0..b48bcf97 100644 --- a/qtsharp/src/bindings/static/QtSignal.cs +++ b/qtsharp/src/bindings/static/QtSignal.cs @@ -28,7 +28,7 @@ namespace Qt { using System.Runtime.InteropServices; using System.Reflection; - internal class QtSignal: TQObject, IDisposable { + internal class QtSignal: TTQObject, IDisposable { internal static bool traceConnects; static QtSignal () @@ -36,7 +36,7 @@ namespace Qt { traceConnects = false; } - private TQObject sender; + private TTQObject sender; private string signal; private string name; private string args; @@ -47,7 +47,7 @@ namespace Qt { get { return MakeSigId(sender, signal); } } - public TQObject Sender { + public TTQObject Sender { get { return sender; } } @@ -75,7 +75,7 @@ namespace Qt { get { return slots; } } - public QtSignal (TQObject sender, string signal): base (NoSignalInit.Instance) + public QtSignal (TTQObject sender, string signal): base (NoSignalInit.Instance) { this.sender = sender; this.signal = signal; @@ -101,7 +101,7 @@ namespace Qt { return sender.CsSignalMap.Contains(signal); } - internal static bool Connect(TQObject sender, string signal, TQObject receiver, string slot) + internal static bool Connect(TTQObject sender, string signal, TTQObject receiver, string slot) { if (IsSlot(signal)) { return false; @@ -114,7 +114,7 @@ namespace Qt { return ConnectSignalToSlot(sender, NormalizeParam(signal), receiver, NormalizeParam(slot)); } - private static bool ConnectSignalToSlot(TQObject sender, string signal, TQObject receiver, string slot) + private static bool ConnectSignalToSlot(TTQObject sender, string signal, TTQObject receiver, string slot) { QtSignal sigobj; QtSlot slotobj = new QtSlot(receiver, slot); @@ -188,82 +188,82 @@ namespace Qt { del = Delegate.CreateDelegate (typeof (del_double), receiver, slotobj.Name); slotobj.WrapperPtr = csharp_connect_double (sender.RawObject, TQT_SIGNAL (signal), receiver.RawObject, del); break; - case "(TQString)": - realsignal = sigobj.Name + "(const TQString&)"; + case "(TTQString)": + realsignal = sigobj.Name + "(const TTQString&)"; 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); break; - case "(TQDockWindow)": - realsignal = sigobj.Name + "(TQDockWindow*)"; + case "(TTQDockWindow)": + realsignal = sigobj.Name + "(TTQDockWindow*)"; del = Delegate.CreateDelegate (typeof (del_QDockWindow), slotobj, "SlotBridge_QDockWindow"); slotobj.WrapperPtr = csharp_connect_QDockWindow (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); break; - case "(TQDropEvent)": - realsignal = sigobj.Name + "(TQDropEvent*)"; + case "(TTQDropEvent)": + realsignal = sigobj.Name + "(TTQDropEvent*)"; del = Delegate.CreateDelegate (typeof (del_QDropEvent), slotobj, "SlotBridge_QDropEvent"); slotobj.WrapperPtr = csharp_connect_QDropEvent (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); break; - case "(TQDropEvent,TQListViewItem)": - realsignal = sigobj.Name + "(TQDropEvent*,TQListViewItem*)"; - del = Delegate.CreateDelegate (typeof (del_QDropEventQListViewItem), slotobj, "SlotBridge_QDropEventQListViewItem"); - slotobj.WrapperPtr = csharp_connect_QDropEventQListViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + case "(TTQDropEvent,TTQListViewItem)": + realsignal = sigobj.Name + "(TTQDropEvent*,TTQListViewItem*)"; + del = Delegate.CreateDelegate (typeof (del_QDropEventTQListViewItem), slotobj, "SlotBridge_QDropEventTQListViewItem"); + slotobj.WrapperPtr = csharp_connect_QDropEventTQListViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); break; - case "(TQIconViewItem)": - realsignal = sigobj.Name + "(TQIconViewItem*)"; + case "(TTQIconViewItem)": + realsignal = sigobj.Name + "(TTQIconViewItem*)"; del = Delegate.CreateDelegate (typeof (del_QIconViewItem), slotobj, "SlotBridge_QIconViewItem"); slotobj.WrapperPtr = csharp_connect_QIconViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); break; - case "(TQListBoxItem)": - realsignal = sigobj.Name + "(TQListBoxItem*)"; + case "(TTQListBoxItem)": + realsignal = sigobj.Name + "(TTQListBoxItem*)"; del = Delegate.CreateDelegate (typeof (del_QListBoxItem), slotobj, "SlotBridge_QListBoxItem"); slotobj.WrapperPtr = csharp_connect_QListBoxItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); break; - case "(TQListViewItem)": - realsignal = sigobj.Name + "(TQListViewItem*)"; + case "(TTQListViewItem)": + realsignal = sigobj.Name + "(TTQListViewItem*)"; del = Delegate.CreateDelegate (typeof (del_QListViewItem), slotobj, "SlotBridge_QListViewItem"); slotobj.WrapperPtr = csharp_connect_QListViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); break; - case "(TQListViewItem,TQListViewItem)": - realsignal = sigobj.Name + "(TQListViewItem*,TQListViewItem*)"; - del = Delegate.CreateDelegate (typeof (del_QListViewItemQListViewItem), slotobj, "SlotBridge_QListViewItemQListViewItem"); - slotobj.WrapperPtr = csharp_connect_QListViewItemQListViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + case "(TTQListViewItem,TTQListViewItem)": + realsignal = sigobj.Name + "(TTQListViewItem*,TTQListViewItem*)"; + del = Delegate.CreateDelegate (typeof (del_QListViewItemTQListViewItem), slotobj, "SlotBridge_QListViewItemTQListViewItem"); + slotobj.WrapperPtr = csharp_connect_QListViewItemTQListViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); break; - case "(TQListViewItem,TQListViewItem,TQListViewItem)": - realsignal = sigobj.Name + "(TQListViewItem*,TQListViewItem*,TQListViewItem*)"; - del = Delegate.CreateDelegate (typeof (del_QListViewItemQListViewItemQListViewItem), slotobj, "SlotBridge_QListViewItemQListViewItemQListViewItem"); - slotobj.WrapperPtr = csharp_connect_QListViewItemQListViewItemQListViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + case "(TTQListViewItem,TTQListViewItem,TTQListViewItem)": + realsignal = sigobj.Name + "(TTQListViewItem*,TTQListViewItem*,TTQListViewItem*)"; + del = Delegate.CreateDelegate (typeof (del_QListViewItemTQListViewItemTQListViewItem), slotobj, "SlotBridge_QListViewItemTQListViewItemTQListViewItem"); + slotobj.WrapperPtr = csharp_connect_QListViewItemTQListViewItemTQListViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); break; - case "(TQNetworkOperation)": - realsignal = sigobj.Name + "(TQNetworkOperation*)"; + case "(TTQNetworkOperation)": + realsignal = sigobj.Name + "(TTQNetworkOperation*)"; del = Delegate.CreateDelegate (typeof (del_QNetworkOperation), slotobj, "SlotBridge_QNetworkOperation"); slotobj.WrapperPtr = csharp_connect_QNetworkOperation (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); break; - case "(TQObject)": - realsignal = sigobj.Name + "(TQObject*)"; + case "(TTQObject)": + realsignal = sigobj.Name + "(TTQObject*)"; del = Delegate.CreateDelegate (typeof (del_QObject), slotobj, "SlotBridge_QObject"); slotobj.WrapperPtr = csharp_connect_QObject (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); break; - case "(TQToolBar)": - realsignal = sigobj.Name + "(TQToolBar*)"; + case "(TTQToolBar)": + realsignal = sigobj.Name + "(TTQToolBar*)"; del = Delegate.CreateDelegate (typeof (del_QToolBar), slotobj, "SlotBridge_QToolBar"); slotobj.WrapperPtr = csharp_connect_QToolBar (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); break; - case "(TQWidget)": - realsignal = sigobj.Name + "(TQWidget*)"; + case "(TTQWidget)": + realsignal = sigobj.Name + "(TTQWidget*)"; del = Delegate.CreateDelegate (typeof (del_QWidget), slotobj, "SlotBridge_QWidget"); slotobj.WrapperPtr = csharp_connect_QWidget (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); break; - case "(int,TQIconViewItem)": - realsignal = sigobj.Name + "(int,TQIconViewItem*)"; - del = Delegate.CreateDelegate (typeof (del_intQIconViewItem), slotobj, "SlotBridge_intQIconViewItem"); - slotobj.WrapperPtr = csharp_connect_intQIconViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + case "(int,TTQIconViewItem)": + realsignal = sigobj.Name + "(int,TTQIconViewItem*)"; + del = Delegate.CreateDelegate (typeof (del_intTQIconViewItem), slotobj, "SlotBridge_intTQIconViewItem"); + slotobj.WrapperPtr = csharp_connect_intTQIconViewItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); break; - case "(int,TQListBoxItem)": - realsignal = sigobj.Name + "(int,TQListBoxItem*)"; - del = Delegate.CreateDelegate (typeof (del_intQListBoxItem), slotobj, "SlotBridge_intQListBoxItem"); - slotobj.WrapperPtr = csharp_connect_intQListBoxItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); + case "(int,TTQListBoxItem)": + realsignal = sigobj.Name + "(int,TTQListBoxItem*)"; + del = Delegate.CreateDelegate (typeof (del_intTQListBoxItem), slotobj, "SlotBridge_intTQListBoxItem"); + slotobj.WrapperPtr = csharp_connect_intTQListBoxItem (sender.RawObject, TQT_SIGNAL (realsignal), receiver.RawObject, del); break; case "(int,bool)": del = Delegate.CreateDelegate (typeof (del_intbool), receiver, slotobj.Name); @@ -297,7 +297,7 @@ namespace Qt { } } - private static bool ConnectSignalToSignal(TQObject sender, string signal, TQObject receiver, string target) + private static bool ConnectSignalToSignal(TTQObject sender, string signal, TTQObject receiver, string target) { if (traceConnects) ErrMsg ("ConnectSignalToSlot: ({0}) {1}, {2}, ({3}) {4}, {5}", sender.RawObject, sender, signal, @@ -338,7 +338,7 @@ namespace Qt { } } - internal static bool Disconnect(TQObject sender, string signal, TQObject receiver, string slot) + internal static bool Disconnect(TTQObject sender, string signal, TTQObject receiver, string slot) { if (signal == null && receiver == null && slot == null) return DisconnectAll(sender); @@ -356,7 +356,7 @@ namespace Qt { return DisconnectSignalFromSlot(sender, NormalizeParam(signal), receiver, NormalizeParam(slot)); } - private static bool DisconnectSignalFromSlot(TQObject sender, string signal, TQObject receiver, string slot) + private static bool DisconnectSignalFromSlot(TTQObject sender, string signal, TTQObject receiver, string slot) { if (traceConnects) ErrMsg ("DisconnectSignalFromSlot: ({0}) {1}, {2}, ({3}) {4}, {5}", sender.RawObject, sender, signal, @@ -415,7 +415,7 @@ namespace Qt { } } - private static bool DisconnectSignalFromSignal(TQObject sender, string signal, TQObject receiver, string target) + private static bool DisconnectSignalFromSignal(TTQObject sender, string signal, TTQObject receiver, string target) { if (traceConnects) ErrMsg ("DisconnectSignalFromSignal: ({0}) {1}, {2}, ({3}) {4}, {5}", sender.RawObject, sender, signal, @@ -458,7 +458,7 @@ namespace Qt { } } - private static bool DisconnectAll(TQObject sender) + private static bool DisconnectAll(TTQObject sender) { if (traceConnects) ErrMsg ("DisconnectAll: ({0}) {1}", sender.RawObject, sender); @@ -479,7 +479,7 @@ namespace Qt { return true; } - private static bool DisconnectReceiver(TQObject sender, TQObject receiver) + private static bool DisconnectReceiver(TTQObject sender, TTQObject receiver) { if (traceConnects) ErrMsg ("DisconnectReceiver: ({0}) {1}, ({2}) {3}", sender.RawObject, sender, receiver.RawObject, receiver); @@ -500,7 +500,7 @@ namespace Qt { return true; } - private static bool DisconnectSignal(TQObject sender, string signal) + private static bool DisconnectSignal(TTQObject sender, string signal) { if (traceConnects) ErrMsg ("DisconnectSignal: ({0}) {1}, {2}", sender.RawObject, sender, signal); @@ -516,7 +516,7 @@ namespace Qt { return true; } - private static bool DisconnectSignalFromReceiver (TQObject sender, string signal, TQObject receiver) + private static bool DisconnectSignalFromReceiver (TTQObject sender, string signal, TTQObject receiver) { if (traceConnects) ErrMsg ("DisconnectSignalFromReceiver: ({0}) {1}, {2}, ({3}), {4}", sender.RawObject, sender, @@ -561,7 +561,7 @@ namespace Qt { */ } - private static string MakeSigId(TQObject sender, string signal) + private static string MakeSigId(TTQObject sender, string signal) { return sender.RawObject.ToString()+signal; } @@ -663,7 +663,7 @@ namespace Qt { Emit (new object[] { value0 }); } - public void Emit_QDropEventQListViewItem (IntPtr value0, IntPtr value1) + public void Emit_QDropEventTQListViewItem (IntPtr value0, IntPtr value1) { Emit (new object[] { value0, value1 }); } @@ -683,12 +683,12 @@ namespace Qt { Emit (new object[] { value0 }); } - public void Emit_QListViewItemQListViewItem (IntPtr value0, IntPtr value1) + public void Emit_QListViewItemTQListViewItem (IntPtr value0, IntPtr value1) { Emit (new object[] { value0, value1 }); } - public void Emit_QListViewItemQListViewItemQListViewItem (IntPtr value0, IntPtr value1, IntPtr value2) + public void Emit_QListViewItemTQListViewItemTQListViewItem (IntPtr value0, IntPtr value1, IntPtr value2) { Emit (new object[] { value0, value1, value2 }); } @@ -713,12 +713,12 @@ namespace Qt { Emit (new object[] { value0 }); } - public void Emit_intQIconViewItem (int value0, IntPtr value1) + public void Emit_intTQIconViewItem (int value0, IntPtr value1) { Emit (new object[] { value0, value1 }); } - public void Emit_intQListBoxItem (int value0, IntPtr value1) + public void Emit_intTQListBoxItem (int value0, IntPtr value1) { Emit (new object[] { value0, value1 }); } @@ -775,7 +775,7 @@ namespace Qt { private static extern IntPtr csharp_connect_QDropEvent (IntPtr sender, string signal, IntPtr receiver, Delegate cb); [DllImport("libqtsharp", CharSet=CharSet.Ansi)] - private static extern IntPtr csharp_connect_QDropEventQListViewItem (IntPtr sender, string signal, IntPtr receiver, Delegate cb); + private static extern IntPtr csharp_connect_QDropEventTQListViewItem (IntPtr sender, string signal, IntPtr receiver, Delegate cb); [DllImport("libqtsharp", CharSet=CharSet.Ansi)] private static extern IntPtr csharp_connect_QIconViewItem (IntPtr sender, string signal, IntPtr receiver, Delegate cb); @@ -787,10 +787,10 @@ namespace Qt { private static extern IntPtr csharp_connect_QListViewItem (IntPtr sender, string signal, IntPtr receiver, Delegate cb); [DllImport("libqtsharp", CharSet=CharSet.Ansi)] - private static extern IntPtr csharp_connect_QListViewItemQListViewItem (IntPtr sender, string signal, IntPtr receiver, Delegate cb); + private static extern IntPtr csharp_connect_QListViewItemTQListViewItem (IntPtr sender, string signal, IntPtr receiver, Delegate cb); [DllImport("libqtsharp", CharSet=CharSet.Ansi)] - private static extern IntPtr csharp_connect_QListViewItemQListViewItemQListViewItem (IntPtr sender, string signal, IntPtr receiver, Delegate cb); + private static extern IntPtr csharp_connect_QListViewItemTQListViewItemTQListViewItem (IntPtr sender, string signal, IntPtr receiver, Delegate cb); [DllImport("libqtsharp", CharSet=CharSet.Ansi)] private static extern IntPtr csharp_connect_QNetworkOperation (IntPtr sender, string signal, IntPtr receiver, Delegate cb); @@ -805,10 +805,10 @@ namespace Qt { private static extern IntPtr csharp_connect_QWidget (IntPtr sender, string signal, IntPtr receiver, Delegate cb); [DllImport("libqtsharp", CharSet=CharSet.Ansi)] - private static extern IntPtr csharp_connect_intQIconViewItem (IntPtr sender, string signal, IntPtr receiver, Delegate cb); + private static extern IntPtr csharp_connect_intTQIconViewItem (IntPtr sender, string signal, IntPtr receiver, Delegate cb); [DllImport("libqtsharp", CharSet=CharSet.Ansi)] - private static extern IntPtr csharp_connect_intQListBoxItem (IntPtr sender, string signal, IntPtr receiver, Delegate cb); + private static extern IntPtr csharp_connect_intTQListBoxItem (IntPtr sender, string signal, IntPtr receiver, Delegate cb); [DllImport("libqtsharp", CharSet=CharSet.Ansi)] private static extern IntPtr csharp_connect_intbool (IntPtr sender, string signal, IntPtr receiver, Delegate cb); @@ -829,18 +829,18 @@ namespace Qt { public delegate void del_QString (IntPtr value0); public delegate void del_QDockWindow (IntPtr value0); public delegate void del_QDropEvent (IntPtr value0); - public delegate void del_QDropEventQListViewItem (IntPtr value0, IntPtr value1); + public delegate void del_QDropEventTQListViewItem (IntPtr value0, IntPtr value1); public delegate void del_QIconViewItem (IntPtr value0); public delegate void del_QListBoxItem (IntPtr value0); public delegate void del_QListViewItem (IntPtr value0); - public delegate void del_QListViewItemQListViewItem (IntPtr value0, IntPtr value1); - public delegate void del_QListViewItemQListViewItemQListViewItem (IntPtr value0, IntPtr value1, IntPtr value2); + public delegate void del_QListViewItemTQListViewItem (IntPtr value0, IntPtr value1); + public delegate void del_QListViewItemTQListViewItemTQListViewItem (IntPtr value0, IntPtr value1, IntPtr value2); public delegate void del_QNetworkOperation (IntPtr value0); public delegate void del_QObject (IntPtr value0); public delegate void del_QToolBar (IntPtr value0); public delegate void del_QWidget (IntPtr value0); - public delegate void del_intQIconViewItem (int value0, IntPtr value1); - public delegate void del_intQListBoxItem (int value0, IntPtr value1); + public delegate void del_intTQIconViewItem (int value0, IntPtr value1); + public delegate void del_intTQListBoxItem (int value0, IntPtr value1); public delegate void del_intbool (int value0, bool value1); public delegate void del_intint (int value0, int value1); public delegate void del_intintint (int value0, int value1, int value2); diff --git a/qtsharp/src/bindings/static/QtSignalMap.cs b/qtsharp/src/bindings/static/QtSignalMap.cs index 7fefcaca..d2f9575a 100644 --- a/qtsharp/src/bindings/static/QtSignalMap.cs +++ b/qtsharp/src/bindings/static/QtSignalMap.cs @@ -17,7 +17,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // // NOTES -// o By inheriting from TQObject, we can use the child tracking features to +// o By inheriting from TTQObject, we can use the child tracking features to // ensure that instances of signal maps are deleted by their parents when // the parent Dispose()es. // @@ -37,9 +37,9 @@ namespace Qt { get { return name; } } - public QtSignalMap (TQObject parent): this (parent, "QtSignalMap") {} + public QtSignalMap (TTQObject parent): this (parent, "QtSignalMap") {} - public QtSignalMap (TQObject parent, string name): base (QNull.Instance) + public QtSignalMap (TTQObject parent, string name): base (TQNull.Instance) { this.name = name; signalMap = new Hashtable (); diff --git a/qtsharp/src/bindings/static/QtSlot.cs b/qtsharp/src/bindings/static/QtSlot.cs index a48c9d42..0467bc13 100644 --- a/qtsharp/src/bindings/static/QtSlot.cs +++ b/qtsharp/src/bindings/static/QtSlot.cs @@ -22,7 +22,7 @@ namespace Qt { using System.Text; internal class QtSlot { - protected TQObject receiver; + protected TTQObject receiver; protected string slot; private string name; private string args; @@ -30,7 +30,7 @@ namespace Qt { private IntPtr wrapperPtr; private Delegate callback; - public TQObject Receiver { + public TTQObject Receiver { get { return receiver; } } @@ -74,7 +74,7 @@ namespace Qt { public QtSlot() {} - public QtSlot(TQObject receiver, string slot) + public QtSlot(TTQObject receiver, string slot) { this.receiver = receiver; this.slot = slot; @@ -95,109 +95,109 @@ namespace Qt { public void SlotBridge_QString (IntPtr value0) { - TQString csvalue0 = QtSupport.LookupObject (value0, typeof (TQString)) as TQString; + TTQString csvalue0 = QtSupport.LookupObject (value0, typeof (TTQString)) as TTQString; Invoke (new object[] {csvalue0}); } public void SlotBridge_QDockWindow (IntPtr value0) { - TQDockWindow csvalue0 = QtSupport.LookupObject (value0, typeof (TQDockWindow)) as TQDockWindow; + TTQDockWindow csvalue0 = QtSupport.LookupObject (value0, typeof (TTQDockWindow)) as TTQDockWindow; Invoke (new object[] {csvalue0}); } public void SlotBridge_QDropEvent (IntPtr value0) { - TQDropEvent csvalue0 = QtSupport.LookupObject (value0, typeof (TQDropEvent)) as TQDropEvent; + TTQDropEvent csvalue0 = QtSupport.LookupObject (value0, typeof (TTQDropEvent)) as TTQDropEvent; Invoke (new object[] {csvalue0}); } - public void SlotBridge_QDropEventQListViewItem (IntPtr value0, IntPtr value1) + public void SlotBridge_QDropEventTQListViewItem (IntPtr value0, IntPtr value1) { - TQDropEvent csvalue0 = QtSupport.LookupObject (value0, typeof (TQDropEvent)) as TQDropEvent; - TQListViewItem csvalue1 = QtSupport.LookupObject (value1, typeof (TQListViewItem)) as TQListViewItem; + TTQDropEvent csvalue0 = QtSupport.LookupObject (value0, typeof (TTQDropEvent)) as TTQDropEvent; + TTQListViewItem csvalue1 = QtSupport.LookupObject (value1, typeof (TTQListViewItem)) as TTQListViewItem; Invoke (new object[] {csvalue0, csvalue1}); } public void SlotBridge_QIconViewItem (IntPtr value0) { - TQIconViewItem csvalue0 = QtSupport.LookupObject (value0, typeof (TQIconViewItem)) as TQIconViewItem; + TTQIconViewItem csvalue0 = QtSupport.LookupObject (value0, typeof (TTQIconViewItem)) as TTQIconViewItem; Invoke (new object[] {csvalue0}); } public void SlotBridge_QListBoxItem (IntPtr value0) { - TQListBoxItem csvalue0 = QtSupport.LookupObject (value0, typeof (TQListBoxItem)) as TQListBoxItem; + TTQListBoxItem csvalue0 = QtSupport.LookupObject (value0, typeof (TTQListBoxItem)) as TTQListBoxItem; Invoke (new object[] {csvalue0}); } public void SlotBridge_QListViewItem (IntPtr value0) { - TQListViewItem csvalue0 = QtSupport.LookupObject (value0, typeof (TQListViewItem)) as TQListViewItem; + TTQListViewItem csvalue0 = QtSupport.LookupObject (value0, typeof (TTQListViewItem)) as TTQListViewItem; Invoke (new object[] {csvalue0}); } - public void SlotBridge_QListViewItemQListViewItem (IntPtr value0, IntPtr value1) + public void SlotBridge_QListViewItemTQListViewItem (IntPtr value0, IntPtr value1) { - TQListViewItem csvalue0 = QtSupport.LookupObject (value0, typeof (TQListViewItem)) as TQListViewItem; - TQListViewItem csvalue1 = QtSupport.LookupObject (value1, typeof (TQListViewItem)) as TQListViewItem; + TTQListViewItem csvalue0 = QtSupport.LookupObject (value0, typeof (TTQListViewItem)) as TTQListViewItem; + TTQListViewItem csvalue1 = QtSupport.LookupObject (value1, typeof (TTQListViewItem)) as TTQListViewItem; Invoke (new object[] {csvalue0, csvalue1}); } - public void SlotBridge_QListViewItemQListViewItemQListViewItem (IntPtr value0, IntPtr value1, IntPtr value2) + public void SlotBridge_QListViewItemTQListViewItemTQListViewItem (IntPtr value0, IntPtr value1, IntPtr value2) { - TQListViewItem csvalue0 = QtSupport.LookupObject (value0, typeof (TQListViewItem)) as TQListViewItem; - TQListViewItem csvalue1 = QtSupport.LookupObject (value1, typeof (TQListViewItem)) as TQListViewItem; - TQListViewItem csvalue2 = QtSupport.LookupObject (value2, typeof (TQListViewItem)) as TQListViewItem; + TTQListViewItem csvalue0 = QtSupport.LookupObject (value0, typeof (TTQListViewItem)) as TTQListViewItem; + TTQListViewItem csvalue1 = QtSupport.LookupObject (value1, typeof (TTQListViewItem)) as TTQListViewItem; + TTQListViewItem csvalue2 = QtSupport.LookupObject (value2, typeof (TTQListViewItem)) as TTQListViewItem; Invoke (new object[] {csvalue0, csvalue1, csvalue2}); } public void SlotBridge_QNetworkOperation (IntPtr value0) { - TQNetworkOperation csvalue0 = QtSupport.LookupObject (value0, typeof (TQNetworkOperation)) as TQNetworkOperation; + TTQNetworkOperation csvalue0 = QtSupport.LookupObject (value0, typeof (TTQNetworkOperation)) as TTQNetworkOperation; Invoke (new object[] {csvalue0}); } public void SlotBridge_QObject (IntPtr value0) { - TQObject csvalue0 = QtSupport.LookupObject (value0, typeof (TQObject)) as TQObject; + TTQObject csvalue0 = QtSupport.LookupObject (value0, typeof (TTQObject)) as TTQObject; Invoke (new object[] {csvalue0}); } public void SlotBridge_QToolBar (IntPtr value0) { - TQToolBar csvalue0 = QtSupport.LookupObject (value0, typeof (TQToolBar)) as TQToolBar; + TTQToolBar csvalue0 = QtSupport.LookupObject (value0, typeof (TTQToolBar)) as TTQToolBar; Invoke (new object[] {csvalue0}); } public void SlotBridge_QWidget (IntPtr value0) { - TQWidget csvalue0 = QtSupport.LookupObject (value0, typeof (TQWidget)) as TQWidget; + TTQWidget csvalue0 = QtSupport.LookupObject (value0, typeof (TTQWidget)) as TTQWidget; Invoke (new object[] {csvalue0}); } - public void SlotBridge_intQIconViewItem (int value0, IntPtr value1) + public void SlotBridge_intTQIconViewItem (int value0, IntPtr value1) { - TQIconViewItem csvalue1 = QtSupport.LookupObject (value1, typeof (TQIconViewItem)) as TQIconViewItem; + TTQIconViewItem csvalue1 = QtSupport.LookupObject (value1, typeof (TTQIconViewItem)) as TTQIconViewItem; Invoke (new object[] {value0, csvalue1}); } - public void SlotBridge_intQListBoxItem (int value0, IntPtr value1) + public void SlotBridge_intTQListBoxItem (int value0, IntPtr value1) { - TQListBoxItem csvalue1 = QtSupport.LookupObject (value1, typeof (TQListBoxItem)) as TQListBoxItem; + TTQListBoxItem csvalue1 = QtSupport.LookupObject (value1, typeof (TTQListBoxItem)) as TTQListBoxItem; Invoke (new object[] {value0, csvalue1}); } @@ -209,7 +209,7 @@ namespace Qt { } } - private static MethodInfo LookupSlot(TQObject receiver, string name, string args) + private static MethodInfo LookupSlot(TTQObject receiver, string name, string args) { MethodInfo ret = null; diff --git a/qtsharp/src/bindings/static/QtSupport.cs b/qtsharp/src/bindings/static/QtSupport.cs index c0ad30ed..acb45de7 100644 --- a/qtsharp/src/bindings/static/QtSupport.cs +++ b/qtsharp/src/bindings/static/QtSupport.cs @@ -33,7 +33,7 @@ namespace Qt { private static QtEventHandler qtEventHandler; - // Runtime flags, set by TQApplication.ParseArguments + // Runtime flags, set by TTQApplication.ParseArguments internal static bool enableDebug; internal static bool disableTracking; internal static bool traceObjects; @@ -66,16 +66,16 @@ namespace Qt { get { return disposed; } } - public QtSupport QParent { + public QtSupport TQParent { get { return qparent; } } - public ArrayList QChildren { + public ArrayList TQChildren { get { return qchildren; } } // A dummy constructor for inherited classes - internal QtSupport (QNull dummy) { + internal QtSupport (TQNull dummy) { disposed = false; deleted = false; qchildren = new ArrayList (); @@ -129,19 +129,19 @@ namespace Qt { /************************** General Utility Methods *********************************/ - public static void QAssert (bool value) + public static void TQAssert (bool value) { if (!value) throw new ApplicationException ("Assertion failed"); } - public static void QAssert (bool value, string message) + public static void TQAssert (bool value, string message) { if (!value) throw new ApplicationException ("Assertion failed: " + message); } - internal bool IsQObject () + internal bool IsTQObject () { - return GetType ().IsSubclassOf (typeof (TQObject)); + return GetType ().IsSubclassOf (typeof (TTQObject)); } internal static void WarnMsg (string format, params object[] arg) @@ -196,7 +196,7 @@ namespace Qt { if (QtObjects.ContainsKey (o.RawObject)) { wref = QtObjects[o.RawObject] as WeakReference; - QAssert (! wref.IsAlive, + TQAssert (! wref.IsAlive, "New object "+o+" has same RawObject as "+(QtSupport)wref.Target+"! Please report this error!"); replacing = "(replacing)"; QtObjects.Remove (o.RawObject); @@ -283,7 +283,7 @@ namespace Qt { new object[] {ptr}, null); - // FIXME Must handle cases where qtsObj is a TQObject root + // FIXME Must handle cases where qtsObj is a TTQObject root // or child. Should we box the entire object tree in // C#? Also, RegisterObject will only track this object // if it is a root node. Child nodes are assumed to be @@ -316,7 +316,7 @@ namespace Qt { private delegate void QtEventHandler (IntPtr instance, string eventname, IntPtr eventinstance, string eventclass); - private static QEventList eventList = new QEventList (); + private static TQEventList eventList = new TQEventList (); [DllImport("libqtsharp", CharSet=CharSet.Ansi)] private static extern void qtsharp_QObject_registerEventDelegate @@ -328,37 +328,37 @@ namespace Qt { qtsharp_QObject_registerEventDelegate (qtEventHandler); } - internal static QEventList EventList { + internal static TQEventList EventList { get { return eventList; } } private static void DispatchEvent (IntPtr instance, string eventname, IntPtr eventinstance, string eventclass) { ArrayList array; - TQObject obj; - TQEvent ev; + TTQObject obj; + TTQEvent ev; Type evtype = Type.GetType ("Qt."+eventclass+",Qt"); - if ((obj = (TQObject)LookupObject (instance)) == null) return; + if ((obj = (TTQObject)LookupObject (instance)) == null) return; try { - if ((ev = (TQEvent)LookupObject (eventinstance)) == null) { + if ((ev = (TTQEvent)LookupObject (eventinstance)) == null) { object[] args = new object[] { eventinstance }; BindingFlags bflags = BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public; - ev = Activator.CreateInstance (evtype, bflags, null, args, null) as TQEvent; + ev = Activator.CreateInstance (evtype, bflags, null, args, null) as TTQEvent; } // Notify global event handlers first. - if ((array = EventList.QEventHandlers (eventclass)) != null) { + if ((array = EventList.TQEventHandlers (eventclass)) != null) { foreach (Delegate del in array) { - QEventArgs evargs = new QEventArgs (eventname, ev); + TQEventArgs evargs = new TQEventArgs (eventname, ev); del.DynamicInvoke (new object[] { obj, evargs }); } } // Notify local event handlers second. - if ((array = EventList.QEventHandlers (eventname)) != null) { + if ((array = EventList.TQEventHandlers (eventname)) != null) { foreach (Delegate del in array) { if (ReferenceEquals (del.Target, obj)) del.DynamicInvoke (new object[] { ev }); @@ -374,93 +374,93 @@ namespace Qt { } // Global events. - public static event QChildHandler childHandler { - add { EventList.Add ("TQChildEvent", value); } - remove { EventList.Remove ("TQChildEvent", value); } + public static event TQChildHandler childHandler { + add { EventList.Add ("TTQChildEvent", value); } + remove { EventList.Remove ("TTQChildEvent", value); } } - public static event QDragEnterHandler dragEnterHandler { - add { EventList.Add ("TQDragEnterEvent", value); } - remove { EventList.Remove ("TQDragEnterEvent", value); } + public static event TQDragEnterHandler dragEnterHandler { + add { EventList.Add ("TTQDragEnterEvent", value); } + remove { EventList.Remove ("TTQDragEnterEvent", value); } } - public static event QDropHandler dropHandler { - add { EventList.Add ("TQDropEvent", value); } - remove { EventList.Remove ("TQDropEvent", value); } + public static event TQDropHandler dropHandler { + add { EventList.Add ("TTQDropEvent", value); } + remove { EventList.Remove ("TTQDropEvent", value); } } - public static event QIMHandler imHandler { - add { EventList.Add ("QIMEvent", value); } - remove { EventList.Remove ("QIMEvent", value); } + public static event TQIMHandler imHandler { + add { EventList.Add ("TQIMEvent", value); } + remove { EventList.Remove ("TQIMEvent", value); } } - public static event QPaintHandler paintHandler { - add { EventList.Add ("TQPaintEvent", value); } - remove { EventList.Remove ("TQPaintEvent", value); } + public static event TQPaintHandler paintHandler { + add { EventList.Add ("TTQPaintEvent", value); } + remove { EventList.Remove ("TTQPaintEvent", value); } } - public static event QTimerHandler timerHandler { - add { EventList.Add ("TQTimerEvent", value); } - remove { EventList.Remove ("TQTimerEvent", value); } + public static event TQTimerHandler timerHandler { + add { EventList.Add ("TTQTimerEvent", value); } + remove { EventList.Remove ("TTQTimerEvent", value); } } - public static event QCloseHandler closeHandler { - add { EventList.Add ("TQCloseEvent", value); } - remove { EventList.Remove ("TQCloseEvent", value); } + public static event TQCloseHandler closeHandler { + add { EventList.Add ("TTQCloseEvent", value); } + remove { EventList.Remove ("TTQCloseEvent", value); } } - public static event QDragLeaveHandler dragLeaveHandler { - add { EventList.Add ("TQDragLeaveEvent", value); } - remove { EventList.Remove ("TQDragLeaveEvent", value); } + public static event TQDragLeaveHandler dragLeaveHandler { + add { EventList.Add ("TTQDragLeaveEvent", value); } + remove { EventList.Remove ("TTQDragLeaveEvent", value); } } - public static event QEventHandler eventHandler { - add { EventList.Add ("QEventEvent", value); } - remove { EventList.Remove ("QEventEvent", value); } + public static event TQEventHandler eventHandler { + add { EventList.Add ("TQEventEvent", value); } + remove { EventList.Remove ("TQEventEvent", value); } } - public static event QKeyHandler keyHandler { - add { EventList.Add ("TQKeyEvent", value); } - remove { EventList.Remove ("TQKeyEvent", value); } + public static event TQKeyHandler keyHandler { + add { EventList.Add ("TTQKeyEvent", value); } + remove { EventList.Remove ("TTQKeyEvent", value); } } - public static event QResizeHandler resizeHandler { - add { EventList.Add ("TQResizeEvent", value); } - remove { EventList.Remove ("TQResizeEvent", value); } + public static event TQResizeHandler resizeHandler { + add { EventList.Add ("TTQResizeEvent", value); } + remove { EventList.Remove ("TTQResizeEvent", value); } } - public static event QWheelHandler wheelHandler { - add { EventList.Add ("TQWheelEvent", value); } - remove { EventList.Remove ("TQWheelEvent", value); } + public static event TQWheelHandler wheelHandler { + add { EventList.Add ("TTQWheelEvent", value); } + remove { EventList.Remove ("TTQWheelEvent", value); } } - public static event QContextMenuHandler contextMenuHandler { - add { EventList.Add ("TQContextMenuEvent", value); } - remove { EventList.Remove ("TQContextMenuEvent", value); } + public static event TQContextMenuHandler contextMenuHandler { + add { EventList.Add ("TTQContextMenuEvent", value); } + remove { EventList.Remove ("TTQContextMenuEvent", value); } } - public static event QDragMoveHandler dragMoveHandler { - add { EventList.Add ("TQDragMoveEvent", value); } - remove { EventList.Remove ("TQDragMoveEvent", value); } + public static event TQDragMoveHandler dragMoveHandler { + add { EventList.Add ("TTQDragMoveEvent", value); } + remove { EventList.Remove ("TTQDragMoveEvent", value); } } - public static event QFocusHandler focusHandler { - add { EventList.Add ("TQFocusEvent", value); } - remove { EventList.Remove ("TQFocusEvent", value); } + public static event TQFocusHandler focusHandler { + add { EventList.Add ("TTQFocusEvent", value); } + remove { EventList.Remove ("TTQFocusEvent", value); } } - public static event QMouseHandler mouseHandler { - add { EventList.Add ("TQMouseEvent", value); } - remove { EventList.Remove ("TQMouseEvent", value); } + public static event TQMouseHandler mouseHandler { + add { EventList.Add ("TTQMouseEvent", value); } + remove { EventList.Remove ("TTQMouseEvent", value); } } - public static event QShowHandler showHandler { - add { EventList.Add ("TQShowEvent", value); } - remove { EventList.Remove ("TQShowEvent", value); } + public static event TQShowHandler showHandler { + add { EventList.Add ("TTQShowEvent", value); } + remove { EventList.Remove ("TTQShowEvent", value); } } - public static event QCustomHandler customHandler { - add { EventList.Add ("TQCustomEvent", value); } - remove { EventList.Remove ("TQCustomEvent", value); } + public static event TQCustomHandler customHandler { + add { EventList.Add ("TTQCustomEvent", value); } + remove { EventList.Remove ("TTQCustomEvent", value); } } - public static event QDragResponseHandler dragResponseHandler { - add { EventList.Add ("TQDragResponseEvent", value); } - remove { EventList.Remove ("TQDragResponseEvent", value); } + public static event TQDragResponseHandler dragResponseHandler { + add { EventList.Add ("TTQDragResponseEvent", value); } + remove { EventList.Remove ("TTQDragResponseEvent", value); } } - public static event QHideHandler hideHandler { - add { EventList.Add ("TQHideEvent", value); } - remove { EventList.Remove ("TQHideEvent", value); } + public static event TQHideHandler hideHandler { + add { EventList.Add ("TTQHideEvent", value); } + remove { EventList.Remove ("TTQHideEvent", value); } } - public static event QMoveHandler moveHandler { - add { EventList.Add ("TQMoveEvent", value); } - remove { EventList.Remove ("TQMoveEvent", value); } + public static event TQMoveHandler moveHandler { + add { EventList.Add ("TTQMoveEvent", value); } + remove { EventList.Remove ("TTQMoveEvent", value); } } - public static event QTabletHandler tabletHandler { - add { EventList.Add ("TQTabletEvent", value); } - remove { EventList.Remove ("TQTabletEvent", value); } + public static event TQTabletHandler tabletHandler { + add { EventList.Add ("TTQTabletEvent", value); } + remove { EventList.Remove ("TTQTabletEvent", value); } } // Local events. @@ -670,81 +670,81 @@ namespace Qt { } // The local event delegates. - protected delegate void ChildEvent (TQChildEvent e); - protected delegate void CloseEvent (TQCloseEvent e); - protected delegate void ContentsContextMenuEvent (TQContextMenuEvent e); - protected delegate void ContentsDragEnterEvent (TQDragEnterEvent e); - protected delegate void ContentsDragLeaveEvent (TQDragLeaveEvent e); - protected delegate void ContentsDragMoveEvent (TQDragMoveEvent e); - protected delegate void ContentsDropEvent (TQDropEvent e); - protected delegate void ContentsMouseDoubleClickEvent (TQMouseEvent e); - protected delegate void ContentsMouseMoveEvent (TQMouseEvent e); - protected delegate void ContentsMousePressEvent (TQMouseEvent e); - protected delegate void ContentsMouseReleaseEvent (TQMouseEvent e); - protected delegate void ContentsWheelEvent (TQWheelEvent e); - protected delegate void ContextMenuEvent (TQContextMenuEvent e); - protected delegate void CustomEvent (TQCustomEvent e); - protected delegate void DragEnterEvent (TQDragEnterEvent e); - protected delegate void DragLeaveEvent (TQDragLeaveEvent e); - protected delegate void DragMoveEvent (TQDragMoveEvent e); - protected delegate void DropEvent (TQDropEvent e); - protected delegate void EnterEvent (TQEvent e); - protected delegate void FocusInEvent (TQFocusEvent e); - protected delegate void FocusOutEvent (TQFocusEvent e); - protected delegate void HideEvent (TQHideEvent e); - protected delegate void IMComposeEvent (TQIMEvent e); - protected delegate void IMEndEvent (TQIMEvent e); - protected delegate void IMStartEvent (TQIMEvent e); - protected delegate void KeyPressEvent (TQKeyEvent e); - protected delegate void KeyReleaseEvent (TQKeyEvent e); - protected delegate void LeaveEvent (TQEvent e); - protected delegate void MouseDoubleClickEvent (TQMouseEvent e); - protected delegate void MouseMoveEvent (TQMouseEvent e); - protected delegate void MousePressEvent (TQMouseEvent e); - protected delegate void MouseReleaseEvent (TQMouseEvent e); - protected delegate void MoveEvent (TQMoveEvent e); - protected delegate void PaintEvent (TQPaintEvent e); - protected delegate void ResizeEvent (TQResizeEvent e); - protected delegate void ShowEvent (TQShowEvent e); - protected delegate void TabletEvent (TQTabletEvent e); - protected delegate void TimerEvent (TQTimerEvent e); - protected delegate void ViewportContextMenuEvent (TQContextMenuEvent e); - protected delegate void ViewportDragEnterEvent (TQDragEnterEvent e); - protected delegate void ViewportDragLeaveEvent (TQDragLeaveEvent e); - protected delegate void ViewportDragMoveEvent (TQDragMoveEvent e); - protected delegate void ViewportDropEvent (TQDropEvent e); - protected delegate void ViewportMouseDoubleClickEvent (TQMouseEvent e); - protected delegate void ViewportMouseMoveEvent (TQMouseEvent e); - protected delegate void ViewportMousePressEvent (TQMouseEvent e); - protected delegate void ViewportMouseReleaseEvent (TQMouseEvent e); - protected delegate void ViewportPaintEvent (TQPaintEvent e); - protected delegate void ViewportResizeEvent (TQResizeEvent e); - protected delegate void ViewportWheelEvent (TQWheelEvent e); - protected delegate void WheelEvent (TQWheelEvent e); + protected delegate void ChildEvent (TTQChildEvent e); + protected delegate void CloseEvent (TTQCloseEvent e); + protected delegate void ContentsContextMenuEvent (TTQContextMenuEvent e); + protected delegate void ContentsDragEnterEvent (TTQDragEnterEvent e); + protected delegate void ContentsDragLeaveEvent (TTQDragLeaveEvent e); + protected delegate void ContentsDragMoveEvent (TTQDragMoveEvent e); + protected delegate void ContentsDropEvent (TTQDropEvent e); + protected delegate void ContentsMouseDoubleClickEvent (TTQMouseEvent e); + protected delegate void ContentsMouseMoveEvent (TTQMouseEvent e); + protected delegate void ContentsMousePressEvent (TTQMouseEvent e); + protected delegate void ContentsMouseReleaseEvent (TTQMouseEvent e); + protected delegate void ContentsWheelEvent (TTQWheelEvent e); + protected delegate void ContextMenuEvent (TTQContextMenuEvent e); + protected delegate void CustomEvent (TTQCustomEvent e); + protected delegate void DragEnterEvent (TTQDragEnterEvent e); + protected delegate void DragLeaveEvent (TTQDragLeaveEvent e); + protected delegate void DragMoveEvent (TTQDragMoveEvent e); + protected delegate void DropEvent (TTQDropEvent e); + protected delegate void EnterEvent (TTQEvent e); + protected delegate void FocusInEvent (TTQFocusEvent e); + protected delegate void FocusOutEvent (TTQFocusEvent e); + protected delegate void HideEvent (TTQHideEvent e); + protected delegate void IMComposeEvent (TTQIMEvent e); + protected delegate void IMEndEvent (TTQIMEvent e); + protected delegate void IMStartEvent (TTQIMEvent e); + protected delegate void KeyPressEvent (TTQKeyEvent e); + protected delegate void KeyReleaseEvent (TTQKeyEvent e); + protected delegate void LeaveEvent (TTQEvent e); + protected delegate void MouseDoubleClickEvent (TTQMouseEvent e); + protected delegate void MouseMoveEvent (TTQMouseEvent e); + protected delegate void MousePressEvent (TTQMouseEvent e); + protected delegate void MouseReleaseEvent (TTQMouseEvent e); + protected delegate void MoveEvent (TTQMoveEvent e); + protected delegate void PaintEvent (TTQPaintEvent e); + protected delegate void ResizeEvent (TTQResizeEvent e); + protected delegate void ShowEvent (TTQShowEvent e); + protected delegate void TabletEvent (TTQTabletEvent e); + protected delegate void TimerEvent (TTQTimerEvent e); + protected delegate void ViewportContextMenuEvent (TTQContextMenuEvent e); + protected delegate void ViewportDragEnterEvent (TTQDragEnterEvent e); + protected delegate void ViewportDragLeaveEvent (TTQDragLeaveEvent e); + protected delegate void ViewportDragMoveEvent (TTQDragMoveEvent e); + protected delegate void ViewportDropEvent (TTQDropEvent e); + protected delegate void ViewportMouseDoubleClickEvent (TTQMouseEvent e); + protected delegate void ViewportMouseMoveEvent (TTQMouseEvent e); + protected delegate void ViewportMousePressEvent (TTQMouseEvent e); + protected delegate void ViewportMouseReleaseEvent (TTQMouseEvent e); + protected delegate void ViewportPaintEvent (TTQPaintEvent e); + protected delegate void ViewportResizeEvent (TTQResizeEvent e); + protected delegate void ViewportWheelEvent (TTQWheelEvent e); + protected delegate void WheelEvent (TTQWheelEvent e); } // The global event delegates. - public delegate void QChildHandler (TQObject sender, QEventArgs e); - public delegate void QDragEnterHandler (TQObject sender, QEventArgs e); - public delegate void QDropHandler (TQObject sender, QEventArgs e); - public delegate void QIMHandler (TQObject sender, QEventArgs e); - public delegate void QPaintHandler (TQObject sender, QEventArgs e); - public delegate void QTimerHandler (TQObject sender, QEventArgs e); - public delegate void QCloseHandler (TQObject sender, QEventArgs e); - public delegate void QDragLeaveHandler (TQObject sender, QEventArgs e); - public delegate void QEventHandler (TQObject sender, QEventArgs e); - public delegate void QKeyHandler (TQObject sender, QEventArgs e); - public delegate void QResizeHandler (TQObject sender, QEventArgs e); - public delegate void QWheelHandler (TQObject sender, QEventArgs e); - public delegate void QContextMenuHandler (TQObject sender, QEventArgs e); - public delegate void QDragMoveHandler (TQObject sender, QEventArgs e); - public delegate void QFocusHandler (TQObject sender, QEventArgs e); - public delegate void QMouseHandler (TQObject sender, QEventArgs e); - public delegate void QShowHandler (TQObject sender, QEventArgs e); - public delegate void QCustomHandler (TQObject sender, QEventArgs e); - public delegate void QDragResponseHandler (TQObject sender, QEventArgs e); - public delegate void QHideHandler (TQObject sender, QEventArgs e); - public delegate void QMoveHandler (TQObject sender, QEventArgs e); - public delegate void QTabletHandler (TQObject sender, QEventArgs e); + public delegate void TQChildHandler (TTQObject sender, TQEventArgs e); + public delegate void TQDragEnterHandler (TTQObject sender, TQEventArgs e); + public delegate void TQDropHandler (TTQObject sender, TQEventArgs e); + public delegate void TQIMHandler (TTQObject sender, TQEventArgs e); + public delegate void TQPaintHandler (TTQObject sender, TQEventArgs e); + public delegate void TQTimerHandler (TTQObject sender, TQEventArgs e); + public delegate void TQCloseHandler (TTQObject sender, TQEventArgs e); + public delegate void TQDragLeaveHandler (TTQObject sender, TQEventArgs e); + public delegate void TQEventHandler (TTQObject sender, TQEventArgs e); + public delegate void TQKeyHandler (TTQObject sender, TQEventArgs e); + public delegate void TQResizeHandler (TTQObject sender, TQEventArgs e); + public delegate void TQWheelHandler (TTQObject sender, TQEventArgs e); + public delegate void TQContextMenuHandler (TTQObject sender, TQEventArgs e); + public delegate void TQDragMoveHandler (TTQObject sender, TQEventArgs e); + public delegate void TQFocusHandler (TTQObject sender, TQEventArgs e); + public delegate void TQMouseHandler (TTQObject sender, TQEventArgs e); + public delegate void TQShowHandler (TTQObject sender, TQEventArgs e); + public delegate void TQCustomHandler (TTQObject sender, TQEventArgs e); + public delegate void TQDragResponseHandler (TTQObject sender, TQEventArgs e); + public delegate void TQHideHandler (TTQObject sender, TQEventArgs e); + public delegate void TQMoveHandler (TTQObject sender, TQEventArgs e); + public delegate void TQTabletHandler (TTQObject sender, TQEventArgs e); } diff --git a/qtsharp/src/bindings/static/RasterOp.cs b/qtsharp/src/bindings/static/RasterOp.cs index 95c4452c..0e2adb56 100644 --- a/qtsharp/src/bindings/static/RasterOp.cs +++ b/qtsharp/src/bindings/static/RasterOp.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // diff --git a/qtsharp/src/bindings/static/StringComparisonMode.cs b/qtsharp/src/bindings/static/StringComparisonMode.cs index 6253646c..7502d010 100644 --- a/qtsharp/src/bindings/static/StringComparisonMode.cs +++ b/qtsharp/src/bindings/static/StringComparisonMode.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // diff --git a/qtsharp/src/bindings/static/TextFlags.cs b/qtsharp/src/bindings/static/TextFlags.cs index ebfb9d53..64cd1577 100644 --- a/qtsharp/src/bindings/static/TextFlags.cs +++ b/qtsharp/src/bindings/static/TextFlags.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // diff --git a/qtsharp/src/bindings/static/TextFormat.cs b/qtsharp/src/bindings/static/TextFormat.cs index d2eab137..fe7e7923 100644 --- a/qtsharp/src/bindings/static/TextFormat.cs +++ b/qtsharp/src/bindings/static/TextFormat.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // diff --git a/qtsharp/src/bindings/static/UIEffect.cs b/qtsharp/src/bindings/static/UIEffect.cs index 3eb93662..87cc25d1 100644 --- a/qtsharp/src/bindings/static/UIEffect.cs +++ b/qtsharp/src/bindings/static/UIEffect.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // diff --git a/qtsharp/src/bindings/static/WidgetFlags.cs b/qtsharp/src/bindings/static/WidgetFlags.cs index 748e6ef5..4867d1fb 100644 --- a/qtsharp/src/bindings/static/WidgetFlags.cs +++ b/qtsharp/src/bindings/static/WidgetFlags.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // diff --git a/qtsharp/src/bindings/static/WidgetState.cs b/qtsharp/src/bindings/static/WidgetState.cs index 7d2f3383..a511c148 100644 --- a/qtsharp/src/bindings/static/WidgetState.cs +++ b/qtsharp/src/bindings/static/WidgetState.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // diff --git a/qtsharp/src/bindings/static/WindowsVersion.cs b/qtsharp/src/bindings/static/WindowsVersion.cs index 68e75c43..eac1440b 100644 --- a/qtsharp/src/bindings/static/WindowsVersion.cs +++ b/qtsharp/src/bindings/static/WindowsVersion.cs @@ -1,4 +1,4 @@ -// TQApplication.cs - A Qt to C# binding. +// TTQApplication.cs - A Qt to C# binding. // // Copyright (C) 2002 Adam Treat (manyoso@yahoo.com) // diff --git a/qtsharp/src/examples/samples/display.cs b/qtsharp/src/examples/samples/display.cs index 9f2f4939..00703b4b 100644 --- a/qtsharp/src/examples/samples/display.cs +++ b/qtsharp/src/examples/samples/display.cs @@ -3,20 +3,20 @@ namespace QtSamples { using Qt; using System; - public class Display : TQMainWindow { + public class Display : TTQMainWindow { private TextArea textarea; - private TQScrollView scrollview; - private TQMenuBar menubar; - private TQPopupMenu filemenu, aboutmenu; + private TTQScrollView scrollview; + private TTQMenuBar menubar; + private TTQPopupMenu filemenu, aboutmenu; - private class TextArea : TQTextEdit { + private class TextArea : TTQTextEdit { - public TextArea (TQWidget parent) : base (parent) + public TextArea (TTQWidget parent) : base (parent) { - TQFile file = new TQFile ("display.cs"); + TTQFile file = new TTQFile ("display.cs"); if ( file.Open(1) ) { - TQTextStream ts = new TQTextStream (file); + TTQTextStream ts = new TTQTextStream (file); this.SetText (ts.Read ()); this.SetTabStopWidth (30); } @@ -25,13 +25,13 @@ namespace QtSamples { public Display () { - filemenu = new TQPopupMenu (null, "filemenu"); + filemenu = new TTQPopupMenu (null, "filemenu"); filemenu.InsertItem ("&Quit", qApp, TQT_SLOT ("quit()")); - aboutmenu = new TQPopupMenu(null, "aboutmenu"); + aboutmenu = new TTQPopupMenu(null, "aboutmenu"); aboutmenu.InsertItem("&About Qt-Sharp", this, TQT_SLOT("slotAbout()")); - menubar = new TQMenuBar(this, ""); + menubar = new TTQMenuBar(this, ""); menubar.InsertItem("&File", filemenu); menubar.InsertItem("&About", aboutmenu); @@ -42,7 +42,7 @@ namespace QtSamples { public void slotAbout () { - TQMessageBox.Information ( + TTQMessageBox.Information ( this, "About Qt-Sharp-0.7", "A Qt (http://www.trolltech.com) to C# language binding.\n" + "Qt-Sharp is compatible with Mono (http://go-mono.org) and\n" + @@ -53,7 +53,7 @@ namespace QtSamples { public static void Main (String[] args) { - TQApplication app = new TQApplication (args); + TTQApplication app = new TTQApplication (args); Display demo = new Display (); demo.SetCaption ("Qt-Sharp-0.7!"); app.SetMainWidget (demo); diff --git a/qtsharp/src/examples/samples/emit.cs b/qtsharp/src/examples/samples/emit.cs index 125166a2..a15868db 100644 --- a/qtsharp/src/examples/samples/emit.cs +++ b/qtsharp/src/examples/samples/emit.cs @@ -6,12 +6,12 @@ namespace QtSamples { using Qt; [DeclareQtSignal ("MySignal()")] - public class EmitSample: TQVBox { + public class EmitSample: TTQVBox { public EmitSample (): this (null, "") {} - public EmitSample (TQWidget parent, string name): base () + public EmitSample (TTQWidget parent, string name): base () { - TQPushButton pb = new TQPushButton ("Papa Smurf", this); + TTQPushButton pb = new TTQPushButton ("Papa Smurf", this); Connect (pb, TQT_SIGNAL ("clicked ()"), TQT_SLOT ("DoEmit ()")); Connect (this, TQT_SIGNAL ("MySignal ()"), TQT_SLOT ("PrintStuff ()")); @@ -29,7 +29,7 @@ namespace QtSamples { public static int Main (string[] args) { - TQApplication app = new TQApplication (args); + TTQApplication app = new TTQApplication (args); EmitSample es = new EmitSample (); app.SetMainWidget (es); es.Show (); diff --git a/qtsharp/src/examples/samples/eventhandling.cs b/qtsharp/src/examples/samples/eventhandling.cs index 2372d766..30928a63 100644 --- a/qtsharp/src/examples/samples/eventhandling.cs +++ b/qtsharp/src/examples/samples/eventhandling.cs @@ -11,11 +11,11 @@ namespace QtSamples { using Qt; using System; - public class EventHandling : TQVBox { + public class EventHandling : TTQVBox { public static void Main (String[] args) { - TQApplication app = new TQApplication (args); + TTQApplication app = new TTQApplication (args); EventHandling evh = new EventHandling (); app.SetMainWidget (evh); evh.Show (); @@ -24,26 +24,26 @@ namespace QtSamples { public EventHandling () : base (null) { - // This is the global event handler for QMouseEvents - mouseHandler += new QMouseHandler(mouseEvents); + // This is the global event handler for TQMouseEvents + mouseHandler += new TQMouseHandler(mouseEvents); MyButton pb = new MyButton (this); } - public void mouseEvents (TQObject sender, QEventArgs e) + public void mouseEvents (TTQObject sender, TQEventArgs e) { Console.WriteLine ("Mouse event: " + e.Name); } - class MyButton : TQPushButton { + class MyButton : TTQPushButton { - public MyButton (TQWidget parent) : base ("Hello Qt-Sharp-0.7!", parent) + public MyButton (TTQWidget parent) : base ("Hello Qt-Sharp-0.7!", parent) { // This is the local event handler for mousePressEvents mousePressEvent += new MousePressEvent (pressEvent); } - public void pressEvent (TQMouseEvent e) + public void pressEvent (TTQMouseEvent e) { Console.WriteLine ("I've been clicked"); } diff --git a/qtsharp/src/examples/samples/hello.cs b/qtsharp/src/examples/samples/hello.cs index 1039aa34..81a5eb89 100644 --- a/qtsharp/src/examples/samples/hello.cs +++ b/qtsharp/src/examples/samples/hello.cs @@ -11,11 +11,11 @@ namespace QtSamples { using Qt; using System; - public class HelloWorld : TQVBox { + public class HelloWorld : TTQVBox { public static void Main (String[] args) { - TQApplication app = new TQApplication (args); + TTQApplication app = new TTQApplication (args); HelloWorld hello = new HelloWorld (); app.SetMainWidget (hello); hello.Show (); @@ -24,13 +24,13 @@ 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()")); + TTQPushButton pb = new TTQPushButton ("Hello Qt-Sharp-0.7!", this); + TTQObject.Connect (pb, TQT_SIGNAL ("clicked()"), this, TQT_SLOT("SlotClicked()")); } public void SlotClicked () { - Console.WriteLine ("TQPushButton Clicked!"); + Console.WriteLine ("TTQPushButton Clicked!"); } } } diff --git a/qtsharp/src/examples/samples/mandelbrot.cs b/qtsharp/src/examples/samples/mandelbrot.cs index 3850b781..cecd6286 100644 --- a/qtsharp/src/examples/samples/mandelbrot.cs +++ b/qtsharp/src/examples/samples/mandelbrot.cs @@ -106,7 +106,7 @@ public class Mandelbrot { public static void Main (string[] args) { - TQApplication app = new TQApplication (args); + TTQApplication app = new TTQApplication (args); ImageDialog dialog = new ImageDialog (null, "Mandelbrot", false, 0); dialog.Show (); @@ -117,109 +117,109 @@ public class Mandelbrot { } -public class ImageDialog : TQDialog { +public class ImageDialog : TTQDialog { const double DefaultPlotXMin = -2.0; const double DefaultPlotXMax = 2.0; const double DefaultPlotYMin = -1.5; const double DefaultPlotYMax = 1.5; - TQHBoxLayout dialogLayout; - TQGridLayout gridLayout; - TQVBoxLayout leftLayout; - TQHBoxLayout buttonLayout; - TQPushButton redrawButton; - TQLabel pixmapLabel; - TQSizePolicy fixedSizePolicy; + TTQHBoxLayout dialogLayout; + TTQGridLayout gridLayout; + TTQVBoxLayout leftLayout; + TTQHBoxLayout buttonLayout; + TTQPushButton redrawButton; + TTQLabel pixmapLabel; + TTQSizePolicy fixedSizePolicy; - TQLabel XMinLabel, XMaxLabel, YMinLabel, YMaxLabel; - TQLineEdit editXMin, editXMax, editYMin, editYMax; + TTQLabel XMinLabel, XMaxLabel, YMinLabel, YMaxLabel; + TTQLineEdit editXMin, editXMax, editYMin, editYMax; - public ImageDialog (TQWidget parent, string name, bool modal, WidgetFlags fl): + public ImageDialog (TTQWidget parent, string name, bool modal, WidgetFlags fl): base (parent, name, modal, fl) { if (name == string.Empty) SetName ("imageDialog"); SetCaption ("Mandelbrot Image"); - dialogLayout = new TQHBoxLayout (this, 11, 6); - gridLayout = new TQGridLayout (null, 1, 1, 0, 6, "gridLayout"); - leftLayout = new TQVBoxLayout (null, 0, 6, "leftLayout"); + dialogLayout = new TTQHBoxLayout (this, 11, 6); + gridLayout = new TTQGridLayout (null, 1, 1, 0, 6, "gridLayout"); + leftLayout = new TTQVBoxLayout (null, 0, 6, "leftLayout"); - fixedSizePolicy = new TQSizePolicy (); - fixedSizePolicy.SetHorData (TQSizePolicy.SizeType.Fixed); - fixedSizePolicy.SetVerData (TQSizePolicy.SizeType.Fixed); + fixedSizePolicy = new TTQSizePolicy (); + fixedSizePolicy.SetHorData (TTQSizePolicy.SizeType.Fixed); + fixedSizePolicy.SetVerData (TTQSizePolicy.SizeType.Fixed); - XMinLabel = new TQLabel ("Xmin", this); + XMinLabel = new TTQLabel ("Xmin", this); XMinLabel.SetSizePolicy (fixedSizePolicy); gridLayout.AddWidget (XMinLabel, 0, 0); - XMaxLabel = new TQLabel ("Xmax", this); + XMaxLabel = new TTQLabel ("Xmax", this); XMaxLabel.SetSizePolicy(fixedSizePolicy); gridLayout.AddWidget (XMaxLabel, 1, 0); - YMinLabel = new TQLabel ("Ymin", this); + YMinLabel = new TTQLabel ("Ymin", this); YMinLabel.SetSizePolicy (fixedSizePolicy); gridLayout.AddWidget (YMinLabel, 2, 0); - YMaxLabel = new TQLabel ("Ymax", this); + YMaxLabel = new TTQLabel ("Ymax", this); YMaxLabel.SetSizePolicy (fixedSizePolicy); gridLayout.AddWidget (YMaxLabel, 3, 0); - TQDoubleValidator validator = new TQDoubleValidator (this); + TTQDoubleValidator validator = new TTQDoubleValidator (this); - editXMin = new TQLineEdit (this, "editXMin"); + editXMin = new TTQLineEdit (this, "editXMin"); editXMin.SetText (Convert.ToString (DefaultPlotXMin)); editXMin.SetValidator (validator); gridLayout.AddWidget (editXMin, 0, 1); - editXMax = new TQLineEdit (this, "editXMax"); + editXMax = new TTQLineEdit (this, "editXMax"); editXMax.SetText (Convert.ToString(DefaultPlotXMax)); editXMax.SetValidator (validator); gridLayout.AddWidget (editXMax, 1, 1); - editYMin = new TQLineEdit (this, "editYMin"); + editYMin = new TTQLineEdit (this, "editYMin"); editYMin.SetText (Convert.ToString(DefaultPlotYMin)); editYMin.SetValidator (validator); gridLayout.AddWidget (editYMin, 2, 1); - editYMax = new TQLineEdit (this, "editYMax"); + editYMax = new TTQLineEdit (this, "editYMax"); editYMax.SetText (Convert.ToString(DefaultPlotYMax)); editYMax.SetValidator (validator); gridLayout.AddWidget (editYMax, 3, 1); leftLayout.AddLayout (gridLayout); - TQSpacerItem spacer1 = new TQSpacerItem (0, 0, 0, 0); + TTQSpacerItem spacer1 = new TTQSpacerItem (0, 0, 0, 0); leftLayout.AddItem (spacer1); - buttonLayout = new TQHBoxLayout (null, 0, 6, "buttonLayout"); - TQSpacerItem spacer2 = new TQSpacerItem (0, 0, 0, 0); + buttonLayout = new TTQHBoxLayout (null, 0, 6, "buttonLayout"); + TTQSpacerItem spacer2 = new TTQSpacerItem (0, 0, 0, 0); buttonLayout.AddItem (spacer2); - redrawButton = new TQPushButton ("Redraw", this); + redrawButton = new TTQPushButton ("Redraw", this); redrawButton.SetDefault (true); buttonLayout.AddWidget (redrawButton); - TQSpacerItem spacer3 = new TQSpacerItem (0, 0, 0, 0); + TTQSpacerItem spacer3 = new TTQSpacerItem (0, 0, 0, 0); buttonLayout.AddItem (spacer3); leftLayout.AddLayout (buttonLayout); dialogLayout.AddLayout (leftLayout); - TQSpacerItem spacer4 = new TQSpacerItem (0, 0, 0, 0); + TTQSpacerItem spacer4 = new TTQSpacerItem (0, 0, 0, 0); dialogLayout.AddItem (spacer4); - pixmapLabel = new TQLabel (this, "pixmapLabel", 0); + pixmapLabel = new TTQLabel (this, "pixmapLabel", 0); pixmapLabel.SetScaledContents (true); dialogLayout.AddWidget (pixmapLabel); - TQObject.Connect (redrawButton, TQT_SIGNAL ("clicked()"), this, TQT_SLOT ("Redraw()")); + TTQObject.Connect (redrawButton, TQT_SIGNAL ("clicked()"), this, TQT_SLOT ("Redraw()")); Redraw (); } - TQImage MandelbrotImage () + TTQImage MandelbrotImage () { int depth; double real, imag; @@ -232,7 +232,7 @@ public class ImageDialog : TQDialog { int ImageXMax = pixmapLabel.Width (); int ImageYMax = pixmapLabel.Height (); - TQImage image = new TQImage (ImageXMax, ImageYMax, 32, 0); + TTQImage image = new TTQImage (ImageXMax, ImageYMax, 32, 0); for (int x = 0; x <= ImageXMax - 1; x+=1) { for (int y = 0; y <= ImageYMax - 1; y+=1) { @@ -248,16 +248,16 @@ public class ImageDialog : TQDialog { public void Redraw () { - TQSize s = pixmapLabel.BaseSize (); + TTQSize s = pixmapLabel.BaseSize (); pixmapLabel.Resize (400,300); - TQApplication.SetOverrideCursor ( new TQCursor( (int) CursorShape.WaitCursor )); - TQImage image = MandelbrotImage (); - TQPixmap pixmap = new TQPixmap (image); + TTQApplication.SetOverrideCursor ( new TTQCursor( (int) CursorShape.WaitCursor )); + TTQImage image = MandelbrotImage (); + TTQPixmap pixmap = new TTQPixmap (image); pixmapLabel.SetPixmap( pixmap); image.Dispose (); pixmap.Dispose (); this.AdjustSize (); - TQApplication.RestoreOverrideCursor (); + TTQApplication.RestoreOverrideCursor (); } } diff --git a/qtsharp/src/examples/samples/mandelbrot2.cs b/qtsharp/src/examples/samples/mandelbrot2.cs index 2b83579e..0e9436e2 100644 --- a/qtsharp/src/examples/samples/mandelbrot2.cs +++ b/qtsharp/src/examples/samples/mandelbrot2.cs @@ -108,7 +108,7 @@ public class Mandelbrot public static void Main (string[] args) { - TQApplication app = new TQApplication (args); + TTQApplication app = new TTQApplication (args); dialog = new ImageDialog (null, "Mandelbrot", false, 0); dialog.SetGeometry(0, 0, 550, 300 ); @@ -120,13 +120,13 @@ public class Mandelbrot } -public class PicLabel: QFrame +public class PicLabel: TQFrame { - TQPixmap newPixmap; + TTQPixmap newPixmap; int newWidth = 400; int newHeight = 300; - public PicLabel( TQWidget parent, string name, WidgetFlags flags ): + public PicLabel( TTQWidget parent, string name, WidgetFlags flags ): base( parent, name, flags ) { SetBackgroundMode (Qt.BackgroundMode.NoBackground); @@ -135,7 +135,7 @@ public class PicLabel: QFrame } - protected void PerformResize (TQResizeEvent e) + protected void PerformResize (TTQResizeEvent e) { Console.WriteLine("Resizing to {0} by {1}", e.Size().Width(), e.Size().Height() ); @@ -146,12 +146,12 @@ public class PicLabel: QFrame } - protected void PerformPaint(TQPaintEvent e ) + protected void PerformPaint(TTQPaintEvent e ) { Console.WriteLine("Making a new image {0} by {1}", newWidth, newHeight ); - TQImage image = Mandelbrot.dialog.MandelbrotImage( newWidth, newHeight ); - newPixmap = new TQPixmap( image ); + TTQImage image = Mandelbrot.dialog.MandelbrotImage( newWidth, newHeight ); + newPixmap = new TTQPixmap( image ); BitBlt(this, 0, 0, newPixmap, 0, 0, -1, -1, RasterOp.CopyROP, false); @@ -161,123 +161,123 @@ public class PicLabel: QFrame -public class ImageDialog : TQDialog { +public class ImageDialog : TTQDialog { const double DefaultPlotXMin = -2.0; const double DefaultPlotXMax = 2.0; const double DefaultPlotYMin = -1.5; const double DefaultPlotYMax = 1.5; - TQHBoxLayout dialogLayout; - TQGridLayout gridLayout; - TQVBoxLayout leftLayout; - TQHBoxLayout buttonLayout; - TQPushButton redrawButton; + TTQHBoxLayout dialogLayout; + TTQGridLayout gridLayout; + TTQVBoxLayout leftLayout; + TTQHBoxLayout buttonLayout; + TTQPushButton redrawButton; public PicLabel pixmapLabel; - TQSizePolicy fixedSizePolicy; + TTQSizePolicy fixedSizePolicy; - TQLabel XMinLabel, XMaxLabel, YMinLabel, YMaxLabel; - TQLineEdit editXMin, editXMax, editYMin, editYMax; + TTQLabel XMinLabel, XMaxLabel, YMinLabel, YMaxLabel; + TTQLineEdit editXMin, editXMax, editYMin, editYMax; - public ImageDialog (TQWidget parent, string name, bool modal, WidgetFlags fl): + public ImageDialog (TTQWidget parent, string name, bool modal, WidgetFlags fl): base (parent, name, modal, fl) { if (name == string.Empty) SetName ("imageDialog"); SetCaption ("Mandelbrot Image"); - dialogLayout = new TQHBoxLayout (this, 11, 6); - gridLayout = new TQGridLayout (null, 1, 1, 0, 6, "gridLayout"); - leftLayout = new TQVBoxLayout (null, 0, 6, "leftLayout"); + dialogLayout = new TTQHBoxLayout (this, 11, 6); + gridLayout = new TTQGridLayout (null, 1, 1, 0, 6, "gridLayout"); + leftLayout = new TTQVBoxLayout (null, 0, 6, "leftLayout"); - fixedSizePolicy = new TQSizePolicy ( TQSizePolicy.SizeType.Fixed, - TQSizePolicy.SizeType.Fixed, false ); + fixedSizePolicy = new TTQSizePolicy ( TTQSizePolicy.SizeType.Fixed, + TTQSizePolicy.SizeType.Fixed, false ); - XMinLabel = new TQLabel ("Xmin", this); + XMinLabel = new TTQLabel ("Xmin", this); XMinLabel.SetSizePolicy (fixedSizePolicy); gridLayout.AddWidget (XMinLabel, 0, 0); - XMaxLabel = new TQLabel ("Xmax", this); + XMaxLabel = new TTQLabel ("Xmax", this); XMaxLabel.SetSizePolicy(fixedSizePolicy); gridLayout.AddWidget (XMaxLabel, 1, 0); - YMinLabel = new TQLabel ("Ymin", this); + YMinLabel = new TTQLabel ("Ymin", this); YMinLabel.SetSizePolicy (fixedSizePolicy); gridLayout.AddWidget (YMinLabel, 2, 0); - YMaxLabel = new TQLabel ("Ymax", this); + YMaxLabel = new TTQLabel ("Ymax", this); YMaxLabel.SetSizePolicy (fixedSizePolicy); gridLayout.AddWidget (YMaxLabel, 3, 0); - TQDoubleValidator validator = new TQDoubleValidator (this); + TTQDoubleValidator validator = new TTQDoubleValidator (this); - editXMin = new TQLineEdit (this, "editXMin"); + editXMin = new TTQLineEdit (this, "editXMin"); editXMin.SetSizePolicy( fixedSizePolicy ); editXMin.SetText (Convert.ToString (DefaultPlotXMin)); editXMin.SetValidator (validator); gridLayout.AddWidget (editXMin, 0, 1); - editXMax = new TQLineEdit (this, "editXMax"); + editXMax = new TTQLineEdit (this, "editXMax"); editXMax.SetSizePolicy( fixedSizePolicy ); editXMax.SetText (Convert.ToString(DefaultPlotXMax)); editXMax.SetValidator (validator); gridLayout.AddWidget (editXMax, 1, 1); - editYMin = new TQLineEdit (this, "editYMin"); + editYMin = new TTQLineEdit (this, "editYMin"); editYMin.SetSizePolicy( fixedSizePolicy ); editYMin.SetText (Convert.ToString(DefaultPlotYMin)); editYMin.SetValidator (validator); gridLayout.AddWidget (editYMin, 2, 1); - editYMax = new TQLineEdit (this, "editYMax"); + editYMax = new TTQLineEdit (this, "editYMax"); editYMax.SetSizePolicy( fixedSizePolicy ); editYMax.SetText (Convert.ToString(DefaultPlotYMax)); editYMax.SetValidator (validator); gridLayout.AddWidget (editYMax, 3, 1); leftLayout.AddLayout (gridLayout); - TQSpacerItem spacer1 = new TQSpacerItem (0, 0, 0, 0); + TTQSpacerItem spacer1 = new TTQSpacerItem (0, 0, 0, 0); leftLayout.AddItem (spacer1); - buttonLayout = new TQHBoxLayout (null, 0, 6, "buttonLayout"); - TQSpacerItem spacer2 = new TQSpacerItem (0, 0, 0, 0); + buttonLayout = new TTQHBoxLayout (null, 0, 6, "buttonLayout"); + TTQSpacerItem spacer2 = new TTQSpacerItem (0, 0, 0, 0); buttonLayout.AddItem (spacer2); - redrawButton = new TQPushButton ("Redraw", this); + redrawButton = new TTQPushButton ("Redraw", this); redrawButton.SetSizePolicy ( fixedSizePolicy ); redrawButton.SetDefault (true); buttonLayout.AddWidget (redrawButton); - TQSpacerItem spacer3 = new TQSpacerItem (0, 0, 0, 0); + TTQSpacerItem spacer3 = new TTQSpacerItem (0, 0, 0, 0); buttonLayout.AddItem (spacer3); leftLayout.AddLayout (buttonLayout); dialogLayout.AddLayout (leftLayout); - TQSpacerItem spacer4 = new TQSpacerItem (0, 0, 0, 0); + TTQSpacerItem spacer4 = new TTQSpacerItem (0, 0, 0, 0); dialogLayout.AddItem (spacer4); pixmapLabel = new PicLabel (this, "pixmapLabel", 0); //pixmapLabel.SetScaledContents (true); - pixmapLabel.SetSizePolicy( TQSizePolicy.SizeType.Minimum, - TQSizePolicy.SizeType.Minimum, false ); + pixmapLabel.SetSizePolicy( TTQSizePolicy.SizeType.Minimum, + TTQSizePolicy.SizeType.Minimum, false ); pixmapLabel.SetGeometry( 0, 0, 400, 300 ); pixmapLabel.Show(); pixmapLabel.Resize(400,300); dialogLayout.AddWidget (pixmapLabel); - //TQImage image = MandelbrotImage( 400, 300 ); - //pixmapLabel.SetPixmap( new TQPixmap( image ) ); + //TTQImage image = MandelbrotImage( 400, 300 ); + //pixmapLabel.SetPixmap( new TTQPixmap( image ) ); - TQObject.Connect (redrawButton, TQT_SIGNAL ("clicked()"), pixmapLabel, TQT_SLOT ("Repaint()")); + TTQObject.Connect (redrawButton, TQT_SIGNAL ("clicked()"), pixmapLabel, TQT_SLOT ("Repaint()")); //Redraw (); } - public TQImage MandelbrotImage ( int width, int height) + public TTQImage MandelbrotImage ( int width, int height) { int depth; double real, imag; @@ -290,7 +290,7 @@ public class ImageDialog : TQDialog { int ImageXMax = width; int ImageYMax = height; - TQImage image = new TQImage (ImageXMax, ImageYMax, 32, 0); + TTQImage image = new TTQImage (ImageXMax, ImageYMax, 32, 0); for (int x = 0; x <= ImageXMax - 1; x+=1) { for (int y = 0; y <= ImageYMax - 1; y+=1) { diff --git a/qtsharp/src/examples/samples/qstring-slot.cs b/qtsharp/src/examples/samples/qstring-slot.cs index e33fa1b3..af2db0a2 100644 --- a/qtsharp/src/examples/samples/qstring-slot.cs +++ b/qtsharp/src/examples/samples/qstring-slot.cs @@ -1,26 +1,26 @@ -// Demo of a TQString slot +// Demo of a TTQString slot // Implemented by Marcus Urban using System; using Qt; -public class MyWidget : QVBox +public class MyWidget : TQVBox { - TQLineEdit lineEdit; - TQLabel label; + TTQLineEdit lineEdit; + TTQLabel label; - public MyWidget (TQWidget parent, String name) : base (parent, name) + public MyWidget (TTQWidget parent, String name) : base (parent, name) { - lineEdit = new TQLineEdit( this, "lineEdit" ); - label = new TQLabel( this, "label" ); + lineEdit = new TTQLineEdit( this, "lineEdit" ); + label = new TTQLabel( this, "label" ); label.SetText("Default"); - TQObject.Connect( lineEdit, TQT_SIGNAL("textChanged(TQString)"), - label, "SetText(TQString)" ); + TTQObject.Connect( lineEdit, TQT_SIGNAL("textChanged(TTQString)"), + label, "SetText(TTQString)" ); } - public MyWidget (TQWidget parent) : this (parent, "") {} + public MyWidget (TTQWidget parent) : this (parent, "") {} public MyWidget () : this (null, "") {} } @@ -28,7 +28,7 @@ public class Example { public static int Main (String[] args) { - TQApplication a = new TQApplication (args); + TTQApplication a = new TTQApplication (args); MyWidget w = new MyWidget (); a.SetMainWidget (w); diff --git a/qtsharp/src/examples/samples/quantumfractals.cs b/qtsharp/src/examples/samples/quantumfractals.cs index fe6c914e..484b5640 100644 --- a/qtsharp/src/examples/samples/quantumfractals.cs +++ b/qtsharp/src/examples/samples/quantumfractals.cs @@ -9,18 +9,18 @@ namespace Qf { using System; using System.Threading; - public class FractalViewer : TQMainWindow { + public class FractalViewer : TTQMainWindow { //Menuing - private TQMenuBar menubar; - private TQPopupMenu filemenu; - private TQPopupMenu shapemenu; - private TQPopupMenu settingsmenu; + private TTQMenuBar menubar; + private TTQPopupMenu filemenu; + private TTQPopupMenu shapemenu; + private TTQPopupMenu settingsmenu; public static int Main (string[] args) { //Initialize and start the main event loop - TQApplication app = new TQApplication (args); + TTQApplication app = new TTQApplication (args); FractalViewer view = new FractalViewer (); app.SetMainWidget (view); view.Show (); @@ -36,13 +36,13 @@ namespace Qf { SetCentralWidget (display); //Setup the filemenu - filemenu = new TQPopupMenu (null, "filemenu"); + filemenu = new TTQPopupMenu (null, "filemenu"); filemenu.InsertItem ("&Screenshot", display, TQT_SLOT ("SlotScreenshot()")); filemenu.InsertSeparator (); filemenu.InsertItem ("&Quit", qApp, TQT_SLOT ("quit()")); //Setup the shapemenu - shapemenu = new TQPopupMenu (null, "typemenu"); + shapemenu = new TTQPopupMenu (null, "typemenu"); shapemenu.InsertItem( "&Tetrahedron", 0); shapemenu.InsertItem( "&Cube", 1); shapemenu.InsertItem( "&Octahedron", 2); @@ -52,42 +52,42 @@ namespace Qf { shapemenu.InsertItem( "&Icosidodecahedron", 6); //Connect the shapemenu - TQObject.Connect (shapemenu, TQT_SIGNAL ("activated(int)"), + TTQObject.Connect (shapemenu, TQT_SIGNAL ("activated(int)"), display, TQT_SLOT("SlotShapeMenu(int)")); //Setup the settingsmenu - settingsmenu = new TQPopupMenu (null, "settingsmenu"); + settingsmenu = new TTQPopupMenu (null, "settingsmenu"); settingsmenu.InsertItem ("&Alpha", display, TQT_SLOT ("SlotSetAlpha()")); //Setup the menubar - menubar = new TQMenuBar (this, ""); + menubar = new TTQMenuBar (this, ""); menubar.InsertItem ("&File", filemenu); menubar.InsertItem ("&Shape", shapemenu); menubar.InsertItem ("&Settings", settingsmenu); } } - public class Display: TQWidget, IQuantumFractal { + public class Display: TTQWidget, IQuantumFractal { //Labels - TQLabel count; - TQLabel shape; - TQLabel alpha; + TTQLabel count; + TTQLabel shape; + TTQLabel alpha; //Buttons - TQPushButton start; - TQPushButton stop; - TQPushButton reset; - TQPushButton gray; - TQPushButton intense; + TTQPushButton start; + TTQPushButton stop; + TTQPushButton reset; + TTQPushButton gray; + TTQPushButton intense; //Drawable region - QPaintBuffer buffer; + TQPaintBuffer buffer; //Layouts - TQVBoxLayout layout; - TQHBoxLayout buttons; - TQVBoxLayout labels; + TTQVBoxLayout layout; + TTQHBoxLayout buttons; + TTQVBoxLayout labels; //Engine controller variables int[] topDensity = new int[0]; @@ -106,35 +106,35 @@ namespace Qf { QuantumFractals qf; Thread engine; - public Display (TQWidget parent): base (parent) + public Display (TTQWidget parent): base (parent) { //Setup the sizes - TQSize size = new TQSize (resolution, resolution); + TTQSize size = new TTQSize (resolution, resolution); parent.SetBaseSize (size); //Some nice colors - SetPaletteBackgroundColor (new TQColor ("Black")); - SetPaletteForegroundColor (new TQColor ("LightBlue")); + SetPaletteBackgroundColor (new TTQColor ("Black")); + SetPaletteForegroundColor (new TTQColor ("LightBlue")); //Setup the buttons - start = new TQPushButton ("Start", this); - stop = new TQPushButton ("Stop", this); - reset = new TQPushButton ("Reset", this); - gray = new TQPushButton ("Color", this); - intense = new TQPushButton ("Intensity", this); + start = new TTQPushButton ("Start", this); + stop = new TTQPushButton ("Stop", this); + reset = new TTQPushButton ("Reset", this); + gray = new TTQPushButton ("Color", this); + intense = new TTQPushButton ("Intensity", this); //Setup the labels - count = new TQLabel (this); - alpha = new TQLabel (this); - shape = new TQLabel (this); + count = new TTQLabel (this); + alpha = new TTQLabel (this); + shape = new TTQLabel (this); //Setup the drawable - buffer = new QPaintBuffer (this); + buffer = new TQPaintBuffer (this); buffer.SetMinimumSize (size); //Create the layouts - layout = new TQVBoxLayout (this); - buttons = new TQHBoxLayout (layout); + layout = new TTQVBoxLayout (this); + buttons = new TTQHBoxLayout (layout); //Add some buttons buttons.AddWidget (start); @@ -144,23 +144,23 @@ namespace Qf { buttons.AddWidget (intense); //Connect the buttons and SlotQuit - TQObject.Connect (start, TQT_SIGNAL ("clicked()"), + TTQObject.Connect (start, TQT_SIGNAL ("clicked()"), this, TQT_SLOT ("SlotStart()")); - TQObject.Connect (stop, TQT_SIGNAL ("clicked()"), + TTQObject.Connect (stop, TQT_SIGNAL ("clicked()"), this, TQT_SLOT ("SlotStop()")); - TQObject.Connect (reset, TQT_SIGNAL ("clicked()"), + TTQObject.Connect (reset, TQT_SIGNAL ("clicked()"), this, TQT_SLOT ("SlotReset()")); - TQObject.Connect (gray, TQT_SIGNAL ("clicked()"), + TTQObject.Connect (gray, TQT_SIGNAL ("clicked()"), this, TQT_SLOT ("SlotGray()")); - TQObject.Connect (intense, TQT_SIGNAL ("clicked()"), + TTQObject.Connect (intense, TQT_SIGNAL ("clicked()"), this, TQT_SLOT ("SlotIntense()")); - TQObject.Connect (buffer, TQT_SIGNAL ("Painted()"), + TTQObject.Connect (buffer, TQT_SIGNAL ("Painted()"), this, TQT_SLOT ("SlotSetLabels()")); - TQObject.Connect (qApp, TQT_SIGNAL ("lastWindowClosed ()"), + TTQObject.Connect (qApp, TQT_SIGNAL ("lastWindowClosed ()"), this, TQT_SLOT ("SlotQuit ()")); //Layout labels - labels = new TQVBoxLayout (layout); + labels = new TTQVBoxLayout (layout); labels.AddWidget (count); labels.AddWidget (shape); labels.AddWidget (alpha); @@ -367,9 +367,9 @@ namespace Qf { WasRunning = Running ? true : false; SlotStop (); - string filename = TQFileDialog.GetSaveFileName ( + string filename = TTQFileDialog.GetSaveFileName ( - TQDir.HomeDirPath (), "*", this, "save", + TTQDir.HomeDirPath (), "*", this, "save", "Save Screenshot", "*.png", true ); @@ -386,7 +386,7 @@ namespace Qf { WasRunning = Running ? true : false; SlotStop (); - qf.Alpha = QInputDialog.GetDouble ( + qf.Alpha = TQInputDialog.GetDouble ( "Set Alpha", "Alpha: ", qf.Alpha, 0, 2, 32 ); @@ -405,7 +405,7 @@ namespace Qf { } //Need to reset the resolution upon resize - private void TouchResize (TQResizeEvent e) + private void TouchResize (TTQResizeEvent e) { int height = buffer.Size ().Height (); int width = buffer.Size ().Width (); @@ -415,23 +415,23 @@ namespace Qf { } [DeclareQtSignal ("Painted()")] - public class QPaintBuffer : TQFrame { + public class TQPaintBuffer : TTQFrame { //Drawables - private TQPixmap buffer; - private TQImage image; + private TTQPixmap buffer; + private TTQImage image; //Timer private TimerCallback call; private Timer timer; - public QPaintBuffer (TQWidget parent) : base (parent) + public TQPaintBuffer (TTQWidget parent) : base (parent) { SetBackgroundMode (Qt.BackgroundMode.NoBackground); //Create drawables - buffer = new TQPixmap (); - image = new TQImage (Size (), 32); + buffer = new TTQPixmap (); + image = new TTQImage (Size (), 32); //Setup the event handlers paintEvent += new PaintEvent (TouchPaint); @@ -448,8 +448,8 @@ namespace Qf { //Resets the drawables public void Reset () { - buffer = new TQPixmap (); - image = new TQImage (Size (), 32); + buffer = new TTQPixmap (); + image = new TTQImage (Size (), 32); PaintImage (null); } @@ -484,24 +484,24 @@ namespace Qf { } //Receive focus events - private void TouchFocus (TQFocusEvent e) + private void TouchFocus (TTQFocusEvent e) { PerformPaint (); } //Receive paint events - private void TouchPaint (TQPaintEvent e) + private void TouchPaint (TTQPaintEvent e) { PerformPaint (); } //Receive resize events - private void TouchResize (TQResizeEvent e) + private void TouchResize (TTQResizeEvent e) { - image = new TQImage (e.Size (), 32); + image = new TTQImage (e.Size (), 32); buffer.Resize (e.Size()); - buffer.Fill (new TQColor("black")); - BitBlt (buffer, 0, 0, new TQPixmap (buffer), + buffer.Fill (new TTQColor("black")); + BitBlt (buffer, 0, 0, new TTQPixmap (buffer), 0, 0, -1, -1, RasterOp.CopyROP, false); } diff --git a/qtsharp/src/examples/samples/scribblewindow.cs b/qtsharp/src/examples/samples/scribblewindow.cs index fdd9fe46..70ed3c0f 100644 --- a/qtsharp/src/examples/samples/scribblewindow.cs +++ b/qtsharp/src/examples/samples/scribblewindow.cs @@ -9,22 +9,22 @@ namespace QtSamples { using Qt; using System; - [DeclareQtSignal ("colorChanged(TQColor)")] - [DeclareQtSignal ("load(TQString)")] - [DeclareQtSignal ("save(TQString)")] - public class ScribbleWindow : TQMainWindow { - - private TQMenuBar menubar; - private TQPopupMenu filemenu; - private TQPopupMenu aboutmenu; - private TQScrollView scrollview; + [DeclareQtSignal ("colorChanged(TTQColor)")] + [DeclareQtSignal ("load(TTQString)")] + [DeclareQtSignal ("save(TTQString)")] + public class ScribbleWindow : TTQMainWindow { + + private TTQMenuBar menubar; + private TTQPopupMenu filemenu; + private TTQPopupMenu aboutmenu; + private TTQScrollView scrollview; public ScribbleArea scribblearea; enum Color {Black, Red, Blue, Green, Yellow}; public static int Main (String[] args) { - TQApplication app = new TQApplication (args); + TTQApplication app = new TTQApplication (args); ScribbleWindow demo = new ScribbleWindow (); demo.SetGeometry (50, 500, 400, 400); app.SetMainWidget (demo); @@ -35,22 +35,22 @@ namespace QtSamples { ScribbleWindow () : base (null, null) { - filemenu = new TQPopupMenu (null, "filemenu"); + filemenu = new TTQPopupMenu (null, "filemenu"); filemenu.InsertItem ("&Load", this, TQT_SLOT ("SlotLoad()") ); filemenu.InsertItem ("&Save", this, TQT_SLOT ("SlotSave()") ); filemenu.InsertSeparator (); filemenu.InsertItem ("&Quit", qApp, TQT_SLOT ("quit()")); - aboutmenu = new TQPopupMenu (null, "helpmenu"); + aboutmenu = new TTQPopupMenu (null, "helpmenu"); aboutmenu.InsertItem ("&About Qt-Sharp", this, TQT_SLOT ("SlotAboutQtSharp()")); aboutmenu.InsertItem ("&About Qt", this, TQT_SLOT ("SlotAboutQt()")); - menubar = new TQMenuBar (this, ""); + menubar = new TTQMenuBar (this, ""); menubar.InsertItem ("&File", filemenu); menubar.InsertItem ("&Color", this, TQT_SLOT("SlotColorChooser()")); menubar.InsertItem ("&About", aboutmenu); - scrollview = new TQScrollView (this); + scrollview = new TTQScrollView (this); scrollview.SetGeometry (0, menubar.Height (), Width (), Height () - menubar.Height ()); scribblearea = new ScribbleArea (this); scribblearea.SetGeometry (0, 0, 1000, 1000); @@ -58,39 +58,39 @@ 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)") ); + TTQObject.Connect (this, TQT_SIGNAL ("colorChanged(TTQColor)"), + scribblearea, TQT_SLOT ("SlotSetColor(TTQColor)") ); + TTQObject.Connect (this, TQT_SIGNAL ("load(TTQString)"), + scribblearea, TQT_SLOT ("PerformLoad(TTQString)") ); + TTQObject.Connect (this, TQT_SIGNAL ("save(TTQString)"), + scribblearea, TQT_SLOT ("PerformSave(TTQString)") ); } public void SlotLoad () { - string filename = TQFileDialog.GetOpenFileName (".", "*.bmp", this, - null, "Load File", TQString.Null, true); + string filename = TTQFileDialog.GetOpenFileName (".", "*.bmp", this, + null, "Load File", TTQString.Null, true); if ( filename != null ) - Emit ("load(TQString)", (TQString) filename); + Emit ("load(TTQString)", (TTQString) filename); } public void SlotSave () { - string filename = TQFileDialog.GetSaveFileName (".", "*.bmp", this, - null, "Save File", TQString.Null, true); + string filename = TTQFileDialog.GetSaveFileName (".", "*.bmp", this, + null, "Save File", TTQString.Null, true); if ( filename != null ) { if ( ! filename.ToLower().EndsWith(".bmp") ) filename += ".bmp"; - Emit ("save(TQString)", (TQString) filename); + Emit ("save(TTQString)", (TTQString) filename); } } public void SlotAboutQtSharp () { - TQMessageBox.Information (this, "About Qt# 0.7", + TTQMessageBox.Information (this, "About Qt# 0.7", "A Qt (http://www.trolltech.com) to C# language binding. \n" + "Qt# is compatible with Mono (http://go-mono.org) and\n" + "Portable.NET (http://www.southern-storm.com.au/portable_net.html)\n" + @@ -100,29 +100,29 @@ namespace QtSamples { public void SlotAboutQt () { - TQMessageBox.AboutQt (this, "About Qt"); + TTQMessageBox.AboutQt (this, "About Qt"); } public void SlotColorChooser () { - TQColor chosenColor = QColorDialog.GetColor(); + TTQColor chosenColor = TQColorDialog.GetColor(); if (chosenColor.IsValid()) - Emit ("colorChanged(TQColor)", chosenColor); + Emit ("colorChanged(TTQColor)", chosenColor); } - public class ScribbleArea : TQFrame { - private TQPoint last; - private TQPixmap buffer; - private TQColor currentcolor = new TQColor("Black"); - private TQPopupMenu popupmenu; + public class ScribbleArea : TTQFrame { + private TTQPoint last; + private TTQPixmap buffer; + private TTQColor currentcolor = new TTQColor("Black"); + private TTQPopupMenu popupmenu; - public ScribbleArea (TQWidget parent) : base (parent) + public ScribbleArea (TTQWidget parent) : base (parent) { - buffer = new TQPixmap (); - last = new TQPoint (); + buffer = new TTQPixmap (); + last = new TTQPoint (); SetBackgroundMode (Qt.BackgroundMode.NoBackground); - popupmenu = new TQPopupMenu(); + popupmenu = new TTQPopupMenu(); popupmenu.InsertItem ("&Clear", this, TQT_SLOT ("SlotClearArea()") ); mouseMoveEvent += new MouseMoveEvent (MouseMoved); @@ -131,51 +131,51 @@ namespace QtSamples { resizeEvent += new ResizeEvent (PerformResize); } - public void PerformLoad (TQString filename) + public void PerformLoad (TTQString filename) { if ( ! buffer.Load(filename) ) - TQMessageBox.Warning (null, "Load error", "Could not load file"); + TTQMessageBox.Warning (null, "Load error", "Could not load file"); Repaint(); } - public void PerformSave (TQString filename) + public void PerformSave (TTQString filename) { if ( ! buffer.Save (filename, "BMP") ) - TQMessageBox.Warning( null, "Save error", "Could not save file"); + TTQMessageBox.Warning( null, "Save error", "Could not save file"); } public void SlotClearArea () { - buffer.Fill( new TQColor ("white") ); + buffer.Fill( new TTQColor ("white") ); BitBlt (this, 0, 0, buffer, 0, 0, -1, -1, Qt.RasterOp.CopyROP, false); } - public void SlotSetColor (TQColor color) + public void SlotSetColor (TTQColor color) { currentcolor = color; } - // Note, Dispose() is called on QPoints here to increase performance - // of the UI. Otherwise, the GC would let dead TQPoint instances pile + // Note, Dispose() is called on TQPoints here to increase performance + // of the UI. Otherwise, the GC would let dead TTQPoint instances pile // up and delete them all at once, causing the UI to pause while it frees // memory. (This happens because the GC runs in the same thread as the // application.) - protected void MousePressed (TQMouseEvent e) + protected void MousePressed (TTQMouseEvent e) { if (e.Button() == ButtonState.RightButton ) - popupmenu.Exec (TQCursor.Pos ()); + popupmenu.Exec (TTQCursor.Pos ()); else { last.Dispose (); last = e.Pos(); } } - protected void MouseMoved (TQMouseEvent e) + protected void MouseMoved (TTQMouseEvent e) { - TQPainter windowPainter = new TQPainter (); - TQPainter bufferPainter = new TQPainter (); + TTQPainter windowPainter = new TTQPainter (); + TTQPainter bufferPainter = new TTQPainter (); windowPainter.Begin (this); bufferPainter.Begin (buffer); @@ -193,17 +193,17 @@ namespace QtSamples { last = e.Pos (); } - protected void PerformPaint (TQPaintEvent e) + protected void PerformPaint (TTQPaintEvent e) { BitBlt(this, 0, 0, buffer, 0, 0, -1, -1, RasterOp.CopyROP, false); } - protected void PerformResize (TQResizeEvent e) + protected void PerformResize (TTQResizeEvent e) { - TQPixmap save = new TQPixmap (buffer); + TTQPixmap save = new TTQPixmap (buffer); buffer.Resize (e.Size()); - buffer.Fill (new TQColor("white")); + buffer.Fill (new TTQColor("white")); BitBlt (buffer, 0, 0, save, 0, 0, -1, -1, RasterOp.CopyROP, false); } diff --git a/qtsharp/src/examples/test-results.html b/qtsharp/src/examples/test-results.html index 631ee200..08238042 100644 --- a/qtsharp/src/examples/test-results.html +++ b/qtsharp/src/examples/test-results.html @@ -3,7 +3,7 @@ - + @@ -187,7 +187,7 @@ (1) No crashes, but no drawing - (2) Closing window results in a double TQObject deletion and then application locks up + (2) Closing window results in a double TTQObject deletion and then application locks up (3) Random lockups occur after a large amount of scribbling is performed; background fails to initialized properly sometimes diff --git a/qtsharp/src/examples/tutorials/t1.cs b/qtsharp/src/examples/tutorials/t1.cs index 84c79d38..b5498d7a 100644 --- a/qtsharp/src/examples/tutorials/t1.cs +++ b/qtsharp/src/examples/tutorials/t1.cs @@ -9,9 +9,9 @@ public class Example { public static int Main (String[] args) { - TQApplication a = new TQApplication (args); + TTQApplication a = new TTQApplication (args); - TQPushButton hello = new TQPushButton ("Hello world!", null); + TTQPushButton hello = new TTQPushButton ("Hello world!", null); // In C++, the second parameter is 0 (null pointer) hello.Resize (100, 30); diff --git a/qtsharp/src/examples/tutorials/t2.cs b/qtsharp/src/examples/tutorials/t2.cs index 5dbe07d1..84af5a37 100644 --- a/qtsharp/src/examples/tutorials/t2.cs +++ b/qtsharp/src/examples/tutorials/t2.cs @@ -9,16 +9,16 @@ public class Example { public static int Main (String[] args) { - TQApplication a = new TQApplication (args); + TTQApplication a = new TTQApplication (args); - TQPushButton quit = new TQPushButton ("Quit", null); + TTQPushButton quit = new TTQPushButton ("Quit", null); // In C++, the second parameter is 0 (null pointer) quit.Resize (75, 30); - quit.SetFont (new TQFont ("Times", 18, TQFont.Weight.Bold)); - // In C++, TQFont::Bold is sufficient + quit.SetFont (new TTQFont ("Times", 18, TTQFont.Weight.Bold)); + // In C++, TTQFont::Bold is sufficient - TQObject.Connect ( quit, QtSupport.TQT_SIGNAL ("clicked()"), a, QtSupport.TQT_SLOT ("Quit()") ); + TTQObject.Connect ( quit, QtSupport.TQT_SIGNAL ("clicked()"), a, QtSupport.TQT_SLOT ("Quit()") ); // TQT_SIGNAL and TQT_SLOT are static functions of QtSupport a.SetMainWidget (quit); diff --git a/qtsharp/src/examples/tutorials/t3.cs b/qtsharp/src/examples/tutorials/t3.cs index 26fece72..806c5184 100644 --- a/qtsharp/src/examples/tutorials/t3.cs +++ b/qtsharp/src/examples/tutorials/t3.cs @@ -10,16 +10,16 @@ public class Example { public static int Main (String[] args) { - TQApplication a = new TQApplication (args); + TTQApplication a = new TTQApplication (args); - TQVBox box = new TQVBox (); + TTQVBox box = new TTQVBox (); box.Resize (200, 120); - TQPushButton quit = new TQPushButton ("Quit", box); - quit.SetFont (new TQFont ("Times", 18, TQFont.Weight.Bold)); - // In C++, TQFont::Bold is sufficient + TTQPushButton quit = new TTQPushButton ("Quit", box); + quit.SetFont (new TTQFont ("Times", 18, TTQFont.Weight.Bold)); + // In C++, TTQFont::Bold is sufficient - TQObject.Connect ( quit, QtSupport.TQT_SIGNAL ("clicked()"), a, QtSupport.TQT_SLOT ("Quit()") ); + TTQObject.Connect ( quit, QtSupport.TQT_SIGNAL ("clicked()"), a, QtSupport.TQT_SLOT ("Quit()") ); // TQT_SIGNAL and TQT_SLOT are static functions of QtSupport a.SetMainWidget (box); diff --git a/qtsharp/src/examples/tutorials/t4.cs b/qtsharp/src/examples/tutorials/t4.cs index a8884b92..68b3c26a 100644 --- a/qtsharp/src/examples/tutorials/t4.cs +++ b/qtsharp/src/examples/tutorials/t4.cs @@ -5,25 +5,25 @@ using System; using Qt; -public class MyWidget : TQWidget { +public class MyWidget : TTQWidget { - public MyWidget (TQWidget parent, String name) : base (parent, name) + public MyWidget (TTQWidget parent, String name) : base (parent, name) // In C++, parent and name have default values of 0 (null pointer) { this.SetMinimumSize (200, 120); this.SetMaximumSize (200, 120); - TQPushButton quit = new TQPushButton ("Quit", this, "quit"); + TTQPushButton quit = new TTQPushButton ("Quit", this, "quit"); quit.SetGeometry (62, 40, 75, 30); - quit.SetFont (new TQFont ("Times", 18, TQFont.Weight.Bold) ); + quit.SetFont (new TTQFont ("Times", 18, TTQFont.Weight.Bold) ); Connect ( quit, TQT_SIGNAL ("clicked()"), qApp, TQT_SLOT ("Quit()") ); - // In C++, qApp is a global variable. Here it's a property of the QObject + // In C++, qApp 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(). } - public MyWidget (TQWidget parent) : this (parent, "") {} + public MyWidget (TTQWidget parent) : this (parent, "") {} public MyWidget () : this (null, "") {} // Note that it was necessary to use an empty string ("") // in the above. Using null does not work at runtime. @@ -33,7 +33,7 @@ public class Example { public static int Main (String[] args) { - TQApplication a = new TQApplication (args); + TTQApplication a = new TTQApplication (args); MyWidget w = new MyWidget (); w.SetGeometry (100, 100, 200, 120); diff --git a/qtsharp/src/examples/tutorials/t5.cs b/qtsharp/src/examples/tutorials/t5.cs index 0488969d..1430e6f3 100644 --- a/qtsharp/src/examples/tutorials/t5.cs +++ b/qtsharp/src/examples/tutorials/t5.cs @@ -5,19 +5,19 @@ using System; using Qt; -public class MyWidget : TQVBox { +public class MyWidget : TTQVBox { - public MyWidget (TQWidget parent, String name) : base (parent, name) + public MyWidget (TTQWidget parent, String name) : base (parent, name) // In C++, parent and name have default values of 0 (null pointer) { - TQPushButton quit = new TQPushButton ("Quit", this, "quit"); - quit.SetFont ( new TQFont ("Times", 18, TQFont.Weight.Bold) ); + TTQPushButton quit = new TTQPushButton ("Quit", this, "quit"); + quit.SetFont ( new TTQFont ("Times", 18, TTQFont.Weight.Bold) ); - TQObject.Connect ( quit, TQT_SIGNAL ("clicked()"), qApp, TQT_SLOT ("Quit()") ); + TTQObject.Connect ( quit, TQT_SIGNAL ("clicked()"), qApp, TQT_SLOT ("Quit()") ); - TQLCDNumber lcd = new TQLCDNumber (2, this, "lcd" ); + TTQLCDNumber lcd = new TTQLCDNumber (2, this, "lcd" ); - TQSlider slider = new TQSlider (Orientation.Horizontal, this, "slider"); + TTQSlider slider = new TTQSlider (Orientation.Horizontal, this, "slider"); // Note that Orientation is defined in the Qt class slider.SetRange (0, 99); slider.SetValue (0); @@ -25,7 +25,7 @@ public class MyWidget : TQVBox { Connect ( slider, TQT_SIGNAL ("valueChanged(int)"), lcd, TQT_SLOT ("Display(int)") ); } - public MyWidget (TQWidget parent) : this (parent, "") {} + public MyWidget (TTQWidget parent) : this (parent, "") {} public MyWidget () : this (null, "") {} // Note that it was necessary to use an empty string ("") // in the above. Using null does not work at runtime. @@ -35,7 +35,7 @@ public class Example { public static int Main (String[] args) { - TQApplication a = new TQApplication (args); + TTQApplication a = new TTQApplication (args); MyWidget w = new MyWidget (); a.SetMainWidget (w); diff --git a/qtsharp/src/examples/tutorials/t6.cs b/qtsharp/src/examples/tutorials/t6.cs index 6fee48e1..9912650b 100644 --- a/qtsharp/src/examples/tutorials/t6.cs +++ b/qtsharp/src/examples/tutorials/t6.cs @@ -5,42 +5,42 @@ using System; using Qt; -public class LCDRange : TQVBox { +public class LCDRange : TTQVBox { - public LCDRange (TQWidget parent, String name) : base (parent, name) + public LCDRange (TTQWidget parent, String name) : base (parent, name) // In C++, parent and name have default values of 0 (null pointer) { - TQLCDNumber lcd = new TQLCDNumber (2, this, "lcd" ); - TQSlider slider = new TQSlider (Orientation.Horizontal, this, "slider"); + TTQLCDNumber lcd = new TTQLCDNumber (2, this, "lcd" ); + TTQSlider slider = new TTQSlider (Orientation.Horizontal, this, "slider"); slider.SetRange (0, 99); slider.SetValue (0); Connect ( slider, TQT_SIGNAL ("valueChanged(int)"), lcd, TQT_SLOT ("Display(int)") ); } - public LCDRange (TQWidget parent) : this (parent, "") {} + public LCDRange (TTQWidget parent) : this (parent, "") {} public LCDRange () : this (null, "") {} // Note that it was necessary to use an empty string ("") // in the above. Using null does not work at runtime. } -public class MyWidget : TQVBox { +public class MyWidget : TTQVBox { - MyWidget (TQWidget parent, String name) : base (parent, name) + MyWidget (TTQWidget parent, String name) : base (parent, name) { - TQPushButton quit = new TQPushButton ("Quit", this, "quit"); - quit.SetFont ( new TQFont ("Times", 18, TQFont.Weight.Bold) ); + TTQPushButton quit = new TTQPushButton ("Quit", this, "quit"); + quit.SetFont ( new TTQFont ("Times", 18, TTQFont.Weight.Bold) ); Connect ( quit, TQT_SIGNAL ("clicked()"), qApp, TQT_SLOT ("Quit()") ); - TQGrid grid = new TQGrid (4, this); + TTQGrid grid = new TTQGrid (4, this); for ( int c =0; c < 4; c++ ) for ( int r = 0; r < 4; r++ ) new LCDRange (grid); } - public MyWidget (TQWidget parent) : this (parent, "") {} + public MyWidget (TTQWidget parent) : this (parent, "") {} public MyWidget () : this (null, "") {} } @@ -48,7 +48,7 @@ public class Example { public static int Main (String[] args) { - TQApplication a = new TQApplication (args); + TTQApplication a = new TTQApplication (args); MyWidget w = new MyWidget (); a.SetMainWidget (w); diff --git a/qtsharp/src/examples/tutorials/t7.cs b/qtsharp/src/examples/tutorials/t7.cs index e1891d26..ba9e758d 100644 --- a/qtsharp/src/examples/tutorials/t7.cs +++ b/qtsharp/src/examples/tutorials/t7.cs @@ -9,15 +9,15 @@ using System; using Qt; [DeclareQtSignal ("valueChanged(int)")] -public class LCDRange : TQVBox { +public class LCDRange : TTQVBox { - TQSlider slider; + TTQSlider slider; - public LCDRange (TQWidget parent, String name) : base (parent, name) + public LCDRange (TTQWidget parent, String name) : base (parent, name) // In C++, parent and name have default values of 0 (null pointer) { - TQLCDNumber lcd = new TQLCDNumber (2, this, "lcd" ); - slider = new TQSlider (Orientation.Horizontal, this, "slider"); + TTQLCDNumber lcd = new TTQLCDNumber (2, this, "lcd" ); + slider = new TTQSlider (Orientation.Horizontal, this, "slider"); slider.SetRange (0, 99); slider.SetValue (0); @@ -25,7 +25,7 @@ public class LCDRange : TQVBox { Connect ( slider, TQT_SIGNAL ("valueChanged(int)"), TQT_SIGNAL ("valueChanged(int)")); } - public LCDRange (TQWidget parent) : this (parent, "") {} + public LCDRange (TTQWidget parent) : this (parent, "") {} public LCDRange () : this (null, "") {} // Note that it was necessary to use an empty string ("") // in the above. Using null does not work at runtime. @@ -36,16 +36,16 @@ public class LCDRange : TQVBox { } } -public class MyWidget : TQVBox { +public class MyWidget : TTQVBox { - MyWidget (TQWidget parent, String name) : base (parent, name) + MyWidget (TTQWidget parent, String name) : base (parent, name) { - TQPushButton quit = new TQPushButton ("Quit", this, "quit"); - quit.SetFont ( new TQFont ("Times", 18, TQFont.Weight.Bold) ); + TTQPushButton quit = new TTQPushButton ("Quit", this, "quit"); + quit.SetFont ( new TTQFont ("Times", 18, TTQFont.Weight.Bold) ); Connect ( quit, TQT_SIGNAL ("clicked()"), qApp, TQT_SLOT ("Quit()") ); - TQGrid grid = new TQGrid (4, this); + TTQGrid grid = new TTQGrid (4, this); LCDRange previous = null; @@ -60,7 +60,7 @@ public class MyWidget : TQVBox { } } - public MyWidget (TQWidget parent) : this (parent, "") {} + public MyWidget (TTQWidget parent) : this (parent, "") {} public MyWidget () : this (null, "") {} } @@ -68,7 +68,7 @@ public class Example { public static int Main (String[] args) { - TQApplication a = new TQApplication (args); + TTQApplication a = new TTQApplication (args); MyWidget w = new MyWidget (); a.SetMainWidget (w); diff --git a/qtsharp/src/generator/Converter.cs b/qtsharp/src/generator/Converter.cs index 8f6ce3b0..f6bbf06e 100644 --- a/qtsharp/src/generator/Converter.cs +++ b/qtsharp/src/generator/Converter.cs @@ -27,12 +27,12 @@ namespace QtCSharp { public class Converter { ArrayList qtypes; - QType qtype; - QTypeMap qmap; + TQType qtype; + TQTypeMap qmap; StringCollection sigs; StringBuilder sig; - public Converter (ArrayList qtypes, QType qtype, QTypeMap qmap) + public Converter (ArrayList qtypes, TQType qtype, TQTypeMap qmap) { this.qtypes = qtypes; this.qtype = qtype; @@ -45,14 +45,14 @@ namespace QtCSharp { qtype.IsConverted = true; } - public QType GetQType () + public TQType GetTQType () { return qtype; } public void Convert () { - foreach (QCtor qctor in qtype.QCtors) { + foreach (TQCtor qctor in qtype.TQCtors) { qctor.Name = qmap.ReservedType (qctor.Name); if (!qctor.Overload) { ConvertCSharpParams (qctor.CSharpParams); @@ -63,7 +63,7 @@ namespace QtCSharp { } CheckSig (qctor); } - foreach (QMethod qmethod in qtype.QMethods) { + foreach (TQMethod qmethod in qtype.TQMethods) { if (qmethod.Name.StartsWith ("protected_")) qmethod.Name = qmethod.Name.Replace ("protected_", ""); qmethod.Name = qmap.ReservedType (qmethod.Name); @@ -81,10 +81,10 @@ namespace QtCSharp { } } - public void CheckSig (QMethod qmethod) + public void CheckSig (TQMethod qmethod) { sig.Append (qmethod.PascalName); - foreach (QParam qparam in qmethod.CSharpParams) { + foreach (TQParam qparam in qmethod.CSharpParams) { sig.Append (qparam.Type); } if (!sigs.Contains (sig.ToString ()) && !sigs.Contains ("The"+sig.ToString ())) { @@ -96,11 +96,11 @@ namespace QtCSharp { sig.Length = 0; } - public void CheckSig (QCtor qctor) + public void CheckSig (TQCtor qctor) { sig.Append (qctor.Name); - foreach (QParam qparam in qctor.CSharpParams) { - //if (qparam.Type == "TQWidget" && qparam.Name == "parent") + foreach (TQParam qparam in qctor.CSharpParams) { + //if (qparam.Type == "TTQWidget" && qparam.Name == "parent") if (qparam.Name == "parent") qctor.Parent = true; sig.Append (qparam.Type); @@ -116,54 +116,54 @@ namespace QtCSharp { public void ConvertCSharpParams (ArrayList qparams) { - foreach (QParam qparam in qparams) { + foreach (TQParam qparam in qparams) { qparam.Type = qmap.ArrayType (qparam.Type); qparam.Type = StripBad (qparam.Type); qparam.Type = qmap.CSharpType (qparam.Type); - qparam.Type = ConvertQString (qparam.Type); + qparam.Type = ConvertTQString (qparam.Type); qparam.Name = qmap.ReservedType (qparam.Name); } } public void ConvertPinvokeCallParams (ArrayList qparams) { - foreach (QParam qparam in qparams) { + foreach (TQParam qparam in qparams) { qparam.Type = qmap.ArrayType (qparam.Type); qparam.Type = StripBad (qparam.Type); qparam.Type = qmap.CSharpType (qparam.Type); qparam.Name = qmap.ReservedType (qparam.Name); - if (IsQObject (qparam.Type)) + if (IsTQObject (qparam.Type)) qparam.Name = qparam.Name + ".RawObject"; - if (IsIQObject (qparam.Type)) + if (IsITQObject (qparam.Type)) qparam.Name = qparam.Name + "." + StripInterface (qparam.Type) + " ()"; - /* if (IsQString (qparam.Type)) - qparam.Name = "new TQString ("+StripPtr(qparam.Name)+").RawObject";*/ + /* if (IsTQString (qparam.Type)) + qparam.Name = "new TTQString ("+StripPtr(qparam.Name)+").RawObject";*/ qparam.Type = ""; } } public void ConvertPinvokeParams (ArrayList qparams) { - foreach (QParam qparam in qparams) { + foreach (TQParam qparam in qparams) { qparam.Type = qmap.ArrayType (qparam.Type); qparam.Type = StripBad (qparam.Type); qparam.Type = qmap.PinvokeType (qparam.Type); qparam.Name = qmap.ReservedType (qparam.Name); - if (IsQObject (qparam.Type) || IsIQObject (qparam.Type)) + if (IsTQObject (qparam.Type) || IsITQObject (qparam.Type)) qparam.Type = "IntPtr"; } } public void ConvertOverloadParams (ArrayList qparams) { - foreach (QParam qparam in qparams) { + foreach (TQParam qparam in qparams) { qparam.Type = qmap.ArrayType (qparam.Type); qparam.Type = StripBad (qparam.Type); qparam.Type = qmap.CSharpType (qparam.Type); OverloadedLastParam (qparam, qparams); OverloadedNull (qparam); - OverloadedQString (qparam); - OverloadedQObject (qparam); + OverloadedTQString (qparam); + OverloadedTQObject (qparam); OverloadedNestedEnum (qparam); OverloadedNullString (qparam); OverloadedBool (qparam); @@ -174,23 +174,23 @@ namespace QtCSharp { } } - public void OverloadedLastParam (QParam qparam, ArrayList qparams) + public void OverloadedLastParam (TQParam qparam, ArrayList qparams) { if (qparams.IndexOf (qparam) != qparams.Count - 1) qparam.Default = null; } - public void OverloadedNull (QParam qparam) + public void OverloadedNull (TQParam qparam) { if (qparam.Default == null) qparam.Type = ""; } - public void OverloadedQString (QParam qparam) + public void OverloadedTQString (TQParam qparam) { - if (IsQString (qparam.Type)){ - qparam.Type = "TQString"; - if (qparam.Default == "TQString::null") + if (IsTQString (qparam.Type)){ + qparam.Type = "TTQString"; + if (qparam.Default == "TTQString::null") qparam.Default = "null"; else if (qparam.Default == "quotquot") qparam.Default = "null"; @@ -199,19 +199,19 @@ namespace QtCSharp { } } - public void OverloadedQObject (QParam qparam) + public void OverloadedTQObject (TQParam qparam) { - if (IsQObject (qparam.Type)) { + if (IsTQObject (qparam.Type)) { qparam.Name = "new "+qparam.Type+" ()"; qparam.Type = ""; } } - public void OverloadedNestedEnum (QParam qparam) + public void OverloadedNestedEnum (TQParam qparam) { - foreach (QEnum qenum in qtype.QEnums) { + foreach (TQEnum qenum in qtype.TQEnums) { if (qparam.Type == qenum.Name) { - foreach (QItem qitem in qenum.QItems) { + foreach (TQItem qitem in qenum.TQItems) { if (qparam.Default == qitem.Name) { qparam.Name = qparam.Type+"."+qparam.Default; qparam.Type = ""; @@ -221,7 +221,7 @@ namespace QtCSharp { } } - public void OverloadedNullString (QParam qparam) + public void OverloadedNullString (TQParam qparam) { if (qmap.OverloadType (qparam.Type) == "string" && qparam.Default == "0") { qparam.Type = ""; @@ -229,7 +229,7 @@ namespace QtCSharp { } } - public void OverloadedBool (QParam qparam) + public void OverloadedBool (TQParam qparam) { if (qparam.Default == "TRUE") { qparam.Type = ""; @@ -246,7 +246,7 @@ namespace QtCSharp { } } - public void OverloadedEnum (QParam qparam) + public void OverloadedEnum (TQParam qparam) { if (IsEnum (qparam.Type)) { qparam.Name = qparam.Type + "." + EnumValue (qparam.Type, qparam.Default); @@ -254,7 +254,7 @@ namespace QtCSharp { } } - public void OverloadedArray (QParam qparam) + public void OverloadedArray (TQParam qparam) { if (IsArray (qparam.Type)) { qparam.Name = "new "+qparam.Type+"{"+qparam.Default+"}"; @@ -262,13 +262,13 @@ namespace QtCSharp { } } - public void OverloadedHex (QParam qparam) + public void OverloadedHex (TQParam qparam) { if (qparam.Default == "0xffffffff") qparam.Default = "1"; } - public void OverloadedDefault (QParam qparam) + public void OverloadedDefault (TQParam qparam) { if (qparam.Type != "") { qparam.Type = "("+qmap.OverloadType (qparam.Type)+")"; @@ -276,18 +276,18 @@ namespace QtCSharp { } } - public void ConvertReturnType (QMethod qmethod) + public void ConvertReturnType (TQMethod qmethod) { qmethod.Return = qmap.ArrayType (qmethod.Return); qmethod.Return = qmap.PinvokeType (StripBad (qmethod.Return)); - if (IsQObject(qmethod.Return)) { + if (IsTQObject(qmethod.Return)) { qmethod.Boxer = true; qmethod.PinvokeReturn = "IntPtr"; } else { qmethod.PinvokeReturn = qmethod.Return; } - if (qmethod.Return == "TQString") { - qmethod.QStringReturn = true; + if (qmethod.Return == "TTQString") { + qmethod.TQStringReturn = true; } } @@ -309,10 +309,10 @@ namespace QtCSharp { return str; } - public string ConvertQString (string str) + public string ConvertTQString (string str) { - if (IsQString (str)) - return "TQString"; + if (IsTQString (str)) + return "TTQString"; else return str; } @@ -344,7 +344,7 @@ namespace QtCSharp { public string ToPascalCase (string name) { string pascal = System.Char.ToUpper (name[0]).ToString ()+name.Substring (1, name.Length -1); - foreach (QEnum qenum in qtype.QEnums) { + foreach (TQEnum qenum in qtype.TQEnums) { if (pascal == qenum.Name) pascal = "The"+pascal; } @@ -358,16 +358,16 @@ namespace QtCSharp { value = StripEnum (value); // There _has_ to be a better way, but I'm tired... - foreach (QType qtype in qtypes) { - foreach (QEnum qenum in qtype.QEnums) { + foreach (TQType qtype in qtypes) { + foreach (TQEnum qenum in qtype.TQEnums) { if (enumname == qenum.Name) { - foreach (QItem qitem in qenum.QItems) { + foreach (TQItem qitem in qenum.TQItems) { if (value == qitem.Name) { match = true; } } if (!match) { - foreach (QItem qitem in qenum.QItems) { + foreach (TQItem qitem in qenum.TQItems) { value = qitem.Name; break; } @@ -380,22 +380,22 @@ namespace QtCSharp { public void Ancestors () { - if (qtype.IsInterface || qtype.QAncestors.Count < 2) + if (qtype.IsInterface || qtype.TQAncestors.Count < 2) return; string iname = ""; - foreach (QAncestor qancestor in qtype.QAncestors) { + foreach (TQAncestor qancestor in qtype.TQAncestors) { iname = qmap.InterfaceType (qancestor.Name); - foreach (QType _qtype in qtypes) { + foreach (TQType _qtype in qtypes) { if (_qtype.Name == qancestor.Name && iname != qancestor.Name) { if (!_qtype.IsConverted) { Converter converter = new Converter (qtypes, _qtype, qmap); } - qtype.AddQMethod (instPointer (qancestor.Name)); - qancestor.QMethods = _qtype.QMethods; + qtype.AddTQMethod (instPointer (qancestor.Name)); + qancestor.TQMethods = _qtype.TQMethods; qancestor.IsInterface = true; qancestor.IName = iname; - foreach (QMethod qmethod in qancestor.QMethods) { + foreach (TQMethod qmethod in qancestor.TQMethods) { CheckSig (qmethod); } } @@ -403,9 +403,9 @@ namespace QtCSharp { } } - public QMethod instPointer (string name) + public TQMethod instPointer (string name) { - QMethod qmethod = new QMethod (); + TQMethod qmethod = new TQMethod (); qmethod.Name = name; qmethod.PascalName = name; qmethod.Access = "public"; @@ -415,17 +415,17 @@ namespace QtCSharp { return qmethod; } - public bool IsQString (string str) + public bool IsTQString (string str) { - if (qtype.Name == "TQString") + if (qtype.Name == "TTQString") return true; - else if (IsQObject (str) && str == "TQString") + else if (IsTQObject (str) && str == "TTQString") return true; else return false; } - public bool IsQObject (string str) + public bool IsTQObject (string str) { //IndexOf is a hack to search for a char ;-) if (str.StartsWith ("Q") && str.IndexOf (".") < 0) @@ -434,7 +434,7 @@ namespace QtCSharp { return false; } - public bool IsIQObject (string str) + public bool IsITQObject (string str) { //IndexOf is a hack to search for a char ;-) if (str == "IntPtr") return false; diff --git a/qtsharp/src/generator/Generator.cs b/qtsharp/src/generator/Generator.cs index 68b1e031..3835f2e1 100644 --- a/qtsharp/src/generator/Generator.cs +++ b/qtsharp/src/generator/Generator.cs @@ -85,12 +85,12 @@ namespace QtCSharp { //} ParseAPI parseapi = new ParseAPI (xmlfile); - QTypeMap qmap = new QTypeMap (); - Console.WriteLine ("Parsing "+parseapi.QTypes.Count+" Qt classes..."); + TQTypeMap qmap = new TQTypeMap (); + Console.WriteLine ("Parsing "+parseapi.TQTypes.Count+" Qt classes..."); - foreach (QType qtype in parseapi.QTypes) { - Converter converter = new Converter (parseapi.QTypes, qtype, qmap); - Printer printer = new Printer (converter.GetQType (), directory); + foreach (TQType qtype in parseapi.TQTypes) { + Converter converter = new Converter (parseapi.TQTypes, qtype, qmap); + Printer printer = new Printer (converter.GetTQType (), directory); } } } diff --git a/qtsharp/src/generator/ParseAPI.cs b/qtsharp/src/generator/ParseAPI.cs index a79a8ab9..c6a86182 100644 --- a/qtsharp/src/generator/ParseAPI.cs +++ b/qtsharp/src/generator/ParseAPI.cs @@ -35,7 +35,7 @@ namespace QtCSharp { Parse (); } - public ArrayList QTypes + public ArrayList TQTypes { get {return qtypes;} } @@ -47,7 +47,7 @@ namespace QtCSharp { if (xtr.NodeType != XmlNodeType.EndElement) { switch(xtr.Name) { case "qtype": - QType t = AddQType (); + TQType t = AddTQType (); typehash[t.Name] = t; continue; default: @@ -56,31 +56,31 @@ namespace QtCSharp { } } - foreach (QType t in qtypes) { - t.IsQObject = IsQObject(t, typehash); + foreach (TQType t in qtypes) { + t.IsTQObject = IsTQObject(t, typehash); } } - public QType AddQType () + public TQType AddTQType () { Parser parser = new Parser (xtr.ReadOuterXml ()); - QType type = parser.GetQType (); + TQType type = parser.GetTQType (); qtypes.Add (type); return type; } - private static bool IsQObject(QType t, Hashtable typehash) + private static bool IsTQObject(TQType t, Hashtable typehash) { if (t.IsInterface) return false; - if (t.Name == "TQObject") return true; + if (t.Name == "TTQObject") return true; - foreach (QAncestor a in t.QAncestors) { - QType at = (QType)typehash[a.Name]; + foreach (TQAncestor a in t.TQAncestors) { + TQType at = (TQType)typehash[a.Name]; if (at == null) continue; - else if (at.Name == "TQObject") + else if (at.Name == "TTQObject") return true; - else if (IsQObject(at, typehash)) + else if (IsTQObject(at, typehash)) return true; } diff --git a/qtsharp/src/generator/Parser.cs b/qtsharp/src/generator/Parser.cs index cea811d3..1639b4b6 100644 --- a/qtsharp/src/generator/Parser.cs +++ b/qtsharp/src/generator/Parser.cs @@ -26,21 +26,21 @@ namespace QtCSharp { public class Parser { XmlTextReader xtr; - QType qtype; + TQType qtype; public Parser (string xmlFragment) { - qtype = new QType (); + qtype = new TQType (); XmlNameTable nt = new NameTable (); XmlNamespaceManager nsMgr = new XmlNamespaceManager (nt); XmlParserContext parserContext = new XmlParserContext (null, nsMgr, null, XmlSpace.None); xtr = new XmlTextReader (xmlFragment, XmlNodeType.Document, parserContext); Parse (); OverLoad (); - NewQCtors (); + NewTQCtors (); } - public QType GetQType () + public TQType GetTQType () { return qtype; } @@ -51,22 +51,22 @@ namespace QtCSharp { if (xtr.NodeType != XmlNodeType.EndElement) { switch (xtr.Name) { case "qtype": - ParseQType (); + ParseTQType (); continue; case "qancestor": - ParseQAncestor (); + ParseTQAncestor (); continue; case "qenum": - ParseQEnum (); + ParseTQEnum (); continue; case "qctor": - ParseQCtor (); + ParseTQCtor (); continue; case "qdctor": - ParseQDCtor (); + ParseTQDCtor (); continue; case "qmethod": - ParseQMethod (); + ParseTQMethod (); continue; default: continue; @@ -75,91 +75,91 @@ namespace QtCSharp { } } - public void NewQCtors () + public void NewTQCtors () { // A ctor for inherited classes - QCtor _qctor = new QCtor(); + TQCtor _qctor = new TQCtor(); _qctor.Name = qtype.Name; _qctor.Access = "internal"; _qctor.Inherited = true; - qtype.AddQCtor(_qctor); + qtype.AddTQCtor(_qctor); // A ctor for type boxing - QCtor __qctor = new QCtor(); + TQCtor __qctor = new TQCtor(); __qctor.Name = qtype.Name; __qctor.Access = "internal"; __qctor.Boxer = true; - QParam qparam = new QParam(); + TQParam qparam = new TQParam(); qparam.Type = "IntPtr"; qparam.Name = "_ptr"; __qctor.AddCSharpParam(qparam); - qtype.AddQCtor(__qctor); + qtype.AddTQCtor(__qctor); // A dummy ctor - QCtor ___qctor = new QCtor(); + TQCtor ___qctor = new TQCtor(); ___qctor.Name = qtype.Name; ___qctor.Access = "internal"; ___qctor.Dummy = true; - QParam ___qparam = new QParam(); - ___qparam.Type = "QNull"; + TQParam ___qparam = new TQParam(); + ___qparam.Type = "TQNull"; ___qparam.Name = "dummy"; ___qctor.AddCSharpParam(___qparam); - qtype.AddQCtor(___qctor); + qtype.AddTQCtor(___qctor); } public void OverLoad () { ArrayList additions = new ArrayList (); - foreach (QCtor qctor in qtype.QCtors){ - foreach (QParam pinvokeparam in qctor.PinvokeParams) { + foreach (TQCtor qctor in qtype.TQCtors){ + foreach (TQParam pinvokeparam in qctor.PinvokeParams) { if (pinvokeparam.Default != null) { - QCtor _qctor = new QCtor(); + TQCtor _qctor = new TQCtor(); _qctor.Name = qctor.Name; _qctor.Access = qctor.Access; _qctor.Overload = true; for (int j = 0; j < qctor.PinvokeParams.IndexOf(pinvokeparam)+1; j++) { - _qctor.AddPinvokeParam((QParam)qctor.PinvokeParams[j]); - _qctor.AddPinvokeCallParam((QParam)qctor.PinvokeCallParams[j]); - _qctor.AddCSharpParam((QParam)qctor.CSharpParams[j]); - _qctor.AddOverloadParam((QParam) (( QParam) qctor.CSharpParams[j]).Clone()); + _qctor.AddPinvokeParam((TQParam)qctor.PinvokeParams[j]); + _qctor.AddPinvokeCallParam((TQParam)qctor.PinvokeCallParams[j]); + _qctor.AddCSharpParam((TQParam)qctor.CSharpParams[j]); + _qctor.AddOverloadParam((TQParam) (( TQParam) qctor.CSharpParams[j]).Clone()); } _qctor.CSharpParams.RemoveAt(_qctor.CSharpParams.Count-1); - //qtype.AddQCtor(_qctor); + //qtype.AddTQCtor(_qctor); additions.Add (_qctor); } } } - foreach (QCtor ctor in additions) qtype.AddQCtor (ctor); + foreach (TQCtor ctor in additions) qtype.AddTQCtor (ctor); additions = new ArrayList (); - foreach (QMethod qmethod in qtype.QMethods){ - foreach (QParam pinvokeparam in qmethod.PinvokeParams) { + foreach (TQMethod qmethod in qtype.TQMethods){ + foreach (TQParam pinvokeparam in qmethod.PinvokeParams) { if (pinvokeparam.Default != null) { - QMethod _qmethod = new QMethod(); + TQMethod _qmethod = new TQMethod(); _qmethod.Name = qmethod.Name; _qmethod.Access = qmethod.Access; _qmethod.Return = qmethod.Return; _qmethod.Overload = true; for (int j = 0; j < qmethod.PinvokeParams.IndexOf(pinvokeparam)+1; j++) { - _qmethod.AddPinvokeParam((QParam)qmethod.PinvokeParams[j]); - _qmethod.AddPinvokeCallParam((QParam)qmethod.PinvokeCallParams[j]); - _qmethod.AddCSharpParam((QParam)qmethod.CSharpParams[j]); - _qmethod.AddOverloadParam((QParam) ((QParam) qmethod.CSharpParams[j]).Clone()); + _qmethod.AddPinvokeParam((TQParam)qmethod.PinvokeParams[j]); + _qmethod.AddPinvokeCallParam((TQParam)qmethod.PinvokeCallParams[j]); + _qmethod.AddCSharpParam((TQParam)qmethod.CSharpParams[j]); + _qmethod.AddOverloadParam((TQParam) ((TQParam) qmethod.CSharpParams[j]).Clone()); } _qmethod.CSharpParams.RemoveAt(_qmethod.CSharpParams.Count-1); - //qtype.AddQMethod(_qmethod); + //qtype.AddTQMethod(_qmethod); additions.Add (_qmethod); } } } - foreach (QMethod method in additions) qtype.AddQMethod (method); + foreach (TQMethod method in additions) qtype.AddTQMethod (method); } - public void ParseQType () + public void ParseTQType () { if (xtr.MoveToAttribute("name")) { qtype.Name = xtr.Value; @@ -170,27 +170,27 @@ namespace QtCSharp { } } - public void ParseQAncestor () + public void ParseTQAncestor () { - QAncestor qancestor = new QAncestor(); + TQAncestor qancestor = new TQAncestor(); if (xtr.MoveToAttribute("name")) { qancestor.Name = xtr.Value; } - qtype.AddQAncestor(qancestor); + qtype.AddTQAncestor(qancestor); } - public void ParseQEnum () + public void ParseTQEnum () { bool match = false; - QEnum qenum = new QEnum(); + TQEnum qenum = new TQEnum(); if (xtr.MoveToAttribute("name")) qenum.Name = xtr.Value; if (xtr.MoveToAttribute("access")) qenum.Access = xtr.Value; while (xtr.Read()) { if (xtr.Name == "qitem") { - QItem qitem = ParseQItem(); - qenum.AddQItem(qitem); + TQItem qitem = ParseTQItem(); + qenum.AddTQItem(qitem); long parse = 0; try { parse = Int64.Parse(qitem.Value); @@ -203,13 +203,13 @@ namespace QtCSharp { break; } } - qtype.AddQEnum(qenum); + qtype.AddTQEnum(qenum); } - public void ParseQCtor () + public void ParseTQCtor () { bool IsEmpty = xtr.IsEmptyElement; - QCtor qctor = new QCtor(); + TQCtor qctor = new TQCtor(); if (xtr.MoveToAttribute("name")) { qctor.Name = xtr.Value; } @@ -222,22 +222,22 @@ namespace QtCSharp { if (!IsEmpty) { while (xtr.Read()) { if (xtr.Name == "qparam") { - qctor.AddPinvokeParam(ParseQParam()); - qctor.AddPinvokeCallParam(ParseQParam()); - qctor.AddCSharpParam(ParseQParam()); + qctor.AddPinvokeParam(ParseTQParam()); + qctor.AddPinvokeCallParam(ParseTQParam()); + qctor.AddCSharpParam(ParseTQParam()); } else if (xtr.Name == ""){ } else { break; } } } - qtype.AddQCtor(qctor); + qtype.AddTQCtor(qctor); } - public void ParseQDCtor () + public void ParseTQDCtor () { bool IsEmpty = xtr.IsEmptyElement; - QDCtor qdctor = new QDCtor(); + TQDCtor qdctor = new TQDCtor(); if (xtr.MoveToAttribute("name")) { qdctor.Name = xtr.Value; } @@ -247,20 +247,20 @@ namespace QtCSharp { if (!IsEmpty) { while (xtr.Read()) { if (xtr.Name == "qparam") { - qdctor.AddQParam(ParseQParam()); + qdctor.AddTQParam(ParseTQParam()); } else if (xtr.Name == "") { } else { break; } } } - qtype.AddQDCtor(qdctor); + qtype.AddTQDCtor(qdctor); } - public void ParseQMethod () + public void ParseTQMethod () { bool IsEmpty = xtr.IsEmptyElement; - QMethod qmethod = new QMethod(); + TQMethod qmethod = new TQMethod(); if (xtr.MoveToAttribute("name")) { qmethod.Name = xtr.Value; } @@ -281,21 +281,21 @@ namespace QtCSharp { if (!IsEmpty) { while (xtr.Read()) { if (xtr.Name == "qparam") { - qmethod.AddPinvokeParam(ParseQParam()); - qmethod.AddPinvokeCallParam(ParseQParam()); - qmethod.AddCSharpParam(ParseQParam()); + qmethod.AddPinvokeParam(ParseTQParam()); + qmethod.AddPinvokeCallParam(ParseTQParam()); + qmethod.AddCSharpParam(ParseTQParam()); } else if (xtr.Name == ""){ } else { break; } } } - qtype.AddQMethod(qmethod); + qtype.AddTQMethod(qmethod); } - public QItem ParseQItem () + public TQItem ParseTQItem () { - QItem qitem = new QItem(); + TQItem qitem = new TQItem(); if (xtr.MoveToAttribute("name")) { qitem.Name = xtr.Value; } @@ -305,9 +305,9 @@ namespace QtCSharp { return qitem; } - public QParam ParseQParam () + public TQParam ParseTQParam () { - QParam qparam = new QParam(); + TQParam qparam = new TQParam(); if (xtr.MoveToAttribute("type")) { qparam.Type = xtr.Value; } diff --git a/qtsharp/src/generator/Printer.cs b/qtsharp/src/generator/Printer.cs index e6243250..c71bed7c 100644 --- a/qtsharp/src/generator/Printer.cs +++ b/qtsharp/src/generator/Printer.cs @@ -25,10 +25,10 @@ namespace QtCSharp { public class Printer { - QType qtype; + TQType qtype; string tab, directory; - public Printer (QType qtype, string directory) + public Printer (TQType qtype, string directory) { this.qtype = qtype; this.directory = directory; @@ -44,15 +44,15 @@ namespace QtCSharp { StreamWriter writer = new StreamWriter(directory + Path.DirectorySeparatorChar + qtype.Name + ".cs", false, new ASCIIEncoding()); writer.Write(Header); - writer.Write(StartClass(qtype.Name, qtype.Access, new ArrayList(qtype.QAncestors))); + writer.Write(StartClass(qtype.Name, qtype.Access, new ArrayList(qtype.TQAncestors))); - foreach (QEnum qenum in qtype.QEnums) { + foreach (TQEnum qenum in qtype.TQEnums) { writer.Write(StartEnum(qenum.Name, qenum.Access, qenum.Type)); - writer.Write(Items(qenum.QItems)); + writer.Write(Items(qenum.TQItems)); writer.Write(EndMember); } - foreach (QCtor qctor in qtype.QCtors) { + foreach (TQCtor qctor in qtype.TQCtors) { if (qctor.Throttle) { } else if (qctor.Inherited) { writer.Write (WriteInherited (qctor.Name, qctor.Access)); @@ -80,7 +80,7 @@ namespace QtCSharp { //writer.Write (DisposePublic ()); - foreach (QDCtor qdctor in qtype.QDCtors) { + foreach (TQDCtor qdctor in qtype.TQDCtors) { writer.Write (ImportAttrib); writer.Write (ImportDCtorCall (qdctor.Name)); } @@ -88,18 +88,18 @@ namespace QtCSharp { //writer.Write (DisposeProtected ()); writer.Write (Delete ()); - foreach (QMethod qmethod in qtype.QMethods) { + foreach (TQMethod qmethod in qtype.TQMethods) { if (qmethod.Throttle) { } else if (!qmethod.Overload) { writer.Write(ImportAttrib); if (qmethod.Access == "public" || qmethod.Access == "protected" || qmethod.Access == "internal") { writer.Write(ImportMethodCall(qtype.Name, qmethod.Name, qmethod.Id, qmethod.PinvokeReturn, qmethod.PinvokeParams)); writer.Write(StartMethod(qmethod.PascalName, qmethod.Access, qmethod.Return, qmethod.CSharpParams)); - writer.Write(MethodCall(qmethod.QStringReturn, qmethod.Boxer, qtype.Name, qmethod.Name, "rawObject", qmethod.Id, qmethod.Return, qmethod.PinvokeCallParams)); + writer.Write(MethodCall(qmethod.TQStringReturn, qmethod.Boxer, qtype.Name, qmethod.Name, "rawObject", qmethod.Id, qmethod.Return, qmethod.PinvokeCallParams)); } else { writer.Write(StaticImportMethodCall(qtype.Name, qmethod.Name, qmethod.Id, qmethod.PinvokeReturn, qmethod.PinvokeParams)); writer.Write(StartMethod(qmethod.PascalName, qmethod.Access, qmethod.Return, qmethod.CSharpParams)); - writer.Write(StaticMethodCall(qmethod.QStringReturn, qmethod.Boxer, qtype.Name, qmethod.Name, qmethod.Id, qmethod.Return, qmethod.PinvokeCallParams)); + writer.Write(StaticMethodCall(qmethod.TQStringReturn, qmethod.Boxer, qtype.Name, qmethod.Name, qmethod.Id, qmethod.Return, qmethod.PinvokeCallParams)); } writer.Write(EndMember); } else { @@ -107,22 +107,22 @@ namespace QtCSharp { } } - foreach (QAncestor qancestor in qtype.QAncestors) { + foreach (TQAncestor qancestor in qtype.TQAncestors) { writer.Write("\n\n"+tab+tab+"// Begin interface methods.\n"); if (qancestor.IsInterface) { Printer printer = new Printer (qancestor, directory); - foreach (QMethod qmethod in qancestor.QMethods) { + foreach (TQMethod qmethod in qancestor.TQMethods) { if (qmethod.Throttle) { } else if (!qmethod.Overload) { writer.Write(ImportAttrib); if (qmethod.Access == "public" || qmethod.Access == "protected") { writer.Write(ImportMethodCall(qancestor.Name, qmethod.Name, qmethod.Id, qmethod.PinvokeReturn, qmethod.PinvokeParams)); writer.Write(StartMethod(qmethod.PascalName, qmethod.Access, qmethod.Return, qmethod.CSharpParams)); - writer.Write(MethodCall(qmethod.QStringReturn, qmethod.Boxer, qancestor.Name, qmethod.Name, qancestor.Name+" ()", qmethod.Id, qmethod.Return, qmethod.PinvokeCallParams)); + writer.Write(MethodCall(qmethod.TQStringReturn, qmethod.Boxer, qancestor.Name, qmethod.Name, qancestor.Name+" ()", qmethod.Id, qmethod.Return, qmethod.PinvokeCallParams)); } else { writer.Write(StaticImportMethodCall(qancestor.Name, qmethod.Name, qmethod.Id, qmethod.PinvokeReturn, qmethod.PinvokeParams)); writer.Write(StartMethod(qmethod.PascalName, qmethod.Access, qmethod.Return, qmethod.CSharpParams)); - writer.Write(StaticMethodCall(qmethod.QStringReturn, qmethod.Boxer, qancestor.Name, qmethod.Name, qmethod.Id, qmethod.Return, qmethod.PinvokeCallParams)); + writer.Write(StaticMethodCall(qmethod.TQStringReturn, qmethod.Boxer, qancestor.Name, qmethod.Name, qmethod.Id, qmethod.Return, qmethod.PinvokeCallParams)); } writer.Write(EndMember); } else { @@ -142,9 +142,9 @@ namespace QtCSharp { StreamWriter writer = new StreamWriter(directory + Path.DirectorySeparatorChar + qtype.IName + ".cs", false, new ASCIIEncoding()); writer.Write(Header); - writer.Write(StartClass(qtype.IName, "public", qtype.QAncestors)); + writer.Write(StartClass(qtype.IName, "public", qtype.TQAncestors)); - foreach (QMethod qmethod in qtype.QMethods) { + foreach (TQMethod qmethod in qtype.TQMethods) { if (qmethod.Throttle || qmethod.Access == "public static" || qmethod.Access == "protected") { } else { writer.Write(IMethod(qmethod.PascalName, qmethod.Return, qmethod.CSharpParams)); @@ -167,7 +167,7 @@ namespace QtCSharp { sb.Append(tab+access+" class "+name+" : "); if (qancestors.Count == 0) sb.Append ("QtSupport"); - foreach (QAncestor qancestor in qancestors) { + foreach (TQAncestor qancestor in qancestors) { if (!qancestor.IsInterface) { if (qancestor.Name == "Qt") { sb.Append ("QtSupport"); @@ -180,7 +180,7 @@ namespace QtCSharp { } } - foreach (QAncestor qancestor in qancestors) { + foreach (TQAncestor qancestor in qancestors) { if (qancestor.IsInterface) { sb.Append (", "+qancestor.IName); } @@ -205,18 +205,18 @@ namespace QtCSharp { public string WriteInherited (string name, string access) { - return "\n\n"+tab+tab+access+" "+name+" () : this (QNull.Instance) {}"; + return "\n\n"+tab+tab+access+" "+name+" () : this (TQNull.Instance) {}"; } public string WriteDummy (string name, string access) { - return "\n\n"+tab+tab+access+" "+name+" (QNull dummy) : base (QNull.Instance) {}"; + return "\n\n"+tab+tab+access+" "+name+" (TQNull dummy) : base (TQNull.Instance) {}"; } public string WriteBoxer (string name, string access) { return "\n\n" + - tab+tab+access+" "+name+" (IntPtr ptr) : this (QNull.Instance)\n"+tab+tab+"{\n" + + tab+tab+access+" "+name+" (IntPtr ptr) : this (TQNull.Instance)\n"+tab+tab+"{\n" + tab+tab+tab+"rawObject = ptr;\n" + tab+tab+tab+"RegisterObject(this);\n" + tab+tab+"}"; @@ -233,7 +233,7 @@ namespace QtCSharp { public string StartCtor (string name, string access, ArrayList csharpparams) { - return "\n"+tab+tab+access+" "+name+" ("+Params(csharpparams)+") : this (QNull.Instance)\n"+tab+tab+"{\n"; + return "\n"+tab+tab+access+" "+name+" ("+Params(csharpparams)+") : this (TQNull.Instance)\n"+tab+tab+"{\n"; } public string StartDCtor (string name) @@ -245,7 +245,7 @@ namespace QtCSharp { { string str = "\n"+tab+tab+access+" "+returntype+" "+name+" ("+Params(csharpparams)+")\n"+tab+tab+"{\n"; - // QEvents should never be disposed inside C# + // TQEvents should never be disposed inside C# if (access.IndexOf ("static") <= 0) str += "\t\t\tif (disposed)\n\t\t\t\tthrow new ObjectDisposedException (this+\": Attempted use of disposed object\");\n\n"; @@ -284,7 +284,7 @@ namespace QtCSharp { { int count = 0; StringBuilder sb = new StringBuilder(); - foreach (QItem qitem in qitems) { + foreach (TQItem qitem in qitems) { count++; sb.Append("\n"+tab+tab+tab+qitem.Name+" = "+qitem.Value); if (count != qitems.Count) @@ -297,7 +297,7 @@ namespace QtCSharp { { int count = 0; StringBuilder sb = new StringBuilder(); - foreach (QParam qparam in qparams) { + foreach (TQParam qparam in qparams) { count++; if (qparam.Type != "") sb.Append(qparam.Type+" "+qparam.Name); @@ -347,13 +347,13 @@ namespace QtCSharp { public string RawObject (string name, string id, ArrayList qparams) { - if (qtype.IsQObject) { + if (qtype.IsTQObject) { ArrayList newparams = new ArrayList (); - foreach (QParam parm in qparams) { + foreach (TQParam parm in qparams) { //Console.WriteLine ("--> {0}", parm.Name); if (parm.Name == "parent.RawObject") { - QParam newparm = parm.Clone() as QParam; + TQParam newparm = parm.Clone() as TQParam; newparm.Name = "parent != null ? parent.RawObject : IntPtr.Zero"; newparams.Add (newparm); } @@ -390,7 +390,7 @@ namespace QtCSharp { string newid = id == "0" ? "" : id; if (boxer && qstring) { - ret = "\t\t\treturn new TQString (qt_"+type+"_"+name+newid+" ("+instPtr+comma+Params (qparams)+"));\n"; + ret = "\t\t\treturn new TTQString (qt_"+type+"_"+name+newid+" ("+instPtr+comma+Params (qparams)+"));\n"; } else if (boxer) { ret = "\t\t\treturn LookupObject (qt_"+type+"_"+name+newid+" ("+instPtr+comma+Params (qparams)+"), typeof ("+ReturnType+")) as "+ReturnType+";"; @@ -416,7 +416,7 @@ namespace QtCSharp { string newid = id == "0" ? "" : id; if (boxer && qstring) { - ret = "\t\t\treturn new TQString (qt_"+type+"_"+name+newid+" ("+Params (qparams)+"));\n"; + ret = "\t\t\treturn new TTQString (qt_"+type+"_"+name+newid+" ("+Params (qparams)+"));\n"; } else if (boxer) { ret = "\t\t\treturn LookupObject (qt_"+type+"_"+name+newid+" ("+Params (qparams)+"), typeof ("+ReturnType+")) as "+ReturnType+";\n"; @@ -496,12 +496,12 @@ namespace QtCSharp { "\t\tinternal override void Delete ()\n" + "\t\t{\n"; - // Let Qt manage QEvents + // Let Qt manage TQEvents if (! (qtype.Name.StartsWith ("Q") && qtype.Name.EndsWith ("Event"))) { ret += "\t\t\tif (deleted) return;\n\n"; - if (qtype.QDCtors.Count > 0) + if (qtype.TQDCtors.Count > 0) ret += "\t\t\tqt_del_"+qtype.Name+" (rawObject);\n"; else ret = "\n" + ret + "\t\t\t// libqtc lacks a qt_del_"+qtype.Name+" function\n"; @@ -517,7 +517,7 @@ namespace QtCSharp { public string DefaultConnections () { - if (qtype.IsQObject) + if (qtype.IsTQObject) return "\n\t\t\tConnect (this, TQT_SIGNAL (\"destroyed ()\"), TQT_SLOT (\"NativeDestroyed ()\"));"; else return ""; diff --git a/qtsharp/src/generator/QAncestor.cs b/qtsharp/src/generator/QAncestor.cs index 5467a902..bb35051b 100644 --- a/qtsharp/src/generator/QAncestor.cs +++ b/qtsharp/src/generator/QAncestor.cs @@ -20,7 +20,7 @@ using System; namespace QtCSharp { - public class QAncestor : QType { + public class TQAncestor : TQType { } } diff --git a/qtsharp/src/generator/QCtor.cs b/qtsharp/src/generator/QCtor.cs index 880bf13b..8a7ec439 100644 --- a/qtsharp/src/generator/QCtor.cs +++ b/qtsharp/src/generator/QCtor.cs @@ -22,7 +22,7 @@ using System.Collections; namespace QtCSharp { - public class QCtor : QMember{ + public class TQCtor : TQMember{ bool dummy, parent, inherited; diff --git a/qtsharp/src/generator/QDCtor.cs b/qtsharp/src/generator/QDCtor.cs index 8aef33c0..de70a51e 100644 --- a/qtsharp/src/generator/QDCtor.cs +++ b/qtsharp/src/generator/QDCtor.cs @@ -22,17 +22,17 @@ using System.Collections; namespace QtCSharp { - public class QDCtor { + public class TQDCtor { string name, access; ArrayList qparams; - public QDCtor() + public TQDCtor() { qparams = new ArrayList(); } - public void AddQParam(QParam qparam) + public void AddTQParam(TQParam qparam) { qparams.Add(qparam); } @@ -49,7 +49,7 @@ namespace QtCSharp { set {access = value;} } - public ArrayList QParams + public ArrayList TQParams { get {return qparams;} } diff --git a/qtsharp/src/generator/QEnum.cs b/qtsharp/src/generator/QEnum.cs index 1be81b41..f2304b02 100644 --- a/qtsharp/src/generator/QEnum.cs +++ b/qtsharp/src/generator/QEnum.cs @@ -22,17 +22,17 @@ using System.Collections; namespace QtCSharp { - public class QEnum { + public class TQEnum { string name, access, type; ArrayList qitems; - public QEnum() + public TQEnum() { qitems = new ArrayList(); } - public void AddQItem(QItem qitem) + public void AddTQItem(TQItem qitem) { qitems.Add(qitem); } @@ -55,7 +55,7 @@ namespace QtCSharp { set {type = value;} } - public ArrayList QItems + public ArrayList TQItems { get {return qitems;} } diff --git a/qtsharp/src/generator/QItem.cs b/qtsharp/src/generator/QItem.cs index 22e23c63..a678de4d 100644 --- a/qtsharp/src/generator/QItem.cs +++ b/qtsharp/src/generator/QItem.cs @@ -21,11 +21,11 @@ using System; namespace QtCSharp { - public class QItem { + public class TQItem { string name, qvalue; - public QItem() + public TQItem() { } diff --git a/qtsharp/src/generator/QMember.cs b/qtsharp/src/generator/QMember.cs index 95c00280..6fb7b14b 100644 --- a/qtsharp/src/generator/QMember.cs +++ b/qtsharp/src/generator/QMember.cs @@ -22,13 +22,13 @@ using System.Collections; namespace QtCSharp { - public class QMember { + public class TQMember { string name, access, id; bool overload, throttle, boxer; ArrayList pinvokeparams, pinvokecallparams, csharpparams, overloadparams; - public QMember() + public TQMember() { pinvokeparams = new ArrayList(); pinvokecallparams = new ArrayList(); @@ -37,22 +37,22 @@ namespace QtCSharp { } - public void AddPinvokeParam(QParam pinvokeparam) + public void AddPinvokeParam(TQParam pinvokeparam) { pinvokeparams.Add(pinvokeparam); } - public void AddPinvokeCallParam(QParam pinvokecallparam) + public void AddPinvokeCallParam(TQParam pinvokecallparam) { pinvokecallparams.Add(pinvokecallparam); } - public void AddCSharpParam(QParam csharpparam) + public void AddCSharpParam(TQParam csharpparam) { csharpparams.Add(csharpparam); } - public void AddOverloadParam(QParam overloadparam) + public void AddOverloadParam(TQParam overloadparam) { overloadparams.Add(overloadparam); } diff --git a/qtsharp/src/generator/QMethod.cs b/qtsharp/src/generator/QMethod.cs index 6bd6eebd..085935c4 100644 --- a/qtsharp/src/generator/QMethod.cs +++ b/qtsharp/src/generator/QMethod.cs @@ -22,7 +22,7 @@ using System.Collections; namespace QtCSharp { - public class QMethod : QMember { + public class TQMethod : TQMember { bool qstringreturn; string returntype, pinvokereturn, pascalname; @@ -39,7 +39,7 @@ namespace QtCSharp { set {pinvokereturn = value;} } - public bool QStringReturn + public bool TQStringReturn { get {return qstringreturn;} set {qstringreturn = value;} diff --git a/qtsharp/src/generator/QParam.cs b/qtsharp/src/generator/QParam.cs index 53212bad..7cf27183 100644 --- a/qtsharp/src/generator/QParam.cs +++ b/qtsharp/src/generator/QParam.cs @@ -21,11 +21,11 @@ using System; namespace QtCSharp { - public class QParam: ICloneable { + public class TQParam: ICloneable { string type, name, defaultvalue; - public QParam() + public TQParam() {} public object Clone() diff --git a/qtsharp/src/generator/QType.cs b/qtsharp/src/generator/QType.cs index 16ba8f56..dd358025 100644 --- a/qtsharp/src/generator/QType.cs +++ b/qtsharp/src/generator/QType.cs @@ -22,13 +22,13 @@ using System.Collections; namespace QtCSharp { - public class QType { + public class TQType { string name, access, iname; - bool isInterface, isConverted, isQObject; + bool isInterface, isConverted, isTQObject; ArrayList qancestors, qenums, qctors, qdctors, qmethods; - public QType () + public TQType () { qancestors = new ArrayList (); qenums = new ArrayList (); @@ -37,27 +37,27 @@ namespace QtCSharp { qmethods = new ArrayList (); } - public void AddQAncestor (QAncestor qancestor) + public void AddTQAncestor (TQAncestor qancestor) { qancestors.Add (qancestor); } - public void AddQEnum (QEnum qenum) + public void AddTQEnum (TQEnum qenum) { qenums.Add (qenum); } - public void AddQCtor (QCtor qctor) + public void AddTQCtor (TQCtor qctor) { qctors.Add (qctor); } - public void AddQDCtor (QDCtor qdctor) + public void AddTQDCtor (TQDCtor qdctor) { qdctors.Add (qdctor); } - public void AddQMethod (QMethod qmethod) + public void AddTQMethod (TQMethod qmethod) { qmethods.Add (qmethod); } @@ -86,9 +86,9 @@ namespace QtCSharp { set {isConverted = value;} } - public bool IsQObject { - get { return isQObject; } - set { isQObject = value; } + public bool IsTQObject { + get { return isTQObject; } + set { isTQObject = value; } } public string IName @@ -97,27 +97,27 @@ namespace QtCSharp { set {iname = value;} } - public ArrayList QAncestors + public ArrayList TQAncestors { get {return qancestors;} } - public ArrayList QEnums + public ArrayList TQEnums { get {return qenums;} } - public ArrayList QCtors + public ArrayList TQCtors { get {return qctors;} } - public ArrayList QDCtors + public ArrayList TQDCtors { get {return qdctors;} } - public ArrayList QMethods + public ArrayList TQMethods { get {return qmethods;} set {qmethods = value;} diff --git a/qtsharp/src/generator/QTypeMap.cs b/qtsharp/src/generator/QTypeMap.cs index 321c4738..05a7afa2 100644 --- a/qtsharp/src/generator/QTypeMap.cs +++ b/qtsharp/src/generator/QTypeMap.cs @@ -21,11 +21,11 @@ using System.Collections; namespace QtCSharp { - public class QTypeMap { + public class TQTypeMap { Hashtable arraymap, mastermap, pinvoketypes, pinvokecalltypes, csharptypes, overloadtypes, reserved, interfaces; - public QTypeMap () + public TQTypeMap () { arraymap = new Hashtable (); arraymap.Add ("void*", "int[]"); @@ -44,8 +44,8 @@ namespace QtCSharp { mastermap = new Hashtable (); mastermap.Add ("void", "void"); - // mastermap.Add ("TQByteArray", "byte[]"); - mastermap.Add ("TQBitArray", "byte[]"); + // mastermap.Add ("TTQByteArray", "byte[]"); + mastermap.Add ("TTQBitArray", "byte[]"); mastermap.Add ("uchar", "string"); mastermap.Add ("unsigned int", "uint"); mastermap.Add ("unsigned short", "ushort"); @@ -63,17 +63,17 @@ namespace QtCSharp { mastermap.Add ("EventRef", "IntPtr"); mastermap.Add ("MSG", "IntPtr"); mastermap.Add ("XEvent", "IntPtr"); - mastermap.Add ("QWSEvent", "IntPtr"); + mastermap.Add ("TQWSEvent", "IntPtr"); mastermap.Add ("GDHandle", "IntPtr"); - mastermap.Add ("QRgb", "int"); - mastermap.Add ("QWSDecoration", "IntPtr"); - mastermap.Add ("QTextParag", "IntPtr"); + mastermap.Add ("TQRgb", "int"); + mastermap.Add ("TQWSDecoration", "IntPtr"); + mastermap.Add ("TQTextParag", "IntPtr"); mastermap.Add ("Qt.HANDLE", "IntPtr"); - mastermap.Add ("QUObject", "IntPtr"); - mastermap.Add ("QGfx", "IntPtr"); - mastermap.Add ("QRESULT", "long"); - mastermap.Add ("QUnknownInterface", "IntPtr"); - mastermap.Add ("TQPtrCollection.Item", "int"); + mastermap.Add ("TQUObject", "IntPtr"); + mastermap.Add ("TQGfx", "IntPtr"); + mastermap.Add ("TQRESULT", "long"); + mastermap.Add ("TQUnknownInterface", "IntPtr"); + mastermap.Add ("TTQPtrCollection.Item", "int"); mastermap.Add ("type", "IntPtr"); mastermap.Add ("array_data", "IntPtr"); mastermap.Add ("bitarr_data", "IntPtr"); @@ -87,14 +87,14 @@ namespace QtCSharp { mastermap.Add ("Q_UINT32", "uint"); mastermap.Add ("Q_UINT8", "char"); mastermap.Add ("Q_ULONG", "long"); - mastermap.Add ("QStyleHintReturn", "IntPtr"); - mastermap.Add ("QFileInfoList", "IntPtr"); - mastermap.Add ("QDomNodePrivate", "IntPtr"); + mastermap.Add ("TQStyleHintReturn", "IntPtr"); + mastermap.Add ("TQFileInfoList", "IntPtr"); + mastermap.Add ("TQDomNodePrivate", "IntPtr"); mastermap.Add ("GUID", "System.Guid"); mastermap.Add ("FILE", "string"); mastermap.Add ("EncoderFn", "int"); mastermap.Add ("DecoderFn", "int"); - mastermap.Add ("QDiskFont", "IntPtr"); + mastermap.Add ("TQDiskFont", "IntPtr"); mastermap.Add ("pointer", "IntPtr"); mastermap.Add ("T", "IntPtr"); mastermap.Add ("T1", "IntPtr"); @@ -105,31 +105,31 @@ namespace QtCSharp { mastermap.Add ("reference", "IntPtr"); mastermap.Add ("_reference", "IntPtr"); mastermap.Add ("ConstIterator", "int"); - mastermap.Add ("QWSDisplay", "IntPtr"); + mastermap.Add ("TQWSDisplay", "IntPtr"); mastermap.Add ("CGContextRef", "IntPtr"); mastermap.Add ("WId", "uint"); - mastermap.Add ("QWidgetMapper", "IntPtr"); + mastermap.Add ("TQWidgetMapper", "IntPtr"); mastermap.Add ("size_type", "int"); mastermap.Add ("Item", "IntPtr"); mastermap.Add ("image_io_handler", "int"); - mastermap.Add ("QCOORD", "short"); + mastermap.Add ("TQCOORD", "short"); mastermap.Add ("key_type", "IntPtr"); mastermap.Add ("K", "IntPtr"); mastermap.Add ("NodePtr", "int"); - mastermap.Add ("QTextFormat", "IntPtr"); - mastermap.Add ("QTextDocument", "IntPtr"); - mastermap.Add ("QTextCursor", "IntPtr"); + mastermap.Add ("TQTextFormat", "IntPtr"); + mastermap.Add ("TQTextDocument", "IntPtr"); + mastermap.Add ("TQTextCursor", "IntPtr"); mastermap.Add ("_NPStream", "IntPtr"); mastermap.Add ("PID", "long"); mastermap.Add ("Region", "int"); mastermap.Add ("RgnHandle", "IntPtr"); - mastermap.Add ("QRemoteInterface", "IntPtr"); + mastermap.Add ("TQRemoteInterface", "IntPtr"); mastermap.Add ("mode_t", "int"); - mastermap.Add ("TQSqlFieldInfo", "IntPtr"); - mastermap.Add ("TQSqlRecordInfo", "IntPtr"); - mastermap.Add ("QSqlRecordPrivate", "IntPtr"); - mastermap.Add ("QTSMFI", "int"); - mastermap.Add ("Widget", "TQWidget"); + mastermap.Add ("TTQSqlFieldInfo", "IntPtr"); + mastermap.Add ("TTQSqlRecordInfo", "IntPtr"); + mastermap.Add ("TQSqlRecordPrivate", "IntPtr"); + mastermap.Add ("TQTSMFI", "int"); + mastermap.Add ("Widget", "TTQWidget"); mastermap.Add ("WidgetClass", "int"); mastermap.Add ("ArgList", "int"); mastermap.Add ("Cardinal", "int"); @@ -138,117 +138,117 @@ namespace QtCSharp { mastermap.Add ("ULONG_MAX", "UInt64.MaxValue"); // Enums - mastermap.Add ("Event", "TQAccessible.Event"); - mastermap.Add ("Role", "TQAccessible.Role"); - mastermap.Add ("NavDirection", "TQAccessible.NavDirection"); - mastermap.Add ("Text", "TQAccessible.Text"); - mastermap.Add ("ColorSpec", "TQApplication.ColorSpec"); - mastermap.Add ("ToggleState", "TQButton.ToggleState"); - mastermap.Add ("RttiValues", "TQCanvasItem.RttiValues"); - mastermap.Add ("FrameAnimationType", "TQCanvasSprite.FrameAnimationType"); - mastermap.Add ("Category", "TQChar.Category"); - mastermap.Add ("Decomposition", "TQChar.Decomposition"); - mastermap.Add ("Joining", "TQChar.Joining"); - mastermap.Add ("CombiningClass", "TQChar.CombiningClass"); - mastermap.Add ("Spec", "TQColor.Spec"); - mastermap.Add ("ColorRole", "TQColorGroup.ColorRole"); - mastermap.Add ("Boundary", "TQDataBrowser.Boundary"); - mastermap.Add ("ByteOrder", "TQDataStream.ByteOrder"); - mastermap.Add ("Refresh", "TQDataTable.Refresh"); - mastermap.Add ("Order", "QDateEdit.Order"); - mastermap.Add ("DialogCode", "TQDialog.DialogCode"); - mastermap.Add ("FilterSpec", "TQDir.FilterSpec"); - mastermap.Add ("SortSpec", "TQDir.SortSpec"); - mastermap.Add ("RecordType", "TQDns.RecordType"); - mastermap.Add ("HandlePosition", "TQDockArea.HandlePosition"); - mastermap.Add ("Place", "TQDockWindow.Place"); - mastermap.Add ("CloseMode", "TQDockWindow.CloseMode"); - mastermap.Add ("NodeType", "TQDomNode.NodeType"); - mastermap.Add ("DragMode", "TQDragObject.DragMode"); - mastermap.Add ("Action", "TQDropEvent.Action"); - mastermap.Add ("ViewMode", "TQFileDialog.ViewMode"); - mastermap.Add ("PreviewMode", "TQFileDialog.PreviewMode"); - mastermap.Add ("PermissionSpec", "TQFileInfo.PermissionSpec"); - mastermap.Add ("StyleStrategy", "TQFont.StyleStrategy"); - mastermap.Add ("Weight", "TQFont.Weight"); - mastermap.Add ("Script", "TQFont.Script"); - mastermap.Add ("Shadow", "TQFrame.Shadow"); - mastermap.Add ("FormatOption", "TQGL.FormatOption"); - mastermap.Add ("Corner", "TQGridLayout.Corner"); - mastermap.Add ("Size", "TQIconSet.Size"); - mastermap.Add ("Arrangement", "TQIconView.Arrangement"); - mastermap.Add ("ItemTextPos", "TQIconView.ItemTextPos"); - mastermap.Add ("Endian", "TQImage.Endian"); - mastermap.Add ("ScaleMode", "TQImage.ScaleMode"); - mastermap.Add ("PaintDeviceFlags", "TQInternal.PaintDeviceFlags"); - mastermap.Add ("Rules", "TQJpUnicodeConv.Rules"); - mastermap.Add ("SegmentStyle", "QLCDNumber.SegmentStyle"); - mastermap.Add ("LayoutMode", "TQListBox.LayoutMode"); - mastermap.Add ("WidthMode", "TQListView.WidthMode"); - mastermap.Add ("RenameAction", "TQListView.RenameAction"); - mastermap.Add ("DockWindows", "TQMainWindow.DockWindows"); - mastermap.Add ("Color", "QMapNodeBase.Color"); - mastermap.Add ("Separator", "TQMenuBar.Separator"); - mastermap.Add ("Icon", "TQMessageBox.Icon"); - mastermap.Add ("Access", "QMetaData.Access"); - mastermap.Add ("Flags", "TQMetaProperty.Flags"); - mastermap.Add ("Status", "TQMovie.Status"); - mastermap.Add ("InstanceMode", "QNPInstance.InstanceMode"); - mastermap.Add ("StreamMode", "QNPInstance.StreamMode"); - mastermap.Add ("Operation", "TQNetworkProtocol.Operation"); - mastermap.Add ("ConnectionState", "TQNetworkProtocol.ConnectionState"); - mastermap.Add ("DisposalMethod", "QPNGImageWriter.DisposalMethod"); - mastermap.Add ("PDevCmd", "TQPaintDevice.PDevCmd"); - mastermap.Add ("CoordinateMode", "TQPainter.CoordinateMode"); - mastermap.Add ("TextDirection", "TQPainter.TextDirection"); - mastermap.Add ("ColorGroup", "TQPalette.ColorGroup"); - mastermap.Add ("Optimization", "TQPixmap.Optimization"); - mastermap.Add ("Edge", "TQPolygonScanner.Edge"); - mastermap.Add ("PrinterMode", "TQPrinter.PrinterMode"); - mastermap.Add ("PageSize", "TQPrinter.PageSize"); - mastermap.Add ("PageOrder", "TQPrinter.PageOrder"); - mastermap.Add ("PaperSource", "TQPrinter.PaperSource"); - mastermap.Add ("Communication", "TQProcess.Communication"); - mastermap.Add ("RegionType", "TQRegion.RegionType"); - mastermap.Add ("ResizePolicy", "TQScrollView.ResizePolicy"); - mastermap.Add ("ScrollBarMode", "TQScrollView.ScrollBarMode"); - mastermap.Add ("RestartHint", "QSessionManager.RestartHint"); - mastermap.Add ("System", "TQSettings.System"); - mastermap.Add ("SizeType", "TQSizePolicy.SizeType"); - mastermap.Add ("ExpandData", "TQSizePolicy.ExpandData"); - mastermap.Add ("TickSetting", "TQSlider.TickSetting"); - mastermap.Add ("Op", "TQSql.Op"); - mastermap.Add ("Location", "TQSql.Location"); - mastermap.Add ("Confirm", "TQSql.Confirm"); - mastermap.Add ("DriverFeature", "TQSqlDriver.DriverFeature"); - mastermap.Add ("SectionFlags", "TQString.SectionFlags"); - mastermap.Add ("PrimitiveElement", "TQStyle.PrimitiveElement"); - mastermap.Add ("StyleFlags", "TQStyle.StyleFlags"); - mastermap.Add ("SFlags", "TQStyle.StyleFlags"); - mastermap.Add ("ControlElement", "TQStyle.ControlElement"); - mastermap.Add ("SubRect", "TQStyle.SubRect"); - mastermap.Add ("ComplexControl", "TQStyle.ComplexControl"); - mastermap.Add ("SubControl", "TQStyle.SubControl"); - mastermap.Add ("SCFlags", "TQStyle.SubControl"); - mastermap.Add ("PixelMetric", "TQStyle.PixelMetric"); - mastermap.Add ("ContentsType", "TQStyle.ContentsType"); - mastermap.Add ("StylePixmap", "TQStyle.StylePixmap"); - mastermap.Add ("StyleOptionDefault", "TQStyleOption.StyleOptionDefault"); - mastermap.Add ("AdditionalStyleValues", "TQStyleSheetItem.AdditionalStyleValues"); - mastermap.Add ("DisplayMode", "TQStyleSheetItem.DisplayMode"); - mastermap.Add ("WhiteSpaceMode", "TQStyleSheetItem.WhiteSpaceMode"); - mastermap.Add ("Margin", "TQStyleSheetItem.Margin"); - mastermap.Add ("ListStyle", "TQStyleSheetItem.ListStyle"); - mastermap.Add ("FocusStyle", "TQTable.FocusStyle"); - mastermap.Add ("EditMode", "TQTable.EditMode"); - mastermap.Add ("EditType", "TQTableItem.EditType"); - mastermap.Add ("TabletDevice", "TQTabletEvent.TabletDevice"); - mastermap.Add ("KeyboardAction", "TQTextEdit.KeyboardAction"); - mastermap.Add ("CursorAction", "TQTextEdit.CursorAction"); - mastermap.Add ("SaveMode", "QTranslator.SaveMode"); - mastermap.Add ("Prefix", "QTranslatorMessage.Prefix"); - mastermap.Add ("FocusPolicy", "TQWidget.FocusPolicy"); - mastermap.Add ("BackgroundOrigin", "TQWidget.BackgroundOrigin"); + mastermap.Add ("Event", "TTQAccessible.Event"); + mastermap.Add ("Role", "TTQAccessible.Role"); + mastermap.Add ("NavDirection", "TTQAccessible.NavDirection"); + mastermap.Add ("Text", "TTQAccessible.Text"); + mastermap.Add ("ColorSpec", "TTQApplication.ColorSpec"); + mastermap.Add ("ToggleState", "TTQButton.ToggleState"); + mastermap.Add ("RttiValues", "TTQCanvasItem.RttiValues"); + mastermap.Add ("FrameAnimationType", "TTQCanvasSprite.FrameAnimationType"); + mastermap.Add ("Category", "TTQChar.Category"); + mastermap.Add ("Decomposition", "TTQChar.Decomposition"); + mastermap.Add ("Joining", "TTQChar.Joining"); + mastermap.Add ("CombiningClass", "TTQChar.CombiningClass"); + mastermap.Add ("Spec", "TTQColor.Spec"); + mastermap.Add ("ColorRole", "TTQColorGroup.ColorRole"); + mastermap.Add ("Boundary", "TTQDataBrowser.Boundary"); + mastermap.Add ("ByteOrder", "TTQDataStream.ByteOrder"); + mastermap.Add ("Refresh", "TTQDataTable.Refresh"); + mastermap.Add ("Order", "TQDateEdit.Order"); + mastermap.Add ("DialogCode", "TTQDialog.DialogCode"); + mastermap.Add ("FilterSpec", "TTQDir.FilterSpec"); + mastermap.Add ("SortSpec", "TTQDir.SortSpec"); + mastermap.Add ("RecordType", "TTQDns.RecordType"); + mastermap.Add ("HandlePosition", "TTQDockArea.HandlePosition"); + mastermap.Add ("Place", "TTQDockWindow.Place"); + mastermap.Add ("CloseMode", "TTQDockWindow.CloseMode"); + mastermap.Add ("NodeType", "TTQDomNode.NodeType"); + mastermap.Add ("DragMode", "TTQDragObject.DragMode"); + mastermap.Add ("Action", "TTQDropEvent.Action"); + mastermap.Add ("ViewMode", "TTQFileDialog.ViewMode"); + mastermap.Add ("PreviewMode", "TTQFileDialog.PreviewMode"); + mastermap.Add ("PermissionSpec", "TTQFileInfo.PermissionSpec"); + mastermap.Add ("StyleStrategy", "TTQFont.StyleStrategy"); + mastermap.Add ("Weight", "TTQFont.Weight"); + mastermap.Add ("Script", "TTQFont.Script"); + mastermap.Add ("Shadow", "TTQFrame.Shadow"); + mastermap.Add ("FormatOption", "TTQGL.FormatOption"); + mastermap.Add ("Corner", "TTQGridLayout.Corner"); + mastermap.Add ("Size", "TTQIconSet.Size"); + mastermap.Add ("Arrangement", "TTQIconView.Arrangement"); + mastermap.Add ("ItemTextPos", "TTQIconView.ItemTextPos"); + mastermap.Add ("Endian", "TTQImage.Endian"); + mastermap.Add ("ScaleMode", "TTQImage.ScaleMode"); + mastermap.Add ("PaintDeviceFlags", "TTQInternal.PaintDeviceFlags"); + mastermap.Add ("Rules", "TTQJpUnicodeConv.Rules"); + mastermap.Add ("SegmentStyle", "TQLCDNumber.SegmentStyle"); + mastermap.Add ("LayoutMode", "TTQListBox.LayoutMode"); + mastermap.Add ("WidthMode", "TTQListView.WidthMode"); + mastermap.Add ("RenameAction", "TTQListView.RenameAction"); + mastermap.Add ("DockWindows", "TTQMainWindow.DockWindows"); + mastermap.Add ("Color", "TQMapNodeBase.Color"); + mastermap.Add ("Separator", "TTQMenuBar.Separator"); + mastermap.Add ("Icon", "TTQMessageBox.Icon"); + mastermap.Add ("Access", "TQMetaData.Access"); + mastermap.Add ("Flags", "TTQMetaProperty.Flags"); + mastermap.Add ("Status", "TTQMovie.Status"); + mastermap.Add ("InstanceMode", "TQNPInstance.InstanceMode"); + mastermap.Add ("StreamMode", "TQNPInstance.StreamMode"); + mastermap.Add ("Operation", "TTQNetworkProtocol.Operation"); + mastermap.Add ("ConnectionState", "TTQNetworkProtocol.ConnectionState"); + mastermap.Add ("DisposalMethod", "TQPNGImageWriter.DisposalMethod"); + mastermap.Add ("PDevCmd", "TTQPaintDevice.PDevCmd"); + mastermap.Add ("CoordinateMode", "TTQPainter.CoordinateMode"); + mastermap.Add ("TextDirection", "TTQPainter.TextDirection"); + mastermap.Add ("ColorGroup", "TTQPalette.ColorGroup"); + mastermap.Add ("Optimization", "TTQPixmap.Optimization"); + mastermap.Add ("Edge", "TTQPolygonScanner.Edge"); + mastermap.Add ("PrinterMode", "TTQPrinter.PrinterMode"); + mastermap.Add ("PageSize", "TTQPrinter.PageSize"); + mastermap.Add ("PageOrder", "TTQPrinter.PageOrder"); + mastermap.Add ("PaperSource", "TTQPrinter.PaperSource"); + mastermap.Add ("Communication", "TTQProcess.Communication"); + mastermap.Add ("RegionType", "TTQRegion.RegionType"); + mastermap.Add ("ResizePolicy", "TTQScrollView.ResizePolicy"); + mastermap.Add ("ScrollBarMode", "TTQScrollView.ScrollBarMode"); + mastermap.Add ("RestartHint", "TQSessionManager.RestartHint"); + mastermap.Add ("System", "TTQSettings.System"); + mastermap.Add ("SizeType", "TTQSizePolicy.SizeType"); + mastermap.Add ("ExpandData", "TTQSizePolicy.ExpandData"); + mastermap.Add ("TickSetting", "TTQSlider.TickSetting"); + mastermap.Add ("Op", "TTQSql.Op"); + mastermap.Add ("Location", "TTQSql.Location"); + mastermap.Add ("Confirm", "TTQSql.Confirm"); + mastermap.Add ("DriverFeature", "TTQSqlDriver.DriverFeature"); + mastermap.Add ("SectionFlags", "TTQString.SectionFlags"); + mastermap.Add ("PrimitiveElement", "TTQStyle.PrimitiveElement"); + mastermap.Add ("StyleFlags", "TTQStyle.StyleFlags"); + mastermap.Add ("SFlags", "TTQStyle.StyleFlags"); + mastermap.Add ("ControlElement", "TTQStyle.ControlElement"); + mastermap.Add ("SubRect", "TTQStyle.SubRect"); + mastermap.Add ("ComplexControl", "TTQStyle.ComplexControl"); + mastermap.Add ("SubControl", "TTQStyle.SubControl"); + mastermap.Add ("SCFlags", "TTQStyle.SubControl"); + mastermap.Add ("PixelMetric", "TTQStyle.PixelMetric"); + mastermap.Add ("ContentsType", "TTQStyle.ContentsType"); + mastermap.Add ("StylePixmap", "TTQStyle.StylePixmap"); + mastermap.Add ("StyleOptionDefault", "TTQStyleOption.StyleOptionDefault"); + mastermap.Add ("AdditionalStyleValues", "TTQStyleSheetItem.AdditionalStyleValues"); + mastermap.Add ("DisplayMode", "TTQStyleSheetItem.DisplayMode"); + mastermap.Add ("WhiteSpaceMode", "TTQStyleSheetItem.WhiteSpaceMode"); + mastermap.Add ("Margin", "TTQStyleSheetItem.Margin"); + mastermap.Add ("ListStyle", "TTQStyleSheetItem.ListStyle"); + mastermap.Add ("FocusStyle", "TTQTable.FocusStyle"); + mastermap.Add ("EditMode", "TTQTable.EditMode"); + mastermap.Add ("EditType", "TTQTableItem.EditType"); + mastermap.Add ("TabletDevice", "TTQTabletEvent.TabletDevice"); + mastermap.Add ("KeyboardAction", "TTQTextEdit.KeyboardAction"); + mastermap.Add ("CursorAction", "TTQTextEdit.CursorAction"); + mastermap.Add ("SaveMode", "TQTranslator.SaveMode"); + mastermap.Add ("Prefix", "TQTranslatorMessage.Prefix"); + mastermap.Add ("FocusPolicy", "TTQWidget.FocusPolicy"); + mastermap.Add ("BackgroundOrigin", "TTQWidget.BackgroundOrigin"); mastermap.Add ("ButtonState", "Qt.ButtonState"); mastermap.Add ("AlignmentFlags", "Qt.AlignmentFlags"); mastermap.Add ("TextFlags", "Qt.TextFlags"); @@ -278,75 +278,75 @@ namespace QtCSharp { mastermap.Add ("StringComparisonMode", "Qt.StringComparisonMode"); mastermap.Add ("ComparisonFlags", "Qt.StringComparisonMode"); - // We need to make sure all params use the interfaces, ie IQPaintDevice - /*mastermap.Add ("QAccessibleFactoryInterface", "IQAccessibleFactory"); - mastermap.Add ("QAccessibleInterface", "IQAccessible");*/ - mastermap.Add ("TQPaintDevice", "IQPaintDevice"); - /*mastermap.Add ("TQMenuData", "IQMenuData"); - mastermap.Add ("TQRangeControl", "IQRangeControl"); - mastermap.Add ("TQMimeSource", "IQMimeSource"); - mastermap.Add ("TQLayoutItem", "IQLayoutItem"); - mastermap.Add ("TQUrl", "IQUrl"); - mastermap.Add ("QIODevice", "IQIODevice"); - mastermap.Add ("TQXmlContentHandler", "IQXmlContentHandler"); - mastermap.Add ("TQXmlErrorHandler", "IQXmlErrorHandler"); - mastermap.Add ("TQXmlDTDHandler", "IQXmlDTDHandler"); - mastermap.Add ("TQXmlEntityResolver", "IQXmlEntityResolver"); - //mastermap.Add ("TQXmlLexicalHandler", "IQXmlLexicalHandler"); - mastermap.Add ("TQXmlDeclHandler", "IQXmlDeclHandler"); + // We need to make sure all params use the interfaces, ie ITQPaintDevice + /*mastermap.Add ("TQAccessibleFactoryInterface", "ITQAccessibleFactory"); + mastermap.Add ("TQAccessibleInterface", "ITQAccessible");*/ + mastermap.Add ("TTQPaintDevice", "ITQPaintDevice"); + /*mastermap.Add ("TTQMenuData", "ITQMenuData"); + mastermap.Add ("TTQRangeControl", "ITQRangeControl"); + mastermap.Add ("TTQMimeSource", "ITQMimeSource"); + mastermap.Add ("TTQLayoutItem", "ITQLayoutItem"); + mastermap.Add ("TTQUrl", "ITQUrl"); + mastermap.Add ("TQIODevice", "ITQIODevice"); + mastermap.Add ("TTQXmlContentHandler", "ITQXmlContentHandler"); + mastermap.Add ("TTQXmlErrorHandler", "ITQXmlErrorHandler"); + mastermap.Add ("TTQXmlDTDHandler", "ITQXmlDTDHandler"); + mastermap.Add ("TTQXmlEntityResolver", "ITQXmlEntityResolver"); + //mastermap.Add ("TTQXmlLexicalHandler", "ITQXmlLexicalHandler"); + mastermap.Add ("TTQXmlDeclHandler", "ITQXmlDeclHandler"); mastermap.Add ("QwAbsSpriteFieldView", "IQwAbsSpriteFieldView"); - mastermap.Add ("TQSqlQuery", "IQSqlQuery"); - mastermap.Add ("QFeatureListInterface", "IQFeatureList"); - mastermap.Add ("QUnknownInterface", "IQUnknown"); - mastermap.Add ("QShared", "IQShared");*/ + mastermap.Add ("TTQSqlQuery", "ITQSqlQuery"); + mastermap.Add ("TQFeatureListInterface", "ITQFeatureList"); + mastermap.Add ("TQUnknownInterface", "ITQUnknown"); + mastermap.Add ("TQShared", "ITQShared");*/ // Key Duplication - //mastermap.Add ("Direction", "TQBoxLayout.Direction"); - //mastermap.Add ("Direction", "TQChar.Direction"); - //mastermap.Add ("Reason", "TQContextMenuEvent.Reason"); - //mastermap.Add ("Reason", "TQFocusEvent.Reason"); - //mastermap.Add ("Reason", "QNPInstance.Reason"); - //mastermap.Add ("Mode", "TQFileDialog.Mode"); - //mastermap.Add ("Mode", "TQIconSet.Mode"); - //mastermap.Add ("Mode", "QLCDNumber.Mode"); - //mastermap.Add ("Mode", "TQSqlCursor.Mode"); - //mastermap.Add ("Shape", "TQFrame.Shape"); - //mastermap.Add ("Shape", "TQTabBar.Shape"); - //mastermap.Add ("KeyType", "TQGCache.KeyType"); - //mastermap.Add ("KeyType", "TQGDict.KeyType"); - //mastermap.Add ("State", "TQAccessible.State"); - //mastermap.Add ("State", "TQNetworkProtocol.State"); - //mastermap.Add ("State", "TQSocket.State"); - //mastermap.Add ("State", "TQValidator.State"); - //mastermap.Add ("ResizeMode", "TQIconView.ResizeMode"); - //mastermap.Add ("ResizeMode", "TQLayout.ResizeMode"); - //mastermap.Add ("ResizeMode", "TQListView.ResizeMode"); - //mastermap.Add ("ResizeMode", "TQListView.ResizeMode"); - //mastermap.Add ("EchoMode", "TQLineEdit.EchoMode"); + //mastermap.Add ("Direction", "TTQBoxLayout.Direction"); + //mastermap.Add ("Direction", "TTQChar.Direction"); + //mastermap.Add ("Reason", "TTQContextMenuEvent.Reason"); + //mastermap.Add ("Reason", "TTQFocusEvent.Reason"); + //mastermap.Add ("Reason", "TQNPInstance.Reason"); + //mastermap.Add ("Mode", "TTQFileDialog.Mode"); + //mastermap.Add ("Mode", "TTQIconSet.Mode"); + //mastermap.Add ("Mode", "TQLCDNumber.Mode"); + //mastermap.Add ("Mode", "TTQSqlCursor.Mode"); + //mastermap.Add ("Shape", "TTQFrame.Shape"); + //mastermap.Add ("Shape", "TTQTabBar.Shape"); + //mastermap.Add ("KeyType", "TTQGCache.KeyType"); + //mastermap.Add ("KeyType", "TTQGDict.KeyType"); + //mastermap.Add ("State", "TTQAccessible.State"); + //mastermap.Add ("State", "TTQNetworkProtocol.State"); + //mastermap.Add ("State", "TTQSocket.State"); + //mastermap.Add ("State", "TTQValidator.State"); + //mastermap.Add ("ResizeMode", "TTQIconView.ResizeMode"); + //mastermap.Add ("ResizeMode", "TTQLayout.ResizeMode"); + //mastermap.Add ("ResizeMode", "TTQListView.ResizeMode"); + //mastermap.Add ("ResizeMode", "TTQListView.ResizeMode"); + //mastermap.Add ("EchoMode", "TTQLineEdit.EchoMode"); //mastermap.Add ("EchoMode", "QtMultiLineEdit.EchoMode"); - //mastermap.Add ("ColorMode", "TQApplication.ColorMode"); - //mastermap.Add ("ColorMode", "TQPrinter.ColorMode"); - //mastermap.Add ("ColorMode", "TQPixmap.ColorMode"); - //mastermap.Add ("SelectionMode", "TQIconView.SelectionMode"); - //mastermap.Add ("SelectionMode", "TQListBox.SelectionMode"); - //mastermap.Add ("SelectionMode", "TQListView.SelectionMode"); - //mastermap.Add ("SelectionMode", "TQTable.SelectionMode"); - //mastermap.Add ("Error", "TQSocket.Error"); - //mastermap.Add ("Error", "TQSocketDevice.Error"); - //mastermap.Add ("Error", "TQNetworkProtocol.Error"); - //mastermap.Add ("ButtonSymbols", "TQSpinBox.ButtonSymbols"); - //mastermap.Add ("ButtonSymbols", "TQSpinWidget.ButtonSymbols"); - //mastermap.Add ("StyleHint", "TQStyle.StyleHint"); - //mastermap.Add ("StyleHint", "TQFont.StyleHint"); - //mastermap.Add ("Encoding", "TQApplication.Encoding"); - //mastermap.Add ("Encoding", "TQTextStream.Encoding"); - //mastermap.Add ("VerticalAlignment", "TQTextEdit.VerticalAlignment"); - //mastermap.Add ("VerticalAlignment", "TQStyleSheetItem.VerticalAlignment"); - //mastermap.Add ("Orientation", "TQPrinter.Orientation"); + //mastermap.Add ("ColorMode", "TTQApplication.ColorMode"); + //mastermap.Add ("ColorMode", "TTQPrinter.ColorMode"); + //mastermap.Add ("ColorMode", "TTQPixmap.ColorMode"); + //mastermap.Add ("SelectionMode", "TTQIconView.SelectionMode"); + //mastermap.Add ("SelectionMode", "TTQListBox.SelectionMode"); + //mastermap.Add ("SelectionMode", "TTQListView.SelectionMode"); + //mastermap.Add ("SelectionMode", "TTQTable.SelectionMode"); + //mastermap.Add ("Error", "TTQSocket.Error"); + //mastermap.Add ("Error", "TTQSocketDevice.Error"); + //mastermap.Add ("Error", "TTQNetworkProtocol.Error"); + //mastermap.Add ("ButtonSymbols", "TTQSpinBox.ButtonSymbols"); + //mastermap.Add ("ButtonSymbols", "TTQSpinWidget.ButtonSymbols"); + //mastermap.Add ("StyleHint", "TTQStyle.StyleHint"); + //mastermap.Add ("StyleHint", "TTQFont.StyleHint"); + //mastermap.Add ("Encoding", "TTQApplication.Encoding"); + //mastermap.Add ("Encoding", "TTQTextStream.Encoding"); + //mastermap.Add ("VerticalAlignment", "TTQTextEdit.VerticalAlignment"); + //mastermap.Add ("VerticalAlignment", "TTQStyleSheetItem.VerticalAlignment"); + //mastermap.Add ("Orientation", "TTQPrinter.Orientation"); //mastermap.Add ("Orientation", "Qt.Orientation"); - //mastermap.Add ("WrapPolicy", "TQTextEdit.WrapPolicy"); + //mastermap.Add ("WrapPolicy", "TTQTextEdit.WrapPolicy"); //mastermap.Add ("WrapPolicy", "QtMultiLineEdit.WrapPolicy"); - //mastermap.Add ("WordWrap", "TQTextEdit.WordWrap"); + //mastermap.Add ("WordWrap", "TTQTextEdit.WordWrap"); //mastermap.Add ("WordWrap", "QtMultiLineEdit.WordWrap"); // These are here in case we need to override the mastermap @@ -367,26 +367,26 @@ namespace QtCSharp { // The allowed interfaces interfaces = new Hashtable (); - interfaces.Add ("QAccessibleFactoryInterface", "IQAccessibleFactory"); - interfaces.Add ("QAccessibleInterface", "IQAccessible"); - interfaces.Add ("TQPaintDevice", "IQPaintDevice"); - interfaces.Add ("TQMenuData", "IQMenuData"); - interfaces.Add ("TQRangeControl", "IQRangeControl"); - interfaces.Add ("TQMimeSource", "IQMimeSource"); - interfaces.Add ("TQLayoutItem", "IQLayoutItem"); - interfaces.Add ("TQUrl", "IQUrl"); - interfaces.Add ("QIODevice", "IQIODevice"); - interfaces.Add ("TQXmlContentHandler", "IQXmlContentHandler"); - interfaces.Add ("TQXmlErrorHandler", "IQXmlErrorHandler"); - interfaces.Add ("TQXmlDTDHandler", "IQXmlDTDHandler"); - interfaces.Add ("TQXmlEntityResolver", "IQXmlEntityResolver"); - //interfaces.Add ("TQXmlLexicalHandler", "IQXmlLexicalHandler"); - interfaces.Add ("TQXmlDeclHandler", "IQXmlDeclHandler"); + interfaces.Add ("TQAccessibleFactoryInterface", "ITQAccessibleFactory"); + interfaces.Add ("TQAccessibleInterface", "ITQAccessible"); + interfaces.Add ("TTQPaintDevice", "ITQPaintDevice"); + interfaces.Add ("TTQMenuData", "ITQMenuData"); + interfaces.Add ("TTQRangeControl", "ITQRangeControl"); + interfaces.Add ("TTQMimeSource", "ITQMimeSource"); + interfaces.Add ("TTQLayoutItem", "ITQLayoutItem"); + interfaces.Add ("TTQUrl", "ITQUrl"); + interfaces.Add ("TQIODevice", "ITQIODevice"); + interfaces.Add ("TTQXmlContentHandler", "ITQXmlContentHandler"); + interfaces.Add ("TTQXmlErrorHandler", "ITQXmlErrorHandler"); + interfaces.Add ("TTQXmlDTDHandler", "ITQXmlDTDHandler"); + interfaces.Add ("TTQXmlEntityResolver", "ITQXmlEntityResolver"); + //interfaces.Add ("TTQXmlLexicalHandler", "ITQXmlLexicalHandler"); + interfaces.Add ("TTQXmlDeclHandler", "ITQXmlDeclHandler"); interfaces.Add ("QwAbsSpriteFieldView", "IQwAbsSpriteFieldView"); - interfaces.Add ("TQSqlQuery", "IQSqlQuery"); - interfaces.Add ("QFeatureListInterface", "IQFeatureList"); - interfaces.Add ("QUnknownInterface", "IQUnknown"); - interfaces.Add ("QShared", "IQShared"); + interfaces.Add ("TTQSqlQuery", "ITQSqlQuery"); + interfaces.Add ("TQFeatureListInterface", "ITQFeatureList"); + interfaces.Add ("TQUnknownInterface", "ITQUnknown"); + interfaces.Add ("TQShared", "ITQShared"); } public string PinvokeType (string str) diff --git a/qtsharp/src/libqtsharp/customslot.cpp b/qtsharp/src/libqtsharp/customslot.cpp index ede36240..82c57a20 100644 --- a/qtsharp/src/libqtsharp/customslot.cpp +++ b/qtsharp/src/libqtsharp/customslot.cpp @@ -1,127 +1,127 @@ #include "customslot.h" -CustomSlot::CustomSlot (void (*ptr)(void), TQObject *parent, const char *name): TQObject (parent, name) +CustomSlot::CustomSlot (void (*ptr)(void), TTQObject *parent, const char *name): TTQObject (parent, name) { p0 = ptr; } -CustomSlot::CustomSlot (void (*ptr)(bool), TQObject *parent, const char *name): TQObject (parent, name) +CustomSlot::CustomSlot (void (*ptr)(bool), TTQObject *parent, const char *name): TTQObject (parent, name) { p1 = ptr; } -CustomSlot::CustomSlot (void (*ptr)(short), TQObject *parent, const char *name): TQObject (parent, name) +CustomSlot::CustomSlot (void (*ptr)(short), TTQObject *parent, const char *name): TTQObject (parent, name) { p2 = ptr; } -CustomSlot::CustomSlot (void (*ptr)(int), TQObject *parent, const char *name): TQObject (parent, name) +CustomSlot::CustomSlot (void (*ptr)(int), TTQObject *parent, const char *name): TTQObject (parent, name) { p3 = ptr; } -CustomSlot::CustomSlot (void (*ptr)(long), TQObject *parent, const char *name): TQObject (parent, name) +CustomSlot::CustomSlot (void (*ptr)(long), TTQObject *parent, const char *name): TTQObject (parent, name) { p4 = ptr; } -CustomSlot::CustomSlot (void (*ptr)(float), TQObject *parent, const char *name): TQObject (parent, name) +CustomSlot::CustomSlot (void (*ptr)(float), TTQObject *parent, const char *name): TTQObject (parent, name) { p5 = ptr; } -CustomSlot::CustomSlot (void (*ptr)(double), TQObject *parent, const char *name): TQObject (parent, name) +CustomSlot::CustomSlot (void (*ptr)(double), TTQObject *parent, const char *name): TTQObject (parent, name) { p6 = ptr; } -CustomSlot::CustomSlot (void (*ptr)(TQDockWindow*), TQObject *parent, const char *name): TQObject (parent, name) +CustomSlot::CustomSlot (void (*ptr)(TTQDockWindow*), TTQObject *parent, const char *name): TTQObject (parent, name) { p7 = ptr; } -CustomSlot::CustomSlot (void (*ptr)(TQDropEvent*), TQObject *parent, const char *name): TQObject (parent, name) +CustomSlot::CustomSlot (void (*ptr)(TTQDropEvent*), TTQObject *parent, const char *name): TTQObject (parent, name) { p8 = ptr; } -CustomSlot::CustomSlot (void (*ptr)(TQDropEvent*,TQListViewItem*), TQObject *parent, const char *name): TQObject (parent, name) +CustomSlot::CustomSlot (void (*ptr)(TTQDropEvent*,TTQListViewItem*), TTQObject *parent, const char *name): TTQObject (parent, name) { p9 = ptr; } -CustomSlot::CustomSlot (void (*ptr)(TQIconViewItem*), TQObject *parent, const char *name): TQObject (parent, name) +CustomSlot::CustomSlot (void (*ptr)(TTQIconViewItem*), TTQObject *parent, const char *name): TTQObject (parent, name) { p10 = ptr; } -CustomSlot::CustomSlot (void (*ptr)(TQListBoxItem*), TQObject *parent, const char *name): TQObject (parent, name) +CustomSlot::CustomSlot (void (*ptr)(TTQListBoxItem*), TTQObject *parent, const char *name): TTQObject (parent, name) { p11 = ptr; } -CustomSlot::CustomSlot (void (*ptr)(TQListViewItem*), TQObject *parent, const char *name): TQObject (parent, name) +CustomSlot::CustomSlot (void (*ptr)(TTQListViewItem*), TTQObject *parent, const char *name): TTQObject (parent, name) { p12 = ptr; } -CustomSlot::CustomSlot (void (*ptr)(TQListViewItem*,TQListViewItem*), TQObject *parent, const char *name): TQObject (parent, name) +CustomSlot::CustomSlot (void (*ptr)(TTQListViewItem*,TTQListViewItem*), TTQObject *parent, const char *name): TTQObject (parent, name) { p13 = ptr; } -CustomSlot::CustomSlot (void (*ptr)(TQListViewItem*,TQListViewItem*,TQListViewItem*), TQObject *parent, const char *name): TQObject (parent, name) +CustomSlot::CustomSlot (void (*ptr)(TTQListViewItem*,TTQListViewItem*,TTQListViewItem*), TTQObject *parent, const char *name): TTQObject (parent, name) { p14 = ptr; } -CustomSlot::CustomSlot (void (*ptr)(TQNetworkOperation*), TQObject *parent, const char *name): TQObject (parent, name) +CustomSlot::CustomSlot (void (*ptr)(TTQNetworkOperation*), TTQObject *parent, const char *name): TTQObject (parent, name) { p15 = ptr; } -CustomSlot::CustomSlot (void (*ptr)(TQObject*), TQObject *parent, const char *name): TQObject (parent, name) +CustomSlot::CustomSlot (void (*ptr)(TTQObject*), TTQObject *parent, const char *name): TTQObject (parent, name) { p16 = ptr; } -CustomSlot::CustomSlot (void (*ptr)(TQToolBar*), TQObject *parent, const char *name): TQObject (parent, name) +CustomSlot::CustomSlot (void (*ptr)(TTQToolBar*), TTQObject *parent, const char *name): TTQObject (parent, name) { p17 = ptr; } -CustomSlot::CustomSlot (void (*ptr)(TQWidget*), TQObject *parent, const char *name): TQObject (parent, name) +CustomSlot::CustomSlot (void (*ptr)(TTQWidget*), TTQObject *parent, const char *name): TTQObject (parent, name) { p18 = ptr; } -CustomSlot::CustomSlot (void (*ptr)(int,TQIconViewItem*), TQObject *parent, const char *name): TQObject (parent, name) +CustomSlot::CustomSlot (void (*ptr)(int,TTQIconViewItem*), TTQObject *parent, const char *name): TTQObject (parent, name) { p19 = ptr; } -CustomSlot::CustomSlot (void (*ptr)(int,TQListBoxItem*), TQObject *parent, const char *name): TQObject (parent, name) +CustomSlot::CustomSlot (void (*ptr)(int,TTQListBoxItem*), TTQObject *parent, const char *name): TTQObject (parent, name) { p20 = ptr; } -CustomSlot::CustomSlot (void (*ptr)(int,bool), TQObject *parent, const char *name): TQObject (parent, name) +CustomSlot::CustomSlot (void (*ptr)(int,bool), TTQObject *parent, const char *name): TTQObject (parent, name) { p21 = ptr; } -CustomSlot::CustomSlot (void (*ptr)(int,int), TQObject *parent, const char *name): TQObject (parent, name) +CustomSlot::CustomSlot (void (*ptr)(int,int), TTQObject *parent, const char *name): TTQObject (parent, name) { p22 = ptr; } -CustomSlot::CustomSlot (void (*ptr)(int,int,int), TQObject *parent, const char *name): TQObject (parent, name) +CustomSlot::CustomSlot (void (*ptr)(int,int,int), TTQObject *parent, const char *name): TTQObject (parent, name) { p23 = ptr; } -CustomSlot::CustomSlot (void (*ptr)(const TQString&), TQObject *parent, const char *name): TQObject (parent, name) +CustomSlot::CustomSlot (void (*ptr)(const TTQString&), TTQObject *parent, const char *name): TTQObject (parent, name) { p24 = ptr; } @@ -161,72 +161,72 @@ void CustomSlot::callback (double value0) p6 (value0); } -void CustomSlot::callback (TQDockWindow* value0) +void CustomSlot::callback (TTQDockWindow* value0) { p7 (value0); } -void CustomSlot::callback (TQDropEvent* value0) +void CustomSlot::callback (TTQDropEvent* value0) { p8 (value0); } -void CustomSlot::callback (TQDropEvent* value0, TQListViewItem* value1) +void CustomSlot::callback (TTQDropEvent* value0, TTQListViewItem* value1) { p9 (value0, value1); } -void CustomSlot::callback (TQIconViewItem* value0) +void CustomSlot::callback (TTQIconViewItem* value0) { p10 (value0); } -void CustomSlot::callback (TQListBoxItem* value0) +void CustomSlot::callback (TTQListBoxItem* value0) { p11 (value0); } -void CustomSlot::callback (TQListViewItem* value0) +void CustomSlot::callback (TTQListViewItem* value0) { p12 (value0); } -void CustomSlot::callback (TQListViewItem* value0, TQListViewItem* value1) +void CustomSlot::callback (TTQListViewItem* value0, TTQListViewItem* value1) { p13 (value0, value1); } -void CustomSlot::callback (TQListViewItem* value0, TQListViewItem* value1, TQListViewItem* value2) +void CustomSlot::callback (TTQListViewItem* value0, TTQListViewItem* value1, TTQListViewItem* value2) { p14 (value0, value1, value2); } -void CustomSlot::callback (TQNetworkOperation* value0) +void CustomSlot::callback (TTQNetworkOperation* value0) { p15 (value0); } -void CustomSlot::callback (TQObject* value0) +void CustomSlot::callback (TTQObject* value0) { p16 (value0); } -void CustomSlot::callback (TQToolBar* value0) +void CustomSlot::callback (TTQToolBar* value0) { p17 (value0); } -void CustomSlot::callback (TQWidget* value0) +void CustomSlot::callback (TTQWidget* value0) { p18 (value0); } -void CustomSlot::callback (int value0, TQIconViewItem* value1) +void CustomSlot::callback (int value0, TTQIconViewItem* value1) { p19 (value0, value1); } -void CustomSlot::callback (int value0, TQListBoxItem* value1) +void CustomSlot::callback (int value0, TTQListBoxItem* value1) { p20 (value0, value1); } @@ -246,7 +246,7 @@ void CustomSlot::callback (int value0, int value1, int value2) p23 (value0, value1, value2); } -void CustomSlot::callback( const TQString& value0 ) +void CustomSlot::callback( const TTQString& value0 ) { p24 (value0); } diff --git a/qtsharp/src/libqtsharp/customslot.h b/qtsharp/src/libqtsharp/customslot.h index 70108dcd..5ea7d65e 100644 --- a/qtsharp/src/libqtsharp/customslot.h +++ b/qtsharp/src/libqtsharp/customslot.h @@ -30,37 +30,37 @@ #include #include -class CustomSlot: public QObject +class CustomSlot: public TQObject { Q_OBJECT public: - CustomSlot (void (*ptr)(void), TQObject *parent, const char *name=0); - CustomSlot (void (*ptr)(bool), TQObject *parent, const char *name=0); - CustomSlot (void (*ptr)(short), TQObject *parent, const char *name=0); - CustomSlot (void (*ptr)(int), TQObject *parent, const char *name=0); - CustomSlot (void (*ptr)(long), TQObject *parent, const char *name=0); - CustomSlot (void (*ptr)(float), TQObject *parent, const char *name=0); - CustomSlot (void (*ptr)(double), TQObject *parent, const char *name=0); - CustomSlot (void (*ptr)(const TQString&), TQObject *parent, const char *name=0); - CustomSlot (void (*ptr)(TQDockWindow*), TQObject *parent, const char *name=0); - CustomSlot (void (*ptr)(TQDropEvent*), TQObject *parent, const char *name=0); - CustomSlot (void (*ptr)(TQDropEvent*,TQListViewItem*), TQObject *parent, const char *name=0); - CustomSlot (void (*ptr)(TQIconViewItem*), TQObject *parent, const char *name=0); - CustomSlot (void (*ptr)(TQListBoxItem*), TQObject *parent, const char *name=0); - CustomSlot (void (*ptr)(TQListViewItem*), TQObject *parent, const char *name=0); - CustomSlot (void (*ptr)(TQListViewItem*,TQListViewItem*), TQObject *parent, const char *name=0); - CustomSlot (void (*ptr)(TQListViewItem*,TQListViewItem*,TQListViewItem*), TQObject *parent, const char *name=0); - CustomSlot (void (*ptr)(TQNetworkOperation*), TQObject *parent, const char *name=0); - CustomSlot (void (*ptr)(TQObject*), TQObject *parent, const char *name=0); - CustomSlot (void (*ptr)(TQToolBar*), TQObject *parent, const char *name=0); - CustomSlot (void (*ptr)(TQWidget*), TQObject *parent, const char *name=0); - CustomSlot (void (*ptr)(int,TQIconViewItem*), TQObject *parent, const char *name=0); - CustomSlot (void (*ptr)(int,TQListBoxItem*), TQObject *parent, const char *name=0); - CustomSlot (void (*ptr)(int,bool), TQObject *parent, const char *name=0); - CustomSlot (void (*ptr)(int,int), TQObject *parent, const char *name=0); - CustomSlot (void (*ptr)(int,int,int), TQObject *parent, const char *name=0); + CustomSlot (void (*ptr)(void), TTQObject *parent, const char *name=0); + CustomSlot (void (*ptr)(bool), TTQObject *parent, const char *name=0); + CustomSlot (void (*ptr)(short), TTQObject *parent, const char *name=0); + CustomSlot (void (*ptr)(int), TTQObject *parent, const char *name=0); + CustomSlot (void (*ptr)(long), TTQObject *parent, const char *name=0); + CustomSlot (void (*ptr)(float), TTQObject *parent, const char *name=0); + CustomSlot (void (*ptr)(double), TTQObject *parent, const char *name=0); + CustomSlot (void (*ptr)(const TTQString&), TTQObject *parent, const char *name=0); + CustomSlot (void (*ptr)(TTQDockWindow*), TTQObject *parent, const char *name=0); + CustomSlot (void (*ptr)(TTQDropEvent*), TTQObject *parent, const char *name=0); + CustomSlot (void (*ptr)(TTQDropEvent*,TTQListViewItem*), TTQObject *parent, const char *name=0); + CustomSlot (void (*ptr)(TTQIconViewItem*), TTQObject *parent, const char *name=0); + CustomSlot (void (*ptr)(TTQListBoxItem*), TTQObject *parent, const char *name=0); + CustomSlot (void (*ptr)(TTQListViewItem*), TTQObject *parent, const char *name=0); + CustomSlot (void (*ptr)(TTQListViewItem*,TTQListViewItem*), TTQObject *parent, const char *name=0); + CustomSlot (void (*ptr)(TTQListViewItem*,TTQListViewItem*,TTQListViewItem*), TTQObject *parent, const char *name=0); + CustomSlot (void (*ptr)(TTQNetworkOperation*), TTQObject *parent, const char *name=0); + CustomSlot (void (*ptr)(TTQObject*), TTQObject *parent, const char *name=0); + CustomSlot (void (*ptr)(TTQToolBar*), TTQObject *parent, const char *name=0); + CustomSlot (void (*ptr)(TTQWidget*), TTQObject *parent, const char *name=0); + CustomSlot (void (*ptr)(int,TTQIconViewItem*), TTQObject *parent, const char *name=0); + CustomSlot (void (*ptr)(int,TTQListBoxItem*), TTQObject *parent, const char *name=0); + CustomSlot (void (*ptr)(int,bool), TTQObject *parent, const char *name=0); + CustomSlot (void (*ptr)(int,int), TTQObject *parent, const char *name=0); + CustomSlot (void (*ptr)(int,int,int), TTQObject *parent, const char *name=0); public slots: void callback (void); @@ -70,21 +70,21 @@ public slots: void callback (long); void callback (float); void callback (double); - void callback (const TQString&); - void callback (TQDockWindow*); - void callback (TQDropEvent*); - void callback (TQDropEvent*,TQListViewItem*); - void callback (TQIconViewItem*); - void callback (TQListBoxItem*); - void callback (TQListViewItem*); - void callback (TQListViewItem*,TQListViewItem*); - void callback (TQListViewItem*,TQListViewItem*,TQListViewItem*); - void callback (TQNetworkOperation*); - void callback (TQObject*); - void callback (TQToolBar*); - void callback (TQWidget*); - void callback (int,TQIconViewItem*); - void callback (int,TQListBoxItem*); + void callback (const TTQString&); + void callback (TTQDockWindow*); + void callback (TTQDropEvent*); + void callback (TTQDropEvent*,TTQListViewItem*); + void callback (TTQIconViewItem*); + void callback (TTQListBoxItem*); + void callback (TTQListViewItem*); + void callback (TTQListViewItem*,TTQListViewItem*); + void callback (TTQListViewItem*,TTQListViewItem*,TTQListViewItem*); + void callback (TTQNetworkOperation*); + void callback (TTQObject*); + void callback (TTQToolBar*); + void callback (TTQWidget*); + void callback (int,TTQIconViewItem*); + void callback (int,TTQListBoxItem*); void callback (int,bool); void callback (int,int); void callback (int,int,int); @@ -97,24 +97,24 @@ private: void (*p4)(long); void (*p5)(float); void (*p6)(double); - void (*p7)(TQDockWindow*); - void (*p8)(TQDropEvent*); - void (*p9)(TQDropEvent*,TQListViewItem*); - void (*p10)(TQIconViewItem*); - void (*p11)(TQListBoxItem*); - void (*p12)(TQListViewItem*); - void (*p13)(TQListViewItem*,TQListViewItem*); - void (*p14)(TQListViewItem*,TQListViewItem*,TQListViewItem*); - void (*p15)(TQNetworkOperation*); - void (*p16)(TQObject*); - void (*p17)(TQToolBar*); - void (*p18)(TQWidget*); - void (*p19)(int,TQIconViewItem*); - void (*p20)(int,TQListBoxItem*); + void (*p7)(TTQDockWindow*); + void (*p8)(TTQDropEvent*); + void (*p9)(TTQDropEvent*,TTQListViewItem*); + void (*p10)(TTQIconViewItem*); + void (*p11)(TTQListBoxItem*); + void (*p12)(TTQListViewItem*); + void (*p13)(TTQListViewItem*,TTQListViewItem*); + void (*p14)(TTQListViewItem*,TTQListViewItem*,TTQListViewItem*); + void (*p15)(TTQNetworkOperation*); + void (*p16)(TTQObject*); + void (*p17)(TTQToolBar*); + void (*p18)(TTQWidget*); + void (*p19)(int,TTQIconViewItem*); + void (*p20)(int,TTQListBoxItem*); void (*p21)(int,bool); void (*p22)(int,int); void (*p23)(int,int,int); - void (*p24)(const TQString&); + void (*p24)(const TTQString&); }; #endif // _CUSTOMSLOT_H_ diff --git a/qtsharp/src/libqtsharp/qtsharp.cpp b/qtsharp/src/libqtsharp/qtsharp.cpp index 80e32b0d..061ead09 100644 --- a/qtsharp/src/libqtsharp/qtsharp.cpp +++ b/qtsharp/src/libqtsharp/qtsharp.cpp @@ -19,273 +19,273 @@ void qtsharp_QObject_registerEventDelegate (qtsharp_EventDelegate delegate) return; } -TQObject *csharp_connect_void (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(void)) +TTQObject *csharp_connect_void (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(void)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (void)))) { + if (! TTQObject::connect (sender, signal, cs, TQT_SLOT (callback (void)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } -TQObject *csharp_connect_item_void (TQMenuData *instance, int id, TQObject *receiver, void (*ptr)(void)) +TTQObject *csharp_connect_item_void (TTQMenuData *instance, int id, TTQObject *receiver, void (*ptr)(void)) { CustomSlot *cs = new CustomSlot (ptr, receiver); if (! instance->connectItem (id, cs, TQT_SLOT (callback (void)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } -TQObject *csharp_connect_bool (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(bool)) +TTQObject *csharp_connect_bool (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(bool)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (bool)))) { + if (! TTQObject::connect (sender, signal, cs, TQT_SLOT (callback (bool)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } -TQObject *csharp_connect_short (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(short)) +TTQObject *csharp_connect_short (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(short)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (short)))) { + if (! TTQObject::connect (sender, signal, cs, TQT_SLOT (callback (short)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } -TQObject *csharp_connect_int (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int)) +TTQObject *csharp_connect_int (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(int)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (int)))) { + if (! TTQObject::connect (sender, signal, cs, TQT_SLOT (callback (int)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } -TQObject *csharp_connect_item_int (TQMenuData *instance, int id, TQObject *receiver, void (*ptr)(int)) +TTQObject *csharp_connect_item_int (TTQMenuData *instance, int id, TTQObject *receiver, void (*ptr)(int)) { CustomSlot *cs = new CustomSlot (ptr, receiver); if (! instance->connectItem (id, cs, TQT_SLOT (callback (int)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } -TQObject *csharp_connect_long (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(long)) +TTQObject *csharp_connect_long (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(long)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (long)))) { + if (! TTQObject::connect (sender, signal, cs, TQT_SLOT (callback (long)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } -TQObject *csharp_connect_float (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(float)) +TTQObject *csharp_connect_float (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(float)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (float)))) { + if (! TTQObject::connect (sender, signal, cs, TQT_SLOT (callback (float)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } -TQObject *csharp_connect_double (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(double)) +TTQObject *csharp_connect_double (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(double)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (double)))) { + if (! TTQObject::connect (sender, signal, cs, TQT_SLOT (callback (double)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } -TQObject *csharp_connect_QString (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(const TQString&)) +TTQObject *csharp_connect_QString (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(const TTQString&)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (const TQString&)))) { + if (! TTQObject::connect (sender, signal, cs, TQT_SLOT (callback (const TTQString&)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } -TQObject *csharp_connect_QDockWindow (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQDockWindow*)) +TTQObject *csharp_connect_QDockWindow (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(TTQDockWindow*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQDockWindow*)))) { + if (! TTQObject::connect (sender, signal, cs, TQT_SLOT (callback (TTQDockWindow*)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } -TQObject *csharp_connect_QDropEvent (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQDropEvent*)) +TTQObject *csharp_connect_QDropEvent (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(TTQDropEvent*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQDropEvent*)))) { + if (! TTQObject::connect (sender, signal, cs, TQT_SLOT (callback (TTQDropEvent*)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } -TQObject *csharp_connect_QDropEventQListViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQDropEvent*,TQListViewItem*)) +TTQObject *csharp_connect_QDropEventTQListViewItem (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(TTQDropEvent*,TTQListViewItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQDropEvent*,TQListViewItem*)))) { + if (! TTQObject::connect (sender, signal, cs, TQT_SLOT (callback (TTQDropEvent*,TTQListViewItem*)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } -TQObject *csharp_connect_QIconViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQIconViewItem*)) +TTQObject *csharp_connect_QIconViewItem (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(TTQIconViewItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQIconViewItem*)))) { + if (! TTQObject::connect (sender, signal, cs, TQT_SLOT (callback (TTQIconViewItem*)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } -TQObject *csharp_connect_QListBoxItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQListBoxItem*)) +TTQObject *csharp_connect_QListBoxItem (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(TTQListBoxItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQListBoxItem*)))) { + if (! TTQObject::connect (sender, signal, cs, TQT_SLOT (callback (TTQListBoxItem*)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } -TQObject *csharp_connect_QListViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQListViewItem*)) +TTQObject *csharp_connect_QListViewItem (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(TTQListViewItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQListViewItem*)))) { + if (! TTQObject::connect (sender, signal, cs, TQT_SLOT (callback (TTQListViewItem*)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } -TQObject *csharp_connect_QListViewItemQListViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQListViewItem*,TQListViewItem*)) +TTQObject *csharp_connect_QListViewItemTQListViewItem (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(TTQListViewItem*,TTQListViewItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQListViewItem*,TQListViewItem*)))) { + if (! TTQObject::connect (sender, signal, cs, TQT_SLOT (callback (TTQListViewItem*,TTQListViewItem*)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } -TQObject *csharp_connect_QListViewItemQListViewItemQListViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQListViewItem*,TQListViewItem*,TQListViewItem*)) +TTQObject *csharp_connect_QListViewItemTQListViewItemTQListViewItem (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(TTQListViewItem*,TTQListViewItem*,TTQListViewItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQListViewItem*,TQListViewItem*,TQListViewItem*)))) { + if (! TTQObject::connect (sender, signal, cs, TQT_SLOT (callback (TTQListViewItem*,TTQListViewItem*,TTQListViewItem*)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } -TQObject *csharp_connect_QNetworkOperation (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQNetworkOperation*)) +TTQObject *csharp_connect_QNetworkOperation (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(TTQNetworkOperation*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQNetworkOperation*)))) { + if (! TTQObject::connect (sender, signal, cs, TQT_SLOT (callback (TTQNetworkOperation*)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } -TQObject *csharp_connect_QObject (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQObject*)) +TTQObject *csharp_connect_QObject (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(TTQObject*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQObject*)))) { + if (! TTQObject::connect (sender, signal, cs, TQT_SLOT (callback (TTQObject*)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } -TQObject *csharp_connect_QToolBar (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQToolBar*)) +TTQObject *csharp_connect_QToolBar (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(TTQToolBar*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQToolBar*)))) { + if (! TTQObject::connect (sender, signal, cs, TQT_SLOT (callback (TTQToolBar*)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } -TQObject *csharp_connect_QWidget (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQWidget*)) +TTQObject *csharp_connect_QWidget (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(TTQWidget*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (TQWidget*)))) { + if (! TTQObject::connect (sender, signal, cs, TQT_SLOT (callback (TTQWidget*)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } -TQObject *csharp_connect_intQIconViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int,TQIconViewItem*)) +TTQObject *csharp_connect_intTQIconViewItem (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(int,TTQIconViewItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (int,TQIconViewItem*)))) { + if (! TTQObject::connect (sender, signal, cs, TQT_SLOT (callback (int,TTQIconViewItem*)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } -TQObject *csharp_connect_intQListBoxItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int,TQListBoxItem*)) +TTQObject *csharp_connect_intTQListBoxItem (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(int,TTQListBoxItem*)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (int,TQListBoxItem*)))) { + if (! TTQObject::connect (sender, signal, cs, TQT_SLOT (callback (int,TTQListBoxItem*)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } -TQObject *csharp_connect_intbool (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int,bool)) +TTQObject *csharp_connect_intbool (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(int,bool)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (int,bool)))) { + if (! TTQObject::connect (sender, signal, cs, TQT_SLOT (callback (int,bool)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } -TQObject *csharp_connect_intint (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int,int)) +TTQObject *csharp_connect_intint (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(int,int)) { CustomSlot *cs = new CustomSlot (ptr, receiver); - if (! TQObject::connect (sender, signal, cs, TQT_SLOT (callback (int,int)))) { + if (! TTQObject::connect (sender, signal, cs, TQT_SLOT (callback (int,int)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } -TQObject *csharp_connect_intintint (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int,int,int)) +TTQObject *csharp_connect_intintint (TTQObject *sender, const char *signal, TTQObject *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 (! TTQObject::connect (sender, signal, cs, TQT_SLOT (callback (int,int,int)))) { delete cs; cs = 0L; } - return (TQObject *)cs; + return (TTQObject *)cs; } diff --git a/qtsharp/src/libqtsharp/qtsharp.h b/qtsharp/src/libqtsharp/qtsharp.h index a1642db3..53b0199e 100644 --- a/qtsharp/src/libqtsharp/qtsharp.h +++ b/qtsharp/src/libqtsharp/qtsharp.h @@ -10,57 +10,57 @@ typedef int (*qt_EventDelegate)(void *, char *, void *, char *); void qt_QObject_registerEventDelegate (qt_EventDelegate delegate); -TQObject *csharp_connect_void (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(void)); -TQObject *csharp_connect_item_void (TQMenuData *instance, int id, TQObject *receiver, void (*ptr)(void)); +TTQObject *csharp_connect_void (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(void)); +TTQObject *csharp_connect_item_void (TTQMenuData *instance, int id, TTQObject *receiver, void (*ptr)(void)); -TQObject *csharp_connect_bool (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(bool)); +TTQObject *csharp_connect_bool (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(bool)); -TQObject *csharp_connect_short (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(short)); +TTQObject *csharp_connect_short (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(short)); -TQObject *csharp_connect_int (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int)); -TQObject *csharp_connect_item_int (TQMenuData *instance, int id, TQObject *receiver, void (*ptr)(int)); +TTQObject *csharp_connect_int (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(int)); +TTQObject *csharp_connect_item_int (TTQMenuData *instance, int id, TTQObject *receiver, void (*ptr)(int)); -TQObject *csharp_connect_long (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(long)); +TTQObject *csharp_connect_long (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(long)); -TQObject *csharp_connect_float (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(float)); +TTQObject *csharp_connect_float (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(float)); -TQObject *csharp_connect_double (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(double)); +TTQObject *csharp_connect_double (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(double)); -TQObject *csharp_connect_QString (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(const TQString&)); +TTQObject *csharp_connect_QString (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(const TTQString&)); -TQObject *csharp_connect_QDockWindow (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQDockWindow*)); +TTQObject *csharp_connect_QDockWindow (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(TTQDockWindow*)); -TQObject *csharp_connect_QDropEvent (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQDropEvent*)); +TTQObject *csharp_connect_QDropEvent (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(TTQDropEvent*)); -TQObject *csharp_connect_QDropEventQListViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQDropEvent*,TQListViewItem*)); +TTQObject *csharp_connect_QDropEventTQListViewItem (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(TTQDropEvent*,TTQListViewItem*)); -TQObject *csharp_connect_QIconViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQIconViewItem*)); +TTQObject *csharp_connect_QIconViewItem (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(TTQIconViewItem*)); -TQObject *csharp_connect_QListBoxItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQListBoxItem*)); +TTQObject *csharp_connect_QListBoxItem (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(TTQListBoxItem*)); -TQObject *csharp_connect_QListViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQListViewItem*)); +TTQObject *csharp_connect_QListViewItem (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(TTQListViewItem*)); -TQObject *csharp_connect_QListViewItemQListViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQListViewItem*,TQListViewItem*)); +TTQObject *csharp_connect_QListViewItemTQListViewItem (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(TTQListViewItem*,TTQListViewItem*)); -TQObject *csharp_connect_QListViewItemQListViewItemQListViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQListViewItem*,TQListViewItem*,TQListViewItem*)); +TTQObject *csharp_connect_QListViewItemTQListViewItemTQListViewItem (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(TTQListViewItem*,TTQListViewItem*,TTQListViewItem*)); -TQObject *csharp_connect_QNetworkOperation (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQNetworkOperation*)); +TTQObject *csharp_connect_QNetworkOperation (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(TTQNetworkOperation*)); -TQObject *csharp_connect_QObject (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQObject*)); +TTQObject *csharp_connect_QObject (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(TTQObject*)); -TQObject *csharp_connect_QToolBar (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQToolBar*)); +TTQObject *csharp_connect_QToolBar (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(TTQToolBar*)); -TQObject *csharp_connect_QWidget (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(TQWidget*)); +TTQObject *csharp_connect_QWidget (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(TTQWidget*)); -TQObject *csharp_connect_intQIconViewItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int,TQIconViewItem*)); +TTQObject *csharp_connect_intTQIconViewItem (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(int,TTQIconViewItem*)); -TQObject *csharp_connect_intQListBoxItem (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int,TQListBoxItem*)); +TTQObject *csharp_connect_intTQListBoxItem (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(int,TTQListBoxItem*)); -TQObject *csharp_connect_intbool (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int,bool)); +TTQObject *csharp_connect_intbool (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(int,bool)); -TQObject *csharp_connect_intint (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int,int)); +TTQObject *csharp_connect_intint (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(int,int)); -TQObject *csharp_connect_intintint (TQObject *sender, const char *signal, TQObject *receiver, void (*ptr)(int,int,int)); +TTQObject *csharp_connect_intintint (TTQObject *sender, const char *signal, TTQObject *receiver, void (*ptr)(int,int,int)); } // extern "C" diff --git a/qtsharp/src/tests/lookuptest.cs b/qtsharp/src/tests/lookuptest.cs index 6cfcad3d..1b55d2bf 100644 --- a/qtsharp/src/tests/lookuptest.cs +++ b/qtsharp/src/tests/lookuptest.cs @@ -1,5 +1,5 @@ // Demonstrates that auto-boxing of foreign C++ objects works. -// Set QTCSHARP_DEBUG to true in your environment to see this work. +// Set TQTCSHARP_DEBUG to true in your environment to see this work. // // TODO // o Turn this into an nunit test. @@ -12,28 +12,28 @@ namespace Qt { using Qt; using System; - public class LookupTest : TQVBox, IDisposable { + public class LookupTest : TTQVBox, IDisposable { public LookupTest() : base (null) { - TQPushButton button = new TQPushButton ("Quit", this); - TQPushButton button2 = (TQPushButton)QtSupport.LookupObject (button.Ptr); // Lookup a child object that exists in C# + TTQPushButton button = new TTQPushButton ("Quit", this); + TTQPushButton button2 = (TTQPushButton)QtSupport.LookupObject (button.Ptr); // Lookup a child object that exists in C# if (button.GetHashCode () != button2.GetHashCode ()) Console.WriteLine ("ERROR: Hash codes differ for button and button2!"); - TQSize size = button2.SizeHint (); // Wrap a non-C# object. Lookup is called from the C# sizeHint method. - TQSize size2 = (TQSize)QtSupport.LookupObject (size.Ptr); + TTQSize size = button2.SizeHint (); // Wrap a non-C# object. Lookup is called from the C# sizeHint method. + TTQSize size2 = (TTQSize)QtSupport.LookupObject (size.Ptr); 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, TQT_SIGNAL ("clicked()"), TTQObject.qApp, TQT_SLOT ("Quit()")); } public static void Main (string[] args) { - TQApplication a = new TQApplication (args); + TTQApplication a = new TTQApplication (args); LookupTest lt = new LookupTest (); a.SetMainWidget (lt); lt.Show (); diff --git a/qtsharp/src/uicsharp/tests/form1.ui b/qtsharp/src/uicsharp/tests/form1.ui index e5895a10..f9553078 100644 --- a/qtsharp/src/uicsharp/tests/form1.ui +++ b/qtsharp/src/uicsharp/tests/form1.ui @@ -1,6 +1,6 @@ Form1 - + Form1 @@ -16,12 +16,12 @@ unnamed - + LineEdit1 - + PushButton1 @@ -29,7 +29,7 @@ PushButton1 - + TextLabel1 diff --git a/qtsharp/src/uicsharp/tests/form10.ui b/qtsharp/src/uicsharp/tests/form10.ui index 50b27bb6..c5b42cce 100644 --- a/qtsharp/src/uicsharp/tests/form10.ui +++ b/qtsharp/src/uicsharp/tests/form10.ui @@ -1,6 +1,6 @@ Form2 - + Form2 @@ -12,7 +12,7 @@ 480 - + WidgetStack1 @@ -24,7 +24,7 @@ 301 - + page @@ -35,7 +35,7 @@ unnamed - + CheckBox2 @@ -43,7 +43,7 @@ CheckBox2 - + RadioButton2 @@ -53,7 +53,7 @@ - + page @@ -64,7 +64,7 @@ unnamed - + Column 1 @@ -88,7 +88,7 @@ ListView1 - + Table1 @@ -101,7 +101,7 @@ - + page @@ -112,7 +112,7 @@ unnamed - + Table2 diff --git a/qtsharp/src/uicsharp/tests/form2.ui b/qtsharp/src/uicsharp/tests/form2.ui index 4d6545d5..57e7256b 100644 --- a/qtsharp/src/uicsharp/tests/form2.ui +++ b/qtsharp/src/uicsharp/tests/form2.ui @@ -1,6 +1,6 @@ Form1 - + Form1 @@ -16,7 +16,7 @@ unnamed - + GroupBox1 @@ -27,7 +27,7 @@ unnamed - + CheckBox1 @@ -35,7 +35,7 @@ CheckBox1 - + CheckBox2 @@ -43,7 +43,7 @@ CheckBox2 - + CheckBox3 @@ -51,7 +51,7 @@ CheckBox3 - + CheckBox4 @@ -59,7 +59,7 @@ CheckBox4 - + CheckBox5 @@ -67,7 +67,7 @@ CheckBox5 - + CheckBox6 @@ -75,7 +75,7 @@ CheckBox6 - + CheckBox7 @@ -83,7 +83,7 @@ CheckBox7 - + CheckBox8 @@ -91,7 +91,7 @@ CheckBox8 - + CheckBox9 @@ -101,7 +101,7 @@ - + Frame3 @@ -115,12 +115,12 @@ unnamed - + LineEdit1 - + New Item diff --git a/qtsharp/src/uicsharp/tests/form3.ui b/qtsharp/src/uicsharp/tests/form3.ui index 2e77c2bd..eb6533ba 100644 --- a/qtsharp/src/uicsharp/tests/form3.ui +++ b/qtsharp/src/uicsharp/tests/form3.ui @@ -1,6 +1,6 @@ Form1 - + Form1 @@ -16,7 +16,7 @@ unnamed - + Layout1 @@ -24,7 +24,7 @@ unnamed - + GroupBox1 @@ -35,7 +35,7 @@ unnamed - + CheckBox1 @@ -43,7 +43,7 @@ CheckBox1 - + CheckBox2 @@ -51,7 +51,7 @@ CheckBox2 - + CheckBox3 @@ -59,7 +59,7 @@ CheckBox3 - + CheckBox4 @@ -67,7 +67,7 @@ CheckBox4 - + CheckBox5 @@ -75,7 +75,7 @@ CheckBox5 - + CheckBox6 @@ -83,7 +83,7 @@ CheckBox6 - + CheckBox7 @@ -91,7 +91,7 @@ CheckBox7 - + CheckBox8 @@ -99,7 +99,7 @@ CheckBox8 - + CheckBox9 @@ -109,7 +109,7 @@ - + GroupBox2 @@ -120,7 +120,7 @@ unnamed - + PushButton1 @@ -128,7 +128,7 @@ PushButton1 - + PushButton2 @@ -138,7 +138,7 @@ - + GroupBox3 @@ -149,7 +149,7 @@ unnamed - + PushButton3 @@ -157,7 +157,7 @@ PushButton3 - + PushButton4 @@ -169,7 +169,7 @@ - + Frame3 @@ -183,12 +183,12 @@ unnamed - + LineEdit1 - + New Item diff --git a/qtsharp/src/uicsharp/tests/form4.ui b/qtsharp/src/uicsharp/tests/form4.ui index bb18f36e..21733b0b 100644 --- a/qtsharp/src/uicsharp/tests/form4.ui +++ b/qtsharp/src/uicsharp/tests/form4.ui @@ -1,6 +1,6 @@ Form1 - + Form1 @@ -16,7 +16,7 @@ unnamed - + Layout1 @@ -24,7 +24,7 @@ unnamed - + GroupBox1 @@ -35,7 +35,7 @@ unnamed - + CheckBox1 @@ -43,7 +43,7 @@ CheckBox1 - + CheckBox2 @@ -51,7 +51,7 @@ CheckBox2 - + CheckBox3 @@ -59,7 +59,7 @@ CheckBox3 - + CheckBox4 @@ -67,7 +67,7 @@ CheckBox4 - + CheckBox5 @@ -75,7 +75,7 @@ CheckBox5 - + CheckBox6 @@ -83,7 +83,7 @@ CheckBox6 - + CheckBox7 @@ -91,7 +91,7 @@ CheckBox7 - + CheckBox8 @@ -99,7 +99,7 @@ CheckBox8 - + CheckBox9 @@ -109,7 +109,7 @@ - + GroupBox2 @@ -120,7 +120,7 @@ unnamed - + PushButton1 @@ -128,7 +128,7 @@ PushButton1 - + PushButton2 @@ -138,7 +138,7 @@ - + GroupBox3 @@ -149,7 +149,7 @@ unnamed - + PushButton3 @@ -157,7 +157,7 @@ PushButton3 - + Layout2 @@ -165,7 +165,7 @@ unnamed - + CheckBox10 @@ -173,7 +173,7 @@ CheckBox10 - + CheckBox11 @@ -187,7 +187,7 @@ - + Frame3 @@ -201,12 +201,12 @@ unnamed - + LineEdit1 - + New Item diff --git a/qtsharp/src/uicsharp/tests/form5.ui b/qtsharp/src/uicsharp/tests/form5.ui index 47cd7d91..bb998334 100644 --- a/qtsharp/src/uicsharp/tests/form5.ui +++ b/qtsharp/src/uicsharp/tests/form5.ui @@ -1,6 +1,6 @@ Form1 - + Form1 diff --git a/qtsharp/src/uicsharp/tests/form6.ui b/qtsharp/src/uicsharp/tests/form6.ui index 7e67784c..bcc04572 100644 --- a/qtsharp/src/uicsharp/tests/form6.ui +++ b/qtsharp/src/uicsharp/tests/form6.ui @@ -1,6 +1,6 @@ MyDialog - + MyDialog @@ -19,14 +19,14 @@ unnamed - + Splitter1 Vertical - + Column 1 @@ -50,7 +50,7 @@ ListView1 - + New Item @@ -64,7 +64,7 @@ - + Layout5 @@ -78,7 +78,7 @@ 6 - + buttonOk @@ -95,7 +95,7 @@ true - + buttonCancel @@ -109,7 +109,7 @@ true - + buttonHelp diff --git a/qtsharp/src/uicsharp/tests/form7.ui b/qtsharp/src/uicsharp/tests/form7.ui index 6cf51c06..8d043b3a 100644 --- a/qtsharp/src/uicsharp/tests/form7.ui +++ b/qtsharp/src/uicsharp/tests/form7.ui @@ -1,6 +1,6 @@ Form1 - + Form1 @@ -12,7 +12,7 @@ 480 - + GroupBox3 @@ -27,7 +27,7 @@ GroupBox3 - + PushButton3 @@ -43,7 +43,7 @@ PushButton3 - + CheckBox10 @@ -59,7 +59,7 @@ CheckBox10 - + CheckBox11 @@ -76,7 +76,7 @@ - + GroupBox1 @@ -91,7 +91,7 @@ GroupBox1 - + CheckBox1 @@ -107,7 +107,7 @@ CheckBox1 - + CheckBox2 @@ -123,7 +123,7 @@ CheckBox2 - + CheckBox3 @@ -139,7 +139,7 @@ CheckBox3 - + CheckBox4 @@ -155,7 +155,7 @@ CheckBox4 - + CheckBox5 @@ -171,7 +171,7 @@ CheckBox5 - + CheckBox6 @@ -187,7 +187,7 @@ CheckBox6 - + CheckBox7 @@ -203,7 +203,7 @@ CheckBox7 - + CheckBox8 @@ -219,7 +219,7 @@ CheckBox8 - + CheckBox9 @@ -236,7 +236,7 @@ - + GroupBox2 @@ -251,7 +251,7 @@ GroupBox2 - + PushButton1 @@ -267,7 +267,7 @@ PushButton1 - + PushButton2 @@ -284,7 +284,7 @@ - + Frame3 @@ -302,7 +302,7 @@ Raised - + LineEdit1 @@ -315,7 +315,7 @@ - + New Item diff --git a/qtsharp/src/uicsharp/tests/form8.ui b/qtsharp/src/uicsharp/tests/form8.ui index 09f20bef..072b9977 100644 --- a/qtsharp/src/uicsharp/tests/form8.ui +++ b/qtsharp/src/uicsharp/tests/form8.ui @@ -1,6 +1,6 @@ Form1 - + Form1 @@ -12,7 +12,7 @@ 480 - + PushButton1 @@ -28,7 +28,7 @@ PushButton1 - + RadioButton1 @@ -44,7 +44,7 @@ RadioButton1 - + CheckBox1 diff --git a/qtsharp/src/uicsharp/tests/form9.ui b/qtsharp/src/uicsharp/tests/form9.ui index b1e61488..3ba562c7 100644 --- a/qtsharp/src/uicsharp/tests/form9.ui +++ b/qtsharp/src/uicsharp/tests/form9.ui @@ -1,6 +1,6 @@ MyDialog1 - + MyDialog1 @@ -25,18 +25,18 @@ 6 - + tabWidget - + Widget8 Tab - + ComboBox1 @@ -49,7 +49,7 @@ - + New Item @@ -67,7 +67,7 @@ - + TextLabel1 @@ -84,7 +84,7 @@ - + Widget9 @@ -95,7 +95,7 @@ unnamed - + New Item @@ -105,7 +105,7 @@ ListBox2 - + TextEdit1 @@ -113,7 +113,7 @@ - + Layout1 @@ -127,7 +127,7 @@ 6 - + buttonHelp @@ -158,7 +158,7 @@ - + buttonOk @@ -175,7 +175,7 @@ true - + buttonCancel diff --git a/qtsharp/src/uicsharp/uicsharp.cs b/qtsharp/src/uicsharp/uicsharp.cs index 62a67757..32587f4b 100644 --- a/qtsharp/src/uicsharp/uicsharp.cs +++ b/qtsharp/src/uicsharp/uicsharp.cs @@ -63,7 +63,7 @@ namespace QtSharp { try { String []dummyargs=new String[0]; - TQApplication dummyapp=new TQApplication(dummyargs,false); + TTQApplication dummyapp=new TTQApplication(dummyargs,false); qtAssembly=Assembly.GetAssembly(dummyapp.GetType()); // qtAssembly=Assembly.Load("Qt.dll"); Console.WriteLine("CodeBase="+qtAssembly.CodeBase); @@ -216,7 +216,7 @@ namespace QtSharp { "\"....#aaaaaaaaaaaaa#...\",\"....#aaaaaaaaaaaaa#...\",\"....#aaaaaaaaaaaaa#...\","+ "\"....#aaaaaaaaaaaaa#...\",\"....#aaaaaaaaaaaaa#...\",\"....###############...\","+ "\"......................\",\"......................\"};"); - writer.WriteLine("\tQPixmap {0};",el.GetAttribute("name")); + writer.WriteLine("\tTQPixmap {0};",el.GetAttribute("name")); } } @@ -225,11 +225,11 @@ namespace QtSharp { { if (menubarElement==null) return; writer.WriteLine("\t//Menubar member fields"); - writer.WriteLine("\t TQMenuBar menubar;"); + writer.WriteLine("\t TTQMenuBar menubar;"); foreach (XmlNode node in menubarElement.ChildNodes) { XmlElement el=node as XmlElement; if (el.Name=="item") { - writer.WriteLine("\tpublic TQPopupMenu {0};",el.GetAttribute("name")); + writer.WriteLine("\tpublic TTQPopupMenu {0};",el.GetAttribute("name")); } } } @@ -241,7 +241,7 @@ namespace QtSharp { foreach (XmlNode node in actionsElement.ChildNodes) { XmlElement el=node as XmlElement; if (el.Name=="action") { - writer.WriteLine("\tpublic TQAction {0};",getName(el)); + writer.WriteLine("\tpublic TTQAction {0};",getName(el)); } } } @@ -253,7 +253,7 @@ namespace QtSharp { foreach (XmlNode node in toolbarsElement.ChildNodes) { XmlElement el=node as XmlElement; if (el.Name=="toolbar") { - writer.WriteLine("\tpublic TQToolBar {0};",getName(el)); + writer.WriteLine("\tpublic TTQToolBar {0};",getName(el)); } } } @@ -269,7 +269,7 @@ namespace QtSharp { if (submembernode.ParentNode!=widget) continue; // I think this is a workaround for a classlib bug XmlElement submember=submembernode as XmlElement; addSubMembers(submember); - if (submember.GetAttribute("class")=="QLayoutWidget") continue; //they are private + if (submember.GetAttribute("class")=="TQLayoutWidget") continue; //they are private String membername=getName(submember); if (membername==String.Empty) continue; writer.WriteLine("\t"+submember.GetAttribute("class")+" "+membername+";"); @@ -334,7 +334,7 @@ namespace QtSharp { tmp=tmp.NextSibling as XmlElement; String slot=tmp.InnerText; - writer.WriteLine("\t\tQObject.Connect({0},TQT_SIGNAL(\"{1}\"),{2},TQT_SLOT(\"{3}\"));", + writer.WriteLine("\t\tTQObject.Connect({0},TQT_SIGNAL(\"{1}\"),{2},TQT_SLOT(\"{3}\"));", sender,signal,receiver,slot); } break; @@ -346,7 +346,7 @@ namespace QtSharp { private void createConstructor() { //Later handle non qwidgets better (dialog,....) - writer.WriteLine("\n\tpublic "+className+"(TQWidget parent, String name) :base(parent, name) {"); + writer.WriteLine("\n\tpublic "+className+"(TTQWidget parent, String name) :base(parent, name) {"); writer.WriteLine("\t\tif (name==null) SetName(\""+className+"\");"); setupImages(); setupActions(); @@ -370,7 +370,7 @@ namespace QtSharp { writer.WriteLine("\t//images"); foreach (XmlNode node in imagesElement.ChildNodes) { XmlElement el=node as XmlElement; - writer.WriteLine("\t\t{0}=new TQPixmap({1}_data);", + writer.WriteLine("\t\t{0}=new TTQPixmap({1}_data);", el.GetAttribute("name"),el.GetAttribute("name")); } } @@ -382,7 +382,7 @@ namespace QtSharp { foreach (XmlNode aNode in actionsElement.ChildNodes) { XmlElement action=aNode as XmlElement; if (action.Name!="action") continue; - writer.WriteLine("\t\t{0}= new TQAction(this,\"{1}\");",getName(action),getName(action)); + writer.WriteLine("\t\t{0}= new TTQAction(this,\"{1}\");",getName(action),getName(action)); foreach (XmlNode pNode in action.ChildNodes) { XmlElement prop=pNode as XmlElement; if (prop.Name!="property") continue; @@ -398,14 +398,14 @@ namespace QtSharp { if (menubarElement==null) return; writer.WriteLine("\t//menubar"); String barname=getName(menubarElement); - writer.WriteLine("\t\t{0}=new TQMenuBar(this,\"{1}\");",barname,barname); + writer.WriteLine("\t\t{0}=new TTQMenuBar(this,\"{1}\");",barname,barname); int count=0; foreach (XmlNode mNode in menubarElement.ChildNodes) { XmlElement item=mNode as XmlElement; if (item.Name!="item") continue; String submenu_name=item.GetAttribute("name"); String submenu_text=stringify(item.GetAttribute("text")); - writer.WriteLine("\t\t{0}=new TQPopupMenu(this);",submenu_name); + writer.WriteLine("\t\t{0}=new TTQPopupMenu(this);",submenu_name); foreach (XmlNode node in item.ChildNodes) { XmlElement element=node as XmlElement; @@ -428,7 +428,7 @@ namespace QtSharp { XmlElement toolbar=tNode as XmlElement; if (toolbar.Name!="toolbar") continue; String varname=getName(toolbar); - writer.WriteLine("\t\t{0}=new TQToolBar(this,\"{1}\");",varname,varname); + writer.WriteLine("\t\t{0}=new TTQToolBar(this,\"{1}\");",varname,varname); writer.WriteLine("\t\tthis.AddDockWindow({0},(Qt.Dock){1},false);",varname,toolbar.GetAttribute("dock")); foreach (XmlNode node in toolbar.ChildNodes) { XmlElement element=node as XmlElement; @@ -442,7 +442,7 @@ namespace QtSharp { private ElementType elementType(XmlElement el) { switch (el.Name) { - case "widget": return (el.GetAttribute("class")=="QLayoutWidget")? + case "widget": return (el.GetAttribute("class")=="TQLayoutWidget")? ElementType.LayoutType:ElementType.WidgetType; case "vbox": return ElementType.LayoutType; case "hbox": return ElementType.LayoutType; @@ -473,7 +473,7 @@ namespace QtSharp { private void widgetAdd(String parname,XmlElement par, XmlElement obj) { if (par==widgetElement) { - if (par.GetAttribute("class")=="TQWizard") + if (par.GetAttribute("class")=="TTQWizard") { writer.WriteLine("\t\tAddPage("+getName(obj)+", "+getName(obj)+".Caption());"); } @@ -486,7 +486,7 @@ namespace QtSharp { else writer.WriteLine("\t\t"+parname+".Add("+getName(obj)+");"); } else switch(par.GetAttribute("class")) { - case "TQTabWidget": writer.WriteLine("\t\t"+parname+".InsertTab("+getName(obj)+",\"\");"); + case "TTQTabWidget": writer.WriteLine("\t\t"+parname+".InsertTab("+getName(obj)+",\"\");"); break; default: break; } @@ -575,10 +575,10 @@ namespace QtSharp { break; } } - writer.WriteLine("\t\tQSpacerItem {0}=new TQSpacerItem({1},{2},{3},{4});", + writer.WriteLine("\t\tTQSpacerItem {0}=new TTQSpacerItem({1},{2},{3},{4});", name,shx,shy, - (orientation=="VERTICAL")?"Qt.TQSizePolicy.SizeType.Minimum":("Qt.TQSizePolicy.SizeType."+toPascal(sizeType)), - (orientation!="VERTICAL")?"Qt.TQSizePolicy.SizeType.Minimum":("Qt.TQSizePolicy.SizeType."+toPascal(sizeType))); + (orientation=="VERTICAL")?"Qt.TTQSizePolicy.SizeType.Minimum":("Qt.TTQSizePolicy.SizeType."+toPascal(sizeType)), + (orientation!="VERTICAL")?"Qt.TTQSizePolicy.SizeType.Minimum":("Qt.TTQSizePolicy.SizeType."+toPascal(sizeType))); } int layoutcnt=1; @@ -600,11 +600,11 @@ namespace QtSharp { parent=obj.GetAttribute("uicsharp_parent"); switch (obj.Name) { - case "vbox": writer.WriteLine("\t\t"+(privateLayout?"TQVBoxLayout ":"")+name+"= new TQVBoxLayout("+ + case "vbox": writer.WriteLine("\t\t"+(privateLayout?"TTQVBoxLayout ":"")+name+"= new TTQVBoxLayout("+ ((parent==null)?"":parent)+");"); setupLayout(name,obj); return obj; - case "hbox": writer.WriteLine("\t\t"+(privateLayout?"TQHBoxLayout ":"")+name+"= new TQHBoxLayout("+ + case "hbox": writer.WriteLine("\t\t"+(privateLayout?"TTQHBoxLayout ":"")+name+"= new TTQHBoxLayout("+ ((parent==null)?"":parent)+");"); setupLayout(name,obj); return obj; @@ -647,7 +647,7 @@ namespace QtSharp { rows=(tmprows