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

36 files changed, 37 insertions, 37 deletions

diff --git a/kjsembed/bindings/brush_imp.cpp b/kjsembed/bindings/brush_imp.cpp
index ab2eee3f..30a4a652 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 <tqbrush.h>
+#include <brush.h>
 
 #include "brush_imp.h"
 
diff --git a/kjsembed/bindings/dcop_imp.cpp b/kjsembed/bindings/dcop_imp.cpp
index 9dfaf4be..f5ba0c37 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 <tqbrush.h>
+#include <brush.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 7f3d2b5b..cb33f9fa 100644
--- a/kjsembed/builtins/qfile_imp.cpp
+++ b/kjsembed/builtins/qfile_imp.cpp
@@ -1,7 +1,7 @@
 
 
 #include <tqcstring.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/builtins/textstream_imp.cpp b/kjsembed/builtins/textstream_imp.cpp
index d28bb46c..7e80bac5 100644
--- a/kjsembed/builtins/textstream_imp.cpp
+++ b/kjsembed/builtins/textstream_imp.cpp
@@ -17,7 +17,7 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqiodevice.h>
 
 #include <kjsembed/global.h>
diff --git a/kjsembed/customobject_imp.cpp b/kjsembed/customobject_imp.cpp
index 74f58c2f..91b68d2b 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 <tqlayout.h>
+#include <layout.h>
 #include <tqlistbox.h>
 #include <tqlistview.h>
 #include <tqmetaobject.h>
diff --git a/kjsembed/global.h b/kjsembed/global.h
index e2e4a652..426e3cec 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 <tqtextstream.h>
+#include <textstream.h>
 namespace KJSEmbed {
 KJSEMBED_EXPORT TQTextStream *conin();
 KJSEMBED_EXPORT TQTextStream *conout();
diff --git a/kjsembed/jsbuiltin_imp.cpp b/kjsembed/jsbuiltin_imp.cpp
index 7cf96082..b87da413 100644
--- a/kjsembed/jsbuiltin_imp.cpp
+++ b/kjsembed/jsbuiltin_imp.cpp
@@ -22,7 +22,7 @@
 
 #include <tqobject.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #ifndef QT_ONLY
 
diff --git a/kjsembed/jsconsolewidget.cpp b/kjsembed/jsconsolewidget.cpp
index d2978a84..bf400cf2 100644
--- a/kjsembed/jsconsolewidget.cpp
+++ b/kjsembed/jsconsolewidget.cpp
@@ -20,7 +20,7 @@
 #include <tqfile.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 
 #include <kdebug.h>
diff --git a/kjsembed/jsfactory.cpp b/kjsembed/jsfactory.cpp
index 5e6a22a7..af8d6589 100644
--- a/kjsembed/jsfactory.cpp
+++ b/kjsembed/jsfactory.cpp
@@ -31,14 +31,14 @@
 #include <tqmainwindow.h>
 //#include <tqpainter.h>
 #include <tqprogressdialog.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqtimer.h>
 #include <tqwidget.h>
 #include <tqwidgetfactory.h>
 #include <tqsplitter.h>
 #include <tqscrollview.h>
 #include <tqcanvas.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqsplashscreen.h>
 
 #ifndef QT_ONLY
diff --git a/kjsembed/jsopaqueproxy.cpp b/kjsembed/jsopaqueproxy.cpp
index 5abd9558..f1d33823 100644
--- a/kjsembed/jsopaqueproxy.cpp
+++ b/kjsembed/jsopaqueproxy.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <tqevent.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "global.h"
 
diff --git a/kjsembed/kjsembedpart.cpp b/kjsembed/kjsembedpart.cpp
index b39b8813..4046968f 100644
--- a/kjsembed/kjsembedpart.cpp
+++ b/kjsembed/kjsembedpart.cpp
@@ -24,7 +24,7 @@
 #include <tqobject.h>
 #include <tqdialog.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqwidget.h>
 #include <tqwidgetfactory.h>
 
diff --git a/kjsembed/plugins/customobject_plugin.cpp b/kjsembed/plugins/customobject_plugin.cpp
index b883ff66..cd22f169 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 <tqbrush.h>
+#include <brush.h>
 
 #include "customobject_plugin.h"
 
diff --git a/kjsembed/plugins/imagefx_plugin.cpp b/kjsembed/plugins/imagefx_plugin.cpp
index ef3d0ed0..5ca4a6a4 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 <tqbrush.h>
+#include <brush.h>
 
 #include "imagefx_plugin.h"
 
diff --git a/kjsembed/qtbindings/qcanvas_imp.cpp b/kjsembed/qtbindings/qcanvas_imp.cpp
index 22e8c40b..1805cac8 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 <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvasellipse_imp.cpp b/kjsembed/qtbindings/qcanvasellipse_imp.cpp
index 3f4d53a5..981cc129 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 <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvasitem_imp.cpp b/kjsembed/qtbindings/qcanvasitem_imp.cpp
index 68c73667..85d7add7 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 <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvasitemlist_imp.cpp b/kjsembed/qtbindings/qcanvasitemlist_imp.cpp
index f92f0d33..6ac69116 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 <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvasline_imp.cpp b/kjsembed/qtbindings/qcanvasline_imp.cpp
index 907573f0..528a5d81 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 <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvaspixmap_imp.cpp b/kjsembed/qtbindings/qcanvaspixmap_imp.cpp
index 9fcf2718..a1204908 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 <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp b/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp
index 8d5a8b79..77bf2743 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 <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvaspolygon_imp.cpp b/kjsembed/qtbindings/qcanvaspolygon_imp.cpp
index 9af85744..d6d5027d 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 <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp
index 4f09509d..6e1942f7 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 <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvasrectangle_imp.cpp b/kjsembed/qtbindings/qcanvasrectangle_imp.cpp
index 55f1f14d..13c9ae6a 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 <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvasspline_imp.cpp b/kjsembed/qtbindings/qcanvasspline_imp.cpp
index 7809002c..1faae121 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 <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvassprite_imp.cpp b/kjsembed/qtbindings/qcanvassprite_imp.cpp
index 98a4a428..d68aaaa1 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 <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvastext_imp.cpp b/kjsembed/qtbindings/qcanvastext_imp.cpp
index d0528647..3dec0bfa 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 <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvasview_imp.cpp b/kjsembed/qtbindings/qcanvasview_imp.cpp
index f32faef7..368b7d72 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 <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qchecklistitem_imp.cpp b/kjsembed/qtbindings/qchecklistitem_imp.cpp
index 9aa28e41..bc2545b7 100644
--- a/kjsembed/qtbindings/qchecklistitem_imp.cpp
+++ b/kjsembed/qtbindings/qchecklistitem_imp.cpp
@@ -2,7 +2,7 @@
 
 
 #include <tqcstring.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcombobox_imp.cpp b/kjsembed/qtbindings/qcombobox_imp.cpp
index 6ee231b8..1adf380a 100644
--- a/kjsembed/qtbindings/qcombobox_imp.cpp
+++ b/kjsembed/qtbindings/qcombobox_imp.cpp
@@ -2,7 +2,7 @@
 
 
 #include <tqcstring.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qlistview_imp.cpp b/kjsembed/qtbindings/qlistview_imp.cpp
index 2536351c..6c868d54 100644
--- a/kjsembed/qtbindings/qlistview_imp.cpp
+++ b/kjsembed/qtbindings/qlistview_imp.cpp
@@ -2,7 +2,7 @@
 
 
 #include <tqcstring.h>
-#include <tqpalette.h>
+#include <palette.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 f1ed55c2..56beef23 100644
--- a/kjsembed/qtbindings/qlistviewitem_imp.cpp
+++ b/kjsembed/qtbindings/qlistviewitem_imp.cpp
@@ -2,7 +2,7 @@
 
 
 #include <tqcstring.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qmenudata_imp.cpp b/kjsembed/qtbindings/qmenudata_imp.cpp
index 22b16d3e..8fd95887 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 <tqpalette.h>
+#include <palette.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 f65fa910..0092095b 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 <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qpopupmenu_imp.cpp b/kjsembed/qtbindings/qpopupmenu_imp.cpp
index 1c94776a..7f11cc2c 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 <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qt_imp.cpp b/kjsembed/qtbindings/qt_imp.cpp
index 0f6bf134..cad225fd 100644
--- a/kjsembed/qtbindings/qt_imp.cpp
+++ b/kjsembed/qtbindings/qt_imp.cpp
@@ -2,7 +2,7 @@
 
 
 #include <tqcstring.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/tools/headers/qcanvas.h b/kjsembed/tools/headers/qcanvas.h
index bdf46d83..e57b9d15 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 "tqbrush.h"
+#include "brush.h"
 #include "tqpen.h"
 #include "tqvaluelist.h"
 #include "tqpointarray.h"