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"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 @@
-
-
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],