diff options
-rw-r--r-- | kalyptus/kalyptusDataDict.pm | 3 | ||||
-rw-r--r-- | qtsharp/src/api/qt.xml | 265 | ||||
-rw-r--r-- | qtsharp/src/bindings/qt.build | 2 | ||||
-rw-r--r-- | qtsharp/src/generator/TQTypeMap.cs | 3 | ||||
-rw-r--r-- | smoke/tde/generate.pl.in | 2 | ||||
-rw-r--r-- | smoke/tde/header_list | 2 | ||||
-rw-r--r-- | smoke/tde/qtguess.pl.in | 10 | ||||
-rw-r--r-- | smoke/tqt/generate.pl.in | 2 | ||||
-rw-r--r-- | smoke/tqt/header_list | 2 | ||||
-rw-r--r-- | smoke/tqt/qtguess.pl.in | 10 |
10 files changed, 0 insertions, 301 deletions
diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm index 6ff6ff2b..6f3e7535 100644 --- a/kalyptus/kalyptusDataDict.pm +++ b/kalyptus/kalyptusDataDict.pm @@ -2288,9 +2288,6 @@ BEGIN 'TQt::RasterOp' => 'int' , 'TQt::UIEffect' => 'int' , 'TQt::WFlags' => 'int' , -'QtMultiLineEdit*' => 'qt_QtMultiLineEdit*', -'QtMultiLineEditRow*' => 'qt_QtMultiLineEditRow*', -'QtTableView*' => 'qt_QtTableView*', 'QwAbsSpriteFieldView*' => 'qt_QwAbsSpriteFieldView*' , 'QwClusterizer*' => 'qt_QwClusterizer*' , 'QwEllipse*' => 'qt_QwEllipse*', diff --git a/qtsharp/src/api/qt.xml b/qtsharp/src/api/qt.xml index 711738bc..77f8199f 100644 --- a/qtsharp/src/api/qt.xml +++ b/qtsharp/src/api/qt.xml @@ -22872,270 +22872,5 @@ value="AlignLeft|AlignRight|AlignHCenter|AlignJustify"/> <qitem name="Contains" value="8"/> <qitem name="ExactMatch" value="16"/> </qenum> -</qtype> <qtype name="QtMultiLineEdit" access="public"> - <qancestor name="QtTableView"/> - <qenum name="EchoMode" access="public"> - <qitem name="Normal" value="0"/> - <qitem name="NoEcho" value="1"/> - <qitem name="Password" value="2"/> - </qenum> - <qenum name="WordWrap" access="public"> - <qitem name="NoWrap" value="0"/> - <qitem name="WidgetWidth" value="1"/> - <qitem name="FixedPixelWidth" value="2"/> - <qitem name="FixedColumnWidth" value="3"/> - </qenum> - <qenum name="WrapPolicy" access="public"> - <qitem name="AtWhiteSpace" value="0"/> - <qitem name="Anywhere" value="1"/> - </qenum> - <qctor name="QtMultiLineEdit" access="public" id="0"> - <qparam type="TQWidget*" name="parent" default="0"/> - <qparam type="char*" name="name" default="0"/> - </qctor> - <qdctor name="QtMultiLineEdit" access="public"/> - <qmethod name="textLine" access="public" return="TQString" id="0"> - <qparam type="int" name="line"/> - </qmethod> - <qmethod name="numLines" access="public" return="int" id="0"/> - <qmethod name="sizeHint" access="public" return="TQSize" id="0"/> - <qmethod name="minimumSizeHint" access="public" return="TQSize" id="0"/> - <qmethod name="sizePolicy" access="public" return="TQSizePolicy" id="0"/> - <qmethod name="setFont" access="public" return="void" id="0"> - <qparam type="TQFontamp" name="font"/> - </qmethod> - <qmethod name="insertLine" access="public" return="void" id="0"> - <qparam type="TQStringamp" name="s"/> - <qparam type="int" name="line" default="-1"/> - </qmethod> - <qmethod name="insertAt" access="public" return="void" id="0"> - <qparam type="TQStringamp" name="s"/> - <qparam type="int" name="line"/> - <qparam type="int" name="col"/> - <qparam type="bool" name="mark" default="FALSE"/> - </qmethod> - <qmethod name="removeLine" access="public" return="void" id="0"> - <qparam type="int" name="line"/> - </qmethod> - <qmethod name="cursorPosition" access="public" return="void" id="0"> - <qparam type="int*" name="line"/> - <qparam type="int*" name="col"/> - </qmethod> - <qmethod name="setCursorPosition" access="public" return="void" id="0"> - <qparam type="int" name="line"/> - <qparam type="int" name="col"/> - <qparam type="bool" name="mark" default="FALSE"/> - </qmethod> - <qmethod name="getCursorPosition" access="public" return="void" id="0"> - <qparam type="int*" name="line"/> - <qparam type="int*" name="col"/> - </qmethod> - <qmethod name="atBeginning" access="public" return="bool" id="0"/> - <qmethod name="atEnd" access="public" return="bool" id="0"/> - <qmethod name="setFixedVisibleLines" access="public" return="void" id="0"> - <qparam type="int" name="lines"/> - </qmethod> - <qmethod name="maxLineWidth" access="public" return="int" id="0"/> - <qmethod name="setAlignment" access="public" return="void" id="0"> - <qparam type="int" name="flags"/> - </qmethod> - <qmethod name="alignment" access="public" return="int" id="0"/> - <qmethod name="setValidator" access="public" return="void" id="0"> - <qparam type="TQValidator*" name="arg1"/> - </qmethod> - <qmethod name="validator" access="public" return="TQValidator*" id="0"/> - <qmethod name="setEdited" access="public" return="void" id="0"> - <qparam type="bool" name="arg1"/> - </qmethod> - <qmethod name="edited" access="public" return="bool" id="0"/> - <qmethod name="cursorWordForward" access="public" return="void" id="0"> - <qparam type="bool" name="mark"/> - </qmethod> - <qmethod name="cursorWordBackward" access="public" return="void" id="0"> - <qparam type="bool" name="mark"/> - </qmethod> - <qmethod name="setEchoMode" access="public" return="void" id="0"> - <qparam type="EchoMode" name="arg1"/> - </qmethod> - <qmethod name="echoMode" access="public" return="EchoMode" id="0"/> - <qmethod name="setMaxLength" access="public" return="void" id="0"> - <qparam type="int" name="arg1"/> - </qmethod> - <qmethod name="maxLength" access="public" return="int" id="0"/> - <qmethod name="setMaxLineLength" access="public" return="void" id="0"> - <qparam type="int" name="arg1"/> - </qmethod> - <qmethod name="maxLineLength" access="public" return="int" id="0"/> - <qmethod name="setMaxLines" access="public" return="void" id="0"> - <qparam type="int" name="arg1"/> - </qmethod> - <qmethod name="maxLines" access="public" return="int" id="0"/> - <qmethod name="setHMargin" access="public" return="void" id="0"> - <qparam type="int" name="arg1"/> - </qmethod> - <qmethod name="hMargin" access="public" return="int" id="0"/> - <qmethod name="setSelection" access="public" return="void" id="0"> - <qparam type="int" name="row_from"/> - <qparam type="int" name="col_from"/> - <qparam type="int" name="row_to"/> - <qparam type="int" name="col_t"/> - </qmethod> - <qmethod name="setWordWrap" access="public" return="void" id="0"> - <qparam type="WordWrap" name="mode"/> - </qmethod> - <qmethod name="wordWrap" access="public" return="WordWrap" id="0"/> - <qmethod name="setWrapColumnOrWidth" access="public" return="void" id="0"> - <qparam type="int" name="arg1"/> - </qmethod> - <qmethod name="wrapColumnOrWidth" access="public" return="int" id="0"/> - <qmethod name="setWrapPolicy" access="public" return="void" id="0"> - <qparam type="WrapPolicy" name="policy"/> - </qmethod> - <qmethod name="wrapPolicy" access="public" return="WrapPolicy" id="0"/> - <qmethod name="autoUpdate" access="public" return="bool" id="0"/> - <qmethod name="setAutoUpdate" access="public" return="void" id="0"> - <qparam type="bool" name="arg1"/> - </qmethod> - <qmethod name="setUndoEnabled" access="public" return="void" id="0"> - <qparam type="bool" name="arg1"/> - </qmethod> - <qmethod name="isUndoEnabled" access="public" return="bool" id="0"/> - <qmethod name="setUndoDepth" access="public" return="void" id="0"> - <qparam type="int" name="arg1"/> - </qmethod> - <qmethod name="undoDepth" access="public" return="int" id="0"/> - <qmethod name="isReadOnly" access="public" return="bool" id="0"/> - <qmethod name="isOverwriteMode" access="public" return="bool" id="0"/> - <qmethod name="text" access="public" return="TQString" id="0"/> - <qmethod name="length" access="public" return="int" id="0"/> - <qmethod name="setText" access="public" return="void" id="0"> - <qparam type="TQStringamp" name="arg1"/> - </qmethod> - <qmethod name="setReadOnly" access="public" return="void" id="0"> - <qparam type="bool" name="arg1"/> - </qmethod> - <qmethod name="setOverwriteMode" access="public" return="void" id="0"> - <qparam type="bool" name="arg1"/> - </qmethod> - <qmethod name="clear" access="public" return="void" id="0"/> - <qmethod name="append" access="public" return="void" id="0"> - <qparam type="TQStringamp" name="arg1"/> - </qmethod> - <qmethod name="deselect" access="public" return="void" id="0"/> - <qmethod name="selectAll" access="public" return="void" id="0"/> - <qmethod name="paste" access="public" return="void" id="0"/> - <qmethod name="pasteSubType" access="public" return="void" id="0"> - <qparam type="TQCStringamp" name="subtype"/> - </qmethod> - <qmethod name="copyText" access="public" return="void" id="0"/> - <qmethod name="copy" access="public" return="void" id="0"/> - <qmethod name="cut" access="public" return="void" id="0"/> - <qmethod name="insert" access="public" return="void" id="0"> - <qparam type="TQStringamp" name="arg1"/> - </qmethod> - <qmethod name="undo" access="public" return="void" id="0"/> - <qmethod name="redo" access="public" return="void" id="0"/> - <qmethod name="setDefaultTabStop" access="public static" return="void" id="0"> - <qparam type="int" name="ex"/> - </qmethod> - <qmethod name="defaultTabStop" access="public static" return="int" id="0"/> - <qmethod name="protected_paintCell" access="protected" return="void" id="0"> - <qparam type="TQPainter*" name="arg1"/> - <qparam type="int" name="row"/> - <qparam type="int" name="col"/> - </qmethod> - <qmethod name="protected_event" access="protected" return="bool" id="0"> - <qparam type="TQEvent*" name="arg1"/> - </qmethod> - <qmethod name="protected_focusNextPrevChild" access="protected" return="bool" id="0"> - <qparam type="bool" name="arg1"/> - </qmethod> - <qmethod name="protected_hasMarkedText" access="protected" return="bool" id="0"/> - <qmethod name="protected_markedText" access="protected" return="TQString" id="0"/> - <qmethod name="protected_textWidth" access="protected" return="int" id="0"> - <qparam type="int" name="arg1"/> - </qmethod> - <qmethod name="protected_textWidth" access="protected" return="int" id="1"> - <qparam type="TQStringamp" name="arg1"/> - </qmethod> - <qmethod name="protected_cursorPoint" access="protected" return="TQPoint" id="0"/> - <qmethod name="protected_insert" access="protected" return="void" id="1"> - <qparam type="TQStringamp" name="arg1"/> - <qparam type="bool" name="mark"/> - </qmethod> - <qmethod name="protected_newLine" access="protected" return="void" id="0"/> - <qmethod name="protected_killLine" access="protected" return="void" id="0"/> - <qmethod name="protected_pageUp" access="protected" return="void" id="0"> - <qparam type="bool" name="mark" default="FALSE"/> - </qmethod> - <qmethod name="protected_pageDown" access="protected" return="void" id="0"> - <qparam type="bool" name="mark" default="FALSE"/> - </qmethod> - <qmethod name="protected_cursorLeft" access="protected" return="void" id="0"> - <qparam type="bool" name="mark" default="FALSE"/> - <qparam type="bool" name="wrap" default="TRUE"/> - </qmethod> - <qmethod name="protected_cursorRight" access="protected" return="void" id="0"> - <qparam type="bool" name="mark" default="FALSE"/> - <qparam type="bool" name="wrap" default="TRUE"/> - </qmethod> - <qmethod name="protected_cursorUp" access="protected" return="void" id="0"> - <qparam type="bool" name="mark" default="FALSE"/> - </qmethod> - <qmethod name="protected_cursorDown" access="protected" return="void" id="0"> - <qparam type="bool" name="mark" default="FALSE"/> - </qmethod> - <qmethod name="protected_backspace" access="protected" return="void" id="0"/> - <qmethod name="protected_del" access="protected" return="void" id="0"/> - <qmethod name="protected_home" access="protected" return="void" id="0"> - <qparam type="bool" name="mark" default="FALSE"/> - </qmethod> - <qmethod name="protected_end" access="protected" return="void" id="0"> - <qparam type="bool" name="mark" default="FALSE"/> - </qmethod> - <qmethod name="protected_getMarkedRegion" access="protected" return="bool" id="0"> - <qparam type="int*" name="line1"/> - <qparam type="int*" name="col1"/> - <qparam type="int*" name="line2"/> - <qparam type="int*" name="col2"/> - </qmethod> - <qmethod name="protected_lineLength" access="protected" return="int" id="0"> - <qparam type="int" name="row"/> - </qmethod> - <qmethod name="protected_getString" access="protected" return="TQString*" id="0"> - <qparam type="int" name="row"/> - </qmethod> - <qmethod name="protected_isEndOfParagraph" access="protected" return="bool" id="0"> - <qparam type="int" name="row"/> - </qmethod> - <qmethod name="protected_stringShown" access="protected" return="TQString" id="0"> - <qparam type="int" name="row"/> - </qmethod> - <qmethod name="protected_insertChar" access="protected" return="void" id="0"> - <qparam type="TQChar" name="arg1"/> - </qmethod> -</qtype> <qtype name="QtTableView" access="public"> - <qancestor name="TQFrame"/> - <qmethod name="setBackgroundColor" access="public" return="void" id="0"> - <qparam type="TQColoramp" name="arg1"/> - </qmethod> - <qmethod name="setPalette" access="public" return="void" id="0"> - <qparam type="TQPaletteamp" name="arg1"/> - </qmethod> - <qmethod name="show" access="public" return="void" id="0"/> - <qmethod name="repaint" access="public" return="void" id="0"> - <qparam type="bool" name="erase" default="TRUE"/> - </qmethod> - <qmethod name="repaint" access="public" return="void" id="1"> - <qparam type="int" name="x"/> - <qparam type="int" name="y"/> - <qparam type="int" name="w"/> - <qparam type="int" name="h"/> - <qparam type="bool" name="erase" default="TRUE"/> - </qmethod> - <qmethod name="repaint" access="public" return="void" id="2"> - <qparam type="TQRectamp" name="arg1"/> - <qparam type="bool" name="erase" default="TRUE"/> - </qmethod> </qtype> </qtypes> diff --git a/qtsharp/src/bindings/qt.build b/qtsharp/src/bindings/qt.build index 8f7c3d0c..ec782f49 100644 --- a/qtsharp/src/bindings/qt.build +++ b/qtsharp/src/bindings/qt.build @@ -461,9 +461,7 @@ <file name="TQXmlSimpleReader.cs" /> <file name="TQXtApplication.cs" /> <file name="TQXtWidget.cs" /> - <file name="QtMultiLineEdit.cs" /> <file name="QtSupport.cs" /> - <file name="QtTableView.cs" /> <file name="RasterOp.cs" /> <file name="StringComparisonMode.cs" /> <file name="TextFlags.cs" /> diff --git a/qtsharp/src/generator/TQTypeMap.cs b/qtsharp/src/generator/TQTypeMap.cs index 8318cca4..b2f71dac 100644 --- a/qtsharp/src/generator/TQTypeMap.cs +++ b/qtsharp/src/generator/TQTypeMap.cs @@ -323,7 +323,6 @@ namespace QtCSharp { //mastermap.Add ("ResizeMode", "TQListView.ResizeMode"); //mastermap.Add ("ResizeMode", "TQListView.ResizeMode"); //mastermap.Add ("EchoMode", "TQLineEdit.EchoMode"); - //mastermap.Add ("EchoMode", "QtMultiLineEdit.EchoMode"); //mastermap.Add ("ColorMode", "TQApplication.ColorMode"); //mastermap.Add ("ColorMode", "TQPrinter.ColorMode"); //mastermap.Add ("ColorMode", "TQPixmap.ColorMode"); @@ -345,9 +344,7 @@ namespace QtCSharp { //mastermap.Add ("Orientation", "TQPrinter.Orientation"); //mastermap.Add ("Orientation", "Qt.Orientation"); //mastermap.Add ("WrapPolicy", "TQTextEdit.WrapPolicy"); - //mastermap.Add ("WrapPolicy", "QtMultiLineEdit.WrapPolicy"); //mastermap.Add ("WordWrap", "TQTextEdit.WordWrap"); - //mastermap.Add ("WordWrap", "QtMultiLineEdit.WordWrap"); // These are here in case we need to override the mastermap pinvoketypes = new Hashtable (); diff --git a/smoke/tde/generate.pl.in b/smoke/tde/generate.pl.in index 2bf8112c..511d3d61 100644 --- a/smoke/tde/generate.pl.in +++ b/smoke/tde/generate.pl.in @@ -58,8 +58,6 @@ my %excludes = ( 'ntqgl.h' => 1, # OpenGL 'ntqglcolormap.h' => 1, # OpenGL 'ntqnp.h' => 1, # NSPlugin - 'ntqttableview.h' => 1, # Not in Qt anymore... - 'ntqtmultilineedit.h' => 1, # Not in Qt anymore... 'ntqwidgetfactory.h' => 1, # Just an interface 'ntqsharedmemory.h' => 1, # "not part of the Qt API" they say 'ntqwindowsstyle.h' => 1, # Qt windowsstyle, plugin diff --git a/smoke/tde/header_list b/smoke/tde/header_list index 41e39c91..1581426a 100644 --- a/smoke/tde/header_list +++ b/smoke/tde/header_list @@ -281,7 +281,6 @@ ntqt.h ntqthread.h ntqtimer.h ntqtl.h -ntqtmultilineedit.h ntqtoolbar.h ntqtoolbutton.h ntqtoolbox.h @@ -289,7 +288,6 @@ ntqtooltip.h ntqtranslator.h ntqtsciicodec.h ntqtstream.h -ntqttableview.h ntqurl.h ntqurlinfo.h ntqurloperator.h diff --git a/smoke/tde/qtguess.pl.in b/smoke/tde/qtguess.pl.in index 5c5e26bf..126bdce3 100644 --- a/smoke/tde/qtguess.pl.in +++ b/smoke/tde/qtguess.pl.in @@ -394,16 +394,6 @@ our %tests = ( "TQT_NO_PROGRESSDIALOG" => ["qprogressdialog.h", "TQProgressDialog foo;", 13], "TQT_NO_PUSHBUTTON" => ["qpushbutton.h", "TQPushButton foo( (TQWidget *) NULL );", 12], "TQT_NO_PROPERTIES" => ["qmetaobject.h", "TQMetaProperty foo;", 0], -# "TQT_NO_QTMULTILINEEDIT" => ["qtmultilineedit.h", "QtMultiLineEdit foo;", 15], -# "TQT_NO_QTTABLEVIEW" => ["qttableview.h", "TQFoo foo;", 16, q£ -# class TQFoo: public QtTableView -# { -# public: -# TQFoo() {}; -# ~TQFoo() {}; -# void paintCell( TQPainter *, int, int) {}; -# }; -# £], "TQT_NO_QUUID_STRING" => ["quuid.h", "TQUuid foo( TQString::null );", 8], "TQT_NO_RANGECONTROL" => ["qrangecontrol.h", "TQRangeControl foo;", 10], "TQT_NO_REGEXP" => ["qregexp.h", "TQRegExp foo;", 5], diff --git a/smoke/tqt/generate.pl.in b/smoke/tqt/generate.pl.in index 50c3d78f..686c6a27 100644 --- a/smoke/tqt/generate.pl.in +++ b/smoke/tqt/generate.pl.in @@ -64,8 +64,6 @@ my %excludes = ( 'ntqgl.h' => 1, # OpenGL 'ntqglcolormap.h' => 1, # OpenGL 'ntqnp.h' => 1, # NSPlugin - 'ntqttableview.h' => 1, # Not in Qt anymore... - 'ntqtmultilineedit.h' => 1, # Not in Qt anymore... 'ntqwidgetfactory.h' => 1, # Just an interface 'ntqsharedmemory.h' => 1, # "not part of the Qt API" they say 'ntqwindowsstyle.h' => 1, # Qt windowsstyle, plugin diff --git a/smoke/tqt/header_list b/smoke/tqt/header_list index 41e39c91..1581426a 100644 --- a/smoke/tqt/header_list +++ b/smoke/tqt/header_list @@ -281,7 +281,6 @@ ntqt.h ntqthread.h ntqtimer.h ntqtl.h -ntqtmultilineedit.h ntqtoolbar.h ntqtoolbutton.h ntqtoolbox.h @@ -289,7 +288,6 @@ ntqtooltip.h ntqtranslator.h ntqtsciicodec.h ntqtstream.h -ntqttableview.h ntqurl.h ntqurlinfo.h ntqurloperator.h diff --git a/smoke/tqt/qtguess.pl.in b/smoke/tqt/qtguess.pl.in index 5c5e26bf..126bdce3 100644 --- a/smoke/tqt/qtguess.pl.in +++ b/smoke/tqt/qtguess.pl.in @@ -394,16 +394,6 @@ our %tests = ( "TQT_NO_PROGRESSDIALOG" => ["qprogressdialog.h", "TQProgressDialog foo;", 13], "TQT_NO_PUSHBUTTON" => ["qpushbutton.h", "TQPushButton foo( (TQWidget *) NULL );", 12], "TQT_NO_PROPERTIES" => ["qmetaobject.h", "TQMetaProperty foo;", 0], -# "TQT_NO_QTMULTILINEEDIT" => ["qtmultilineedit.h", "QtMultiLineEdit foo;", 15], -# "TQT_NO_QTTABLEVIEW" => ["qttableview.h", "TQFoo foo;", 16, q£ -# class TQFoo: public QtTableView -# { -# public: -# TQFoo() {}; -# ~TQFoo() {}; -# void paintCell( TQPainter *, int, int) {}; -# }; -# £], "TQT_NO_QUUID_STRING" => ["quuid.h", "TQUuid foo( TQString::null );", 8], "TQT_NO_RANGECONTROL" => ["qrangecontrol.h", "TQRangeControl foo;", 10], "TQT_NO_REGEXP" => ["qregexp.h", "TQRegExp foo;", 5], |