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

52 files changed, 64 insertions, 64 deletions

diff --git a/qtjava/javalib/examples/textedit/example.html b/qtjava/javalib/examples/textedit/example.html
index 90df139e..8815f9d8 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="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>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>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="tqlayout.html">TQLayout</a> (e.g. top-level widgets).
+a <a href="layout.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="tqtextview.html">TQTextView</a> instead. It will flicker
+only. For large documents, use <a href="textview.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 47a827f2..d5e16236 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 <tqtextedit.h>
+#include <textedit.h>
 
 class JavaSlotFactory;
 class TQMetaObject;
diff --git a/qtjava/javalib/qtjava/Qt.cpp b/qtjava/javalib/qtjava/Qt.cpp
index 6ee67238..b10c8da1 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 <tqpalette.h>
+#include <palette.h>
 #include <tqpaintdevice.h>
 #include <tqpicture.h>
 #include <tqsplitter.h>
 #include <tqsize.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqregion.h>
 #include <tqcursor.h>
 #include <tqwindowdefs.h>
 #include <tqpixmap.h>
-#include <tqtextstream.h>
+#include <textstream.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 85dddeee..dd9ff61a 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 <tqpalette.h>
+#include <palette.h>
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQBoxLayout.cpp b/qtjava/javalib/qtjava/TQBoxLayout.cpp
index ccd4f3ce..73744223 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 <tqlayout.h>
+#include <layout.h>
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQBrush.cpp b/qtjava/javalib/qtjava/TQBrush.cpp
index 5afc1645..f18f553b 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 <tqbrush.h>
+#include <brush.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 59307c27..76c2d40d 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 <tqbrush.h>
+#include <brush.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 08f8ec75..1f717240 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 <tqpalette.h>
+#include <palette.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQCheckListItem.h>
diff --git a/qtjava/javalib/qtjava/TQCheckTableItem.cpp b/qtjava/javalib/qtjava/TQCheckTableItem.cpp
index 26da3e80..0f85846c 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 <tqpalette.h>
+#include <palette.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQCheckTableItem.h>
diff --git a/qtjava/javalib/qtjava/TQClipboard.cpp b/qtjava/javalib/qtjava/TQClipboard.cpp
index b390c9ea..4fedcc2c 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 <tqclipboard.h>
+#include <clipboard.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 66c9e966..a26b2a1b 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 <tqbrush.h>
+#include <brush.h>
 #include <tqcolor.h>
-#include <tqpalette.h>
+#include <palette.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQColorGroup.h>
diff --git a/qtjava/javalib/qtjava/TQComboBox.cpp b/qtjava/javalib/qtjava/TQComboBox.cpp
index 4a0dc900..a55b4c98 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 <tqpalette.h>
+#include <palette.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQComboBox.h>
diff --git a/qtjava/javalib/qtjava/TQComboTableItem.cpp b/qtjava/javalib/qtjava/TQComboTableItem.cpp
index 6a0d9280..7b4761e0 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 <tqpalette.h>
+#include <palette.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQComboTableItem.h>
diff --git a/qtjava/javalib/qtjava/TQCustomMenuItem.cpp b/qtjava/javalib/qtjava/TQCustomMenuItem.cpp
index 9f869f98..60dafe65 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 <tqpalette.h>
+#include <palette.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQCustomMenuItem.h>
diff --git a/qtjava/javalib/qtjava/TQDataTable.cpp b/qtjava/javalib/qtjava/TQDataTable.cpp
index 88068513..40f22812 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 <tqpalette.h>
+#include <palette.h>
 #include <tqdatatable.h>
 #include <tqnamespace.h>
 
diff --git a/qtjava/javalib/qtjava/TQDomNode.cpp b/qtjava/javalib/qtjava/TQDomNode.cpp
index 108d592e..dd0d70a1 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 <tqtextstream.h>
+#include <textstream.h>
 #include <tqstring.h>
 #include <tqdom.h>
 
diff --git a/qtjava/javalib/qtjava/TQGridLayout.cpp b/qtjava/javalib/qtjava/TQGridLayout.cpp
index 74a6d7b3..eb18a554 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 <tqlayout.h>
+#include <layout.h>
 #include <tqstring.h>
 #include <tqsize.h>
 
diff --git a/qtjava/javalib/qtjava/TQHBoxLayout.cpp b/qtjava/javalib/qtjava/TQHBoxLayout.cpp
index 54587967..f12983d2 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 <tqlayout.h>
+#include <layout.h>
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQIconView.cpp b/qtjava/javalib/qtjava/TQIconView.cpp
index 6917393b..5b22a9b1 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 <tqpalette.h>
+#include <palette.h>
 #include <tqsize.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqfont.h>
 #include <tqnamespace.h>
 
diff --git a/qtjava/javalib/qtjava/TQIconViewItem.cpp b/qtjava/javalib/qtjava/TQIconViewItem.cpp
index 55b57d3e..254a6cc3 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 <tqpalette.h>
+#include <palette.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 5d219272..26009f47 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 <tqlayout.h>
+#include <layout.h>
 #include <tqstring.h>
 #include <tqsize.h>
 
diff --git a/qtjava/javalib/qtjava/TQLayoutItem.cpp b/qtjava/javalib/qtjava/TQLayoutItem.cpp
index 499a3ac9..0ad300f3 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 <tqlayout.h>
+#include <layout.h>
 #include <tqsize.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQLineEdit.cpp b/qtjava/javalib/qtjava/TQLineEdit.cpp
index 5995598c..37e4207e 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 <tqpalette.h>
+#include <palette.h>
 #include <tqsize.h>
 #include <tqfont.h>
 
diff --git a/qtjava/javalib/qtjava/TQListView.cpp b/qtjava/javalib/qtjava/TQListView.cpp
index 9e3e693a..ccd94c50 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 <tqpalette.h>
+#include <palette.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 33857c08..956b6222 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 <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQPainter.cpp b/qtjava/javalib/qtjava/TQPainter.cpp
index d85341ad..5fe46ed9 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 <tqbrush.h>
+#include <brush.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 cdb7d59f..76e63609 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 <tqpalette.h>
-#include <tqbrush.h>
+#include <palette.h>
+#include <brush.h>
 #include <tqcolor.h>
 #include <tqnamespace.h>
 
diff --git a/qtjava/javalib/qtjava/TQScrollBar.cpp b/qtjava/javalib/qtjava/TQScrollBar.cpp
index c56a3453..661473d5 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 <tqpalette.h>
+#include <palette.h>
 #include <tqsize.h>
 #include <tqnamespace.h>
 
diff --git a/qtjava/javalib/qtjava/TQSimpleRichText.cpp b/qtjava/javalib/qtjava/TQSimpleRichText.cpp
index 13026fba..dd8a3ff8 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 <tqpalette.h>
+#include <palette.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 f96f435e..adb5a951 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 <tqpalette.h>
+#include <palette.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 ec8ab0df..0203ce48 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 <tqlayout.h>
+#include <layout.h>
 #include <tqsize.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQStyle.cpp b/qtjava/javalib/qtjava/TQStyle.cpp
index 836fde0d..eac72f49 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 <tqpalette.h>
+#include <palette.h>
 #include <tqsize.h>
 #include <tqpixmap.h>
 
diff --git a/qtjava/javalib/qtjava/TQStyleSheet.cpp b/qtjava/javalib/qtjava/TQStyleSheet.cpp
index 9afa5cfe..73435fa3 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 <tqstylesheet.h>
+#include <stylesheet.h>
 #include <tqmime.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQStyleSheetItem.cpp b/qtjava/javalib/qtjava/TQStyleSheetItem.cpp
index 95ff6d7f..3dc2b323 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 <tqstylesheet.h>
+#include <stylesheet.h>
 #include <tqcolor.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQTable.cpp b/qtjava/javalib/qtjava/TQTable.cpp
index dc74d32a..fa9aafc9 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 <tqpalette.h>
+#include <palette.h>
 #include <tqsize.h>
 #include <tqpixmap.h>
 
diff --git a/qtjava/javalib/qtjava/TQTableItem.cpp b/qtjava/javalib/qtjava/TQTableItem.cpp
index 60dfa7d8..be41d333 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 <tqpalette.h>
+#include <palette.h>
 #include <tqsize.h>
 #include <tqpixmap.h>
 
diff --git a/qtjava/javalib/qtjava/TQTextBrowser.cpp b/qtjava/javalib/qtjava/TQTextBrowser.cpp
index 544977a7..b4b2274e 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 <tqtextbrowser.h>
+#include <textbrowser.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQTextBrowser.h>
diff --git a/qtjava/javalib/qtjava/TQTextCodec.cpp b/qtjava/javalib/qtjava/TQTextCodec.cpp
index ae9b384b..5115d759 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 <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQTextDecoder.cpp b/qtjava/javalib/qtjava/TQTextDecoder.cpp
index 63339de3..db1f73c1 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 <tqtextcodec.h>
+#include <textcodec.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQTextDecoder.h>
diff --git a/qtjava/javalib/qtjava/TQTextEdit.cpp b/qtjava/javalib/qtjava/TQTextEdit.cpp
index 56ae8149..7b930a3f 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 <tqpalette.h>
+#include <palette.h>
 #include <tqsize.h>
-#include <tqbrush.h>
-#include <tqtextedit.h>
+#include <brush.h>
+#include <textedit.h>
 #include <tqfont.h>
-#include <tqstylesheet.h>
+#include <stylesheet.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 1fe136ce..dc66be81 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 <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQTextIStream.cpp b/qtjava/javalib/qtjava/TQTextIStream.cpp
index 6348ea45..315bcfc3 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 <tqtextstream.h>
+#include <textstream.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQTextOStream.cpp b/qtjava/javalib/qtjava/TQTextOStream.cpp
index 9d1dad60..bd3eb33b 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 <tqtextstream.h>
+#include <textstream.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQTextStream.cpp b/qtjava/javalib/qtjava/TQTextStream.cpp
index d7ef6b29..024261fe 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 <tqtextstream.h>
+#include <textstream.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQTextView.cpp b/qtjava/javalib/qtjava/TQTextView.cpp
index da6c858a..9acc9915 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 <tqtextview.h>
+#include <textview.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQTextView.h>
diff --git a/qtjava/javalib/qtjava/TQToolButton.cpp b/qtjava/javalib/qtjava/TQToolButton.cpp
index c4cb619a..d2651f79 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 <tqpalette.h>
+#include <palette.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 79d95bc3..0956f398 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 <tqpalette.h>
+#include <palette.h>
 #include <tqtooltip.h>
 #include <tqfont.h>
 
diff --git a/qtjava/javalib/qtjava/TQVBoxLayout.cpp b/qtjava/javalib/qtjava/TQVBoxLayout.cpp
index e4172991..eb98676c 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 <tqlayout.h>
+#include <layout.h>
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQVariant.cpp b/qtjava/javalib/qtjava/TQVariant.cpp
index 4c713dc7..529c0b3f 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 <tqpalette.h>
+#include <palette.h>
 #include <tqsize.h>
-#include <tqbrush.h>
+#include <brush.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 7b14d140..d51f416a 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 <tqpalette.h>
+#include <palette.h>
 #include <tqwidget.h>
 #include <tqpaintdevice.h>
-#include <tqbrush.h>
+#include <brush.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 4dc2fcc4..a760dd50 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 <tqlayout.h>
+#include <layout.h>
 #include <tqsize.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQXmlInputSource.cpp b/qtjava/javalib/qtjava/TQXmlInputSource.cpp
index 2ed62091..5cc7e459 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 <tqtextstream.h>
+#include <textstream.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>