Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebindings@1157645 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

45 files changed, 1042 insertions, 1042 deletions

diff --git a/kjsembed/qtbindings/qcanvas_imp.cpp b/kjsembed/qtbindings/qcanvas_imp.cpp
index 65192798..f653416b 100644
--- a/kjsembed/qtbindings/qcanvas_imp.cpp
+++ b/kjsembed/qtbindings/qcanvas_imp.cpp
@@ -1,12 +1,12 @@
 
 
 
-#include <qcstring.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qpalette.h>
-#include <qpixmap.h>
-#include <qfont.h>
+#include <tqcstring.h>
+#include <tqimage.h>
+#include <tqpainter.h>
+#include <tqpalette.h>
+#include <tqpixmap.h>
+#include <tqfont.h>
 
 #include <kjs/object.h>
 
@@ -15,7 +15,7 @@
 #include <kjsembed/jsopaqueproxy.h>
 #include <kjsembed/jsbinding.h>
 
-#include <qcanvas.h>
+#include <tqcanvas.h>
 #include "qcanvas_imp.h"
 
 /**
@@ -43,7 +43,7 @@ void QCanvasImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -116,7 +116,7 @@ void QCanvasImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -129,25 +129,25 @@ void QCanvasImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a QCanvas pointer from an Object.
+ * Extract a TQCanvas pointer from an Object.
  */
-QCanvas *QCanvasImp::toQCanvas( KJS::Object &self )
+TQCanvas *QCanvasImp::toQCanvas( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        QObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<QCanvas *>( obj );
+           return dynamic_cast<TQCanvas *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "QCanvas" )
+    if ( op->typeName() != "TQCanvas" )
         return 0;
 
-    return op->toNative<QCanvas>();
+    return op->toNative<TQCanvas>();
 }
 
 /**
@@ -173,7 +173,7 @@ KJS::Object QCanvasImp::construct( KJS::ExecState *exec, const KJS::List &args )
              break;
     }
 
-    QString msg = i18n("QCanvasCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("QCanvasCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -181,21 +181,21 @@ KJS::Object QCanvasImp::construct( KJS::ExecState *exec, const KJS::List &args )
 KJS::Object QCanvasImp::QCanvas_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter QObject *
+    // Unsupported parameter TQObject *
 
-    QObject * arg0 = extractQObject(exec,args,0);
+    TQObject * arg0 = extractQObject(exec,args,0);
 
     const char *arg1 = (args.size() >= 2) ? args[1].toString(exec).ascii() : 0;
 
 
-    // We should now create an instance of the QCanvas object
+    // We should now create an instance of the TQCanvas object
 
-    QCanvas *ret = new QCanvas(
+    TQCanvas *ret = new TQCanvas(
 
           arg0,
           arg1 );
 
-    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "QCanvas");
+    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TQCanvas");
     return KJS::Object( prx );
 }
 
@@ -207,13 +207,13 @@ KJS::Object QCanvasImp::QCanvas_2( KJS::ExecState *exec, const KJS::List &args )
     int arg1 = extractInt(exec, args, 1);
 
 
-    // We should now create an instance of the QCanvas object
+    // We should now create an instance of the TQCanvas object
 
-    QCanvas *ret = new QCanvas(
+    TQCanvas *ret = new TQCanvas(
 
           arg0,
           arg1 );
-    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "QCanvas");
+    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TQCanvas");
     return KJS::Object( prx );
 
 }
@@ -223,7 +223,7 @@ KJS::Object QCanvasImp::QCanvas_3( KJS::ExecState *exec, const KJS::List &args )
 
     // Unsupported parameter QPixmap
 
-    QPixmap arg0 = extractQPixmap(exec, args, 0);
+    TQPixmap arg0 = extractQPixmap(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -234,9 +234,9 @@ KJS::Object QCanvasImp::QCanvas_3( KJS::ExecState *exec, const KJS::List &args )
     int arg4 = extractInt(exec, args, 4);
 
 
-    // We should now create an instance of the QCanvas object
+    // We should now create an instance of the TQCanvas object
 
-    QCanvas *ret = new QCanvas(
+    TQCanvas *ret = new TQCanvas(
 
           arg0,
           arg1,
@@ -244,7 +244,7 @@ KJS::Object QCanvasImp::QCanvas_3( KJS::ExecState *exec, const KJS::List &args )
           arg3,
           arg4 );
 
-    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "QCanvas");
+    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TQCanvas");
     return KJS::Object( prx );
 }
 
@@ -450,7 +450,7 @@ KJS::Value QCanvasImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS:
         break;
     }
 
-    QString msg = i18n( "QCanvasImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "QCanvasImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -461,7 +461,7 @@ KJS::Value QCanvasImp::setTiles_5( KJS::ExecState *exec, KJS::Object &obj, const
     // Unsupported parameter QPixmap
     return KJS::Value();
 
-    QPixmap arg0; // Dummy
+    TQPixmap arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -484,7 +484,7 @@ KJS::Value QCanvasImp::setTiles_5( KJS::ExecState *exec, KJS::Object &obj, const
 KJS::Value QCanvasImp::setBackgroundPixmap_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QPixmap arg0 = extractQPixmap(exec, args, 0);
+    TQPixmap arg0 = extractQPixmap(exec, args, 0);
 
       instance->setBackgroundPixmap(
        arg0 );
@@ -494,7 +494,7 @@ KJS::Value QCanvasImp::setBackgroundPixmap_6( KJS::ExecState *exec, KJS::Object
 
 KJS::Value QCanvasImp::backgroundPixmap_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    QPixmap ret;
+    TQPixmap ret;
       ret = instance->backgroundPixmap(  );
 
        return convertToValue( exec, ret );
@@ -504,7 +504,7 @@ KJS::Value QCanvasImp::backgroundPixmap_7( KJS::ExecState *exec, KJS::Object &ob
 KJS::Value QCanvasImp::setBackgroundColor_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QColor arg0 = extractQColor(exec, args, 0);
+    TQColor arg0 = extractQColor(exec, args, 0);
 
       instance->setBackgroundColor(
        arg0 );
@@ -622,7 +622,7 @@ KJS::Value QCanvasImp::height_18( KJS::ExecState *exec, KJS::Object &obj, const
 
 KJS::Value QCanvasImp::size_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    QSize ret;
+    TQSize ret;
       ret = instance->size(  );
 
        return convertToValue( exec, ret );
@@ -631,7 +631,7 @@ KJS::Value QCanvasImp::size_19( KJS::ExecState *exec, KJS::Object &obj, const KJ
 
 KJS::Value QCanvasImp::rect_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    QRect ret;
+    TQRect ret;
       ret = instance->rect(  );
 
        return convertToValue( exec, ret );
@@ -656,7 +656,7 @@ KJS::Value QCanvasImp::onCanvas_21( KJS::ExecState *exec, KJS::Object &obj, cons
 KJS::Value QCanvasImp::onCanvas_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QPoint arg0 = extractQPoint(exec, args, 0);
+    TQPoint arg0 = extractQPoint(exec, args, 0);
 
       bool ret;
       ret = instance->onCanvas(
@@ -683,7 +683,7 @@ KJS::Value QCanvasImp::validChunk_23( KJS::ExecState *exec, KJS::Object &obj, co
 KJS::Value QCanvasImp::validChunk_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QPoint arg0 = extractQPoint(exec, args, 0);
+    TQPoint arg0 = extractQPoint(exec, args, 0);
 
       bool ret;
       ret = instance->validChunk(
@@ -775,7 +775,7 @@ KJS::Value QCanvasImp::setAllChanged_30( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value QCanvasImp::setChanged_31( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QRect arg0 = extractQRect(exec, args, 0);
+    TQRect arg0 = extractQRect(exec, args, 0);
 
       instance->setChanged(
        arg0 );
@@ -786,7 +786,7 @@ KJS::Value QCanvasImp::setChanged_31( KJS::ExecState *exec, KJS::Object &obj, co
 KJS::Value QCanvasImp::setUnchanged_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QRect arg0 = extractQRect(exec, args, 0);
+    TQRect arg0 = extractQRect(exec, args, 0);
 
       instance->setUnchanged(
        arg0 );
@@ -797,10 +797,10 @@ KJS::Value QCanvasImp::setUnchanged_32( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value QCanvasImp::addItemToChunk_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QCanvasItem *
+    // Unsupported parameter TQCanvasItem *
     return KJS::Value();
 
-    QCanvasItem * arg0; // Dummy
+    TQCanvasItem * arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -817,10 +817,10 @@ KJS::Value QCanvasImp::addItemToChunk_33( KJS::ExecState *exec, KJS::Object &obj
 KJS::Value QCanvasImp::removeItemFromChunk_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QCanvasItem *
+    // Unsupported parameter TQCanvasItem *
     return KJS::Value();
 
-    QCanvasItem * arg0; // Dummy
+    TQCanvasItem * arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -837,10 +837,10 @@ KJS::Value QCanvasImp::removeItemFromChunk_34( KJS::ExecState *exec, KJS::Object
 KJS::Value QCanvasImp::addItemToChunkContaining_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QCanvasItem *
+    // Unsupported parameter TQCanvasItem *
     return KJS::Value();
 
-    QCanvasItem * arg0; // Dummy
+    TQCanvasItem * arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -857,10 +857,10 @@ KJS::Value QCanvasImp::addItemToChunkContaining_35( KJS::ExecState *exec, KJS::O
 KJS::Value QCanvasImp::removeItemFromChunkContaining_36( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QCanvasItem *
+    // Unsupported parameter TQCanvasItem *
     return KJS::Value();
 
-    QCanvasItem * arg0; // Dummy
+    TQCanvasItem * arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -885,7 +885,7 @@ KJS::Value QCanvasImp::allItems_37( KJS::ExecState *exec, KJS::Object &obj, cons
 KJS::Value QCanvasImp::collisions_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QPoint arg0 = extractQPoint(exec, args, 0);
+    TQPoint arg0 = extractQPoint(exec, args, 0);
 
       instance->collisions(
        arg0 );
@@ -896,7 +896,7 @@ KJS::Value QCanvasImp::collisions_38( KJS::ExecState *exec, KJS::Object &obj, co
 KJS::Value QCanvasImp::collisions_39( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QRect arg0 = extractQRect(exec, args, 0);
+    TQRect arg0 = extractQRect(exec, args, 0);
 
       instance->collisions(
        arg0 );
@@ -907,12 +907,12 @@ KJS::Value QCanvasImp::collisions_39( KJS::ExecState *exec, KJS::Object &obj, co
 KJS::Value QCanvasImp::collisions_40( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QPointArray arg0; // TODO (hack for qcanvas)
+    TQPointArray arg0; // TODO (hack for qcanvas)
 
-    // Unsupported parameter const QCanvasItem *
+    // Unsupported parameter const TQCanvasItem *
     return KJS::Value();
 
-    const QCanvasItem * arg1; // Dummy
+    const TQCanvasItem * arg1; // Dummy
 
     bool arg2 = extractBool(exec, args, 2);
 
@@ -927,12 +927,12 @@ KJS::Value QCanvasImp::collisions_40( KJS::ExecState *exec, KJS::Object &obj, co
 KJS::Value QCanvasImp::drawArea_41( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QRect arg0 = extractQRect(exec, args, 0);
+    TQRect arg0 = extractQRect(exec, args, 0);
 
-    // Unsupported parameter QPainter *
+    // Unsupported parameter TQPainter *
     return KJS::Value();
 
-    QPainter * arg1; // Dummy
+    TQPainter * arg1; // Dummy
 
     bool arg2 = extractBool(exec, args, 2);
 
@@ -947,10 +947,10 @@ KJS::Value QCanvasImp::drawArea_41( KJS::ExecState *exec, KJS::Object &obj, cons
 KJS::Value QCanvasImp::addView_42( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QCanvasView *
+    // Unsupported parameter TQCanvasView *
     return KJS::Value();
 
-    QCanvasView * arg0; // Dummy
+    TQCanvasView * arg0; // Dummy
 
       instance->addView(
        arg0 );
@@ -961,10 +961,10 @@ KJS::Value QCanvasImp::addView_42( KJS::ExecState *exec, KJS::Object &obj, const
 KJS::Value QCanvasImp::removeView_43( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QCanvasView *
+    // Unsupported parameter TQCanvasView *
     return KJS::Value();
 
-    QCanvasView * arg0; // Dummy
+    TQCanvasView * arg0; // Dummy
 
       instance->removeView(
        arg0 );
@@ -975,12 +975,12 @@ KJS::Value QCanvasImp::removeView_43( KJS::ExecState *exec, KJS::Object &obj, co
 KJS::Value QCanvasImp::drawCanvasArea_44( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QRect arg0 = extractQRect(exec, args, 0);
+    TQRect arg0 = extractQRect(exec, args, 0);
 
-    // Unsupported parameter QPainter *
+    // Unsupported parameter TQPainter *
     return KJS::Value();
 
-    QPainter * arg1; // Dummy
+    TQPainter * arg1; // Dummy
 
     bool arg2 = extractBool(exec, args, 2);
 
@@ -995,17 +995,17 @@ KJS::Value QCanvasImp::drawCanvasArea_44( KJS::ExecState *exec, KJS::Object &obj
 KJS::Value QCanvasImp::drawViewArea_45( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QCanvasView *
+    // Unsupported parameter TQCanvasView *
     return KJS::Value();
 
-    QCanvasView * arg0; // Dummy
+    TQCanvasView * arg0; // Dummy
 
-    // Unsupported parameter QPainter *
+    // Unsupported parameter TQPainter *
     return KJS::Value();
 
-    QPainter * arg1; // Dummy
+    TQPainter * arg1; // Dummy
 
-    QRect arg2 = extractQRect(exec, args, 2);
+    TQRect arg2 = extractQRect(exec, args, 2);
 
     bool arg3 = extractBool(exec, args, 3);
 
@@ -1021,10 +1021,10 @@ KJS::Value QCanvasImp::drawViewArea_45( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value QCanvasImp::addItem_46( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QCanvasItem *
+    // Unsupported parameter TQCanvasItem *
     return KJS::Value();
 
-    QCanvasItem * arg0; // Dummy
+    TQCanvasItem * arg0; // Dummy
 
       instance->addItem(
        arg0 );
@@ -1035,10 +1035,10 @@ KJS::Value QCanvasImp::addItem_46( KJS::ExecState *exec, KJS::Object &obj, const
 KJS::Value QCanvasImp::addAnimation_47( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QCanvasItem *
+    // Unsupported parameter TQCanvasItem *
     return KJS::Value();
 
-    QCanvasItem * arg0; // Dummy
+    TQCanvasItem * arg0; // Dummy
 
       instance->addAnimation(
        arg0 );
@@ -1049,10 +1049,10 @@ KJS::Value QCanvasImp::addAnimation_47( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value QCanvasImp::removeItem_48( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QCanvasItem *
+    // Unsupported parameter TQCanvasItem *
     return KJS::Value();
 
-    QCanvasItem * arg0; // Dummy
+    TQCanvasItem * arg0; // Dummy
 
       instance->removeItem(
        arg0 );
@@ -1063,10 +1063,10 @@ KJS::Value QCanvasImp::removeItem_48( KJS::ExecState *exec, KJS::Object &obj, co
 KJS::Value QCanvasImp::removeAnimation_49( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QCanvasItem *
+    // Unsupported parameter TQCanvasItem *
     return KJS::Value();
 
-    QCanvasItem * arg0; // Dummy
+    TQCanvasItem * arg0; // Dummy
 
       instance->removeAnimation(
        arg0 );
diff --git a/kjsembed/qtbindings/qcanvas_imp.h b/kjsembed/qtbindings/qcanvas_imp.h
index 9bd167bb..4521bfe8 100644
--- a/kjsembed/qtbindings/qcanvas_imp.h
+++ b/kjsembed/qtbindings/qcanvas_imp.h
@@ -17,7 +17,7 @@ class QCanvas;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for QCanvas methods.
+ * Wrapper class for TQCanvas methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -102,7 +102,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static QCanvas *toQCanvas( KJS::Object &object );
+   static TQCanvas *toQCanvas( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -182,7 +182,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   QCanvas *instance; // Temp
+   TQCanvas *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvasellipse_imp.cpp b/kjsembed/qtbindings/qcanvasellipse_imp.cpp
index 6c4fbff3..6d9311e7 100644
--- a/kjsembed/qtbindings/qcanvasellipse_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasellipse_imp.cpp
@@ -1,12 +1,12 @@
 
 
 
-#include <qcstring.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qpalette.h>
-#include <qpixmap.h>
-#include <qfont.h>
+#include <tqcstring.h>
+#include <tqimage.h>
+#include <tqpainter.h>
+#include <tqpalette.h>
+#include <tqpixmap.h>
+#include <tqfont.h>
 
 #include <kjs/object.h>
 
@@ -15,7 +15,7 @@
 #include <kjsembed/jsopaqueproxy.h>
 #include <kjsembed/jsbinding.h>
 
-#include <qcanvas.h>
+#include <tqcanvas.h>
 #include "qcanvasellipse_imp.h"
 
 /**
@@ -43,7 +43,7 @@ void QCanvasEllipseImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &ob
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -77,7 +77,7 @@ void QCanvasEllipseImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -90,25 +90,25 @@ void QCanvasEllipseImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a QCanvasEllipse pointer from an Object.
+ * Extract a TQCanvasEllipse pointer from an Object.
  */
-QCanvasEllipse *QCanvasEllipseImp::toQCanvasEllipse( KJS::Object &self )
+TQCanvasEllipse *QCanvasEllipseImp::toQCanvasEllipse( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        QObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<QCanvasEllipse *>( obj );
+           return dynamic_cast<TQCanvasEllipse *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "QCanvasEllipse" )
+    if ( op->typeName() != "TQCanvasEllipse" )
         return 0;
 
-    return op->toNative<QCanvasEllipse>();
+    return op->toNative<TQCanvasEllipse>();
 }
 
 /**
@@ -134,7 +134,7 @@ KJS::Object QCanvasEllipseImp::construct( KJS::ExecState *exec, const KJS::List
              break;
     }
 
-    QString msg = i18n("QCanvasEllipseCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("QCanvasEllipseCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -142,15 +142,15 @@ KJS::Object QCanvasEllipseImp::construct( KJS::ExecState *exec, const KJS::List
 KJS::Object QCanvasEllipseImp::QCanvasEllipse_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter QCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    QCanvas * arg0; // Dummy
+    TQCanvas * arg0; // Dummy
 
 
-    // We should now create an instance of the QCanvasEllipse object
+    // We should now create an instance of the TQCanvasEllipse object
 
-    QCanvasEllipse *ret = new QCanvasEllipse(
+    TQCanvasEllipse *ret = new TQCanvasEllipse(
 
           arg0 );
 
@@ -164,15 +164,15 @@ KJS::Object QCanvasEllipseImp::QCanvasEllipse_2( KJS::ExecState *exec, const KJS
 
     int arg1 = extractInt(exec, args, 1);
 
-    // Unsupported parameter QCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    QCanvas * arg2; // Dummy
+    TQCanvas * arg2; // Dummy
 
 
-    // We should now create an instance of the QCanvasEllipse object
+    // We should now create an instance of the TQCanvasEllipse object
 
-    QCanvasEllipse *ret = new QCanvasEllipse(
+    TQCanvasEllipse *ret = new TQCanvasEllipse(
 
           arg0,
           arg1,
@@ -192,15 +192,15 @@ KJS::Object QCanvasEllipseImp::QCanvasEllipse_3( KJS::ExecState *exec, const KJS
 
     int arg3 = extractInt(exec, args, 3);
 
-    // Unsupported parameter QCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    QCanvas * arg4; // Dummy
+    TQCanvas * arg4; // Dummy
 
 
-    // We should now create an instance of the QCanvasEllipse object
+    // We should now create an instance of the TQCanvasEllipse object
 
-    QCanvasEllipse *ret = new QCanvasEllipse(
+    TQCanvasEllipse *ret = new TQCanvasEllipse(
 
           arg0,
           arg1,
@@ -257,7 +257,7 @@ KJS::Value QCanvasEllipseImp::call( KJS::ExecState *exec, KJS::Object &self, con
         break;
     }
 
-    QString msg = i18n( "QCanvasEllipseImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "QCanvasEllipseImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -337,10 +337,10 @@ KJS::Value QCanvasEllipseImp::areaPoints_11( KJS::ExecState *exec, KJS::Object &
 KJS::Value QCanvasEllipseImp::collidesWith_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QCanvasItem *
+    // Unsupported parameter const TQCanvasItem *
     return KJS::Value();
 
-    const QCanvasItem * arg0; // Dummy
+    const TQCanvasItem * arg0; // Dummy
 
       bool ret;
       ret = instance->collidesWith(
diff --git a/kjsembed/qtbindings/qcanvasellipse_imp.h b/kjsembed/qtbindings/qcanvasellipse_imp.h
index 052f41cf..0d15d67b 100644
--- a/kjsembed/qtbindings/qcanvasellipse_imp.h
+++ b/kjsembed/qtbindings/qcanvasellipse_imp.h
@@ -17,7 +17,7 @@ class QCanvasEllipse;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for QCanvasEllipse methods.
+ * Wrapper class for TQCanvasEllipse methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -63,7 +63,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static QCanvasEllipse *toQCanvasEllipse( KJS::Object &object );
+   static TQCanvasEllipse *toQCanvasEllipse( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -104,7 +104,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   QCanvasEllipse *instance; // Temp
+   TQCanvasEllipse *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvasitem_imp.cpp b/kjsembed/qtbindings/qcanvasitem_imp.cpp
index f2e1c0e0..c11b3780 100644
--- a/kjsembed/qtbindings/qcanvasitem_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasitem_imp.cpp
@@ -1,12 +1,12 @@
 
 
 
-#include <qcstring.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qpalette.h>
-#include <qpixmap.h>
-#include <qfont.h>
+#include <tqcstring.h>
+#include <tqimage.h>
+#include <tqpainter.h>
+#include <tqpalette.h>
+#include <tqpixmap.h>
+#include <tqfont.h>
 
 #include <kjs/object.h>
 
@@ -15,7 +15,7 @@
 #include <kjsembed/jsopaqueproxy.h>
 #include <kjsembed/jsbinding.h>
 
-#include <qcanvas.h>
+#include <tqcanvas.h>
 #include "qcanvasitem_imp.h"
 
 /**
@@ -43,7 +43,7 @@ void QCanvasItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &objec
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -66,15 +66,15 @@ void QCanvasItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &objec
     EnumValue enums[] = {
 
         // enum RttiValues
-        { "Rtti_Item", QCanvasItem::Rtti_Item },
-        { "Rtti_Sprite", QCanvasItem::Rtti_Sprite },
-        { "Rtti_PolygonalItem", QCanvasItem::Rtti_PolygonalItem },
-        { "Rtti_Text", QCanvasItem::Rtti_Text },
-        { "Rtti_Polygon", QCanvasItem::Rtti_Polygon },
-        { "Rtti_Rectangle", QCanvasItem::Rtti_Rectangle },
-        { "Rtti_Ellipse", QCanvasItem::Rtti_Ellipse },
-        { "Rtti_Line", QCanvasItem::Rtti_Line },
-        { "Rtti_Spline", QCanvasItem::Rtti_Spline },
+        { "Rtti_Item", TQCanvasItem::Rtti_Item },
+        { "Rtti_Sprite", TQCanvasItem::Rtti_Sprite },
+        { "Rtti_PolygonalItem", TQCanvasItem::Rtti_PolygonalItem },
+        { "Rtti_Text", TQCanvasItem::Rtti_Text },
+        { "Rtti_Polygon", TQCanvasItem::Rtti_Polygon },
+        { "Rtti_Rectangle", TQCanvasItem::Rtti_Rectangle },
+        { "Rtti_Ellipse", TQCanvasItem::Rtti_Ellipse },
+        { "Rtti_Line", TQCanvasItem::Rtti_Line },
+        { "Rtti_Spline", TQCanvasItem::Rtti_Spline },
 	{ 0, 0 }
     };
 
@@ -135,7 +135,7 @@ void QCanvasItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -148,28 +148,28 @@ void QCanvasItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a QCanvasItem pointer from an Object.
+ * Extract a TQCanvasItem pointer from an Object.
  */
-QCanvasItem *QCanvasItemImp::toQCanvasItem( KJS::Object &self )
+TQCanvasItem *QCanvasItemImp::toQCanvasItem( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        QObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<QCanvasItem *>( obj );
+           return dynamic_cast<TQCanvasItem *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 /*
-    if ( !op->inherits("QCanvasItem") ) {
+    if ( !op->inherits("TQCanvasItem") ) {
 	kdDebug() << "Typename of opaque canvas item is " << op->typeName() << endl;
 	// Check superclasses
         return 0;
     }
 */
-    return op->toNative<QCanvasItem>();
+    return op->toNative<TQCanvasItem>();
 }
 
 /**
@@ -187,7 +187,7 @@ KJS::Object QCanvasItemImp::construct( KJS::ExecState *exec, const KJS::List &ar
              break;
     }
 
-    QString msg = i18n("QCanvasItemCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("QCanvasItemCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -197,15 +197,15 @@ KJS::Object QCanvasItemImp::QCanvasItem_1( KJS::ExecState *exec, const KJS::List
 
 #if 0 // This constructor has been disabled by the XSL template
 
-    // Unsupported parameter QCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    QCanvas * arg0; // Dummy
+    TQCanvas * arg0; // Dummy
 
 
-    // We should now create an instance of the QCanvasItem object
+    // We should now create an instance of the TQCanvasItem object
 
-    QCanvasItem *ret = new QCanvasItem(
+    TQCanvasItem *ret = new TQCanvasItem(
 
           arg0 );
 
@@ -221,7 +221,7 @@ KJS::Value QCanvasItemImp::call( KJS::ExecState *exec, KJS::Object &self, const
     /*
     if ( !instance )
     {
-       QString msg = i18n( "QCanvasItemImp was not valid" );
+       TQString msg = i18n( "QCanvasItemImp was not valid" );
     return throwError(exec, msg,KJS::ReferenceError);
     }
     */
@@ -384,7 +384,7 @@ KJS::Value QCanvasItemImp::call( KJS::ExecState *exec, KJS::Object &self, const
         break;
     }
 
-    QString msg = i18n( "QCanvasItemImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "QCanvasItemImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -565,10 +565,10 @@ KJS::Value QCanvasItemImp::advance_18( KJS::ExecState *exec, KJS::Object &obj, c
 KJS::Value QCanvasItemImp::collidesWith_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QCanvasItem *
+    // Unsupported parameter const TQCanvasItem *
     return KJS::Value();
 
-    const QCanvasItem * arg0; // Dummy
+    const TQCanvasItem * arg0; // Dummy
 
       bool ret;
       ret = instance->collidesWith(
@@ -591,10 +591,10 @@ KJS::Value QCanvasItemImp::collisions_20( KJS::ExecState *exec, KJS::Object &obj
 KJS::Value QCanvasItemImp::setCanvas_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Value();
 
-    QCanvas * arg0; // Dummy
+    TQCanvas * arg0; // Dummy
 
       instance->setCanvas(
        arg0 );
@@ -605,7 +605,7 @@ KJS::Value QCanvasItemImp::setCanvas_21( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value QCanvasItemImp::draw_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QPainter arg0; // TODO (hack for qcanvas)
+    TQPainter arg0; // TODO (hack for qcanvas)
 
       instance->draw(
        arg0 );
@@ -756,7 +756,7 @@ KJS::Value QCanvasItemImp::rtti_37( KJS::ExecState *exec, KJS::Object &obj, cons
 
 KJS::Value QCanvasItemImp::boundingRect_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    QRect ret;
+    TQRect ret;
       ret = instance->boundingRect(  );
 
        return convertToValue( exec, ret );
@@ -765,7 +765,7 @@ KJS::Value QCanvasItemImp::boundingRect_38( KJS::ExecState *exec, KJS::Object &o
 
 KJS::Value QCanvasItemImp::boundingRectAdvanced_39( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    QRect ret;
+    TQRect ret;
       ret = instance->boundingRectAdvanced(  );
 
        return convertToValue( exec, ret );
@@ -776,7 +776,7 @@ KJS::Value QCanvasItemImp::canvas_40( KJS::ExecState *exec, KJS::Object &obj, co
 {
 
       instance->canvas(  );
-      return KJS::Value(); // Returns 'QCanvas *'
+      return KJS::Value(); // Returns 'TQCanvas *'
 
 }
 
diff --git a/kjsembed/qtbindings/qcanvasitem_imp.h b/kjsembed/qtbindings/qcanvasitem_imp.h
index 5af88785..8951eda0 100644
--- a/kjsembed/qtbindings/qcanvasitem_imp.h
+++ b/kjsembed/qtbindings/qcanvasitem_imp.h
@@ -17,7 +17,7 @@ class QCanvasItem;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for QCanvasItem methods.
+ * Wrapper class for TQCanvasItem methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -90,7 +90,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static QCanvasItem *toQCanvasItem( KJS::Object &object );
+   static TQCanvasItem *toQCanvasItem( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -158,7 +158,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   QCanvasItem *instance; // Temp
+   TQCanvasItem *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvasitemlist_imp.cpp b/kjsembed/qtbindings/qcanvasitemlist_imp.cpp
index 293aa5f3..fd87e511 100644
--- a/kjsembed/qtbindings/qcanvasitemlist_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasitemlist_imp.cpp
@@ -1,12 +1,12 @@
 
 
 
-#include <qcstring.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qpalette.h>
-#include <qpixmap.h>
-#include <qfont.h>
+#include <tqcstring.h>
+#include <tqimage.h>
+#include <tqpainter.h>
+#include <tqpalette.h>
+#include <tqpixmap.h>
+#include <tqfont.h>
 
 #include <kjs/object.h>
 
@@ -15,7 +15,7 @@
 #include <kjsembed/jsopaqueproxy.h>
 #include <kjsembed/jsbinding.h>
 
-#include <qcanvas.h>
+#include <tqcanvas.h>
 #include "qcanvasitemlist_imp.h"
 
 /**
@@ -43,7 +43,7 @@ void QCanvasItemListImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &o
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -70,7 +70,7 @@ void QCanvasItemListImp::addBindings( KJS::ExecState *exec, KJS::Object &object
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -83,25 +83,25 @@ void QCanvasItemListImp::addBindings( KJS::ExecState *exec, KJS::Object &object
 }
 
 /**
- * Extract a QCanvasItemList pointer from an Object.
+ * Extract a TQCanvasItemList pointer from an Object.
  */
-QCanvasItemList *QCanvasItemListImp::toQCanvasItemList( KJS::Object &self )
+TQCanvasItemList *QCanvasItemListImp::toQCanvasItemList( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        QObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<QCanvasItemList *>( obj );
+           return dynamic_cast<TQCanvasItemList *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "QCanvasItemList" )
+    if ( op->typeName() != "TQCanvasItemList" )
         return 0;
 
-    return op->toNative<QCanvasItemList>();
+    return op->toNative<TQCanvasItemList>();
 }
 
 /**
@@ -115,7 +115,7 @@ KJS::Object QCanvasItemListImp::construct( KJS::ExecState *exec, const KJS::List
              break;
     }
 
-    QString msg = i18n("QCanvasItemListCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("QCanvasItemListCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -138,7 +138,7 @@ KJS::Value QCanvasItemListImp::call( KJS::ExecState *exec, KJS::Object &self, co
         break;
     }
 
-    QString msg = i18n( "QCanvasItemListImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "QCanvasItemListImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -154,7 +154,7 @@ KJS::Value QCanvasItemListImp::sort_1( KJS::ExecState *exec, KJS::Object &obj, c
 KJS::Value QCanvasItemListImp::drawUnique_2( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QPainter arg0; // TODO (hack for qcanvas)
+    TQPainter arg0; // TODO (hack for qcanvas)
 
       instance->drawUnique(
        arg0 );
diff --git a/kjsembed/qtbindings/qcanvasitemlist_imp.h b/kjsembed/qtbindings/qcanvasitemlist_imp.h
index dad12e1a..f6b7a0cc 100644
--- a/kjsembed/qtbindings/qcanvasitemlist_imp.h
+++ b/kjsembed/qtbindings/qcanvasitemlist_imp.h
@@ -17,7 +17,7 @@ class QCanvasItemList;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for QCanvasItemList methods.
+ * Wrapper class for TQCanvasItemList methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -53,7 +53,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static QCanvasItemList *toQCanvasItemList( KJS::Object &object );
+   static TQCanvasItemList *toQCanvasItemList( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -84,7 +84,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   QCanvasItemList *instance; // Temp
+   TQCanvasItemList *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvasline_imp.cpp b/kjsembed/qtbindings/qcanvasline_imp.cpp
index 6ddf7c5d..429321f3 100644
--- a/kjsembed/qtbindings/qcanvasline_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasline_imp.cpp
@@ -1,12 +1,12 @@
 
 
 
-#include <qcstring.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qpalette.h>
-#include <qpixmap.h>
-#include <qfont.h>
+#include <tqcstring.h>
+#include <tqimage.h>
+#include <tqpainter.h>
+#include <tqpalette.h>
+#include <tqpixmap.h>
+#include <tqfont.h>
 
 #include <kjs/object.h>
 
@@ -15,7 +15,7 @@
 #include <kjsembed/jsopaqueproxy.h>
 #include <kjsembed/jsbinding.h>
 
-#include <qcanvas.h>
+#include <tqcanvas.h>
 #include "qcanvasline_imp.h"
 
 /**
@@ -43,7 +43,7 @@ void QCanvasLineImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &objec
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -74,7 +74,7 @@ void QCanvasLineImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -87,25 +87,25 @@ void QCanvasLineImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a QCanvasLine pointer from an Object.
+ * Extract a TQCanvasLine pointer from an Object.
  */
-QCanvasLine *QCanvasLineImp::toQCanvasLine( KJS::Object &self )
+TQCanvasLine *QCanvasLineImp::toQCanvasLine( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        QObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<QCanvasLine *>( obj );
+           return dynamic_cast<TQCanvasLine *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "QCanvasLine" )
+    if ( op->typeName() != "TQCanvasLine" )
         return 0;
 
-    return op->toNative<QCanvasLine>();
+    return op->toNative<TQCanvasLine>();
 }
 
 /**
@@ -123,7 +123,7 @@ KJS::Object QCanvasLineImp::construct( KJS::ExecState *exec, const KJS::List &ar
              break;
     }
 
-    QString msg = i18n("QCanvasLineCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("QCanvasLineCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -131,15 +131,15 @@ KJS::Object QCanvasLineImp::construct( KJS::ExecState *exec, const KJS::List &ar
 KJS::Object QCanvasLineImp::QCanvasLine_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter QCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    QCanvas * arg0; // Dummy
+    TQCanvas * arg0; // Dummy
 
 
-    // We should now create an instance of the QCanvasLine object
+    // We should now create an instance of the TQCanvasLine object
 
-    QCanvasLine *ret = new QCanvasLine(
+    TQCanvasLine *ret = new TQCanvasLine(
 
           arg0 );
 
@@ -180,7 +180,7 @@ KJS::Value QCanvasLineImp::call( KJS::ExecState *exec, KJS::Object &self, const
         break;
     }
 
-    QString msg = i18n( "QCanvasLineImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "QCanvasLineImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -207,7 +207,7 @@ KJS::Value QCanvasLineImp::setPoints_3( KJS::ExecState *exec, KJS::Object &obj,
 
 KJS::Value QCanvasLineImp::startPoint_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    QPoint ret;
+    TQPoint ret;
       ret = instance->startPoint(  );
 
        return convertToValue( exec, ret );
@@ -216,7 +216,7 @@ KJS::Value QCanvasLineImp::startPoint_4( KJS::ExecState *exec, KJS::Object &obj,
 
 KJS::Value QCanvasLineImp::endPoint_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    QPoint ret;
+    TQPoint ret;
       ret = instance->endPoint(  );
 
        return convertToValue( exec, ret );
@@ -238,7 +238,7 @@ KJS::Value QCanvasLineImp::setPen_7( KJS::ExecState *exec, KJS::Object &obj, con
     // Unsupported parameter QPen
     return KJS::Value();
 
-    QPen arg0; // Dummy
+    TQPen arg0; // Dummy
 
       instance->setPen(
        arg0 );
diff --git a/kjsembed/qtbindings/qcanvasline_imp.h b/kjsembed/qtbindings/qcanvasline_imp.h
index 5ce51a7e..94b8f1ad 100644
--- a/kjsembed/qtbindings/qcanvasline_imp.h
+++ b/kjsembed/qtbindings/qcanvasline_imp.h
@@ -17,7 +17,7 @@ class QCanvasLine;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for QCanvasLine methods.
+ * Wrapper class for TQCanvasLine methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -58,7 +58,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static QCanvasLine *toQCanvasLine( KJS::Object &object );
+   static TQCanvasLine *toQCanvasLine( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -94,7 +94,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   QCanvasLine *instance; // Temp
+   TQCanvasLine *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvaspixmap_imp.cpp b/kjsembed/qtbindings/qcanvaspixmap_imp.cpp
index 846f90fc..505cdb1f 100644
--- a/kjsembed/qtbindings/qcanvaspixmap_imp.cpp
+++ b/kjsembed/qtbindings/qcanvaspixmap_imp.cpp
@@ -1,12 +1,12 @@
 
 
 
-#include <qcstring.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qpalette.h>
-#include <qpixmap.h>
-#include <qfont.h>
+#include <tqcstring.h>
+#include <tqimage.h>
+#include <tqpainter.h>
+#include <tqpalette.h>
+#include <tqpixmap.h>
+#include <tqfont.h>
 
 #include <kjs/object.h>
 
@@ -15,7 +15,7 @@
 #include <kjsembed/jsopaqueproxy.h>
 #include <kjsembed/jsbinding.h>
 
-#include <qcanvas.h>
+#include <tqcanvas.h>
 #include "qcanvaspixmap_imp.h"
 
 /**
@@ -43,7 +43,7 @@ void QCanvasPixmapImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &obj
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -71,7 +71,7 @@ void QCanvasPixmapImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -84,25 +84,25 @@ void QCanvasPixmapImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a QCanvasPixmap pointer from an Object.
+ * Extract a TQCanvasPixmap pointer from an Object.
  */
-QCanvasPixmap *QCanvasPixmapImp::toQCanvasPixmap( KJS::Object &self )
+TQCanvasPixmap *QCanvasPixmapImp::toQCanvasPixmap( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        QObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<QCanvasPixmap *>( obj );
+           return dynamic_cast<TQCanvasPixmap *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "QCanvasPixmap" )
+    if ( op->typeName() != "TQCanvasPixmap" )
         return 0;
 
-    return op->toNative<QCanvasPixmap>();
+    return op->toNative<TQCanvasPixmap>();
 }
 
 /**
@@ -128,7 +128,7 @@ KJS::Object QCanvasPixmapImp::construct( KJS::ExecState *exec, const KJS::List &
              break;
     }
 
-    QString msg = i18n("QCanvasPixmapCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("QCanvasPixmapCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -136,12 +136,12 @@ KJS::Object QCanvasPixmapImp::construct( KJS::ExecState *exec, const KJS::List &
 KJS::Object QCanvasPixmapImp::QCanvasPixmap_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    QString arg0 = extractQString(exec, args, 0);
+    TQString arg0 = extractQString(exec, args, 0);
 
 
-    // We should now create an instance of the QCanvasPixmap object
+    // We should now create an instance of the TQCanvasPixmap object
 
-    QCanvasPixmap *ret = new QCanvasPixmap(
+    TQCanvasPixmap *ret = new TQCanvasPixmap(
 
           arg0 );
 
@@ -151,12 +151,12 @@ KJS::Object QCanvasPixmapImp::QCanvasPixmap_1( KJS::ExecState *exec, const KJS::
 KJS::Object QCanvasPixmapImp::QCanvasPixmap_2( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    QImage arg0 = extractQImage(exec, args, 0);
+    TQImage arg0 = extractQImage(exec, args, 0);
 
 
-    // We should now create an instance of the QCanvasPixmap object
+    // We should now create an instance of the TQCanvasPixmap object
 
-    QCanvasPixmap *ret = new QCanvasPixmap(
+    TQCanvasPixmap *ret = new TQCanvasPixmap(
 
           arg0 );
 
@@ -167,14 +167,14 @@ KJS::Object QCanvasPixmapImp::QCanvasPixmap_2( KJS::ExecState *exec, const KJS::
 KJS::Object QCanvasPixmapImp::QCanvasPixmap_3( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    QPixmap arg0 = extractQPixmap(exec, args, 0);
+    TQPixmap arg0 = extractQPixmap(exec, args, 0);
 
-    QPoint arg1 = extractQPoint(exec, args, 1);
+    TQPoint arg1 = extractQPoint(exec, args, 1);
 
 
-    // We should now create an instance of the QCanvasPixmap object
+    // We should now create an instance of the TQCanvasPixmap object
 
-    QCanvasPixmap *ret = new QCanvasPixmap(
+    TQCanvasPixmap *ret = new TQCanvasPixmap(
 
           arg0,
           arg1 );
@@ -205,7 +205,7 @@ KJS::Value QCanvasPixmapImp::call( KJS::ExecState *exec, KJS::Object &self, cons
         break;
     }
 
-    QString msg = i18n( "QCanvasPixmapImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "QCanvasPixmapImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
diff --git a/kjsembed/qtbindings/qcanvaspixmap_imp.h b/kjsembed/qtbindings/qcanvaspixmap_imp.h
index 38f8be81..6e9525f0 100644
--- a/kjsembed/qtbindings/qcanvaspixmap_imp.h
+++ b/kjsembed/qtbindings/qcanvaspixmap_imp.h
@@ -17,7 +17,7 @@ class QCanvasPixmap;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for QCanvasPixmap methods.
+ * Wrapper class for TQCanvasPixmap methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -57,7 +57,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static QCanvasPixmap *toQCanvasPixmap( KJS::Object &object );
+   static TQCanvasPixmap *toQCanvasPixmap( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -92,7 +92,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   QCanvasPixmap *instance; // Temp
+   TQCanvasPixmap *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp b/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp
index dbb41a18..d3f249d9 100644
--- a/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp
+++ b/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp
@@ -1,12 +1,12 @@
 
 
 
-#include <qcstring.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qpalette.h>
-#include <qpixmap.h>
-#include <qfont.h>
+#include <tqcstring.h>
+#include <tqimage.h>
+#include <tqpainter.h>
+#include <tqpalette.h>
+#include <tqpixmap.h>
+#include <tqfont.h>
 
 #include <kjs/object.h>
 
@@ -15,7 +15,7 @@
 #include <kjsembed/jsopaqueproxy.h>
 #include <kjsembed/jsbinding.h>
 
-#include <qcanvas.h>
+#include <tqcanvas.h>
 #include "qcanvaspixmaparray_imp.h"
 
 /**
@@ -43,7 +43,7 @@ void QCanvasPixmapArrayImp::addStaticBindings( KJS::ExecState *exec, KJS::Object
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -74,7 +74,7 @@ void QCanvasPixmapArrayImp::addBindings( KJS::ExecState *exec, KJS::Object &obje
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -87,25 +87,25 @@ void QCanvasPixmapArrayImp::addBindings( KJS::ExecState *exec, KJS::Object &obje
 }
 
 /**
- * Extract a QCanvasPixmapArray pointer from an Object.
+ * Extract a TQCanvasPixmapArray pointer from an Object.
  */
-QCanvasPixmapArray *QCanvasPixmapArrayImp::toQCanvasPixmapArray( KJS::Object &self )
+TQCanvasPixmapArray *QCanvasPixmapArrayImp::toQCanvasPixmapArray( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        QObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<QCanvasPixmapArray *>( obj );
+           return dynamic_cast<TQCanvasPixmapArray *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "QCanvasPixmapArray" )
+    if ( op->typeName() != "TQCanvasPixmapArray" )
         return 0;
 
-    return op->toNative<QCanvasPixmapArray>();
+    return op->toNative<TQCanvasPixmapArray>();
 }
 
 /**
@@ -135,7 +135,7 @@ KJS::Object QCanvasPixmapArrayImp::construct( KJS::ExecState *exec, const KJS::L
              break;
     }
 
-    QString msg = i18n("QCanvasPixmapArrayCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("QCanvasPixmapArrayCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -144,9 +144,9 @@ KJS::Object QCanvasPixmapArrayImp::QCanvasPixmapArray_1( KJS::ExecState *exec, c
 {
 
 
-    // We should now create an instance of the QCanvasPixmapArray object
+    // We should now create an instance of the TQCanvasPixmapArray object
 
-    QCanvasPixmapArray *ret = new QCanvasPixmapArray(
+    TQCanvasPixmapArray *ret = new TQCanvasPixmapArray(
         );
 
 	return KJS::Object();
@@ -155,14 +155,14 @@ KJS::Object QCanvasPixmapArrayImp::QCanvasPixmapArray_1( KJS::ExecState *exec, c
 KJS::Object QCanvasPixmapArrayImp::QCanvasPixmapArray_2( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    QString arg0 = extractQString(exec, args, 0);
+    TQString arg0 = extractQString(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
 
-    // We should now create an instance of the QCanvasPixmapArray object
+    // We should now create an instance of the TQCanvasPixmapArray object
 
-    QCanvasPixmapArray *ret = new QCanvasPixmapArray(
+    TQCanvasPixmapArray *ret = new TQCanvasPixmapArray(
 
           arg0,
           arg1 );
@@ -173,20 +173,20 @@ KJS::Object QCanvasPixmapArrayImp::QCanvasPixmapArray_2( KJS::ExecState *exec, c
 KJS::Object QCanvasPixmapArrayImp::QCanvasPixmapArray_3( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter QPtrList< QPixmap >
+    // Unsupported parameter TQPtrList< TQPixmap >
     return KJS::Object();
 
-    QPtrList< QPixmap > arg0; // Dummy
+    TQPtrList< TQPixmap > arg0; // Dummy
 
-    // Unsupported parameter QPtrList< QPoint >
+    // Unsupported parameter TQPtrList< TQPoint >
     return KJS::Object();
 
-    QPtrList< QPoint > arg1; // Dummy
+    TQPtrList< TQPoint > arg1; // Dummy
 
 
-    // We should now create an instance of the QCanvasPixmapArray object
+    // We should now create an instance of the TQCanvasPixmapArray object
 
-    QCanvasPixmapArray *ret = new QCanvasPixmapArray(
+    TQCanvasPixmapArray *ret = new TQCanvasPixmapArray(
 
           arg0,
           arg1 );
@@ -197,20 +197,20 @@ KJS::Object QCanvasPixmapArrayImp::QCanvasPixmapArray_3( KJS::ExecState *exec, c
 KJS::Object QCanvasPixmapArrayImp::QCanvasPixmapArray_4( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter QValueList< QPixmap >
+    // Unsupported parameter TQValueList< TQPixmap >
     return KJS::Object();
 
-    QValueList< QPixmap > arg0; // Dummy
+    TQValueList< TQPixmap > arg0; // Dummy
 
     // Unsupported parameter QPointArray
     return KJS::Object();
 
-    QPointArray arg1; // Dummy
+    TQPointArray arg1; // Dummy
 
 
-    // We should now create an instance of the QCanvasPixmapArray object
+    // We should now create an instance of the TQCanvasPixmapArray object
 
-    QCanvasPixmapArray *ret = new QCanvasPixmapArray(
+    TQCanvasPixmapArray *ret = new TQCanvasPixmapArray(
 
           arg0,
           arg1 );
@@ -252,7 +252,7 @@ KJS::Value QCanvasPixmapArrayImp::call( KJS::ExecState *exec, KJS::Object &self,
         break;
     }
 
-    QString msg = i18n( "QCanvasPixmapArrayImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "QCanvasPixmapArrayImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -260,7 +260,7 @@ KJS::Value QCanvasPixmapArrayImp::call( KJS::ExecState *exec, KJS::Object &self,
 KJS::Value QCanvasPixmapArrayImp::readPixmaps_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QString arg0 = extractQString(exec, args, 0);
+    TQString arg0 = extractQString(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -275,7 +275,7 @@ KJS::Value QCanvasPixmapArrayImp::readPixmaps_6( KJS::ExecState *exec, KJS::Obje
 KJS::Value QCanvasPixmapArrayImp::readCollisionMasks_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QString arg0 = extractQString(exec, args, 0);
+    TQString arg0 = extractQString(exec, args, 0);
 
       bool ret;
       ret = instance->readCollisionMasks(
@@ -300,7 +300,7 @@ KJS::Value QCanvasPixmapArrayImp::image_10( KJS::ExecState *exec, KJS::Object &o
 
       instance->image(
        arg0 );
-      return KJS::Value(); // Returns 'QCanvasPixmap *'
+      return KJS::Value(); // Returns 'TQCanvasPixmap *'
 
 }
 
@@ -309,10 +309,10 @@ KJS::Value QCanvasPixmapArrayImp::setImage_11( KJS::ExecState *exec, KJS::Object
 
     int arg0 = extractInt(exec, args, 0);
 
-    // Unsupported parameter QCanvasPixmap *
+    // Unsupported parameter TQCanvasPixmap *
     return KJS::Value();
 
-    QCanvasPixmap * arg1; // Dummy
+    TQCanvasPixmap * arg1; // Dummy
 
       instance->setImage(
        arg0,
diff --git a/kjsembed/qtbindings/qcanvaspixmaparray_imp.h b/kjsembed/qtbindings/qcanvaspixmaparray_imp.h
index 2b37d93a..16f842a5 100644
--- a/kjsembed/qtbindings/qcanvaspixmaparray_imp.h
+++ b/kjsembed/qtbindings/qcanvaspixmaparray_imp.h
@@ -17,7 +17,7 @@ class QCanvasPixmapArray;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for QCanvasPixmapArray methods.
+ * Wrapper class for TQCanvasPixmapArray methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -61,7 +61,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static QCanvasPixmapArray *toQCanvasPixmapArray( KJS::Object &object );
+   static TQCanvasPixmapArray *toQCanvasPixmapArray( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -100,7 +100,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   QCanvasPixmapArray *instance; // Temp
+   TQCanvasPixmapArray *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvaspolygon_imp.cpp b/kjsembed/qtbindings/qcanvaspolygon_imp.cpp
index d735fd7a..4064e3f0 100644
--- a/kjsembed/qtbindings/qcanvaspolygon_imp.cpp
+++ b/kjsembed/qtbindings/qcanvaspolygon_imp.cpp
@@ -1,12 +1,12 @@
 
 
 
-#include <qcstring.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qpalette.h>
-#include <qpixmap.h>
-#include <qfont.h>
+#include <tqcstring.h>
+#include <tqimage.h>
+#include <tqpainter.h>
+#include <tqpalette.h>
+#include <tqpixmap.h>
+#include <tqfont.h>
 
 #include <kjs/object.h>
 
@@ -15,7 +15,7 @@
 #include <kjsembed/jsopaqueproxy.h>
 #include <kjsembed/jsbinding.h>
 
-#include <qcanvas.h>
+#include <tqcanvas.h>
 #include "qcanvaspolygon_imp.h"
 
 /**
@@ -43,7 +43,7 @@ void QCanvasPolygonImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &ob
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -73,7 +73,7 @@ void QCanvasPolygonImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -86,25 +86,25 @@ void QCanvasPolygonImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a QCanvasPolygon pointer from an Object.
+ * Extract a TQCanvasPolygon pointer from an Object.
  */
-QCanvasPolygon *QCanvasPolygonImp::toQCanvasPolygon( KJS::Object &self )
+TQCanvasPolygon *QCanvasPolygonImp::toQCanvasPolygon( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        QObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<QCanvasPolygon *>( obj );
+           return dynamic_cast<TQCanvasPolygon *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "QCanvasPolygon" )
+    if ( op->typeName() != "TQCanvasPolygon" )
         return 0;
 
-    return op->toNative<QCanvasPolygon>();
+    return op->toNative<TQCanvasPolygon>();
 }
 
 /**
@@ -122,7 +122,7 @@ KJS::Object QCanvasPolygonImp::construct( KJS::ExecState *exec, const KJS::List
              break;
     }
 
-    QString msg = i18n("QCanvasPolygonCons has no constructor with id '%1',").arg(id);
+    TQString msg = i18n("QCanvasPolygonCons has no constructor with id '%1',").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -130,15 +130,15 @@ KJS::Object QCanvasPolygonImp::construct( KJS::ExecState *exec, const KJS::List
 KJS::Object QCanvasPolygonImp::QCanvasPolygon_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter QCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    QCanvas * arg0; // Dummy
+    TQCanvas * arg0; // Dummy
 
 
-    // We should now create an instance of the QCanvasPolygon object
+    // We should now create an instance of the TQCanvasPolygon object
 
-    QCanvasPolygon *ret = new QCanvasPolygon(
+    TQCanvasPolygon *ret = new TQCanvasPolygon(
 
           arg0 );
 
@@ -175,7 +175,7 @@ KJS::Value QCanvasPolygonImp::call( KJS::ExecState *exec, KJS::Object &self, con
         break;
     }
 
-    QString msg = i18n( "QCanvasPolygonImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "QCanvasPolygonImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -186,7 +186,7 @@ KJS::Value QCanvasPolygonImp::setPoints_3( KJS::ExecState *exec, KJS::Object &ob
     // Unsupported parameter QPointArray
     return KJS::Value();
 
-    QPointArray arg0; // Dummy
+    TQPointArray arg0; // Dummy
 
       instance->setPoints(
        arg0 );
diff --git a/kjsembed/qtbindings/qcanvaspolygon_imp.h b/kjsembed/qtbindings/qcanvaspolygon_imp.h
index 0e1e3255..9bb1a99e 100644
--- a/kjsembed/qtbindings/qcanvaspolygon_imp.h
+++ b/kjsembed/qtbindings/qcanvaspolygon_imp.h
@@ -17,7 +17,7 @@ class QCanvasPolygon;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for QCanvasPolygon methods.
+ * Wrapper class for TQCanvasPolygon methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -57,7 +57,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static QCanvasPolygon *toQCanvasPolygon( KJS::Object &object );
+   static TQCanvasPolygon *toQCanvasPolygon( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -92,7 +92,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   QCanvasPolygon *instance; // Temp
+   TQCanvasPolygon *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp
index 325260ba..64500a9b 100644
--- a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp
+++ b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp
@@ -1,12 +1,12 @@
 
 
 
-#include <qcstring.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qpalette.h>
-#include <qpixmap.h>
-#include <qfont.h>
+#include <tqcstring.h>
+#include <tqimage.h>
+#include <tqpainter.h>
+#include <tqpalette.h>
+#include <tqpixmap.h>
+#include <tqfont.h>
 
 #include <kjs/object.h>
 
@@ -15,7 +15,7 @@
 #include <kjsembed/jsopaqueproxy.h>
 #include <kjsembed/jsbinding.h>
 
-#include <qcanvas.h>
+#include <tqcanvas.h>
 #include "qcanvaspolygonalitem_imp.h"
 
 /**
@@ -43,7 +43,7 @@ void QCanvasPolygonalItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Obje
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -77,7 +77,7 @@ void QCanvasPolygonalItemImp::addBindings( KJS::ExecState *exec, KJS::Object &ob
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -90,25 +90,25 @@ void QCanvasPolygonalItemImp::addBindings( KJS::ExecState *exec, KJS::Object &ob
 }
 
 /**
- * Extract a QCanvasPolygonalItem pointer from an Object.
+ * Extract a TQCanvasPolygonalItem pointer from an Object.
  */
-QCanvasPolygonalItem *QCanvasPolygonalItemImp::toQCanvasPolygonalItem( KJS::Object &self )
+TQCanvasPolygonalItem *QCanvasPolygonalItemImp::toQCanvasPolygonalItem( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        QObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<QCanvasPolygonalItem *>( obj );
+           return dynamic_cast<TQCanvasPolygonalItem *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "QCanvasPolygonalItem" )
+    if ( op->typeName() != "TQCanvasPolygonalItem" )
         return 0;
 
-    return op->toNative<QCanvasPolygonalItem>();
+    return op->toNative<TQCanvasPolygonalItem>();
 }
 
 /**
@@ -126,7 +126,7 @@ KJS::Object QCanvasPolygonalItemImp::construct( KJS::ExecState *exec, const KJS:
              break;
     }
 
-    QString msg = i18n("QCanvasPolygonalItemCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("QCanvasPolygonalItemCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -136,15 +136,15 @@ KJS::Object QCanvasPolygonalItemImp::QCanvasPolygonalItem_1( KJS::ExecState *exe
 
 #if 0 // This constructor has been disabled by the XSL template
 
-    // Unsupported parameter QCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    QCanvas * arg0; // Dummy
+    TQCanvas * arg0; // Dummy
 
 
-    // We should now create an instance of the QCanvasPolygonalItem object
+    // We should now create an instance of the TQCanvasPolygonalItem object
 
-    QCanvasPolygonalItem *ret = new QCanvasPolygonalItem(
+    TQCanvasPolygonalItem *ret = new TQCanvasPolygonalItem(
 
           arg0 );
 
@@ -199,7 +199,7 @@ KJS::Value QCanvasPolygonalItemImp::call( KJS::ExecState *exec, KJS::Object &sel
         break;
     }
 
-    QString msg = i18n( "QCanvasPolygonalItemImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "QCanvasPolygonalItemImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -207,10 +207,10 @@ KJS::Value QCanvasPolygonalItemImp::call( KJS::ExecState *exec, KJS::Object &sel
 KJS::Value QCanvasPolygonalItemImp::collidesWith_3( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QCanvasItem *
+    // Unsupported parameter const TQCanvasItem *
     return KJS::Value();
 
-    const QCanvasItem * arg0; // Dummy
+    const TQCanvasItem * arg0; // Dummy
 
       bool ret;
       ret = instance->collidesWith(
@@ -225,7 +225,7 @@ KJS::Value QCanvasPolygonalItemImp::setPen_4( KJS::ExecState *exec, KJS::Object
     // Unsupported parameter QPen
     return KJS::Value();
 
-    QPen arg0; // Dummy
+    TQPen arg0; // Dummy
 
       instance->setPen(
        arg0 );
@@ -239,7 +239,7 @@ KJS::Value QCanvasPolygonalItemImp::setBrush_5( KJS::ExecState *exec, KJS::Objec
     // Unsupported parameter QBrush
     return KJS::Value();
 
-    QBrush arg0; // Dummy
+    TQBrush arg0; // Dummy
 
       instance->setBrush(
        arg0 );
@@ -249,7 +249,7 @@ KJS::Value QCanvasPolygonalItemImp::setBrush_5( KJS::ExecState *exec, KJS::Objec
 
 KJS::Value QCanvasPolygonalItemImp::pen_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    QPen ret;
+    TQPen ret;
       ret = instance->pen(  );
 
        return convertToValue( exec, ret );
@@ -258,7 +258,7 @@ KJS::Value QCanvasPolygonalItemImp::pen_6( KJS::ExecState *exec, KJS::Object &ob
 
 KJS::Value QCanvasPolygonalItemImp::brush_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    QBrush ret;
+    TQBrush ret;
       ret = instance->brush(  );
 
        return convertToValue( exec, ret );
@@ -283,7 +283,7 @@ KJS::Value QCanvasPolygonalItemImp::areaPointsAdvanced_9( KJS::ExecState *exec,
 
 KJS::Value QCanvasPolygonalItemImp::boundingRect_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    QRect ret;
+    TQRect ret;
       ret = instance->boundingRect(  );
 
        return convertToValue( exec, ret );
diff --git a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h
index fabda144..2316e7f9 100644
--- a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h
+++ b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.h
@@ -17,7 +17,7 @@ class QCanvasPolygonalItem;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for QCanvasPolygonalItem methods.
+ * Wrapper class for TQCanvasPolygonalItem methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -61,7 +61,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static QCanvasPolygonalItem *toQCanvasPolygonalItem( KJS::Object &object );
+   static TQCanvasPolygonalItem *toQCanvasPolygonalItem( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -100,7 +100,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   QCanvasPolygonalItem *instance; // Temp
+   TQCanvasPolygonalItem *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvasrectangle_imp.cpp b/kjsembed/qtbindings/qcanvasrectangle_imp.cpp
index 809d571b..72c7ee08 100644
--- a/kjsembed/qtbindings/qcanvasrectangle_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasrectangle_imp.cpp
@@ -1,12 +1,12 @@
 
 
 
-#include <qcstring.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qpalette.h>
-#include <qpixmap.h>
-#include <qfont.h>
+#include <tqcstring.h>
+#include <tqimage.h>
+#include <tqpainter.h>
+#include <tqpalette.h>
+#include <tqpixmap.h>
+#include <tqfont.h>
 
 #include <kjs/object.h>
 
@@ -15,7 +15,7 @@
 #include <kjsembed/jsopaqueproxy.h>
 #include <kjsembed/jsbinding.h>
 
-#include <qcanvas.h>
+#include <tqcanvas.h>
 #include "qcanvasrectangle_imp.h"
 
 /**
@@ -43,7 +43,7 @@ void QCanvasRectangleImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -76,7 +76,7 @@ void QCanvasRectangleImp::addBindings( KJS::ExecState *exec, KJS::Object &object
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -89,25 +89,25 @@ void QCanvasRectangleImp::addBindings( KJS::ExecState *exec, KJS::Object &object
 }
 
 /**
- * Extract a QCanvasRectangle pointer from an Object.
+ * Extract a TQCanvasRectangle pointer from an Object.
  */
-QCanvasRectangle *QCanvasRectangleImp::toQCanvasRectangle( KJS::Object &self )
+TQCanvasRectangle *QCanvasRectangleImp::toQCanvasRectangle( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        QObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<QCanvasRectangle *>( obj );
+           return dynamic_cast<TQCanvasRectangle *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "QCanvasRectangle" )
+    if ( op->typeName() != "TQCanvasRectangle" )
         return 0;
 
-    return op->toNative<QCanvasRectangle>();
+    return op->toNative<TQCanvasRectangle>();
 }
 
 /**
@@ -133,7 +133,7 @@ KJS::Object QCanvasRectangleImp::construct( KJS::ExecState *exec, const KJS::Lis
              break;
     }
 
-    QString msg = i18n("QCanvasRectangleCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("QCanvasRectangleCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -141,15 +141,15 @@ KJS::Object QCanvasRectangleImp::construct( KJS::ExecState *exec, const KJS::Lis
 KJS::Object QCanvasRectangleImp::QCanvasRectangle_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter QCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    QCanvas * arg0; // Dummy
+    TQCanvas * arg0; // Dummy
 
 
-    // We should now create an instance of the QCanvasRectangle object
+    // We should now create an instance of the TQCanvasRectangle object
 
-    QCanvasRectangle *ret = new QCanvasRectangle(
+    TQCanvasRectangle *ret = new TQCanvasRectangle(
 
           arg0 );
 
@@ -159,17 +159,17 @@ KJS::Object QCanvasRectangleImp::QCanvasRectangle_1( KJS::ExecState *exec, const
 KJS::Object QCanvasRectangleImp::QCanvasRectangle_2( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    QRect arg0 = extractQRect(exec, args, 0);
+    TQRect arg0 = extractQRect(exec, args, 0);
 
-    // Unsupported parameter QCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    QCanvas * arg1; // Dummy
+    TQCanvas * arg1; // Dummy
 
 
-    // We should now create an instance of the QCanvasRectangle object
+    // We should now create an instance of the TQCanvasRectangle object
 
-    QCanvasRectangle *ret = new QCanvasRectangle(
+    TQCanvasRectangle *ret = new TQCanvasRectangle(
 
           arg0,
           arg1 );
@@ -188,15 +188,15 @@ KJS::Object QCanvasRectangleImp::QCanvasRectangle_3( KJS::ExecState *exec, const
 
     int arg3 = extractInt(exec, args, 3);
 
-    // Unsupported parameter QCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    QCanvas * arg4; // Dummy
+    TQCanvas * arg4; // Dummy
 
 
-    // We should now create an instance of the QCanvasRectangle object
+    // We should now create an instance of the TQCanvasRectangle object
 
-    QCanvasRectangle *ret = new QCanvasRectangle(
+    TQCanvasRectangle *ret = new TQCanvasRectangle(
 
           arg0,
           arg1,
@@ -249,7 +249,7 @@ KJS::Value QCanvasRectangleImp::call( KJS::ExecState *exec, KJS::Object &self, c
         break;
     }
 
-    QString msg = i18n( "QCanvasRectangleImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "QCanvasRectangleImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -288,7 +288,7 @@ KJS::Value QCanvasRectangleImp::setSize_7( KJS::ExecState *exec, KJS::Object &ob
 
 KJS::Value QCanvasRectangleImp::size_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    QSize ret;
+    TQSize ret;
       ret = instance->size(  );
 
        return convertToValue( exec, ret );
@@ -305,7 +305,7 @@ KJS::Value QCanvasRectangleImp::areaPoints_9( KJS::ExecState *exec, KJS::Object
 
 KJS::Value QCanvasRectangleImp::rect_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    QRect ret;
+    TQRect ret;
       ret = instance->rect(  );
 
        return convertToValue( exec, ret );
@@ -315,10 +315,10 @@ KJS::Value QCanvasRectangleImp::rect_10( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value QCanvasRectangleImp::collidesWith_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QCanvasItem *
+    // Unsupported parameter const TQCanvasItem *
     return KJS::Value();
 
-    const QCanvasItem * arg0; // Dummy
+    const TQCanvasItem * arg0; // Dummy
 
       bool ret;
       ret = instance->collidesWith(
diff --git a/kjsembed/qtbindings/qcanvasrectangle_imp.h b/kjsembed/qtbindings/qcanvasrectangle_imp.h
index 0ba72f37..b2ff92a3 100644
--- a/kjsembed/qtbindings/qcanvasrectangle_imp.h
+++ b/kjsembed/qtbindings/qcanvasrectangle_imp.h
@@ -17,7 +17,7 @@ class QCanvasRectangle;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for QCanvasRectangle methods.
+ * Wrapper class for TQCanvasRectangle methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -62,7 +62,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static QCanvasRectangle *toQCanvasRectangle( KJS::Object &object );
+   static TQCanvasRectangle *toQCanvasRectangle( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -102,7 +102,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   QCanvasRectangle *instance; // Temp
+   TQCanvasRectangle *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvasspline_imp.cpp b/kjsembed/qtbindings/qcanvasspline_imp.cpp
index 57ea74b1..54edeb8f 100644
--- a/kjsembed/qtbindings/qcanvasspline_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasspline_imp.cpp
@@ -1,12 +1,12 @@
 
 
 
-#include <qcstring.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qpalette.h>
-#include <qpixmap.h>
-#include <qfont.h>
+#include <tqcstring.h>
+#include <tqimage.h>
+#include <tqpainter.h>
+#include <tqpalette.h>
+#include <tqpixmap.h>
+#include <tqfont.h>
 
 #include <kjs/object.h>
 
@@ -15,7 +15,7 @@
 #include <kjsembed/jsopaqueproxy.h>
 #include <kjsembed/jsbinding.h>
 
-#include <qcanvas.h>
+#include <tqcanvas.h>
 #include "qcanvasspline_imp.h"
 
 /**
@@ -43,7 +43,7 @@ void QCanvasSplineImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &obj
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -72,7 +72,7 @@ void QCanvasSplineImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -85,25 +85,25 @@ void QCanvasSplineImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a QCanvasSpline pointer from an Object.
+ * Extract a TQCanvasSpline pointer from an Object.
  */
-QCanvasSpline *QCanvasSplineImp::toQCanvasSpline( KJS::Object &self )
+TQCanvasSpline *QCanvasSplineImp::toQCanvasSpline( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        QObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<QCanvasSpline *>( obj );
+           return dynamic_cast<TQCanvasSpline *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "QCanvasSpline" )
+    if ( op->typeName() != "TQCanvasSpline" )
         return 0;
 
-    return op->toNative<QCanvasSpline>();
+    return op->toNative<TQCanvasSpline>();
 }
 
 /**
@@ -121,7 +121,7 @@ KJS::Object QCanvasSplineImp::construct( KJS::ExecState *exec, const KJS::List &
              break;
     }
 
-    QString msg = i18n("QCanvasSplineCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("QCanvasSplineCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -129,15 +129,15 @@ KJS::Object QCanvasSplineImp::construct( KJS::ExecState *exec, const KJS::List &
 KJS::Object QCanvasSplineImp::QCanvasSpline_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter QCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    QCanvas * arg0; // Dummy
+    TQCanvas * arg0; // Dummy
 
 
-    // We should now create an instance of the QCanvasSpline object
+    // We should now create an instance of the TQCanvasSpline object
 
-    QCanvasSpline *ret = new QCanvasSpline(
+    TQCanvasSpline *ret = new TQCanvasSpline(
 
           arg0 );
 
@@ -170,7 +170,7 @@ KJS::Value QCanvasSplineImp::call( KJS::ExecState *exec, KJS::Object &self, cons
         break;
     }
 
-    QString msg = i18n( "QCanvasSplineImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "QCanvasSplineImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -181,7 +181,7 @@ KJS::Value QCanvasSplineImp::setControlPoints_3( KJS::ExecState *exec, KJS::Obje
     // Unsupported parameter QPointArray
     return KJS::Value();
 
-    QPointArray arg0; // Dummy
+    TQPointArray arg0; // Dummy
 
     bool arg1 = extractBool(exec, args, 1);
 
diff --git a/kjsembed/qtbindings/qcanvasspline_imp.h b/kjsembed/qtbindings/qcanvasspline_imp.h
index dc4d4ed8..28679bcb 100644
--- a/kjsembed/qtbindings/qcanvasspline_imp.h
+++ b/kjsembed/qtbindings/qcanvasspline_imp.h
@@ -17,7 +17,7 @@ class QCanvasSpline;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for QCanvasSpline methods.
+ * Wrapper class for TQCanvasSpline methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -56,7 +56,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static QCanvasSpline *toQCanvasSpline( KJS::Object &object );
+   static TQCanvasSpline *toQCanvasSpline( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -90,7 +90,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   QCanvasSpline *instance; // Temp
+   TQCanvasSpline *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvassprite_imp.cpp b/kjsembed/qtbindings/qcanvassprite_imp.cpp
index 6268e75c..7d9898b3 100644
--- a/kjsembed/qtbindings/qcanvassprite_imp.cpp
+++ b/kjsembed/qtbindings/qcanvassprite_imp.cpp
@@ -1,12 +1,12 @@
 
 
 
-#include <qcstring.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qpalette.h>
-#include <qpixmap.h>
-#include <qfont.h>
+#include <tqcstring.h>
+#include <tqimage.h>
+#include <tqpainter.h>
+#include <tqpalette.h>
+#include <tqpixmap.h>
+#include <tqfont.h>
 
 #include <kjs/object.h>
 
@@ -15,7 +15,7 @@
 #include <kjsembed/jsopaqueproxy.h>
 #include <kjsembed/jsbinding.h>
 
-#include <qcanvas.h>
+#include <tqcanvas.h>
 #include "qcanvassprite_imp.h"
 
 /**
@@ -43,7 +43,7 @@ void QCanvasSpriteImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &obj
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -66,8 +66,8 @@ void QCanvasSpriteImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &obj
     EnumValue enums[] = {
 
         // enum FrameAnimationType
-        { "Cycle", QCanvasSprite::Cycle },
-        { "Oscillate", QCanvasSprite::Oscillate },
+        { "Cycle", TQCanvasSprite::Cycle },
+        { "Oscillate", TQCanvasSprite::Oscillate },
 	{ 0, 0 }
     };
 
@@ -115,7 +115,7 @@ void QCanvasSpriteImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -128,25 +128,25 @@ void QCanvasSpriteImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a QCanvasSprite pointer from an Object.
+ * Extract a TQCanvasSprite pointer from an Object.
  */
-QCanvasSprite *QCanvasSpriteImp::toQCanvasSprite( KJS::Object &self )
+TQCanvasSprite *QCanvasSpriteImp::toQCanvasSprite( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        QObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<QCanvasSprite *>( obj );
+           return dynamic_cast<TQCanvasSprite *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "QCanvasSprite" )
+    if ( op->typeName() != "TQCanvasSprite" )
         return 0;
 
-    return op->toNative<QCanvasSprite>();
+    return op->toNative<TQCanvasSprite>();
 }
 
 /**
@@ -164,7 +164,7 @@ KJS::Object QCanvasSpriteImp::construct( KJS::ExecState *exec, const KJS::List &
              break;
     }
 
-    QString msg = i18n("QCanvasSpriteCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("QCanvasSpriteCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -172,20 +172,20 @@ KJS::Object QCanvasSpriteImp::construct( KJS::ExecState *exec, const KJS::List &
 KJS::Object QCanvasSpriteImp::QCanvasSprite_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter QCanvasPixmapArray *
+    // Unsupported parameter TQCanvasPixmapArray *
     return KJS::Object();
 
-    QCanvasPixmapArray * arg0; // Dummy
+    TQCanvasPixmapArray * arg0; // Dummy
 
-    // Unsupported parameter QCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    QCanvas * arg1; // Dummy
+    TQCanvas * arg1; // Dummy
 
 
-    // We should now create an instance of the QCanvasSprite object
+    // We should now create an instance of the TQCanvasSprite object
 
-    QCanvasSprite *ret = new QCanvasSprite(
+    TQCanvasSprite *ret = new TQCanvasSprite(
 
           arg0,
           arg1 );
@@ -303,7 +303,7 @@ KJS::Value QCanvasSpriteImp::call( KJS::ExecState *exec, KJS::Object &self, cons
         break;
     }
 
-    QString msg = i18n( "QCanvasSpriteImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "QCanvasSpriteImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -311,10 +311,10 @@ KJS::Value QCanvasSpriteImp::call( KJS::ExecState *exec, KJS::Object &self, cons
 KJS::Value QCanvasSpriteImp::setSequence_2( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QCanvasPixmapArray *
+    // Unsupported parameter TQCanvasPixmapArray *
     return KJS::Value();
 
-    QCanvasPixmapArray * arg0; // Dummy
+    TQCanvasPixmapArray * arg0; // Dummy
 
       instance->setSequence(
        arg0 );
@@ -367,7 +367,7 @@ KJS::Value QCanvasSpriteImp::setFrame_6( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value QCanvasSpriteImp::setFrameAnimation_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QCanvasSprite::FrameAnimationType arg0 = QCanvasSprite::Cycle; // TODO (hack for QCanvasSprite)
+    TQCanvasSprite::FrameAnimationType arg0 = TQCanvasSprite::Cycle; // TODO (hack for TQCanvasSprite)
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -411,10 +411,10 @@ KJS::Value QCanvasSpriteImp::rtti_10( KJS::ExecState *exec, KJS::Object &obj, co
 KJS::Value QCanvasSpriteImp::collidesWith_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QCanvasItem *
+    // Unsupported parameter const TQCanvasItem *
     return KJS::Value();
 
-    const QCanvasItem * arg0; // Dummy
+    const TQCanvasItem * arg0; // Dummy
 
       bool ret;
       ret = instance->collidesWith(
@@ -425,7 +425,7 @@ KJS::Value QCanvasSpriteImp::collidesWith_11( KJS::ExecState *exec, KJS::Object
 
 KJS::Value QCanvasSpriteImp::boundingRect_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    QRect ret;
+    TQRect ret;
       ret = instance->boundingRect(  );
 
        return convertToValue( exec, ret );
@@ -538,7 +538,7 @@ KJS::Value QCanvasSpriteImp::image_23( KJS::ExecState *exec, KJS::Object &obj, c
 {
 
       instance->image(  );
-      return KJS::Value(); // Returns 'QCanvasPixmap *'
+      return KJS::Value(); // Returns 'TQCanvasPixmap *'
 
 }
 
@@ -546,7 +546,7 @@ KJS::Value QCanvasSpriteImp::imageAdvanced_24( KJS::ExecState *exec, KJS::Object
 {
 
       instance->imageAdvanced(  );
-      return KJS::Value(); // Returns 'QCanvasPixmap *'
+      return KJS::Value(); // Returns 'TQCanvasPixmap *'
 
 }
 
@@ -557,7 +557,7 @@ KJS::Value QCanvasSpriteImp::image_25( KJS::ExecState *exec, KJS::Object &obj, c
 
       instance->image(
        arg0 );
-      return KJS::Value(); // Returns 'QCanvasPixmap *'
+      return KJS::Value(); // Returns 'TQCanvasPixmap *'
 
 }
 
@@ -575,7 +575,7 @@ KJS::Value QCanvasSpriteImp::advance_26( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value QCanvasSpriteImp::draw_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QPainter arg0; // TODO (hack for qcanvas)
+    TQPainter arg0; // TODO (hack for qcanvas)
 
       instance->draw(
        arg0 );
diff --git a/kjsembed/qtbindings/qcanvassprite_imp.h b/kjsembed/qtbindings/qcanvassprite_imp.h
index 5f597077..c62f86db 100644
--- a/kjsembed/qtbindings/qcanvassprite_imp.h
+++ b/kjsembed/qtbindings/qcanvassprite_imp.h
@@ -17,7 +17,7 @@ class QCanvasSprite;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for QCanvasSprite methods.
+ * Wrapper class for TQCanvasSprite methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -77,7 +77,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static QCanvasSprite *toQCanvasSprite( KJS::Object &object );
+   static TQCanvasSprite *toQCanvasSprite( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -132,7 +132,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   QCanvasSprite *instance; // Temp
+   TQCanvasSprite *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvastext_imp.cpp b/kjsembed/qtbindings/qcanvastext_imp.cpp
index 84548eea..44db9795 100644
--- a/kjsembed/qtbindings/qcanvastext_imp.cpp
+++ b/kjsembed/qtbindings/qcanvastext_imp.cpp
@@ -1,12 +1,12 @@
 
 
 
-#include <qcstring.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qpalette.h>
-#include <qpixmap.h>
-#include <qfont.h>
+#include <tqcstring.h>
+#include <tqimage.h>
+#include <tqpainter.h>
+#include <tqpalette.h>
+#include <tqpixmap.h>
+#include <tqfont.h>
 
 #include <kjs/object.h>
 
@@ -15,7 +15,7 @@
 #include <kjsembed/jsopaqueproxy.h>
 #include <kjsembed/jsbinding.h>
 
-#include <qcanvas.h>
+#include <tqcanvas.h>
 #include "qcanvastext_imp.h"
 
 /**
@@ -43,7 +43,7 @@ void QCanvasTextImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &objec
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -80,7 +80,7 @@ void QCanvasTextImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -93,25 +93,25 @@ void QCanvasTextImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a QCanvasText pointer from an Object.
+ * Extract a TQCanvasText pointer from an Object.
  */
-QCanvasText *QCanvasTextImp::toQCanvasText( KJS::Object &self )
+TQCanvasText *QCanvasTextImp::toQCanvasText( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        QObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<QCanvasText *>( obj );
+           return dynamic_cast<TQCanvasText *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "QCanvasText" )
+    if ( op->typeName() != "TQCanvasText" )
         return 0;
 
-    return op->toNative<QCanvasText>();
+    return op->toNative<TQCanvasText>();
 }
 
 /**
@@ -137,7 +137,7 @@ KJS::Object QCanvasTextImp::construct( KJS::ExecState *exec, const KJS::List &ar
              break;
     }
 
-    QString msg = i18n("QCanvasTextCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("QCanvasTextCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -145,15 +145,15 @@ KJS::Object QCanvasTextImp::construct( KJS::ExecState *exec, const KJS::List &ar
 KJS::Object QCanvasTextImp::QCanvasText_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter QCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    QCanvas * arg0; // Dummy
+    TQCanvas * arg0; // Dummy
 
 
-    // We should now create an instance of the QCanvasText object
+    // We should now create an instance of the TQCanvasText object
 
-    QCanvasText *ret = new QCanvasText(
+    TQCanvasText *ret = new TQCanvasText(
 
           arg0 );
 
@@ -163,17 +163,17 @@ KJS::Object QCanvasTextImp::QCanvasText_1( KJS::ExecState *exec, const KJS::List
 KJS::Object QCanvasTextImp::QCanvasText_2( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    QString arg0 = extractQString(exec, args, 0);
+    TQString arg0 = extractQString(exec, args, 0);
 
-    // Unsupported parameter QCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    QCanvas * arg1; // Dummy
+    TQCanvas * arg1; // Dummy
 
 
-    // We should now create an instance of the QCanvasText object
+    // We should now create an instance of the TQCanvasText object
 
-    QCanvasText *ret = new QCanvasText(
+    TQCanvasText *ret = new TQCanvasText(
 
           arg0,
           arg1 );
@@ -184,22 +184,22 @@ KJS::Object QCanvasTextImp::QCanvasText_2( KJS::ExecState *exec, const KJS::List
 KJS::Object QCanvasTextImp::QCanvasText_3( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    QString arg0 = extractQString(exec, args, 0);
+    TQString arg0 = extractQString(exec, args, 0);
 
     // Unsupported parameter QFont
     return KJS::Object();
 
-    QFont arg1; // Dummy
+    TQFont arg1; // Dummy
 
-    // Unsupported parameter QCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Object();
 
-    QCanvas * arg2; // Dummy
+    TQCanvas * arg2; // Dummy
 
 
-    // We should now create an instance of the QCanvasText object
+    // We should now create an instance of the TQCanvasText object
 
-    QCanvasText *ret = new QCanvasText(
+    TQCanvasText *ret = new TQCanvasText(
 
           arg0,
           arg1,
@@ -266,7 +266,7 @@ KJS::Value QCanvasTextImp::call( KJS::ExecState *exec, KJS::Object &self, const
         break;
     }
 
-    QString msg = i18n( "QCanvasTextImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "QCanvasTextImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -274,7 +274,7 @@ KJS::Value QCanvasTextImp::call( KJS::ExecState *exec, KJS::Object &self, const
 KJS::Value QCanvasTextImp::setText_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QString arg0 = extractQString(exec, args, 0);
+    TQString arg0 = extractQString(exec, args, 0);
 
       instance->setText(
        arg0 );
@@ -285,7 +285,7 @@ KJS::Value QCanvasTextImp::setText_5( KJS::ExecState *exec, KJS::Object &obj, co
 KJS::Value QCanvasTextImp::setFont_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QFont arg0 = extractQFont(exec, args, 0);
+    TQFont arg0 = extractQFont(exec, args, 0);
 
       instance->setFont(
        arg0 );
@@ -296,7 +296,7 @@ KJS::Value QCanvasTextImp::setFont_6( KJS::ExecState *exec, KJS::Object &obj, co
 KJS::Value QCanvasTextImp::setColor_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QColor arg0 = extractQColor(exec, args, 0);
+    TQColor arg0 = extractQColor(exec, args, 0);
 
       instance->setColor(
        arg0 );
@@ -307,7 +307,7 @@ KJS::Value QCanvasTextImp::setColor_7( KJS::ExecState *exec, KJS::Object &obj, c
 KJS::Value QCanvasTextImp::text_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      QString ret;
+      TQString ret;
       ret = instance->text(  );
       return KJS::String( ret );
 
@@ -365,7 +365,7 @@ KJS::Value QCanvasTextImp::setTextFlags_13( KJS::ExecState *exec, KJS::Object &o
 
 KJS::Value QCanvasTextImp::boundingRect_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    QRect ret;
+    TQRect ret;
       ret = instance->boundingRect(  );
 
        return convertToValue( exec, ret );
@@ -375,10 +375,10 @@ KJS::Value QCanvasTextImp::boundingRect_14( KJS::ExecState *exec, KJS::Object &o
 KJS::Value QCanvasTextImp::collidesWith_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QCanvasItem *
+    // Unsupported parameter const TQCanvasItem *
     return KJS::Value();
 
-    const QCanvasItem * arg0; // Dummy
+    const TQCanvasItem * arg0; // Dummy
 
       bool ret;
       ret = instance->collidesWith(
diff --git a/kjsembed/qtbindings/qcanvastext_imp.h b/kjsembed/qtbindings/qcanvastext_imp.h
index 56fa2b6a..bf2049bd 100644
--- a/kjsembed/qtbindings/qcanvastext_imp.h
+++ b/kjsembed/qtbindings/qcanvastext_imp.h
@@ -17,7 +17,7 @@ class QCanvasText;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for QCanvasText methods.
+ * Wrapper class for TQCanvasText methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -66,7 +66,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static QCanvasText *toQCanvasText( KJS::Object &object );
+   static TQCanvasText *toQCanvasText( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -110,7 +110,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   QCanvasText *instance; // Temp
+   TQCanvasText *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcanvasview_imp.cpp b/kjsembed/qtbindings/qcanvasview_imp.cpp
index f51e7f0c..bf190920 100644
--- a/kjsembed/qtbindings/qcanvasview_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasview_imp.cpp
@@ -1,12 +1,12 @@
 
 
 
-#include <qcstring.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qpalette.h>
-#include <qpixmap.h>
-#include <qfont.h>
+#include <tqcstring.h>
+#include <tqimage.h>
+#include <tqpainter.h>
+#include <tqpalette.h>
+#include <tqpixmap.h>
+#include <tqfont.h>
 
 #include <kjs/object.h>
 
@@ -15,7 +15,7 @@
 #include <kjsembed/jsopaqueproxy.h>
 #include <kjsembed/jsbinding.h>
 
-#include <qcanvas.h>
+#include <tqcanvas.h>
 #include "qcanvasview_imp.h"
 
 /**
@@ -43,7 +43,7 @@ void QCanvasViewImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &objec
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -73,7 +73,7 @@ void QCanvasViewImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -86,25 +86,25 @@ void QCanvasViewImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a QCanvasView pointer from an Object.
+ * Extract a TQCanvasView pointer from an Object.
  */
-QCanvasView *QCanvasViewImp::toQCanvasView( KJS::Object &self )
+TQCanvasView *QCanvasViewImp::toQCanvasView( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        QObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<QCanvasView *>( obj );
+           return dynamic_cast<TQCanvasView *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "QCanvasView" )
+    if ( op->typeName() != "TQCanvasView" )
         return 0;
 
-    return op->toNative<QCanvasView>();
+    return op->toNative<TQCanvasView>();
 }
 
 /**
@@ -126,7 +126,7 @@ KJS::Object QCanvasViewImp::construct( KJS::ExecState *exec, const KJS::List &ar
              break;
     }
 
-    QString msg = i18n("QCanvasViewCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("QCanvasViewCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -134,50 +134,50 @@ KJS::Object QCanvasViewImp::construct( KJS::ExecState *exec, const KJS::List &ar
 KJS::Object QCanvasViewImp::QCanvasView_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    QWidget *arg0 = extractQWidget(exec, args, 0);
+    TQWidget *arg0 = extractQWidget(exec, args, 0);
 
 
     const char *arg1 = (args.size() >= 2) ? args[1].toString(exec).ascii() : 0;
 
-    Qt::WFlags arg2 = 0; // TODO (hack for QCanvasView)
+    Qt::WFlags arg2 = 0; // TODO (hack for TQCanvasView)
 
 
-    // We should now create an instance of the QCanvasView object
+    // We should now create an instance of the TQCanvasView object
 
-    QCanvasView *ret = new QCanvasView(
+    TQCanvasView *ret = new TQCanvasView(
 
           arg0,
           arg1,
           arg2 );
 
-    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "QCanvasView");
+    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TQCanvasView");
     return KJS::Object( prx );
 }
 
 KJS::Object QCanvasViewImp::QCanvasView_2( KJS::ExecState *exec, const KJS::List &args )
 {
-    QCanvas * arg0 = 0L;;
+    TQCanvas * arg0 = 0L;;
 
     KJS::Object obj = args[0].toObject(exec);
     JSObjectProxy *proxy = JSProxy::toObjectProxy( obj.imp() );
-    if ( proxy ) arg0 = dynamic_cast<QCanvas *>( proxy->widget() );
+    if ( proxy ) arg0 = dynamic_cast<TQCanvas *>( proxy->widget() );
 
-    QWidget * arg1 = extractQWidget(exec, args, 1);
+    TQWidget * arg1 = extractQWidget(exec, args, 1);
 
     const char *arg2 = (args.size() >= 3) ? args[2].toString(exec).ascii() : 0;
 
-    Qt::WFlags arg3 = 0; // TODO (hack for QCanvasView)
+    Qt::WFlags arg3 = 0; // TODO (hack for TQCanvasView)
 
 
-    // We should now create an instance of the QCanvasView object
+    // We should now create an instance of the TQCanvasView object
 
-    QCanvasView *ret = new QCanvasView(
+    TQCanvasView *ret = new TQCanvasView(
           arg0,
           arg1,
           arg2,
           arg3 );
 
-    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "QCanvasView");
+    JSOpaqueProxy *prx = new JSOpaqueProxy( ret, "TQCanvasView");
     return KJS::Object( prx );
 }
 
@@ -211,7 +211,7 @@ KJS::Value QCanvasViewImp::call( KJS::ExecState *exec, KJS::Object &self, const
         break;
     }
 
-    QString msg = i18n( "QCanvasViewImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "QCanvasViewImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -220,17 +220,17 @@ KJS::Value QCanvasViewImp::canvas_4( KJS::ExecState *exec, KJS::Object &obj, con
 {
 
       instance->canvas(  );
-      return KJS::Value(); // Returns 'QCanvas *'
+      return KJS::Value(); // Returns 'TQCanvas *'
 
 }
 
 KJS::Value QCanvasViewImp::setCanvas_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QCanvas *
+    // Unsupported parameter TQCanvas *
     return KJS::Value();
 
-    QCanvas * arg0; // Dummy
+    TQCanvas * arg0; // Dummy
 
       instance->setCanvas(
        arg0 );
@@ -242,7 +242,7 @@ KJS::Value QCanvasViewImp::worldMatrix_6( KJS::ExecState *exec, KJS::Object &obj
 {
 
       instance->worldMatrix(  );
-      return KJS::Value(); // Returns 'const QWMatrix &'
+      return KJS::Value(); // Returns 'const TQWMatrix &'
 
 }
 
@@ -250,14 +250,14 @@ KJS::Value QCanvasViewImp::inverseWorldMatrix_7( KJS::ExecState *exec, KJS::Obje
 {
 
       instance->inverseWorldMatrix(  );
-      return KJS::Value(); // Returns 'const QWMatrix &'
+      return KJS::Value(); // Returns 'const TQWMatrix &'
 
 }
 
 KJS::Value QCanvasViewImp::setWorldMatrix_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QWMatrix arg0; // TODO (hack for qcanvasview)
+    TQWMatrix arg0; // TODO (hack for qcanvasview)
 
       bool ret;
       ret = instance->setWorldMatrix(
diff --git a/kjsembed/qtbindings/qcanvasview_imp.h b/kjsembed/qtbindings/qcanvasview_imp.h
index 59024535..03fac913 100644
--- a/kjsembed/qtbindings/qcanvasview_imp.h
+++ b/kjsembed/qtbindings/qcanvasview_imp.h
@@ -17,7 +17,7 @@ class QCanvasView;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for QCanvasView methods.
+ * Wrapper class for TQCanvasView methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -58,7 +58,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static QCanvasView *toQCanvasView( KJS::Object &object );
+   static TQCanvasView *toQCanvasView( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -94,7 +94,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   QCanvasView *instance; // Temp
+   TQCanvasView *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qchecklistitem_imp.cpp b/kjsembed/qtbindings/qchecklistitem_imp.cpp
index afa32dab..508861f5 100644
--- a/kjsembed/qtbindings/qchecklistitem_imp.cpp
+++ b/kjsembed/qtbindings/qchecklistitem_imp.cpp
@@ -1,10 +1,10 @@
 
 
 
-#include <qcstring.h>
-#include <qpalette.h>
-#include <qpixmap.h>
-#include <qfont.h>
+#include <tqcstring.h>
+#include <tqpalette.h>
+#include <tqpixmap.h>
+#include <tqfont.h>
 
 #include <kjs/object.h>
 
@@ -13,7 +13,7 @@
 #include <kjsembed/jsopaqueproxy.h>
 #include <kjsembed/jsbinding.h>
 
-#include <qlistview.h>
+#include <tqlistview.h>
 #include "qchecklistitem_imp.h"
 #include "qlistviewitem_imp.h"
 /**
@@ -28,21 +28,21 @@ namespace Bindings {
                         // FALL THRU
         } else {
             JSOpaqueProxy * arg0 = JSProxy::toOpaqueProxy( args[ 0 ].imp() );
-            QString arg1 = ( args.size() >= 2 ) ? args[ 1 ].toString( exec ).qstring() : QString::null;
+            TQString arg1 = ( args.size() >= 2 ) ? args[ 1 ].toString( exec ).qstring() : TQString::null;
             JSOpaqueProxy *prx = 0;
 
             if ( arg0 ) {
-                if ( arg0->typeName() == "QListViewItem" ) {
-                    QListViewItem * parent = arg0->toNative<QListViewItem>();
-                    prx = new JSOpaqueProxy( new QCheckListItem( parent, arg1 ), "QCheckListItem" );
+                if ( arg0->typeName() == "TQListViewItem" ) {
+                    TQListViewItem * parent = arg0->toNative<TQListViewItem>();
+                    prx = new JSOpaqueProxy( new TQCheckListItem( parent, arg1 ), "TQCheckListItem" );
                 } else {
                     return KJS::Object();
                 }
             } else {
                 JSObjectProxy *arg0 = JSProxy::toObjectProxy( args[ 0 ].imp() );
                 if ( arg0 ) {
-                    QListView * parent = ( QListView * ) ( arg0->widget() );
-                    prx = new JSOpaqueProxy( new QCheckListItem( parent, arg1 ), "QCheckListItem" );
+                    TQListView * parent = ( TQListView * ) ( arg0->widget() );
+                    prx = new JSOpaqueProxy( new TQCheckListItem( parent, arg1 ), "TQCheckListItem" );
                 } else {
                     return KJS::Object();
                 }
@@ -92,7 +92,7 @@ void QCheckListItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].id ) {
         if ( lastName != methods[idx].name ) {
@@ -115,15 +115,15 @@ void QCheckListItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     EnumValue enums[] = {
 
         // enum Type
-        { "RadioButton", QCheckListItem::RadioButton },
-        { "CheckBox", QCheckListItem::CheckBox },
-        { "Controller", QCheckListItem::Controller },
-        { "RadioButtonController", QCheckListItem::RadioButtonController },
-        { "CheckBoxController", QCheckListItem::CheckBoxController },
+        { "RadioButton", TQCheckListItem::RadioButton },
+        { "CheckBox", TQCheckListItem::CheckBox },
+        { "Controller", TQCheckListItem::Controller },
+        { "RadioButtonController", TQCheckListItem::RadioButtonController },
+        { "CheckBoxController", TQCheckListItem::CheckBoxController },
         // enum ToggleState
-        { "Off", QCheckListItem::Off },
-        { "NoChange", QCheckListItem::NoChange },
-        { "On", QCheckListItem::On },
+        { "Off", TQCheckListItem::Off },
+        { "NoChange", TQCheckListItem::NoChange },
+        { "On", TQCheckListItem::On },
 	{ 0, 0 }
     };
 
@@ -135,19 +135,19 @@ void QCheckListItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 
 }
 
-QCheckListItem *QCheckListItemImp::toQCheckListItem( KJS::Object &self )
+TQCheckListItem *QCheckListItemImp::toQCheckListItem( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        QObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<QCheckListItem *>( obj );
+           return dynamic_cast<TQCheckListItem *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
-    return op->toNative<QCheckListItem>();
+    return op->toNative<TQCheckListItem>();
 }
 
 
@@ -191,7 +191,7 @@ KJS::Object QCheckListItemImp::construct( KJS::ExecState *exec, const KJS::List
              break;
     }
 
-    QString msg = i18n("QCheckListItemCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("QCheckListItemCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -199,11 +199,11 @@ KJS::Object QCheckListItemImp::construct( KJS::ExecState *exec, const KJS::List
 KJS::Object QCheckListItemImp::QCheckListItem_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    QWidget *arg0 = extractQWidget(exec,args,0);
+    TQWidget *arg0 = extractQWidget(exec,args,0);
 
-    QWidget *arg1 = extractQWidget(exec,args,1);
+    TQWidget *arg1 = extractQWidget(exec,args,1);
 
-    QWidget *arg2 = extractQWidget(exec,args,2);
+    TQWidget *arg2 = extractQWidget(exec,args,2);
 
     return KJS::Object(  );
 }
@@ -212,16 +212,16 @@ KJS::Object QCheckListItemImp::QCheckListItem_2( KJS::ExecState *exec, const KJS
 {
 
     // TODO
-    QWidget *arg0 = extractQWidget(exec,args,0);
+    TQWidget *arg0 = extractQWidget(exec,args,0);
 
     // TODO
-    QWidget *arg1 = extractQWidget(exec,args,0);
+    TQWidget *arg1 = extractQWidget(exec,args,0);
 
     // TODO
-    QWidget *arg2 = extractQWidget(exec,args,0);
+    TQWidget *arg2 = extractQWidget(exec,args,0);
 
     // TODO
-    QWidget *arg3 = extractQWidget(exec,args,0);
+    TQWidget *arg3 = extractQWidget(exec,args,0);
     return KJS::Object();
 
 }
@@ -230,13 +230,13 @@ KJS::Object QCheckListItemImp::QCheckListItem_3( KJS::ExecState *exec, const KJS
 {
 
     // TODO
-    QWidget *arg0 = extractQWidget(exec,args,0);
+    TQWidget *arg0 = extractQWidget(exec,args,0);
 
     // TODO
-    QWidget *arg1 = extractQWidget(exec,args,0);
+    TQWidget *arg1 = extractQWidget(exec,args,0);
 
     // TODO
-    QWidget *arg2 = extractQWidget(exec,args,0);
+    TQWidget *arg2 = extractQWidget(exec,args,0);
     return KJS::Object();
 
 }
@@ -245,16 +245,16 @@ KJS::Object QCheckListItemImp::QCheckListItem_4( KJS::ExecState *exec, const KJS
 {
 
     // TODO
-    QWidget *arg0 = extractQWidget(exec,args,0);
+    TQWidget *arg0 = extractQWidget(exec,args,0);
 
     // TODO
-    QWidget *arg1 = extractQWidget(exec,args,0);
+    TQWidget *arg1 = extractQWidget(exec,args,0);
 
     // TODO
-    QWidget *arg2 = extractQWidget(exec,args,0);
+    TQWidget *arg2 = extractQWidget(exec,args,0);
 
     // TODO
-    QWidget *arg3 = extractQWidget(exec,args,0);
+    TQWidget *arg3 = extractQWidget(exec,args,0);
     return KJS::Object();
 
 }
@@ -263,13 +263,13 @@ KJS::Object QCheckListItemImp::QCheckListItem_5( KJS::ExecState *exec, const KJS
 {
 
     // TODO
-    QWidget *arg0 = extractQWidget(exec,args,0);
+    TQWidget *arg0 = extractQWidget(exec,args,0);
 
     // TODO
-    QWidget *arg1 = extractQWidget(exec,args,0);
+    TQWidget *arg1 = extractQWidget(exec,args,0);
 
     // TODO
-    QWidget *arg2 = extractQWidget(exec,args,0);
+    TQWidget *arg2 = extractQWidget(exec,args,0);
     return KJS::Object();
 
 }
@@ -278,16 +278,16 @@ KJS::Object QCheckListItemImp::QCheckListItem_6( KJS::ExecState *exec, const KJS
 {
 
     // TODO
-    QWidget *arg0 = extractQWidget(exec,args,0);
+    TQWidget *arg0 = extractQWidget(exec,args,0);
 
     // TODO
-    QWidget *arg1 = extractQWidget(exec,args,0);
+    TQWidget *arg1 = extractQWidget(exec,args,0);
 
     // TODO
-    QWidget *arg2 = extractQWidget(exec,args,0);
+    TQWidget *arg2 = extractQWidget(exec,args,0);
 
     // TODO
-    QWidget *arg3 = extractQWidget(exec,args,0);
+    TQWidget *arg3 = extractQWidget(exec,args,0);
     return KJS::Object();
 
 }
@@ -296,13 +296,13 @@ KJS::Object QCheckListItemImp::QCheckListItem_7( KJS::ExecState *exec, const KJS
 {
 
     // TODO
-    QWidget *arg0 = extractQWidget(exec,args,0);
+    TQWidget *arg0 = extractQWidget(exec,args,0);
 
     // TODO
-    QWidget *arg1 = extractQWidget(exec,args,0);
+    TQWidget *arg1 = extractQWidget(exec,args,0);
 
     // TODO
-    QWidget *arg2 = extractQWidget(exec,args,0);
+    TQWidget *arg2 = extractQWidget(exec,args,0);
     return KJS::Object();
 
 }
@@ -311,13 +311,13 @@ KJS::Object QCheckListItemImp::QCheckListItem_8( KJS::ExecState *exec, const KJS
 {
 
     // TODO
-    QWidget *arg0 = extractQWidget(exec,args,0);
+    TQWidget *arg0 = extractQWidget(exec,args,0);
 
     // TODO
-    QWidget *arg1 = extractQWidget(exec,args,0);
+    TQWidget *arg1 = extractQWidget(exec,args,0);
 
     // TODO
-    QWidget *arg2 = extractQWidget(exec,args,0);
+    TQWidget *arg2 = extractQWidget(exec,args,0);
     return KJS::Object();
 
 }
@@ -388,7 +388,7 @@ KJS::Value QCheckListItemImp::call( KJS::ExecState *exec, KJS::Object &self, con
         break;
     }
 
-    QString msg = i18n( "QCheckListItemImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "QCheckListItemImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -396,15 +396,15 @@ KJS::Value QCheckListItemImp::call( KJS::ExecState *exec, KJS::Object &self, con
 KJS::Value QCheckListItemImp::paintCell_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QPainter *
+    // Unsupported parameter TQPainter *
     return KJS::Value();
 
-    QPainter * arg0; // Dummy
+    TQPainter * arg0; // Dummy
 
-    // Unsupported parameter const QColorGroup &
+    // Unsupported parameter const TQColorGroup &
     return KJS::Value();
 #if 0
-    const QColorGroup & arg1; // Dummy
+    const TQColorGroup & arg1; // Dummy
 
     int arg2 = (args.size() >= 3) ? args[2].toInteger(exec) : -1;
 
@@ -425,17 +425,17 @@ KJS::Value QCheckListItemImp::paintCell_10( KJS::ExecState *exec, KJS::Object &o
 KJS::Value QCheckListItemImp::paintFocus_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QPainter *
+    // Unsupported parameter TQPainter *
     return KJS::Value();
 #if 0
-    QPainter * arg0; // Dummy
+    TQPainter * arg0; // Dummy
 
-    // Unsupported parameter const QColorGroup &
+    // Unsupported parameter const TQColorGroup &
     return KJS::Value();
 
-    const QColorGroup & arg1; // Dummy
+    const TQColorGroup & arg1; // Dummy
 
-    QRect arg2 = extractQRect(exec, args, 2);
+    TQRect arg2 = extractQRect(exec, args, 2);
 
       instance->paintFocus(
        arg0,
@@ -448,15 +448,15 @@ KJS::Value QCheckListItemImp::paintFocus_11( KJS::ExecState *exec, KJS::Object &
 KJS::Value QCheckListItemImp::width_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QFontMetrics &
+    // Unsupported parameter const TQFontMetrics &
     return KJS::Value();
 #if 0
-    const QFontMetrics & arg0; // Dummy
+    const TQFontMetrics & arg0; // Dummy
 
-    // Unsupported parameter const QListView *
+    // Unsupported parameter const TQListView *
     return KJS::Value();
 
-    const QListView * arg1; // Dummy
+    const TQListView * arg1; // Dummy
 
     int arg2 = (args.size() >= 3) ? args[2].toInteger(exec) : -1;
 
@@ -508,7 +508,7 @@ KJS::Value QCheckListItemImp::type_16( KJS::ExecState *exec, KJS::Object &obj, c
 KJS::Value QCheckListItemImp::text_17( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      QString ret;
+      TQString ret;
       ret = instance->text(  );
       return KJS::String( ret );
 
@@ -519,7 +519,7 @@ KJS::Value QCheckListItemImp::text_18( KJS::ExecState *exec, KJS::Object &obj, c
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
 
-      QString ret;
+      TQString ret;
       ret = instance->text(
        arg0 );
       return KJS::String( ret );
diff --git a/kjsembed/qtbindings/qchecklistitem_imp.h b/kjsembed/qtbindings/qchecklistitem_imp.h
index a1030d2a..5bc5bcd8 100644
--- a/kjsembed/qtbindings/qchecklistitem_imp.h
+++ b/kjsembed/qtbindings/qchecklistitem_imp.h
@@ -26,7 +26,7 @@ namespace Bindings {
     };
 }
 /**
- * Wrapper class for QCheckListItem methods.
+ * Wrapper class for TQCheckListItem methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -72,7 +72,7 @@ public:
 
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static QCheckListItem *toQCheckListItem( KJS::Object &object );
+   static TQCheckListItem *toQCheckListItem( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -123,7 +123,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   QCheckListItem *instance; // Temp
+   TQCheckListItem *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qcombobox_imp.cpp b/kjsembed/qtbindings/qcombobox_imp.cpp
index 56407cb7..330da994 100644
--- a/kjsembed/qtbindings/qcombobox_imp.cpp
+++ b/kjsembed/qtbindings/qcombobox_imp.cpp
@@ -1,10 +1,10 @@
 
 
 
-#include <qcstring.h>
-#include <qpalette.h>
-#include <qpixmap.h>
-#include <qfont.h>
+#include <tqcstring.h>
+#include <tqpalette.h>
+#include <tqpixmap.h>
+#include <tqfont.h>
 
 #include <kjs/object.h>
 
@@ -13,7 +13,7 @@
 #include <kjsembed/jsopaqueproxy.h>
 #include <kjsembed/jsbinding.h>
 
-#include <qcombobox.h>
+#include <tqcombobox.h>
 #include "qcombobox_imp.h"
 
 /**
@@ -41,7 +41,7 @@ void QComboBoxImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -64,12 +64,12 @@ void QComboBoxImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object
     EnumValue enums[] = {
 
         // enum Policy
-        { "NoInsertion", QComboBox::NoInsertion },
-        { "AtTop", QComboBox::AtTop },
-        { "AtCurrent", QComboBox::AtCurrent },
-        { "AtBottom", QComboBox::AtBottom },
-        { "AfterCurrent", QComboBox::AfterCurrent },
-        { "BeforeCurrent", QComboBox::BeforeCurrent },
+        { "NoInsertion", TQComboBox::NoInsertion },
+        { "AtTop", TQComboBox::AtTop },
+        { "AtCurrent", TQComboBox::AtCurrent },
+        { "AtBottom", TQComboBox::AtBottom },
+        { "AfterCurrent", TQComboBox::AfterCurrent },
+        { "BeforeCurrent", TQComboBox::BeforeCurrent },
 	{ 0, 0 }
     };
 
@@ -137,7 +137,7 @@ void QComboBoxImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -150,25 +150,25 @@ void QComboBoxImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a QComboBox pointer from an Object.
+ * Extract a TQComboBox pointer from an Object.
  */
-QComboBox *QComboBoxImp::toQComboBox( KJS::Object &self )
+TQComboBox *QComboBoxImp::toQComboBox( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        QObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<QComboBox *>( obj );
+           return dynamic_cast<TQComboBox *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "QComboBox" )
+    if ( op->typeName() != "TQComboBox" )
         return 0;
 
-    return op->toNative<QComboBox>();
+    return op->toNative<TQComboBox>();
 }
 
 /**
@@ -190,7 +190,7 @@ KJS::Object QComboBoxImp::construct( KJS::ExecState *exec, const KJS::List &args
              break;
     }
 
-    QString msg = i18n("QComboBoxCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("QComboBoxCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -198,15 +198,15 @@ KJS::Object QComboBoxImp::construct( KJS::ExecState *exec, const KJS::List &args
 KJS::Object QComboBoxImp::QComboBox_1( KJS::ExecState *exec, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter QWidget *
+    // Unsupported parameter TQWidget *
     return KJS::Value();
 
-    QWidget * arg0; // Dummy
+    TQWidget * arg0; // Dummy
 
     const char *arg1 = (args.size() >= 2) ? args[1].toString(exec).ascii() : 0;
 
 
-    // We should now create an object of type QComboBoxQComboBox *ret = new QComboBox(
+    // We should now create an object of type QComboBoxQComboBox *ret = new TQComboBox(
 
           arg0,
           arg1 );
@@ -219,15 +219,15 @@ KJS::Object QComboBoxImp::QComboBox_2( KJS::ExecState *exec, const KJS::List &ar
 #if 0
     bool arg0 = extractBool(exec, args, 0);
 
-    // Unsupported parameter QWidget *
+    // Unsupported parameter TQWidget *
     return KJS::Value();
 
-    QWidget * arg1; // Dummy
+    TQWidget * arg1; // Dummy
 
     const char *arg2 = (args.size() >= 3) ? args[2].toString(exec).ascii() : 0;
 
 
-    // We should now create an object of type QComboBoxQComboBox *ret = new QComboBox(
+    // We should now create an object of type QComboBoxQComboBox *ret = new TQComboBox(
 
           arg0,
           arg1,
@@ -427,7 +427,7 @@ KJS::Value QComboBoxImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ
         break;
     }
 
-    QString msg = i18n( "QComboBoxImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "QComboBoxImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -444,7 +444,7 @@ KJS::Value QComboBoxImp::count_4( KJS::ExecState *exec, KJS::Object &obj, const
 KJS::Value QComboBoxImp::insertStringList_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QStringList arg0 = extractQStringList(exec, args, 0);
+    TQStringList arg0 = extractQStringList(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -458,7 +458,7 @@ KJS::Value QComboBoxImp::insertStringList_5( KJS::ExecState *exec, KJS::Object &
 KJS::Value QComboBoxImp::insertStrList_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QStrList arg0 = extractQStrList(exec, args, 0);
+    TQStrList arg0 = extractQStrList(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -472,10 +472,10 @@ KJS::Value QComboBoxImp::insertStrList_6( KJS::ExecState *exec, KJS::Object &obj
 KJS::Value QComboBoxImp::insertStrList_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QStrList *
+    // Unsupported parameter const TQStrList *
     return KJS::Value();
 
-    const QStrList * arg0; // Dummy
+    const TQStrList * arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -509,7 +509,7 @@ KJS::Value QComboBoxImp::insertStrList_8( KJS::ExecState *exec, KJS::Object &obj
 KJS::Value QComboBoxImp::insertItem_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QString arg0 = extractQString(exec, args, 0);
+    TQString arg0 = extractQString(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -523,7 +523,7 @@ KJS::Value QComboBoxImp::insertItem_9( KJS::ExecState *exec, KJS::Object &obj, c
 KJS::Value QComboBoxImp::insertItem_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QPixmap arg0 = extractQPixmap(exec, args, 0);
+    TQPixmap arg0 = extractQPixmap(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -537,9 +537,9 @@ KJS::Value QComboBoxImp::insertItem_10( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value QComboBoxImp::insertItem_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QPixmap arg0 = extractQPixmap(exec, args, 0);
+    TQPixmap arg0 = extractQPixmap(exec, args, 0);
 
-    QString arg1 = extractQString(exec, args, 1);
+    TQString arg1 = extractQString(exec, args, 1);
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -585,7 +585,7 @@ KJS::Value QComboBoxImp::setCurrentItem_14( KJS::ExecState *exec, KJS::Object &o
 KJS::Value QComboBoxImp::currentText_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      QString ret;
+      TQString ret;
       ret = instance->currentText(  );
       return KJS::String( ret );
 
@@ -594,7 +594,7 @@ KJS::Value QComboBoxImp::currentText_15( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value QComboBoxImp::setCurrentText_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QString arg0 = extractQString(exec, args, 0);
+    TQString arg0 = extractQString(exec, args, 0);
 
       instance->setCurrentText(
        arg0 );
@@ -607,7 +607,7 @@ KJS::Value QComboBoxImp::text_17( KJS::ExecState *exec, KJS::Object &obj, const
 
     int arg0 = extractInt(exec, args, 0);
 
-      QString ret;
+      TQString ret;
       ret = instance->text(
        arg0 );
       return KJS::String( ret );
@@ -621,14 +621,14 @@ KJS::Value QComboBoxImp::pixmap_18( KJS::ExecState *exec, KJS::Object &obj, cons
 
       instance->pixmap(
        arg0 );
-      return KJS::Value(); // Returns 'const QPixmap *'
+      return KJS::Value(); // Returns 'const TQPixmap *'
 
 }
 
 KJS::Value QComboBoxImp::changeItem_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QString arg0 = extractQString(exec, args, 0);
+    TQString arg0 = extractQString(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -642,7 +642,7 @@ KJS::Value QComboBoxImp::changeItem_19( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value QComboBoxImp::changeItem_20( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QPixmap arg0 = extractQPixmap(exec, args, 0);
+    TQPixmap arg0 = extractQPixmap(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -656,9 +656,9 @@ KJS::Value QComboBoxImp::changeItem_20( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value QComboBoxImp::changeItem_21( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QPixmap arg0 = extractQPixmap(exec, args, 0);
+    TQPixmap arg0 = extractQPixmap(exec, args, 0);
 
-    QString arg1 = extractQString(exec, args, 1);
+    TQString arg1 = extractQString(exec, args, 1);
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -692,7 +692,7 @@ KJS::Value QComboBoxImp::setAutoResize_23( KJS::ExecState *exec, KJS::Object &ob
 
 KJS::Value QComboBoxImp::sizeHint_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    QSize ret;
+    TQSize ret;
       ret = instance->sizeHint(  );
 
        return convertToValue( exec, ret );
@@ -702,7 +702,7 @@ KJS::Value QComboBoxImp::sizeHint_24( KJS::ExecState *exec, KJS::Object &obj, co
 KJS::Value QComboBoxImp::setPalette_25( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QPalette arg0 = extractQPalette(exec, args, 0);
+    TQPalette arg0 = extractQPalette(exec, args, 0);
 
       instance->setPalette(
        arg0 );
@@ -713,7 +713,7 @@ KJS::Value QComboBoxImp::setPalette_25( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value QComboBoxImp::setFont_26( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QFont arg0 = extractQFont(exec, args, 0);
+    TQFont arg0 = extractQFont(exec, args, 0);
 
       instance->setFont(
        arg0 );
@@ -775,7 +775,7 @@ KJS::Value QComboBoxImp::maxCount_31( KJS::ExecState *exec, KJS::Object &obj, co
 KJS::Value QComboBoxImp::setInsertionPolicy_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QComboBox::Policy arg0 = QComboBox::AtBottom; // TODO (hack for combo box)
+    TQComboBox::Policy arg0 = TQComboBox::AtBottom; // TODO (hack for combo box)
 
       instance->setInsertionPolicy(
        arg0 );
@@ -794,10 +794,10 @@ KJS::Value QComboBoxImp::insertionPolicy_33( KJS::ExecState *exec, KJS::Object &
 KJS::Value QComboBoxImp::setValidator_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QValidator *
+    // Unsupported parameter const TQValidator *
     return KJS::Value();
 
-    const QValidator * arg0; // Dummy
+    const TQValidator * arg0; // Dummy
 
       instance->setValidator(
        arg0 );
@@ -809,17 +809,17 @@ KJS::Value QComboBoxImp::validator_35( KJS::ExecState *exec, KJS::Object &obj, c
 {
 
       instance->validator(  );
-      return KJS::Value(); // Returns 'const QValidator *'
+      return KJS::Value(); // Returns 'const TQValidator *'
 
 }
 
 KJS::Value QComboBoxImp::setListBox_36( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QListBox *
+    // Unsupported parameter TQListBox *
     return KJS::Value();
 
-    QListBox * arg0; // Dummy
+    TQListBox * arg0; // Dummy
 
       instance->setListBox(
        arg0 );
@@ -831,17 +831,17 @@ KJS::Value QComboBoxImp::listBox_37( KJS::ExecState *exec, KJS::Object &obj, con
 {
 
       instance->listBox(  );
-      return KJS::Value(); // Returns 'QListBox *'
+      return KJS::Value(); // Returns 'TQListBox *'
 
 }
 
 KJS::Value QComboBoxImp::setLineEdit_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QLineEdit *
+    // Unsupported parameter TQLineEdit *
     return KJS::Value();
 
-    QLineEdit * arg0; // Dummy
+    TQLineEdit * arg0; // Dummy
 
       instance->setLineEdit(
        arg0 );
@@ -853,7 +853,7 @@ KJS::Value QComboBoxImp::lineEdit_39( KJS::ExecState *exec, KJS::Object &obj, co
 {
 
       instance->lineEdit(  );
-      return KJS::Value(); // Returns 'QLineEdit *'
+      return KJS::Value(); // Returns 'TQLineEdit *'
 
 }
 
@@ -880,15 +880,15 @@ KJS::Value QComboBoxImp::autoCompletion_41( KJS::ExecState *exec, KJS::Object &o
 KJS::Value QComboBoxImp::eventFilter_42( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QObject *
+    // Unsupported parameter TQObject *
     return KJS::Value();
 
-    QObject * arg0; // Dummy
+    TQObject * arg0; // Dummy
 
-    // Unsupported parameter QEvent *
+    // Unsupported parameter TQEvent *
     return KJS::Value();
 
-    QEvent * arg1; // Dummy
+    TQEvent * arg1; // Dummy
 
       bool ret;
       ret = instance->eventFilter(
diff --git a/kjsembed/qtbindings/qcombobox_imp.h b/kjsembed/qtbindings/qcombobox_imp.h
index 56653345..255e5323 100644
--- a/kjsembed/qtbindings/qcombobox_imp.h
+++ b/kjsembed/qtbindings/qcombobox_imp.h
@@ -17,7 +17,7 @@ class QComboBox;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for QComboBox methods.
+ * Wrapper class for TQComboBox methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -98,7 +98,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static QComboBox *toQComboBox( KJS::Object &object );
+   static TQComboBox *toQComboBox( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -174,7 +174,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   QComboBox *instance; // Temp
+   TQComboBox *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qframe_imp.cpp b/kjsembed/qtbindings/qframe_imp.cpp
index 92254a8b..146e6bb2 100644
--- a/kjsembed/qtbindings/qframe_imp.cpp
+++ b/kjsembed/qtbindings/qframe_imp.cpp
@@ -5,7 +5,7 @@
 #include <kjsembed/jsobjectproxy.h>
 #include <kjsembed/jsbinding.h>
 
-#include <qframe.h>
+#include <tqframe.h>
 #include "qframe_imp.h"
 
 /**
@@ -25,25 +25,25 @@ void QFrameImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     EnumValue enums[] = {
 
         // enum Shape
-        { "NoFrame", QFrame::NoFrame },
-        { "Box", QFrame::Box },
-        { "Panel", QFrame::Panel },
-        { "WinPanel", QFrame::WinPanel },
-        { "HLine", QFrame::HLine },
-        { "VLine", QFrame::VLine },
-        { "StyledPanel", QFrame::StyledPanel },
-        { "PopupPanel", QFrame::PopupPanel },
-        { "MenuBarPanel", QFrame::MenuBarPanel },
-        { "ToolBarPanel", QFrame::ToolBarPanel },
-        { "LineEditPanel", QFrame::LineEditPanel },
-        { "TabWidgetPanel", QFrame::TabWidgetPanel },
-        { "GroupBoxPanel", QFrame::GroupBoxPanel },
-        { "MShape", QFrame::MShape },
+        { "NoFrame", TQFrame::NoFrame },
+        { "Box", TQFrame::Box },
+        { "Panel", TQFrame::Panel },
+        { "WinPanel", TQFrame::WinPanel },
+        { "HLine", TQFrame::HLine },
+        { "VLine", TQFrame::VLine },
+        { "StyledPanel", TQFrame::StyledPanel },
+        { "PopupPanel", TQFrame::PopupPanel },
+        { "MenuBarPanel", TQFrame::MenuBarPanel },
+        { "ToolBarPanel", TQFrame::ToolBarPanel },
+        { "LineEditPanel", TQFrame::LineEditPanel },
+        { "TabWidgetPanel", TQFrame::TabWidgetPanel },
+        { "GroupBoxPanel", TQFrame::GroupBoxPanel },
+        { "MShape", TQFrame::MShape },
         // enum Shadow
-        { "Plain", QFrame::Plain },
-        { "Raised", QFrame::Raised },
-        { "Sunken", QFrame::Sunken },
-        { "MShadow", QFrame::MShadow },
+        { "Plain", TQFrame::Plain },
+        { "Raised", TQFrame::Raised },
+        { "Sunken", TQFrame::Sunken },
+        { "MShadow", TQFrame::MShadow },
 	{ 0, 0 }
     };
 
diff --git a/kjsembed/qtbindings/qframe_imp.h b/kjsembed/qtbindings/qframe_imp.h
index 0f227605..3d386e23 100644
--- a/kjsembed/qtbindings/qframe_imp.h
+++ b/kjsembed/qtbindings/qframe_imp.h
@@ -14,7 +14,7 @@
 namespace KJSEmbed {
 
 /**
- * Wrapper class for QFrame enums.
+ * Wrapper class for TQFrame enums.
  *
  * @author Ian Reinhart Geiser, geiseri@kde.org
  */
diff --git a/kjsembed/qtbindings/qlistview_imp.cpp b/kjsembed/qtbindings/qlistview_imp.cpp
index a5f4c022..ef670d95 100644
--- a/kjsembed/qtbindings/qlistview_imp.cpp
+++ b/kjsembed/qtbindings/qlistview_imp.cpp
@@ -1,11 +1,11 @@
 
 
 
-#include <qcstring.h>
-#include <qpalette.h>
-#include <qpixmap.h>
-#include <qfont.h>
-#include <qiconset.h>
+#include <tqcstring.h>
+#include <tqpalette.h>
+#include <tqpixmap.h>
+#include <tqfont.h>
+#include <tqiconset.h>
 
 #include <kjs/object.h>
 
@@ -14,7 +14,7 @@
 #include <kjsembed/jsopaqueproxy.h>
 #include <kjsembed/jsbinding.h>
 
-#include <qlistview.h>
+#include <tqlistview.h>
 #include "qlistview_imp.h"
 
 /**
@@ -108,7 +108,7 @@ void QListViewImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].id ) {
         if ( lastName != methods[idx].name ) {
@@ -131,20 +131,20 @@ void QListViewImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     EnumValue enums[] = {
 
         // enum WidthMode
-        { "Manual", QListView::Manual },
-        { "Maximum", QListView::Maximum },
+        { "Manual", TQListView::Manual },
+        { "Maximum", TQListView::Maximum },
         // enum SelectionMode
-        { "Single", QListView::Single },
-        { "Multi", QListView::Multi },
-        { "Extended", QListView::Extended },
-        { "NoSelection", QListView::NoSelection },
+        { "Single", TQListView::Single },
+        { "Multi", TQListView::Multi },
+        { "Extended", TQListView::Extended },
+        { "NoSelection", TQListView::NoSelection },
         // enum ResizeMode
-        { "NoColumn", QListView::NoColumn },
-        { "AllColumns", QListView::AllColumns },
-        { "LastColumn", QListView::LastColumn },
+        { "NoColumn", TQListView::NoColumn },
+        { "AllColumns", TQListView::AllColumns },
+        { "LastColumn", TQListView::LastColumn },
         // enum RenameAction
-        { "Accept", QListView::Accept },
-        { "Reject", QListView::Reject },
+        { "Accept", TQListView::Accept },
+        { "Reject", TQListView::Reject },
 	{ 0, 0 }
     };
 
@@ -156,23 +156,23 @@ void QListViewImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 
 }
 
-QListView *QListViewImp::toQListView( KJS::Object &self )
+TQListView *QListViewImp::toQListView( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        QObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<QListView *>( obj );
+           return dynamic_cast<TQListView *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "QListView" )
+    if ( op->typeName() != "TQListView" )
         return 0;
 
-    return op->toNative<QListView>();
+    return op->toNative<TQListView>();
 }
 
 
@@ -188,7 +188,7 @@ KJS::Object QListViewImp::construct( KJS::ExecState *exec, const KJS::List &args
              break;
     }
 
-    QString msg = i18n("QListViewCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("QListViewCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -197,13 +197,13 @@ KJS::Object QListViewImp::QListView_1( KJS::ExecState *exec, const KJS::List &ar
 {
 
     // TODO
-    QWidget *arg0 = 0L;
+    TQWidget *arg0 = 0L;
 
     // TODO
-    QWidget *arg1 = 0L;
+    TQWidget *arg1 = 0L;
 
     // TODO
-    QWidget *arg2 = 0L;
+    TQWidget *arg2 = 0L;
 
 }
 
@@ -493,7 +493,7 @@ KJS::Value QListViewImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ
         break;
     }
 
-    QString msg = i18n( "QListViewImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "QListViewImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -521,10 +521,10 @@ KJS::Value QListViewImp::setTreeStepSize_4( KJS::ExecState *exec, KJS::Object &o
 KJS::Value QListViewImp::insertItem_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    QListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
       instance->insertItem(
        arg0 );
@@ -535,10 +535,10 @@ KJS::Value QListViewImp::insertItem_5( KJS::ExecState *exec, KJS::Object &obj, c
 KJS::Value QListViewImp::takeItem_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    QListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
       instance->takeItem(
        arg0 );
@@ -549,10 +549,10 @@ KJS::Value QListViewImp::takeItem_6( KJS::ExecState *exec, KJS::Object &obj, con
 KJS::Value QListViewImp::removeItem_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    QListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
       instance->removeItem(
        arg0 );
@@ -564,14 +564,14 @@ KJS::Value QListViewImp::header_8( KJS::ExecState *exec, KJS::Object &obj, const
 {
 
       instance->header(  );
-      return KJS::Value(); // Returns 'QHeader *'
+      return KJS::Value(); // Returns 'TQHeader *'
 
 }
 
 KJS::Value QListViewImp::addColumn_9( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null;
+    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
 
     int arg1 = (args.size() >= 2) ? args[1].toInteger(exec) : -1;
 
@@ -589,9 +589,9 @@ KJS::Value QListViewImp::addColumn_10( KJS::ExecState *exec, KJS::Object &obj, c
     // Unsupported parameter const QIconSet
     return KJS::Value();
 
-    const QIconSet  arg0; // Dummy
+    const TQIconSet  arg0; // Dummy
 
-    QString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : QString::null;
+    TQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TQString::null;
 
     int arg2 = (args.size() >= 3) ? args[2].toInteger(exec) : -1;
 
@@ -620,7 +620,7 @@ KJS::Value QListViewImp::setColumnText_12( KJS::ExecState *exec, KJS::Object &ob
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
 
-    QString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : QString::null;
+    TQString arg1 = (args.size() >= 2) ? args[1].toString(exec).qstring() : TQString::null;
 
       instance->setColumnText(
        arg0,
@@ -637,9 +637,9 @@ KJS::Value QListViewImp::setColumnText_13( KJS::ExecState *exec, KJS::Object &ob
     // Unsupported parameter const QIconSet
     return KJS::Value();
 
-    const QIconSet  arg1; // Dummy
+    const TQIconSet  arg1; // Dummy
 
-    QString arg2 = (args.size() >= 3) ? args[2].toString(exec).qstring() : QString::null;
+    TQString arg2 = (args.size() >= 3) ? args[2].toString(exec).qstring() : TQString::null;
 
       instance->setColumnText(
        arg0,
@@ -654,7 +654,7 @@ KJS::Value QListViewImp::columnText_14( KJS::ExecState *exec, KJS::Object &obj,
 
     int arg0 = (args.size() >= 1) ? args[0].toInteger(exec) : -1;
 
-      QString ret;
+      TQString ret;
       ret = instance->columnText(
        arg0 );
       return KJS::String( ret );
@@ -761,24 +761,24 @@ KJS::Value QListViewImp::show_22( KJS::ExecState *exec, KJS::Object &obj, const
 KJS::Value QListViewImp::itemAt_23( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QPoint &
+    // Unsupported parameter const TQPoint &
     return KJS::Value();
 
-    const QPoint & arg0; // Dummy
+    const TQPoint & arg0; // Dummy
 
       instance->itemAt(
        arg0 );
-      return KJS::Value(); // Returns 'QListViewItem *'
+      return KJS::Value(); // Returns 'TQListViewItem *'
 
 }
 
 KJS::Value QListViewImp::itemRect_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QListViewItem *
+    // Unsupported parameter const TQListViewItem *
     return KJS::Value();
 
-    const QListViewItem * arg0; // Dummy
+    const TQListViewItem * arg0; // Dummy
 
       instance->itemRect(
        arg0 );
@@ -789,10 +789,10 @@ KJS::Value QListViewImp::itemRect_24( KJS::ExecState *exec, KJS::Object &obj, co
 KJS::Value QListViewImp::itemPos_25( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QListViewItem *
+    // Unsupported parameter const TQListViewItem *
     return KJS::Value();
 
-    const QListViewItem * arg0; // Dummy
+    const TQListViewItem * arg0; // Dummy
 
       int ret;
       ret = instance->itemPos(
@@ -804,10 +804,10 @@ KJS::Value QListViewImp::itemPos_25( KJS::ExecState *exec, KJS::Object &obj, con
 KJS::Value QListViewImp::ensureItemVisible_26( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QListViewItem *
+    // Unsupported parameter const TQListViewItem *
     return KJS::Value();
 
-    const QListViewItem * arg0; // Dummy
+    const TQListViewItem * arg0; // Dummy
 
       instance->ensureItemVisible(
        arg0 );
@@ -818,10 +818,10 @@ KJS::Value QListViewImp::ensureItemVisible_26( KJS::ExecState *exec, KJS::Object
 KJS::Value QListViewImp::repaintItem_27( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QListViewItem *
+    // Unsupported parameter const TQListViewItem *
     return KJS::Value();
 
-    const QListViewItem * arg0; // Dummy
+    const TQListViewItem * arg0; // Dummy
 
       instance->repaintItem(
        arg0 );
@@ -882,10 +882,10 @@ KJS::Value QListViewImp::clearSelection_32( KJS::ExecState *exec, KJS::Object &o
 KJS::Value QListViewImp::setSelected_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    QListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
     bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false;
 
@@ -899,10 +899,10 @@ KJS::Value QListViewImp::setSelected_33( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value QListViewImp::setSelectionAnchor_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    QListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
       instance->setSelectionAnchor(
        arg0 );
@@ -913,10 +913,10 @@ KJS::Value QListViewImp::setSelectionAnchor_34( KJS::ExecState *exec, KJS::Objec
 KJS::Value QListViewImp::isSelected_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QListViewItem *
+    // Unsupported parameter const TQListViewItem *
     return KJS::Value();
 
-    const QListViewItem * arg0; // Dummy
+    const TQListViewItem * arg0; // Dummy
 
       bool ret;
       ret = instance->isSelected(
@@ -929,17 +929,17 @@ KJS::Value QListViewImp::selectedItem_36( KJS::ExecState *exec, KJS::Object &obj
 {
 
       instance->selectedItem(  );
-      return KJS::Value(); // Returns 'QListViewItem *'
+      return KJS::Value(); // Returns 'TQListViewItem *'
 
 }
 
 KJS::Value QListViewImp::setOpen_37( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    QListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
     bool arg1 = (args.size() >= 2) ? args[1].toBoolean(exec) : false;
 
@@ -953,10 +953,10 @@ KJS::Value QListViewImp::setOpen_37( KJS::ExecState *exec, KJS::Object &obj, con
 KJS::Value QListViewImp::isOpen_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QListViewItem *
+    // Unsupported parameter const TQListViewItem *
     return KJS::Value();
 
-    const QListViewItem * arg0; // Dummy
+    const TQListViewItem * arg0; // Dummy
 
       bool ret;
       ret = instance->isOpen(
@@ -968,10 +968,10 @@ KJS::Value QListViewImp::isOpen_38( KJS::ExecState *exec, KJS::Object &obj, cons
 KJS::Value QListViewImp::setCurrentItem_39( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    QListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
       instance->setCurrentItem(
        arg0 );
@@ -983,7 +983,7 @@ KJS::Value QListViewImp::currentItem_40( KJS::ExecState *exec, KJS::Object &obj,
 {
 
       instance->currentItem(  );
-      return KJS::Value(); // Returns 'QListViewItem *'
+      return KJS::Value(); // Returns 'TQListViewItem *'
 
 }
 
@@ -991,7 +991,7 @@ KJS::Value QListViewImp::firstChild_41( KJS::ExecState *exec, KJS::Object &obj,
 {
 
       instance->firstChild(  );
-      return KJS::Value(); // Returns 'QListViewItem *'
+      return KJS::Value(); // Returns 'TQListViewItem *'
 
 }
 
@@ -999,7 +999,7 @@ KJS::Value QListViewImp::lastItem_42( KJS::ExecState *exec, KJS::Object &obj, co
 {
 
       instance->lastItem(  );
-      return KJS::Value(); // Returns 'QListViewItem *'
+      return KJS::Value(); // Returns 'TQListViewItem *'
 
 }
 
@@ -1139,7 +1139,7 @@ KJS::Value QListViewImp::sort_55( KJS::ExecState *exec, KJS::Object &obj, const
 KJS::Value QListViewImp::setFont_56( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QFont arg0; // TODO
+    TQFont arg0; // TODO
 
       instance->setFont(
        arg0 );
@@ -1150,7 +1150,7 @@ KJS::Value QListViewImp::setFont_56( KJS::ExecState *exec, KJS::Object &obj, con
 KJS::Value QListViewImp::setPalette_57( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QPalette arg0; // TODO
+    TQPalette arg0; // TODO
 
       instance->setPalette(
        arg0 );
@@ -1161,15 +1161,15 @@ KJS::Value QListViewImp::setPalette_57( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value QListViewImp::eventFilter_58( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QObject *
+    // Unsupported parameter TQObject *
     return KJS::Value();
 
-    QObject * arg0; // Dummy
+    TQObject * arg0; // Dummy
 
-    // Unsupported parameter QEvent *
+    // Unsupported parameter TQEvent *
     return KJS::Value();
 
-    QEvent * arg1; // Dummy
+    TQEvent * arg1; // Dummy
 
       bool ret;
       ret = instance->eventFilter(
@@ -1260,7 +1260,7 @@ KJS::Value QListViewImp::resizeMode_66( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value QListViewImp::findItem_67( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : QString::null;
+    TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null;
 
     int arg1 = (args.size() >= 2) ? args[1].toInteger(exec) : -1;
 
@@ -1273,7 +1273,7 @@ KJS::Value QListViewImp::findItem_67( KJS::ExecState *exec, KJS::Object &obj, co
        arg0,
        arg1,
        arg2 );
-      return KJS::Value(); // Returns 'QListViewItem *'
+      return KJS::Value(); // Returns 'TQListViewItem *'
 
 }
 
diff --git a/kjsembed/qtbindings/qlistview_imp.h b/kjsembed/qtbindings/qlistview_imp.h
index 0c1edf2d..7fbee199 100644
--- a/kjsembed/qtbindings/qlistview_imp.h
+++ b/kjsembed/qtbindings/qlistview_imp.h
@@ -17,7 +17,7 @@ class QListView;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for QListView methods.
+ * Wrapper class for TQListView methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -111,7 +111,7 @@ public:
 
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static QListView *toQListView( KJS::Object &object );
+   static TQListView *toQListView( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -210,7 +210,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   QListView *instance; // Temp
+   TQListView *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qlistviewitem_imp.cpp b/kjsembed/qtbindings/qlistviewitem_imp.cpp
index b7e18820..13765e2b 100644
--- a/kjsembed/qtbindings/qlistviewitem_imp.cpp
+++ b/kjsembed/qtbindings/qlistviewitem_imp.cpp
@@ -1,10 +1,10 @@
 
 
 
-#include <qcstring.h>
-#include <qpalette.h>
-#include <qpixmap.h>
-#include <qfont.h>
+#include <tqcstring.h>
+#include <tqpalette.h>
+#include <tqpixmap.h>
+#include <tqfont.h>
 
 #include <kjs/object.h>
 
@@ -13,7 +13,7 @@
 #include <kjsembed/jsopaqueproxy.h>
 #include <kjsembed/jsbinding.h>
 
-#include <qlistview.h>
+#include <tqlistview.h>
 #include "qlistviewitem_imp.h"
 
 /**
@@ -31,17 +31,17 @@ namespace Bindings {
             JSOpaqueProxy *prx = 0;
 
             if ( arg0 ) {
-                if ( arg0->typeName() == "QListViewItem" ) {
-                    QListViewItem * parent = arg0->toNative<QListViewItem>();
-                    prx = new JSOpaqueProxy( new QListViewItem( parent ), "QListViewItem" );
+                if ( arg0->typeName() == "TQListViewItem" ) {
+                    TQListViewItem * parent = arg0->toNative<TQListViewItem>();
+                    prx = new JSOpaqueProxy( new TQListViewItem( parent ), "TQListViewItem" );
                 } else {
                     return KJS::Object();
                 }
             } else {
                 JSObjectProxy *arg0 = JSProxy::toObjectProxy( args[ 0 ].imp() );
                 if ( arg0 ) {
-                    QListView * parent = ( QListView * ) ( arg0->widget() );
-                    prx = new JSOpaqueProxy( new QListViewItem( parent ), "QListViewItem" );
+                    TQListView * parent = ( TQListView * ) ( arg0->widget() );
+                    prx = new JSOpaqueProxy( new TQListViewItem( parent ), "TQListViewItem" );
                 } else {
                     return KJS::Object();
                 }
@@ -80,7 +80,7 @@ void QListViewItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &obj
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -159,7 +159,7 @@ void QListViewItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -172,21 +172,21 @@ void QListViewItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a QListViewItem pointer from an Object.
+ * Extract a TQListViewItem pointer from an Object.
  */
-QListViewItem *QListViewItemImp::toQListViewItem( KJS::Object &self )
+TQListViewItem *QListViewItemImp::toQListViewItem( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        QObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<QListViewItem *>( obj );
+           return dynamic_cast<TQListViewItem *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
-    return op->toNative<QListViewItem>();
+    return op->toNative<TQListViewItem>();
 }
 
 /**
@@ -232,7 +232,7 @@ KJS::Object QListViewItemImp::construct( KJS::ExecState *exec, const KJS::List &
              break;
     }
 
-    QString msg = i18n("QListViewItemCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("QListViewItemCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -240,13 +240,13 @@ KJS::Object QListViewItemImp::construct( KJS::ExecState *exec, const KJS::List &
 KJS::Object QListViewItemImp::QListViewItem_1( KJS::ExecState *exec, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter QListView *
+    // Unsupported parameter TQListView *
     return KJS::Value();
 
-    QListView * arg0; // Dummy
+    TQListView * arg0; // Dummy
 
 
-    // We should now create an object of type QListViewItemQListViewItem *ret = new QListViewItem(
+    // We should now create an object of type QListViewItemQListViewItem *ret = new TQListViewItem(
 
           arg0 );
 #endif
@@ -257,13 +257,13 @@ return KJS::Object();
 KJS::Object QListViewItemImp::QListViewItem_2( KJS::ExecState *exec, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter QListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    QListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
 
-    // We should now create an object of type QListViewItemQListViewItem *ret = new QListViewItem(
+    // We should now create an object of type QListViewItemQListViewItem *ret = new TQListViewItem(
 
           arg0 );
 #endif
@@ -274,18 +274,18 @@ KJS::Object QListViewItemImp::QListViewItem_3( KJS::ExecState *exec, const KJS::
 {
 #if 0
 
-    // Unsupported parameter QListView *
+    // Unsupported parameter TQListView *
     return KJS::Value();
 
-    QListView * arg0; // Dummy
+    TQListView * arg0; // Dummy
 
-    // Unsupported parameter QListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    QListViewItem * arg1; // Dummy
+    TQListViewItem * arg1; // Dummy
 
 
-    // We should now create an object of type QListViewItemQListViewItem *ret = new QListViewItem(
+    // We should now create an object of type QListViewItemQListViewItem *ret = new TQListViewItem(
 
           arg0,
           arg1 );
@@ -297,18 +297,18 @@ KJS::Object QListViewItemImp::QListViewItem_4( KJS::ExecState *exec, const KJS::
 {
 #if 0
 
-    // Unsupported parameter QListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    QListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
-    // Unsupported parameter QListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    QListViewItem * arg1; // Dummy
+    TQListViewItem * arg1; // Dummy
 
 
-    // We should now create an object of type QListViewItemQListViewItem *ret = new QListViewItem(
+    // We should now create an object of type QListViewItemQListViewItem *ret = new TQListViewItem(
 
           arg0,
           arg1 );
@@ -321,29 +321,29 @@ KJS::Object QListViewItemImp::QListViewItem_5( KJS::ExecState *exec, const KJS::
 {
 #if 0
 
-    // Unsupported parameter QListView *
+    // Unsupported parameter TQListView *
     return KJS::Value();
 
-    QListView * arg0; // Dummy
+    TQListView * arg0; // Dummy
 
-    QString arg1 = extractQString(exec, args, 1);
+    TQString arg1 = extractQString(exec, args, 1);
 
-    QString arg2 = extractQString(exec, args, 2);
+    TQString arg2 = extractQString(exec, args, 2);
 
-    QString arg3 = extractQString(exec, args, 3);
+    TQString arg3 = extractQString(exec, args, 3);
 
-    QString arg4 = extractQString(exec, args, 4);
+    TQString arg4 = extractQString(exec, args, 4);
 
-    QString arg5 = extractQString(exec, args, 5);
+    TQString arg5 = extractQString(exec, args, 5);
 
-    QString arg6 = extractQString(exec, args, 6);
+    TQString arg6 = extractQString(exec, args, 6);
 
-    QString arg7 = extractQString(exec, args, 7);
+    TQString arg7 = extractQString(exec, args, 7);
 
-    QString arg8 = extractQString(exec, args, 8);
+    TQString arg8 = extractQString(exec, args, 8);
 
 
-    // We should now create an object of type QListViewItemQListViewItem *ret = new QListViewItem(
+    // We should now create an object of type QListViewItemQListViewItem *ret = new TQListViewItem(
 
           arg0,
           arg1,
@@ -363,29 +363,29 @@ KJS::Object QListViewItemImp::QListViewItem_6( KJS::ExecState *exec, const KJS::
 {
 #if 0
 
-    // Unsupported parameter QListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    QListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
-    QString arg1 = extractQString(exec, args, 1);
+    TQString arg1 = extractQString(exec, args, 1);
 
-    QString arg2 = extractQString(exec, args, 2);
+    TQString arg2 = extractQString(exec, args, 2);
 
-    QString arg3 = extractQString(exec, args, 3);
+    TQString arg3 = extractQString(exec, args, 3);
 
-    QString arg4 = extractQString(exec, args, 4);
+    TQString arg4 = extractQString(exec, args, 4);
 
-    QString arg5 = extractQString(exec, args, 5);
+    TQString arg5 = extractQString(exec, args, 5);
 
-    QString arg6 = extractQString(exec, args, 6);
+    TQString arg6 = extractQString(exec, args, 6);
 
-    QString arg7 = extractQString(exec, args, 7);
+    TQString arg7 = extractQString(exec, args, 7);
 
-    QString arg8 = extractQString(exec, args, 8);
+    TQString arg8 = extractQString(exec, args, 8);
 
 
-    // We should now create an object of type QListViewItemQListViewItem *ret = new QListViewItem(
+    // We should now create an object of type QListViewItemQListViewItem *ret = new TQListViewItem(
 
           arg0,
           arg1,
@@ -405,34 +405,34 @@ return KJS::Object();
 KJS::Object QListViewItemImp::QListViewItem_7( KJS::ExecState *exec, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter QListView *
+    // Unsupported parameter TQListView *
     return KJS::Value();
 
-    QListView * arg0; // Dummy
+    TQListView * arg0; // Dummy
 
-    // Unsupported parameter QListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    QListViewItem * arg1; // Dummy
+    TQListViewItem * arg1; // Dummy
 
-    QString arg2 = extractQString(exec, args, 2);
+    TQString arg2 = extractQString(exec, args, 2);
 
-    QString arg3 = extractQString(exec, args, 3);
+    TQString arg3 = extractQString(exec, args, 3);
 
-    QString arg4 = extractQString(exec, args, 4);
+    TQString arg4 = extractQString(exec, args, 4);
 
-    QString arg5 = extractQString(exec, args, 5);
+    TQString arg5 = extractQString(exec, args, 5);
 
-    QString arg6 = extractQString(exec, args, 6);
+    TQString arg6 = extractQString(exec, args, 6);
 
-    QString arg7 = extractQString(exec, args, 7);
+    TQString arg7 = extractQString(exec, args, 7);
 
-    QString arg8 = extractQString(exec, args, 8);
+    TQString arg8 = extractQString(exec, args, 8);
 
-    QString arg9 = extractQString(exec, args, 9);
+    TQString arg9 = extractQString(exec, args, 9);
 
 
-    // We should now create an object of type QListViewItemQListViewItem *ret = new QListViewItem(
+    // We should now create an object of type QListViewItemQListViewItem *ret = new TQListViewItem(
 
           arg0,
           arg1,
@@ -452,34 +452,34 @@ return KJS::Object();
 KJS::Object QListViewItemImp::QListViewItem_8( KJS::ExecState *exec, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter QListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    QListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
-    // Unsupported parameter QListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    QListViewItem * arg1; // Dummy
+    TQListViewItem * arg1; // Dummy
 
-    QString arg2 = extractQString(exec, args, 2);
+    TQString arg2 = extractQString(exec, args, 2);
 
-    QString arg3 = extractQString(exec, args, 3);
+    TQString arg3 = extractQString(exec, args, 3);
 
-    QString arg4 = extractQString(exec, args, 4);
+    TQString arg4 = extractQString(exec, args, 4);
 
-    QString arg5 = extractQString(exec, args, 5);
+    TQString arg5 = extractQString(exec, args, 5);
 
-    QString arg6 = extractQString(exec, args, 6);
+    TQString arg6 = extractQString(exec, args, 6);
 
-    QString arg7 = extractQString(exec, args, 7);
+    TQString arg7 = extractQString(exec, args, 7);
 
-    QString arg8 = extractQString(exec, args, 8);
+    TQString arg8 = extractQString(exec, args, 8);
 
-    QString arg9 = extractQString(exec, args, 9);
+    TQString arg9 = extractQString(exec, args, 9);
 
 
-    // We should now create an object of type QListViewItemQListViewItem *ret = new QListViewItem(
+    // We should now create an object of type QListViewItemQListViewItem *ret = new TQListViewItem(
 
           arg0,
           arg1,
@@ -722,7 +722,7 @@ KJS::Value QListViewItemImp::call( KJS::ExecState *exec, KJS::Object &self, cons
         break;
     }
 
-    QString msg = i18n( "QListViewItemImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "QListViewItemImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -730,10 +730,10 @@ KJS::Value QListViewItemImp::call( KJS::ExecState *exec, KJS::Object &self, cons
 KJS::Value QListViewItemImp::insertItem_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    QListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
       instance->insertItem(
        arg0 );
@@ -744,10 +744,10 @@ KJS::Value QListViewItemImp::insertItem_10( KJS::ExecState *exec, KJS::Object &o
 KJS::Value QListViewItemImp::takeItem_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    QListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
       instance->takeItem(
        arg0 );
@@ -758,10 +758,10 @@ KJS::Value QListViewItemImp::takeItem_11( KJS::ExecState *exec, KJS::Object &obj
 KJS::Value QListViewItemImp::removeItem_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    QListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
       instance->removeItem(
        arg0 );
@@ -798,15 +798,15 @@ KJS::Value QListViewItemImp::totalHeight_15( KJS::ExecState *exec, KJS::Object &
 KJS::Value QListViewItemImp::width_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter const QFontMetrics &
+    // Unsupported parameter const TQFontMetrics &
     return KJS::Value();
 
-    const QFontMetrics & arg0; // Dummy
+    const TQFontMetrics & arg0; // Dummy
 
-    // Unsupported parameter const QListView *
+    // Unsupported parameter const TQListView *
     return KJS::Value();
 
-    const QListView * arg1; // Dummy
+    const TQListView * arg1; // Dummy
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -846,7 +846,7 @@ KJS::Value QListViewItemImp::setText_19( KJS::ExecState *exec, KJS::Object &obj,
 
     int arg0 = extractInt(exec, args, 0);
 
-    QString arg1 = extractQString(exec, args, 1);
+    TQString arg1 = extractQString(exec, args, 1);
 
       instance->setText(
        arg0,
@@ -860,7 +860,7 @@ KJS::Value QListViewItemImp::text_20( KJS::ExecState *exec, KJS::Object &obj, co
 
     int arg0 = extractInt(exec, args, 0);
 
-      QString ret;
+      TQString ret;
       ret = instance->text(
        arg0 );
       return KJS::String( ret );
@@ -872,7 +872,7 @@ KJS::Value QListViewItemImp::setPixmap_21( KJS::ExecState *exec, KJS::Object &ob
 
     int arg0 = extractInt(exec, args, 0);
 
-    QPixmap arg1 = extractQPixmap(exec, args, 1);
+    TQPixmap arg1 = extractQPixmap(exec, args, 1);
 
       instance->setPixmap(
        arg0,
@@ -888,7 +888,7 @@ KJS::Value QListViewItemImp::pixmap_22( KJS::ExecState *exec, KJS::Object &obj,
 
       instance->pixmap(
        arg0 );
-      return KJS::Value(); // Returns 'const QPixmap *'
+      return KJS::Value(); // Returns 'const TQPixmap *'
 
 }
 
@@ -899,7 +899,7 @@ KJS::Value QListViewItemImp::key_23( KJS::ExecState *exec, KJS::Object &obj, con
 
     bool arg1 = extractBool(exec, args, 1);
 
-      QString ret;
+      TQString ret;
       ret = instance->key(
        arg0,
        arg1 );
@@ -910,10 +910,10 @@ KJS::Value QListViewItemImp::key_23( KJS::ExecState *exec, KJS::Object &obj, con
 KJS::Value QListViewItemImp::compare_24( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    QListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -1002,15 +1002,15 @@ KJS::Value QListViewItemImp::isSelected_31( KJS::ExecState *exec, KJS::Object &o
 KJS::Value QListViewItemImp::paintCell_32( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter QPainter *
+    // Unsupported parameter TQPainter *
     return KJS::Value();
 
-    QPainter * arg0; // Dummy
+    TQPainter * arg0; // Dummy
 
-    // Unsupported parameter const QColorGroup &
+    // Unsupported parameter const TQColorGroup &
     return KJS::Value();
 
-    const QColorGroup & arg1; // Dummy
+    const TQColorGroup & arg1; // Dummy
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -1033,15 +1033,15 @@ return KJS::Object();
 KJS::Value QListViewItemImp::paintBranches_33( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter QPainter *
+    // Unsupported parameter TQPainter *
     return KJS::Value();
 
-    QPainter * arg0; // Dummy
+    TQPainter * arg0; // Dummy
 
-    // Unsupported parameter const QColorGroup &
+    // Unsupported parameter const TQColorGroup &
     return KJS::Value();
 
-    const QColorGroup & arg1; // Dummy
+    const TQColorGroup & arg1; // Dummy
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -1064,17 +1064,17 @@ return KJS::Object();
 KJS::Value QListViewItemImp::paintFocus_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 #if 0
-    // Unsupported parameter QPainter *
+    // Unsupported parameter TQPainter *
     return KJS::Value();
 
-    QPainter * arg0; // Dummy
+    TQPainter * arg0; // Dummy
 
-    // Unsupported parameter const QColorGroup &
+    // Unsupported parameter const TQColorGroup &
     return KJS::Value();
 
-    const QColorGroup & arg1; // Dummy
+    const TQColorGroup & arg1; // Dummy
 
-    QRect arg2 = extractQRect(exec, args, 2);
+    TQRect arg2 = extractQRect(exec, args, 2);
 
       instance->paintFocus(
        arg0,
@@ -1089,10 +1089,10 @@ return KJS::Object();
 KJS::Value QListViewItemImp::firstChild_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      QListViewItem *item = instance->firstChild(  );
+      TQListViewItem *item = instance->firstChild(  );
       if( item )
       {
-          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "QListViewItem" );
+          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TQListViewItem" );
           prx->setOwner( JSProxy::Native );
           KJS::Object proxyObj( prx );
           addBindings(exec,proxyObj);
@@ -1106,10 +1106,10 @@ KJS::Value QListViewItemImp::firstChild_35( KJS::ExecState *exec, KJS::Object &o
 KJS::Value QListViewItemImp::nextSibling_36( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      QListViewItem *item = instance->nextSibling(  );
+      TQListViewItem *item = instance->nextSibling(  );
       if( item )
       {
-          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "QListViewItem" );
+          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TQListViewItem" );
           prx->setOwner( JSProxy::Native );
           KJS::Object proxyObj( prx );
           addBindings(exec,proxyObj);
@@ -1123,10 +1123,10 @@ KJS::Value QListViewItemImp::nextSibling_36( KJS::ExecState *exec, KJS::Object &
 KJS::Value QListViewItemImp::parent_37( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      QListViewItem *item = instance->parent(  );
+      TQListViewItem *item = instance->parent(  );
       if( item )
       {
-          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "QListViewItem" );
+          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TQListViewItem" );
           prx->setOwner( JSProxy::Native );
           KJS::Object proxyObj( prx );
           addBindings(exec,proxyObj);
@@ -1140,10 +1140,10 @@ KJS::Value QListViewItemImp::parent_37( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value QListViewItemImp::itemAbove_38( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      QListViewItem *item = instance->itemAbove(  );
+      TQListViewItem *item = instance->itemAbove(  );
       if( item )
       {
-          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "QListViewItem" );
+          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TQListViewItem" );
           prx->setOwner( JSProxy::Native );
           KJS::Object proxyObj( prx );
           addBindings(exec,proxyObj);
@@ -1157,10 +1157,10 @@ KJS::Value QListViewItemImp::itemAbove_38( KJS::ExecState *exec, KJS::Object &ob
 KJS::Value QListViewItemImp::itemBelow_39( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      QListViewItem *item = instance->itemBelow(  );
+      TQListViewItem *item = instance->itemBelow(  );
       if( item )
       {
-          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "QListViewItem" );
+          JSOpaqueProxy *prx = new JSOpaqueProxy( item, "TQListViewItem" );
           prx->setOwner( JSProxy::Native );
           KJS::Object proxyObj( prx );
           addBindings(exec,proxyObj);
@@ -1184,7 +1184,7 @@ KJS::Value QListViewItemImp::listView_41( KJS::ExecState *exec, KJS::Object &obj
 {
 
       instance->listView(  );
-      return KJS::Value(); // Returns 'QListView *'
+      return KJS::Value(); // Returns 'TQListView *'
 
 }
 
@@ -1247,10 +1247,10 @@ KJS::Value QListViewItemImp::sort_47( KJS::ExecState *exec, KJS::Object &obj, co
 KJS::Value QListViewItemImp::moveItem_48( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QListViewItem *
+    // Unsupported parameter TQListViewItem *
     return KJS::Value();
 
-    QListViewItem * arg0; // Dummy
+    TQListViewItem * arg0; // Dummy
 
       instance->moveItem(
        arg0 );
@@ -1301,10 +1301,10 @@ KJS::Value QListViewItemImp::dropEnabled_52( KJS::ExecState *exec, KJS::Object &
 KJS::Value QListViewItemImp::acceptDrop_53( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter const QMimeSource *
+    // Unsupported parameter const TQMimeSource *
     return KJS::Value();
 
-    const QMimeSource * arg0; // Dummy
+    const TQMimeSource * arg0; // Dummy
 
       bool ret;
       ret = instance->acceptDrop(
diff --git a/kjsembed/qtbindings/qlistviewitem_imp.h b/kjsembed/qtbindings/qlistviewitem_imp.h
index 590cde36..9f05bf89 100644
--- a/kjsembed/qtbindings/qlistviewitem_imp.h
+++ b/kjsembed/qtbindings/qlistviewitem_imp.h
@@ -26,7 +26,7 @@ namespace Bindings {
     };
 }
 /**
- * Wrapper class for QListViewItem methods.
+ * Wrapper class for TQListViewItem methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -122,7 +122,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static QListViewItem *toQListViewItem( KJS::Object &object );
+   static TQListViewItem *toQListViewItem( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -213,7 +213,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   QListViewItem *instance; // Temp
+   TQListViewItem *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qmenudata_imp.cpp b/kjsembed/qtbindings/qmenudata_imp.cpp
index aecd1808..da91f8dd 100644
--- a/kjsembed/qtbindings/qmenudata_imp.cpp
+++ b/kjsembed/qtbindings/qmenudata_imp.cpp
@@ -1,13 +1,13 @@
 
 
 
-#include <qcstring.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qpalette.h>
-#include <qpixmap.h>
-#include <qfont.h>
-#include <qkeysequence.h>
+#include <tqcstring.h>
+#include <tqimage.h>
+#include <tqpainter.h>
+#include <tqpalette.h>
+#include <tqpixmap.h>
+#include <tqfont.h>
+#include <tqkeysequence.h>
 #include <kjs/object.h>
 
 #include <kjsembed/global.h>
@@ -15,7 +15,7 @@
 #include <kjsembed/jsopaqueproxy.h>
 #include <kjsembed/jsbinding.h>
 
-#include <qmenudata.h>
+#include <tqmenudata.h>
 #include "qmenudata_imp.h"
 
 /**
@@ -43,7 +43,7 @@ void QMenuDataImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -121,7 +121,7 @@ void QMenuDataImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -134,25 +134,25 @@ void QMenuDataImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a QMenuData pointer from an Object.
+ * Extract a TQMenuData pointer from an Object.
  */
-QMenuData *QMenuDataImp::toQMenuData( KJS::Object &self )
+TQMenuData *QMenuDataImp::toQMenuData( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        QObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<QMenuData *>( obj );
+           return dynamic_cast<TQMenuData *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "QMenuData" )
+    if ( op->typeName() != "TQMenuData" )
         return 0;
 
-    return op->toNative<QMenuData>();
+    return op->toNative<TQMenuData>();
 }
 
 /**
@@ -170,7 +170,7 @@ KJS::Object QMenuDataImp::construct( KJS::ExecState *exec, const KJS::List &args
              break;
     }
 
-    QString msg = i18n("QMenuDataCons has no constructor with id '%1'").arg(id);
+    TQString msg = i18n("QMenuDataCons has no constructor with id '%1'").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -179,9 +179,9 @@ KJS::Object QMenuDataImp::QMenuData_1( KJS::ExecState *exec, const KJS::List &ar
 {
 
 
-    // We should now create an instance of the QMenuData object
+    // We should now create an instance of the TQMenuData object
 
-    QMenuData *ret = new QMenuData(
+    TQMenuData *ret = new TQMenuData(
         );
 
     return KJS::Object();
@@ -409,7 +409,7 @@ KJS::Value QMenuDataImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ
         break;
     }
 
-    QString msg = i18n( "QMenuDataImp has no method with id '%1'" ).arg( id );
+    TQString msg = i18n( "QMenuDataImp has no method with id '%1'" ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -426,19 +426,19 @@ KJS::Value QMenuDataImp::count_3( KJS::ExecState *exec, KJS::Object &obj, const
 KJS::Value QMenuDataImp::insertItem_4( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QString arg0 = extractQString(exec, args, 0);
+    TQString arg0 = extractQString(exec, args, 0);
 
-    // Unsupported parameter const QObject *
+    // Unsupported parameter const TQObject *
     return KJS::Value();
 
-    const QObject * arg1; // Dummy
+    const TQObject * arg1; // Dummy
 
     const char *arg2 = (args.size() >= 3) ? args[2].toString(exec).ascii() : 0;
 
     // Unsupported parameter const QKeySequence
     return KJS::Value();
 
-    const QKeySequence  arg3; // Dummy
+    const TQKeySequence  arg3; // Dummy
 
     int arg4 = extractInt(exec, args, 4);
 
@@ -462,21 +462,21 @@ KJS::Value QMenuDataImp::insertItem_5( KJS::ExecState *exec, KJS::Object &obj, c
     // Unsupported parameter const QIconSet
     return KJS::Value();
 
-    const QIconSet arg0; // Dummy
+    const TQIconSet arg0; // Dummy
 
-    QString arg1 = extractQString(exec, args, 1);
+    TQString arg1 = extractQString(exec, args, 1);
 
-    // Unsupported parameter const QObject *
+    // Unsupported parameter const TQObject *
     return KJS::Value();
 
-    const QObject * arg2; // Dummy
+    const TQObject * arg2; // Dummy
 
     const char *arg3 = (args.size() >= 4) ? args[3].toString(exec).ascii() : 0;
 
     // Unsupported parameter const QKeySequence
     return KJS::Value();
 
-    const QKeySequence arg4; // Dummy
+    const TQKeySequence arg4; // Dummy
 
     int arg5 = extractInt(exec, args, 5);
 
@@ -498,19 +498,19 @@ KJS::Value QMenuDataImp::insertItem_5( KJS::ExecState *exec, KJS::Object &obj, c
 KJS::Value QMenuDataImp::insertItem_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QPixmap arg0 = extractQPixmap(exec, args, 0);
+    TQPixmap arg0 = extractQPixmap(exec, args, 0);
 
-    // Unsupported parameter const QObject *
+    // Unsupported parameter const TQObject *
     return KJS::Value();
 
-    const QObject * arg1; // Dummy
+    const TQObject * arg1; // Dummy
 
     const char *arg2 = (args.size() >= 3) ? args[2].toString(exec).ascii() : 0;
 
     // Unsupported parameter const QKeySequence
     return KJS::Value();
 
-    const QKeySequence  arg3; // Dummy
+    const TQKeySequence  arg3; // Dummy
 
     int arg4 = extractInt(exec, args, 4);
 
@@ -534,21 +534,21 @@ KJS::Value QMenuDataImp::insertItem_7( KJS::ExecState *exec, KJS::Object &obj, c
     // Unsupported parameter const QIconSet
     return KJS::Value();
 
-    const QIconSet arg0; // Dummy
+    const TQIconSet arg0; // Dummy
 
-    QPixmap arg1 = extractQPixmap(exec, args, 1);
+    TQPixmap arg1 = extractQPixmap(exec, args, 1);
 
-    // Unsupported parameter const QObject *
+    // Unsupported parameter const TQObject *
     return KJS::Value();
 
-    const QObject * arg2; // Dummy
+    const TQObject * arg2; // Dummy
 
     const char *arg3 = (args.size() >= 4) ? args[3].toString(exec).ascii() : 0;
 
     // Unsupported parameter const QKeySequence
     return KJS::Value();
 
-    const QKeySequence arg4; // Dummy
+    const TQKeySequence arg4; // Dummy
 
     int arg5 = extractInt(exec, args, 5);
 
@@ -570,7 +570,7 @@ KJS::Value QMenuDataImp::insertItem_7( KJS::ExecState *exec, KJS::Object &obj, c
 KJS::Value QMenuDataImp::insertItem_8( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QString arg0 = extractQString(exec, args, 0);
+    TQString arg0 = extractQString(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -591,9 +591,9 @@ KJS::Value QMenuDataImp::insertItem_9( KJS::ExecState *exec, KJS::Object &obj, c
     // Unsupported parameter const QIconSet
     return KJS::Value();
 
-    const QIconSet arg0; // Dummy
+    const TQIconSet arg0; // Dummy
 
-    QString arg1 = extractQString(exec, args, 1);
+    TQString arg1 = extractQString(exec, args, 1);
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -612,12 +612,12 @@ KJS::Value QMenuDataImp::insertItem_9( KJS::ExecState *exec, KJS::Object &obj, c
 KJS::Value QMenuDataImp::insertItem_10( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QString arg0 = extractQString(exec, args, 0);
+    TQString arg0 = extractQString(exec, args, 0);
 
-    // Unsupported parameter QPopupMenu *
+    // Unsupported parameter TQPopupMenu *
     return KJS::Value();
 
-    QPopupMenu * arg1; // Dummy
+    TQPopupMenu * arg1; // Dummy
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -639,14 +639,14 @@ KJS::Value QMenuDataImp::insertItem_11( KJS::ExecState *exec, KJS::Object &obj,
     // Unsupported parameter const QIconSet
     return KJS::Value();
 
-    const QIconSet arg0; // Dummy
+    const TQIconSet arg0; // Dummy
 
-    QString arg1 = extractQString(exec, args, 1);
+    TQString arg1 = extractQString(exec, args, 1);
 
-    // Unsupported parameter QPopupMenu *
+    // Unsupported parameter TQPopupMenu *
     return KJS::Value();
 
-    QPopupMenu * arg2; // Dummy
+    TQPopupMenu * arg2; // Dummy
 
     int arg3 = extractInt(exec, args, 3);
 
@@ -666,7 +666,7 @@ KJS::Value QMenuDataImp::insertItem_11( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value QMenuDataImp::insertItem_12( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QPixmap arg0 = extractQPixmap(exec, args, 0);
+    TQPixmap arg0 = extractQPixmap(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -687,9 +687,9 @@ KJS::Value QMenuDataImp::insertItem_13( KJS::ExecState *exec, KJS::Object &obj,
     // Unsupported parameter const QIconSet
     return KJS::Value();
 
-    const QIconSet arg0; // Dummy
+    const TQIconSet arg0; // Dummy
 
-    QPixmap arg1 = extractQPixmap(exec, args, 1);
+    TQPixmap arg1 = extractQPixmap(exec, args, 1);
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -708,12 +708,12 @@ KJS::Value QMenuDataImp::insertItem_13( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value QMenuDataImp::insertItem_14( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QPixmap arg0 = extractQPixmap(exec, args, 0);
+    TQPixmap arg0 = extractQPixmap(exec, args, 0);
 
-    // Unsupported parameter QPopupMenu *
+    // Unsupported parameter TQPopupMenu *
     return KJS::Value();
 
-    QPopupMenu * arg1; // Dummy
+    TQPopupMenu * arg1; // Dummy
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -735,14 +735,14 @@ KJS::Value QMenuDataImp::insertItem_15( KJS::ExecState *exec, KJS::Object &obj,
     // Unsupported parameter const QIconSet
     return KJS::Value();
 
-    const QIconSet arg0; // Dummy
+    const TQIconSet arg0; // Dummy
 
-    QPixmap arg1 = extractQPixmap(exec, args, 1);
+    TQPixmap arg1 = extractQPixmap(exec, args, 1);
 
-    // Unsupported parameter QPopupMenu *
+    // Unsupported parameter TQPopupMenu *
     return KJS::Value();
 
-    QPopupMenu * arg2; // Dummy
+    TQPopupMenu * arg2; // Dummy
 
     int arg3 = extractInt(exec, args, 3);
 
@@ -762,10 +762,10 @@ KJS::Value QMenuDataImp::insertItem_15( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value QMenuDataImp::insertItem_16( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QWidget *
+    // Unsupported parameter TQWidget *
     return KJS::Value();
 
-    QWidget * arg0; // Dummy
+    TQWidget * arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -786,12 +786,12 @@ KJS::Value QMenuDataImp::insertItem_17( KJS::ExecState *exec, KJS::Object &obj,
     // Unsupported parameter const QIconSet
     return KJS::Value();
 
-    const QIconSet arg0; // Dummy
+    const TQIconSet arg0; // Dummy
 
-    // Unsupported parameter QCustomMenuItem *
+    // Unsupported parameter TQCustomMenuItem *
     return KJS::Value();
 
-    QCustomMenuItem * arg1; // Dummy
+    TQCustomMenuItem * arg1; // Dummy
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -810,10 +810,10 @@ KJS::Value QMenuDataImp::insertItem_17( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value QMenuDataImp::insertItem_18( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QCustomMenuItem *
+    // Unsupported parameter TQCustomMenuItem *
     return KJS::Value();
 
-    QCustomMenuItem * arg0; // Dummy
+    TQCustomMenuItem * arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -887,7 +887,7 @@ KJS::Value QMenuDataImp::setAccel_24( KJS::ExecState *exec, KJS::Object &obj, co
     // Unsupported parameter const QKeySequence
     return KJS::Value();
 
-    const QKeySequence  arg0; // Dummy
+    const TQKeySequence  arg0; // Dummy
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -905,7 +905,7 @@ KJS::Value QMenuDataImp::iconSet_25( KJS::ExecState *exec, KJS::Object &obj, con
 
       instance->iconSet(
        arg0 );
-      return KJS::Value(); // Returns 'QIconSet *'
+      return KJS::Value(); // Returns 'TQIconSet *'
 
 }
 
@@ -914,7 +914,7 @@ KJS::Value QMenuDataImp::text_26( KJS::ExecState *exec, KJS::Object &obj, const
 
     int arg0 = extractInt(exec, args, 0);
 
-      QString ret;
+      TQString ret;
       ret = instance->text(
        arg0 );
       return KJS::String( ret );
@@ -928,7 +928,7 @@ KJS::Value QMenuDataImp::pixmap_27( KJS::ExecState *exec, KJS::Object &obj, cons
 
       instance->pixmap(
        arg0 );
-      return KJS::Value(); // Returns 'QPixmap *'
+      return KJS::Value(); // Returns 'TQPixmap *'
 
 }
 
@@ -937,7 +937,7 @@ KJS::Value QMenuDataImp::setWhatsThis_28( KJS::ExecState *exec, KJS::Object &obj
 
     int arg0 = extractInt(exec, args, 0);
 
-    QString arg1 = extractQString(exec, args, 1);
+    TQString arg1 = extractQString(exec, args, 1);
 
       instance->setWhatsThis(
        arg0,
@@ -951,7 +951,7 @@ KJS::Value QMenuDataImp::whatsThis_29( KJS::ExecState *exec, KJS::Object &obj, c
 
     int arg0 = extractInt(exec, args, 0);
 
-      QString ret;
+      TQString ret;
       ret = instance->whatsThis(
        arg0 );
       return KJS::String( ret );
@@ -963,7 +963,7 @@ KJS::Value QMenuDataImp::changeItem_30( KJS::ExecState *exec, KJS::Object &obj,
 
     int arg0 = extractInt(exec, args, 0);
 
-    QString arg1 = extractQString(exec, args, 1);
+    TQString arg1 = extractQString(exec, args, 1);
 
       instance->changeItem(
        arg0,
@@ -977,7 +977,7 @@ KJS::Value QMenuDataImp::changeItem_31( KJS::ExecState *exec, KJS::Object &obj,
 
     int arg0 = extractInt(exec, args, 0);
 
-    QPixmap arg1 = extractQPixmap(exec, args, 1);
+    TQPixmap arg1 = extractQPixmap(exec, args, 1);
 
       instance->changeItem(
        arg0,
@@ -994,9 +994,9 @@ KJS::Value QMenuDataImp::changeItem_32( KJS::ExecState *exec, KJS::Object &obj,
     // Unsupported parameter const QIconSet
     return KJS::Value();
 
-    const QIconSet  arg1; // Dummy
+    const TQIconSet  arg1; // Dummy
 
-    QString arg2 = extractQString(exec, args, 2);
+    TQString arg2 = extractQString(exec, args, 2);
 
       instance->changeItem(
        arg0,
@@ -1014,9 +1014,9 @@ KJS::Value QMenuDataImp::changeItem_33( KJS::ExecState *exec, KJS::Object &obj,
     // Unsupported parameter const QIconSet
     return KJS::Value();
 
-    const QIconSet  arg1; // Dummy
+    const TQIconSet  arg1; // Dummy
 
-    QPixmap arg2 = extractQPixmap(exec, args, 2);
+    TQPixmap arg2 = extractQPixmap(exec, args, 2);
 
       instance->changeItem(
        arg0,
@@ -1029,7 +1029,7 @@ KJS::Value QMenuDataImp::changeItem_33( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value QMenuDataImp::changeItem_34( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QString arg0 = extractQString(exec, args, 0);
+    TQString arg0 = extractQString(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -1043,7 +1043,7 @@ KJS::Value QMenuDataImp::changeItem_34( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value QMenuDataImp::changeItem_35( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QPixmap arg0 = extractQPixmap(exec, args, 0);
+    TQPixmap arg0 = extractQPixmap(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -1060,9 +1060,9 @@ KJS::Value QMenuDataImp::changeItem_36( KJS::ExecState *exec, KJS::Object &obj,
     // Unsupported parameter const QIconSet
     return KJS::Value();
 
-    const QIconSet arg0; // Dummy
+    const TQIconSet arg0; // Dummy
 
-    QString arg1 = extractQString(exec, args, 1);
+    TQString arg1 = extractQString(exec, args, 1);
 
     int arg2 = extractInt(exec, args, 2);
 
@@ -1218,10 +1218,10 @@ KJS::Value QMenuDataImp::connectItem_48( KJS::ExecState *exec, KJS::Object &obj,
 
     int arg0 = extractInt(exec, args, 0);
 
-    // Unsupported parameter const QObject *
+    // Unsupported parameter const TQObject *
     return KJS::Value();
 
-    const QObject * arg1; // Dummy
+    const TQObject * arg1; // Dummy
 
     const char *arg2 = (args.size() >= 3) ? args[2].toString(exec).ascii() : 0;
 
@@ -1239,10 +1239,10 @@ KJS::Value QMenuDataImp::disconnectItem_49( KJS::ExecState *exec, KJS::Object &o
 
     int arg0 = extractInt(exec, args, 0);
 
-    // Unsupported parameter const QObject *
+    // Unsupported parameter const TQObject *
     return KJS::Value();
 
-    const QObject * arg1; // Dummy
+    const TQObject * arg1; // Dummy
 
     const char *arg2 = (args.size() >= 3) ? args[2].toString(exec).ascii() : 0;
 
@@ -1289,7 +1289,7 @@ KJS::Value QMenuDataImp::findItem_52( KJS::ExecState *exec, KJS::Object &obj, co
 
       instance->findItem(
        arg0 );
-      return KJS::Value(); // Returns 'QMenuItem *'
+      return KJS::Value(); // Returns 'TQMenuItem *'
 
 }
 
@@ -1298,25 +1298,25 @@ KJS::Value QMenuDataImp::findItem_53( KJS::ExecState *exec, KJS::Object &obj, co
 
     int arg0 = extractInt(exec, args, 0);
 
-    // Unsupported parameter QMenuData **
+    // Unsupported parameter TQMenuData **
     return KJS::Value();
 
-    QMenuData ** arg1; // Dummy
+    TQMenuData ** arg1; // Dummy
 
       instance->findItem(
        arg0,
        arg1 );
-      return KJS::Value(); // Returns 'QMenuItem *'
+      return KJS::Value(); // Returns 'TQMenuItem *'
 
 }
 
 KJS::Value QMenuDataImp::findPopup_54( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    // Unsupported parameter QPopupMenu *
+    // Unsupported parameter TQPopupMenu *
     return KJS::Value();
 
-    QPopupMenu * arg0; // Dummy
+    TQPopupMenu * arg0; // Dummy
 
     // Unsupported parameter int *
     return KJS::Value();
@@ -1326,7 +1326,7 @@ KJS::Value QMenuDataImp::findPopup_54( KJS::ExecState *exec, KJS::Object &obj, c
       instance->findPopup(
        arg0,
        arg1 );
-      return KJS::Value(); // Returns 'QMenuItem *'
+      return KJS::Value(); // Returns 'TQMenuItem *'
 
 }
 
diff --git a/kjsembed/qtbindings/qmenudata_imp.h b/kjsembed/qtbindings/qmenudata_imp.h
index f5ed75b4..b6b50fa7 100644
--- a/kjsembed/qtbindings/qmenudata_imp.h
+++ b/kjsembed/qtbindings/qmenudata_imp.h
@@ -17,7 +17,7 @@ class QMenuData;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for QMenuData methods.
+ * Wrapper class for TQMenuData methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -105,7 +105,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static QMenuData *toQMenuData( KJS::Object &object );
+   static TQMenuData *toQMenuData( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -188,7 +188,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   QMenuData *instance; // Temp
+   TQMenuData *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qmenuitem_imp.cpp b/kjsembed/qtbindings/qmenuitem_imp.cpp
index fa994b21..c2be558c 100644
--- a/kjsembed/qtbindings/qmenuitem_imp.cpp
+++ b/kjsembed/qtbindings/qmenuitem_imp.cpp
@@ -1,12 +1,12 @@
 
 
 
-#include <qcstring.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qpalette.h>
-#include <qpixmap.h>
-#include <qfont.h>
+#include <tqcstring.h>
+#include <tqimage.h>
+#include <tqpainter.h>
+#include <tqpalette.h>
+#include <tqpixmap.h>
+#include <tqfont.h>
 
 #include <kjs/object.h>
 
@@ -15,7 +15,7 @@
 #include <kjsembed/jsopaqueproxy.h>
 #include <kjsembed/jsbinding.h>
 
-#include <qmenudata.h>
+#include <tqmenudata.h>
 #include "qmenuitem_imp.h"
 
 /**
@@ -43,7 +43,7 @@ void QMenuItemImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -91,24 +91,24 @@ void QMenuItemImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a QMenuItem pointer from an Object.
+ * Extract a TQMenuItem pointer from an Object.
  */
-QMenuItem *QMenuItemImp::toQMenuItem( KJS::Object &self )
+TQMenuItem *QMenuItemImp::toQMenuItem( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        QObject *obj = ob->object();
+        TQObject *obj = ob->object();
     if ( obj )
-           return dynamic_cast<QMenuItem *>( obj );
+           return dynamic_cast<TQMenuItem *>( obj );
     }
 
-    if( !JSProxy::checkType(self, JSProxy::ObjectProxy, "QMenuItem") ) {
-        QObject *obj = JSProxy::toObjectProxy( self.imp() )->object();
-        return dynamic_cast<QMenuItem *>( obj );
+    if( !JSProxy::checkType(self, JSProxy::ObjectProxy, "TQMenuItem") ) {
+        TQObject *obj = JSProxy::toObjectProxy( self.imp() )->object();
+        return dynamic_cast<TQMenuItem *>( obj );
     }
     
-    if( !JSProxy::checkType(self, JSProxy::OpaqueProxy, "QMenuItem") ) {
-        return JSProxy::toOpaqueProxy( self.imp() )->toNative<QMenuItem>();
+    if( !JSProxy::checkType(self, JSProxy::OpaqueProxy, "TQMenuItem") ) {
+        return JSProxy::toOpaqueProxy( self.imp() )->toNative<TQMenuItem>();
     }
     return 0;
     
@@ -129,7 +129,7 @@ KJS::Object QMenuItemImp::construct( KJS::ExecState *exec, const KJS::List &args
              break;
     }
 
-    QString msg = i18n("QMenuItemCons has no constructor with id '%1'").arg(id);
+    TQString msg = i18n("QMenuItemCons has no constructor with id '%1'").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -138,9 +138,9 @@ KJS::Object QMenuItemImp::QMenuItem_1( KJS::ExecState *exec, const KJS::List &ar
 {
 
 
-    // We should now create an instance of the QMenuItem object
+    // We should now create an instance of the TQMenuItem object
 
-    QMenuItem *ret = new QMenuItem(
+    TQMenuItem *ret = new TQMenuItem(
         );
 
     return KJS::Object();
@@ -236,7 +236,7 @@ KJS::Value QMenuItemImp::call( KJS::ExecState *exec, KJS::Object &self, const KJ
         break;
     }
 
-    QString msg = i18n( "QMenuItemImp has no method with id '%1'" ).arg( id );
+    TQString msg = i18n( "QMenuItemImp has no method with id '%1'" ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -254,14 +254,14 @@ KJS::Value QMenuItemImp::iconSet_4( KJS::ExecState *exec, KJS::Object &obj, cons
 {
 
       instance->iconSet(  );
-      return KJS::Value(); // Returns 'QIconSet *'
+      return KJS::Value(); // Returns 'TQIconSet *'
 
 }
 
 KJS::Value QMenuItemImp::text_5( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      QString ret;
+      TQString ret;
       ret = instance->text(  );
       return KJS::String( ret );
 
@@ -270,7 +270,7 @@ KJS::Value QMenuItemImp::text_5( KJS::ExecState *exec, KJS::Object &obj, const K
 KJS::Value QMenuItemImp::whatsThis_6( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-      QString ret;
+      TQString ret;
       ret = instance->whatsThis(  );
       return KJS::String( ret );
 
@@ -287,7 +287,7 @@ KJS::Value QMenuItemImp::popup_8( KJS::ExecState *exec, KJS::Object &obj, const
 {
 
       instance->popup(  );
-      return KJS::Value(); // Returns 'QPopupMenu *'
+      return KJS::Value(); // Returns 'TQPopupMenu *'
 
 }
 
@@ -295,7 +295,7 @@ KJS::Value QMenuItemImp::widget_9( KJS::ExecState *exec, KJS::Object &obj, const
 {
 
       instance->widget(  );
-      return KJS::Value(); // Returns 'QWidget *'
+      return KJS::Value(); // Returns 'TQWidget *'
 
 }
 
@@ -303,7 +303,7 @@ KJS::Value QMenuItemImp::custom_10( KJS::ExecState *exec, KJS::Object &obj, cons
 {
 
       instance->custom(  );
-      return KJS::Value(); // Returns 'QCustomMenuItem *'
+      return KJS::Value(); // Returns 'TQCustomMenuItem *'
 
 }
 
@@ -318,7 +318,7 @@ KJS::Value QMenuItemImp::signal_12( KJS::ExecState *exec, KJS::Object &obj, cons
 {
 
       instance->signal(  );
-      return KJS::Value(); // Returns 'QSignal *'
+      return KJS::Value(); // Returns 'TQSignal *'
 
 }
 
@@ -379,7 +379,7 @@ KJS::Value QMenuItemImp::isEnabledAndVisible_18( KJS::ExecState *exec, KJS::Obje
 KJS::Value QMenuItemImp::setText_19( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QString arg0 = extractQString(exec, args, 0);
+    TQString arg0 = extractQString(exec, args, 0);
 
       instance->setText(
        arg0 );
@@ -412,7 +412,7 @@ KJS::Value QMenuItemImp::setVisible_21( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value QMenuItemImp::setWhatsThis_22( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QString arg0 = extractQString(exec, args, 0);
+    TQString arg0 = extractQString(exec, args, 0);
 
       instance->setWhatsThis(
        arg0 );
diff --git a/kjsembed/qtbindings/qmenuitem_imp.h b/kjsembed/qtbindings/qmenuitem_imp.h
index 3b1935d2..7af67bd6 100644
--- a/kjsembed/qtbindings/qmenuitem_imp.h
+++ b/kjsembed/qtbindings/qmenuitem_imp.h
@@ -17,7 +17,7 @@ class QMenuItem;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for QMenuItem methods.
+ * Wrapper class for TQMenuItem methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -72,7 +72,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static QMenuItem *toQMenuItem( KJS::Object &object );
+   static TQMenuItem *toQMenuItem( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -122,7 +122,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   QMenuItem *instance; // Temp
+   TQMenuItem *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qpopupmenu_imp.cpp b/kjsembed/qtbindings/qpopupmenu_imp.cpp
index 14430351..7b652422 100644
--- a/kjsembed/qtbindings/qpopupmenu_imp.cpp
+++ b/kjsembed/qtbindings/qpopupmenu_imp.cpp
@@ -1,12 +1,12 @@
 
 
 
-#include <qcstring.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qpalette.h>
-#include <qpixmap.h>
-#include <qfont.h>
+#include <tqcstring.h>
+#include <tqimage.h>
+#include <tqpainter.h>
+#include <tqpalette.h>
+#include <tqpixmap.h>
+#include <tqfont.h>
 
 #include <kjs/object.h>
 
@@ -15,7 +15,7 @@
 #include <kjsembed/jsopaqueproxy.h>
 #include <kjsembed/jsbinding.h>
 
-#include <qpopupmenu.h>
+#include <tqpopupmenu.h>
 #include "qpopupmenu_imp.h"
 
 /**
@@ -43,7 +43,7 @@ void QPopupMenuImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -85,7 +85,7 @@ void QPopupMenuImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -98,25 +98,25 @@ void QPopupMenuImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
 }
 
 /**
- * Extract a QPopupMenu pointer from an Object.
+ * Extract a TQPopupMenu pointer from an Object.
  */
-QPopupMenu *QPopupMenuImp::toQPopupMenu( KJS::Object &self )
+TQPopupMenu *QPopupMenuImp::toQPopupMenu( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        QObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
-           return dynamic_cast<QPopupMenu *>( obj );
+           return dynamic_cast<TQPopupMenu *>( obj );
     }
 
     JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() );
     if ( !op )
         return 0;
 
-    if ( op->typeName() != "QPopupMenu" )
+    if ( op->typeName() != "TQPopupMenu" )
         return 0;
 
-    return op->toNative<QPopupMenu>();
+    return op->toNative<TQPopupMenu>();
 }
 
 /**
@@ -134,7 +134,7 @@ KJS::Object QPopupMenuImp::construct( KJS::ExecState *exec, const KJS::List &arg
              break;
     }
 
-    QString msg = i18n("QPopupMenuCons has no constructor with id '%1'").arg(id);
+    TQString msg = i18n("QPopupMenuCons has no constructor with id '%1'").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -142,17 +142,17 @@ KJS::Object QPopupMenuImp::construct( KJS::ExecState *exec, const KJS::List &arg
 KJS::Object QPopupMenuImp::QPopupMenu_1( KJS::ExecState *exec, const KJS::List &args )
 {
 
-    // Unsupported parameter QWidget *
+    // Unsupported parameter TQWidget *
     return KJS::Object();
 
-    QWidget * arg0; // Dummy
+    TQWidget * arg0; // Dummy
 
     const char *arg1 = (args.size() >= 2) ? args[1].toString(exec).ascii() : 0;
 
 
-    // We should now create an instance of the QPopupMenu object
+    // We should now create an instance of the TQPopupMenu object
 
-    QPopupMenu *ret = new QPopupMenu(
+    TQPopupMenu *ret = new TQPopupMenu(
 
           arg0,
           arg1 );
@@ -238,7 +238,7 @@ KJS::Value QPopupMenuImp::call( KJS::ExecState *exec, KJS::Object &self, const K
         break;
     }
 
-    QString msg = i18n( "QPopupMenuImp has no method with id '%1'" ).arg( id );
+    TQString msg = i18n( "QPopupMenuImp has no method with id '%1'" ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -246,7 +246,7 @@ KJS::Value QPopupMenuImp::call( KJS::ExecState *exec, KJS::Object &self, const K
 KJS::Value QPopupMenuImp::popup_3( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QPoint arg0 = extractQPoint(exec, args, 0);
+    TQPoint arg0 = extractQPoint(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -291,7 +291,7 @@ KJS::Value QPopupMenuImp::isCheckable_6( KJS::ExecState *exec, KJS::Object &obj,
 KJS::Value QPopupMenuImp::setFont_7( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QFont arg0 = extractQFont(exec, args, 0);
+    TQFont arg0 = extractQFont(exec, args, 0);
 
       instance->setFont(
        arg0 );
@@ -327,7 +327,7 @@ KJS::Value QPopupMenuImp::exec_10( KJS::ExecState *exec, KJS::Object &obj, const
 KJS::Value QPopupMenuImp::exec_11( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QPoint arg0 = extractQPoint(exec, args, 0);
+    TQPoint arg0 = extractQPoint(exec, args, 0);
 
     int arg1 = extractInt(exec, args, 1);
 
@@ -352,7 +352,7 @@ KJS::Value QPopupMenuImp::setActiveItem_12( KJS::ExecState *exec, KJS::Object &o
 
 KJS::Value QPopupMenuImp::sizeHint_13( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
-    QSize ret;
+    TQSize ret;
       ret = instance->sizeHint(  );
 
        return convertToValue( exec, ret );
@@ -374,7 +374,7 @@ KJS::Value QPopupMenuImp::idAt_14( KJS::ExecState *exec, KJS::Object &obj, const
 KJS::Value QPopupMenuImp::idAt_15( KJS::ExecState *exec, KJS::Object &obj, const KJS::List &args )
 {
 
-    QPoint arg0 = extractQPoint(exec, args, 0);
+    TQPoint arg0 = extractQPoint(exec, args, 0);
 
       int ret;
       ret = instance->idAt(
@@ -422,7 +422,7 @@ KJS::Value QPopupMenuImp::itemGeometry_19( KJS::ExecState *exec, KJS::Object &ob
 {
 
     int arg0 = extractInt(exec, args, 0);
-        QRect ret;
+        TQRect ret;
       ret = instance->itemGeometry(
        arg0 );
 
diff --git a/kjsembed/qtbindings/qpopupmenu_imp.h b/kjsembed/qtbindings/qpopupmenu_imp.h
index 6695f486..9bb16af9 100644
--- a/kjsembed/qtbindings/qpopupmenu_imp.h
+++ b/kjsembed/qtbindings/qpopupmenu_imp.h
@@ -17,7 +17,7 @@ class QPopupMenu;
 namespace KJSEmbed {
 
 /**
- * Wrapper class for QPopupMenu methods.
+ * Wrapper class for TQPopupMenu methods.
  *
  * @author Richard Moore, rich@kde.org
  */
@@ -69,7 +69,7 @@ public:
     */
    static void addBindings( KJS::ExecState *exec, KJS::Object &object );
 
-   static QPopupMenu *toQPopupMenu( KJS::Object &object );
+   static TQPopupMenu *toQPopupMenu( KJS::Object &object );
 
    //
    // Constructors implemented by this class.
@@ -116,7 +116,7 @@ public:
    virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args );
 
 private:
-   QPopupMenu *instance; // Temp
+   TQPopupMenu *instance; // Temp
    int id;
    bool cons;
 };
diff --git a/kjsembed/qtbindings/qt_imp.cpp b/kjsembed/qtbindings/qt_imp.cpp
index ba72c824..99cae783 100644
--- a/kjsembed/qtbindings/qt_imp.cpp
+++ b/kjsembed/qtbindings/qt_imp.cpp
@@ -1,10 +1,10 @@
 
 
 
-#include <qcstring.h>
-#include <qpalette.h>
-#include <qpixmap.h>
-#include <qfont.h>
+#include <tqcstring.h>
+#include <tqpalette.h>
+#include <tqpixmap.h>
+#include <tqfont.h>
 
 #include <kjs/object.h>
 
@@ -13,7 +13,7 @@
 #include <kjsembed/jsopaqueproxy.h>
 #include <kjsembed/jsbinding.h>
 
-#include <qnamespace.h>
+#include <tqnamespace.h>
 #include "qt_imp.h"
 
 /**
@@ -41,7 +41,7 @@ void QtImp::addStaticBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -705,7 +705,7 @@ void QtImp::addBindings( KJS::ExecState *exec, KJS::Object &object )
     };
 
     int idx = 0;
-    QCString lastName;
+    TQCString lastName;
 
     while( methods[idx].name ) {
         if ( lastName != methods[idx].name ) {
@@ -724,7 +724,7 @@ Qt *QtImp::toQt( KJS::Object &self )
 {
     JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() );
     if ( ob ) {
-        QObject *obj = ob->object();
+        TQObject *obj = ob->object();
 	if ( obj )
            return dynamic_cast<Qt *>( obj );
     }
@@ -750,7 +750,7 @@ KJS::Object QtImp::construct( KJS::ExecState *exec, const KJS::List &args )
              break;
     }
 
-    QString msg = i18n("QtCons has no constructor with id '%1'.").arg(id);
+    TQString msg = i18n("QtCons has no constructor with id '%1'.").arg(id);
     return throwError(exec, msg,KJS::ReferenceError);
 }
 
@@ -765,7 +765,7 @@ KJS::Value QtImp::call( KJS::ExecState *exec, KJS::Object &self, const KJS::List
         break;
     }
 
-    QString msg = i18n( "QtImp has no method with id '%1'." ).arg( id );
+    TQString msg = i18n( "QtImp has no method with id '%1'." ).arg( id );
     return throwError(exec, msg,KJS::ReferenceError);
 }