Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 996381f5af9d39777caa6c48bac35d8ff92ad99e.

106 files changed, 121 insertions, 121 deletions

diff --git a/dcopjava/dcopidl2java/main.cpp b/dcopjava/dcopidl2java/main.cpp
index b13a92dc..913b7e7a 100644
--- a/dcopjava/dcopidl2java/main.cpp
+++ b/dcopjava/dcopidl2java/main.cpp
@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************************************************/
 #include <tqdom.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstring.h>
 
 #include <string.h>
diff --git a/dcopjava/dcopidl2java/skel.cpp b/dcopjava/dcopidl2java/skel.cpp
index 2c6293d6..4b4a3fd0 100644
--- a/dcopjava/dcopidl2java/skel.cpp
+++ b/dcopjava/dcopidl2java/skel.cpp
@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************************************************/
 #include <tqdom.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstring.h>
 #include <tqvaluelist.h>
 #include <tqstringlist.h>
diff --git a/dcopjava/dcopidl2java/stubimpl.cpp b/dcopjava/dcopidl2java/stubimpl.cpp
index 9edb0273..55e474c9 100644
--- a/dcopjava/dcopidl2java/stubimpl.cpp
+++ b/dcopjava/dcopidl2java/stubimpl.cpp
@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************************************************/
 #include <tqdom.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstring.h>
 #include <tqregexp.h>
 
diff --git a/dcoppython/shell/pcop.cpp b/dcoppython/shell/pcop.cpp
index 0e81bb26..88e26cc1 100644
--- a/dcoppython/shell/pcop.cpp
+++ b/dcoppython/shell/pcop.cpp
@@ -17,7 +17,7 @@
 #include <tqcstring.h>
 #include <tqdatastream.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstring.h>
 
 #include <dcopclient.h>
diff --git a/kdejava/koala/kdejava/KApplication.cpp b/kdejava/koala/kdejava/KApplication.cpp
index 27834a44..ff735cf2 100644
--- a/kdejava/koala/kdejava/KApplication.cpp
+++ b/kdejava/koala/kdejava/KApplication.cpp
@@ -5,7 +5,7 @@
 #include <tqsessionmanager.h>
 #include <kinstance.h>
 #include <kurl.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqnamespace.h>
 #include <tqcstring.h>
 #include <tqpixmap.h>
diff --git a/kdejava/koala/kdejava/KDE.cpp b/kdejava/koala/kdejava/KDE.cpp
index 3486e6d5..08c15047 100644
--- a/kdejava/koala/kdejava/KDE.cpp
+++ b/kdejava/koala/kdejava/KDE.cpp
@@ -29,7 +29,7 @@
 #include <kiconloader.h>
 #include <kprinter.h>
 #include <kurl.h>
-#include <palette.h>
+#include <tqpalette.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KIconViewItem.cpp b/kdejava/koala/kdejava/KIconViewItem.cpp
index 667befae..135e6432 100644
--- a/kdejava/koala/kdejava/KIconViewItem.cpp
+++ b/kdejava/koala/kdejava/KIconViewItem.cpp
@@ -4,7 +4,7 @@
 #include <tqsize.h>
 #include <tqpixmap.h>
 #include <tqstring.h>
-#include <palette.h>
+#include <tqpalette.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KListViewItem.cpp b/kdejava/koala/kdejava/KListViewItem.cpp
index a7945a55..7ee9d8bd 100644
--- a/kdejava/koala/kdejava/KListViewItem.cpp
+++ b/kdejava/koala/kdejava/KListViewItem.cpp
@@ -2,7 +2,7 @@
 #include <tqstring.h>
 #include <klistview.h>
 #include <tqcolor.h>
-#include <palette.h>
+#include <tqpalette.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KTextEdit.cpp b/kdejava/koala/kdejava/KTextEdit.cpp
index 10174ef1..ac2cbac2 100644
--- a/kdejava/koala/kdejava/KTextEdit.cpp
+++ b/kdejava/koala/kdejava/KTextEdit.cpp
@@ -2,7 +2,7 @@
 #include <ktextedit.h>
 #include <tqstring.h>
 #include <tqpoint.h>
-#include <palette.h>
+#include <tqpalette.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KToolBarButton.cpp b/kdejava/koala/kdejava/KToolBarButton.cpp
index b706e83b..88e94af4 100644
--- a/kdejava/koala/kdejava/KToolBarButton.cpp
+++ b/kdejava/koala/kdejava/KToolBarButton.cpp
@@ -4,7 +4,7 @@
 #include <tqiconset.h>
 #include <tqstring.h>
 #include <ktoolbarbutton.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/KURLBar.cpp b/kdejava/koala/kdejava/KURLBar.cpp
index f325ff4a..3af2fca7 100644
--- a/kdejava/koala/kdejava/KURLBar.cpp
+++ b/kdejava/koala/kdejava/KURLBar.cpp
@@ -5,7 +5,7 @@
 #include <tqstring.h>
 #include <tqpoint.h>
 #include <kurl.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kjsembed/bindings/brush_imp.cpp b/kjsembed/bindings/brush_imp.cpp
index 30a4a652..ab2eee3f 100644
--- a/kjsembed/bindings/brush_imp.cpp
+++ b/kjsembed/bindings/brush_imp.cpp
@@ -23,7 +23,7 @@
 #include <kjsembed/jsvalueproxy.h>
 #include <kjsembed/jsbinding.h>
 #include <tqvariant.h>
-#include <brush.h>
+#include <tqbrush.h>
 
 #include "brush_imp.h"
 
diff --git a/kjsembed/bindings/dcop_imp.cpp b/kjsembed/bindings/dcop_imp.cpp
index f5ba0c37..9dfaf4be 100644
--- a/kjsembed/bindings/dcop_imp.cpp
+++ b/kjsembed/bindings/dcop_imp.cpp
@@ -35,7 +35,7 @@
 #include <tqmap.h>
 #include <tqfont.h>
 #include <tqpixmap.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqrect.h>
 #include <tqsize.h>
 #include <tqcolor.h>
diff --git a/kjsembed/builtins/qfile_imp.cpp b/kjsembed/builtins/qfile_imp.cpp
index cb33f9fa..7f3d2b5b 100644
--- a/kjsembed/builtins/qfile_imp.cpp
+++ b/kjsembed/builtins/qfile_imp.cpp
@@ -1,7 +1,7 @@
 
 
 #include <tqcstring.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/builtins/textstream_imp.cpp b/kjsembed/builtins/textstream_imp.cpp
index 7e80bac5..d28bb46c 100644
--- a/kjsembed/builtins/textstream_imp.cpp
+++ b/kjsembed/builtins/textstream_imp.cpp
@@ -17,7 +17,7 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqiodevice.h>
 
 #include <kjsembed/global.h>
diff --git a/kjsembed/customobject_imp.cpp b/kjsembed/customobject_imp.cpp
index 91b68d2b..74f58c2f 100644
--- a/kjsembed/customobject_imp.cpp
+++ b/kjsembed/customobject_imp.cpp
@@ -24,7 +24,7 @@
 #include <tqpopupmenu.h>
 #include <tqdialog.h>
 #include <tqhbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlistbox.h>
 #include <tqlistview.h>
 #include <tqmetaobject.h>
diff --git a/kjsembed/global.h b/kjsembed/global.h
index 426e3cec..e2e4a652 100644
--- a/kjsembed/global.h
+++ b/kjsembed/global.h
@@ -53,7 +53,7 @@ KJSEMBED_EXPORT void RedirectIOToConsole();
 char *itoa(int num, char *str, int radix = 10);
 #endif
 
-#include <textstream.h>
+#include <tqtextstream.h>
 namespace KJSEmbed {
 KJSEMBED_EXPORT TQTextStream *conin();
 KJSEMBED_EXPORT TQTextStream *conout();
diff --git a/kjsembed/jsbuiltin_imp.cpp b/kjsembed/jsbuiltin_imp.cpp
index b87da413..7cf96082 100644
--- a/kjsembed/jsbuiltin_imp.cpp
+++ b/kjsembed/jsbuiltin_imp.cpp
@@ -22,7 +22,7 @@
 
 #include <tqobject.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #ifndef QT_ONLY
 
diff --git a/kjsembed/jsconsolewidget.cpp b/kjsembed/jsconsolewidget.cpp
index bf400cf2..d2978a84 100644
--- a/kjsembed/jsconsolewidget.cpp
+++ b/kjsembed/jsconsolewidget.cpp
@@ -20,7 +20,7 @@
 #include <tqfile.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 
 #include <kdebug.h>
diff --git a/kjsembed/jsfactory.cpp b/kjsembed/jsfactory.cpp
index af8d6589..5e6a22a7 100644
--- a/kjsembed/jsfactory.cpp
+++ b/kjsembed/jsfactory.cpp
@@ -31,14 +31,14 @@
 #include <tqmainwindow.h>
 //#include <tqpainter.h>
 #include <tqprogressdialog.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqtimer.h>
 #include <tqwidget.h>
 #include <tqwidgetfactory.h>
 #include <tqsplitter.h>
 #include <tqscrollview.h>
 #include <tqcanvas.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqsplashscreen.h>
 
 #ifndef QT_ONLY
diff --git a/kjsembed/jsopaqueproxy.cpp b/kjsembed/jsopaqueproxy.cpp
index f1d33823..5abd9558 100644
--- a/kjsembed/jsopaqueproxy.cpp
+++ b/kjsembed/jsopaqueproxy.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <tqevent.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include "global.h"
 
diff --git a/kjsembed/kjsembedpart.cpp b/kjsembed/kjsembedpart.cpp
index 4046968f..b39b8813 100644
--- a/kjsembed/kjsembedpart.cpp
+++ b/kjsembed/kjsembedpart.cpp
@@ -24,7 +24,7 @@
 #include <tqobject.h>
 #include <tqdialog.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqwidget.h>
 #include <tqwidgetfactory.h>
 
diff --git a/kjsembed/plugins/customobject_plugin.cpp b/kjsembed/plugins/customobject_plugin.cpp
index cd22f169..b883ff66 100644
--- a/kjsembed/plugins/customobject_plugin.cpp
+++ b/kjsembed/plugins/customobject_plugin.cpp
@@ -27,7 +27,7 @@
 #include <kjsembed/kjsembedpart.h>
 #include <kjsembed/customobject_imp.h>
 #include <tqvariant.h>
-#include <brush.h>
+#include <tqbrush.h>
 
 #include "customobject_plugin.h"
 
diff --git a/kjsembed/plugins/imagefx_plugin.cpp b/kjsembed/plugins/imagefx_plugin.cpp
index 5ca4a6a4..ef3d0ed0 100644
--- a/kjsembed/plugins/imagefx_plugin.cpp
+++ b/kjsembed/plugins/imagefx_plugin.cpp
@@ -28,7 +28,7 @@
 #include <kjsembed/kjsembedpart.h>
 #include <kjsembed/customobject_imp.h>
 #include <tqvariant.h>
-#include <brush.h>
+#include <tqbrush.h>
 
 #include "imagefx_plugin.h"
 
diff --git a/kjsembed/qtbindings/qcanvas_imp.cpp b/kjsembed/qtbindings/qcanvas_imp.cpp
index 1805cac8..22e8c40b 100644
--- a/kjsembed/qtbindings/qcanvas_imp.cpp
+++ b/kjsembed/qtbindings/qcanvas_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvasellipse_imp.cpp b/kjsembed/qtbindings/qcanvasellipse_imp.cpp
index 981cc129..3f4d53a5 100644
--- a/kjsembed/qtbindings/qcanvasellipse_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasellipse_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvasitem_imp.cpp b/kjsembed/qtbindings/qcanvasitem_imp.cpp
index 85d7add7..68c73667 100644
--- a/kjsembed/qtbindings/qcanvasitem_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasitem_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvasitemlist_imp.cpp b/kjsembed/qtbindings/qcanvasitemlist_imp.cpp
index 6ac69116..f92f0d33 100644
--- a/kjsembed/qtbindings/qcanvasitemlist_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasitemlist_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvasline_imp.cpp b/kjsembed/qtbindings/qcanvasline_imp.cpp
index 528a5d81..907573f0 100644
--- a/kjsembed/qtbindings/qcanvasline_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasline_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvaspixmap_imp.cpp b/kjsembed/qtbindings/qcanvaspixmap_imp.cpp
index a1204908..9fcf2718 100644
--- a/kjsembed/qtbindings/qcanvaspixmap_imp.cpp
+++ b/kjsembed/qtbindings/qcanvaspixmap_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp b/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp
index 77bf2743..8d5a8b79 100644
--- a/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp
+++ b/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvaspolygon_imp.cpp b/kjsembed/qtbindings/qcanvaspolygon_imp.cpp
index d6d5027d..9af85744 100644
--- a/kjsembed/qtbindings/qcanvaspolygon_imp.cpp
+++ b/kjsembed/qtbindings/qcanvaspolygon_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp
index 6e1942f7..4f09509d 100644
--- a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp
+++ b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvasrectangle_imp.cpp b/kjsembed/qtbindings/qcanvasrectangle_imp.cpp
index 13c9ae6a..55f1f14d 100644
--- a/kjsembed/qtbindings/qcanvasrectangle_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasrectangle_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvasspline_imp.cpp b/kjsembed/qtbindings/qcanvasspline_imp.cpp
index 1faae121..7809002c 100644
--- a/kjsembed/qtbindings/qcanvasspline_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasspline_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvassprite_imp.cpp b/kjsembed/qtbindings/qcanvassprite_imp.cpp
index d68aaaa1..98a4a428 100644
--- a/kjsembed/qtbindings/qcanvassprite_imp.cpp
+++ b/kjsembed/qtbindings/qcanvassprite_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvastext_imp.cpp b/kjsembed/qtbindings/qcanvastext_imp.cpp
index 3dec0bfa..d0528647 100644
--- a/kjsembed/qtbindings/qcanvastext_imp.cpp
+++ b/kjsembed/qtbindings/qcanvastext_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvasview_imp.cpp b/kjsembed/qtbindings/qcanvasview_imp.cpp
index 368b7d72..f32faef7 100644
--- a/kjsembed/qtbindings/qcanvasview_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasview_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qchecklistitem_imp.cpp b/kjsembed/qtbindings/qchecklistitem_imp.cpp
index bc2545b7..9aa28e41 100644
--- a/kjsembed/qtbindings/qchecklistitem_imp.cpp
+++ b/kjsembed/qtbindings/qchecklistitem_imp.cpp
@@ -2,7 +2,7 @@
 
 
 #include <tqcstring.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcombobox_imp.cpp b/kjsembed/qtbindings/qcombobox_imp.cpp
index 1adf380a..6ee231b8 100644
--- a/kjsembed/qtbindings/qcombobox_imp.cpp
+++ b/kjsembed/qtbindings/qcombobox_imp.cpp
@@ -2,7 +2,7 @@
 
 
 #include <tqcstring.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qlistview_imp.cpp b/kjsembed/qtbindings/qlistview_imp.cpp
index 6c868d54..2536351c 100644
--- a/kjsembed/qtbindings/qlistview_imp.cpp
+++ b/kjsembed/qtbindings/qlistview_imp.cpp
@@ -2,7 +2,7 @@
 
 
 #include <tqcstring.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 #include <tqiconset.h>
diff --git a/kjsembed/qtbindings/qlistviewitem_imp.cpp b/kjsembed/qtbindings/qlistviewitem_imp.cpp
index 56beef23..f1ed55c2 100644
--- a/kjsembed/qtbindings/qlistviewitem_imp.cpp
+++ b/kjsembed/qtbindings/qlistviewitem_imp.cpp
@@ -2,7 +2,7 @@
 
 
 #include <tqcstring.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qmenudata_imp.cpp b/kjsembed/qtbindings/qmenudata_imp.cpp
index 8fd95887..22b16d3e 100644
--- a/kjsembed/qtbindings/qmenudata_imp.cpp
+++ b/kjsembed/qtbindings/qmenudata_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 #include <tqkeysequence.h>
diff --git a/kjsembed/qtbindings/qmenuitem_imp.cpp b/kjsembed/qtbindings/qmenuitem_imp.cpp
index 0092095b..f65fa910 100644
--- a/kjsembed/qtbindings/qmenuitem_imp.cpp
+++ b/kjsembed/qtbindings/qmenuitem_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qpopupmenu_imp.cpp b/kjsembed/qtbindings/qpopupmenu_imp.cpp
index 7f11cc2c..1c94776a 100644
--- a/kjsembed/qtbindings/qpopupmenu_imp.cpp
+++ b/kjsembed/qtbindings/qpopupmenu_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qt_imp.cpp b/kjsembed/qtbindings/qt_imp.cpp
index cad225fd..0f6bf134 100644
--- a/kjsembed/qtbindings/qt_imp.cpp
+++ b/kjsembed/qtbindings/qt_imp.cpp
@@ -2,7 +2,7 @@
 
 
 #include <tqcstring.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/tools/headers/qcanvas.h b/kjsembed/tools/headers/qcanvas.h
index e57b9d15..bdf46d83 100644
--- a/kjsembed/tools/headers/qcanvas.h
+++ b/kjsembed/tools/headers/qcanvas.h
@@ -42,7 +42,7 @@
 #include "tqscrollview.h"
 #include "tqpixmap.h"
 #include "tqptrlist.h"
-#include "brush.h"
+#include "tqbrush.h"
 #include "tqpen.h"
 #include "tqvaluelist.h"
 #include "tqpointarray.h"
diff --git a/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp b/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp
index f4777554..bc1114bb 100644
--- a/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp
+++ b/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqdom.h>
 #include <tqregexp.h>
 
diff --git a/qtjava/javalib/examples/textedit/example.html b/qtjava/javalib/examples/textedit/example.html
index 8815f9d8..90df139e 100644
--- a/qtjava/javalib/examples/textedit/example.html
+++ b/qtjava/javalib/examples/textedit/example.html
@@ -103,7 +103,7 @@ the other widget (called the TQLabel's "buddy"). Example:
 (the <a href="tqlineedit.html">TQLineEdit</a>) when the user presses <dfn>Alt-P.</dfn> You can also
 use the <a href="#191701">setBuddy</a>() function to accomplish the same.
 <p>
-<p>See also  <a href="tqlineedit.html">TQLineEdit</a>, <a href="textview.html">TQTextView</a>, <a href="tqpixmap.html">TQPixmap</a>, <a href="tqmovie.html">TQMovie</a> and <a href="guibooks.html#fowler">GUI Design Handbook: Label</a>
+<p>See also  <a href="tqlineedit.html">TQLineEdit</a>, <a href="tqtextview.html">TQTextView</a>, <a href="tqpixmap.html">TQPixmap</a>, <a href="tqmovie.html">TQMovie</a> and <a href="guibooks.html#fowler">GUI Design Handbook: Label</a>
 <p>Examples:
  <a href="cursor-cursor-cpp.html#TQLabel">cursor/cursor.cpp</a>
  <a href="layout-layout-cpp.html#TQLabel">layout/layout.cpp</a>
@@ -208,7 +208,7 @@ Enables auto-resizing if <em>enable</em> is TRUE, or disables it if <em>enable</
 <p>When auto-resizing is enabled, the label will resize itself to fit
 the contents whenever the contents change. The top left corner is
 not moved. This is useful for TQLabel widgets that are not managed by
-a <a href="layout.html">TQLayout</a> (e.g. top-level widgets).
+a <a href="tqlayout.html">TQLayout</a> (e.g. top-level widgets).
 <p>Auto-resizing is disabled by default.
 <p>See also  <a href="#75b2a1">autoResize</a>(), <a href="tqwidget.html#ab3108">adjustSize</a>() and <a href="#614dd5">sizeHint</a>().
 <h3 class="fn">void <a name="191701"></a>TQLabel::setBuddy ( <a href="tqwidget.html">TQWidget</a> * buddy ) <code>[virtual]</code></h3>
@@ -294,7 +294,7 @@ the format of <em>text.</em>
 the buddy accelerator key is updated from the new text.
 <p>The label resizes itself if auto-resizing is enabled.
 <p>Note that Qlabel is well suited to display small rich text documents
-only. For large documents, use <a href="textview.html">TQTextView</a> instead. It will flicker
+only. For large documents, use <a href="tqtextview.html">TQTextView</a> instead. It will flicker
 less on resize and can also provide a scrollbar if necessary.
 <p>See also  <a href="#72cf09">text</a>(), <a href="#5de3f9">setTextFormat</a>(), <a href="#191701">setBuddy</a>() and <a href="#1f406e">setAlignment</a>().
 <p>Examples:
diff --git a/qtjava/javalib/qtjava/JavaSlot.h b/qtjava/javalib/qtjava/JavaSlot.h
index d5e16236..47a827f2 100644
--- a/qtjava/javalib/qtjava/JavaSlot.h
+++ b/qtjava/javalib/qtjava/JavaSlot.h
@@ -38,7 +38,7 @@
 #include <tqlibrary.h>
 #include <tqhttp.h>
 #include <tqdir.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 
 class JavaSlotFactory;
 class TQMetaObject;
diff --git a/qtjava/javalib/qtjava/Qt.cpp b/qtjava/javalib/qtjava/Qt.cpp
index b10c8da1..6ee67238 100644
--- a/qtjava/javalib/qtjava/Qt.cpp
+++ b/qtjava/javalib/qtjava/Qt.cpp
@@ -15,17 +15,17 @@
 #include <tqstringlist.h>
 #include <tqdom.h>
 #include <tqpoint.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpaintdevice.h>
 #include <tqpicture.h>
 #include <tqsplitter.h>
 #include <tqsize.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqregion.h>
 #include <tqcursor.h>
 #include <tqwindowdefs.h>
 #include <tqpixmap.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqfont.h>
 #include <tqimage.h>
 #include <tqmainwindow.h>
diff --git a/qtjava/javalib/qtjava/TQApplication.cpp b/qtjava/javalib/qtjava/TQApplication.cpp
index dd9ff61a..85dddeee 100644
--- a/qtjava/javalib/qtjava/TQApplication.cpp
+++ b/qtjava/javalib/qtjava/TQApplication.cpp
@@ -10,7 +10,7 @@
 #include <tqpoint.h>
 #include <tqfontmetrics.h>
 #include <tqcolor.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQBoxLayout.cpp b/qtjava/javalib/qtjava/TQBoxLayout.cpp
index 73744223..ccd4f3ce 100644
--- a/qtjava/javalib/qtjava/TQBoxLayout.cpp
+++ b/qtjava/javalib/qtjava/TQBoxLayout.cpp
@@ -2,7 +2,7 @@
 #include <tqsizepolicy.h>
 #include <tqsize.h>
 #include <tqrect.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQBrush.cpp b/qtjava/javalib/qtjava/TQBrush.cpp
index f18f553b..5afc1645 100644
--- a/qtjava/javalib/qtjava/TQBrush.cpp
+++ b/qtjava/javalib/qtjava/TQBrush.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqpixmap.h>
 #include <tqcolor.h>
 #include <tqnamespace.h>
diff --git a/qtjava/javalib/qtjava/TQCanvasPolygonalItem.cpp b/qtjava/javalib/qtjava/TQCanvasPolygonalItem.cpp
index 76c2d40d..59307c27 100644
--- a/qtjava/javalib/qtjava/TQCanvasPolygonalItem.cpp
+++ b/qtjava/javalib/qtjava/TQCanvasPolygonalItem.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqrect.h>
 #include <tqcanvas.h>
 #include <tqpointarray.h>
diff --git a/qtjava/javalib/qtjava/TQCheckListItem.cpp b/qtjava/javalib/qtjava/TQCheckListItem.cpp
index 1f717240..08f8ec75 100644
--- a/qtjava/javalib/qtjava/TQCheckListItem.cpp
+++ b/qtjava/javalib/qtjava/TQCheckListItem.cpp
@@ -4,7 +4,7 @@
 #include <tqstring.h>
 #include <tqfontmetrics.h>
 #include <tqlistview.h>
-#include <palette.h>
+#include <tqpalette.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQCheckListItem.h>
diff --git a/qtjava/javalib/qtjava/TQCheckTableItem.cpp b/qtjava/javalib/qtjava/TQCheckTableItem.cpp
index 0f85846c..26da3e80 100644
--- a/qtjava/javalib/qtjava/TQCheckTableItem.cpp
+++ b/qtjava/javalib/qtjava/TQCheckTableItem.cpp
@@ -3,7 +3,7 @@
 #include <tqrect.h>
 #include <tqstring.h>
 #include <tqtable.h>
-#include <palette.h>
+#include <tqpalette.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQCheckTableItem.h>
diff --git a/qtjava/javalib/qtjava/TQClipboard.cpp b/qtjava/javalib/qtjava/TQClipboard.cpp
index 4fedcc2c..b390c9ea 100644
--- a/qtjava/javalib/qtjava/TQClipboard.cpp
+++ b/qtjava/javalib/qtjava/TQClipboard.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqpixmap.h>
 #include <tqimage.h>
 #include <tqstring.h>
diff --git a/qtjava/javalib/qtjava/TQColorGroup.cpp b/qtjava/javalib/qtjava/TQColorGroup.cpp
index a26b2a1b..66c9e966 100644
--- a/qtjava/javalib/qtjava/TQColorGroup.cpp
+++ b/qtjava/javalib/qtjava/TQColorGroup.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqcolor.h>
-#include <palette.h>
+#include <tqpalette.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQColorGroup.h>
diff --git a/qtjava/javalib/qtjava/TQComboBox.cpp b/qtjava/javalib/qtjava/TQComboBox.cpp
index a55b4c98..4a0dc900 100644
--- a/qtjava/javalib/qtjava/TQComboBox.cpp
+++ b/qtjava/javalib/qtjava/TQComboBox.cpp
@@ -7,7 +7,7 @@
 #include <tqfont.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <palette.h>
+#include <tqpalette.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQComboBox.h>
diff --git a/qtjava/javalib/qtjava/TQComboTableItem.cpp b/qtjava/javalib/qtjava/TQComboTableItem.cpp
index 7b4761e0..6a0d9280 100644
--- a/qtjava/javalib/qtjava/TQComboTableItem.cpp
+++ b/qtjava/javalib/qtjava/TQComboTableItem.cpp
@@ -4,7 +4,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqtable.h>
-#include <palette.h>
+#include <tqpalette.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQComboTableItem.h>
diff --git a/qtjava/javalib/qtjava/TQCustomMenuItem.cpp b/qtjava/javalib/qtjava/TQCustomMenuItem.cpp
index 60dafe65..9f869f98 100644
--- a/qtjava/javalib/qtjava/TQCustomMenuItem.cpp
+++ b/qtjava/javalib/qtjava/TQCustomMenuItem.cpp
@@ -2,7 +2,7 @@
 #include <tqsize.h>
 #include <tqmenudata.h>
 #include <tqfont.h>
-#include <palette.h>
+#include <tqpalette.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQCustomMenuItem.h>
diff --git a/qtjava/javalib/qtjava/TQDataTable.cpp b/qtjava/javalib/qtjava/TQDataTable.cpp
index 40f22812..88068513 100644
--- a/qtjava/javalib/qtjava/TQDataTable.cpp
+++ b/qtjava/javalib/qtjava/TQDataTable.cpp
@@ -8,7 +8,7 @@
 #include <tqsqlindex.h>
 #include <tqvariant.h>
 #include <tqstringlist.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqdatatable.h>
 #include <tqnamespace.h>
 
diff --git a/qtjava/javalib/qtjava/TQDomNode.cpp b/qtjava/javalib/qtjava/TQDomNode.cpp
index dd0d70a1..108d592e 100644
--- a/qtjava/javalib/qtjava/TQDomNode.cpp
+++ b/qtjava/javalib/qtjava/TQDomNode.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqstring.h>
 #include <tqdom.h>
 
diff --git a/qtjava/javalib/qtjava/TQGridLayout.cpp b/qtjava/javalib/qtjava/TQGridLayout.cpp
index eb18a554..74a6d7b3 100644
--- a/qtjava/javalib/qtjava/TQGridLayout.cpp
+++ b/qtjava/javalib/qtjava/TQGridLayout.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqsizepolicy.h>
 #include <tqrect.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqstring.h>
 #include <tqsize.h>
 
diff --git a/qtjava/javalib/qtjava/TQHBoxLayout.cpp b/qtjava/javalib/qtjava/TQHBoxLayout.cpp
index f12983d2..54587967 100644
--- a/qtjava/javalib/qtjava/TQHBoxLayout.cpp
+++ b/qtjava/javalib/qtjava/TQHBoxLayout.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQIconView.cpp b/qtjava/javalib/qtjava/TQIconView.cpp
index 5b22a9b1..6917393b 100644
--- a/qtjava/javalib/qtjava/TQIconView.cpp
+++ b/qtjava/javalib/qtjava/TQIconView.cpp
@@ -4,9 +4,9 @@
 #include <tqiconview.h>
 #include <tqstring.h>
 #include <tqpoint.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqsize.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqfont.h>
 #include <tqnamespace.h>
 
diff --git a/qtjava/javalib/qtjava/TQIconViewItem.cpp b/qtjava/javalib/qtjava/TQIconViewItem.cpp
index 254a6cc3..55b57d3e 100644
--- a/qtjava/javalib/qtjava/TQIconViewItem.cpp
+++ b/qtjava/javalib/qtjava/TQIconViewItem.cpp
@@ -3,7 +3,7 @@
 #include <tqiconview.h>
 #include <tqstring.h>
 #include <tqpoint.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpicture.h>
 #include <tqsize.h>
 #include <tqpixmap.h>
diff --git a/qtjava/javalib/qtjava/TQLayout.cpp b/qtjava/javalib/qtjava/TQLayout.cpp
index 26009f47..5d219272 100644
--- a/qtjava/javalib/qtjava/TQLayout.cpp
+++ b/qtjava/javalib/qtjava/TQLayout.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqsizepolicy.h>
 #include <tqrect.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqstring.h>
 #include <tqsize.h>
 
diff --git a/qtjava/javalib/qtjava/TQLayoutItem.cpp b/qtjava/javalib/qtjava/TQLayoutItem.cpp
index 0ad300f3..499a3ac9 100644
--- a/qtjava/javalib/qtjava/TQLayoutItem.cpp
+++ b/qtjava/javalib/qtjava/TQLayoutItem.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqsizepolicy.h>
 #include <tqrect.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqsize.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQLineEdit.cpp b/qtjava/javalib/qtjava/TQLineEdit.cpp
index 37e4207e..5995598c 100644
--- a/qtjava/javalib/qtjava/TQLineEdit.cpp
+++ b/qtjava/javalib/qtjava/TQLineEdit.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
 #include <tqlineedit.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqsize.h>
 #include <tqfont.h>
 
diff --git a/qtjava/javalib/qtjava/TQListView.cpp b/qtjava/javalib/qtjava/TQListView.cpp
index ccd94c50..9e3e693a 100644
--- a/qtjava/javalib/qtjava/TQListView.cpp
+++ b/qtjava/javalib/qtjava/TQListView.cpp
@@ -4,7 +4,7 @@
 #include <tqstring.h>
 #include <tqpoint.h>
 #include <tqlistview.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqsize.h>
 #include <tqfont.h>
 #include <tqiconset.h>
diff --git a/qtjava/javalib/qtjava/TQListViewItem.cpp b/qtjava/javalib/qtjava/TQListViewItem.cpp
index 956b6222..33857c08 100644
--- a/qtjava/javalib/qtjava/TQListViewItem.cpp
+++ b/qtjava/javalib/qtjava/TQListViewItem.cpp
@@ -4,7 +4,7 @@
 #include <tqpoint.h>
 #include <tqfontmetrics.h>
 #include <tqlistview.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQPainter.cpp b/qtjava/javalib/qtjava/TQPainter.cpp
index 5fe46ed9..d85341ad 100644
--- a/qtjava/javalib/qtjava/TQPainter.cpp
+++ b/qtjava/javalib/qtjava/TQPainter.cpp
@@ -6,7 +6,7 @@
 #include <tqfontmetrics.h>
 #include <tqpainter.h>
 #include <tqpicture.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqregion.h>
 #include <tqfontinfo.h>
 #include <tqpixmap.h>
diff --git a/qtjava/javalib/qtjava/TQPalette.cpp b/qtjava/javalib/qtjava/TQPalette.cpp
index 76e63609..cdb7d59f 100644
--- a/qtjava/javalib/qtjava/TQPalette.cpp
+++ b/qtjava/javalib/qtjava/TQPalette.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <palette.h>
-#include <brush.h>
+#include <tqpalette.h>
+#include <tqbrush.h>
 #include <tqcolor.h>
 #include <tqnamespace.h>
 
diff --git a/qtjava/javalib/qtjava/TQScrollBar.cpp b/qtjava/javalib/qtjava/TQScrollBar.cpp
index 661473d5..c56a3453 100644
--- a/qtjava/javalib/qtjava/TQScrollBar.cpp
+++ b/qtjava/javalib/qtjava/TQScrollBar.cpp
@@ -5,7 +5,7 @@
 #include <tqstring.h>
 #include <tqscrollbar.h>
 #include <tqrangecontrol.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqsize.h>
 #include <tqnamespace.h>
 
diff --git a/qtjava/javalib/qtjava/TQSimpleRichText.cpp b/qtjava/javalib/qtjava/TQSimpleRichText.cpp
index dd8a3ff8..13026fba 100644
--- a/qtjava/javalib/qtjava/TQSimpleRichText.cpp
+++ b/qtjava/javalib/qtjava/TQSimpleRichText.cpp
@@ -2,7 +2,7 @@
 #include <tqrect.h>
 #include <tqstring.h>
 #include <tqpoint.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqregion.h>
 #include <tqsimplerichtext.h>
 #include <tqfont.h>
diff --git a/qtjava/javalib/qtjava/TQSlider.cpp b/qtjava/javalib/qtjava/TQSlider.cpp
index adb5a951..f96f435e 100644
--- a/qtjava/javalib/qtjava/TQSlider.cpp
+++ b/qtjava/javalib/qtjava/TQSlider.cpp
@@ -4,7 +4,7 @@
 #include <tqstyle.h>
 #include <tqstring.h>
 #include <tqrangecontrol.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqsize.h>
 #include <tqslider.h>
 #include <tqnamespace.h>
diff --git a/qtjava/javalib/qtjava/TQSpacerItem.cpp b/qtjava/javalib/qtjava/TQSpacerItem.cpp
index 0203ce48..ec8ab0df 100644
--- a/qtjava/javalib/qtjava/TQSpacerItem.cpp
+++ b/qtjava/javalib/qtjava/TQSpacerItem.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqsizepolicy.h>
 #include <tqrect.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqsize.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQStyle.cpp b/qtjava/javalib/qtjava/TQStyle.cpp
index eac72f49..836fde0d 100644
--- a/qtjava/javalib/qtjava/TQStyle.cpp
+++ b/qtjava/javalib/qtjava/TQStyle.cpp
@@ -3,7 +3,7 @@
 #include <tqstyle.h>
 #include <tqstring.h>
 #include <tqpoint.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqsize.h>
 #include <tqpixmap.h>
 
diff --git a/qtjava/javalib/qtjava/TQStyleSheet.cpp b/qtjava/javalib/qtjava/TQStyleSheet.cpp
index 73435fa3..9afa5cfe 100644
--- a/qtjava/javalib/qtjava/TQStyleSheet.cpp
+++ b/qtjava/javalib/qtjava/TQStyleSheet.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
 #include <tqfont.h>
-#include <stylesheet.h>
+#include <tqstylesheet.h>
 #include <tqmime.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQStyleSheetItem.cpp b/qtjava/javalib/qtjava/TQStyleSheetItem.cpp
index 3dc2b323..95ff6d7f 100644
--- a/qtjava/javalib/qtjava/TQStyleSheetItem.cpp
+++ b/qtjava/javalib/qtjava/TQStyleSheetItem.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <stylesheet.h>
+#include <tqstylesheet.h>
 #include <tqcolor.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQTable.cpp b/qtjava/javalib/qtjava/TQTable.cpp
index fa9aafc9..dc74d32a 100644
--- a/qtjava/javalib/qtjava/TQTable.cpp
+++ b/qtjava/javalib/qtjava/TQTable.cpp
@@ -4,7 +4,7 @@
 #include <tqpoint.h>
 #include <tqstringlist.h>
 #include <tqtable.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqsize.h>
 #include <tqpixmap.h>
 
diff --git a/qtjava/javalib/qtjava/TQTableItem.cpp b/qtjava/javalib/qtjava/TQTableItem.cpp
index be41d333..60dfa7d8 100644
--- a/qtjava/javalib/qtjava/TQTableItem.cpp
+++ b/qtjava/javalib/qtjava/TQTableItem.cpp
@@ -2,7 +2,7 @@
 #include <tqrect.h>
 #include <tqstring.h>
 #include <tqtable.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqsize.h>
 #include <tqpixmap.h>
 
diff --git a/qtjava/javalib/qtjava/TQTextBrowser.cpp b/qtjava/javalib/qtjava/TQTextBrowser.cpp
index b4b2274e..544977a7 100644
--- a/qtjava/javalib/qtjava/TQTextBrowser.cpp
+++ b/qtjava/javalib/qtjava/TQTextBrowser.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <textbrowser.h>
+#include <tqtextbrowser.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQTextBrowser.h>
diff --git a/qtjava/javalib/qtjava/TQTextCodec.cpp b/qtjava/javalib/qtjava/TQTextCodec.cpp
index 5115d759..ae9b384b 100644
--- a/qtjava/javalib/qtjava/TQTextCodec.cpp
+++ b/qtjava/javalib/qtjava/TQTextCodec.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQTextDecoder.cpp b/qtjava/javalib/qtjava/TQTextDecoder.cpp
index db1f73c1..63339de3 100644
--- a/qtjava/javalib/qtjava/TQTextDecoder.cpp
+++ b/qtjava/javalib/qtjava/TQTextDecoder.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQTextDecoder.h>
diff --git a/qtjava/javalib/qtjava/TQTextEdit.cpp b/qtjava/javalib/qtjava/TQTextEdit.cpp
index 7b930a3f..56ae8149 100644
--- a/qtjava/javalib/qtjava/TQTextEdit.cpp
+++ b/qtjava/javalib/qtjava/TQTextEdit.cpp
@@ -2,12 +2,12 @@
 #include <tqrect.h>
 #include <tqstring.h>
 #include <tqpoint.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqsize.h>
-#include <brush.h>
-#include <textedit.h>
+#include <tqbrush.h>
+#include <tqtextedit.h>
 #include <tqfont.h>
-#include <stylesheet.h>
+#include <tqstylesheet.h>
 #include <tqcolor.h>
 #include <tqcstring.h>
 #include <tqnamespace.h>
diff --git a/qtjava/javalib/qtjava/TQTextEncoder.cpp b/qtjava/javalib/qtjava/TQTextEncoder.cpp
index dc66be81..1fe136ce 100644
--- a/qtjava/javalib/qtjava/TQTextEncoder.cpp
+++ b/qtjava/javalib/qtjava/TQTextEncoder.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQTextIStream.cpp b/qtjava/javalib/qtjava/TQTextIStream.cpp
index 315bcfc3..6348ea45 100644
--- a/qtjava/javalib/qtjava/TQTextIStream.cpp
+++ b/qtjava/javalib/qtjava/TQTextIStream.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQTextOStream.cpp b/qtjava/javalib/qtjava/TQTextOStream.cpp
index bd3eb33b..9d1dad60 100644
--- a/qtjava/javalib/qtjava/TQTextOStream.cpp
+++ b/qtjava/javalib/qtjava/TQTextOStream.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQTextStream.cpp b/qtjava/javalib/qtjava/TQTextStream.cpp
index 024261fe..d7ef6b29 100644
--- a/qtjava/javalib/qtjava/TQTextStream.cpp
+++ b/qtjava/javalib/qtjava/TQTextStream.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQTextView.cpp b/qtjava/javalib/qtjava/TQTextView.cpp
index 9acc9915..da6c858a 100644
--- a/qtjava/javalib/qtjava/TQTextView.cpp
+++ b/qtjava/javalib/qtjava/TQTextView.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <textview.h>
+#include <tqtextview.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQTextView.h>
diff --git a/qtjava/javalib/qtjava/TQToolButton.cpp b/qtjava/javalib/qtjava/TQToolButton.cpp
index d2651f79..c4cb619a 100644
--- a/qtjava/javalib/qtjava/TQToolButton.cpp
+++ b/qtjava/javalib/qtjava/TQToolButton.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqtoolbutton.h>
 #include <tqstring.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqsize.h>
 #include <tqiconset.h>
 #include <tqnamespace.h>
diff --git a/qtjava/javalib/qtjava/TQToolTip.cpp b/qtjava/javalib/qtjava/TQToolTip.cpp
index 0956f398..79d95bc3 100644
--- a/qtjava/javalib/qtjava/TQToolTip.cpp
+++ b/qtjava/javalib/qtjava/TQToolTip.cpp
@@ -2,7 +2,7 @@
 #include <tqrect.h>
 #include <tqstring.h>
 #include <tqpoint.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqtooltip.h>
 #include <tqfont.h>
 
diff --git a/qtjava/javalib/qtjava/TQVBoxLayout.cpp b/qtjava/javalib/qtjava/TQVBoxLayout.cpp
index eb98676c..e4172991 100644
--- a/qtjava/javalib/qtjava/TQVBoxLayout.cpp
+++ b/qtjava/javalib/qtjava/TQVBoxLayout.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQVariant.cpp b/qtjava/javalib/qtjava/TQVariant.cpp
index 529c0b3f..4c713dc7 100644
--- a/qtjava/javalib/qtjava/TQVariant.cpp
+++ b/qtjava/javalib/qtjava/TQVariant.cpp
@@ -7,9 +7,9 @@
 #include <tqstring.h>
 #include <tqpoint.h>
 #include <tqstringlist.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqsize.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqregion.h>
 #include <tqcursor.h>
 #include <tqbitmap.h>
diff --git a/qtjava/javalib/qtjava/TQWidget.cpp b/qtjava/javalib/qtjava/TQWidget.cpp
index d51f416a..7b14d140 100644
--- a/qtjava/javalib/qtjava/TQWidget.cpp
+++ b/qtjava/javalib/qtjava/TQWidget.cpp
@@ -5,10 +5,10 @@
 #include <tqstring.h>
 #include <tqpoint.h>
 #include <tqfontmetrics.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqwidget.h>
 #include <tqpaintdevice.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqsize.h>
 #include <tqregion.h>
 #include <tqcursor.h>
diff --git a/qtjava/javalib/qtjava/TQWidgetItem.cpp b/qtjava/javalib/qtjava/TQWidgetItem.cpp
index a760dd50..4dc2fcc4 100644
--- a/qtjava/javalib/qtjava/TQWidgetItem.cpp
+++ b/qtjava/javalib/qtjava/TQWidgetItem.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqsizepolicy.h>
 #include <tqrect.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqsize.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQXmlInputSource.cpp b/qtjava/javalib/qtjava/TQXmlInputSource.cpp
index 5cc7e459..2ed62091 100644
--- a/qtjava/javalib/qtjava/TQXmlInputSource.cpp
+++ b/qtjava/javalib/qtjava/TQXmlInputSource.cpp
@@ -2,7 +2,7 @@
 #include <tqxml.h>
 #include <tqstring.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtruby/rubylib/designer/rbuic/form.cpp b/qtruby/rubylib/designer/rbuic/form.cpp
index a5e0718c..42ec751f 100644
--- a/qtruby/rubylib/designer/rbuic/form.cpp
+++ b/qtruby/rubylib/designer/rbuic/form.cpp
@@ -368,7 +368,7 @@ void Uic::createFormImpl( const TQDomElement &e )
 	for ( i = 1; i < (int) nl.length(); i++ ) { // start at 1, 0 is the toplevel widget
 	    TQString name = getClassName( nl.item(i).toElement() );
 	    if ( name == "Spacer" ) {
-		globalIncludes += "layout.h";
+		globalIncludes += "tqlayout.h";
 		globalIncludes += "tqapplication.h";
 		continue;
 	    }
diff --git a/qtruby/rubylib/designer/rbuic/uic.h b/qtruby/rubylib/designer/rbuic/uic.h
index 74e53c4d..ddfcc1be 100644
--- a/qtruby/rubylib/designer/rbuic/uic.h
+++ b/qtruby/rubylib/designer/rbuic/uic.h
@@ -25,8 +25,8 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqmap.h>
-#include <textstream.h>
-#include <palette.h>
+#include <tqtextstream.h>
+#include <tqpalette.h>
 
 
 class RubyIndent
diff --git a/qtruby/rubylib/designer/rbuic/widgetdatabase.cpp b/qtruby/rubylib/designer/rbuic/widgetdatabase.cpp
index 5d3f487c..f8a0f0fd 100644
--- a/qtruby/rubylib/designer/rbuic/widgetdatabase.cpp
+++ b/qtruby/rubylib/designer/rbuic/widgetdatabase.cpp
@@ -30,7 +30,7 @@
 #include <tqstrlist.h>
 #include <tqdict.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqcleanuphandler.h>
 
 #include <tqfeatures.h>
diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp
index 7c6d138b..c45eeb64 100644
--- a/qtruby/rubylib/qtruby/Qt.cpp
+++ b/qtruby/rubylib/qtruby/Qt.cpp
@@ -32,7 +32,7 @@
 #include <tqvariant.h>
 #include <tqcursor.h>
 #include <tqobjectlist.h>
-#include <signalslotimp.h>
+#include <tqsignalslotimp.h>
 #include <tqcstring.h>
 
 #undef DEBUG
diff --git a/qtruby/rubylib/qtruby/handlers.cpp b/qtruby/rubylib/qtruby/handlers.cpp
index d34ea4a0..30341fd1 100644
--- a/qtruby/rubylib/qtruby/handlers.cpp
+++ b/qtruby/rubylib/qtruby/handlers.cpp
@@ -15,11 +15,11 @@
 #include <tqiconview.h>
 #include <tqtable.h>
 #include <tqpopupmenu.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqmetaobject.h>
 #include <tqvaluelist.h>
 #include <tqobjectlist.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqhostaddress.h>
 #include <tqpair.h>
 
diff --git a/xparts/xpart_notepad/xp_notepad.cpp b/xparts/xpart_notepad/xp_notepad.cpp
index 35b71e4f..5dc7157c 100644
--- a/xparts/xpart_notepad/xp_notepad.cpp
+++ b/xparts/xpart_notepad/xp_notepad.cpp
@@ -2,7 +2,7 @@
 #include <kapplication.h>
 #include <tqmultilineedit.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <stdio.h>
 #include <iostream>
 #include <xpart.h>