diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm
index 6f3e7535..55188a9d 100644
--- a/kalyptus/kalyptusDataDict.pm
+++ b/kalyptus/kalyptusDataDict.pm
@@ -1866,10 +1866,6 @@ BEGIN
'TQMultiLineEdit*' => 'qt_QMultiLineEdit*',
'TQMultiLineEditRow*' => 'qt_QMultiLineEditRow*',
'TQMutex*' => 'qt_QMutex*',
-'TQNPInstance*' => 'qt_QNPInstance*',
-'TQNPStream*' => 'qt_QNPStream*',
-'TQNPWidget*' => 'qt_QNPWidget*',
-'TQNPlugin*' => 'qt_QNPlugin*',
'TQNetworkOperation*' => 'qt_QNetworkOperation*' ,
'TQNetworkProtocol*' => 'qt_QNetworkProtocol*' ,
'TQNetworkProtocol::Operation' => 'int' ,
@@ -2257,8 +2253,6 @@ BEGIN
'TQXmlParseException*' => 'qt_QXmlParseException*',
'TQXmlReader*' => 'qt_QXmlReader*',
'TQXmlSimpleReader*' => 'qt_QXmlSimpleReader*' ,
-'TQXtApplication*' => 'qt_QXtApplication*',
-'TQXtWidget*' => 'qt_QXtWidget*',
'TQ_INT16&' => 'short',
'TQ_INT16' => 'short',
'TQ_INT32&' => 'int',
diff --git a/kjsembed/jsfactory.cpp b/kjsembed/jsfactory.cpp
index 3443a1c4..f7c148fa 100644
--- a/kjsembed/jsfactory.cpp
+++ b/kjsembed/jsfactory.cpp
@@ -1011,13 +1011,8 @@ namespace KJSEmbed {
"TQMacStyle",
"TQMenuBar",
"TQMessageBox",
- "TQMotif",
- "TQMotifDialog",
"TQMotifPlusStyle",
"TQMotifStyle",
- "TQMotifWidget",
- "TQNPInstance",
- "TQNPWidget",
"TQNetworkOperation",
"TQNetworkProtocol",
"TQObjectCleanupHandler",
@@ -1058,7 +1053,6 @@ namespace KJSEmbed {
"TQWindowsStyle",
"TQWindowsXPStyle",
"TQWorkspace",
- "TQXtWidget",
0
};
diff --git a/kjsembed/tools/coverage/allqobjects.txt b/kjsembed/tools/coverage/allqobjects.txt
index 107d7a34..500dc9d4 100644
--- a/kjsembed/tools/coverage/allqobjects.txt
+++ b/kjsembed/tools/coverage/allqobjects.txt
@@ -70,14 +70,9 @@ TQMacStyle
TQMainWindow
TQMenuBar
TQMessageBox
-TQMotif
-TQMotifDialog
TQMotifPlusStyle
TQMotifStyle
-TQMotifWidget
TQMultiLineEdit
-TQNPInstance
-TQNPWidget
TQNetworkOperation
TQNetworkProtocol
TQObject
@@ -142,4 +137,3 @@ TQWindowsStyle
TQWindowsXPStyle
TQWizard
TQWorkspace
-TQXtWidget
diff --git a/kjsembed/tools/coverage/unsupported.txt b/kjsembed/tools/coverage/unsupported.txt
index 055ca045..60ec689d 100644
--- a/kjsembed/tools/coverage/unsupported.txt
+++ b/kjsembed/tools/coverage/unsupported.txt
@@ -45,13 +45,8 @@ TQLocalFs MISSING
TQMacStyle MISSING
TQMenuBar MISSING
TQMessageBox MISSING
-TQMotif MISSING
-TQMotifDialog MISSING
TQMotifPlusStyle MISSING
TQMotifStyle MISSING
-TQMotifWidget MISSING
-TQNPInstance MISSING
-TQNPWidget MISSING
TQNetworkOperation MISSING
TQNetworkProtocol MISSING
TQObjectCleanupHandler MISSING
@@ -92,4 +87,3 @@ TQWSKeyboardHandler MISSING
TQWindowsStyle MISSING
TQWindowsXPStyle MISSING
TQWorkspace MISSING
-TQXtWidget MISSING
diff --git a/qtsharp/TODO b/qtsharp/TODO
index 0571785e..ec31bf81 100644
--- a/qtsharp/TODO
+++ b/qtsharp/TODO
@@ -38,7 +38,7 @@ o TQPROPERTYs
TQTimeEdit, TQDateTimeEdit, TQHebrewCodec, TQJisCodec, TQTsciiCodec, TQPtr*,
TQHeader (needed?), TQLibrary (hehe), TQNetwork*, TQInt*, TQNS*, TQStr*,
TQText*Stream, TQTextCodec*, TQText[En|De]coder, TQThread, TQWaitCondition,
-TQTimer, TQValidator, TQValue*, TQWidgetStack, TQXml*, TQXt*
+TQTimer, TQValidator, TQValue*, TQWidgetStack, TQXml*
** MI Classes (very incomplete list)
diff --git a/qtsharp/src/api/qt.xml b/qtsharp/src/api/qt.xml
index 9cf58705..27601146 100644
--- a/qtsharp/src/api/qt.xml
+++ b/qtsharp/src/api/qt.xml
@@ -11750,154 +11750,6 @@ id="0">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -22242,47 +22094,6 @@ id="0"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/qtsharp/src/bindings/qt.build b/qtsharp/src/bindings/qt.build
index ec782f49..6bbf8967 100644
--- a/qtsharp/src/bindings/qt.build
+++ b/qtsharp/src/bindings/qt.build
@@ -273,10 +273,6 @@
-
-
-
-
@@ -459,8 +455,6 @@
-
-
diff --git a/qtsharp/src/generator/TQTypeMap.cs b/qtsharp/src/generator/TQTypeMap.cs
index 3acda3c7..378c0d10 100644
--- a/qtsharp/src/generator/TQTypeMap.cs
+++ b/qtsharp/src/generator/TQTypeMap.cs
@@ -193,8 +193,6 @@ namespace QtCSharp {
mastermap.Add ("Access", "TQMetaData.Access");
mastermap.Add ("Flags", "TQMetaProperty.Flags");
mastermap.Add ("Status", "TQMovie.Status");
- mastermap.Add ("InstanceMode", "TQNPInstance.InstanceMode");
- mastermap.Add ("StreamMode", "TQNPInstance.StreamMode");
mastermap.Add ("Operation", "TQNetworkProtocol.Operation");
mastermap.Add ("ConnectionState", "TQNetworkProtocol.ConnectionState");
mastermap.Add ("DisposalMethod", "TQPNGImageWriter.DisposalMethod");
@@ -305,7 +303,6 @@ namespace QtCSharp {
//mastermap.Add ("Direction", "TQChar.Direction");
//mastermap.Add ("Reason", "TQContextMenuEvent.Reason");
//mastermap.Add ("Reason", "TQFocusEvent.Reason");
- //mastermap.Add ("Reason", "TQNPInstance.Reason");
//mastermap.Add ("Mode", "TQFileDialog.Mode");
//mastermap.Add ("Mode", "TQIconSet.Mode");
//mastermap.Add ("Mode", "TQLCDNumber.Mode");
diff --git a/smoke/tde/generate.pl.in b/smoke/tde/generate.pl.in
index e9ecf05c..9c90bb2d 100644
--- a/smoke/tde/generate.pl.in
+++ b/smoke/tde/generate.pl.in
@@ -49,15 +49,9 @@ chdir "$kalyptusdir" or die "Couldn't go to $kalyptusdir (edit script to change
my %excludes = (
'tqaccessible.h' => 1, # Accessibility support is not compiled by defaut
'tqassistantclient.h' => 1, # Not part of Qt (introduced in Qt-3.1)
- 'tqmotif.h' => 1, #
- 'tqmotifwidget.h' => 1, # Motif extension (introduced in Qt-3.1)
- 'tqmotifdialog.h' => 1, #
- 'tqxt.h' => 1, # Xt
- 'tqxtwidget.h' => 1, # Xt
'tqdns.h' => 1, # internal
'tqgl.h' => 1, # OpenGL
'tqglcolormap.h' => 1, # OpenGL
- 'tqnp.h' => 1, # NSPlugin
'tqwidgetfactory.h' => 1, # Just an interface
'tqsharedmemory.h' => 1, # "not part of the Qt API" they say
'tqwindowsstyle.h' => 1, # Qt windowsstyle, plugin
diff --git a/smoke/tde/header_list b/smoke/tde/header_list
index 7bee0845..0fa15d71 100644
--- a/smoke/tde/header_list
+++ b/smoke/tde/header_list
@@ -121,11 +121,8 @@ tqmessagebox.h
tqmetaobject.h
tqmime.h
ntqmodules.h
-tqmotifdialog.h
-tqmotif.h
tqmotifplusstyle.h
tqmotifstyle.h
-tqmotifwidget.h
tqmovie.h
tqmultilineedit.h
tqmutex.h
diff --git a/smoke/tqt/generate.pl.in b/smoke/tqt/generate.pl.in
index b8a3e530..546f94bb 100644
--- a/smoke/tqt/generate.pl.in
+++ b/smoke/tqt/generate.pl.in
@@ -55,15 +55,9 @@ chdir "$kalyptusdir" or die "Couldn't go to $kalyptusdir (edit script to change
my %excludes = (
'tqaccessible.h' => 1, # Accessibility support is not compiled by defaut
'tqassistantclient.h' => 1, # Not part of Qt (introduced in Qt-3.1)
- 'tqmotif.h' => 1, #
- 'tqmotifwidget.h' => 1, # Motif extension (introduced in Qt-3.1)
- 'tqmotifdialog.h' => 1, #
- 'tqxt.h' => 1, # Xt
- 'tqxtwidget.h' => 1, # Xt
'tqdns.h' => 1, # internal
'tqgl.h' => 1, # OpenGL
'tqglcolormap.h' => 1, # OpenGL
- 'tqnp.h' => 1, # NSPlugin
'tqwidgetfactory.h' => 1, # Just an interface
'tqsharedmemory.h' => 1, # "not part of the Qt API" they say
'tqwindowsstyle.h' => 1, # Qt windowsstyle, plugin
diff --git a/smoke/tqt/header_list b/smoke/tqt/header_list
index 7bee0845..0fa15d71 100644
--- a/smoke/tqt/header_list
+++ b/smoke/tqt/header_list
@@ -121,11 +121,8 @@ tqmessagebox.h
tqmetaobject.h
tqmime.h
ntqmodules.h
-tqmotifdialog.h
-tqmotif.h
tqmotifplusstyle.h
tqmotifstyle.h
-tqmotifwidget.h
tqmovie.h
tqmultilineedit.h
tqmutex.h