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

This reverts commit 996381f5af.

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>

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>

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>
 

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>

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>

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>

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>

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>

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>

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>

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>

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"
 

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>

kjsembed/builtins/qfile_imp.cpp

@@ -1,7 +1,7 @@
 
 
 #include <tqcstring.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 

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>

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>

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();

kjsembed/jsbuiltin_imp.cpp

@@ -22,7 +22,7 @@
 
 #include <tqobject.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #ifndef QT_ONLY
 

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>

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

kjsembed/jsopaqueproxy.cpp

@@ -18,7 +18,7 @@
  */
 
 #include <tqevent.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include "global.h"
 

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>
 

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"
 

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"
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

kjsembed/qtbindings/qchecklistitem_imp.cpp

@@ -2,7 +2,7 @@
 
 
 #include <tqcstring.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 

kjsembed/qtbindings/qcombobox_imp.cpp

@@ -2,7 +2,7 @@
 
 
 #include <tqcstring.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 

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>

kjsembed/qtbindings/qlistviewitem_imp.cpp

@@ -2,7 +2,7 @@
 
 
 #include <tqcstring.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 

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>

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>
 

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>
 

kjsembed/qtbindings/qt_imp.cpp

@@ -2,7 +2,7 @@
 
 
 #include <tqcstring.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 

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"

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>
 

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:

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;

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>
 

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>
 

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>
 

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>

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>
 

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>

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>
 

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>

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>
 

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>

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>

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>

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>
 

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>
 

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>

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>

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>

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>
 

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>

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>

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>
 

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>
 

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>
 

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>

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>

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>

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>

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>

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;
 	    }

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

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>

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

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>
 

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>